big_spoon 0.2.0 → 0.2.1

data/CHANGES.md

@@ -1,4 +1,15 @@
 # CHANGELOG
+## 0.2.1
+### `hooks` now aliased as `spoon` to avoid namespace conflicts
+- Fixes bugs w/Railties generators and other libraries that use
+  a class method named `hooks`
+
+## 0.2.0
+### Multiple bugs fixed and test for decent backtraces
+- before and after filters no longer assume argument-less-methods
+- `before` and `after` are now in method_missing so they won't
+  conflict with other libraries
+
 ## 0.1.1
 ### :if, :unless, and tested in production!
 - :if => :method and :unless => lambda { false } are now supported.

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/big_spoon.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "big_spoon"
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Flip Sasser"]
-  s.date = "2012-08-14"
+  s.date = "2012-08-20"
   s.description = "\n      BigSpoon will add a hooks method to every class. Call that method with a block and add all kinds of fun hooks before and after your methods.\n    "
   s.email = "flip@x451.com"
   s.extra_rdoc_files = [

data/lib/big_spoon.rb

@@ -2,10 +2,10 @@ require 'big_spoon/hook'
 
 module BigSpoon
   module ClassMethods
-    def hooks(options = {}, &block)
+    def spoon(options = {}, &block)
       @hooks ||= Hook.for(self)
       @hooks.instance_eval(&block) if block_given?
-
+    
       unless respond_to?(:_big_spoon_original_method_added)
         class << self
           alias :_big_spoon_original_method_added :method_added
@@ -18,24 +18,33 @@ module BigSpoon
         end
       end
       @hooks
-    end # `hooks` method
+    end # `big_spoon` method
 
     private
-    def method_missing(method_name, *args)
+    def method_missing_with_big_spoon(method_name, *args, &block)
       case method_name.to_s
+      when 'hooks'
+        spoon *args, &block
       when 'after'
-        hooks.after *args
+        hooks.after *args, &block
       when /^after_(.+)$/
-        hooks.after $1, *args
+        hooks.after $1, *args, &block
       when 'before'
-        hooks.before *args
+        hooks.before *args, &block
       when /^before_(.+)$/
-        hooks.before $1, *args
+        hooks.before $1, *args, &block
       else
-        super
+        method_missing_without_big_spoon(method_name, *args)
       end
     end
   end # `ClassMethods` module
 end # `BigSpoon` module
 
-Object.extend BigSpoon::ClassMethods
+Object.class_eval do
+  extend BigSpoon::ClassMethods
+  class << self
+    alias :method_missing_without_big_spoon :method_missing
+    alias :method_missing :method_missing_with_big_spoon
+  end
+end
+

data/lib/big_spoon/hook.rb

@@ -15,12 +15,12 @@ module BigSpoon
 
     # Define a method to execute after another
     def after(method_to_hook, method_to_call = nil, options = {}, &block)
-      hook(:after, method_to_hook, method_to_call, options, &block)
+      add(:after, method_to_hook, method_to_call, options, &block)
     end
 
     # Define a method to execute before another
     def before(method_to_hook, method_to_call = nil, options = {}, &block)
-      hook(:before, method_to_hook, method_to_call, options, &block)
+      add(:before, method_to_hook, method_to_call, options, &block)
     end
 
     # def clear!
@@ -65,17 +65,39 @@ module BigSpoon
       methods[method_to_hook.to_sym] && hookable?(method_to_hook) && !hooked?(method_to_hook)
     end
 
-    def unhook!(method_to_hook)
-      hooked_method = hooked_method(method_to_hook)
-      original_method = original_method(method_to_hook)
-      line = __LINE__; alias_these_hooks = <<-hooks
-      alias :#{method_to_hook} #{original_method}
-      remove_method #{hooked_method}
-      hooks
-      klass.class_eval alias_these_hooks, __FILE__, line.succ
-    end
+    # def unhook!(method_to_hook)
+    #   hooked_method = hooked_method(method_to_hook)
+    #   original_method = original_method(method_to_hook)
+    #   line = __LINE__; alias_these_hooks = <<-hooks
+    #   alias :#{method_to_hook} #{original_method}
+    #   remove_method #{hooked_method}
+    #   hooks
+    #   klass.class_eval alias_these_hooks, __FILE__, line.succ
+    # end
 
     private
+    def add(before_or_after, method_to_hook, method_to_call = nil, options = {}, &block)
+      method_to_hook = method_to_hook.to_sym
+      if method_to_call.is_a? Hash
+        options = method_to_call
+        method_to_call = nil
+      end
+      if block_given?
+        method_to_call = block
+      else
+        method_to_call = method_to_call.to_sym
+      end
+
+      methods[method_to_hook] ||= {}
+      methods[method_to_hook][before_or_after] ||= []
+      method_definition = options.merge({:method => method_to_call})
+      methods[method_to_hook][before_or_after].push(method_definition) unless methods[method_to_hook][before_or_after].any? do |other_method_definition|
+        other_method_definition[:method] == method_to_call
+      end
+
+      hook!(method_to_hook) if should_hook?(method_to_hook)
+    end
+
     def execute(before_or_after, method_to_hook, instance)
       methods[method_to_hook] ||= {}
       methods[method_to_hook][before_or_after] ||= []
@@ -102,28 +124,6 @@ module BigSpoon
       end
     end
 
-    def hook(before_or_after, method_to_hook, method_to_call = nil, options = {}, &block)
-      method_to_hook = method_to_hook.to_sym
-      if method_to_call.is_a? Hash
-        options = method_to_call
-        method_to_call = nil
-      end
-      if block_given?
-        method_to_call = block
-      else
-        method_to_call = method_to_call.to_sym
-      end
-
-      methods[method_to_hook] ||= {}
-      methods[method_to_hook][before_or_after] ||= []
-      method_definition = options.merge({:method => method_to_call})
-      methods[method_to_hook][before_or_after].push(method_definition) unless methods[method_to_hook][before_or_after].any? do |other_method_definition|
-        other_method_definition[:method] == method_to_call
-      end
-
-      hook!(method_to_hook) if should_hook?(method_to_hook)
-    end
-
     def hookable?(method_to_hook)
       klass.method_defined?(method_to_hook)
     end

data/spec/lib/big_spoon_spec.rb

@@ -48,10 +48,6 @@ describe BigSpoon do
     @big_spoon_test = BigSpoonTest.new
   end
 
-  it "should monkeypatch Object" do
-    Object.should respond_to(:hooks)
-  end
-
   it "should allow me to add a hook before an object's methods BEFORE THEY EXIST" do
     @big_spoon_test.should_receive(:hook_1)
     @big_spoon_test.foo!
@@ -145,7 +141,7 @@ describe BigSpoon do
     @big_spoon_test.i_accept_many("ohai", "i'll be an array", "someday")
   end
 
-  it "should handle an option argument" do
+  it "should handle an optional argument" do
     BigSpoonTest.after :i_might_accept_one, :hook_11
     @big_spoon_test.should_receive(:puts).with(nil)
     @big_spoon_test.i_might_accept_one
@@ -155,7 +151,7 @@ describe BigSpoon do
     BigSpoonTest.after :raise_sommat, :hook_12
     begin
       @big_spoon_test.raise_sommat
-    rescue Exception => error
+    rescue
       $!.backtrace.first.should =~ /:\d+\:in `raise_sommat'/
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: big_spoon
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-14 00:00:00.000000000 Z
+date: 2012-08-20 00:00:00.000000000 Z
 dependencies: []
 description: ! "\n      BigSpoon will add a hooks method to every class. Call that
   method with a block and add all kinds of fun hooks before and after your methods.\n
@@ -49,7 +49,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2835356473338463026
+      hash: 2773944303666380351
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: