method_callbacks 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19ee03dc720d25d9e1e326ac91e9718dd9e01272
-  data.tar.gz: f61c75e0258697e042aece4916c77c1c3de919a9
+  metadata.gz: ba8dff1ccdad716d4f7a3621e44af91c523f1e12
+  data.tar.gz: 8a7b5b9efe3cd8da572b175310b74749e6047894
 SHA512:
-  metadata.gz: 593b6df610d9e64695f9fe55fa185e943217f0b56775d993880398dbc6b320e8963f6fef04b4b1b811a155ea0d977787f63cf07f8fafa32e899e7faa7200c510
-  data.tar.gz: 11802ed240eb4727516519fed47f1d10fc70c085ef54462eded418eb1cdbcdbc95df08c98f21c47807ed5f78246d9e4845d838eb81cdb515f64479630fb97b55
+  metadata.gz: 045d53539c4410517b8dca5831f3499e08e3e5d081182f8c53a7264ba92005f9beb50b9ce030e42677d45e70d628bd161c456daab867e3a1f8510bda7f45a143
+  data.tar.gz: c365b942d95db6db0af206b827c94994d9b99d7918f2282e212240d7fc40da4879fb48303586c118556c685378094584b52e9a7b1c50022be18aad0ecaa975dc

data/CHANGELOG

@@ -1,3 +1,6 @@
+1.2.1 / 2014-06-18
+  * Rename private methods to avoid naming collisions
+
 1.2.0 / 2014-06-12
   * Add proxy_result as a type of callback
   * Add proxy_result examples to the readme

data/lib/method_callbacks.rb

@@ -8,55 +8,55 @@ module MethodCallbacks
 
   module ClassMethods
     def after_method(method_name, *callback_names)
-      define(method_name, :after, callback_names)
-      define_with_block(method_name, :after, &Proc.new) if block_given?
+      __method_callbacks_define(method_name, :after, callback_names)
+      __method_callbacks_define_with_block(method_name, :after, &Proc.new) if block_given?
     end
 
     def around_method(method_name, *callback_names)
-      define(method_name, :around, callback_names)
+      __method_callbacks_define(method_name, :around, callback_names)
     end
 
     def proxy_result(method_name, &block)
-      define_with_block(method_name, :proxy, &block)
+      __method_callbacks_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?
+      __method_callbacks_define(method_name, :before, callback_names)
+      __method_callbacks_define_with_block(method_name, :before, &Proc.new) if block_given?
     end
 
     private
 
-    def define(method_name, type, callback_names)
-      find_or_new(method_name).define(type, callback_names)
+    def __method_callbacks_define(method_name, type, callback_names)
+      __method_callbacks_find_or_new(method_name).define(type, callback_names)
     end
 
-    def define_with_block(method_name, type)
-      find_or_new(method_name).define_with_block(type, &Proc.new)
+    def __method_callbacks_define_with_block(method_name, type)
+      __method_callbacks_find_or_new(method_name).define_with_block(type, &Proc.new)
     end
 
-    def find(method_name)
-      finder(method_name).find
+    def __method_callbacks_find(method_name)
+      __method_callbacks_finder(method_name).find
     end
 
-    def finder(method_name)
-      @_finder ||= {}
-      @_finder[method_name] ||= MethodCallbacks::Finder.new(method_name)
+    def __method_callbacks_finder(method_name)
+      @___method_callbacks_finder ||= {}
+      @___method_callbacks_finder[method_name] ||= MethodCallbacks::Finder.new(method_name)
     end
 
-    def find_or_new(method_name)
-      method = finder(method_name).find_or_new
-      redefine_method(method)
+    def __method_callbacks_find_or_new(method_name)
+      method = __method_callbacks_finder(method_name).find_or_new
+      __method_callbacks_redefine_method(method)
       method
     end
 
-    def method_added(method_name)
-      redefine_method(find(method_name))
+    def __method_callbacks_method_added(method_name)
+      __method_callbacks_redefine_method(find(method_name))
 
       super
     end
 
-    def redefine_method(method)
+    def __method_callbacks_redefine_method(method)
       return if !method || method.locked? || !method_defined?(method.name) || method_defined?(method.alias)
 
       method.lock! && alias_method(method.alias, method.name)

data/lib/method_callbacks/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: method_callbacks
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Morgan Showman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-12 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement