method_callbacks 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbf0e679bd6e803446afce6df859949314259077
-  data.tar.gz: f1c885539200a66a3b71eb2a875f46d07bac3fce
+  metadata.gz: 7ce34ba7f8257e2369d5fc112aa947a7455e58d6
+  data.tar.gz: a929db6bcd8cc31b78f797158aabb24e22722151
 SHA512:
-  metadata.gz: 7e2609566689254861eb16ceef74c4a71e6025253b420f99e68866edd36555ede6dfd93557fcdb9e696be01926064d5245bc542d1ed0dc53bc184fd8fdaf3b18
-  data.tar.gz: cffb1bb69568ab5d172d8861351688cafcc66eb9fd30da97ea9e0f02dca0c7df2bbe386abb4745649f755983ac169d42cb2fdbb9f2c94bc750eae5f1872ea22c
+  metadata.gz: 4e692481c23bf044c38a0c2b59fca6747454d5c8d131d49543ede7a023739d0a73642b3a2ea7cf01eb276d91c2c6e28896387834f7ab549d95b6b2bb67bf6c6d
+  data.tar.gz: ff58f30bde12591cbaf329fadac637d9d2f860e2c5c98e594c799a22bc3502f6cceb8054cac6d7878cf873c72a9859e5d31d09d52a9cafde3f7eb038ef934143

data/CHANGELOG

@@ -0,0 +1,9 @@
+1.1.0 / 2014-06-12
+	* Add badges for Travis CI and RubyGems to README
+  * Test return value of method with callbacks
+  * Encapsulate a method's alias in the method class
+  * Fix defining callbacks after the method definition
+	* Add changelog
+
+1.0.0 / 2014-05-31
+  * Initial release of method_callbacks

data/README.md

@@ -1,3 +1,7 @@
+[![Build Status](https://travis-ci.org/MorganShowman/method_callbacks.svg?branch=master)](https://travis-ci.org/MorganShowman/method_callbacks)
+
+[![Gem Version](https://badge.fury.io/rb/method_callbacks.svg)](http://badge.fury.io/rb/method_callbacks)
+
 # MethodCallbacks
 
 Add after, around, and before callbacks to your methods.

data/lib/method_callbacks.rb

@@ -2,8 +2,6 @@ require "method_callbacks/finder"
 require "method_callbacks/version"
 
 module MethodCallbacks
-  ALIAS_PREFIX = "__method_callback_alias_to_original"
-
   def self.included(base)
     base.extend(ClassMethods)
   end
@@ -43,7 +41,9 @@ module MethodCallbacks
     end
 
     def find_or_new(method_name)
-      finder(method_name).find_or_new
+      method = finder(method_name).find_or_new
+      redefine_method(method)
+      method
     end
 
     def method_added(method_name)
@@ -53,14 +53,14 @@ module MethodCallbacks
     end
 
     def redefine_method(method)
-      return if !method || method.locked?
+      return if !method || method.locked? || !method_defined?(method.name) || method_defined?(method.alias)
 
-      method.lock! && alias_method("#{ALIAS_PREFIX}_#{method.name}", method.name)
+      method.lock! && alias_method(method.alias, method.name)
 
       define_method(method.name) do
         method.execute(:before, self)
         return_value = method.execute(:around, self) do
-          send("#{ALIAS_PREFIX}_#{method.name}")
+          send(method.alias)
         end
         method.execute(:after, self)
         return_value

data/lib/method_callbacks/method.rb

@@ -7,6 +7,8 @@ module MethodCallbacks
   class Method
     extend Forwardable
 
+    ALIAS_PREFIX = "__method_callback_alias_to_original"
+
     attr_reader :name
 
     def_delegators :definer, :define, :define_with_block
@@ -20,6 +22,10 @@ module MethodCallbacks
       self.name == other.name
     end
 
+    def alias
+      "#{ALIAS_PREFIX}_#{name}"
+    end
+
     def callbacks(type)
       @_callbacks ||= {}
       @_callbacks[type] ||= []

data/lib/method_callbacks/version.rb

@@ -1,3 +1,3 @@
 module MethodCallbacks
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/spec/method_callbacks_spec.rb

@@ -16,16 +16,19 @@ describe MethodCallbacks do
     expect(test_callbacks).to receive(:puts).with("Executing unload").ordered
     expect(test_callbacks).to receive(:puts).with("Executing block").ordered
 
-    test_callbacks.action
+    expect(test_callbacks.action).to eq("Return value")
   end
 end
 
 class TestCallbacks
   include MethodCallbacks
 
-  after_method :action, :farewell, :unload
-  after_method :action do
-    puts "Executing block"
+  def intro
+    puts "Executing intro"
+  end
+
+  def greet
+    puts "Executing greet"
   end
 
   before_method :action do
@@ -33,8 +36,23 @@ class TestCallbacks
   end
   before_method :action, :intro
   before_method :action, :greet
+  def action
+    puts "Executing action"
 
-  around_method :action, :outer_around, :inner_around
+    "Return value"
+  end
+  after_method :action, :farewell, :unload
+  after_method :action do
+    puts "Executing block"
+  end
+
+  def farewell
+    puts "Executing farewell"
+  end
+
+  def unload
+    puts "Executing unload"
+  end
 
   def outer_around
     puts "Executing pre outer_around"
@@ -43,32 +61,12 @@ class TestCallbacks
     return_value
   end
 
+  around_method :action, :outer_around, :inner_around
+
   def inner_around
     puts "Executing pre inner_around"
     return_value = yield
     puts "Executing post inner_around"
     return_value
   end
-
-  def action
-    puts "Executing action"
-
-    "Return value"
-  end
-
-  def greet
-    puts "Executing greet"
-  end
-
-  def intro
-    puts "Executing intro"
-  end
-
-  def farewell
-    puts "Executing farewell"
-  end
-
-  def unload
-    puts "Executing unload"
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: method_callbacks
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Morgan Showman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-31 00:00:00.000000000 Z
+date: 2014-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -89,6 +89,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CHANGELOG
 - Gemfile
 - Guardfile
 - LICENSE.txt