forwardable-extended 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2aee4eb76e135c0b524a2e7789499fd26ab9b587
-  data.tar.gz: 0dac1c644c9fdf0a6f7b72fd93dd012d452753a3
+  metadata.gz: 44928a73258dd5fea629b2a83f2c33606ca922c1
+  data.tar.gz: 6848d6b288a73cbbbdabfcc3941e2a5bc1ab4f71
 SHA512:
-  metadata.gz: 8422bfbcd02da7e99a25499f0fafa7a9fbb5bf215e1475343ac4e154fadbf02cd28aa32a41436e26f683cb68103f7525aba4d017ebd0e47546ed582b57b40d6e
-  data.tar.gz: 6b04cd0250f1aad93b99fffe86ab455f01172ac0072222c36e0a20f07be0853690a51b33d26d4036cb1ea5a8fe98fb13da4f7288e6f165df401c91f894f4306a
+  metadata.gz: 0761c6e6e3ce5346eac28ab13f56c8fb64a7f185b9beb8051611feaeb417f0ea63cc48d4a2ee01b36af38e83378553eca0fb65a4bc85ca7c29275cf0716a743e
+  data.tar.gz: 62c8057174d3a5fe87163a6cc99a3408a2ccebfdccd69acb0f0a89a276393745dbe3e2eba9b5f6c9e4a715451adf5dff500cefa9118a31e980b1dca93e997486

data/lib/forwardable/extended.rb

@@ -8,71 +8,94 @@ require "forwardable"
 module Forwardable
   module Extended
     DEF_DELEGATOR = Object::Forwardable.instance_method(:def_delegator)
-    def def_hash_delegator(hash, method, key: method, bool: false, wrap: false)
-      prefix = (bool == :reverse ? "!!!" : "!!") if bool
-      wrap = "self.class.new" if wrap.is_a?(TrueClass)
-      wrap = wrap ? "#{wrap} " : ""
-      suffix = (bool ? "?" : "")
+
+    # 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)
 
       class_eval <<-STR, __FILE__, __LINE__
-        def #{method}#{suffix}
-          #{wrap}#{prefix}#{hash}[#{key.inspect}]
+        def #{method}#{suffix}(*args)
+          #{wrap} #{prefix} #{hash}[#{key.inspect}]
         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, bool: false, wrap: false)
-      prefix = (bool == :reverse ? "!!!" : "!!") if bool
-      wrap = "self.class.new" if wrap.is_a?(TrueClass)
-      wrap = wrap ? "#{wrap} " : ""
-      suffix = (bool ? "?" : "")
+    def def_ivar_delegator(ivar, alias_ = ivar, **kwd)
+      prefix, suffix, wrap = __prepare(**kwd)
 
       class_eval <<-STR, __FILE__, __LINE__
         def #{alias_.to_s.gsub(/\A@/, "")}#{suffix}
-          #{wrap}#{prefix}#{ivar}
+          #{wrap} #{prefix} #{ivar}
+        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)
+
+      class_eval <<-STR, __FILE__, __LINE__
+        def #{alias_}#{suffix}(*args, &block)
+          #{wrap} #{prefix} #{accessor}.send(#{method.inspect}#{args}, *args, &block)
         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)
+      })
+    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)
+      kwd = methods.pop   if methods. last.is_a?(Hash)
+      kwd = {} unless kwd
 
-      if alias_.is_a?(Hash) || !kwd.any?
-        DEF_DELEGATOR.bind(self).call(
-          accessor, method, alias_
-        )
-
-      elsif kwd[:type]
-        raise ArgumentError, "Alias not supported with type; the method is the alias" if alias_ != method
-        send("def_#{kwd[:type]}_delegator", accessor, method, **kwd.tap { |obj|
-          obj.delete(:type)
-        })
-
-      else
-        def_modern_delegator(
-          accessor, method, alias_, **kwd
-        )
+      methods.each do |method|
+        def_delegator accessor, method, **kwd
       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.
 
-    def def_modern_delegator(accessor, method, alias_ = method, args: [], bool: false, wrap: false)
-      args = [args].flatten.compact.map(&:to_s).unshift("").join(", ")
+    private
+    def __prepare(wrap: nil, bool: false)
       prefix = (bool == :reverse ? "!!!" : "!!") if bool
-      wrap = "self.class.new" if wrap.is_a?(TrueClass)
-      wrap = wrap ? "#{wrap} " : ""
-      suffix = (bool ? "?" : "")
+      wrap   = "self.class.new" if wrap.is_a?(TrueClass)
+      suffix = "?" if bool
 
-      class_eval <<-STR, __FILE__, __LINE__
-        def #{alias_}#{suffix}(*args, &block)
-          #{wrap}#{prefix}#{accessor}.send(#{method.inspect}#{args + ", *args"}, &block)
-        end
-      STR
+      return [
+        prefix, suffix, wrap
+      ]
     end
   end
 end

data/lib/forwardable/extended/version.rb

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

metadata

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