module-cluster 1.4.5 → 1.4.6

data/lib/module-cluster/_private_/ModuleCluster/CascadeFeatures/PerformCascades.rb

@@ -1,12 +1,13 @@
 
 module ::ModuleCluster::CascadeFeatures::PerformCascades
 
+  $this_time = 0
   ######################
   #  perform_cascades  #
   ######################
   
   def perform_cascades( module_self, action, hooked_instance, set_stack )
-    
+
     # This method is called when a ::ModuleCluster module is included or extended.
     # It determines what modules should be included/extended and which should cascade.
 
@@ -130,15 +131,20 @@ module ::ModuleCluster::CascadeFeatures::PerformCascades
 
   def cascade_block_into_hooked_instance( module_self, hooked_instance, set )
 
-    # if we are supposed to cascade we need to extend with the ::ModuleCluster dependency module
-    hooked_instance.extend( set.dependency_module )
+    # subclasses already cascade due to #inherited behavior
+    unless hooked_instance.is_a?( Class )
 
-    # and we call the set's definition method to cascade
-    hooked_instance.__send__( set.method, & set.runtime_block )
+      # if we are supposed to cascade we need to extend with the ::ModuleCluster dependency module
+      hooked_instance.extend( set.dependency_module )
 
-    existing_inherit_hooks = module_self.cluster_stack.inherited_hooks
-    hooked_instance.cluster_stack.inherited_hooks.concat( existing_inherit_hooks )
+      # and we call the set's definition method to cascade
+      hooked_instance.__send__( set.method, & set.runtime_block )
 
+      existing_inherit_hooks = module_self.cluster_stack.inherited_hooks
+      hooked_instance.cluster_stack.inherited_hooks.concat( existing_inherit_hooks )
+    
+    end
+    
   end
   
   #######################################

data/lib/module-cluster/_private_/ModuleCluster/CascadeFeatures/Subclass.rb

@@ -7,17 +7,16 @@ module ::ModuleCluster::CascadeFeatures::Subclass
 	
 	def inherited( hooked_instance )
 
-    # all future subclasses should receive cascading hook
-    hooked_instance.extend( ::ModuleCluster::CascadeFeatures::Subclass )
-    hooked_instance.cluster_stack.inherited_hooks.concat( cluster_stack.inherited_hooks )
-    
     ::ModuleCluster::CascadeFeatures.perform_cascades( self, 
-                                                     :inherited, 
-                                                     hooked_instance, 
-                                                     cluster_stack.inherited_hooks )
+                                                       :inherited, 
+                                                       hooked_instance, 
+                                                       cluster_stack.inherited_hooks )
+    
+    # we don't call super because we don't want to run our inherited action multiple times
+    # that means if you are messing with #inherited on your own (whoever is reading this code)
+    # then you need to consider the order your #inherited will be inserted in relation to
+    # the one provided by module-cluster
     
-    super
-
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: module-cluster
 version: !ruby/object:Gem::Version
-  version: 1.4.5
+  version: 1.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-10 00:00:00.000000000 Z
+date: 2012-03-12 00:00:00.000000000 Z
 dependencies: []
 description: ! 'Provides methods for clustering modules so that when the main module
   is included other modules are also included or extended, either before or after