module-cluster 1.3.4 → 1.3.5

data/README.md

@@ -20,7 +20,7 @@ Simply:
 
 ```ruby
 module SomeModule
-  include ModuleCluster
+  extend ModuleCluster
 end
 ```
 
@@ -30,7 +30,7 @@ For example:
 
 ```ruby
 module SomeModule
-  include 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
-  include ModuleCluster
+  extend ModuleCluster
   include_also_includes( SomeOtherModule ) do
     AnotherModule
   end
@@ -49,8 +49,21 @@ 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
+module SomeModule
+  extend ModuleCluster
+  include_or_extend_cascades_prepending_extends do
+    method_that_returns_one_or_more_modules
+  end
+end
+```
+
+Block methods can be 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
 ```
 
@@ -142,15 +155,26 @@ 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
-```
+Block methods:
+
+* module_include
+* module_extend
+* module_include_or_extend
+* prepend_module_include
+* prepend_module_extend
+* prepend_module_include_or_extend
+* class_include
+* class_extend
+* class_include_or_extend
+* prepend_class_include
+* prepend_class_extend
+* prepend_class_include_or_extend
+* class_or_module_include
+* class_or_module_extend
+* class_or_module_include_or_extend
+* prepend_class_or_module_include
+* prepend_class_or_module_extend
+* prepend_class_or_module_include_or_extend
 
 # License #
 

data/README.rdoc

@@ -19,7 +19,7 @@ Provides methods for clustering modules so that when the main module is included
 Simply:
 
 module SomeModule
-  include ModuleCluster
+  extend ModuleCluster
 end
 
 Definition methods accept modules as arguments. 
@@ -27,14 +27,14 @@ Definition methods accept modules as arguments.
 For example:
 
 module SomeModule
-  include 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
-  include ModuleCluster
+  extend ModuleCluster
   include_also_includes( SomeOtherModule ) do
     AnotherModule
   end
@@ -42,8 +42,19 @@ 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
+module SomeModule
+  extend ModuleCluster
+  include_or_extend_cascades_prepending_extends do
+    method_that_returns_one_or_more_modules
+  end
+end
+
+Block methods can be used for nesting declarations, for instance to apply cascades only after first module/class:
+
+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
 
 Calls to the various functions are cumulative and stack in the order called. This permits multiple calls, whether subsequently or otherwise.
@@ -134,13 +145,26 @@ 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
+Block methods:
+
+* module_include
+* module_extend
+* module_include_or_extend
+* prepend_module_include
+* prepend_module_extend
+* prepend_module_include_or_extend
+* class_include
+* class_extend
+* class_include_or_extend
+* prepend_class_include
+* prepend_class_extend
+* prepend_class_include_or_extend
+* class_or_module_include
+* class_or_module_extend
+* class_or_module_include_or_extend
+* prepend_class_or_module_include
+* prepend_class_or_module_extend
+* prepend_class_or_module_include_or_extend
 
 == License
 

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

@@ -70,7 +70,7 @@ module ModuleCluster::CascadeFeatures
                                                                                                    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 )            
+          cascades[ this_set.dependency_module ][ this_set.method ].concat( runtime_set )
         end
         # get includes/extends
         case this_set.include_or_extend
@@ -112,16 +112,33 @@ module ModuleCluster::CascadeFeatures
   ###########################
   
   def self.cascade_features( class_or_module, cascade_struct )
+    
+    if class_or_module.is_a?( Module )
 
-    class_or_module.module_eval do
-      include( *cascade_struct.includes.reverse ) unless cascade_struct.includes.empty?
-      extend( *cascade_struct.extends.reverse ) unless cascade_struct.extends.empty?
-    end
+      class_or_module.module_eval do
+        include( *cascade_struct.includes.reverse ) unless cascade_struct.includes.empty?
+        extend( *cascade_struct.extends.reverse ) unless cascade_struct.extends.empty?
+      end
 
-    cascade_struct.cascades.each do |this_dependency_module, this_method_and_module_set|
-      this_method_and_module_set.each do |this_method, this_module_set|
-        this_dependency_module.perform_cascades( class_or_module, this_method, this_module_set )
+      cascade_struct.cascades.each do |this_dependency_module, this_method_and_module_set|
+        this_method_and_module_set.each do |this_method, this_module_set|
+          this_dependency_module.perform_cascades( class_or_module, this_method, this_module_set )
+        end
+      end
+
+    else
+      
+      class_or_module.instance_eval do
+        extend( *cascade_struct.includes.reverse ) unless cascade_struct.includes.empty?
+        extend( *cascade_struct.extends.reverse ) unless cascade_struct.extends.empty?
+      end
+
+      cascade_struct.cascades.each do |this_dependency_module, this_method_and_module_set|
+        this_method_and_module_set.each do |this_method, this_module_set|
+          this_dependency_module.perform_cascades( class_or_module, :extend, this_module_set )
+        end
       end
+      
     end
     
   end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: module-cluster
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 3
-  - 4
-  version: 1.3.4
+  prerelease: 
+  version: 1.3.5
 platform: ruby
 authors: 
 - Asher
@@ -14,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-06 00:00:00 -04:00
-default_executable: 
+date: 2011-08-25 00:00:00 Z
 dependencies: []
 
 description: "Provides methods for clustering modules so that when the main module is included other modules are also included or extended, either before or after the main module. There are currently three variants: cluster, cascade, cascade to class. Cluster causes the next module to be affected. Cascade causes all subsequent modules to be affected. Cascade to class causes the first including/extending class to be affected, but not any modules prior to it (although the effects will cascade through those unaffected modules)."
@@ -56,7 +51,6 @@ files:
 - spec/ModuleCluster_spec.rb
 - README.md
 - README.rdoc
-has_rdoc: true
 homepage: http://rubygems.org/gems/module-cluster
 licenses: []
 
@@ -70,21 +64,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: module-cluster
-rubygems_version: 1.3.7
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: "Adds methods for defining module clusters using #included, #extended, #append_features, and #extend_object."