module-cluster 1.3.5 → 1.3.6

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

@@ -129,7 +129,6 @@ module ModuleCluster::CascadeFeatures
     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
 

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

@@ -21,23 +21,12 @@ module ModuleCluster::Define::ClusterCascades
     return true
   end
 
-  #######################################
-  #  self.perform_includes_and_extends  #
-  #######################################
-  
-  def self.perform_includes_and_extends( class_or_module, set_stack )
-    class_or_module.module_eval do
-      include( *cascade_struct.includes.reverse ) unless includes.empty?
-      extend( *cascade_struct.extends.reverse ) unless extends.empty?
-    end
-  end
-
   ###########################
   #  self.perform_cascades  #
   ###########################
   
   def self.perform_cascades( class_or_module, method, modules )
-    class_or_module.module_eval do
+    class_or_module.instance_eval do
       unless is_a?( Class )
         extend ModuleCluster::Define::ClusterCascades
         __send__( method, *modules )

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

@@ -26,7 +26,7 @@ module ModuleCluster::Define::ClusterCascadesToClass
   ###########################
   
   def self.perform_cascades( class_or_module, method, modules )
-    class_or_module.module_eval do
+    class_or_module.instance_eval do
       unless is_a?( Class )
         extend ModuleCluster::Define::ClusterCascadesToClass
         __send__( method, *modules )

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

@@ -26,7 +26,7 @@ module ModuleCluster::Define::ClusterCascadesToModule
   ###########################
   
   def self.perform_cascades( class_or_module, method, modules )
-    class_or_module.module_eval do
+    class_or_module.instance_eval do
       unless is_a?( Class )
         extend ModuleCluster::Define::ClusterCascadesToModule
         __send__( method, *modules )

metadata

@@ -2,7 +2,7 @@
 name: module-cluster
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors: 
 - Asher
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-25 00:00:00 Z
+date: 2011-10-18 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)."
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: module-cluster
-rubygems_version: 1.8.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: "Adds methods for defining module clusters using #included, #extended, #append_features, and #extend_object."