module-cluster 1.3.7 → 1.4.0

data/lib/module-cluster/ModuleCluster/Define/ClassOrInstanceCluster.rb

@@ -0,0 +1,127 @@
+
+module ModuleCluster::Define::ClassOrInstanceCluster
+
+  include ModuleCluster::CascadeFeatures::ClusterStack
+  
+  extend ModuleCluster::ExtendForCascade
+
+  ####################################
+  #  self.should_include_or_extend?  #
+  ####################################
+
+  def self.should_include_or_extend?( hooked_instance )
+    return hooked_instance.is_a?( Class ) || ! hooked_instance.is_a?( Module )
+  end
+
+  ##########################
+  #  self.should_cascade?  #
+  ##########################
+
+  def self.should_cascade?( class_or_instance_or_module )
+    return false
+  end
+  
+	#########################################################################
+	#  class_include_or_extend_or_instance_extend_also_includes_or_extends  #
+	#########################################################################
+
+	def class_include_or_extend_or_instance_extend_also_includes_or_extends( *includes_or_extends, & runtime_includes_or_extends_block )
+	  cluster_stack.class_include_includes( ModuleCluster::Define::ClassOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
+	  cluster_stack.class_extend_extends( ModuleCluster::Define::ClassOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
+	  cluster_stack.instance_extend_extends( ModuleCluster::Define::ClassOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
+		return self
+	end
+	
+	#############################################################
+	#  class_include_or_extend_or_instance_extend_also_extends  #
+	#############################################################
+
+	def class_include_or_extend_or_instance_extend_also_extends( *includes_or_extends, & runtime_includes_or_extends_block )
+	  cluster_stack.class_include_extends( ModuleCluster::Define::ClassOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
+	  cluster_stack.class_extend_extends( ModuleCluster::Define::ClassOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
+	  cluster_stack.instance_extend_extends( ModuleCluster::Define::ClassOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
+		return self
+	end
+
+	###############################################################
+	#  class_include_or_instance_extend_also_includes_or_extends  #
+	###############################################################
+
+	def class_include_or_instance_extend_also_includes_or_extends( *includes_or_extends, & runtime_includes_or_extends_block )
+	  cluster_stack.class_include_includes( ModuleCluster::Define::ClassOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
+	  cluster_stack.instance_extend_extends( ModuleCluster::Define::ClassOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
+		return self
+	end
+	
+	###################################################
+	#  class_include_or_instance_extend_also_extends  #
+	###################################################
+	
+	def class_include_or_instance_extend_also_extends( *extends, & runtime_extends_block )
+	  cluster_stack.class_include_extends( ModuleCluster::Define::ClassOrInstanceCluster, __method__, extends, runtime_extends_block )
+	  cluster_stack.instance_extend_extends( ModuleCluster::Define::ClassOrInstanceCluster, __method__, extends, runtime_extends_block )
+		return self
+	end
+	
+	###########################################
+	#  class_or_instance_extend_also_extends  #
+	###########################################
+
+	def class_or_instance_extend_also_extends( *extends, & runtime_extends_block )
+	  cluster_stack.class_extend_extends( ModuleCluster::Define::ClassOrInstanceCluster, __method__, extends, runtime_extends_block )
+	  cluster_stack.instance_extend_extends( ModuleCluster::Define::ClassOrInstanceCluster, __method__, extends, runtime_extends_block )
+		return self
+	end
+
+	#############################################################################
+	#  class_include_or_extend_or_instance_extend_prepends_includes_or_extends  #
+	#############################################################################
+	
+	def class_include_or_extend_or_instance_extend_prepends_includes_or_extends( *includes_or_extends, & runtime_includes_or_extends_block )
+	  cluster_stack.class_include_prepends_includes( ModuleCluster::Define::ClassOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
+	  cluster_stack.class_extend_prepends_extends( ModuleCluster::Define::ClassOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
+	  cluster_stack.instance_extend_prepends_extends( ModuleCluster::Define::ClassOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
+		return self
+	end
+	
+	###################################################################
+	#  class_include_or_instance_extend_prepends_includes_or_extends  #
+	###################################################################
+
+	def class_include_or_instance_extend_prepends_includes_or_extends( *includes_or_extends, & runtime_includes_or_extends_block )
+	  cluster_stack.class_include_prepends_includes( ModuleCluster::Define::ClassOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
+	  cluster_stack.instance_extend_prepends_extends( ModuleCluster::Define::ClassOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
+		return self
+	end
+
+	#################################################################
+	#  class_include_or_extend_or_instance_extend_prepends_extends  #
+	#################################################################
+	
+	def class_include_or_extend_or_instance_extend_prepends_extends( *includes_or_extends, & runtime_includes_or_extends_block )
+	  cluster_stack.class_include_prepends_includes( ModuleCluster::Define::ClassOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
+	  cluster_stack.instance_extend_prepends_extends( ModuleCluster::Define::ClassOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
+		return self
+	end
+	
+	#######################################################
+	#  class_include_or_instance_extend_prepends_extends  #
+	#######################################################
+	
+	def class_include_or_instance_extend_prepends_extends( *extends, & runtime_extends_block )
+	  cluster_stack.class_include_prepends_extends( ModuleCluster::Define::ClassOrInstanceCluster, __method__, extends, runtime_extends_block )
+	  cluster_stack.instance_extend_prepends_extends( ModuleCluster::Define::ClassOrInstanceCluster, __method__, extends, runtime_extends_block )
+		return self
+	end
+
+	###############################################
+	#  class_or_instance_extend_prepends_extends  #
+	###############################################
+
+	def class_or_instance_extend_prepends_extends( *extends, & runtime_extends_block )
+	  cluster_stack.class_extend_prepends_extends( ModuleCluster::Define::ClassOrInstanceCluster, __method__, extends, runtime_extends_block )
+	  cluster_stack.instance_extend_prepends_extends( ModuleCluster::Define::ClassOrInstanceCluster, __method__, extends, runtime_extends_block )
+		return self
+	end
+
+end

data/lib/module-cluster/ModuleCluster/Define/Cluster.rb

@@ -1,7 +1,7 @@
 
 module ModuleCluster::Define::Cluster
 
-  include ModuleCluster::Define::ClusterStack
+  include ModuleCluster::CascadeFeatures::ClusterStack
   
   extend ModuleCluster::ExtendForCascade
 
@@ -18,17 +18,9 @@ module ModuleCluster::Define::Cluster
   ##########################
 
   def self.should_cascade?( class_or_module )
-    return true
-  end
-  
-  ###########################
-  #  self.perform_cascades  #
-  ###########################
-  
-  def self.perform_cascades( class_or_module, method, modules )
-    # nothing required
+    return false
   end
-  
+
 	###########################
 	#  include_also_includes  #
 	###########################
@@ -52,8 +44,7 @@ module ModuleCluster::Define::Cluster
 	#######################################
 
 	def include_also_includes_and_extends( *includes_and_extends, & runtime_includes_and_extends_block )
-		include_also_includes( *includes_and_extends, & runtime_includes_and_extends_block )
-		include_also_extends( *includes_and_extends, & runtime_includes_and_extends_block )
+	  cluster_stack.include_includes_and_extends( ModuleCluster::Define::Cluster, __method__, includes_and_extends, runtime_includes_and_extends_block )
 		return self
 	end
 
@@ -80,8 +71,7 @@ module ModuleCluster::Define::Cluster
 	######################################
 
 	def extend_also_includes_and_extends( *includes_and_extends, & runtime_includes_and_extends_block )
-		extend_also_includes( *includes_and_extends, & runtime_includes_and_extends_block )
-		extend_also_extends( *includes_and_extends, & runtime_includes_and_extends_block )
+	  cluster_stack.extend_includes_and_extends( ModuleCluster::Define::Cluster, __method__, includes_and_extends, runtime_includes_and_extends_block )
 		return self
 	end
 
@@ -108,8 +98,7 @@ module ModuleCluster::Define::Cluster
 	###########################################
 
 	def include_prepends_includes_and_extends( *includes_and_extends, & runtime_includes_and_extends_block )
-		include_prepends_includes( *includes_and_extends, & runtime_includes_and_extends_block )
-		include_prepends_extends( *includes_and_extends, & runtime_includes_and_extends_block )
+	  cluster_stack.include_prepends_includes_and_extends( ModuleCluster::Define::Cluster, __method__, includes_and_extends, runtime_includes_and_extends_block )
 		return self
 	end
 
@@ -136,8 +125,7 @@ module ModuleCluster::Define::Cluster
 	##########################################
 
 	def extend_prepends_includes_and_extends( *includes_and_extends, & runtime_includes_and_extends_block )
-		extend_prepends_includes( *includes_and_extends, & runtime_includes_and_extends_block )
-		extend_prepends_extends( *includes_and_extends, & runtime_includes_and_extends_block )
+	  cluster_stack.extend_prepends_includes_and_extends( ModuleCluster::Define::Cluster, __method__, includes_and_extends, runtime_includes_and_extends_block )
 		return self
 	end
 	

data/lib/module-cluster/ModuleCluster/Define/ClusterCascades.rb

@@ -1,7 +1,7 @@
 
 module ModuleCluster::Define::ClusterCascades
 
-  include ModuleCluster::Define::ClusterStack
+  include ModuleCluster::CascadeFeatures::ClusterStack
 
   extend ModuleCluster::ExtendForCascade
 
@@ -9,7 +9,7 @@ module ModuleCluster::Define::ClusterCascades
   #  self.should_include_or_extend?  #
   ####################################
 
-  def self.should_include_or_extend?( class_or_module )
+  def self.should_include_or_extend?( hooked_instance )
     return true
   end
 
@@ -17,23 +17,10 @@ module ModuleCluster::Define::ClusterCascades
   #  self.should_cascade?  #
   ##########################
 
-  def self.should_cascade?( class_or_module )
+  def self.should_cascade?( hooked_instance )
     return true
   end
 
-  ###########################
-  #  self.perform_cascades  #
-  ###########################
-  
-  def self.perform_cascades( class_or_module, method, modules )
-    class_or_module.instance_eval do
-      unless is_a?( Class )
-        extend ModuleCluster::Define::ClusterCascades
-        __send__( method, *modules )
-      end
-    end
-  end
-
 	###############################
 	#  include_cascades_includes  #
 	###############################
@@ -57,8 +44,7 @@ module ModuleCluster::Define::ClusterCascades
 	###########################################
 
 	def include_cascades_includes_and_extends( *includes_and_extends, & runtime_includes_and_extends_block )
-		include_cascades_includes( *includes_and_extends, & runtime_includes_and_extends_block )
-		include_cascades_extends( *includes_and_extends, & runtime_includes_and_extends_block )
+	  cluster_stack.include_includes_and_extends( ModuleCluster::Define::ClusterCascades, __method__, includes_and_extends, runtime_includes_and_extends_block )
 		return self
 	end
 
@@ -85,8 +71,7 @@ module ModuleCluster::Define::ClusterCascades
 	##########################################
 
 	def extend_cascades_includes_and_extends( *includes_and_extends, & runtime_includes_and_extends_block )
-		extend_cascades_includes( *includes_and_extends, & runtime_includes_and_extends_block )
-		extend_cascades_extends( *includes_and_extends, & runtime_includes_and_extends_block )
+	  cluster_stack.extend_includes_and_extends( ModuleCluster::Define::ClusterCascades, __method__, includes_and_extends, runtime_includes_and_extends_block )
 		return self
 	end
 

data/lib/module-cluster/ModuleCluster/Define/ClusterCascadesToClass.rb

@@ -1,7 +1,7 @@
 
 module ModuleCluster::Define::ClusterCascadesToClass
 
-  include ModuleCluster::Define::ClusterStack
+  include ModuleCluster::CascadeFeatures::ClusterStack
 
   extend ModuleCluster::ExtendForCascade
 
@@ -9,29 +9,16 @@ module ModuleCluster::Define::ClusterCascadesToClass
   #  self.should_include_or_extend?  #
   ####################################
 
-  def self.should_include_or_extend?( class_or_module )
-    return class_or_module.is_a?( Class )
+  def self.should_include_or_extend?( hooked_instance )
+    return hooked_instance.is_a?( Class )
   end
 
   ##########################
   #  self.should_cascade?  #
   ##########################
 
-  def self.should_cascade?( class_or_module )
-    return ! class_or_module.is_a?( Class )
-  end
-
-  ###########################
-  #  self.perform_cascades  #
-  ###########################
-  
-  def self.perform_cascades( class_or_module, method, modules )
-    class_or_module.instance_eval do
-      unless is_a?( Class )
-        extend ModuleCluster::Define::ClusterCascadesToClass
-        __send__( method, *modules )
-      end
-    end
+  def self.should_cascade?( hooked_instance )
+    return hooked_instance.is_a?( Module ) && ! hooked_instance.is_a?( Class )
   end
 
 	########################################
@@ -57,8 +44,7 @@ module ModuleCluster::Define::ClusterCascadesToClass
 	####################################################
 
 	def include_cascades_includes_and_extends_to_class( *includes_and_extends, & runtime_includes_and_extends_block )
-		include_cascades_includes_to_class( *includes_and_extends, & runtime_includes_and_extends_block )
-		include_cascades_extends_to_class( *includes_and_extends, & runtime_includes_and_extends_block )
+	  cluster_stack.include_includes_and_extends( ModuleCluster::Define::ClusterCascadesToClass, __method__, includes_and_extends, runtime_includes_and_extends_block )
 		return self
 	end
 
@@ -85,8 +71,7 @@ module ModuleCluster::Define::ClusterCascadesToClass
 	###################################################
 
 	def extend_cascades_includes_and_extends_to_class( *includes_and_extends, & runtime_includes_and_extends_block )
-		extend_cascades_includes_to_class( *includes_and_extends, & runtime_includes_and_extends_block )
-		extend_cascades_extends_to_class( *includes_and_extends, & runtime_includes_and_extends_block )
+	  cluster_stack.extend_includes_and_extends( ModuleCluster::Define::ClusterCascadesToClass, __method__, includes_and_extends, runtime_includes_and_extends_block )
 		return self
 	end
 
@@ -113,8 +98,7 @@ module ModuleCluster::Define::ClusterCascadesToClass
 	###############################################################
 
 	def include_cascades_to_class_prepending_includes_and_extends( *includes_and_extends, & runtime_includes_and_extends_block )
-		include_cascades_to_class_prepending_includes( *includes_and_extends, & runtime_includes_and_extends_block )
-		include_cascades_to_class_prepending_extends( *includes_and_extends, & runtime_includes_and_extends_block )
+	  cluster_stack.include_prepends_includes_and_extends( ModuleCluster::Define::ClusterCascadesToClass, __method__, includes_and_extends, runtime_includes_and_extends_block )
 		return self
 	end
 
@@ -141,8 +125,7 @@ module ModuleCluster::Define::ClusterCascadesToClass
 	##############################################################
 
 	def extend_cascades_to_class_prepending_includes_and_extends( *includes_and_extends, & runtime_includes_and_extends_block )
-		extend_cascades_to_class_prepending_includes( *includes_and_extends, & runtime_includes_and_extends_block )
-		extend_cascades_to_class_prepending_extends( *includes_and_extends, & runtime_includes_and_extends_block )
+	  cluster_stack.extend_prepends_includes_and_extends( ModuleCluster::Define::ClusterCascadesToClass, __method__, includes_and_extends, runtime_includes_and_extends_block )
 		return self
 	end
 

data/lib/module-cluster/ModuleCluster/Define/ClusterCascadesToModule.rb

@@ -1,7 +1,7 @@
 
 module ModuleCluster::Define::ClusterCascadesToModule
 
-  include ModuleCluster::Define::ClusterStack
+  include ModuleCluster::CascadeFeatures::ClusterStack
 
   extend ModuleCluster::ExtendForCascade
 
@@ -9,29 +9,16 @@ module ModuleCluster::Define::ClusterCascadesToModule
   #  self.should_include_or_extend?  #
   ####################################
 
-  def self.should_include_or_extend?( class_or_module )
-    return ! class_or_module.is_a?( Class )
+  def self.should_include_or_extend?( hooked_instance )
+    return hooked_instance.is_a?( Module ) && ! hooked_instance.is_a?( Class )
   end
 
   ##########################
   #  self.should_cascade?  #
   ##########################
 
-  def self.should_cascade?( class_or_module )
-    return ! class_or_module.is_a?( Class )
-  end
-
-  ###########################
-  #  self.perform_cascades  #
-  ###########################
-  
-  def self.perform_cascades( class_or_module, method, modules )
-    class_or_module.instance_eval do
-      unless is_a?( Class )
-        extend ModuleCluster::Define::ClusterCascadesToModule
-        __send__( method, *modules )
-      end
-    end
+  def self.should_cascade?( hooked_instance )
+    return hooked_instance.is_a?( Module ) && ! hooked_instance.is_a?( Class )
   end
   
 	#########################################
@@ -57,8 +44,7 @@ module ModuleCluster::Define::ClusterCascadesToModule
 	#####################################################
 
 	def include_cascades_includes_and_extends_to_module( *includes_and_extends, & runtime_includes_and_extends_block )
-		include_cascades_includes_to_module( *includes_and_extends, & runtime_includes_and_extends_block )
-		include_cascades_extends_to_module( *includes_and_extends, & runtime_includes_and_extends_block )
+	  cluster_stack.include_prepends_includes_and_extends( ModuleCluster::Define::ClusterCascadesToModule, __method__, includes_and_extends, runtime_includes_and_extends_block )
 		return self
 	end
 
@@ -85,8 +71,7 @@ module ModuleCluster::Define::ClusterCascadesToModule
 	####################################################
 
 	def extend_cascades_includes_and_extends_to_module( *includes_and_extends, & runtime_includes_and_extends_block )
-		extend_cascades_includes_to_module( *includes_and_extends, & runtime_includes_and_extends_block )
-		extend_cascades_extends_to_module( *includes_and_extends, & runtime_includes_and_extends_block )
+	  cluster_stack.extend_prepends_includes_and_extends( ModuleCluster::Define::ClusterCascadesToModule, __method__, includes_and_extends, runtime_includes_and_extends_block )
 		return self
 	end
 
@@ -113,8 +98,7 @@ module ModuleCluster::Define::ClusterCascadesToModule
 	################################################################
 
 	def include_cascades_to_module_prepending_includes_and_extends( *includes_and_extends, & runtime_includes_and_extends_block )
-		include_cascades_to_module_prepending_includes( *includes_and_extends, & runtime_includes_and_extends_block )
-		include_cascades_to_module_prepending_extends( *includes_and_extends, & runtime_includes_and_extends_block )
+	  cluster_stack.include_prepends_includes_and_extends( ModuleCluster::Define::ClusterCascadesToModule, __method__, includes_and_extends, runtime_includes_and_extends_block )
 		return self
 	end
 
@@ -141,8 +125,7 @@ module ModuleCluster::Define::ClusterCascadesToModule
 	###############################################################
 
 	def extend_cascades_to_module_prepending_includes_and_extends( *includes_and_extends, & runtime_includes_and_extends_block )
-		extend_cascades_to_module_prepending_includes( *includes_and_extends, & runtime_includes_and_extends_block )
-		extend_cascades_to_module_prepending_extends( *includes_and_extends, & runtime_includes_and_extends_block )
+	  cluster_stack.extend_prepends_includes_and_extends( ModuleCluster::Define::ClusterCascadesToModule, __method__, includes_and_extends, runtime_includes_and_extends_block )
 		return self
 	end
 

data/lib/module-cluster/ModuleCluster/Define/InstanceCluster.rb

@@ -0,0 +1,46 @@
+
+module ModuleCluster::Define::InstanceCluster
+
+  include ModuleCluster::CascadeFeatures::ClusterStack
+  
+  extend ModuleCluster::ExtendForCascade
+
+  ####################################
+  #  self.should_include_or_extend?  #
+  ####################################
+
+  def self.should_include_or_extend?( hooked_instance )
+    should_include_or_extend = false
+    unless hooked_instance.is_a?( Module )
+      should_include_or_extend = true
+    end
+    return should_include_or_extend
+  end
+
+  ##########################
+  #  self.should_cascade?  #
+  ##########################
+
+  def self.should_cascade?( hooked_instance )
+    return false
+  end
+	
+	##################################
+	#  instance_extend_also_extends  #
+	##################################
+	
+	def instance_extend_also_extends( *extends, & runtime_extends_block )
+	  cluster_stack.instance_extend_extends( ModuleCluster::Define::Cluster, __method__, extends, runtime_extends_block )
+		return self
+	end
+	
+	######################################
+	#  instance_extend_prepends_extends  #
+	######################################
+	
+	def instance_extend_prepends_extends( *extends, & runtime_extends_block )
+	  cluster_stack.instance_extend_prepends_extends( ModuleCluster::Define::Cluster, __method__, extends, runtime_extends_block )
+		return self
+	end
+	
+end