module-cluster 2.0.4 → 2.0.5

data/lib/module/cluster.rb

@@ -46,6 +46,23 @@ module ::Module::Cluster
     return ::Module::Cluster.cluster( self, name )
     
   end
+  
+  ##################
+  #  has_cluster?  #
+  ##################
+  
+  ###
+  # Get cluster for name. Will create cluster if it does not already exist.
+  #
+  # @param name Name of cluster.
+  #
+  # @return [true,false] Whether cluster name exists for self.
+  #
+  def has_cluster?( name )
+    
+    return ::Module::Cluster.has_cluster?( self, name )
+    
+  end
 
   ##################################################################################################
   #   private ######################################################################################
@@ -79,6 +96,8 @@ module ::Module::Cluster
       @clusters[ instance ] = instance_hash = { }
     end
     
+    name = name.to_sym
+    
     unless cluster_instance = instance_hash[ name ]
       instance_hash[ name ] = cluster_instance = ::Module::Cluster::Cluster.new( instance, name )
     end
@@ -87,6 +106,35 @@ module ::Module::Cluster
     
   end
 
+  #######################
+  #  self.has_cluster?  #
+  #######################
+  
+  ###
+  # @private
+  #
+  # Return whether cluster exists for instance.
+  #
+  # @param instance 
+  #          Instance for which cluster is being queried.
+  #
+  # @param name 
+  #          Name of cluster for instance.
+  #
+  # @return [true,false] Whether cluster exists for instance.
+  #
+  def self.has_cluster?( instance, name )
+    
+    has_cluster = false
+    
+    if instance_hash = @clusters[ instance ]
+      has_cluster = instance_hash.has_key?( name.to_sym )
+    end
+    
+    return has_cluster
+    
+  end
+  
   ##############################
   #  self.instance_controller  #
   ##############################
@@ -185,7 +233,7 @@ module ::Module::Cluster
   def self.hook_cluster_events( instance, hooked_instance, event_context )
 
     requires_module_cluster_enable = false
-    
+
     # Subclass hooks always cascade to the first subclass.
     # If it should casade for each subclass that has to be declared explicitly and will be handled below.
     unless event_context == :subclass
@@ -316,7 +364,7 @@ module ::Module::Cluster
 
           # if we have a block it runs last
           if this_block = this_frame.block
-            this_frame.owner.module_exec( hooked_instance, & this_block )
+            instance.module_exec( hooked_instance, this_frame.owner, & this_block )
           end
 
         end

data/lib/module/cluster/cluster/cluster_interface.rb

@@ -155,12 +155,14 @@ module ::Module::Cluster::Cluster::ClusterInterface
     hook_controller = @instance_controller.after_include_controller
     
     chain_proxy_instance = hook_controller.chain_proxy
+        
+    chain_proxy_instance.cluster_name( @name ).context( *contexts )
     
     if block_given?
-      hook_controller.action( & block )
+      chain_proxy_instance.action( & block )
     end
     
-    return hook_controller.chain_proxy.cluster_name( @name ).context( *contexts )
+    return chain_proxy_instance
 
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: module-cluster
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-12 00:00:00.000000000 Z
+date: 2012-07-17 00:00:00.000000000 Z
 dependencies: []
 description: Provides hooks via :included, :extended, :append_features, :extend_object,
   :inherited. Define behavior at hooks via simple interface.