module-cluster 1.4.4 → 1.4.5

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

@@ -1,5 +1,5 @@
 
-module ModuleCluster::CascadeFeatures::PerformCascades
+module ::ModuleCluster::CascadeFeatures::PerformCascades
 
   ######################
   #  perform_cascades  #
@@ -7,7 +7,7 @@ module ModuleCluster::CascadeFeatures::PerformCascades
   
   def perform_cascades( module_self, action, hooked_instance, set_stack )
     
-    # This method is called when a ModuleCluster module is included or extended.
+    # This method is called when a ::ModuleCluster module is included or extended.
     # It determines what modules should be included/extended and which should cascade.
 
     unless module_self.hooks_suspended?( action )
@@ -18,10 +18,16 @@ module ModuleCluster::CascadeFeatures::PerformCascades
         # if this particular set is suspended, skip to the next
         next if this_set.suspended
         
-        # Block sets simply run a block at a hook. They do not include or extend returns from the block.
-        # The hooked module will not be extended by ModuleCluster.
-        if this_set.is_a?( ModuleCluster::ClusterStack::Block::Set )
+        # Block sets simply run a block at a hook. 
+        # They do not include or extend returns from the block.
+        # The hooked module will not be extended by ::ModuleCluster.
+        if this_set.is_a?( ::ModuleCluster::ClusterStack::Block::Set )
 
+          # if our blocks are set to cascade then we need to copy inherit hooks
+          if this_set.dependency_module.should_cascade?( hooked_instance )
+            cascade_block_into_hooked_instance( module_self, hooked_instance, this_set )
+          end
+          
           if this_set.dependency_module.should_run_block?( hooked_instance )
 
             case this_set.runtime_block.arity
@@ -36,29 +42,44 @@ module ModuleCluster::CascadeFeatures::PerformCascades
         # Other sets take parameters and an optional block. The optional block returns are included
         # or extended like the parameters provided.
         else
+
+          if should_cascade = this_set.dependency_module.should_cascade?( hooked_instance )
+            # cascade parameter modules as appropriate
+            cascade_modules_into_hooked_instance( module_self, 
+                                                  hooked_instance, 
+                                                  this_set, 
+                                                  this_set.modules )
+          end
         
           # dependency modules can cause instances to be included/extended and/or cascade
           should_include = this_set.dependency_module.should_include_or_extend?( hooked_instance )
-          should_cascade = this_set.dependency_module.should_cascade?( hooked_instance )
-
-          # cascade parameter modules as appropriate
-          cascade_modules_into_hooked_instance( module_self, hooked_instance, this_set, this_set.modules ) if should_cascade
 
           # include/extend parameter modules as appropriate
-          include_extend_modules( module_self, hooked_instance, this_set, this_set.modules ) if should_include        
-        
+          if should_include
+            include_extend_modules( module_self, hooked_instance, this_set, this_set.modules )        
+          end
+          
           # process runtime block if present
           if this_set.runtime_includes_or_extends_block
           
             # if we have a runtime block, run block and collect returns as appropriate
-            if runtime_modules = collect_block_runtime_result_modules( module_self, hooked_instance, this_set )
+            if runtime_modules = collect_block_runtime_result_modules( module_self, 
+                                                                       hooked_instance, 
+                                                                       this_set )
         
               # cascade return modules if appropriate
-              cascade_modules_into_hooked_instance( module_self, hooked_instance, this_set, runtime_modules ) if should_cascade
-          
+              if should_cascade
+                cascade_modules_into_hooked_instance( module_self, 
+                                                      hooked_instance, 
+                                                      this_set, 
+                                                      runtime_modules )
+              end
+              
               # include/extend return modules if appropriate
-              include_extend_modules( module_self, hooked_instance, this_set, runtime_modules ) if should_include
-          
+              if should_include
+                include_extend_modules( module_self, hooked_instance, this_set, runtime_modules )
+              end
+              
             end
           
           end
@@ -95,19 +116,40 @@ module ModuleCluster::CascadeFeatures::PerformCascades
 
   def cascade_modules_into_hooked_instance( module_self, hooked_instance, set, modules )
 
-    # if we are supposed to cascade we need to extend with the ModuleCluster dependency module
+    # if we are supposed to cascade we need to extend with the ::ModuleCluster dependency module
     hooked_instance.extend( set.dependency_module )
 
     # and we call the set's definition method to cascade
     hooked_instance.__send__( set.method, *modules )
 
   end
+
+  ########################################
+  #  cascade_block_into_hooked_instance  #
+  ########################################
+
+  def cascade_block_into_hooked_instance( module_self, hooked_instance, set )
+
+    # if we are supposed to cascade we need to extend with the ::ModuleCluster dependency module
+    hooked_instance.extend( set.dependency_module )
+
+    # and we call the set's definition method to cascade
+    hooked_instance.__send__( set.method, & set.runtime_block )
+
+    existing_inherit_hooks = module_self.cluster_stack.inherited_hooks
+    hooked_instance.cluster_stack.inherited_hooks.concat( existing_inherit_hooks )
+
+  end
   
   #######################################
   #  include_or_extend_hooked_instance  #
   ######################################
   
-  def include_or_extend_hooked_instance( hooked_instance, set, should_include, should_extend, modules )
+  def include_or_extend_hooked_instance( hooked_instance, 
+                                         set, 
+                                         should_include, 
+                                         should_extend, 
+                                         modules )
     
     # We have collected includes, extends, transparent cascades.
     # Now we want to actually include/extend/cascade as appropriate.
@@ -118,16 +160,18 @@ module ModuleCluster::CascadeFeatures::PerformCascades
 
       hooked_instance.module_eval do
         
-        if should_include                                                                                      and 
-           module_self.should_include_or_extend_instance?( set.module_class_instance_or_all, hooked_instance ) and 
+        if should_include                                                                    and 
+           module_self.should_include_or_extend_instance?( set.module_class_instance_or_all, 
+                                                           hooked_instance )                 and 
            ! modules.empty?
            
           include( *modules.reverse )
           
         end
         
-        if should_extend                                                                                       and 
-           module_self.should_include_or_extend_instance?( set.module_class_instance_or_all, hooked_instance ) and
+        if should_extend                                                                     and 
+           module_self.should_include_or_extend_instance?( set.module_class_instance_or_all, 
+                                                           hooked_instance )                 and
            ! modules.empty?
            
           extend( *modules.reverse )
@@ -139,8 +183,9 @@ module ModuleCluster::CascadeFeatures::PerformCascades
     # Otherwise we have an instance:
     else
       
-      if should_extend                                                                                       and 
-         module_self.should_include_or_extend_instance?( set.module_class_instance_or_all, hooked_instance ) and 
+      if should_extend                                                                       and 
+         module_self.should_include_or_extend_instance?( set.module_class_instance_or_all, 
+                                                         hooked_instance )                   and 
          ! modules.empty?
 
         hooked_instance.extend( *modules.reverse )
@@ -157,7 +202,8 @@ module ModuleCluster::CascadeFeatures::PerformCascades
 
   def should_include_or_extend_instance?( module_class_instance_or_all, into_instance )
 
-    # The set stack already corresponds to include or extend or both, we are testing all_module_class_or_instance for:
+    # The set stack already corresponds to include or extend or both, 
+    # we are testing all_module_class_or_instance for:
     #
     # * any include/extend
     # * module include/extend
@@ -174,12 +220,14 @@ module ModuleCluster::CascadeFeatures::PerformCascades
         should_include_or_extend_instance = into_instance.is_a?( Module )
       when :module_or_instance, :module_and_instance, :module_instance
         should_include_or_extend_instance = ( ! into_instance.is_a?( Module ) or
-                                              ( into_instance.is_a?( Module ) && ! into_instance.is_a?( Class ) ) )
+                                              ( into_instance.is_a?( Module ) && 
+                                                ! into_instance.is_a?( Class ) ) )
       when :class_or_instance, :class_and_instance, :class_instance
         should_include_or_extend_instance = ( into_instance.is_a?( Class ) or
                                               ! into_instance.is_a?( Module ) )
       when :module
-        should_include_or_extend_instance = ( into_instance.is_a?( Module ) && ! into_instance.is_a?( Class ) )
+        should_include_or_extend_instance = ( into_instance.is_a?( Module ) && 
+                                              ! into_instance.is_a?( Class ) )
       when :class
         should_include_or_extend_instance = into_instance.is_a?( Class )
       when :instance
@@ -198,18 +246,23 @@ module ModuleCluster::CascadeFeatures::PerformCascades
 
     runtime_block_result_modules = nil
 
-    case set.runtime_includes_or_extends_block.arity
+    block = set.runtime_includes_or_extends_block
+
+    case block.arity
       when 0
-        runtime_block_result_modules = module_self.instance_eval( & set.runtime_includes_or_extends_block )
+        runtime_block_result_modules = module_self.instance_eval( & block )
       else
-        runtime_block_result_modules = module_self.instance_exec( hooked_instance, & set.runtime_includes_or_extends_block )
+        runtime_block_result_modules = module_self.instance_exec( hooked_instance, 
+                                                                  & block )
     end
     
     if runtime_block_result_modules
 
       # make sure we have an array as a result
-      runtime_block_result_modules = [ runtime_block_result_modules ] unless runtime_block_result_modules.is_a?( Array )
-
+      unless runtime_block_result_modules.is_a?( Array )
+        runtime_block_result_modules = [ runtime_block_result_modules ]
+      end
+      
       # make sure members of our result array are modules
       runtime_block_result_modules.delete_if do |this_result_instance|
         ! this_result_instance.is_a?( Module )

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

@@ -1,5 +1,5 @@
 
-module ModuleCluster::CascadeFeatures::Subclass
+module ::ModuleCluster::CascadeFeatures::Subclass
 
 	###############
 	#  inherited  #
@@ -8,10 +8,13 @@ module ModuleCluster::CascadeFeatures::Subclass
 	def inherited( hooked_instance )
 
     # all future subclasses should receive cascading hook
-    hooked_instance.extend( ModuleCluster::CascadeFeatures::Subclass )
+    hooked_instance.extend( ::ModuleCluster::CascadeFeatures::Subclass )
     hooked_instance.cluster_stack.inherited_hooks.concat( cluster_stack.inherited_hooks )
     
-    ModuleCluster::CascadeFeatures.perform_cascades( self, :inherited, hooked_instance, cluster_stack.inherited_hooks )
+    ::ModuleCluster::CascadeFeatures.perform_cascades( self, 
+                                                     :inherited, 
+                                                     hooked_instance, 
+                                                     cluster_stack.inherited_hooks )
     
     super
 

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

@@ -1,5 +1,5 @@
 
-module ModuleCluster::CascadeFeatures
+module ::ModuleCluster::CascadeFeatures
   
   extend ::ModuleCluster::CascadeFeatures::PerformCascades
   
@@ -9,7 +9,7 @@ module ModuleCluster::CascadeFeatures
 
   def append_features( hooked_instance )
 
-    ModuleCluster::CascadeFeatures.perform_cascades( self, :prepend_include, hooked_instance, cluster_stack.prepend_include_hooks )
+    ::ModuleCluster::CascadeFeatures.perform_cascades( self, :prepend_include, hooked_instance, cluster_stack.prepend_include_hooks )
     
     super
     
@@ -23,7 +23,7 @@ module ModuleCluster::CascadeFeatures
 
     super
 
-    ModuleCluster::CascadeFeatures.perform_cascades( self, :include, hooked_instance, cluster_stack.include_hooks )
+    ::ModuleCluster::CascadeFeatures.perform_cascades( self, :include, hooked_instance, cluster_stack.include_hooks )
     
   end
   
@@ -33,7 +33,7 @@ module ModuleCluster::CascadeFeatures
 
   def extend_object( hooked_instance )
 
-    ModuleCluster::CascadeFeatures.perform_cascades( self, :prepend_extend, hooked_instance, cluster_stack.prepend_extend_hooks )
+    ::ModuleCluster::CascadeFeatures.perform_cascades( self, :prepend_extend, hooked_instance, cluster_stack.prepend_extend_hooks )
     
     super
     
@@ -47,7 +47,7 @@ module ModuleCluster::CascadeFeatures
 
     super
 
-    ModuleCluster::CascadeFeatures.perform_cascades( self, :extend, hooked_instance, cluster_stack.extend_hooks )
+    ::ModuleCluster::CascadeFeatures.perform_cascades( self, :extend, hooked_instance, cluster_stack.extend_hooks )
 
   end
   

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

@@ -1,36 +1,36 @@
 
-module ModuleCluster::ClusterStack::Block::Class
+module ::ModuleCluster::ClusterStack::Block::Class
   
   ###################
   #  class_include  #
   ###################
 
-  def class_include( dependency_module, runtime_block )
-    include_hooks.push( ModuleCluster::ClusterStack::Block::Set.new( dependency_module, runtime_block ) )
+  def class_include( dependency_module, dependency_method, runtime_block )
+    include_hooks.push( ::ModuleCluster::ClusterStack::Block::Set.new( dependency_module, dependency_method, runtime_block ) )
   end
 
   ##################
   #  class_extend  #
   ##################
 
-  def class_extend( dependency_module, runtime_block )
-    extend_hooks.push( ModuleCluster::ClusterStack::Block::Set.new( dependency_module, runtime_block ) )
+  def class_extend( dependency_module, dependency_method, runtime_block )
+    extend_hooks.push( ::ModuleCluster::ClusterStack::Block::Set.new( dependency_module, dependency_method, runtime_block ) )
   end
 
   ###########################
   #  prepend_class_include  #
   ###########################
 
-  def prepend_class_include( dependency_module, runtime_block )
-    prepend_include_hooks.push( ModuleCluster::ClusterStack::Block::Set.new( dependency_module, runtime_block ) )
+  def prepend_class_include( dependency_module, dependency_method, runtime_block )
+    prepend_include_hooks.push( ::ModuleCluster::ClusterStack::Block::Set.new( dependency_module, dependency_method, runtime_block ) )
   end
 
   ##########################
   #  prepend_class_extend  #
   ##########################
 
-  def prepend_class_extend( dependency_module, runtime_block )
-    prepend_extend_hooks.push( ModuleCluster::ClusterStack::Block::Set.new( dependency_module, runtime_block ) )
+  def prepend_class_extend( dependency_module, dependency_method, runtime_block )
+    prepend_extend_hooks.push( ::ModuleCluster::ClusterStack::Block::Set.new( dependency_module, dependency_method, runtime_block ) )
   end
 
 end

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

@@ -1,5 +1,5 @@
 
-module ModuleCluster::ClusterStack::Block::Inherited
+module ::ModuleCluster::ClusterStack::Block::Inherited
   
   #####################
   #  inherited_hooks  #
@@ -13,8 +13,8 @@ module ModuleCluster::ClusterStack::Block::Inherited
   #  subclass  #
   ##############
   
-  def subclass( dependency_module, runtime_block )
-    inherited_hooks.push( ModuleCluster::ClusterStack::Block::Set.new( dependency_module, runtime_block ) )
+  def subclass( dependency_module, dependency_method, runtime_block )
+    inherited_hooks.push( ::ModuleCluster::ClusterStack::Block::Set.new( dependency_module, dependency_method, runtime_block ) )
   end
 
 end

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

@@ -1,20 +1,20 @@
 
-module ModuleCluster::ClusterStack::Block::Instance
+module ::ModuleCluster::ClusterStack::Block::Instance
 
   #####################
   #  instance_extend  #
   #####################
 
-  def instance_extend( dependency_module, runtime_block )
-    extend_hooks.push( ModuleCluster::ClusterStack::Block::Set.new( dependency_module, runtime_block ) )
+  def instance_extend( dependency_module, dependency_method, runtime_block )
+    extend_hooks.push( ::ModuleCluster::ClusterStack::Block::Set.new( dependency_module, dependency_method, runtime_block ) )
   end
 
   #############################
   #  prepend_instance_extend  #
   #############################
 
-  def prepend_instance_extend( dependency_module, runtime_block )
-    prepend_extend_hooks.push( ModuleCluster::ClusterStack::Block::Set.new( dependency_module, runtime_block ) )
+  def prepend_instance_extend( dependency_module, dependency_method, runtime_block )
+    prepend_extend_hooks.push( ::ModuleCluster::ClusterStack::Block::Set.new( dependency_module, dependency_method, runtime_block ) )
   end
 
 end

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

@@ -1,36 +1,36 @@
 
-module ModuleCluster::ClusterStack::Block::Module
+module ::ModuleCluster::ClusterStack::Block::Module
 
   ####################
   #  module_include  #
   ####################
 
-  def module_include( dependency_module, runtime_block )
-    include_hooks.push( ModuleCluster::ClusterStack::Block::Set.new( dependency_module, runtime_block ) )
+  def module_include( dependency_module, dependency_method, runtime_block )
+    include_hooks.push( ::ModuleCluster::ClusterStack::Block::Set.new( dependency_module, dependency_method, runtime_block ) )
   end
 
   ###################
   #  module_extend  #
   ###################
 
-  def module_extend( dependency_module, runtime_block )
-    extend_hooks.push( ModuleCluster::ClusterStack::Block::Set.new( dependency_module, runtime_block ) )
+  def module_extend( dependency_module, dependency_method, runtime_block )
+    extend_hooks.push( ::ModuleCluster::ClusterStack::Block::Set.new( dependency_module, dependency_method, runtime_block ) )
   end
 
   ############################
   #  prepend_module_include  #
   ############################
 
-  def prepend_module_include( dependency_module, runtime_block )
-    prepend_include_hooks.push( ModuleCluster::ClusterStack::Block::Set.new( dependency_module, runtime_block ) )
+  def prepend_module_include( dependency_module, dependency_method, runtime_block )
+    prepend_include_hooks.push( ::ModuleCluster::ClusterStack::Block::Set.new( dependency_module, dependency_method, runtime_block ) )
   end
 
   ###########################
   #  prepend_module_extend  #
   ###########################
 
-  def prepend_module_extend( dependency_module, runtime_block )
-    prepend_extend_hooks.push( ModuleCluster::ClusterStack::Block::Set.new( dependency_module, runtime_block ) )
+  def prepend_module_extend( dependency_module, dependency_method, runtime_block )
+    prepend_extend_hooks.push( ::ModuleCluster::ClusterStack::Block::Set.new( dependency_module, dependency_method, runtime_block ) )
   end
 
 end

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

@@ -1,5 +1,6 @@
 
 ModuleCluster::ClusterStack::Block::Set = Struct.new( :dependency_module, 
+                                                      :method,
                                                       :runtime_block,
                                                       :suspended,
                                                       :name )

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

@@ -1,5 +1,5 @@
 
-module ModuleCluster::ClusterStack::Block
+module ::ModuleCluster::ClusterStack::Block
   
   include Class
   include Module

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

@@ -1,5 +1,5 @@
 
-module ModuleCluster::ClusterStack::Extends
+module ::ModuleCluster::ClusterStack::Extends
   
   ##################
   #  extend_hooks  #
@@ -14,7 +14,7 @@ module ModuleCluster::ClusterStack::Extends
   #####################
   
   def extend_includes( module_instance, method, includes, runtime_includes_block )
-    new_set = 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 )
     extend_hooks.push( new_set )
     return new_set
   end
@@ -24,7 +24,7 @@ module ModuleCluster::ClusterStack::Extends
   ####################
 
   def extend_extends( module_instance, method, extends, runtime_extends_block )
-    new_set = 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 )
     extend_hooks.push( new_set )
     return new_set
   end
@@ -34,7 +34,7 @@ module ModuleCluster::ClusterStack::Extends
   #################################
   
   def extend_includes_and_extends( module_instance, method, 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 )
+    new_set = ::ModuleCluster::ClusterStack::Set.new( module_instance, method, :all, :include_and_extend, includes_and_extends, runtime_includes_and_extends_block )
     extend_hooks.push( new_set )
     return new_set
   end
@@ -44,7 +44,7 @@ module ModuleCluster::ClusterStack::Extends
   ############################
   
   def module_extend_includes( module_instance, method, includes, runtime_includes_block )
-    new_set = 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 )
     extend_hooks.push( new_set )
     return new_set
   end
@@ -54,7 +54,7 @@ module ModuleCluster::ClusterStack::Extends
   ###########################
 
   def module_extend_extends( module_instance, method, extends, runtime_extends_block )
-    new_set = 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 )
     extend_hooks.push( new_set )
     return new_set
   end
@@ -64,7 +64,7 @@ module ModuleCluster::ClusterStack::Extends
   ########################################
   
   def module_extend_includes_and_extends( module_instance, method, 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 )
+    new_set = ::ModuleCluster::ClusterStack::Set.new( module_instance, method, :module, :include_and_extend, includes_and_extends, runtime_includes_and_extends_block )
     extend_hooks.push( new_set )
     return new_set
   end
@@ -74,7 +74,7 @@ module ModuleCluster::ClusterStack::Extends
   ###########################
   
   def class_extend_includes( module_instance, method, includes, runtime_includes_block )
-    new_set = 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 )
     extend_hooks.push( new_set )
     return new_set
   end
@@ -84,7 +84,7 @@ module ModuleCluster::ClusterStack::Extends
   ##########################
 
   def class_extend_extends( module_instance, method, extends, runtime_extends_block )
-    new_set = 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 )
     extend_hooks.push( new_set )
     return new_set
   end
@@ -94,7 +94,7 @@ module ModuleCluster::ClusterStack::Extends
   #######################################
   
   def class_extend_includes_and_extends( module_instance, method, 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 )
+    new_set = ::ModuleCluster::ClusterStack::Set.new( module_instance, method, :class, :include_and_extend, includes_and_extends, runtime_includes_and_extends_block )
     extend_hooks.push( new_set )
     return new_set
   end
@@ -104,7 +104,7 @@ module ModuleCluster::ClusterStack::Extends
   ##############################
   
   def instance_extend_includes( module_instance, method, includes, runtime_includes_block )
-    new_set = 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 )
     extend_hooks.push( new_set )
     return new_set
   end
@@ -114,7 +114,7 @@ module ModuleCluster::ClusterStack::Extends
   #############################
 
   def instance_extend_extends( module_instance, method, extends, runtime_extends_block )
-    new_set = 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 )
     extend_hooks.push( new_set )
     return new_set
   end
@@ -124,7 +124,7 @@ module ModuleCluster::ClusterStack::Extends
   ##########################################
   
   def instance_extend_includes_and_extends( module_instance, method, 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 )
+    new_set = ::ModuleCluster::ClusterStack::Set.new( module_instance, method, :instance, :include_and_extend, includes_and_extends, runtime_includes_and_extends_block )
     extend_hooks.push( new_set )
     return new_set
   end

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

@@ -1,5 +1,5 @@
 
-module ModuleCluster::ClusterStack::Includes
+module ::ModuleCluster::ClusterStack::Includes
 
   ###################
   #  include_hooks  #
@@ -14,7 +14,7 @@ module ModuleCluster::ClusterStack::Includes
   ######################
 
   def include_includes( module_instance, method, includes, runtime_includes_block )
-    new_set = 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 )
     include_hooks.push( new_set )
     return new_set
   end
@@ -24,7 +24,7 @@ module ModuleCluster::ClusterStack::Includes
   #####################
   
   def include_extends( module_instance, method, extends, runtime_extends_block )
-    new_set = 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 )
     include_hooks.push( new_set )
     return new_set
   end
@@ -34,7 +34,7 @@ module ModuleCluster::ClusterStack::Includes
   ##################################
   
   def include_includes_and_extends( module_instance, method, 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 )
+    new_set = ::ModuleCluster::ClusterStack::Set.new( module_instance, method, :all, :include_and_extend, includes_and_extends, runtime_includes_and_extends_block )
     include_hooks.push( new_set )
     return new_set
   end
@@ -44,7 +44,7 @@ module ModuleCluster::ClusterStack::Includes
   #############################
 
   def module_include_includes( module_instance, method, includes, runtime_includes_block )
-    new_set = 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 )
     include_hooks.push( new_set )
     return new_set
   end
@@ -54,7 +54,7 @@ module ModuleCluster::ClusterStack::Includes
   ############################
   
   def module_include_extends( module_instance, method, extends, runtime_extends_block )
-    new_set = 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 )
     include_hooks.push( new_set )
     return new_set
   end
@@ -64,7 +64,7 @@ module ModuleCluster::ClusterStack::Includes
   #########################################
   
   def module_include_includes_and_extends( module_instance, method, 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 )
+    new_set = ::ModuleCluster::ClusterStack::Set.new( module_instance, method, :module, :include_and_extend, includes_and_extends, runtime_includes_and_extends_block )
     include_hooks.push( new_set )
     return new_set
   end
@@ -74,7 +74,7 @@ module ModuleCluster::ClusterStack::Includes
   ############################
 
   def class_include_includes( module_instance, method, includes, runtime_includes_block )
-    new_set = 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 )
     include_hooks.push( new_set )
     return new_set
   end
@@ -84,7 +84,7 @@ module ModuleCluster::ClusterStack::Includes
   ###########################
   
   def class_include_extends( module_instance, method, extends, runtime_extends_block )
-    new_set = 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 )
     include_hooks.push( new_set )
     return new_set
   end
@@ -94,7 +94,7 @@ module ModuleCluster::ClusterStack::Includes
   ########################################
   
   def class_include_includes_and_extends( module_instance, method, 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 )
+    new_set = ::ModuleCluster::ClusterStack::Set.new( module_instance, method, :class, :include_and_extend, includes_and_extends, runtime_includes_and_extends_block )
     include_hooks.push( new_set )
     return new_set
   end