Merge commit 'mainstream/master'

7 files changed, 99 insertions, 32 deletions

diff --git a/activesupport/lib/active_support/autoload.rb b/activesupport/lib/active_support/autoload.rb
index ed229d1c5f..75706855d6 100644
--- a/activesupport/lib/active_support/autoload.rb
+++ b/activesupport/lib/active_support/autoload.rb
@@ -5,7 +5,7 @@ module ActiveSupport
   autoload :BufferedLogger, 'active_support/buffered_logger'
   autoload :Cache, 'active_support/cache'
   autoload :Callbacks, 'active_support/callbacks'
-  autoload :NewCallbacks, 'active_support/new_callbacks'
+  autoload :Concern, 'active_support/concern'
   autoload :ConcurrentHash, 'active_support/concurrent_hash'
   autoload :DependencyModule, 'active_support/dependency_module'
   autoload :Deprecation, 'active_support/deprecation'
@@ -15,6 +15,7 @@ module ActiveSupport
   autoload :MessageEncryptor, 'active_support/message_encryptor'
   autoload :MessageVerifier, 'active_support/message_verifier'
   autoload :Multibyte, 'active_support/multibyte'
+  autoload :NewCallbacks, 'active_support/new_callbacks'
   autoload :OptionMerger, 'active_support/option_merger'
   autoload :OrderedHash, 'active_support/ordered_hash'
   autoload :OrderedOptions, 'active_support/ordered_options'
diff --git a/activesupport/lib/active_support/cache/strategy/local_cache.rb b/activesupport/lib/active_support/cache/strategy/local_cache.rb
index 4bbcd8e4c4..3b5fccc737 100644
--- a/activesupport/lib/active_support/cache/strategy/local_cache.rb
+++ b/activesupport/lib/active_support/cache/strategy/local_cache.rb
@@ -45,7 +45,7 @@ module ActiveSupport
           elsif value.nil?
             value = super
             local_cache.write(key, value || NULL) if local_cache
-            value
+            value.duplicable? ? value.dup : value
           else
             # forcing the value to be immutable
             value.duplicable? ? value.dup : value
diff --git a/activesupport/lib/active_support/concern.rb b/activesupport/lib/active_support/concern.rb
new file mode 100644
index 0000000000..dcf1e8152f
--- /dev/null
+++ b/activesupport/lib/active_support/concern.rb
@@ -0,0 +1,25 @@
+require 'active_support/dependency_module'
+
+module ActiveSupport
+  module Concern
+    include DependencyModule
+
+    def append_features(base)
+      if super
+        base.extend const_get("ClassMethods") if const_defined?("ClassMethods")
+        base.send :include, const_get("InstanceMethods") if const_defined?("InstanceMethods")
+        base.class_eval(&@_included_block) if instance_variable_defined?("@_included_block")
+      end
+    end
+
+    def included(base = nil, &block)
+      if base.nil?
+        @_included_block = block
+      else
+        super
+      end
+    end
+
+    alias_method :include, :depends_on
+  end
+end
diff --git a/activesupport/lib/active_support/dependency_module.rb b/activesupport/lib/active_support/dependency_module.rb
index 9872b9654b..6847c0f86a 100644
--- a/activesupport/lib/active_support/dependency_module.rb
+++ b/activesupport/lib/active_support/dependency_module.rb
@@ -1,19 +1,9 @@
 module ActiveSupport
   module DependencyModule
     def append_features(base)
-      return if base < self
+      return false if base < self
       (@_dependencies ||= []).each { |dep| base.send(:include, dep) }
       super
-      base.extend const_get("ClassMethods") if const_defined?("ClassMethods")
-      base.class_eval(&@_included_block) if instance_variable_defined?("@_included_block")
-    end
-
-    def included(base = nil, &block)
-      if base.nil?
-        @_included_block = block
-      else
-        super
-      end
     end
 
     def depends_on(*mods)
diff --git a/activesupport/lib/active_support/new_callbacks.rb b/activesupport/lib/active_support/new_callbacks.rb
index f8108780f1..8512c659b0 100644
--- a/activesupport/lib/active_support/new_callbacks.rb
+++ b/activesupport/lib/active_support/new_callbacks.rb
@@ -287,6 +287,14 @@ module ActiveSupport
         when Proc
           @klass.send(:define_method, method_name, &filter)
           method_name << (filter.arity == 1 ? "(self)" : "")
+        when Method
+          @klass.send(:define_method, "#{method_name}_method") { filter }
+          @klass.class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
+            def #{method_name}(&blk)
+              #{method_name}_method.call(self, &blk)
+            end
+          RUBY_EVAL
+          method_name
         when String
           @klass.class_eval <<-RUBY_EVAL
             def #{method_name}
@@ -298,11 +306,34 @@ module ActiveSupport
           kind, name = @kind, @name
           @klass.send(:define_method, "#{method_name}_object") { filter }
 
-          @klass.class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
-            def #{method_name}(&blk)
-              #{method_name}_object.send("#{kind}_#{name}", self, &blk)
-            end
-          RUBY_EVAL
+          if kind == :around
+            @klass.class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
+              def #{method_name}(&blk)
+                if :#{kind} == :around && #{method_name}_object.respond_to?(:filter)
+                  #{method_name}_object.send("filter", self, &blk)
+                # TODO: Deprecate this
+                elsif #{method_name}_object.respond_to?(:before) && #{method_name}_object.respond_to?(:after)
+                  should_continue = #{method_name}_object.before(self)
+                  yield if should_continue
+                  #{method_name}_object.after(self)
+                else
+                  #{method_name}_object.send("#{kind}_#{name}", self, &blk)
+                end
+              end
+            RUBY_EVAL
+          else
+            @klass.class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
+              def #{method_name}(&blk)
+                if #{method_name}_object.respond_to?(:#{kind})
+                  #{method_name}_object.#{kind}(self, &blk)
+                elsif #{method_name}_object.respond_to?(:filter)
+                  #{method_name}_object.send("filter", self, &blk)
+                else
+                  #{method_name}_object.send("#{kind}_#{name}", self, &blk)
+                end
+              end
+            RUBY_EVAL
+          end
           method_name
         end
       end
@@ -444,7 +475,9 @@ module ActiveSupport
                 self._#{symbol}_callbacks.delete_if {|c| c.matches?(type, :#{symbol}, filter)}
                 Callback.new(filter, type, options.dup, self, :#{symbol})
               end
-              self._#{symbol}_callbacks.push(*filters)
+              options[:prepend] ?
+                self._#{symbol}_callbacks.unshift(*filters) :
+                self._#{symbol}_callbacks.push(*filters)
               _define_runner(:#{symbol}, 
                 self._#{symbol}_callbacks.compile(nil, :terminator => _#{symbol}_terminator), 
                 options)
diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index bd237a5c8e..51d04d9388 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -180,6 +180,15 @@ uses_memcached 'memcached backed store' do
       end
     end
 
+    def test_stored_objects_should_not_be_frozen
+      @cache.with_local_cache do
+        @cache.write('foo', 'bar')
+      end
+      @cache.with_local_cache do
+        assert !@cache.read('foo').frozen?
+      end
+    end
+
     def test_write_should_return_true_on_success
       @cache.with_local_cache do
         result = @cache.write('foo', 'bar')
diff --git a/activesupport/test/dependency_module_test.rb b/activesupport/test/concern_test.rb
index be7db0fa7b..4cbe56a2d2 100644
--- a/activesupport/test/dependency_module_test.rb
+++ b/activesupport/test/concern_test.rb
@@ -1,9 +1,9 @@
 require 'abstract_unit'
-require 'active_support/dependency_module'
+require 'active_support/concern'
 
-class DependencyModuleTest < Test::Unit::TestCase
+class ConcernTest < Test::Unit::TestCase
   module Baz
-    extend ActiveSupport::DependencyModule
+    extend ActiveSupport::Concern
 
     module ClassMethods
       def baz
@@ -19,6 +19,9 @@ class DependencyModuleTest < Test::Unit::TestCase
       end
     end
 
+    module InstanceMethods
+    end
+
     included do
       self.included_ran = true
     end
@@ -29,9 +32,9 @@ class DependencyModuleTest < Test::Unit::TestCase
   end
 
   module Bar
-    extend ActiveSupport::DependencyModule
+    extend ActiveSupport::Concern
 
-    depends_on Baz
+    include Baz
 
     def bar
       "bar"
@@ -43,9 +46,9 @@ class DependencyModuleTest < Test::Unit::TestCase
   end
 
   module Foo
-    extend ActiveSupport::DependencyModule
+    extend ActiveSupport::Concern
 
-    depends_on Bar, Baz
+    include Bar, Baz
   end
 
   def setup
@@ -55,17 +58,23 @@ class DependencyModuleTest < Test::Unit::TestCase
   def test_module_is_included_normally
     @klass.send(:include, Baz)
     assert_equal "baz", @klass.new.baz
-    assert_equal DependencyModuleTest::Baz, @klass.included_modules[0]
+    assert @klass.included_modules.include?(ConcernTest::Baz)
 
     @klass.send(:include, Baz)
     assert_equal "baz", @klass.new.baz
-    assert_equal DependencyModuleTest::Baz, @klass.included_modules[0]
+    assert @klass.included_modules.include?(ConcernTest::Baz)
   end
 
   def test_class_methods_are_extended
     @klass.send(:include, Baz)
     assert_equal "baz", @klass.baz
-    assert_equal DependencyModuleTest::Baz::ClassMethods, (class << @klass; self.included_modules; end)[0]
+    assert_equal ConcernTest::Baz::ClassMethods, (class << @klass; self.included_modules; end)[0]
+  end
+
+  def test_instance_methods_are_included
+    @klass.send(:include, Baz)
+    assert_equal "baz", @klass.new.baz
+    assert @klass.included_modules.include?(ConcernTest::Baz::InstanceMethods)
   end
 
   def test_included_block_is_ran
@@ -78,11 +87,11 @@ class DependencyModuleTest < Test::Unit::TestCase
     assert_equal "bar", @klass.new.bar
     assert_equal "bar+baz", @klass.new.baz
     assert_equal "baz", @klass.baz
-    assert_equal [DependencyModuleTest::Bar, DependencyModuleTest::Baz], @klass.included_modules[0..1]
+    assert @klass.included_modules.include?(ConcernTest::Bar)
   end
 
-  def test_depends_on_with_multiple_modules
+  def test_dependencies_with_multiple_modules
     @klass.send(:include, Foo)
-    assert_equal [DependencyModuleTest::Foo, DependencyModuleTest::Bar, DependencyModuleTest::Baz], @klass.included_modules[0..2]
+    assert_equal [ConcernTest::Foo, ConcernTest::Bar, ConcernTest::Baz::InstanceMethods, ConcernTest::Baz], @klass.included_modules[0..3]
   end
 end