forwardable-extended 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4793f206fb4d2244f04cf4a4be8a65f46cce54de
-  data.tar.gz: d86c5074e45837f313b1ba589a3602d0ff75a87b
+  metadata.gz: 4ae6e9add3adb8d683178c3a41637a72a0410f9d
+  data.tar.gz: da1443e1b70f5ed9bd8cc5811c7194efdc45a9d4
 SHA512:
-  metadata.gz: 05057e477d66c3f5a79a0a8cc2e068a2880fa8638266d5f2acd66687724822531d30d536f3cded00ebe24180831a11c1651beedeb4791d376cb25aaa2ae0605c
-  data.tar.gz: cf72c2bdddf1f8ab4510a4a474b08812b1beb39f1d327913d0e8f61e6b3bb4341ffd817ea2ffb38574c1853da49af8bdade18575d36694bae81f247136e6844d
+  metadata.gz: a3a0455ae2671bd4526521fd21aa890e7134c344ab15e0ceec8c6aa5da649f6c118c084697c3485aed089eb57bd8878cb696af5d788f641e847faf0a01df5462
+  data.tar.gz: 61b3f52eaa770f3a460e4f64be8619b4fa9e44da1a5dca3fa837c8f5579f1ecd7ee23e762facda146d9c57c38158f9db2be8888aa8e0fb3a579419cfa88f5657

data/Gemfile

@@ -7,12 +7,15 @@ gem "rake", :require => false
 gemspec
 
 group :test do
+  gem "rspec-helpers", :require => false
   gem "codeclimate-test-reporter", :require => false
+  gem "luna-rspec-formatters", :require => false
+  gem "rspec", :require => false
 end
 
 group :development do
-  gem "rspec", :require => false
-  gem "rspec-helpers", :require => false
-  gem "luna-rspec-formatters", :require => false
-  gem "pry", :require => false
+  gem "rubocop", :github => "bbatsov/rubocop", :require => false
+  gem "pry", {
+    :require => false
+  }
 end

data/lib/forwardable/extended.rb

@@ -34,21 +34,36 @@ module Forwardable
 
     #
 
-    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
+    def def_delegator(accessor, method, alias_ = method, **kwd)
+      kwd, alias_ = alias_, method if alias_.is_a?(Hash) && !kwd.any?
+
+      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)
+
+      else
+        def_modern_delegator(
+          accessor, method, alias_, **kwd
         )
       end
+    end
 
-      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] ? "?" : "")
+    #
+
+    def def_modern_delegator(accessor, method, alias_ = method, args: [], bool: false)
+      prefix = (bool == :reverse ? "!!!" : "!!") if bool
+      args = [args].flatten.compact.map(&:to_s).unshift("").join(", ")
+      suffix = (bool ? "?" : "")
 
       class_eval <<-STR, __FILE__, __LINE__
-        def #{method}#{suffix}
-          #{prefix}#{accessor}.send(#{alias_.inspect})
+        def #{alias_}#{suffix}(*args, &block)
+          #{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.0.0"
+    VERSION = "2.1.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forwardable-extended
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Jordon Bedwell