forwardable-extended 2.5.3 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d90dc39d0f23f0acbfa3fb0563db755d1c898f0
-  data.tar.gz: ff31cfc71354d276f702baffd3289cd5d9b2e8a8
+  metadata.gz: 5a63d4f78c993a050c8b1cc6aa077296fa7acab3
+  data.tar.gz: dbd35851e146d851ed4d3b1f0db85a5bfb432666
 SHA512:
-  metadata.gz: 8ac56d19ae6529f9502925b38d919525f66183db7f4ea1ae0a766748aeee4e413d8b9d5137318ca7a956e5f6a5860f4ad325d30746d1618fd339dc29ff02351c
-  data.tar.gz: 1c0eecff649dd33ea319a14aff83814718b1dc46cbc76728ac2a4b513217b64751a703056c35afac8d5bd42210003a89b83ba55183cb3056a3e3029ab022b32e
+  metadata.gz: d4b9c2dc38d4420b791309886c545b35f1fe9b3ad0211365582f678daed1dee9e84416f39c10949ecbc5421cf85f638cd47068d081d8d74ca75ff246fb3e0764
+  data.tar.gz: 0508f825a4a79e5bb26da05da2489646b741cd86dc8ee51cc956b5d1ba1e2901f10ecfc4513048a03244acea35781f7ee2ceb805c1f6a110db80338f4dbc0583

data/lib/forwardable/extended.rb

@@ -46,14 +46,14 @@ module Forwardable
         )
       end
 
-      class_eval <<-STR, __FILE__, __LINE__ - 9
+      class_eval delegate_debug(<<-STR), __FILE__, __LINE__ - 9
         def #{method}#{suffix}(*args)
           #{wrap}(
             #{prefix}#{hash}[#{key.inspect}]
           )
 
         rescue Exception
-          unless Forwardable.debug
+          if !Forwardable.debug && $@ && $@.respond_to?(:delete_if)
             $@.delete_if do |source|
               source =~ %r"#{Regexp.escape(__FILE__)}"o
             end
@@ -77,14 +77,14 @@ module Forwardable
         )
       end
 
-      class_eval <<-STR, __FILE__, __LINE__ - 9
+      class_eval delegate_debug(<<-STR), __FILE__, __LINE__ - 9
         def #{alias_.to_s.gsub(/\A@/, "")}#{suffix}
           #{wrap}(
             #{prefix}#{ivar}
           )
 
         rescue Exception
-          unless Forwardable.debug
+          if !Forwardable.debug && $@ && $@.respond_to?(:delete_if)
             $@.delete_if do |source|
               source =~ %r"#{Regexp.escape(__FILE__)}"o
             end
@@ -99,24 +99,25 @@ module Forwardable
     # Like def_delegator but allows you to send args and do other stuff.
     # ------------------------------------------------------------------------
 
-    def def_modern_delegator(accessor, method, alias_ = method, args: [], **kwd)
-      args = [args].flatten.compact.map(&:to_s).unshift("").join(", ")
-      prefix, suffix, wrap = prepare_delegate(**kwd)
+    def def_modern_delegator(accessor, method, alias_ = method, args: \
+        { :before => [], :after => [] }, **kwd)
 
-      if suffix
-        alias_ = alias_.to_s.gsub(
-          /\?$/, ""
-        )
-      end
-
-      class_eval <<-STR, __FILE__, __LINE__ - 10
+      prefix, suffix, wrap = prepare_delegate(**kwd)
+      args = { :before => args } unless args.is_a?(Hash)
+      b = [args[:before]].flatten.compact.map(&:to_s).join(", ")
+      a = [args[ :after]].flatten.compact.map(&:to_s).join(", ")
+      b = b + ", " unless args[:before].nil? || args[:before].empty?
+      a = ", " + a unless args[ :after].nil? || args[ :after].empty?
+      alias_ = alias_.to_s.gsub(/\?$/, "") if suffix
+
+      class_eval delegate_debug(<<-STR), __FILE__, __LINE__ - 10
         def #{alias_}#{suffix}(*args, &block)
           #{wrap}(#{prefix}#{accessor}.send(
-            #{method.inspect}#{args}, *args, &block
+            #{method.inspect}, #{b}*args#{a}, &block
           ))
 
         rescue Exception
-          unless Forwardable.debug
+          if !Forwardable.debug && $@ && $@.respond_to?(:delete_if)
             $@.delete_if do |source|
               source =~ %r"#{Regexp.escape(__FILE__)}"o
             end
@@ -179,5 +180,23 @@ module Forwardable
         prefix, suffix, wrap
       ]
     end
+
+    # ------------------------------------------------------------------------
+
+    private
+    def delegate_debug(str)
+      if Forwardable.debug && !Forwardable.debug.is_a?(TrueClass)
+        then Forwardable.debug.debug(
+          str
+        )
+
+      elsif Forwardable.debug
+        $stdout.puts(
+          "\n# ------\n\n", str
+        )
+      end
+
+      str
+    end
   end
 end

data/lib/forwardable/extended/version.rb

@@ -4,6 +4,6 @@
 
 module Forwardable
   module Extended
-    VERSION = "2.5.3"
+    VERSION = "2.6.0"
   end
 end

metadata

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