module-cluster 1.4.2 → 1.4.3

data/lib/module-cluster.rb

@@ -8,6 +8,8 @@ module ModuleCluster
       end
       module Module
       end
+      module Inherited
+      end
     end
     module Status
     end
@@ -15,6 +17,16 @@ module ModuleCluster
     end
   end
   module CascadeFeatures
+    module Subclass
+    end
+    module ClusterStack
+    end
+    module PerformCascades
+    end
+  end
+  module ExtendForCascade
+    module Subclass
+    end
   end
   module Define
     module Block
@@ -67,9 +79,11 @@ end
 
 require_relative 'module-cluster/_private_/ModuleCluster/CascadeFeatures/ClusterStack.rb'
 require_relative 'module-cluster/_private_/ModuleCluster/CascadeFeatures/PerformCascades.rb'
+require_relative 'module-cluster/_private_/ModuleCluster/CascadeFeatures/Subclass.rb'
 require_relative 'module-cluster/_private_/ModuleCluster/CascadeFeatures.rb'
 
 require_relative 'module-cluster/_private_/ModuleCluster/ExtendForCascade.rb'
+require_relative 'module-cluster/_private_/ModuleCluster/ExtendForCascade/Subclass.rb'
 
 require_relative 'module-cluster/_private_/ModuleCluster/ClusterStack/Set.rb'
 require_relative 'module-cluster/_private_/ModuleCluster/ClusterStack/Set/MultiSetProxy.rb'
@@ -80,6 +94,7 @@ require_relative 'module-cluster/_private_/ModuleCluster/ClusterStack/Extends.rb
 require_relative 'module-cluster/_private_/ModuleCluster/ClusterStack/PrependsIncludes.rb'
 require_relative 'module-cluster/_private_/ModuleCluster/ClusterStack/PrependsExtends.rb'
 require_relative 'module-cluster/_private_/ModuleCluster/ClusterStack/Block/Set.rb'
+require_relative 'module-cluster/_private_/ModuleCluster/ClusterStack/Block/Inherited.rb'
 require_relative 'module-cluster/_private_/ModuleCluster/ClusterStack/Block/Class.rb'
 require_relative 'module-cluster/_private_/ModuleCluster/ClusterStack/Block/Instance.rb'
 require_relative 'module-cluster/_private_/ModuleCluster/ClusterStack/Block/Module.rb'
@@ -91,6 +106,7 @@ 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'

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

@@ -0,0 +1,25 @@
+
+module ModuleCluster::Define::Block::Subclass
+
+  include ModuleCluster::CascadeFeatures::ClusterStack
+  include ModuleCluster::Suspend::WithoutHooks
+  
+  extend ModuleCluster::ExtendForCascade::Subclass
+
+  ############################
+  #  self.should_run_block?  #
+  ############################
+  
+  def self.should_run_block?( hooked_instance )
+    return hooked_instance.is_a?( Class )
+  end
+
+  ##############
+  #  subclass  #
+  ##############
+
+  def subclass( & runtime_block )
+    return cluster_stack.subclass( ModuleCluster::Define::Block::Subclass, runtime_block )
+  end
+
+end

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

@@ -0,0 +1,20 @@
+
+module ModuleCluster::CascadeFeatures::Subclass
+
+	###############
+	#  inherited  #
+	###############
+	
+	def inherited( hooked_instance )
+
+    # all future subclasses should receive cascading hook
+    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 )
+    
+    super
+
+  end
+  
+end

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

@@ -4,5 +4,6 @@ module ModuleCluster::ClusterStack::Block
   include Class
   include Module
   include Instance
-
+  include Inherited
+  
 end

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

@@ -0,0 +1,20 @@
+
+module ModuleCluster::ClusterStack::Block::Inherited
+  
+  #####################
+  #  inherited_hooks  #
+  #####################
+
+  def inherited_hooks
+    return @inherited_hooks ||= ::ModuleCluster::ClusterStack::Set::MultiSetProxy.new
+  end
+  
+  ##############
+  #  subclass  #
+  ##############
+  
+  def subclass( dependency_module, runtime_block )
+    inherited_hooks.push( ModuleCluster::ClusterStack::Block::Set.new( dependency_module, runtime_block ) )
+  end
+
+end

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

@@ -5,16 +5,16 @@ module ModuleCluster::ExtendForCascade
 	#  extended  #
 	##############
 	
-	def extended( module_cluster_module )
+	def extended( module_cluster_configuration_instance )
 	  super
-	  module_cluster_module.module_eval do
+	  module_cluster_configuration_instance.module_eval do
 	    # when a module-cluster definition module is used to extend a module,
 	    # define self#extended, self#included, self#append_features, self#extend_object in
 	    # module_cluster_module ( module extended with module-cluster definition module )
 	    extend ModuleCluster::CascadeFeatures
 	      # classes and instances can't cascade through include/extend, so no reason to define
 	      # unless we have a module
-    end if module_cluster_module.is_a?( Module ) and ! module_cluster_module.is_a?( Class )
+    end if module_cluster_configuration_instance.is_a?( Module ) and ! module_cluster_configuration_instance.is_a?( Class )
   end
   
 end

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

@@ -0,0 +1,21 @@
+
+module ModuleCluster::ExtendForCascade::Subclass
+
+	##############
+	#  extended  #
+	##############
+	
+	def extended( module_cluster_configuration_class_instance )
+	  unless module_cluster_configuration_class_instance.is_a?( Class )
+	    raise ArgumentError, 'Module-cluster blocks cannot be defined for subclassing on non-class objects.'
+	  end
+	  super
+	  module_cluster_configuration_class_instance.module_eval do
+	    # when a module-cluster definition module is used to extend a module,
+	    # define self#inherited module_cluster_configuration_class_instance 
+	    # (class extended with module-cluster definition module)
+	    extend ModuleCluster::CascadeFeatures::Subclass
+    end
+  end
+
+end

data/spec/ModuleCluster/Define/Block/Subclass_spec.rb

@@ -0,0 +1,42 @@
+
+require_relative '../../../../lib/module-cluster.rb'
+
+describe ModuleCluster::Define::Block::Subclass do
+
+  ##############
+  #  subclass  #
+  ##############
+
+  it 'can run a block when a class is subclassed' do
+    
+    # Modules shouldn't work
+    Proc.new do
+      module ModuleCluster::Define::Block::Subclass::ModuleMock01
+        extend ModuleCluster::Define::Block::Subclass
+      end
+    end.should raise_error
+    
+    class ModuleCluster::Define::Block::Subclass::Mock01
+      extend ModuleCluster::Define::Block::Subclass
+      block_ran = false
+      subclass do |subclass_instance|
+        self.ancestors.include?( ModuleCluster::Define::Block::Subclass::Mock01 ).should == true
+        subclass_instance.ancestors.include?( ModuleCluster::Define::Block::Subclass::Mock01 ).should == true
+        block_ran = true
+      end
+      respond_to?( :inherited ).should == true
+      respond_to?( :included ).should == false
+      respond_to?( :extended ).should == false
+      respond_to?( :append_features ).should == false
+      respond_to?( :extend_object ).should == false
+      class ModuleProof < ModuleCluster::Define::Block::Subclass::Mock01
+      end
+      block_ran.should == true
+      block_ran = false
+      class ModuleProof2 < ModuleProof
+      end
+      block_ran.should == true
+    end
+  end
+
+end

metadata

@@ -2,7 +2,7 @@
 name: module-cluster
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors: 
 - Asher
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-08 00:00:00 Z
+date: 2012-01-11 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)."
@@ -24,8 +24,10 @@ extra_rdoc_files: []
 files: 
 - lib/module-cluster/_private_/ModuleCluster/CascadeFeatures/ClusterStack.rb
 - lib/module-cluster/_private_/ModuleCluster/CascadeFeatures/PerformCascades.rb
+- lib/module-cluster/_private_/ModuleCluster/CascadeFeatures/Subclass.rb
 - lib/module-cluster/_private_/ModuleCluster/CascadeFeatures.rb
 - lib/module-cluster/_private_/ModuleCluster/ClusterStack/Block/Class.rb
+- lib/module-cluster/_private_/ModuleCluster/ClusterStack/Block/Inherited.rb
 - lib/module-cluster/_private_/ModuleCluster/ClusterStack/Block/Instance.rb
 - lib/module-cluster/_private_/ModuleCluster/ClusterStack/Block/Module.rb
 - lib/module-cluster/_private_/ModuleCluster/ClusterStack/Block/Set.rb
@@ -39,6 +41,7 @@ files:
 - lib/module-cluster/_private_/ModuleCluster/ClusterStack/Status.rb
 - lib/module-cluster/_private_/ModuleCluster/ClusterStack/Suspend.rb
 - lib/module-cluster/_private_/ModuleCluster/ClusterStack.rb
+- lib/module-cluster/_private_/ModuleCluster/ExtendForCascade/Subclass.rb
 - lib/module-cluster/_private_/ModuleCluster/ExtendForCascade.rb
 - lib/module-cluster/ModuleCluster/Define/Block/Class.rb
 - lib/module-cluster/ModuleCluster/Define/Block/ClassOrInstance.rb
@@ -47,6 +50,7 @@ files:
 - lib/module-cluster/ModuleCluster/Define/Block/Instance.rb
 - lib/module-cluster/ModuleCluster/Define/Block/Module.rb
 - lib/module-cluster/ModuleCluster/Define/Block/ModuleOrInstance.rb
+- lib/module-cluster/ModuleCluster/Define/Block/Subclass.rb
 - lib/module-cluster/ModuleCluster/Define/Block.rb
 - lib/module-cluster/ModuleCluster/Define/ClassCluster.rb
 - lib/module-cluster/ModuleCluster/Define/ClassOrInstanceCluster.rb
@@ -76,6 +80,7 @@ files:
 - spec/ModuleCluster/Define/Block/Instance_spec.rb
 - spec/ModuleCluster/Define/Block/Module_spec.rb
 - spec/ModuleCluster/Define/Block/ModuleOrInstance_spec.rb
+- spec/ModuleCluster/Define/Block/Subclass_spec.rb
 - spec/ModuleCluster/Define/Block_spec.rb
 - spec/ModuleCluster/Define/ClassCluster_spec.rb
 - spec/ModuleCluster/Define/ClassOrInstanceCluster_spec.rb