define_method_handler 0.0.4 → 0.0.5

data/CHANGELOG

@@ -1,3 +1,7 @@
+0.0.5   added error handling on remove_method
+
+        refactor: changed state variables of chain to changes to allow keeping state of multiple methods by nam
+
 0.0.4   Allow referencing self from condition block	
 
     Allow using of normal methods as method handlers define_method_handler(:foo, :method => :foo_impl)

data/Rakefile

@@ -7,7 +7,7 @@ require "rspec/core/rake_task"
 
 spec = Gem::Specification.new do |s|
   s.name = 'define_method_handler'
-  s.version = '0.0.4'
+  s.version = '0.0.5'
   s.author = 'Dario Seminara'
   s.email = 'robertodarioseminara@gmail.com'
   s.platform = Gem::Platform::RUBY

data/lib/define_method_handler.rb

@@ -50,8 +50,11 @@ class Class
           end
           chain.send(tmp_method,*args)
         ensure
-          chain.class.class_eval do
-            remove_method(tmp_method)
+          begin
+            chain.class.class_eval do
+              remove_method(tmp_method)
+            end
+          rescue NameError
           end
         end
       else
@@ -67,39 +70,37 @@ class Class
   
   module ChainMethods
     def disabled_handler_groups
-      @disabled_handler_groups ||= Set.new
-    end
-    
-    def disabled_handler_groups=(a)
-      @disabled_handler_groups=a
+      @disabled_handler_groups ||= Hash.new
     end
     
-    def enable_handler_group(groupname)
+    def enable_handler_group(groupname, mname = self.class.method_handlers.keys.first)
       group_included = false
       if block_given?
-        old_groups = disabled_handler_groups.dup
+        old_groups = (disabled_handler_groups[mname]||Set.new).dup
         begin
-          enable_handler_group(groupname)
+          enable_handler_group(groupname,mname)
           yield
         ensure
-          self.disabled_handler_groups = old_groups
+          self.disabled_handler_groups[mname] = old_groups
         end
       else
-        disabled_handler_groups.delete(groupname)
+        disabled_handler_groups[mname] ||= Set.new
+        disabled_handler_groups[mname].delete(groupname)
       end
     end
     
-    def disable_handler_group(groupname)
+    def disable_handler_group(groupname, mname = self.class.method_handlers.keys.first)
       if block_given?
-        old_groups = disabled_handler_groups.dup
+        old_groups = (disabled_handler_groups[mname]||Set.new).dup
         begin
-          disable_handler_group(groupname)
+          disable_handler_group(groupname,mname)
           yield
         ensure
-          self.disabled_handler_groups = old_groups
+          self.disabled_handler_groups[mname] = old_groups
         end
       else
-        disabled_handler_groups << groupname
+        disabled_handler_groups[mname] ||= Set.new
+        disabled_handler_groups[mname] << groupname
       end
     end
   end
@@ -123,17 +124,18 @@ class Class
     options = options.inject(&:merge) || {}
     options.merge!(@method_handler_options) if @method_handler_options 
     
-    @method_handlers ||= Array.new
+    @method_handlers ||= Hash.new
+    @method_handlers[mname] ||= Array.new
     @next_priority = (@next_priority || 0) + 1
     
     mh = MethodHandler.new(blk, @next_priority, (options[:group].to_a + :default.to_a), options[:priority] || 0)
     mh.method_name = options[:method]
     
-    @method_handlers << mh
+    @method_handlers[mname] << mh
     
     include ChainMethods
     
-    @method_handlers.sort!{|x,y| 
+    @method_handlers[mname].sort!{|x,y| 
       if x.priority == y.priority
         x.second_priority <=> y.second_priority
        else
@@ -142,9 +144,12 @@ class Class
     }
         
     define_method(mname) do |*x, &callblk|
-      self.class.method_handlers.reject{|mhh| 
+      self.class.method_handlers[mname].reject{|mhh| 
           mhh.group.count { |gr|
-            (@disabled_handler_groups||[]).include? gr
+            @disabled_handler_groups ||= Hash.new
+            @disabled_handler_groups[mname]||= Set.new
+            
+            @disabled_handler_groups[mname].include? gr
           } > 0 }.reverse_each do |mhh|
 
         if mhh.execute?(self,*x)
@@ -161,8 +166,11 @@ class Class
             end
           ensure
             unless mhh.method_name
-              self.class.class_eval do
-                remove_method(tmp_method)
+              begin
+                self.class.class_eval do
+                  remove_method(tmp_method)
+                end
+              rescue NameError
               end
             end 
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: define_method_handler
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-26 00:00:00.000000000Z
+date: 2012-01-29 00:00:00.000000000Z
 dependencies: []
 description: Chain of responsability implementation in a ruby fashion way. See README
   for examples