forwardable-extended 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02ba0e024964bbc8dd125981a805d601f2d3392e
-  data.tar.gz: cac96d2b17ff585c8cfbe6a9b3c5ca4a82e2d747
+  metadata.gz: 4793f206fb4d2244f04cf4a4be8a65f46cce54de
+  data.tar.gz: d86c5074e45837f313b1ba589a3602d0ff75a87b
 SHA512:
-  metadata.gz: 4793f596b87fe6e0e5c77f94227ba388ec73fe51debe5c901cf279414cff5c7629236b16f95e699275ec7c9e1b965247425af0e1977da51851717bf5292b7509
-  data.tar.gz: cf5b23ee25cb1bd54a8155b18a08b1332af7c3c55fee11fdb6fd80a30c448134fe9c4534a8d7f016bf91ab3137824bfa9c4f4af3d8a58ebfac457bf982386ef8
+  metadata.gz: 05057e477d66c3f5a79a0a8cc2e068a2880fa8638266d5f2acd66687724822531d30d536f3cded00ebe24180831a11c1651beedeb4791d376cb25aaa2ae0605c
+  data.tar.gz: cf72c2bdddf1f8ab4510a4a474b08812b1beb39f1d327913d0e8f61e6b3bb4341ffd817ea2ffb38574c1853da49af8bdade18575d36694bae81f247136e6844d

data/lib/forwardable/extended.rb

@@ -7,47 +7,50 @@ require "forwardable"
 
 module Forwardable
   module Extended
-    include Forwardable
+    DEF_DELEGATOR = Object::Forwardable.instance_method(:def_delegator)
+    def def_hash_delegator(hash, method, key: method, bool: false, type: :ivar)
+      prefix = (bool == :reverse ? "!!!" : "!!") if bool
+      suffix = (bool ? "?" : "")
+
+      class_eval <<-STR, __FILE__, __LINE__
+        def #{method}#{suffix}
+          #{prefix}#{hash}[#{key.inspect}]
+        end
+      STR
+    end
 
-    def def_hash_delegator(hash, *methods, key: nil, bool: false, revbool: false)
-      line = __LINE__ - 1
-      file = __FILE__
+    #
 
-      [methods].flatten.each do |method|
-        prefix = bool || revbool ? "!!#{"!" if revbool}" : ""
-        var = key ? %(#{hash}["#{key}"]) : %(#{hash}["#{method}"])
-        method = method.to_s + "?" if revbool || bool
+    def def_ivar_delegator(ivar, alias_ = ivar, bool: false, type: :ivar)
+      prefix = (bool == :reverse ? "!!!" : "!!") if bool
+      suffix = (bool ? "?" : "")
+
+      class_eval <<-STR, __FILE__, __LINE__
+        def #{alias_.to_s.gsub(/\A@/, "")}#{suffix}
+          #{prefix}#{ivar}
+        end
+      STR
+    end
 
-        ruby = <<-STR
-          def #{method}
-            #{prefix}#{var}
-          end
-        STR
+    #
 
-        class_eval ruby, file, line
+    def def_delegator(accessor, method, *args)
+      if args.empty? || args.size > 1 || !args.first.is_a?(Hash)
+        return DEF_DELEGATOR.bind(self).call(
+          accessor, method, *args
+        )
       end
-    end
 
-    def def_ivar_delegator(var, method, bool: false, revbool: false)
-      line = __LINE__ - 1
-      file = __FILE__
+      return def_ivar_delegator(accessor, method, *args) if args.first[:type] == :ivar
+      return def_hash_delegator(accessor, method, *args) if args.first[:type] == :hash
+      prefix = (kwd[:bool] == :reverse ? "!!!" : "!!") if kwd[:bool]
+      suffix = (kwd[:bool] ? "?" : "")
 
-      prefix = revbool || bool ? "!!#{"!" if revbool}" : ""
-      method = method.to_s + "?" if revbool || bool
-      ruby = <<-STR
-        def #{method}
-          #{prefix}#{var}
+      class_eval <<-STR, __FILE__, __LINE__
+        def #{method}#{suffix}
+          #{prefix}#{accessor}.send(#{alias_.inspect})
         end
       STR
-
-      class_eval ruby, file, line
-    end
-
-    def def_ivar_delegators(vars, methods, **kwd)
-      raise ArgumentError, "unequal methods and vars" unless vars.size == methods.size
-      methods.zip(vars).each do |method, var|
-        def_ivar_delegator var, method, **kwd
-      end
     end
   end
 end

data/lib/forwardable/extended/version.rb

@@ -4,6 +4,6 @@
 
 module Forwardable
   module Extended
-    VERSION = "1.0.0"
+    VERSION = "2.0.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forwardable-extended
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Jordon Bedwell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-09 00:00:00.000000000 Z
+date: 2016-01-13 00:00:00.000000000 Z
 dependencies: []
 description: Forwardable with hash, and instance variable extensions.
 email:
@@ -22,7 +22,7 @@ files:
 - Rakefile
 - lib/forwardable/extended.rb
 - lib/forwardable/extended/version.rb
-homepage: http://github.com/envygeeks/extended-forwardable
+homepage: http://github.com/envygeeks/forwardable-extended
 licenses:
 - MIT
 metadata: {}