module-cluster 1.4.3 → 1.4.4

data/README.md

@@ -20,7 +20,7 @@ Simply:
 
 ```ruby
 module SomeModule
-  extend ModuleCluster
+  extend ::ModuleCluster
 end
 ```
 
@@ -30,7 +30,7 @@ For example:
 
 ```ruby
 module SomeModule
-  extend ModuleCluster
+  extend ::ModuleCluster
   include_also_includes( SomeOtherModule )
 end
 ```
@@ -39,7 +39,7 @@ Additionally, all methods accept a block that returns one or more modules; the m
 
 ```ruby
 module SomeModule
-  extend ModuleCluster
+  extend ::ModuleCluster
   include_also_includes( SomeOtherModule ) do
     AnotherModule
   end
@@ -50,7 +50,7 @@ Blocks can be used to return dynamically-determined modules at runtime.
 
 ```ruby
 module SomeModule
-  extend ModuleCluster
+  extend ::ModuleCluster
   include_or_extend_cascades_prepend_extends do
     method_that_returns_one_or_more_modules
   end

data/README.rdoc

@@ -19,7 +19,7 @@ Provides methods for clustering modules so that when the main module is included
 Simply:
 
 module SomeModule
-  extend ModuleCluster
+  extend ::ModuleCluster
 end
 
 Definition methods accept modules as arguments. 
@@ -27,14 +27,14 @@ Definition methods accept modules as arguments.
 For example:
 
 module SomeModule
-  extend ModuleCluster
+  extend ::ModuleCluster
   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
-  extend ModuleCluster
+  extend ::ModuleCluster
   include_also_includes( SomeOtherModule ) do
     AnotherModule
   end
@@ -43,7 +43,7 @@ end
 Blocks can be used to return dynamically-determined modules at runtime.
 
 module SomeModule
-  extend ModuleCluster
+  extend ::ModuleCluster
   include_or_extend_cascades_prepend_extends do
     method_that_returns_one_or_more_modules
   end

data/lib/module-cluster.rb

@@ -36,12 +36,18 @@ module ModuleCluster
       end
       module ClassOrInstance
       end
+      module ClassOrSubclass
+      end
+      module ClassOrModuleOrSubclass
+      end
       module Instance
       end
       module Module
       end
       module ModuleOrInstance
       end
+      module ModuleOrSubclass
+      end
     end
     module ClusterStack
     end
@@ -105,16 +111,6 @@ require_relative 'module-cluster/ModuleCluster/Suspend/Hooks.rb'
 require_relative 'module-cluster/ModuleCluster/Suspend/WithoutHooks.rb'
 require_relative 'module-cluster/ModuleCluster/Suspend.rb'
 
-require_relative 'module-cluster/ModuleCluster/Define/Block/Class.rb'
-require_relative 'module-cluster/ModuleCluster/Define/Block/Subclass.rb'
-require_relative 'module-cluster/ModuleCluster/Define/Block/Instance.rb'
-require_relative 'module-cluster/ModuleCluster/Define/Block/Module.rb'
-require_relative 'module-cluster/ModuleCluster/Define/Block/ClassOrInstance.rb'
-require_relative 'module-cluster/ModuleCluster/Define/Block/ClassOrModule.rb'
-require_relative 'module-cluster/ModuleCluster/Define/Block/ModuleOrInstance.rb'
-require_relative 'module-cluster/ModuleCluster/Define/Block/ClassOrModuleOrInstance.rb'
-require_relative 'module-cluster/ModuleCluster/Define/Block.rb'
-
 require_relative 'module-cluster/ModuleCluster/Define/Cluster.rb'
 require_relative 'module-cluster/ModuleCluster/Define/ModuleCluster.rb'
 require_relative 'module-cluster/ModuleCluster/Define/ClassCluster.rb'
@@ -126,6 +122,19 @@ 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/Block/Class.rb'
+require_relative 'module-cluster/ModuleCluster/Define/Block/Instance.rb'
+require_relative 'module-cluster/ModuleCluster/Define/Block/Module.rb'
+require_relative 'module-cluster/ModuleCluster/Define/Block/ClassOrInstance.rb'
+require_relative 'module-cluster/ModuleCluster/Define/Block/ClassOrModule.rb'
+require_relative 'module-cluster/ModuleCluster/Define/Block/ModuleOrInstance.rb'
+require_relative 'module-cluster/ModuleCluster/Define/Block/ClassOrModuleOrInstance.rb'
+require_relative 'module-cluster/ModuleCluster/Define/Block/ClassOrModuleOrSubclass.rb'
+require_relative 'module-cluster/ModuleCluster/Define/Block/Subclass.rb'
+require_relative 'module-cluster/ModuleCluster/Define/Block/ModuleOrSubclass.rb'
+require_relative 'module-cluster/ModuleCluster/Define/Block/ClassOrSubclass.rb'
+require_relative 'module-cluster/ModuleCluster/Define/Block.rb'
+
 require_relative 'module-cluster/ModuleCluster/Define/Deprecated.rb'
 
 require_relative 'module-cluster/ModuleCluster/Define.rb'

data/lib/module-cluster/ModuleCluster.rb

@@ -1,7 +1,7 @@
 
 module ModuleCluster
 	
-	extend ModuleCluster::ExtendForCascade
+	extend ::ModuleCluster::ExtendForCascade
     
   include Define
   include Suspend

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

@@ -1,10 +1,10 @@
 
 module ModuleCluster::Define::Block::Class
 
-  include ModuleCluster::CascadeFeatures::ClusterStack
-  include ModuleCluster::Suspend::WithoutHooks
+  include ::ModuleCluster::CascadeFeatures::ClusterStack
+  include ::ModuleCluster::Suspend::WithoutHooks
   
-  extend ModuleCluster::ExtendForCascade
+  extend ::ModuleCluster::ExtendForCascade
   
   ############################
   #  self.should_run_block?  #

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

@@ -1,11 +1,11 @@
 
 module ModuleCluster::Define::Block::ClassOrInstance
   
-  include ModuleCluster::Define::Block::Class
-  include ModuleCluster::Define::Block::Instance
-  include ModuleCluster::Suspend::WithoutHooks
+  include ::ModuleCluster::Define::Block::Class
+  include ::ModuleCluster::Define::Block::Instance
+  include ::ModuleCluster::Suspend::WithoutHooks
   
-  extend ModuleCluster::ExtendForCascade
+  extend ::ModuleCluster::ExtendForCascade
   
   ##############################
   #  class_or_instance_extend  #

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

@@ -1,11 +1,11 @@
 
 module ModuleCluster::Define::Block::ClassOrModule
   
-  include ModuleCluster::Define::Block::Class
-  include ModuleCluster::Define::Block::Module
-  include ModuleCluster::Suspend::WithoutHooks
+  include ::ModuleCluster::Define::Block::Class
+  include ::ModuleCluster::Define::Block::Module
+  include ::ModuleCluster::Suspend::WithoutHooks
   
-  extend ModuleCluster::ExtendForCascade
+  extend ::ModuleCluster::ExtendForCascade
   
   #############################
   #  class_or_module_include  #

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

@@ -1,11 +1,11 @@
 
 module ModuleCluster::Define::Block::ClassOrModuleOrInstance
   
-  include ModuleCluster::Define::Block::ClassOrModule
-  include ModuleCluster::Define::Block::Instance
-  include ModuleCluster::Suspend::WithoutHooks
+  include ::ModuleCluster::Define::Block::ClassOrModule
+  include ::ModuleCluster::Define::Block::Instance
+  include ::ModuleCluster::Suspend::WithoutHooks
   
-  extend ModuleCluster::ExtendForCascade
+  extend ::ModuleCluster::ExtendForCascade
   
   ########################################
   #  class_or_module_or_instance_extend  #

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

@@ -0,0 +1,29 @@
+
+module ModuleCluster::Define::Block::ClassOrModuleOrSubclass
+
+  include ::ModuleCluster::CascadeFeatures::ClusterStack
+  include ::ModuleCluster::Define::Block::ClassOrModule
+  include ::ModuleCluster::Suspend::WithoutHooks
+  
+  extend ::ModuleCluster::ExtendForCascade::Subclass
+  extend ::ModuleCluster::ExtendForCascade
+
+  ############################
+  #  self.should_run_block?  #
+  ############################
+  
+  def self.should_run_block?( hooked_instance )
+    return hooked_instance.is_a?( Module )
+  end
+
+  #########################################
+  #  class_or_module_include_or_subclass  #
+  #########################################
+
+  def class_or_module_include_or_subclass( & runtime_block )
+    class_or_module_set = class_or_module_include( & runtime_block )
+    subclass_set = cluster_stack.subclass( ModuleCluster::Define::Block::ClassOrModuleOrSubclass, runtime_block )
+    return ModuleCluster::ClusterStack::Set::MultiSetProxy.new( class_or_module_set, subclass_set )    
+  end
+
+end

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

@@ -0,0 +1,22 @@
+
+module ModuleCluster::Define::Block::ClassOrSubclass
+
+  include ::ModuleCluster::CascadeFeatures::ClusterStack
+  include ::ModuleCluster::Define::Block::Class
+  include ::ModuleCluster::Define::Block::Subclass
+  include ::ModuleCluster::Suspend::WithoutHooks
+  
+  extend ::ModuleCluster::ExtendForCascade::Subclass
+  extend ::ModuleCluster::ExtendForCascade
+
+  ###############################
+  #  class_include_or_subclass  #
+  ###############################
+
+  def class_include_or_subclass( & runtime_block )
+    class_set = class_include( & runtime_block )
+    subclass_set = subclass( & runtime_block )
+    return ModuleCluster::ClusterStack::Set::MultiSetProxy.new( class_set, subclass_set )    
+  end
+
+end

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

@@ -1,10 +1,10 @@
 
 module ModuleCluster::Define::Block::Instance
   
-  include ModuleCluster::CascadeFeatures::ClusterStack
-  include ModuleCluster::Suspend::WithoutHooks
+  include ::ModuleCluster::CascadeFeatures::ClusterStack
+  include ::ModuleCluster::Suspend::WithoutHooks
   
-  extend ModuleCluster::ExtendForCascade
+  extend ::ModuleCluster::ExtendForCascade
 
   ############################
   #  self.should_run_block?  #

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

@@ -1,10 +1,10 @@
 
 module ModuleCluster::Define::Block::Module
   
-  include ModuleCluster::CascadeFeatures::ClusterStack
-  include ModuleCluster::Suspend::WithoutHooks
+  include ::ModuleCluster::CascadeFeatures::ClusterStack
+  include ::ModuleCluster::Suspend::WithoutHooks
   
-  extend ModuleCluster::ExtendForCascade
+  extend ::ModuleCluster::ExtendForCascade
   
   ############################
   #  self.should_run_block?  #

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

@@ -1,11 +1,11 @@
 
 module ModuleCluster::Define::Block::ModuleOrInstance
   
-  include ModuleCluster::Define::Block::Module
-  include ModuleCluster::Define::Block::Instance
-  include ModuleCluster::Suspend::WithoutHooks
+  include ::ModuleCluster::Define::Block::Module
+  include ::ModuleCluster::Define::Block::Instance
+  include ::ModuleCluster::Suspend::WithoutHooks
   
-  extend ModuleCluster::ExtendForCascade
+  extend ::ModuleCluster::ExtendForCascade
   
   ###############################
   #  module_or_instance_extend  #

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

@@ -0,0 +1,22 @@
+
+module ModuleCluster::Define::Block::ModuleOrSubclass
+
+  include ::ModuleCluster::CascadeFeatures::ClusterStack
+  include ::ModuleCluster::Define::Block::Module
+  include ::ModuleCluster::Define::Block::Subclass
+  include ::ModuleCluster::Suspend::WithoutHooks
+  
+  extend ::ModuleCluster::ExtendForCascade::Subclass
+  extend ::ModuleCluster::ExtendForCascade
+
+  ################################
+  #  module_include_or_subclass  #
+  ################################
+
+  def module_include_or_subclass( & runtime_block )
+    module_set = module_include( & runtime_block )
+    subclass_set = subclass( & runtime_block )
+    return ModuleCluster::ClusterStack::Set::MultiSetProxy.new( module_set, subclass_set )    
+  end
+
+end

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

@@ -1,17 +1,44 @@
 
 module ModuleCluster::Define::Block::Subclass
 
-  include ModuleCluster::CascadeFeatures::ClusterStack
-  include ModuleCluster::Suspend::WithoutHooks
+  include ::ModuleCluster::CascadeFeatures::ClusterStack
+  include ::ModuleCluster::Suspend::WithoutHooks
+  extend ::ModuleCluster::Define::Block::Module
+  
+#  module_extend do |module_instance|
+#    module_instance.module_eval do
+#      extend ::ModuleCluster::Define::Block::Class
+#      class_include do |class_instance|
+#      end
+#    end
+#  end
+  
+  extend ::ModuleCluster::ExtendForCascade::Subclass
   
-  extend ModuleCluster::ExtendForCascade::Subclass
-
   ############################
   #  self.should_run_block?  #
   ############################
   
   def self.should_run_block?( hooked_instance )
-    return hooked_instance.is_a?( Class )
+
+    should_run_block = false
+
+    if hooked_instance.is_a?( Module )
+      
+      if hooked_instance.is_a?( Class )
+
+        # subclass instance
+        if hooked_instance.ancestors[ 1 ].is_a?( Class )
+          should_run_block = true
+        end
+        # class instance - don't run
+      end
+      # module instance - don't run
+      
+    end
+    
+    return should_run_block
+
   end
 
   ##############

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

@@ -1,10 +1,10 @@
 
 module ModuleCluster::Define::ClassCluster
 
-  include ModuleCluster::CascadeFeatures::ClusterStack
-  include ModuleCluster::Suspend::WithoutHooks
+  include ::ModuleCluster::CascadeFeatures::ClusterStack
+  include ::ModuleCluster::Suspend::WithoutHooks
   
-  extend ModuleCluster::ExtendForCascade
+  extend ::ModuleCluster::ExtendForCascade
 
   ####################################
   #  self.should_include_or_extend?  #

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

@@ -1,10 +1,10 @@
 
 module ModuleCluster::Define::ClassOrInstanceCluster
 
-  include ModuleCluster::CascadeFeatures::ClusterStack
-  include ModuleCluster::Suspend::WithoutHooks
+  include ::ModuleCluster::CascadeFeatures::ClusterStack
+  include ::ModuleCluster::Suspend::WithoutHooks
   
-  extend ModuleCluster::ExtendForCascade
+  extend ::ModuleCluster::ExtendForCascade
 
   ####################################
   #  self.should_include_or_extend?  #

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

@@ -1,10 +1,10 @@
 
 module ModuleCluster::Define::Cluster
 
-  include ModuleCluster::CascadeFeatures::ClusterStack
-  include ModuleCluster::Suspend::WithoutHooks
+  include ::ModuleCluster::CascadeFeatures::ClusterStack
+  include ::ModuleCluster::Suspend::WithoutHooks
   
-  extend ModuleCluster::ExtendForCascade
+  extend ::ModuleCluster::ExtendForCascade
 
   ####################################
   #  self.should_include_or_extend?  #

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

@@ -1,10 +1,10 @@
 
 module ModuleCluster::Define::ClusterCascades
 
-  include ModuleCluster::CascadeFeatures::ClusterStack
-  include ModuleCluster::Suspend::WithoutHooks
+  include ::ModuleCluster::CascadeFeatures::ClusterStack
+  include ::ModuleCluster::Suspend::WithoutHooks
 
-  extend ModuleCluster::ExtendForCascade
+  extend ::ModuleCluster::ExtendForCascade
 
   ####################################
   #  self.should_include_or_extend?  #

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

@@ -1,10 +1,10 @@
 
 module ModuleCluster::Define::ClusterCascadesToClass
 
-  include ModuleCluster::CascadeFeatures::ClusterStack
-  include ModuleCluster::Suspend::WithoutHooks
+  include ::ModuleCluster::CascadeFeatures::ClusterStack
+  include ::ModuleCluster::Suspend::WithoutHooks
 
-  extend ModuleCluster::ExtendForCascade
+  extend ::ModuleCluster::ExtendForCascade
 
   ####################################
   #  self.should_include_or_extend?  #