nakajima-booty-call 0.0.1 → 0.0.2

data/lib/booty-call.rb

@@ -0,0 +1 @@
+require File.dirname(__FILE__) + '/booty_call.rb'

data/lib/booty_call/callbacker.rb

@@ -19,7 +19,6 @@ module BootyCall
     
     def extend_klass
       klass.class_eval do
-        meta_eval { attr_reader :pristine_cache, :callback_cache }
         @pristine_cache = Hash.new
         @callback_cache = { :after => Hash.new([]), :before => Hash.new([]) }
         extend ClassMethods
@@ -42,6 +41,9 @@ module BootyCall
     end
     
     def redefine_method(method_id)
+      safe_method_id = method_id.to_s
+      safe_method_id.gsub!(/=/, '__EQUALS__')
+      safe_method_id.gsub!(/\?/, '__PREDICATE__')
       klass.class_eval(<<-EOS, "(__DELEGATION__)", 1)
         def #{method_id}(*args, &block)
           catch(#{method_id.to_sym.inspect}) do
@@ -52,13 +54,21 @@ module BootyCall
           end
         end
         
-        def #{method_id}_without_callbacks(*args, &block)
+        def #{safe_method_id}_without_callbacks(*args, &block)
           __PRISTINE__(#{method_id.inspect}, *args, &block)
         end
       EOS
     end
     
     module ClassMethods
+      def pristine_cache
+        @pristine_cache || superclass.pristine_cache
+      end
+      
+      def callback_cache
+        @callback_cache || superclass.callback_cache
+      end
+      
       def run_callbacks_for(target, position, method_id, *results)
         callbacks = callback_cache[position][method_id.to_sym]
         

data/lib/booty_call/hook.rb

@@ -17,8 +17,8 @@ module BootyCall
         callback(:after, method_id, *args, &block)
       end
       
-      def observe(method_id, &block)
-        @introspector.observe(method_id, &block)
+      def observe(method_id, options={}, &block)
+        @introspector.observe(method_id, options, &block)
       end
       
       def callback(position, method_id, *args, &block)

data/lib/booty_call/introspector.rb

@@ -1,18 +1,19 @@
 module BootyCall
   class Introspector
-    attr_reader :klass
+    attr_reader :klass, :options
     
-    def initialize(klass)
-      @klass = klass
+    def initialize(klass, options={})
+      @klass, @options = klass, options
       @observed_methods = { }
     end
     
     def observe_klass!
       @observed ||= begin
         this = self
-        klass.meta_def(:method_added) do |m|
+        hook = options[:metaclass] ? :singleton_method_added : :method_added
+        klass.meta_def(hook) do |m|
           this.check_method(m)
-        end and true
+        end; true
       end
     end
     
@@ -20,22 +21,29 @@ module BootyCall
       not not @observed_methods[method_id]
     end
     
-    def observe(method_id, &block)
+    def observe(method_id, options={}, &block)
       observe_klass!
-      @observed_methods[method_id] ||= []
-      @observed_methods[method_id].tap do |set|
-        set.push(block) if block_given?
-        set.tap.compact!.uniq!
-      end
-    end
-    
-    def check_method(method_id)
-      handlers = @observed_methods.delete(method_id)
-      handlers.each(&:call) rescue nil
+      @observed_methods[method_id] ||= ObservedMethod.new(method_id, options)
+      @observed_methods[method_id].push(block) if block_given?
     end
     
     def defined_methods
       (klass.instance_methods - Object.instance_methods).map(&:to_sym)
     end
+    
+    def check_method(sym)
+      @observed_methods.each do |method_id, observer|
+        stop_observing(method_id) do
+          observer.match(sym)
+          observer.valid?
+        end
+      end
+    end
+    
+    def stop_observing(method_id, &block)
+      @observed_methods.delete(method_id).tap do |observer|
+        @observed_methods[method_id] = observer if block.try(:call, observer)
+      end
+    end
   end
 end

data/lib/booty_call/observed_method.rb

@@ -0,0 +1,31 @@
+module BootyCall
+  class ObservedMethod
+    attr_reader :method_id
+
+    def initialize(method_id, options={})
+      @method_id = method_id
+      @callbacks = []
+      @count = 0
+      @times = options[:times] || 1
+    end
+  
+    def match(sym)
+      return unless case method_id
+      when Symbol then valid?
+      when Regexp then valid? and method_id.try(:match, sym.to_s)
+      else ; nil
+      end
+      @callbacks.each { |fn| fn.call(sym) }
+      @count += 1
+    end
+    
+    def valid?
+      @times.eql?(:infinite) or @count < @times
+    end
+  
+    def push(*args)
+      @callbacks += args
+      @callbacks.tap.compact!.uniq!
+    end
+  end
+end

data/lib/booty_call.rb

@@ -1,11 +1,12 @@
 $LOAD_PATH << File.dirname(__FILE__) + '/booty_call'
 
 module BootyCall
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end
 
 require 'rubygems'
 require 'nakajima'
 require 'callbacker'
+require 'observed_method'
 require 'introspector'
 require 'hook'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nakajima-booty-call
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Pat Nakajima
@@ -31,10 +31,12 @@ extra_rdoc_files: []
 
 files: 
 - lib/booty_call
-- lib/booty_call/callbacker.rb
+- lib/booty-call.rb
+- lib/booty_call.rb
 - lib/booty_call/hook.rb
+- lib/booty_call/callbacker.rb
 - lib/booty_call/introspector.rb
-- lib/booty_call.rb
+- lib/booty_call/observed_method.rb
 has_rdoc: false
 homepage: http://github.com/nakajima/booty-call
 post_install_message: