module-cluster 2.0.1 → 2.0.2

data/README.md

@@ -8,7 +8,7 @@ Provides an interface for event hooks at any point during module include/extend
 
 # Description #
 
-Provides hooks via :included, :extended, :append_features, :extend_object, :subclass. Define behavior at hooks via simple interface.
+Provides hooks via :included, :extended, :append_features, :extend_object, :inherited. Define behavior at hooks via simple interface.
 
 # Install #
 

data/lib/module/cluster.rb

@@ -183,7 +183,7 @@ module ::Module::Cluster
   # @return [ModuleCluster::Cluster::InstanceController::HookController] Hook Controller instance.
   #
   def self.hook_cluster_events( instance, hooked_instance, event_context )
-    
+
     requires_module_cluster_enable = false
     
     # Subclass hooks always cascade to the first subclass.
@@ -264,11 +264,11 @@ module ::Module::Cluster
 
         end
         
-        if cascade_context
-          
+        if cascade_context and ! cascade_context.empty?
+
           # already handled
         
-        elsif match_context = this_frame.context
+        elsif match_context = this_frame.context and ! match_context.empty?
 
           # if we have a context we test against instance to see if we match, then we perform action
           case hooked_instance

data/lib/module/cluster/instance_controller/hook_controller/chain_proxy.rb

@@ -32,7 +32,7 @@ class ::Module::Cluster::InstanceController::HookController::ChainProxy
   ###
   # Declare that modules should be included at event hook in the context specified this chained declaration.
   #
-  # @overload include( module, .., & block )
+  # @overload include( module, ..., & block )
   #
   #   @param module Module to include at event hook in the context specified this chained declaration.
   #
@@ -57,7 +57,7 @@ class ::Module::Cluster::InstanceController::HookController::ChainProxy
   ###
   # Declare that modules should be extended at event hook in the context specified this chained declaration.
   #
-  # @overload extend( module, .., & block )
+  # @overload extend( module, ..., & block )
   #
   #   @param module Module to extend at event hook in the context specified this chained declaration.
   #
@@ -89,7 +89,7 @@ class ::Module::Cluster::InstanceController::HookController::ChainProxy
   # Declare that modules should be included and extended at event hook in the context 
   #   specified this chained declaration. See also #extend_and_include.
   #
-  # @overload include_and_extend( module, .., & block )
+  # @overload include_and_extend( module, ..., & block )
   #
   #   @param module Module to include and extend at event hook in the context specified this chained declaration.
   #
@@ -121,7 +121,7 @@ class ::Module::Cluster::InstanceController::HookController::ChainProxy
   # Declare that modules should be extended and included at event hook in the context 
   #   specified this chained declaration. Order is reversed from #include_and_extend.
   #
-  # @overload extend_and_include( module, .., & block )
+  # @overload extend_and_include( module, ..., & block )
   #
   #   @param module Module to extend and include at event hook in the context specified this chained declaration.
   #
@@ -175,7 +175,7 @@ class ::Module::Cluster::InstanceController::HookController::ChainProxy
   ###
   # Declare contexts to which declarations made from this declaration chain should cascade.
   #
-  # @overload cascade( context, .., & block )
+  # @overload cascade( context, ..., & block )
   #
   #   @param context nil, :any, :class, :module, :subclass Contexts that should have event hooks cascaded into them.
   #
@@ -226,7 +226,7 @@ class ::Module::Cluster::InstanceController::HookController::ChainProxy
   # Declare that chained actions should be inserted into the event stack prior to the location 
   #   in the same event stack where provided module(s) are specified to be extended.
   #
-  # @overload before_extend( module, .., & block )
+  # @overload before_extend( module, ..., & block )
   #
   #   @param module Module that insert should be prior to.
   #
@@ -252,7 +252,7 @@ class ::Module::Cluster::InstanceController::HookController::ChainProxy
   # Declare that chained actions should be inserted into the event stack prior to the location 
   #   in the same event stack where provided module(s) are specified to be included.
   #
-  # @overload before_include( module, .., & block )
+  # @overload before_include( module, ..., & block )
   #
   #   @param module Module that insert should be prior to.
   #
@@ -279,7 +279,7 @@ class ::Module::Cluster::InstanceController::HookController::ChainProxy
   # Declare that chained actions should be inserted into the event stack prior to the location 
   #   in the same event stack where provided module(s) are specified to be included or extended.
   #
-  # @overload before_include_or_extend( module, .., & block )
+  # @overload before_include_or_extend( module, ..., & block )
   #
   #   @param module Module that insert should be prior to.
   #
@@ -307,7 +307,7 @@ class ::Module::Cluster::InstanceController::HookController::ChainProxy
   # Declare that chained actions should be inserted into the event stack after the location 
   #   in the same event stack where provided module(s) are specified to be included.
   #
-  # @overload before_include( module, .., & block )
+  # @overload before_include( module, ..., & block )
   #
   #   @param module Module that insert should be after.
   #
@@ -333,7 +333,7 @@ class ::Module::Cluster::InstanceController::HookController::ChainProxy
   # Declare that chained actions should be inserted into the event stack after the location 
   #   in the same event stack where provided module(s) are specified to be extended.
   #
-  # @overload before_extend( module, .., & block )
+  # @overload before_extend( module, ..., & block )
   #
   #   @param module Module that insert should be after.
   #
@@ -360,7 +360,7 @@ class ::Module::Cluster::InstanceController::HookController::ChainProxy
   # Declare that chained actions should be inserted into the event stack after the location 
   #   in the same event stack where provided module(s) are specified to be included or extended.
   #
-  # @overload before_include_or_extend( module, .., & block )
+  # @overload before_include_or_extend( module, ..., & block )
   #
   #   @param module Module that insert should be after.
   #
@@ -387,7 +387,7 @@ class ::Module::Cluster::InstanceController::HookController::ChainProxy
   ###
   # Set context for matching instance to determine whether to perform chained actions in stack.
   #
-  # @overload context( context, .. )
+  # @overload context( context, ... )
   #
   #   @param context nil, :any, :class, :module, :subclass Contexts that should have event hooks cascaded into them.
   #

data/lib/module/cluster/instance_controller/hook_controller/hook_controller_interface.rb

@@ -670,7 +670,7 @@ module ::Module::Cluster::InstanceController::HookController::HookControllerInte
     new_frame = self.class::FrameStruct.new( @instance, cluster_name, contexts, cascade_to, block )
     
     @stack.insert( index, new_frame )
-    
+
     unless index < 0
       index += 1
     end

data/lib/module/cluster/module_support.rb

@@ -12,7 +12,7 @@ module ::Module::Cluster::ModuleSupport
   # Ensures {::Module::Cluster Module::Cluster} before_include hooks occur at time of include.
   #
   def append_features( hooked_instance )
-    
+
     ::Module::Cluster.hook_cluster_events( self, hooked_instance, :before_include )
 
     super if defined?( super )

data/spec/module/cluster_spec.rb

@@ -27,6 +27,68 @@ describe ::Module::Cluster do
   #  include hooks  #
   ###################
 
+  # before - block only
+  it 'can create a before-include hook to run a block' do
+    module ::Module::Cluster::BeforeIncludeBlockHookMock
+      
+      block_ran = false
+      
+      ClusterModuleMock = ::Module.new
+      ClusterModuleMock.instance_eval do
+        extend ::Module::Cluster
+        cluster( :cluster_name ).before_include do |instance|
+          block_ran = true
+        end
+      end
+      
+      module AnotherModule
+        include ClusterModuleMock
+      end
+
+      block_ran.should == true
+      
+      block_ran = false
+      
+      module OtherModule
+        include AnotherModule
+      end
+      
+      block_ran.should == false
+      
+    end
+  end
+
+  # after - block only
+  it 'can create an after-include hook to run a block' do
+    module ::Module::Cluster::BeforeIncludeBlockHookMock
+      
+      block_ran = false
+      
+      ClusterModuleMock = ::Module.new
+      ClusterModuleMock.instance_eval do
+        extend ::Module::Cluster
+        cluster( :cluster_name ).after_include do |instance|
+          block_ran = true
+        end
+      end
+      
+      module AnotherModule
+        include ClusterModuleMock
+      end
+
+      block_ran.should == true
+      
+      block_ran = false
+      
+      module OtherModule
+        include AnotherModule
+      end
+
+      block_ran.should == false
+      
+    end
+  end
+
   # before - without block
 
   it 'can create before-include hooks' do
@@ -179,6 +241,68 @@ describe ::Module::Cluster do
   #  extend hooks  #
   ##################
 
+  # before - block only
+  it 'can create a before-extend hook to run a block' do
+    module ::Module::Cluster::BeforeIncludeBlockHookMock
+      
+      block_ran = false
+      
+      ClusterModuleMock = ::Module.new
+      ClusterModuleMock.instance_eval do
+        extend ::Module::Cluster
+        cluster( :cluster_name ).before_extend do |instance|
+          block_ran = true
+        end
+      end
+      
+      module AnotherModule
+        extend ClusterModuleMock
+      end
+
+      block_ran.should == true
+      
+      block_ran = false
+      
+      module OtherModule
+        extend AnotherModule
+      end
+      
+      block_ran.should == false
+      
+    end
+  end
+
+  # after - block only
+  it 'can create a after-extend hook to run a block' do
+    module ::Module::Cluster::BeforeIncludeBlockHookMock
+      
+      block_ran = false
+      
+      ClusterModuleMock = ::Module.new
+      ClusterModuleMock.instance_eval do
+        extend ::Module::Cluster
+        cluster( :cluster_name ).after_extend do |instance|
+          block_ran = true
+        end
+      end
+      
+      module AnotherModule
+        extend ClusterModuleMock
+      end
+
+      block_ran.should == true
+      
+      block_ran = false
+      
+      module OtherModule
+        extend AnotherModule
+      end
+
+      block_ran.should == false
+      
+    end
+  end
+
   # before - without block
 
   it 'can create before-extend hooks' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: module-cluster
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-05 00:00:00.000000000 Z
+date: 2012-07-06 00:00:00.000000000 Z
 dependencies: []
 description: Provides hooks via :included, :extended, :append_features, :extend_object,
-  :subclass. Define behavior at hooks via simple interface.
+  :inherited. Define behavior at hooks via simple interface.
 email: asher@ridiculouspower.com
 executables: []
 extensions: []