Prefer "included" language over "setup"

2 files changed, 15 insertions, 15 deletions

diff --git a/activesupport/lib/active_support/dependency_module.rb b/activesupport/lib/active_support/dependency_module.rb
index 0e1cc67b53..c690b49a2b 100644
--- a/activesupport/lib/active_support/dependency_module.rb
+++ b/activesupport/lib/active_support/dependency_module.rb
@@ -1,18 +1,18 @@
 module ActiveSupport
   module DependencyModule
-    def setup(&blk)
-      @_setup_block = blk
-    end
-
     def append_features(base)
       return if base < self
       (@_dependencies ||= []).each { |dep| base.send(:include, dep) }
       super
     end
 
-    def included(base)
-      base.extend const_get("ClassMethods") if const_defined?("ClassMethods")
-      base.class_eval(&@_setup_block) if instance_variable_defined?("@_setup_block")
+    def included(base = nil, &block)
+      if base.nil? && block_given?
+        @_included_block = block
+      else
+        base.extend const_get("ClassMethods") if const_defined?("ClassMethods")
+        base.class_eval(&@_included_block) if instance_variable_defined?("@_included_block")
+      end
     end
 
     def depends_on(mod)
diff --git a/activesupport/test/dependency_module_test.rb b/activesupport/test/dependency_module_test.rb
index d611b4056c..07090d15a1 100644
--- a/activesupport/test/dependency_module_test.rb
+++ b/activesupport/test/dependency_module_test.rb
@@ -10,17 +10,17 @@ class DependencyModuleTest < Test::Unit::TestCase
         "baz"
       end
 
-      def setup=(value)
-        @@setup = value
+      def included_ran=(value)
+        @@included_ran = value
       end
 
-      def setup
-        @@setup
+      def included_ran
+        @@included_ran
       end
     end
 
-    setup do
-      self.setup = true
+    included do
+      self.included_ran = true
     end
 
     def baz
@@ -62,9 +62,9 @@ class DependencyModuleTest < Test::Unit::TestCase
     assert_equal DependencyModuleTest::Baz::ClassMethods, (class << @klass; self.included_modules; end)[0]
   end
 
-  def test_setup_block_is_ran
+  def test_included_block_is_ran
     @klass.send(:include, Baz)
-    assert_equal true, @klass.setup
+    assert_equal true, @klass.included_ran
   end
 
   def test_modules_dependencies_are_met