forwardable-extended 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44928a73258dd5fea629b2a83f2c33606ca922c1
-  data.tar.gz: 6848d6b288a73cbbbdabfcc3941e2a5bc1ab4f71
+  metadata.gz: 6f03c74bee501582d5fe8c93eab591e72cf285c9
+  data.tar.gz: 7d83bd3e70ab74b9ac87879fe8912b29ebbf58c0
 SHA512:
-  metadata.gz: 0761c6e6e3ce5346eac28ab13f56c8fb64a7f185b9beb8051611feaeb417f0ea63cc48d4a2ee01b36af38e83378553eca0fb65a4bc85ca7c29275cf0716a743e
-  data.tar.gz: 62c8057174d3a5fe87163a6cc99a3408a2ccebfdccd69acb0f0a89a276393745dbe3e2eba9b5f6c9e4a715451adf5dff500cefa9118a31e980b1dca93e997486
+  metadata.gz: d26c1a7fda68197b490555a293d9eccd0ec61c67b145aac2b37fa4faa011bff377497f9f6e0eac28184ed88be746e142c2d2276598768ac8f9dd2bc6215c9d98
+  data.tar.gz: 0d8f3c7826b12edd53cde5864e2d7350741b361286d4ca91d75058fa8692b9442ca0d4b96c66f69912f04d12bffe9ed02928b1618bd409f8e7963723208a2a5b

data/lib/forwardable/extended.rb

@@ -1,77 +1,144 @@
+# ----------------------------------------------------------------------------
 # Frozen-string-literal: true
 # Copyright: 2015-2016 Jordon Bedwell - MIT License
 # Encoding: utf-8
+# ----------------------------------------------------------------------------
 
 require "forwardable/extended/version"
 require "forwardable"
 
 module Forwardable
   module Extended
-    DEF_DELEGATOR = Object::Forwardable.instance_method(:def_delegator)
 
+    # ------------------------------------------------------------------------
+    # A simpler delegator that wraps around `def_delegator` and makes it easy.
+    # ------------------------------------------------------------------------
+
+    def rb_delegate(method, to: nil, alias_of: method, **kwd)
+      raise ArgumentError, "to must be provided" unless to
+      def_delegator(
+        to, alias_of, method, **kwd
+      )
+    end
+
+    # ------------------------------------------------------------------------
     # Delegates a method to a `hash[key]`.
     # @param [Symbol] key used if method is an alias; disignates the hash key.
     # @param [Hash] hash the hash object you wish to delegate to.
+    # ------------------------------------------------------------------------
 
     def def_hash_delegator(hash, method, key: method, **kwd)
       prefix, suffix, wrap = __prepare(**kwd)
+      method = method.to_s.gsub(/\?$/, "")
 
-      class_eval <<-STR, __FILE__, __LINE__
+      class_eval <<-STR, __FILE__, __LINE__ - 3
         def #{method}#{suffix}(*args)
-          #{wrap} #{prefix} #{hash}[#{key.inspect}]
+          #{wrap}(
+            #{prefix}#{hash}[#{key.inspect}]
+          )
+
+        rescue Exception
+          unless Forwardable.debug
+            $@.delete_if do |source|
+              source =~ %r"#{Regexp.escape(__FILE__)}"o
+            end
+          end
+
+          raise
         end
       STR
     end
 
+    # ------------------------------------------------------------------------
     # Delegates a method to an instance variable.
     # @note if you are not using an alias or booleans use `attr_reader`.
     # @param [String, Symbol] ivar the instance variable.
     # @param [String, Symbol] alias_ the alias.
+    # ------------------------------------------------------------------------
 
     def def_ivar_delegator(ivar, alias_ = ivar, **kwd)
       prefix, suffix, wrap = __prepare(**kwd)
+      alias_ = alias_.to_s.gsub(/\?$/, "")
 
-      class_eval <<-STR, __FILE__, __LINE__
+      class_eval <<-STR, __FILE__, __LINE__ - 3
         def #{alias_.to_s.gsub(/\A@/, "")}#{suffix}
-          #{wrap} #{prefix} #{ivar}
+          #{wrap}(
+            #{prefix}#{ivar}
+          )
+
+        rescue Exception
+          unless Forwardable.debug
+            $@.delete_if do |source|
+              source =~ %r"#{Regexp.escape(__FILE__)}"o
+            end
+          end
+
+          raise
         end
       STR
     end
 
+    # ------------------------------------------------------------------------
     # A more beefed up version of Ruby's `def_delegator` that
     # offers a tiny bit more than the default version in `Forwardable`
     # @param [Object<>] accessor the object to ship your method to.
     # @param [String, Symbol] method the method being messaged.
     # @param [Array<>] args the arguments to place in front.
+    # ------------------------------------------------------------------------
 
     def def_modern_delegator(accessor, method, alias_ = method, args: [], **kwd)
       args = [args].flatten.compact.map(&:to_s).unshift("").join(", ")
       prefix, suffix, wrap = __prepare(**kwd)
+      alias_ = alias_.to_s.gsub(/\?$/, "")
 
-      class_eval <<-STR, __FILE__, __LINE__
+      class_eval <<-STR, __FILE__, __LINE__ - 4
         def #{alias_}#{suffix}(*args, &block)
-          #{wrap} #{prefix} #{accessor}.send(#{method.inspect}#{args}, *args, &block)
+          #{wrap}(#{prefix}#{accessor}.send(
+            #{method.inspect}#{args}, *args, &block
+          ))
+
+        rescue Exception
+          unless Forwardable.debug
+            $@.delete_if do |source|
+              source =~ %r"#{Regexp.escape(__FILE__)}"o
+            end
+          end
+
+          raise
         end
       STR
     end
 
+    # ------------------------------------------------------------------------
     # Wraps around traditional def_delegator to offer forwarding to modern,
     # ivar and hash delegators.  With a bit of data checking between.
     # @see `Object::Forwardable#def_delegator`
+    # ------------------------------------------------------------------------
 
     def def_delegator(accessor, method, alias_ = method, **kwd)
       kwd, alias_ = alias_, method if alias_.is_a?(Hash) && !kwd.any?
-      return DEF_DELEGATOR.bind(self).call(accessor, method, alias_) if alias_.is_a?(Hash) || !kwd.any?
-      return def_modern_delegator(accessor, method, alias_, **kwd) unless kwd[:type]
 
-      raise ArgumentError, "Alias not supported with type" if alias_ != method
-      send("def_#{kwd[:type]}_delegator", accessor, method, **kwd.tap { |obj|
-        obj.delete(:type)
-      })
+      if alias_.is_a?(Hash) || !kwd.any?
+        Forwardable.instance_method(:def_delegator).bind(self) \
+          .call(accessor, method, alias_)
+
+      elsif !kwd[:type]
+        def_modern_delegator(
+          accessor, method, alias_, **kwd
+        )
+
+      else
+        raise ArgumentError, "Alias not supported with type" if alias_ != method
+        send("def_#{kwd[:type]}_delegator", accessor, method, **kwd.tap { |obj|
+          obj.delete(:type)
+        })
+      end
     end
 
+    # ------------------------------------------------------------------------
     # Wraps around traditional `def_delegators` to detect hash arguments.
     # @see `Object::Forwardable#def_delegators`
+    # ------------------------------------------------------------------------
 
     def def_delegators(accessor, *methods)
       kwd = methods.shift if methods.first.is_a?(Hash)
@@ -83,9 +150,11 @@ module Forwardable
       end
     end
 
+    # ------------------------------------------------------------------------
     # Prepares the suffix, prefix and wrap method if available.
     # @param [true, false, :reverse] bool whether or not this is a boolean.
     # @param [true, Symbol, String] wrap wrap result into the wrap.
+    # ------------------------------------------------------------------------
 
     private
     def __prepare(wrap: nil, bool: false)

data/lib/forwardable/extended/version.rb

@@ -4,6 +4,6 @@
 
 module Forwardable
   module Extended
-    VERSION = "2.3.0"
+    VERSION = "2.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forwardable-extended
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Jordon Bedwell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-15 00:00:00.000000000 Z
+date: 2016-01-18 00:00:00.000000000 Z
 dependencies: []
 description: Forwardable with hash, and instance variable extensions.
 email: