module-cluster 1.4.0 → 1.4.1

data/lib/module-cluster/_private_/ModuleCluster/ClusterStack/PrependsExtends.rb

@@ -2,11 +2,11 @@
 module ModuleCluster::ClusterStack::PrependsExtends
   
   #############################
-  #  prepending_extend_hooks  #
+  #  prepend_extend_hooks  #
   #############################
 
-  def prepending_extend_hooks
-    return @prepending_extend_hooks ||= Array.new
+  def prepend_extend_hooks
+    return @prepend_extend_hooks ||= ::ModuleCluster::ClusterStack::Set::MultiSetProxy.new
   end
   
   ##############################
@@ -14,7 +14,9 @@ module ModuleCluster::ClusterStack::PrependsExtends
   ##############################
   
   def extend_prepends_includes( module_instance, method, includes, runtime_includes_block )
-    prepending_extend_hooks.push( ModuleCluster::ClusterStack::Set.new( module_instance, method, :all, :include, includes, runtime_includes_block ) )
+    new_set = ModuleCluster::ClusterStack::Set.new( module_instance, method, :all, :include, includes, runtime_includes_block )
+    prepend_extend_hooks.push( new_set )
+    return new_set
   end
 
   #############################
@@ -22,7 +24,9 @@ module ModuleCluster::ClusterStack::PrependsExtends
   #############################
   
   def extend_prepends_extends( module_instance, method, extends, runtime_extends_block )
-    prepending_extend_hooks.push( ModuleCluster::ClusterStack::Set.new( module_instance, method, :all, :extend, extends, runtime_extends_block ) )
+    new_set = ModuleCluster::ClusterStack::Set.new( module_instance, method, :all, :extend, extends, runtime_extends_block )
+    prepend_extend_hooks.push( new_set )
+    return new_set
   end
 
   ##########################################
@@ -30,7 +34,9 @@ module ModuleCluster::ClusterStack::PrependsExtends
   ##########################################
   
   def extend_prepends_includes_and_extends( module_instance, method, includes_and_extends, runtime_includes_and_extends_block )
-    prepending_extend_hooks.push( ModuleCluster::ClusterStack::Set.new( module_instance, method, :all, :include_and_extend, includes_and_extends, runtime_includes_and_extends_block ) )
+    new_set = ModuleCluster::ClusterStack::Set.new( module_instance, method, :all, :include_and_extend, includes_and_extends, runtime_includes_and_extends_block )
+    prepend_extend_hooks.push( new_set )
+    return new_set
   end
 
   #####################################
@@ -38,7 +44,9 @@ module ModuleCluster::ClusterStack::PrependsExtends
   #####################################
   
   def module_extend_prepends_includes( module_instance, method, includes, runtime_includes_block )
-    prepending_extend_hooks.push( ModuleCluster::ClusterStack::Set.new( module_instance, method, :module, :include, includes, runtime_includes_block ) )
+    new_set = ModuleCluster::ClusterStack::Set.new( module_instance, method, :module, :include, includes, runtime_includes_block )
+    prepend_extend_hooks.push( new_set )
+    return new_set
   end
 
   ####################################
@@ -46,7 +54,9 @@ module ModuleCluster::ClusterStack::PrependsExtends
   ####################################
   
   def module_extend_prepends_extends( module_instance, method, extends, runtime_extends_block )
-    prepending_extend_hooks.push( ModuleCluster::ClusterStack::Set.new( module_instance, method, :module, :extend, extends, runtime_extends_block ) )
+    new_set = ModuleCluster::ClusterStack::Set.new( module_instance, method, :module, :extend, extends, runtime_extends_block )
+    prepend_extend_hooks.push( new_set )
+    return new_set
   end
 
   #################################################
@@ -54,7 +64,9 @@ module ModuleCluster::ClusterStack::PrependsExtends
   #################################################
   
   def module_extend_prepends_includes_and_extends( module_instance, method, includes_and_extends, runtime_includes_and_extends_block )
-    prepending_extend_hooks.push( ModuleCluster::ClusterStack::Set.new( module_instance, method, :module, :include_and_extend, includes_and_extends, runtime_includes_and_extends_block ) )
+    new_set = ModuleCluster::ClusterStack::Set.new( module_instance, method, :module, :include_and_extend, includes_and_extends, runtime_includes_and_extends_block )
+    prepend_extend_hooks.push( new_set )
+    return new_set
   end
 
   ####################################
@@ -62,7 +74,9 @@ module ModuleCluster::ClusterStack::PrependsExtends
   ####################################
   
   def class_extend_prepends_includes( module_instance, method, includes, runtime_includes_block )
-    prepending_extend_hooks.push( ModuleCluster::ClusterStack::Set.new( module_instance, method, :class, :include, includes, runtime_includes_block ) )
+    new_set = ModuleCluster::ClusterStack::Set.new( module_instance, method, :class, :include, includes, runtime_includes_block )
+    prepend_extend_hooks.push( new_set )
+    return new_set
   end
 
   ###################################
@@ -70,7 +84,9 @@ module ModuleCluster::ClusterStack::PrependsExtends
   ###################################
   
   def class_extend_prepends_extends( module_instance, method, extends, runtime_extends_block )
-    prepending_extend_hooks.push( ModuleCluster::ClusterStack::Set.new( module_instance, method, :class, :extend, extends, runtime_extends_block ) )
+    new_set = ModuleCluster::ClusterStack::Set.new( module_instance, method, :class, :extend, extends, runtime_extends_block )
+    prepend_extend_hooks.push( new_set )
+    return new_set
   end
 
   ################################################
@@ -78,7 +94,9 @@ module ModuleCluster::ClusterStack::PrependsExtends
   ################################################
   
   def class_extend_prepends_includes_and_extends( module_instance, method, includes_and_extends, runtime_includes_and_extends_block )
-    prepending_extend_hooks.push( ModuleCluster::ClusterStack::Set.new( module_instance, method, :class, :include_and_extend, includes_and_extends, runtime_includes_and_extends_block ) )
+    new_set = ModuleCluster::ClusterStack::Set.new( module_instance, method, :class, :include_and_extend, includes_and_extends, runtime_includes_and_extends_block )
+    prepend_extend_hooks.push( new_set )
+    return new_set
   end
 
   #######################################
@@ -86,7 +104,9 @@ module ModuleCluster::ClusterStack::PrependsExtends
   #######################################
   
   def instance_extend_prepends_includes( module_instance, method, includes, runtime_includes_block )
-    prepending_extend_hooks.push( ModuleCluster::ClusterStack::Set.new( module_instance, method, :instance, :include, includes, runtime_includes_block ) )
+    new_set = ModuleCluster::ClusterStack::Set.new( module_instance, method, :instance, :include, includes, runtime_includes_block )
+    prepend_extend_hooks.push( new_set )
+    return new_set
   end
 
   ######################################
@@ -94,7 +114,9 @@ module ModuleCluster::ClusterStack::PrependsExtends
   ######################################
   
   def instance_extend_prepends_extends( module_instance, method, extends, runtime_extends_block )
-    prepending_extend_hooks.push( ModuleCluster::ClusterStack::Set.new( module_instance, method, :instance, :extend, extends, runtime_extends_block ) )
+    new_set = ModuleCluster::ClusterStack::Set.new( module_instance, method, :instance, :extend, extends, runtime_extends_block )
+    prepend_extend_hooks.push( new_set )
+    return new_set
   end
 
   ###################################################
@@ -102,7 +124,17 @@ module ModuleCluster::ClusterStack::PrependsExtends
   ###################################################
   
   def instance_extend_prepends_includes_and_extends( module_instance, method, includes_and_extends, runtime_includes_and_extends_block )
-    prepending_extend_hooks.push( ModuleCluster::ClusterStack::Set.new( module_instance, method, :instance, :include_and_extend, includes_and_extends, runtime_includes_and_extends_block ) )
+    new_set = ModuleCluster::ClusterStack::Set.new( module_instance, method, :instance, :include_and_extend, includes_and_extends, runtime_includes_and_extends_block )
+    prepend_extend_hooks.push( new_set )
+    return new_set
+  end
+
+  ##############################
+  #  has_prepend_extend_hook?  #
+  ##############################
+  
+  def has_prepend_extend_hook?( description )
+    return prepend_extend_hooks.hooks_with( description ) || false
   end
   
 end

data/lib/module-cluster/_private_/ModuleCluster/ClusterStack/PrependsIncludes.rb

@@ -2,11 +2,11 @@
 module ModuleCluster::ClusterStack::PrependsIncludes
   
   ##############################
-  #  prepending_include_hooks  #
+  #  prepend_include_hooks  #
   ##############################
 
-  def prepending_include_hooks
-    return @prepending_include_hooks ||= Array.new
+  def prepend_include_hooks
+    return @prepend_include_hooks ||= ::ModuleCluster::ClusterStack::Set::MultiSetProxy.new
   end
   
   ###############################
@@ -14,7 +14,9 @@ module ModuleCluster::ClusterStack::PrependsIncludes
   ###############################
   
   def include_prepends_includes( module_instance, method, includes, runtime_includes_block )
-    prepending_include_hooks.push( ModuleCluster::ClusterStack::Set.new( module_instance, method, :all, :include, includes, runtime_includes_block ) )
+    new_set = ModuleCluster::ClusterStack::Set.new( module_instance, method, :all, :include, includes, runtime_includes_block )
+    prepend_include_hooks.push( new_set )
+    return new_set
   end
 
   ##############################
@@ -22,7 +24,9 @@ module ModuleCluster::ClusterStack::PrependsIncludes
   ##############################
   
   def include_prepends_extends( module_instance, method, extends, runtime_extends_block )
-    prepending_include_hooks.push( ModuleCluster::ClusterStack::Set.new( module_instance, method, :all, :extend, extends, runtime_extends_block ) )
+    new_set = ModuleCluster::ClusterStack::Set.new( module_instance, method, :all, :extend, extends, runtime_extends_block )
+    prepend_include_hooks.push( new_set )
+    return new_set
   end
 
   ###########################################
@@ -30,7 +34,9 @@ module ModuleCluster::ClusterStack::PrependsIncludes
   ###########################################
   
   def include_prepends_includes_and_extends( module_instance, method, includes_and_extends, runtime_includes_and_extends_block )
-    prepending_include_hooks.push( ModuleCluster::ClusterStack::Set.new( module_instance, method, :all, :include_and_extend, includes_and_extends, runtime_includes_and_extends_block ) )
+    new_set = ModuleCluster::ClusterStack::Set.new( module_instance, method, :all, :include_and_extend, includes_and_extends, runtime_includes_and_extends_block )
+    prepend_include_hooks.push( new_set )
+    return new_set
   end
 
   ######################################
@@ -38,7 +44,9 @@ module ModuleCluster::ClusterStack::PrependsIncludes
   ######################################
   
   def module_include_prepends_includes( module_instance, method, includes, runtime_includes_block )
-    prepending_include_hooks.push( ModuleCluster::ClusterStack::Set.new( module_instance, method, :module, :include, includes, runtime_includes_block ) )
+    new_set = ModuleCluster::ClusterStack::Set.new( module_instance, method, :module, :include, includes, runtime_includes_block )
+    prepend_include_hooks.push( new_set )
+    return new_set
   end
 
   #####################################
@@ -46,7 +54,9 @@ module ModuleCluster::ClusterStack::PrependsIncludes
   #####################################
   
   def module_include_prepends_extends( module_instance, method, extends, runtime_extends_block )
-    prepending_include_hooks.push( ModuleCluster::ClusterStack::Set.new( module_instance, method, :module, :extend, extends, runtime_extends_block ) )
+    new_set = ModuleCluster::ClusterStack::Set.new( module_instance, method, :module, :extend, extends, runtime_extends_block )
+    prepend_include_hooks.push( new_set )
+    return new_set
   end
 
   ##################################################
@@ -54,7 +64,9 @@ module ModuleCluster::ClusterStack::PrependsIncludes
   ##################################################
   
   def module_include_prepends_includes_and_extends( module_instance, method, includes_and_extends, runtime_includes_and_extends_block )
-    prepending_include_hooks.push( ModuleCluster::ClusterStack::Set.new( module_instance, method, :module, :include_and_extend, includes_and_extends, runtime_includes_and_extends_block ) )
+    new_set = ModuleCluster::ClusterStack::Set.new( module_instance, method, :module, :include_and_extend, includes_and_extends, runtime_includes_and_extends_block )
+    prepend_include_hooks.push( new_set )
+    return new_set
   end
 
   #####################################
@@ -62,7 +74,9 @@ module ModuleCluster::ClusterStack::PrependsIncludes
   #####################################
   
   def class_include_prepends_includes( module_instance, method, includes, runtime_includes_block )
-    prepending_include_hooks.push( ModuleCluster::ClusterStack::Set.new( module_instance, method, :class, :include, includes, runtime_includes_block ) )
+    new_set = ModuleCluster::ClusterStack::Set.new( module_instance, method, :class, :include, includes, runtime_includes_block )
+    prepend_include_hooks.push( new_set )
+    return new_set
   end
 
   ####################################
@@ -70,7 +84,9 @@ module ModuleCluster::ClusterStack::PrependsIncludes
   ####################################
   
   def class_include_prepends_extends( module_instance, method, extends, runtime_extends_block )
-    prepending_include_hooks.push( ModuleCluster::ClusterStack::Set.new( module_instance, method, :class, :extend, extends, runtime_extends_block ) )
+    new_set = ModuleCluster::ClusterStack::Set.new( module_instance, method, :class, :extend, extends, runtime_extends_block )
+    prepend_include_hooks.push( new_set )
+    return new_set
   end
 
   #################################################
@@ -78,7 +94,17 @@ module ModuleCluster::ClusterStack::PrependsIncludes
   #################################################
   
   def class_include_prepends_includes_and_extends( module_instance, method, includes_and_extends, runtime_includes_and_extends_block )
-    prepending_include_hooks.push( ModuleCluster::ClusterStack::Set.new( module_instance, method, :class, :include_and_extend, includes_and_extends, runtime_includes_and_extends_block ) )
+    new_set = ModuleCluster::ClusterStack::Set.new( module_instance, method, :class, :include_and_extend, includes_and_extends, runtime_includes_and_extends_block )
+    prepend_include_hooks.push( new_set )
+    return new_set
+  end
+
+  ###############################
+  #  has_prepend_include_hook?  #
+  ###############################
+  
+  def has_prepend_include_hook?( description )
+    return prepend_include_hooks.hooks_with( description ) || false
   end
   
 end

data/lib/module-cluster/_private_/ModuleCluster/ClusterStack/Set.rb

@@ -4,4 +4,32 @@ ModuleCluster::ClusterStack::Set = Struct.new( :dependency_module,
                                                :module_class_instance_or_all, 
                                                :include_or_extend, 
                                                :modules, 
-                                               :runtime_includes_or_extends_block )
+                                               :runtime_includes_or_extends_block,
+                                               :suspended,
+                                               :name ) do
+  
+  #############
+  #  suspend  #
+  #############
+
+  def suspend
+    suspended = true
+  end
+
+  ############
+  #  resume  #
+  ############
+
+  def resume
+    suspended = false
+  end
+
+  ################
+  #  suspended?  #
+  ################
+  
+  def suspended?
+    return suspended
+  end
+  
+end

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

@@ -5,11 +5,16 @@ module ModuleCluster::ExtendForCascade
 	#  extended  #
 	##############
 	
-	def extended( class_or_module )
+	def extended( module_cluster_module )
 	  super
-	  class_or_module.module_eval do
+	  module_cluster_module.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
-    end if class_or_module.is_a?( Module ) and ! class_or_module.is_a?( Class )
+	      # classes and instances can't cascade through include/extend, so no reason to define
+	      # unless we have a module
+    end if module_cluster_module.is_a?( Module ) and ! module_cluster_module.is_a?( Class )
   end
   
 end

data/spec/ModuleCluster/Define/ClassCluster_spec.rb

@@ -34,7 +34,7 @@ describe ModuleCluster::Define::ClassCluster do
       end
       module Module2
       end
-      class_include_also_includes( Module1, Module2 )
+      class_include_also_includes( Module1, Module2 ).name = :some_name
       respond_to?( :included ).should == true
       module ModuleProof
         include ModuleCluster::Define::ClassCluster::Mock01
@@ -66,7 +66,7 @@ describe ModuleCluster::Define::ClassCluster do
       end
       module Module2
       end
-      class_include_also_extends( Module1, Module2 )
+      class_include_also_extends( Module1, Module2 ).name = :some_name
       respond_to?( :included ).should == true
       module ModuleProof
         include ModuleCluster::Define::ClassCluster::Mock02
@@ -98,7 +98,7 @@ describe ModuleCluster::Define::ClassCluster do
       end
       module Module2
       end
-      class_include_also_includes_and_extends( Module1, Module2 )
+      class_include_also_includes_and_extends( Module1, Module2 ).name = :some_name
       respond_to?( :included ).should == true
       module ModuleProof
         include ModuleCluster::Define::ClassCluster::Mock03
@@ -130,7 +130,7 @@ describe ModuleCluster::Define::ClassCluster do
       end
       module Module2
       end
-      class_extend_also_includes( Module1, Module2 )
+      class_extend_also_includes( Module1, Module2 ).name = :some_name
       respond_to?( :extended ).should == true
       module ModuleProof
         extend ModuleCluster::Define::ClassCluster::Mock04
@@ -162,7 +162,7 @@ describe ModuleCluster::Define::ClassCluster do
       end
       module Module2
       end
-      class_extend_also_extends( Module1, Module2 )
+      class_extend_also_extends( Module1, Module2 ).name = :some_name
       respond_to?( :extended ).should == true
       module ModuleProof
         extend ModuleCluster::Define::ClassCluster::Mock05
@@ -200,7 +200,7 @@ describe ModuleCluster::Define::ClassCluster do
       end
       module Module2
       end
-      class_extend_also_includes_and_extends( Module1, Module2 )
+      class_extend_also_includes_and_extends( Module1, Module2 ).name = :some_name
       respond_to?( :extended ).should == true
       module ModuleProof
         extend ModuleCluster::Define::ClassCluster::Mock06
@@ -238,7 +238,7 @@ describe ModuleCluster::Define::ClassCluster do
       end
       module Module2
       end
-      class_include_prepends_includes( Module1, Module2 )
+      class_include_prepends_includes( Module1, Module2 ).name = :some_name
       respond_to?( :append_features ).should == true
       module ModuleProof
         include ModuleCluster::Define::ClassCluster::Mock07
@@ -270,7 +270,7 @@ describe ModuleCluster::Define::ClassCluster do
       end
       module Module2
       end
-      class_include_prepends_extends( Module1, Module2 )
+      class_include_prepends_extends( Module1, Module2 ).name = :some_name
       respond_to?( :append_features ).should == true
       module ModuleProof
         include ModuleCluster::Define::ClassCluster::Mock08
@@ -302,7 +302,7 @@ describe ModuleCluster::Define::ClassCluster do
       end
       module Module2
       end
-      class_include_prepends_includes_and_extends( Module1, Module2 )
+      class_include_prepends_includes_and_extends( Module1, Module2 ).name = :some_name
       respond_to?( :append_features ).should == true
       module ModuleProof
         include ModuleCluster::Define::ClassCluster::Mock09
@@ -334,7 +334,7 @@ describe ModuleCluster::Define::ClassCluster do
       end
       module Module2
       end
-      class_extend_prepends_includes( Module1, Module2 )
+      class_extend_prepends_includes( Module1, Module2 ).name = :some_name
       respond_to?( :extend_object ).should == true
       module ModuleProof
         extend ModuleCluster::Define::ClassCluster::Mock10
@@ -366,7 +366,7 @@ describe ModuleCluster::Define::ClassCluster do
       end
       module Module2
       end
-      class_extend_prepends_extends( Module1, Module2 )
+      class_extend_prepends_extends( Module1, Module2 ).name = :some_name
       respond_to?( :extend_object ).should == true
       module ModuleProof
         extend ModuleCluster::Define::ClassCluster::Mock11
@@ -404,7 +404,7 @@ describe ModuleCluster::Define::ClassCluster do
       end
       module Module2
       end
-      class_extend_prepends_includes_and_extends( Module1, Module2 )
+      class_extend_prepends_includes_and_extends( Module1, Module2 ).name = :some_name
       respond_to?( :extend_object ).should == true
       module ModuleProof
         extend ModuleCluster::Define::ClassCluster::Mock12
@@ -442,7 +442,7 @@ describe ModuleCluster::Define::ClassCluster do
       end
       module Module2
       end
-      class_include_or_extend_also_includes( Module1, Module2 )
+      class_include_or_extend_also_includes( Module1, Module2 ).name = :some_name
       respond_to?( :append_features ).should == true
       module ModuleProof
         include ModuleCluster::Define::ClassCluster::Mock13
@@ -490,7 +490,7 @@ describe ModuleCluster::Define::ClassCluster do
       end
       module Module2
       end
-      class_include_or_extend_also_extends( Module1, Module2 )
+      class_include_or_extend_also_extends( Module1, Module2 ).name = :some_name
       respond_to?( :included ).should == true
       module ModuleProof
         include ModuleCluster::Define::ClassCluster::Mock14
@@ -538,7 +538,7 @@ describe ModuleCluster::Define::ClassCluster do
       end
       module Module2
       end
-      class_include_or_extend_also_includes_and_extends( Module1, Module2 )
+      class_include_or_extend_also_includes_and_extends( Module1, Module2 ).name = :some_name
       respond_to?( :included ).should == true
       module ModuleProof
         include ModuleCluster::Define::ClassCluster::Mock15
@@ -586,7 +586,7 @@ describe ModuleCluster::Define::ClassCluster do
       end
       module Module2
       end
-      class_include_or_extend_prepends_includes( Module1, Module2 )
+      class_include_or_extend_prepends_includes( Module1, Module2 ).name = :some_name
       respond_to?( :append_features ).should == true
       module ModuleProof
         include ModuleCluster::Define::ClassCluster::Mock16
@@ -634,7 +634,7 @@ describe ModuleCluster::Define::ClassCluster do
       end
       module Module2
       end
-      class_include_or_extend_prepends_extends( Module1, Module2 )
+      class_include_or_extend_prepends_extends( Module1, Module2 ).name = :some_name
       respond_to?( :extend_object ).should == true
       module ModuleProof
         include ModuleCluster::Define::ClassCluster::Mock17
@@ -688,7 +688,7 @@ describe ModuleCluster::Define::ClassCluster do
       end
       module Module2
       end
-      class_include_or_extend_prepends_includes_and_extends( Module1, Module2 )
+      class_include_or_extend_prepends_includes_and_extends( Module1, Module2 ).name = :some_name
       respond_to?( :append_features ).should == true
       module ModuleProof
         include ModuleCluster::Define::ClassCluster::Mock18