module-cluster 1.4.6 → 1.4.8

data/lib/module-cluster.rb

@@ -97,7 +97,6 @@ require_relative 'module-cluster/_private_/ModuleCluster/CascadeFeatures/Subclas
 require_relative 'module-cluster/_private_/ModuleCluster/CascadeFeatures.rb'
 
 require_relative 'module-cluster/_private_/ModuleCluster/ExtendForCascade.rb'
-require_relative 'module-cluster/_private_/ModuleCluster/ExtendForCascade/Subclass.rb'
 
 require_relative 'module-cluster/_private_/ModuleCluster/ClusterStack/Set.rb'
 require_relative 'module-cluster/_private_/ModuleCluster/ClusterStack/Set/MultiSetProxy.rb'

data/lib/module-cluster/ModuleCluster/Define/Block/CascadingModuleOrSubclass.rb

@@ -6,7 +6,6 @@ module ::ModuleCluster::Define::Block::CascadingModuleOrSubclass
   include ::ModuleCluster::Define::Block::Subclass
   include ::ModuleCluster::Suspend::WithoutHooks
   
-  extend ::ModuleCluster::ExtendForCascade::Subclass
   extend ::ModuleCluster::ExtendForCascade
 
   ##########################################

data/lib/module-cluster/ModuleCluster/Define/Block/ClassOrModuleOrSubclass.rb

@@ -5,7 +5,6 @@ module ::ModuleCluster::Define::Block::ClassOrModuleOrSubclass
   include ::ModuleCluster::Define::Block::ClassOrModule
   include ::ModuleCluster::Suspend::WithoutHooks
   
-  extend ::ModuleCluster::ExtendForCascade::Subclass
   extend ::ModuleCluster::ExtendForCascade
 
   ##########################

data/lib/module-cluster/ModuleCluster/Define/Block/ClassOrSubclass.rb

@@ -6,7 +6,6 @@ module ::ModuleCluster::Define::Block::ClassOrSubclass
   include ::ModuleCluster::Define::Block::Subclass
   include ::ModuleCluster::Suspend::WithoutHooks
   
-  extend ::ModuleCluster::ExtendForCascade::Subclass
   extend ::ModuleCluster::ExtendForCascade
 
   ##########################

data/lib/module-cluster/ModuleCluster/Define/Block/ModuleOrSubclass.rb

@@ -6,7 +6,6 @@ module ::ModuleCluster::Define::Block::ModuleOrSubclass
   include ::ModuleCluster::Define::Block::Subclass
   include ::ModuleCluster::Suspend::WithoutHooks
   
-  extend ::ModuleCluster::ExtendForCascade::Subclass
   extend ::ModuleCluster::ExtendForCascade
 
   ##########################

data/lib/module-cluster/ModuleCluster/Define/Block/Subclass.rb

@@ -3,18 +3,9 @@ module ::ModuleCluster::Define::Block::Subclass
 
   include ::ModuleCluster::CascadeFeatures::ClusterStack
   include ::ModuleCluster::Suspend::WithoutHooks
-  extend ::ModuleCluster::Define::Block::Module
-  
-#  module_extend do |module_instance|
-#    module_instance.module_eval do
-#      extend ::ModuleCluster::Define::Block::Class
-#      class_include do |class_instance|
-#      end
-#    end
-#  end
-  
-  extend ::ModuleCluster::ExtendForCascade::Subclass
   
+  extend ::ModuleCluster::ExtendForCascade
+    
   ##########################
   #  self.should_cascade?  #
   ##########################
@@ -55,9 +46,11 @@ module ::ModuleCluster::Define::Block::Subclass
   ##############
 
   def subclass( & runtime_block )
+    
     return cluster_stack.subclass( ::ModuleCluster::Define::Block::Subclass, 
                                    __method__, 
                                    runtime_block )
+  
   end
 
 end

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

@@ -8,8 +8,11 @@ module ::ModuleCluster::CascadeFeatures
   #####################
 
   def append_features( hooked_instance )
-
-    ::ModuleCluster::CascadeFeatures.perform_cascades( self, :prepend_include, hooked_instance, cluster_stack.prepend_include_hooks )
+    
+    ::ModuleCluster::CascadeFeatures.perform_cascades( self, 
+                                                       :prepend_include, 
+                                                       hooked_instance, 
+                                                       cluster_stack.prepend_include_hooks )
     
     super
     
@@ -23,7 +26,21 @@ module ::ModuleCluster::CascadeFeatures
 
     super
 
-    ::ModuleCluster::CascadeFeatures.perform_cascades( self, :include, hooked_instance, cluster_stack.include_hooks )
+    ::ModuleCluster::CascadeFeatures.perform_cascades( self, 
+                                                      :include, 
+                                                      hooked_instance, 
+                                                      cluster_stack.include_hooks )
+    
+    # if we are included in a class and we have cascading inherit hooks we need to move them over
+    # append_features and included are both called for an inlucde, so we only need to do this in one
+    if hooked_instance.is_a?( Class )
+
+      unless cluster_stack.inherited_hooks.empty?
+        hooked_instance.extend( ::ModuleCluster::Define::Block::Subclass )
+        hooked_instance.cluster_stack.inherited_hooks.concat( cluster_stack.inherited_hooks )
+      end
+
+    end
     
   end
   
@@ -33,7 +50,10 @@ module ::ModuleCluster::CascadeFeatures
 
   def extend_object( hooked_instance )
 
-    ::ModuleCluster::CascadeFeatures.perform_cascades( self, :prepend_extend, hooked_instance, cluster_stack.prepend_extend_hooks )
+    ::ModuleCluster::CascadeFeatures.perform_cascades( self, 
+                                                       :prepend_extend, 
+                                                       hooked_instance, 
+                                                       cluster_stack.prepend_extend_hooks )
     
     super
     
@@ -47,7 +67,10 @@ module ::ModuleCluster::CascadeFeatures
 
     super
 
-    ::ModuleCluster::CascadeFeatures.perform_cascades( self, :extend, hooked_instance, cluster_stack.extend_hooks )
+    ::ModuleCluster::CascadeFeatures.perform_cascades( self, 
+                                                       :extend, 
+                                                       hooked_instance, 
+                                                       cluster_stack.extend_hooks )
 
   end
   

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

@@ -1,7 +1,6 @@
 
 module ::ModuleCluster::CascadeFeatures::PerformCascades
 
-  $this_time = 0
   ######################
   #  perform_cascades  #
   ######################
@@ -26,7 +25,7 @@ module ::ModuleCluster::CascadeFeatures::PerformCascades
 
           # if our blocks are set to cascade then we need to copy inherit hooks
           if this_set.dependency_module.should_cascade?( hooked_instance )
-            cascade_block_into_hooked_instance( module_self, hooked_instance, this_set )
+            cascade_block_into_hooked_instance( module_self, action, hooked_instance, this_set )
           end
           
           if this_set.dependency_module.should_run_block?( hooked_instance )
@@ -129,20 +128,27 @@ module ::ModuleCluster::CascadeFeatures::PerformCascades
   #  cascade_block_into_hooked_instance  #
   ########################################
 
-  def cascade_block_into_hooked_instance( module_self, hooked_instance, set )
+  def cascade_block_into_hooked_instance( module_self, action, hooked_instance, set )
+    
+    hooked_instance.extend( set.dependency_module )
+          
+    if hooked_instance.is_a?( Class )
+      
+      if action == :inherited
 
-    # subclasses already cascade due to #inherited behavior
-    unless hooked_instance.is_a?( Class )
+        unless set.dependency_module == ::ModuleCluster::CascadeFeatures::Subclass
+          hooked_instance.extend( ::ModuleCluster::CascadeFeatures::Subclass )
+        end
+        
+        hooked_instance.subclass( & set.runtime_block )
 
-      # if we are supposed to cascade we need to extend with the ::ModuleCluster dependency module
-      hooked_instance.extend( set.dependency_module )
+      end
+      
+    else
 
       # 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

@@ -1,6 +1,8 @@
 
 module ::ModuleCluster::CascadeFeatures::Subclass
 
+  extend ::ModuleCluster::CascadeFeatures::PerformCascades
+
 	###############
 	#  inherited  #
 	###############

data/lib/module-cluster/_private_/ModuleCluster/ExtendForCascade.rb

@@ -6,15 +6,29 @@ module ::ModuleCluster::ExtendForCascade
 	##############
 	
 	def extended( module_cluster_configuration_instance )
+
 	  super
-	  module_cluster_configuration_instance.module_eval do
-	    # when a module-cluster definition module is used to extend a module,
-	    # define self#extended, self#included, self#append_features, self#extend_object in
-	    # module_cluster_module ( module extended with module-cluster definition module )
-	    extend ::ModuleCluster::CascadeFeatures
-	      # classes and instances can't cascade through include/extend, so no reason to define
-	      # unless we have a module
-    end if module_cluster_configuration_instance.is_a?( Module ) and ! module_cluster_configuration_instance.is_a?( Class )
+
+    if module_cluster_configuration_instance.is_a?( Class )
+
+  	  module_cluster_configuration_instance.module_eval do
+  	    # when a module-cluster definition module is used to extend a module,
+  	    # define self#extended, self#included, self#append_features, self#extend_object in
+  	    # module_cluster_module ( module extended with module-cluster definition module )
+  	    extend ::ModuleCluster::CascadeFeatures::Subclass
+      end
+      
+    else
+      
+  	  module_cluster_configuration_instance.instance_eval do
+  	    # when a module-cluster definition module is used to extend a module,
+  	    # define self#extended, self#included, self#append_features, self#extend_object in
+  	    # module_cluster_module ( module extended with module-cluster definition module )
+  	    extend ::ModuleCluster::CascadeFeatures
+      end
+    
+    end
+    
   end
   
 end

data/spec/ModuleCluster/Define/Block/CascadingClass_spec.rb

@@ -14,12 +14,21 @@ describe ::ModuleCluster::Define::Block::CascadingClass do
       cascading_class_include do
         block_ran = true
       end
+      cluster_stack.inherited_hooks.count.should == 1
       respond_to?( :included ).should == true
       module ModuleProof
         include ::ModuleCluster::Define::Block::CascadingClass::Mock01
+        respond_to?( :cluster_stack ).should == true
+        cluster_stack.inherited_hooks.count.should == 1
       end
       block_ran.should == false
       module ModuleProof2
+        include ::ModuleCluster::Define::Block::CascadingClass::Mock01::ModuleProof
+        respond_to?( :cluster_stack ).should == true
+        cluster_stack.inherited_hooks.count.should == 1
+      end
+      block_ran.should == false
+      module ModuleProofExtended
         extend ::ModuleCluster::Define::Block::CascadingClass::Mock01
       end
       block_ran.should == false
@@ -33,10 +42,14 @@ describe ::ModuleCluster::Define::Block::CascadingClass do
       block_ran.should == false
       class CascadingClassProof
         include ::ModuleCluster::Define::Block::CascadingClass::Mock01
+        respond_to?( :cluster_stack ).should == true
+        cluster_stack.inherited_hooks.count.should == 1
       end
       block_ran.should == true
       block_ran = false
       class CascadingClassProof2 < CascadingClassProof
+        respond_to?( :cluster_stack ).should == true
+        cluster_stack.inherited_hooks.count.should == 1
       end
       block_ran.should == true
     end

data/spec/ModuleCluster/Define/Block/Module_spec.rb

@@ -15,25 +15,31 @@ describe ::ModuleCluster::Define::Block::Module do
         block_ran = true
         self.should == ::ModuleCluster::Define::Block::Module::Mock01
       end
+      cluster_stack.include_hooks.count.should == 1
       respond_to?( :included ).should == true
       class ClassProof
         extend ::ModuleCluster::Define::Block::Module::Mock01
+        respond_to?( :cluster_stack ).should == false
       end
       block_ran.should == false
       class ClassProof2
         include ::ModuleCluster::Define::Block::Module::Mock01
+        respond_to?( :cluster_stack ).should == false
       end
       block_ran.should == false
       Object.new.instance_eval do
         extend ::ModuleCluster::Define::Block::Module::Mock01
+        respond_to?( :cluster_stack ).should == false
       end
       block_ran.should == false
       module ModuleProof
         extend ::ModuleCluster::Define::Block::Module::Mock01
+        respond_to?( :cluster_stack ).should == false
       end
       block_ran.should == false
       module ModuleProof2
         include ::ModuleCluster::Define::Block::Module::Mock01
+        respond_to?( :cluster_stack ).should == false
       end
       block_ran.should == true
     end

data/spec/ModuleCluster/Define/Block/Subclass_spec.rb

@@ -46,8 +46,9 @@ describe ::ModuleCluster::Define::Block::Subclass do
       end
       respond_to?( :included ).should == true
       respond_to?( :extended ).should == true
-      respond_to?( :append_features ).should == false
-      respond_to?( :extend_object ).should == false
+      respond_to?( :append_features ).should == true
+      respond_to?( :extend_object ).should == true
+      respond_to?( :inherited ).should == false
       class ClassProof
         include ::ModuleCluster::Define::Block::Subclass::Mock02
         respond_to?( :inherited ).should == true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: module-cluster
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.4.8
   prerelease: 
 platform: ruby
 authors:
@@ -42,7 +42,6 @@ files:
 - lib/module-cluster/_private_/ModuleCluster/ClusterStack/Status.rb
 - lib/module-cluster/_private_/ModuleCluster/ClusterStack/Suspend.rb
 - lib/module-cluster/_private_/ModuleCluster/ClusterStack.rb
-- lib/module-cluster/_private_/ModuleCluster/ExtendForCascade/Subclass.rb
 - lib/module-cluster/_private_/ModuleCluster/ExtendForCascade.rb
 - lib/module-cluster/ModuleCluster/Define/Block/CascadingClass.rb
 - lib/module-cluster/ModuleCluster/Define/Block/CascadingClassOrModule.rb

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

@@ -1,68 +0,0 @@
-
-module ::ModuleCluster::ExtendForCascade::Subclass
-
-	##############
-	#  extended  #
-	##############
-	
-	def extended( module_cluster_configuration_class_instance )
-
-	  super
-
-	  if module_cluster_configuration_class_instance.is_a?( Class )
-
-  	  module_cluster_configuration_class_instance.module_eval do
-  	    # when a module-cluster definition module is used to extend a module,
-  	    # define self#inherited module_cluster_configuration_class_instance 
-  	    # (class extended with module-cluster definition module)
-  	    extend ::ModuleCluster::CascadeFeatures::Subclass
-      end
-    
-    elsif module_cluster_configuration_class_instance.is_a?( Module )
-
-      # we need to create an include hook in the module so that when the class includes it, 
-      # it gets the subclass definition
-  	  module_cluster_configuration_class_instance.module_eval do
-  	    # when a module is enabled for subclass we need to cascade subclassing
-  	    extend ::ModuleCluster::ExtendForCascade::Subclass
-      end
-      
-    end
-    
-  end
-
-	##############
-	#  included  #
-	##############
-	
-	def included( module_cluster_configuration_class_instance )
-
-	  super
-
-    existing_inherited_hooks = cluster_stack.inherited_hooks
-
-    if module_cluster_configuration_class_instance.is_a?( Class )
-
-  	  module_cluster_configuration_class_instance.module_eval do
-  	    # when a module-cluster definition module is used to extend a module,
-  	    # define self#inherited module_cluster_configuration_class_instance 
-  	    # (class extended with module-cluster definition module)
-  	    extend ::ModuleCluster::Define::Block::Subclass
-        cluster_stack.inherited_hooks.concat( existing_inherited_hooks )
-      end
-
-    elsif module_cluster_configuration_class_instance.is_a?( Module )
-
-      # we need to create an include hook in the module so that when the class includes it, 
-      # it gets the subclass definition
-  	  module_cluster_configuration_class_instance.module_eval do
-  	    # when a module is enabled for subclass we need to cascade subclassing
-  	    extend ::ModuleCluster::Define::Block::Subclass
-        cluster_stack.inherited_hooks.concat( existing_inherited_hooks )
-      end
-      
-	  end
-
-  end
-  
-end