module-cluster 1.3.2 → 1.3.3

data/README.md

@@ -35,6 +35,25 @@ module SomeModule
 end
 ```
 
+Additionally, all methods accept a block that returns one or more modules; the modules will be added *after* any modules specified in the parameters:
+
+```ruby
+module SomeModule
+  include ModuleCluster
+  include_also_includes( SomeOtherModule ) do
+    AnotherModule
+  end
+end
+```
+
+Blocks can be used to return dynamically-determined modules at runtime.
+
+```ruby
+class_or_module.include_or_extend_cascades_prepending_extends do
+  method_that_returns_one_or_more_modules
+end
+```
+
 Calls to the various functions are cumulative and stack in the order called. This permits multiple calls, whether subsequently or otherwise.
 
 # Methods #
@@ -123,6 +142,16 @@ Cascade to module methods (does not cascade to classes):
 * include_or_extend_cascades_to_module_prepending_extends
 * include_or_extend_cascades_to_module_prepending_includes_and_extends
 
+Block methods (used for nesting declarations, for instance to apply cascades only after first module/class):
+
+```ruby
+prepend_module_include do |class_or_module|
+  class_or_module.include_or_extend_cascades_prepending_extends do
+    method_that_returns_one_or_more_modules
+  end
+end
+```
+
 # License #
 
   (The MIT License)

data/README.rdoc

@@ -31,6 +31,21 @@ module SomeModule
   include_also_includes( SomeOtherModule )
 end
 
+Additionally, all methods accept a block that returns one or more modules; the modules will be added *after* any modules specified in the parameters:
+
+module SomeModule
+  include ModuleCluster
+  include_also_includes( SomeOtherModule ) do
+    AnotherModule
+  end
+end
+
+Blocks can be used to return dynamically-determined modules at runtime.
+
+class_or_module.include_or_extend_cascades_prepending_extends do
+  method_that_returns_one_or_more_modules
+end
+
 Calls to the various functions are cumulative and stack in the order called. This permits multiple calls, whether subsequently or otherwise.
 
 == Methods
@@ -119,6 +134,14 @@ Cascade to module methods (does not cascade to classes):
 * include_or_extend_cascades_to_module_prepending_extends
 * include_or_extend_cascades_to_module_prepending_includes_and_extends
 
+Block methods (used for nesting declarations, for instance to apply cascades only after first module/class, or for dynamic declarations):
+
+prepend_module_include do |class_or_module|
+  class_or_module.include_or_extend_cascades_prepending_extends do
+    method_that_returns_one_or_more_modules
+  end
+end
+
 == License
 
   (The MIT License)

data/lib/module-cluster.rb

@@ -1,11 +1,23 @@
 
 module ModuleCluster
   class ClusterStack
+    module Block
+      module Class
+      end
+      module Module
+      end
+    end
   end
   module CascadeFeatures
   end
   module Define
-    module DedoubleAncestors
+    module Block
+      module Class
+      end
+      module Module
+      end
+      module ClassOrModule
+      end
     end
     module ClusterStack
     end
@@ -23,14 +35,24 @@ module ModuleCluster
 end
 
 require_relative 'module-cluster/ModuleCluster/CascadeFeatures.rb'
-require_relative 'module-cluster/ModuleCluster/Define/DedoubleAncestors.rb'
 require_relative 'module-cluster/ModuleCluster/ExtendForCascade.rb'
 require_relative 'module-cluster/ModuleCluster/Define/ClusterStack.rb'
+require_relative 'module-cluster/ModuleCluster/Define/Block/Class.rb'
+require_relative 'module-cluster/ModuleCluster/Define/Block/Module.rb'
+require_relative 'module-cluster/ModuleCluster/Define/Block/ClassOrModule.rb'
+require_relative 'module-cluster/ModuleCluster/Define/Block.rb'
 require_relative 'module-cluster/ModuleCluster/Define/Cluster.rb'
 require_relative 'module-cluster/ModuleCluster/Define/ClusterCascades.rb'
 require_relative 'module-cluster/ModuleCluster/Define/ClusterCascadesToClass.rb'
 require_relative 'module-cluster/ModuleCluster/Define/ClusterCascadesToModule.rb'
 require_relative 'module-cluster/ModuleCluster/Define/Deprecated.rb'
+require_relative 'module-cluster/ModuleCluster/ClusterStack/Includes.rb'
+require_relative 'module-cluster/ModuleCluster/ClusterStack/Extends.rb'
+require_relative 'module-cluster/ModuleCluster/ClusterStack/PrependsIncludes.rb'
+require_relative 'module-cluster/ModuleCluster/ClusterStack/PrependsExtends.rb'
+require_relative 'module-cluster/ModuleCluster/ClusterStack/Block/Class.rb'
+require_relative 'module-cluster/ModuleCluster/ClusterStack/Block/Module.rb'
+require_relative 'module-cluster/ModuleCluster/ClusterStack/Block.rb'
 require_relative 'module-cluster/ModuleCluster/ClusterStack.rb'
 require_relative 'module-cluster/ModuleCluster.rb'
 

data/lib/module-cluster/ModuleCluster.rb

@@ -3,11 +3,12 @@ module ModuleCluster
 	
 	extend ModuleCluster::ExtendForCascade
     
+  include ModuleCluster::Define::Block
   include ModuleCluster::Define::Cluster
   include ModuleCluster::Define::ClusterCascades
   include ModuleCluster::Define::ClusterCascadesToClass
   include ModuleCluster::Define::ClusterCascadesToModule
 
   include ModuleCluster::Define::Deprecated
-		
+
 end

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

@@ -13,58 +13,81 @@ module ModuleCluster::CascadeFeatures
     includes_or_extends = nil
     
     case runtime_includes_or_extends_block.arity
-    when 0
-      includes_or_extends = module_self.instance_eval( & runtime_includes_or_extends_block )
-    else
-      includes_or_extends = module_self.instance_exec( class_or_module, & runtime_includes_or_extends_block )
+      when 0
+        includes_or_extends = module_self.instance_eval( & runtime_includes_or_extends_block )
+      else
+        includes_or_extends = module_self.instance_exec( class_or_module, & runtime_includes_or_extends_block )
     end
-
+    
+    unless includes_or_extends.is_a?( Array )
+      includes_or_extends = [ includes_or_extends ]
+    end
+    
     return includes_or_extends
     
   end
   
-  ############################################
-  #  self.includes_or_extends_for_set_stack  #
-  ############################################
+  #######################################
+  #  self.cascade_struct_for_set_stack  #
+  #######################################
   
-  def self.includes_or_extends_for_set_stack( module_self, class_or_module, set_stack )
+  def self.cascade_struct_for_set_stack( module_self, class_or_module, set_stack )
     
     includes = Array.new
     extends = Array.new
     cascades = Hash.new
     
     set_stack.each do |this_set|
-
-      # get cascades
-      if this_set.dependency_module.should_cascade?( class_or_module )
-        cascades[ this_set.dependency_module ] ||= Hash.new
-        cascades[ this_set.dependency_module ][ this_set.method ] ||= Array.new
-        cascades[ this_set.dependency_module ][ this_set.method ].concat( this_set.modules )            
-      end
-
-      # get runtime block
-      runtime_set = nil
-      if block = this_set.runtime_includes_or_extends_block
-        runtime_set = ModuleCluster::CascadeFeatures.get_runtime_includes_or_extends_from_block( module_self, 
-                                                                                                 class_or_module,
-                                                                                                 this_set.include_or_extend,
-                                                                                                 block )
-      end
       
-      # get includes/extends
-      case this_set.include_or_extend
-        when :include
-          this_set.modules.each do |this_module|
+      if this_set.is_a?( ModuleCluster::ClusterStack::Block::Set )
+        
+        class_or_module.instance_eval do
+          extend( ModuleCluster )
+        end
+        
+        case this_set.runtime_block.arity
+          when 0
+            module_self.instance_eval( & this_set.runtime_block )
+          else
+            module_self.instance_exec( class_or_module, & this_set.runtime_block )
+        end
+        
+      else
+        
+        # get cascades
+        if this_set.dependency_module.should_cascade?( class_or_module )
+          cascades[ this_set.dependency_module ] ||= Hash.new
+          cascades[ this_set.dependency_module ][ this_set.method ] ||= Array.new
+          cascades[ this_set.dependency_module ][ this_set.method ].concat( this_set.modules )            
+        end
+
+        # get runtime block
+        runtime_set = nil
+        if block = this_set.runtime_includes_or_extends_block
+          runtime_set = ModuleCluster::CascadeFeatures.get_runtime_includes_or_extends_from_block( module_self, 
+                                                                                                   class_or_module,
+                                                                                                   this_set.include_or_extend,
+                                                                                                   block )
+          cascades[ this_set.dependency_module ] ||= Hash.new
+          cascades[ this_set.dependency_module ][ this_set.method ] ||= Array.new
+          cascades[ this_set.dependency_module ][ this_set.method ].concat( runtime_set )            
+        end
+        # get includes/extends
+        case this_set.include_or_extend
+          when :include
+            this_set.modules.each do |this_module|
+              if this_set.dependency_module.should_include_or_extend?( class_or_module )
+                includes.concat( this_set.modules )            
+              end
+            end
+            includes.concat( runtime_set ) if runtime_set
+          when :extend
             if this_set.dependency_module.should_include_or_extend?( class_or_module )
-              includes.concat( this_set.modules )            
+              extends.concat( this_set.modules )
             end
-          end
-          includes.concat( runtime_set ) if runtime_set
-        when :extend
-          if this_set.dependency_module.should_include_or_extend?( class_or_module )
-            extends.concat( this_set.modules )
-          end
-          extends.concat( runtime_set ) if runtime_set
+            extends.concat( runtime_set ) if runtime_set
+        end
+      
       end
       
     end
@@ -105,8 +128,8 @@ module ModuleCluster::CascadeFeatures
   #####################
 
   def append_features( class_or_module )
-    
-    cascade_struct = ModuleCluster::CascadeFeatures.includes_or_extends_for_set_stack( self, class_or_module, cluster_stack.cascading_prepending_includes )
+        
+    cascade_struct = ModuleCluster::CascadeFeatures.cascade_struct_for_set_stack( self, class_or_module, cluster_stack.cascading_prepending_includes )
     ModuleCluster::CascadeFeatures.cascade_features( class_or_module, cascade_struct )
     
     super
@@ -121,7 +144,7 @@ module ModuleCluster::CascadeFeatures
 
     super
 
-    cascade_struct = ModuleCluster::CascadeFeatures.includes_or_extends_for_set_stack( self, class_or_module, cluster_stack.cascading_includes )
+    cascade_struct = ModuleCluster::CascadeFeatures.cascade_struct_for_set_stack( self, class_or_module, cluster_stack.cascading_includes )
     ModuleCluster::CascadeFeatures.cascade_features( class_or_module, cascade_struct )
     
   end
@@ -132,7 +155,7 @@ module ModuleCluster::CascadeFeatures
 
   def extend_object( class_or_module )
 
-    cascade_struct = ModuleCluster::CascadeFeatures.includes_or_extends_for_set_stack( self, class_or_module, cluster_stack.cascading_prepending_extends )
+    cascade_struct = ModuleCluster::CascadeFeatures.cascade_struct_for_set_stack( self, class_or_module, cluster_stack.cascading_prepending_extends )
     ModuleCluster::CascadeFeatures.cascade_features( class_or_module, cascade_struct )
     
     super
@@ -147,7 +170,7 @@ module ModuleCluster::CascadeFeatures
 
     super
 
-    cascade_struct = ModuleCluster::CascadeFeatures.includes_or_extends_for_set_stack( self, class_or_module, cluster_stack.cascading_extends )
+    cascade_struct = ModuleCluster::CascadeFeatures.cascade_struct_for_set_stack( self, class_or_module, cluster_stack.cascading_extends )
     ModuleCluster::CascadeFeatures.cascade_features( class_or_module, cascade_struct )
 
   end

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

@@ -3,100 +3,10 @@ class ModuleCluster::ClusterStack
 
   Set = Struct.new( :dependency_module, :method, :include_or_extend, :modules, :runtime_includes_or_extends_block )
 
-  ########################
-  #  cascading_includes  #
-  ########################
-
-  def cascading_includes
-    return @cascading_includes ||= Array.new
-  end
-  
-  #######################
-  #  cascading_extends  #
-  #######################
-
-  def cascading_extends
-    return @cascading_extends ||= Array.new
-  end
-
-  ###################################
-  #  cascading_prepending_includes  #
-  ###################################
-
-  def cascading_prepending_includes
-    return @cascading_prepending_includes ||= Array.new
-  end
-
-  ##################################
-  #  cascading_prepending_extends  #
-  ##################################
-
-  def cascading_prepending_extends
-    return @cascading_prepending_extends ||= Array.new
-  end
-
-  ######################
-  #  include_includes  #
-  ######################
-
-  def include_includes( module_instance, method, includes, runtime_includes_block )
-    cascading_includes.push( Set.new( module_instance, method, :include, includes, runtime_includes_block ) )
-  end
-
-  #####################
-  #  include_extends  #
-  #####################
-  
-  def include_extends( module_instance, method, extends, runtime_extends_block )
-    cascading_includes.push( Set.new( module_instance, method, :extend, extends, runtime_extends_block ) )
-  end
-
-  #####################
-  #  extend_includes  #
-  #####################
+  include ModuleCluster::ClusterStack::Block
+  include ModuleCluster::ClusterStack::Includes
+  include ModuleCluster::ClusterStack::Extends
+  include ModuleCluster::ClusterStack::PrependsIncludes
+  include ModuleCluster::ClusterStack::PrependsExtends
   
-  def extend_includes( module_instance, method, includes, runtime_includes_block )
-    cascading_extends.push( Set.new( module_instance, method, :include, includes, runtime_includes_block ) )
-  end
-  
-  ####################
-  #  extend_extends  #
-  ####################
-
-  def extend_extends( module_instance, method, extends, runtime_extends_block )
-    cascading_extends.push( Set.new( module_instance, method, :extend, extends, runtime_extends_block ) )
-  end
-
-  ###############################
-  #  include_prepends_includes  #
-  ###############################
-  
-  def include_prepends_includes( module_instance, method, includes, runtime_includes_block )
-    cascading_prepending_includes.push( Set.new( module_instance, method, :include, includes, runtime_includes_block ) )
-  end
-
-  ##############################
-  #  include_prepends_extends  #
-  ##############################
-  
-  def include_prepends_extends( module_instance, method, extends, runtime_extends_block )
-    cascading_prepending_includes.push( Set.new( module_instance, method, :extend, extends, runtime_extends_block ) )
-  end
-
-  ##############################
-  #  extend_prepends_includes  #
-  ##############################
-  
-  def extend_prepends_includes( module_instance, method, includes, runtime_includes_block )
-    cascading_prepending_extends.push( Set.new( module_instance, method, :include, includes, runtime_includes_block ) )
-  end
-
-  #############################
-  #  extend_prepends_extends  #
-  #############################
-  
-  def extend_prepends_extends( module_instance, method, extends, runtime_extends_block )
-    cascading_prepending_extends.push( Set.new( module_instance, method, :extend, extends, runtime_extends_block ) )
-  end
-
 end

data/lib/module-cluster/ModuleCluster/ClusterStack/Block.rb

@@ -0,0 +1,9 @@
+
+module ModuleCluster::ClusterStack::Block
+  
+  Set = Struct.new( :runtime_block )
+  
+  include ModuleCluster::ClusterStack::Block::Class
+  include ModuleCluster::ClusterStack::Block::Module
+
+end

data/lib/module-cluster/ModuleCluster/ClusterStack/Block/Class.rb

@@ -0,0 +1,36 @@
+
+module ModuleCluster::ClusterStack::Block::Class
+  
+  ###################
+  #  class_include  #
+  ###################
+
+  def class_include( runtime_block )
+    cascading_includes.push( ModuleCluster::ClusterStack::Block::Set.new( runtime_block ) )
+  end
+
+  ##################
+  #  class_extend  #
+  ##################
+
+  def class_extend( runtime_block )
+    cascading_extends.push( ModuleCluster::ClusterStack::Block::Set.new( runtime_block ) )
+  end
+
+  ###########################
+  #  prepend_class_include  #
+  ###########################
+
+  def prepend_class_include( runtime_block )
+    cascading_prepending_includes.push( ModuleCluster::ClusterStack::Block::Set.new( runtime_block ) )
+  end
+
+  ##########################
+  #  prepend_class_extend  #
+  ##########################
+
+  def prepend_class_extend( runtime_block )
+    cascading_prepending_extends.push( ModuleCluster::ClusterStack::Block::Set.new( runtime_block ) )
+  end
+
+end

data/lib/module-cluster/ModuleCluster/ClusterStack/Block/Module.rb

@@ -0,0 +1,36 @@
+
+module ModuleCluster::ClusterStack::Block::Module
+
+  ####################
+  #  module_include  #
+  ####################
+
+  def module_include( runtime_block )
+    cascading_includes.push( ModuleCluster::ClusterStack::Block::Set.new( runtime_block ) )
+  end
+
+  ###################
+  #  module_extend  #
+  ###################
+
+  def module_extend( runtime_block )
+    cascading_extends.push( ModuleCluster::ClusterStack::Block::Set.new( runtime_block ) )
+  end
+
+  ############################
+  #  prepend_module_include  #
+  ############################
+
+  def prepend_module_include( runtime_block )
+    cascading_prepending_includes.push( ModuleCluster::ClusterStack::Block::Set.new( runtime_block ) )
+  end
+
+  ###########################
+  #  prepend_module_extend  #
+  ###########################
+
+  def prepend_module_extend( runtime_block )
+    cascading_prepending_extends.push( ModuleCluster::ClusterStack::Block::Set.new( runtime_block ) )
+  end
+
+end

data/lib/module-cluster/ModuleCluster/ClusterStack/Extends.rb

@@ -0,0 +1,29 @@
+
+module ModuleCluster::ClusterStack::Extends
+  
+  #######################
+  #  cascading_extends  #
+  #######################
+
+  def cascading_extends
+    return @cascading_extends ||= Array.new
+  end
+
+  #####################
+  #  extend_includes  #
+  #####################
+  
+  def extend_includes( module_instance, method, includes, runtime_includes_block )
+    cascading_extends.push( ModuleCluster::ClusterStack::Set.new( module_instance, method, :include, includes, runtime_includes_block ) )
+  end
+  
+  ####################
+  #  extend_extends  #
+  ####################
+
+  def extend_extends( module_instance, method, extends, runtime_extends_block )
+    cascading_extends.push( ModuleCluster::ClusterStack::Set.new( module_instance, method, :extend, extends, runtime_extends_block ) )
+  end
+
+  
+end

data/lib/module-cluster/ModuleCluster/ClusterStack/Includes.rb

@@ -0,0 +1,28 @@
+
+module ModuleCluster::ClusterStack::Includes
+
+  ########################
+  #  cascading_includes  #
+  ########################
+
+  def cascading_includes
+    return @cascading_includes ||= Array.new
+  end
+
+  ######################
+  #  include_includes  #
+  ######################
+
+  def include_includes( module_instance, method, includes, runtime_includes_block )
+    cascading_includes.push( ModuleCluster::ClusterStack::Set.new( module_instance, method, :include, includes, runtime_includes_block ) )
+  end
+
+  #####################
+  #  include_extends  #
+  #####################
+  
+  def include_extends( module_instance, method, extends, runtime_extends_block )
+    cascading_includes.push( ModuleCluster::ClusterStack::Set.new( module_instance, method, :extend, extends, runtime_extends_block ) )
+  end
+  
+end

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

@@ -0,0 +1,28 @@
+
+module ModuleCluster::ClusterStack::PrependsExtends
+  
+  ##################################
+  #  cascading_prepending_extends  #
+  ##################################
+
+  def cascading_prepending_extends
+    return @cascading_prepending_extends ||= Array.new
+  end
+  
+  ##############################
+  #  extend_prepends_includes  #
+  ##############################
+  
+  def extend_prepends_includes( module_instance, method, includes, runtime_includes_block )
+    cascading_prepending_extends.push( ModuleCluster::ClusterStack::Set.new( module_instance, method, :include, includes, runtime_includes_block ) )
+  end
+
+  #############################
+  #  extend_prepends_extends  #
+  #############################
+  
+  def extend_prepends_extends( module_instance, method, extends, runtime_extends_block )
+    cascading_prepending_extends.push( ModuleCluster::ClusterStack::Set.new( module_instance, method, :extend, extends, runtime_extends_block ) )
+  end
+  
+end

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

@@ -0,0 +1,28 @@
+
+module ModuleCluster::ClusterStack::PrependsIncludes
+  
+  ###################################
+  #  cascading_prepending_includes  #
+  ###################################
+
+  def cascading_prepending_includes
+    return @cascading_prepending_includes ||= Array.new
+  end
+  
+  ###############################
+  #  include_prepends_includes  #
+  ###############################
+  
+  def include_prepends_includes( module_instance, method, includes, runtime_includes_block )
+    cascading_prepending_includes.push( ModuleCluster::ClusterStack::Set.new( module_instance, method, :include, includes, runtime_includes_block ) )
+  end
+
+  ##############################
+  #  include_prepends_extends  #
+  ##############################
+  
+  def include_prepends_extends( module_instance, method, extends, runtime_extends_block )
+    cascading_prepending_includes.push( ModuleCluster::ClusterStack::Set.new( module_instance, method, :extend, extends, runtime_extends_block ) )
+  end
+  
+end

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

@@ -0,0 +1,6 @@
+
+module ModuleCluster::Define::Block
+  
+  include ModuleCluster::Define::Block::ClassOrModule
+  
+end

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

@@ -0,0 +1,54 @@
+
+module ModuleCluster::Define::Block::Class
+  
+  ###################
+  #  class_include  #
+  ###################
+
+  def class_include( & runtime_block )
+    cluster_stack.class_include( runtime_block )
+  end
+
+  ##################
+  #  class_extend  #
+  ##################
+
+  def class_extend( & runtime_block )
+    cluster_stack.class_extend( runtime_block )
+  end
+
+  #############################
+  #  class_include_or_extend  #
+  #############################
+
+  def class_include_or_extend( & runtime_block )
+    class_include( & runtime_block )
+    class_extend( & runtime_block )
+  end
+
+  ###########################
+  #  prepend_class_include  #
+  ###########################
+
+  def prepend_class_include( & runtime_block )
+    cluster_stack.prepend_class_include( runtime_block )
+  end
+
+  ##########################
+  #  prepend_class_extend  #
+  ##########################
+
+  def prepend_class_extend( & runtime_block )
+    cluster_stack.prepend_class_extend( runtime_block )
+  end
+
+  #####################################
+  #  prepend_class_include_or_extend  #
+  #####################################
+
+  def prepend_class_include_or_extend( & runtime_block )
+    prepend_class_include( & runtime_block )
+    prepend_class_extend( & runtime_block )
+  end
+	
+end

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

@@ -0,0 +1,61 @@
+
+module ModuleCluster::Define::Block::ClassOrModule
+  
+  include ModuleCluster::Define::Block::Class
+  include ModuleCluster::Define::Block::Module
+  
+  #############################
+  #  class_or_module_include  #
+  #############################
+
+  def class_or_module_include( & runtime_block )
+    class_include( & runtime_block )
+    module_include( & runtime_block )
+  end
+
+  ############################
+  #  class_or_module_extend  #
+  ############################
+
+  def class_or_module_extend( & runtime_block )
+    class_extend( & runtime_block )
+    module_extend( & runtime_block )
+  end
+
+  #######################################
+  #  class_or_module_include_or_extend  #
+  #######################################
+
+  def class_or_module_include_or_extend( & runtime_block )
+    class_or_module_include( & runtime_block )
+    class_or_module_extend( & runtime_block )
+  end
+
+  #####################################
+  #  prepend_class_or_module_include  #
+  #####################################
+
+  def prepend_class_or_module_include( & runtime_block )
+    prepend_class_include( & runtime_block )
+    prepend_module_include( & runtime_block )
+  end
+
+  ####################################
+  #  prepend_class_or_module_extend  #
+  ####################################
+
+  def prepend_class_or_module_extend( & runtime_block )
+    prepend_class_extend( & runtime_block )
+    prepend_module_extend( & runtime_block )
+  end
+
+  ###############################################
+  #  prepend_class_or_module_include_or_extend  #
+  ###############################################
+
+  def prepend_class_or_module_include_or_extend( & runtime_block )
+    prepend_class_or_module_include( & runtime_block )
+    prepend_class_or_module_extend( & runtime_block )
+  end
+  
+end

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

@@ -0,0 +1,54 @@
+
+module ModuleCluster::Define::Block::Module
+  
+  ####################
+  #  module_include  #
+  ####################
+
+  def module_include( & runtime_block )
+    cluster_stack.module_include( runtime_block )
+  end
+
+  ###################
+  #  module_extend  #
+  ###################
+
+  def module_extend( & runtime_block )
+    cluster_stack.module_extend( runtime_block )
+  end
+
+  ##############################
+  #  module_include_or_extend  #
+  ##############################
+
+  def module_include_or_extend( & runtime_block )
+    module_include( & runtime_block )
+    module_extend( & runtime_block )
+  end
+
+  ############################
+  #  prepend_module_include  #
+  ############################
+
+  def prepend_module_include( & runtime_block )
+    cluster_stack.prepend_module_include( runtime_block )
+  end
+
+  ###########################
+  #  prepend_module_extend  #
+  ###########################
+
+  def prepend_module_extend( & runtime_block )
+    cluster_stack.prepend_module_extend( runtime_block )
+  end
+
+  ######################################
+  #  prepend_module_include_or_extend  #
+  ######################################
+
+  def prepend_module_include_or_extend( & runtime_block )
+    prepend_module_include( & runtime_block )
+    prepend_module_extend( & runtime_block )
+  end
+  
+end

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

@@ -26,6 +26,7 @@ module ModuleCluster::Define::Cluster
   ###########################
   
   def self.perform_cascades( class_or_module, method, modules )
+    # nothing required
   end
   
 	###########################

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 3
-  - 2
-  version: 1.3.2
+  - 3
+  version: 1.3.3
 platform: ruby
 authors: 
 - Asher
@@ -28,13 +28,23 @@ extra_rdoc_files: []
 
 files: 
 - lib/module-cluster/ModuleCluster/CascadeFeatures.rb
+- lib/module-cluster/ModuleCluster/ClusterStack/Block/Class.rb
+- lib/module-cluster/ModuleCluster/ClusterStack/Block/Module.rb
+- lib/module-cluster/ModuleCluster/ClusterStack/Block.rb
+- lib/module-cluster/ModuleCluster/ClusterStack/Extends.rb
+- lib/module-cluster/ModuleCluster/ClusterStack/Includes.rb
+- lib/module-cluster/ModuleCluster/ClusterStack/PrependsExtends.rb
+- lib/module-cluster/ModuleCluster/ClusterStack/PrependsIncludes.rb
 - lib/module-cluster/ModuleCluster/ClusterStack.rb
+- lib/module-cluster/ModuleCluster/Define/Block/Class.rb
+- lib/module-cluster/ModuleCluster/Define/Block/ClassOrModule.rb
+- lib/module-cluster/ModuleCluster/Define/Block/Module.rb
+- lib/module-cluster/ModuleCluster/Define/Block.rb
 - lib/module-cluster/ModuleCluster/Define/Cluster.rb
 - lib/module-cluster/ModuleCluster/Define/ClusterCascades.rb
 - lib/module-cluster/ModuleCluster/Define/ClusterCascadesToClass.rb
 - lib/module-cluster/ModuleCluster/Define/ClusterCascadesToModule.rb
 - lib/module-cluster/ModuleCluster/Define/ClusterStack.rb
-- lib/module-cluster/ModuleCluster/Define/DedoubleAncestors.rb
 - lib/module-cluster/ModuleCluster/Define/Deprecated.rb
 - lib/module-cluster/ModuleCluster/ExtendForCascade.rb
 - lib/module-cluster/ModuleCluster.rb

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

@@ -1,22 +0,0 @@
-
-module ModuleCluster::Define::DedoubleAncestors
-
-  ####################################
-  #  dedouble_modules_for_ancestors  #
-  ####################################
-
-  def dedouble_modules_for_ancestors( include_or_extend, *modules )
-    
-    case include_or_extend
-      when :include
-        modules -= ancestors
-      when :extend
-        eigenclass = class << self ; self ; end
-        modules -= eigenclass.ancestors
-    end
-    
-    return modules
-    
-  end
-  
-end