forwardable-extended 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ae6e9add3adb8d683178c3a41637a72a0410f9d
-  data.tar.gz: da1443e1b70f5ed9bd8cc5811c7194efdc45a9d4
+  metadata.gz: 2aee4eb76e135c0b524a2e7789499fd26ab9b587
+  data.tar.gz: 0dac1c644c9fdf0a6f7b72fd93dd012d452753a3
 SHA512:
-  metadata.gz: a3a0455ae2671bd4526521fd21aa890e7134c344ab15e0ceec8c6aa5da649f6c118c084697c3485aed089eb57bd8878cb696af5d788f641e847faf0a01df5462
-  data.tar.gz: 61b3f52eaa770f3a460e4f64be8619b4fa9e44da1a5dca3fa837c8f5579f1ecd7ee23e762facda146d9c57c38158f9db2be8888aa8e0fb3a579419cfa88f5657
+  metadata.gz: 8422bfbcd02da7e99a25499f0fafa7a9fbb5bf215e1475343ac4e154fadbf02cd28aa32a41436e26f683cb68103f7525aba4d017ebd0e47546ed582b57b40d6e
+  data.tar.gz: 6b04cd0250f1aad93b99fffe86ab455f01172ac0072222c36e0a20f07be0853690a51b33d26d4036cb1ea5a8fe98fb13da4f7288e6f165df401c91f894f4306a

data/lib/forwardable/extended.rb

@@ -8,26 +8,30 @@ require "forwardable"
 module Forwardable
   module Extended
     DEF_DELEGATOR = Object::Forwardable.instance_method(:def_delegator)
-    def def_hash_delegator(hash, method, key: method, bool: false, type: :ivar)
+    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 ? "?" : "")
 
       class_eval <<-STR, __FILE__, __LINE__
         def #{method}#{suffix}
-          #{prefix}#{hash}[#{key.inspect}]
+          #{wrap}#{prefix}#{hash}[#{key.inspect}]
         end
       STR
     end
 
     #
 
-    def def_ivar_delegator(ivar, alias_ = ivar, bool: false, type: :ivar)
+    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 ? "?" : "")
 
       class_eval <<-STR, __FILE__, __LINE__
         def #{alias_.to_s.gsub(/\A@/, "")}#{suffix}
-          #{prefix}#{ivar}
+          #{wrap}#{prefix}#{ivar}
         end
       STR
     end
@@ -44,8 +48,9 @@ module Forwardable
 
       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)
+        send("def_#{kwd[:type]}_delegator", accessor, method, **kwd.tap { |obj|
+          obj.delete(:type)
+        })
 
       else
         def_modern_delegator(
@@ -56,14 +61,16 @@ module Forwardable
 
     #
 
-    def def_modern_delegator(accessor, method, alias_ = method, args: [], bool: false)
-      prefix = (bool == :reverse ? "!!!" : "!!") if bool
+    def def_modern_delegator(accessor, method, alias_ = method, args: [], bool: false, wrap: false)
       args = [args].flatten.compact.map(&:to_s).unshift("").join(", ")
+      prefix = (bool == :reverse ? "!!!" : "!!") if bool
+      wrap = "self.class.new" if wrap.is_a?(TrueClass)
+      wrap = wrap ? "#{wrap} " : ""
       suffix = (bool ? "?" : "")
 
       class_eval <<-STR, __FILE__, __LINE__
         def #{alias_}#{suffix}(*args, &block)
-          #{prefix}#{accessor}.send(#{method.inspect}#{args + ", *args"}, &block)
+          #{wrap}#{prefix}#{accessor}.send(#{method.inspect}#{args + ", *args"}, &block)
         end
       STR
     end

data/lib/forwardable/extended/version.rb

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

metadata

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