module-cluster 1.1.1 → 1.2.0

data/lib/module-cluster/ModuleCluster.rb

@@ -1,126 +1,10 @@
 
 module ModuleCluster
 
-	############################
-	#  define_module_included  #
-	############################
+  include ModuleCluster::Define::ModuleCluster
+  include ModuleCluster::Define::ModuleClusterCascades
+  include ModuleCluster::Define::ModuleClusterCascadesToClass
 
-	def define_module_included( & include_extend_block )
-		inclusion_array, extension_array = yield_for_includes_extends( Array::ClassOrModule.new, Array::ClassOrModule.new, include_extend_block )
-		ModuleCluster::IncludeSupport.add_includes_for_class_or_module( self, inclusion_array )
-		ModuleCluster::IncludeSupport.add_extends_for_class_or_module( self, extension_array )
-		extend ModuleCluster::IncludeSupport
-		return self
-	end
-
-	############################
-	#  define_module_extended  #
-	############################
-	
-	def define_module_extended( & include_extend_block )
-		inclusion_array, extension_array = yield_for_includes_extends( Array::ClassOrModule.new, Array::ClassOrModule.new, include_extend_block )
-		ModuleCluster::ExtendSupport.add_includes_for_class_or_module( self, inclusion_array )
-		ModuleCluster::ExtendSupport.add_extends_for_class_or_module( self, extension_array )
-		extend ModuleCluster::ExtendSupport
-		return self
-	end
-	
-	###########################
-	#  define_module_cluster  #
-	###########################
-
-	def define_module_cluster( & include_extend_block )
-		define_module_included( & include_extend_block )
-		define_module_extended( & include_extend_block )
-		return self
-	end
-
-	#####################################
-	#  define_module_included_cascades  #
-	#####################################
-
-	def define_module_included_cascades( & include_extend_block )
-		# any time we are included or extended in a module we want to add cascading extends:
-		# * to the module cascading includes
-		# any time we are included in a class we want to add cascading extends
-		# * to the class
-		inclusion_array, extension_array = yield_for_includes_extends( Array::CascadeToClassOrModule.new, Array::CascadeToClassOrModule.new, include_extend_block )
-		ModuleCluster::IncludeSupport.add_cascading_includes_for_class_or_module( self, inclusion_array )
-		ModuleCluster::IncludeSupport.add_cascading_extends_for_class_or_module( self, extension_array )
-		extend ModuleCluster::IncludeSupport
-		return inclusion_array, extension_array
-	end
-	
-	#####################################
-	#  define_module_extended_cascades  #
-	#####################################
-
-	def define_module_extended_cascades( & include_extend_block )
-		# any time we are included or extended in a module we want to add cascading extends:
-		# * to the module cascading extends
-		# any time we are extended in a class we want to add cascading extends
-		# * to the class
-		inclusion_array, extension_array = yield_for_includes_extends( Array::CascadeToClassOrModule.new, Array::CascadeToClassOrModule.new, include_extend_block )
-		ModuleCluster::ExtendSupport.add_cascading_includes_for_class_or_module( self, inclusion_array )
-		ModuleCluster::ExtendSupport.add_cascading_extends_for_class_or_module( self, extension_array )
-		extend ModuleCluster::ExtendSupport
-		return inclusion_array, extension_array
-	end
-	
-	####################################
-	#  define_module_cluster_cascades  #
-	####################################
-
-	def define_module_cluster_cascades( & include_extend_block )
-		include_includes, include_extends = define_module_included_cascades( & include_extend_block )
-		extend_includes, extend_extends = define_module_extended_cascades( & include_extend_block )
-		ModuleCluster::IncludeSupport.set_as_cluster( self, include_includes, include_extends )
-		ModuleCluster::ExtendSupport.set_as_cluster( self, extend_includes, extend_extends )
-		return self
-	end
-
-	##############################################
-	#  define_module_included_cascades_to_class  #
-	##############################################
-
-	def define_module_included_cascades_to_class( & include_extend_block )
-		# any time we are included or extended in a module we want to add cascading extends:
-		# * to the module cascading includes
-		# any time we are included in a class we want to add cascading extends
-		# * to the class
-		inclusion_array, extension_array = yield_for_includes_extends( Array::CascadeToClass.new, Array::CascadeToClass.new, include_extend_block )
-		ModuleCluster::IncludeSupport.add_cascading_includes_for_class( self, inclusion_array )
-		ModuleCluster::IncludeSupport.add_cascading_extends_for_class( self, extension_array )
-		extend ModuleCluster::IncludeSupport
-		return inclusion_array, extension_array
-	end
-	
-	##############################################
-	#  define_module_extended_cascades_to_class  #
-	##############################################
-
-	def define_module_extended_cascades_to_class( & include_extend_block )
-		# any time we are included or extended in a module we want to add cascading extends:
-		# * to the module cascading extends
-		# any time we are extended in a class we want to add cascading extends
-		# * to the class
-		inclusion_array, extension_array = yield_for_includes_extends( Array::CascadeToClass.new, Array::CascadeToClass.new, include_extend_block )
-		ModuleCluster::ExtendSupport.add_cascading_includes_for_class( self, inclusion_array )
-		ModuleCluster::ExtendSupport.add_cascading_extends_for_class( self, extension_array )
-		extend ModuleCluster::ExtendSupport
-		return inclusion_array, extension_array
-	end
-	
-	#############################################
-	#  define_module_cluster_cascades_to_class  #
-	#############################################
-
-	def define_module_cluster_cascades_to_class( & include_extend_block )
-		include_includes, include_extends = define_module_included_cascades_to_class( & include_extend_block )
-		extend_includes, extend_extends = define_module_extended_cascades_to_class( & include_extend_block )
-		ModuleCluster::IncludeSupport.set_as_cluster( self, include_includes, include_extends )
-		ModuleCluster::ExtendSupport.set_as_cluster( self, extend_includes, extend_extends )
-		return self
-	end
+  include ModuleCluster::Define::Deprecated
 	
 end

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

@@ -0,0 +1,40 @@
+
+module ModuleCluster::Define::Deprecated
+
+  def define_module_included
+    raise NoMethodError, 'This method has been replaced by :include_also_includes and :include_also_extends.'
+  end
+
+  def define_module_extended
+    raise NoMethodError, 'This method has been replaced by :extend_also_includes and :extend_also_extends.'
+  end
+
+  def define_module_cluster
+    raise NoMethodError, 'This method has been replaced by :include_also_includes_and_extends and :extend_also_includes_and_extends.'
+  end
+
+  def define_module_included_cascades
+    raise NoMethodError, 'This method has been replaced by :include_cascades_includes and :include_cascades_extends.'
+  end
+
+  def define_module_extended_cascades
+    raise NoMethodError, 'This method has been replaced by :extend_cascades_includes and :extend_cascades_extends.'
+  end
+
+  def define_module_cluster_cascades
+    raise NoMethodError, 'This method has been replaced by :include_cascades_includes_and_extends and :extend_cascades_includes_and_extends.'
+  end
+
+  def define_module_included_cascades_to_class
+    raise NoMethodError, 'This method has been replaced by :include_cascades_includes_to_class and :include_cascades_extends_to_class.'
+  end
+
+  def define_module_extended_cascades_to_class
+    raise NoMethodError, 'This method has been replaced by :extend_cascades_includes_to_class and :extend_cascades_extends_to_class.'
+  end
+
+  def define_module_cluster_cascades_to_class
+    raise NoMethodError, 'This method has been replaced by :include_cascades_includes_and_extends_to_class and :extend_cascades_includes_and_extends_to_class.'
+  end
+
+end

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

@@ -0,0 +1,140 @@
+
+module ModuleCluster::Define::ModuleCluster
+
+	###########################
+	#  include_also_includes  #
+	###########################
+
+	def include_also_includes( *includes )
+	  includes_module = anonymous_module_included( :include, *includes )
+    clusterstack_module do
+      include( includes_module )
+    end
+		return self
+	end
+	
+	##########################
+	#  include_also_extends  #
+	##########################
+	
+	def include_also_extends( *extends )
+	  extends_module = anonymous_module_included( :extend, *extends )
+    clusterstack_module do
+      include( extends_module )
+    end
+		return self
+	end
+	
+	#######################################
+	#  include_also_includes_and_extends  #
+	#######################################
+
+	def include_also_includes_and_extends( *includes_and_extends )
+		include_also_includes( *includes_and_extends )
+		include_also_extends( *includes_and_extends )
+		return self
+	end
+
+	##########################
+	#  extend_also_includes  #
+	##########################
+
+	def extend_also_includes( *includes )
+	  includes_module = anonymous_module_extended( :include, *includes )
+    clusterstack_module do
+      include( includes_module )
+    end
+		return self
+	end
+	
+	#########################
+	#  extend_also_extends  #
+	#########################
+	
+	def extend_also_extends( *extends )
+	  extends_module = anonymous_module_extended( :extend, *extends )
+    clusterstack_module do
+      include( extends_module )
+    end
+		return self
+	end
+	
+	######################################
+	#  extend_also_includes_and_extends  #
+	######################################
+
+	def extend_also_includes_and_extends( *includes_and_extends )
+		extend_also_includes( *includes_and_extends )
+		extend_also_extends( *includes_and_extends )
+		return self
+	end
+
+	###############################
+	#  include_prepends_includes  #
+	###############################
+
+	def include_prepends_includes( *includes )
+	  includes_module = anonymous_module_append_features( :include, *includes )
+    clusterstack_module do
+      include( includes_module )
+    end
+		return self
+	end
+
+	##############################
+	#  include_prepends_extends  #
+	##############################
+	
+	def include_prepends_extends( *extends )
+	  extends_module = anonymous_module_append_features( :extend, *extends )
+    clusterstack_module do
+      include( extends_module )
+    end
+		return self
+	end
+	
+	###########################################
+	#  include_prepends_includes_and_extends  #
+	###########################################
+
+	def include_prepends_includes_and_extends( *includes_and_extends )
+		include_prepends_includes( *includes_and_extends )
+		include_prepends_extends( *includes_and_extends )
+		return self
+	end
+
+	##############################
+	#  extend_prepends_includes  #
+	##############################
+
+	def extend_prepends_includes( *includes )
+	  includes_module = anonymous_module_extend_object( :include, *includes )
+    clusterstack_module do
+      include( includes_module )
+    end
+		return self
+	end
+
+	#############################
+	#  extend_prepends_extends  #
+	#############################
+	
+	def extend_prepends_extends( *extends )
+	  extends_module = anonymous_module_extend_object( :extend, *extends )
+    clusterstack_module do
+      include( extends_module )
+    end
+		return self
+	end
+	
+	##########################################
+	#  extend_prepends_includes_and_extends  #
+	##########################################
+
+	def extend_prepends_includes_and_extends( *includes_and_extends )
+		extend_prepends_includes( *includes_and_extends )
+		extend_prepends_extends( *includes_and_extends )
+		return self
+	end
+
+end

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

@@ -0,0 +1,140 @@
+
+module ModuleCluster::Define::ModuleClusterCascades
+
+	###############################
+	#  include_cascades_includes  #
+	###############################
+
+	def include_cascades_includes( *includes )
+	  includes_module = anonymous_module_cascade_included( :include, *includes )
+    clusterstack_module do
+      include( includes_module )
+    end
+		return self
+	end
+	
+	##############################
+	#  include_cascades_extends  #
+	##############################
+
+	def include_cascades_extends( *extends )
+	  extends_module = anonymous_module_cascade_included( :extend, *extends )
+    clusterstack_module do
+      include( extends_module )
+    end
+		return self
+	end
+	
+	###########################################
+	#  include_cascades_includes_and_extends  #
+	###########################################
+
+	def include_cascades_includes_and_extends( *includes_and_extends )
+		include_cascades_includes( *includes_and_extends )
+		include_cascades_extends( *includes_and_extends )
+		return self
+	end
+
+	##############################
+	#  extend_cascades_includes  #
+	##############################
+
+	def extend_cascades_includes( *includes )
+	  includes_module = anonymous_module_cascade_extended( :include, *includes )
+    clusterstack_module do
+      include( includes_module )
+    end
+		return self
+	end
+	
+	#############################
+	#  extend_cascades_extends  #
+	#############################
+
+	def extend_cascades_extends( *extends )
+	  extends_module = anonymous_module_cascade_extended( :extend, *extends )
+    clusterstack_module do
+      include( extends_module )
+    end
+		return self
+	end
+	
+	##########################################
+	#  extend_cascades_includes_and_extends  #
+	##########################################
+
+	def extend_cascades_includes_and_extends( *includes_and_extends )
+		extend_cascades_includes( *includes_and_extends )
+		extend_cascades_extends( *includes_and_extends )
+		return self
+	end
+
+	##########################################
+	#  include_cascades_prepending_includes  #
+	##########################################
+
+	def include_cascades_prepending_includes( *includes )
+	  includes_module = anonymous_module_cascade_append_features( :include, *includes )
+    clusterstack_module do
+      include( includes_module )
+    end
+		return self
+	end
+	
+	#########################################
+	#  include_cascades_prepending_extends  #
+	#########################################
+
+	def include_cascades_prepending_extends( *extends )
+	  extends_module = anonymous_module_cascade_append_features( :extend, *extends )
+    clusterstack_module do
+      include( extends_module )
+    end
+		return self
+	end
+	
+	######################################################
+	#  include_cascades_prepending_includes_and_extends  #
+	######################################################
+
+	def include_cascades_prepending_includes_and_extends( *includes_and_extends )
+		include_cascades_prepending_includes( *includes_and_extends )
+		include_cascades_prepending_extends( *includes_and_extends )
+		return self
+	end
+
+	#########################################
+	#  extend_cascades_prepending_includes  #
+	#########################################
+
+	def extend_cascades_prepending_includes( *includes )
+	  includes_module = anonymous_module_cascade_extend_object( :include, *includes )
+    clusterstack_module do
+      include( includes_module )
+    end
+		return self
+	end
+	
+	########################################
+	#  extend_cascades_prepending_extends  #
+	########################################
+
+	def extend_cascades_prepending_extends( *extends )
+	  extends_module = anonymous_module_cascade_extend_object( :extend, *extends )
+    clusterstack_module do
+      include( extends_module )
+    end
+		return self
+	end
+	
+	#####################################################
+	#  extend_cascades_prepending_includes_and_extends  #
+	#####################################################
+
+	def extend_cascades_prepending_includes_and_extends( *includes_and_extends )
+		extend_cascades_prepending_includes( *includes_and_extends )
+		extend_cascades_prepending_extends( *includes_and_extends )
+		return self
+	end
+
+end