poly_delegate 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e361c440292c2ef5fafd483dc009bbf6d2f933a
-  data.tar.gz: 0f5ddc87ccce20950ff55c75c502b1589748355b
+  metadata.gz: 86b1a5ce6f8911671007a0098b5e9f39f04c7e0d
+  data.tar.gz: a44f331f4029d053e1e1cc12efd37657c1ea6343
 SHA512:
-  metadata.gz: b5a4267a89325390d048d9aeb1810f2ea7b6f39dafdc676eac182baf5c2446ff97c4383dbae7b0f8a1e410d798979e218b3df57391c64a0727df753270413285
-  data.tar.gz: 61ce9688c826efbf297c69bcb47d959e9d31fe9c0fdb78f5beaa49c6d595a1ed62cfb86fa1c18bd984268883d5aec72a796e75ca442e59a13ec04382a7266496
+  metadata.gz: 9e718e86a89b8b37d79cba03e95220812df46539ec4a0c042a26fdf4b51e7d2a886f9106c77127f68418fb921d1916de00878588b7cb2a5940a9423570fec535
+  data.tar.gz: fac1d66d0991b33041b1ed2e307b641e0e9036a4e9dab4b8620904cbaaaeb14e95e0585ee0e6ce4caf59c5bc766e205d514b5934462450403846705da0a67c9f

data/lib/poly_delegate/call.rb

@@ -0,0 +1,35 @@
+# encoding: utf-8
+# Copyright (c) 2016 Nathan Currier
+
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+require 'poly_delegate/method'
+
+module PolyDelegate
+  def self.distinguish_delegator(obj, *args)
+    delegator =
+      if args.empty? || !args.first.is_a?(Delegator)
+        obj
+      else
+        args.shift
+      end
+
+    [delegator, args]
+  end
+
+  def self.delegate_call(obj, method, *args, &block)
+    delegator, args = distinguish_delegator(obj, *args)
+    bound = force_bind(delegator, method)
+    bound.call(*args, &block)
+  end
+
+  def self.create_delegated_method(klass, name)
+    method = klass.instance_method(name)
+
+    redefine_method(klass, name) do |*args, &block|
+      PolyDelegate.delegate_call(self, method, *args, &block)
+    end
+  end
+end

data/lib/poly_delegate/delegated.rb

@@ -5,9 +5,9 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+require 'poly_delegate/call'
 require 'poly_delegate/classic_access'
 require 'poly_delegate/force_bind'
-require 'poly_delegate/method'
 
 module PolyDelegate
   module Delegated
@@ -19,7 +19,7 @@ module PolyDelegate
         intercepted = intercepted.map(&:instance_methods).reduce(&:-)
 
         intercepted.each do |name|
-          __create_delegated_method__(name)
+          PolyDelegate.create_delegated_method(base, name)
         end
       end
     end
@@ -27,31 +27,11 @@ module PolyDelegate
     module ClassMethods
       include ClassicAttributeAccess
 
-      def __create_delegated_method__(name)
-        method = instance_method(name)
-
-        PolyDelegate.redefine_method(self, name) do |*args, &block|
-          __delegated_call__(method, *args, &block)
-        end
-      end
-
-      def __delegated_call__(method, *args, &block)
-        delegator =
-          if args.empty? || !args.first.is_a?(Delegator)
-            self
-          else
-            args.shift
-          end
-
-        bound = PolyDelegate.force_bind(delegator, method)
-        bound.call(*args, &block)
-      end
-
       def method_added(name)
         return if %i(method_missing initialize).include?(name)
         return if PolyDelegate.callers(2).include?(:redefine_method)
 
-        __create_delegated_method__(name)
+        PolyDelegate.create_delegated_method(self, name)
       end
     end
   end

data/lib/poly_delegate/force_bind.rb

@@ -5,8 +5,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-require 'force_bind' if RUBY_ENGINE == 'ruby'
-
 module PolyDelegate
   # rubocop:disable Lint/DuplicateMethods
   case RUBY_ENGINE
@@ -17,6 +15,8 @@ module PolyDelegate
       Method.new(bound_obj, *method_args)
     end
   when 'ruby'
+    require 'force_bind'
+
     def self.force_bind(bound_obj, method)
       if bound_obj.class == method.owner
         method.bind(bound_obj)

data/lib/poly_delegate/version.rb

@@ -6,5 +6,5 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 module PolyDelegate
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poly_delegate
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Nathan Currier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-02 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :runtime
@@ -41,6 +41,7 @@ files:
 - gemfiles/Gemfile.ci
 - gemfiles/Gemfile.doc
 - lib/poly_delegate.rb
+- lib/poly_delegate/call.rb
 - lib/poly_delegate/classic_access.rb
 - lib/poly_delegate/delegated.rb
 - lib/poly_delegate/delegator.rb