callmeback 1.0.1 → 1.1.0

data/README.rdoc

@@ -17,7 +17,10 @@ Or add it to your gem file:
   gem 'callmeback'
 
 == Usage
+Add +include Callmeback+ after **all** your module inclusions to be sure the gem works.
+
   class Example
+    include Mongoid::Document
     include Callmeback
 
     before :foo => :bar
@@ -36,6 +39,7 @@ Or add it to your gem file:
 
 Because this extension overrides the +.initialize+ method, if you need to redefine it, please add +callback_binding+ to your +.initialize+ method. Here is the same example as above but implemeting the +.initialize+ method:
   class Example
+    include Mongoid::Document
     include Callmeback
 
     after :foo => :bar
@@ -59,6 +63,8 @@ Because this extension overrides the +.initialize+ method, if you need to redefi
 
 You can use +before+, +after+ and +around+, as if you use the suggested method in the +ActiveSupport::Callbacks+ documentation.
 
+Note that Mongoid is used in these examples but it *should* also work with ActiveRecord.
+
 == How is it work?
 First, this gem module defines the class methods +.before+, +.after+, +.around+ in your class. Then when you instanciate your class, the gem overrides your binded methods and wraps them to bind your custom callbacks.
 

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.1.0

data/callmeback.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "callmeback"
-  s.version = "1.0.1"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sebastien Azimi"]
-  s.date = "2012-05-09"
+  s.date = "2013-01-15"
   s.description = ""
   s.email = "sebstp@gmail.com"
   s.extra_rdoc_files = [
@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/suruja/callmeback"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.23"
   s.summary = "Automatically provide dead-simple ActiveSupport callbacks to your instance methods."
 
   if s.respond_to? :specification_version then

data/lib/callmeback.rb

@@ -1,50 +1,66 @@
+require 'active_support/concern'
 require 'active_support/callbacks'
 
 module Callmeback
-  extend ActiveSupport::Callbacks
+  extend ActiveSupport::Concern
+  include ActiveSupport::Callbacks
 
-  def self.included(base)
-    $callmeback_methods = {}
-    base.extend(ClassMethods)
-    base.module_eval do
-      include ActiveSupport::Callbacks
-    end
+  included do
+    # Initialize the callmeback methods and method index
+    self.callmeback_methods = {}
+    self.callmeback_method_index = 0
   end
 
-  def initialize
-    super
+  def initialize(*args, &block)
+    super(*args, &block)
+
+    # Overwrite the initialize method to perform the defined callbacks binding
     callback_binding
   end
 
   def callback_binding
-    $callmeback_methods.each do |pst, vals|
-      vals.each do |binded, callback|
-        class_eval do
-          define_method "wrapped_#{binded}" do
-            prefix = 'callmeback'
-            prefixed_binded = "#{prefix}_#{binded}"
+    self.class.callmeback_methods.each do |callback_prefix, callback_array|
+      callback_array.each do |callback_hash|
+        callback_hash.each do |binded, callbacks|
+          [callbacks].flatten.each do |callback|
+
+            binded_suffix = "method_#{self.class.callmeback_method_index}"
+            self.class.callmeback_method_index += 1
+
+            prefixed_wrapped_binded = "callmeback_wrapped_#{binded_suffix}"
+            prefixed_unwrapped_binded = "callmeback_unwrapped_#{binded_suffix}"
+
             class_eval do
-              define_callbacks prefixed_binded
-              set_callback prefixed_binded, pst, callback
-            end
+              define_method prefixed_wrapped_binded do
+                class_eval do
+                  define_callbacks prefixed_wrapped_binded
+                  set_callback prefixed_wrapped_binded, callback_prefix, callback
+                end
+
+                run_callbacks prefixed_wrapped_binded do
+                  send prefixed_unwrapped_binded
+                end
+              end
 
-            run_callbacks prefixed_binded do
-              send "unwrapped_#{binded}"
+              alias_method prefixed_unwrapped_binded, binded
+              alias_method binded, prefixed_wrapped_binded
             end
           end
-
-          alias_method "unwrapped_#{binded}", binded
-          alias_method binded, "wrapped_#{binded}"
         end
       end
     end
   end
 
   module ClassMethods
+    attr_accessor :callmeback_methods
+    attr_accessor :callmeback_method_index
+
     class_eval do
-      [:before, :after, :around].each do |method_name|
-        define_method method_name do |hsh|
-          $callmeback_methods[method_name] = hsh
+      [:before, :after, :around].each do |callback_prefix|
+        define_method callback_prefix do |arg, &block|
+          self.callmeback_methods[callback_prefix] ||= []
+          arg = {:"#{arg}" => block} if block.is_a?(Proc)
+          self.callmeback_methods[callback_prefix] << arg
         end
       end
     end

data/spec/app/models/example.rb

@@ -5,14 +5,61 @@ class Example
   after :after_foo => :bar
   around :around_foo => :around_bar
 
+  before :multiple_before_foo => [:bar, :bar]
+  after :multiple_after_foo => [:bar, :bar]
+  around :multiple_around_foo => [:around_bar, :around_bar]
+
+  before :complex_foo => :bar
+  around :complex_foo => [:around_bar, :around_bar]
+  after :complex_foo => [:bar, :bar]
+
+  before :block_before_foo do
+    bar
+  end
+
+  after :block_after_foo do
+    bar
+  end
+
+  around :block_around_foo do |&block|
+    bar
+    block.call
+    bar
+  end
+
+  before :complex_with_blocks_foo do
+    bar
+    bar
+  end
+  after :complex_with_blocks_foo do
+    bar
+  end
+  around :complex_with_blocks_foo do |&block|
+    bar
+    block.call
+    bar
+  end
+
+  before :complex_with_methods_and_blocks_foo => [:bar, :bar]
+  after :complex_with_methods_and_blocks_foo do
+    bar
+  end
+  around :complex_with_methods_and_blocks_foo do |&block|
+    bar
+    block.call
+    bar
+  end
+
   def initialize
     @result = []
     callback_binding
   end
 
-  def before_foo; foo; end
-  def after_foo; foo; end
-  def around_foo; foo; end
+  %w{before after around multiple_before multiple_after multiple_around complex block_before block_after block_around complex_with_blocks complex_with_methods_and_blocks}.each do |prefix|
+    define_method "#{prefix}_foo" do
+      foo
+    end
+  end
 
   private
   def foo

data/spec/callmeback_spec.rb

@@ -29,4 +29,56 @@ describe Callmeback do
       example.around_foo.should == %w{bar foo bar}
     end
   end
+
+  context "the callback value is an array of methods" do
+    describe ".before" do
+      it "should fire array-length callbacks before the original method is executed" do
+        example.multiple_before_foo.should == %w{bar bar foo}
+      end
+    end
+
+    describe ".after" do
+      it "should fire array-length callbacks after the original method is executed" do
+        example.multiple_after_foo.should == %w{foo bar bar}
+      end
+    end
+
+    describe ".around" do
+      it "should fire array-length callbacks around the original method is executed" do
+        example.multiple_around_foo.should == %w{bar bar foo bar bar}
+      end
+    end
+  end
+
+  context "the gem should handle complex callback structures" do
+    it "should fire the callbacks in the order of their call" do
+      example.complex_foo.should == %w{bar bar bar foo bar bar bar bar}
+    end
+  end
+
+  context "the gem should handle blocks as callbacks" do
+    it "should fire a callback block before the original method is executed" do
+      example.block_before_foo.should == %w{bar foo}
+    end
+
+    it "should fire a callback block after the original method is executed" do
+      example.block_after_foo.should == %w{foo bar}
+    end
+
+    it "should fire a callback block around the original method is executed" do
+      example.block_around_foo.should == %w{bar foo bar}
+    end
+  end
+
+  context "the gem should handle blocks as callbacks" do
+    it "should fire the callbacks in the order of their call" do
+      example.complex_with_blocks_foo.should == %w{bar bar bar foo bar bar}
+    end
+  end
+
+  context "the gem should handle blocks as callbacks and methods" do
+    it "should fire the callbacks in the order of their call" do
+      example.complex_with_methods_and_blocks_foo.should == %w{bar bar bar foo bar bar}
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: callmeback
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-09 00:00:00.000000000 Z
+date: 2013-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -192,7 +192,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -762099405
+      hash: 2462921630949056169
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -201,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Automatically provide dead-simple ActiveSupport callbacks to your instance