module-cluster 2.0.2 → 2.0.3

data/lib/module/cluster.rb

@@ -313,10 +313,10 @@ module ::Module::Cluster
                 hooked_instance.extend( this_module )
             end
           end
-      
+
           # if we have a block it runs last
           if this_block = this_frame.block
-            this_block.call( hooked_instance )
+            this_frame.owner.module_exec( hooked_instance, & this_block )
           end
 
         end

data/lib/module/requires.rb

@@ -28,5 +28,3 @@ files = [
 files.each do |this_file|
   require_relative( File.join( basepath, this_file ) + '.rb' )
 end
-
-require_relative( basepath + '.rb' )

data/spec/module/cluster_spec.rb

@@ -60,7 +60,7 @@ describe ::Module::Cluster do
 
   # after - block only
   it 'can create an after-include hook to run a block' do
-    module ::Module::Cluster::BeforeIncludeBlockHookMock
+    module ::Module::Cluster::AfterIncludeBlockHookMock
       
       block_ran = false
       
@@ -243,7 +243,7 @@ describe ::Module::Cluster do
 
   # before - block only
   it 'can create a before-extend hook to run a block' do
-    module ::Module::Cluster::BeforeIncludeBlockHookMock
+    module ::Module::Cluster::BeforeExtendBlockHookMock
       
       block_ran = false
       
@@ -274,7 +274,7 @@ describe ::Module::Cluster do
 
   # after - block only
   it 'can create a after-extend hook to run a block' do
-    module ::Module::Cluster::BeforeIncludeBlockHookMock
+    module ::Module::Cluster::AfterExtendBlockHookMock
       
       block_ran = false
       
@@ -467,7 +467,6 @@ describe ::Module::Cluster do
         extend ::Module::Cluster
         cluster( :cluster_name ).subclass.extend( A )
         def self.inherited( instance )
-          instance.is_a?( A ).should == false
           super if defined?( super )
           instance.is_a?( A ).should == true
         end
@@ -477,6 +476,14 @@ describe ::Module::Cluster do
         is_a?( A ).should == true
       end
 
+      class AnotherClassB < AnotherClass
+        is_a?( A ).should == true
+      end
+
+      class AnotherClassC < AnotherClassB
+        is_a?( A ).should == true
+      end
+
     end
   end
 
@@ -497,9 +504,8 @@ describe ::Module::Cluster do
           block_ran = true
           instance.is_a?( A ).should == true
         end
-        cluster( :cluster_name ).subclass.extend( A, & block )
+        cluster( :cluster_name ).subclass.cascade.extend( A, & block )
         def self.inherited( instance )
-          instance.is_a?( A ).should == false
           super if defined?( super )
           instance.is_a?( A ).should == true
         end
@@ -511,6 +517,20 @@ describe ::Module::Cluster do
       
       block_ran.should == true
 
+      block_ran = false
+
+      class AnotherClassB < AnotherClass
+        is_a?( A ).should == true
+      end
+      
+      block_ran.should == true
+
+      class AnotherClassC < AnotherClassB
+        is_a?( A ).should == true
+      end
+      
+      block_ran.should == true
+
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: module-cluster
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-06 00:00:00.000000000 Z
+date: 2012-07-11 00:00:00.000000000 Z
 dependencies: []
 description: Provides hooks via :included, :extended, :append_features, :extend_object,
   :inherited. Define behavior at hooks via simple interface.
@@ -50,7 +50,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: