module_chain_method 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/module/chain_method.rb

@@ -4,11 +4,11 @@ class Module
     def self.included target
       # $stderr.puts "ChainMethod #{self.inspect}.included #{target}"
       super
-      target.extend(ClassMethods)  if Class  === target 
-      target.extend(ModuleMethods) if Module === target
-      if target.method_defined?(:included)
+      if target.method_defined?(:included) && ! target.method_defined?(:included_without_ChainMethod)
         target.send(:alias_method, :included_without_ChainMethod, :included)
       end
+      target.extend(ClassMethods)  if Class  === target 
+      target.extend(ModuleMethods) if Module === target
     end
 
     module ModuleMethods 

data/test/test_module_chain_method.rb

@@ -28,7 +28,29 @@ class TestModuleChainMethod < Test::Unit::TestCase
                  )
                  
   end
-end
+
+  should "handle multiple includes" do
+    Module::ChainMethod::Test::Foo.class_eval do
+      include Module::ChainMethod::Test::MyMixin
+    end
+    assert_equal( 
+                 [ 
+                  "MyMixin.included Module::ChainMethod::Test::Foo",
+                  "MyMixin.included Module::ChainMethod::Test::Foo",
+                 ],
+                 Module::ChainMethod::Test::MyMixin.instance_variable_get("@calls")
+                 )
+
+    f = Module::ChainMethod::Test::Foo.new
+    f.foo
+    f.bar
+    assert_equal(
+                 [ "MyMixin#foo", "Foo#foo", "Foo#bar" ],
+                 f.instance_variable_get("@calls")
+                 )
+                 
+  end
+end 
 
 
 ######################################################################

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: module_chain_method
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Kurt Stephens