method_callbacks 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c458557e297aaf3c9665fbcb7019ea0f33bfce2
-  data.tar.gz: 59d48ddf065fc2e56169b446a9a37cc5251d455b
+  metadata.gz: 19ee03dc720d25d9e1e326ac91e9718dd9e01272
+  data.tar.gz: f61c75e0258697e042aece4916c77c1c3de919a9
 SHA512:
-  metadata.gz: b309cbec10a4620855225e4c468e86be6691e3f1a233672aa46c9b35665def49d8358d7d670350af72fd922beb603368e6bbc16f8e155d649a735091bb657797
-  data.tar.gz: 97507375a55e7f4b26ff1524500bb0c75eb773b9662e9e6cab504d85427683b10248e0dd9c572e9a660dfa4aac51cb55a3461c9c911c99ae54a1051f3bd51030
+  metadata.gz: 593b6df610d9e64695f9fe55fa185e943217f0b56775d993880398dbc6b320e8963f6fef04b4b1b811a155ea0d977787f63cf07f8fafa32e899e7faa7200c510
+  data.tar.gz: 11802ed240eb4727516519fed47f1d10fc70c085ef54462eded418eb1cdbcdbc95df08c98f21c47807ed5f78246d9e4845d838eb81cdb515f64479630fb97b55

data/CHANGELOG

@@ -1,3 +1,7 @@
+1.2.0 / 2014-06-12
+  * Add proxy_result as a type of callback
+  * Add proxy_result examples to the readme
+
 1.1.1 / 2014-06-12
   * Replace rspec nested format with documentation
 

data/README.md

@@ -91,6 +91,33 @@ Executing farewell after action but before unload!
 Executing unload after action and farewell!
 Executing block callback after action and everything else!
  => "My return value!"
+
+class TestProxyResult
+  include MethodCallbacks
+
+  def result
+    "hello!"
+  end
+  proxy_result(:result) { |original_result| "the original result was: #{original_result}" }
+
+  def result_with_block
+    "hello world!"
+  end
+  proxy_result(:result_with_block) { |original_result, &block| block.call(original_result) }
+
+  def chain_result_proxy
+    "original"
+  end
+  proxy_result(:chain_result_proxy) { |original_result| "original_result: #{original_result}" }
+  proxy_result(:chain_result_proxy) { |chained_result| "chained_result: #{chained_result}" }
+end
+
+> TestProxyResult.new.result
+ => "the original result was: hello!"
+> TestProxyResult.new.result_with_block
+ => "hello world!"
+> TestProxyResult.new.chain_result_proxy
+ => "original_result: chained_result: original"
 ```
 
 ## Contributing

data/lib/method_callbacks/executor.rb

@@ -8,10 +8,15 @@ module MethodCallbacks
       @object = object
     end
 
-    def execute
-      return execute_callbacks if !block_given?
-
-      callbacks.empty? ? yield : execute_around_callbacks(&Proc.new)
+    def execute(&block)
+      case type
+      when :proxy
+        execute_proxy_callbacks(&block)
+      when :around
+        execute_around_callbacks(&block)
+      else
+        execute_callbacks
+      end
     end
 
     private
@@ -27,5 +32,9 @@ module MethodCallbacks
     def execute_callbacks
       callbacks.each { |callback_name| callback_name.is_a?(Proc) ? object.instance_eval(&callback_name) : object.send(callback_name) }
     end
+
+    def execute_proxy_callbacks(&block_on_call)
+      callbacks.reduce(object) { |result, block| block.call(result, &block_on_call) }
+    end
   end
 end

data/lib/method_callbacks/version.rb

@@ -1,3 +1,3 @@
 module MethodCallbacks
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/lib/method_callbacks.rb

@@ -16,6 +16,10 @@ module MethodCallbacks
       define(method_name, :around, callback_names)
     end
 
+    def proxy_result(method_name, &block)
+      define_with_block(method_name, :proxy, &block)
+    end
+
     def before_method(method_name, *callback_names)
       define(method_name, :before, callback_names)
       define_with_block(method_name, :before, &Proc.new) if block_given?
@@ -57,11 +61,10 @@ module MethodCallbacks
 
       method.lock! && alias_method(method.alias, method.name)
 
-      define_method(method.name) do
+      define_method(method.name) do |&block|
         method.execute(:before, self)
-        return_value = method.execute(:around, self) do
-          send(method.alias)
-        end
+        return_value = method.execute(:around, self) { send(method.alias) }
+        return_value = method.execute(:proxy, return_value, &block)
         method.execute(:after, self)
         return_value
       end

data/spec/method_callbacks_spec.rb

@@ -2,6 +2,7 @@ require "spec_helper"
 
 describe MethodCallbacks do
   let(:test_callbacks) { TestCallbacks.new }
+  let(:test_proxy_result) { TestProxyResult.new }
 
   it "should execute all the callbacks on action" do
     expect(test_callbacks).to receive(:puts).with("Executing block").ordered
@@ -18,6 +19,21 @@ describe MethodCallbacks do
 
     expect(test_callbacks.action).to eq("Return value")
   end
+
+  it "should proxy the result" do
+    expect(test_proxy_result.result).to eq("the original result was: hello!")
+  end
+
+  it "should proxy the result with block" do
+    test_string = "the original result was:"
+    expect(test_proxy_result.result_with_block do |result|
+      "#{test_string} #{result}"
+    end).to eq("#{test_string} hello world!")
+  end
+
+  it "should chain proxy results" do
+    expect(test_proxy_result.chain_result_proxy).to eq("chained_result: original_result: original")
+  end
 end
 
 class TestCallbacks
@@ -70,3 +86,23 @@ class TestCallbacks
     return_value
   end
 end
+
+class TestProxyResult
+  include MethodCallbacks
+
+  def result
+    "hello!"
+  end
+  proxy_result(:result) { |original_result| "the original result was: #{original_result}" }
+
+  def result_with_block
+    "hello world!"
+  end
+  proxy_result(:result_with_block) { |original_result, &block| block.call(original_result) }
+
+  def chain_result_proxy
+    "original"
+  end
+  proxy_result(:chain_result_proxy) { |original_result| "original_result: #{original_result}" }
+  proxy_result(:chain_result_proxy) { |chained_result| "chained_result: #{chained_result}" }
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: method_callbacks
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Morgan Showman