forwardable-extended 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0bf26e6d3a0d6c8702033209c8cc78dd66e91b8
-  data.tar.gz: cff44e0ccbc27734e5b7537f1bfb7ab00699d6af
+  metadata.gz: 5a63d4f78c993a050c8b1cc6aa077296fa7acab3
+  data.tar.gz: dbd35851e146d851ed4d3b1f0db85a5bfb432666
 SHA512:
-  metadata.gz: 956f7150e5cf3d1c008debc814333c1b15b6447dce17857a7a6593bea964e76f0d1d74f68e8828ed9dce6bd5cb309d0dc9069539aaea12635ea1374b1aef137f
-  data.tar.gz: 1067a33f3dbaa30926b9f52a01a6031160a2864a98b4b74a7d80745680f20a47936d612f4c3337903524865fb576d5973d84af91d14c0e4ba84fe6079d688353
+  metadata.gz: d4b9c2dc38d4420b791309886c545b35f1fe9b3ad0211365582f678daed1dee9e84416f39c10949ecbc5421cf85f638cd47068d081d8d74ca75ff246fb3e0764
+  data.tar.gz: 0508f825a4a79e5bb26da05da2489646b741cd86dc8ee51cc956b5d1ba1e2901f10ecfc4513048a03244acea35781f7ee2ceb805c1f6a110db80338f4dbc0583

data/Gemfile

@@ -1,6 +1,8 @@
+# ----------------------------------------------------------------------------
 # Frozen-string-literal: true
 # Copyright: 2015-2016 Jordon Bedwell - MIT License
 # Encoding: utf-8
+# ----------------------------------------------------------------------------
 
 source "https://rubygems.org"
 gem "rake", :require => false
@@ -14,6 +16,7 @@ group :test do
 end
 
 group :development do
+  gem "luna-rubocop-formatters", :require => false
   gem "rubocop", :github => "bbatsov/rubocop", :require => false
   gem "pry", {
     :require => false

data/Rakefile

@@ -1,8 +1,11 @@
+# ----------------------------------------------------------------------------
 # Frozen-string-literal: true
 # Copyright: 2015-2016 Jordon Bedwell - MIT License
 # Encoding: utf-8
+# ----------------------------------------------------------------------------
 
 $LOAD_PATH.unshift(File.expand_path("../lib", __FILE__))
+require "luna/rubocop/rake/task"
 require "rspec/core/rake_task"
 
 task :default => [:spec]

data/lib/forwardable/extended/version.rb

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

data/lib/forwardable/extended.rb

@@ -1,6 +1,8 @@
+# ----------------------------------------------------------------------------
 # Frozen-string-literal: true
 # Copyright: 2015-2016 Jordon Bedwell - MIT License
 # Encoding: utf-8
+# ----------------------------------------------------------------------------
 
 require "forwardable/extended/version"
 require "forwardable"
@@ -8,9 +10,10 @@ require "forwardable"
 module Forwardable
   module Extended
 
+    # ------------------------------------------------------------------------
     # Make our methods private on the class, there is no reason for public.
-    # This makes it so that things are cleaner to view when inside of REPL's/Debuggers.
-    # That way you don't see our methods without asking to see them.
+    # ------------------------------------------------------------------------
+
     def self.extended(klass)
       instance_methods.each do |method|
         klass.private_class_method(
@@ -19,10 +22,10 @@ module Forwardable
       end
     end
 
+    # ------------------------------------------------------------------------
     # Delegate using a Rails-like interface.
-    # to - the class (object) you are delegating to.
-    # alias_of - the method of the class (by default it's the method.)
-    # method - the method you are forwarding.
+    # ------------------------------------------------------------------------
+
     def rb_delegate(method, to: nil, alias_of: method, **kwd)
       raise ArgumentError, "to must be provided" unless to
       def_delegator(
@@ -30,10 +33,10 @@ module Forwardable
       )
     end
 
+    # ------------------------------------------------------------------------
     # Delegate a method to a hash and key.
-    # key - the key to use if the method is not the key.
-    # method - the name of the method you wish to create.
-    # hash - the hash you are delegating to.
+    # ------------------------------------------------------------------------
+
     def def_hash_delegator(hash, method, key: method, **kwd)
       prefix, suffix, wrap = prepare_delegate(**kwd)
 
@@ -43,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
@@ -61,10 +64,10 @@ module Forwardable
       STR
     end
 
+    # ------------------------------------------------------------------------
     # Delegate a method to an instance variable.
-    # ivar - the instance variable you are aliasing.
-    # alias_ - alias it to another method name.
-    # Note: If you are not doing booleans then don't bother with this.
+    # ------------------------------------------------------------------------
+
     def def_ivar_delegator(ivar, alias_ = ivar, **kwd)
       prefix, suffix, wrap = prepare_delegate(**kwd)
 
@@ -74,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
@@ -92,29 +95,29 @@ module Forwardable
       STR
     end
 
-    # method - the method you wish to delegate.
-    # alias_ - the name of the method on the current object.
-    # args - arguments to pass to the method.  Note: these are inspected.
+    # ------------------------------------------------------------------------
     # Like def_delegator but allows you to send args and do other stuff.
-    # accessor - the object you wish to delegate to.
-    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)
+    # ------------------------------------------------------------------------
 
-      if suffix
-        alias_ = alias_.to_s.gsub(
-          /\?$/, ""
-        )
-      end
+    def def_modern_delegator(accessor, method, alias_ = method, args: \
+        { :before => [], :after => [] }, **kwd)
 
-      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
@@ -125,7 +128,10 @@ module Forwardable
       STR
     end
 
+    # ------------------------------------------------------------------------
     # Wraps around traditional delegation and modern delegation.
+    # ------------------------------------------------------------------------
+
     def def_delegator(accessor, method, alias_ = method, **kwd)
       kwd, alias_ = alias_, method if alias_.is_a?(Hash) && !kwd.any?
 
@@ -146,7 +152,10 @@ module Forwardable
       end
     end
 
+    # ------------------------------------------------------------------------
     # Create multiple delegates at once.
+    # ------------------------------------------------------------------------
+
     def def_delegators(accessor, *methods)
       kwd = methods.shift if methods.first.is_a?(Hash)
       kwd = methods.pop   if methods. last.is_a?(Hash)
@@ -157,10 +166,12 @@ module Forwardable
       end
     end
 
+    # ------------------------------------------------------------------------
     # Prepares a delegate and it's few arguments.
-    # wrap - whether to wrap (or the class to wrap it with.)
-    # bool - whether or not this delegate is a boolean.
-    private def prepare_delegate(wrap: nil, bool: false)
+    # ------------------------------------------------------------------------
+
+    private
+    def prepare_delegate(wrap: nil, bool: false)
       prefix = (bool == :reverse ? "!!!" : "!!") if bool
       wrap   = "self.class.new" if wrap.is_a?(TrueClass)
       suffix = "?" if bool
@@ -169,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forwardable-extended
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Jordon Bedwell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-04-06 00:00:00.000000000 Z
 dependencies: []
 description: Forwardable with hash, and instance variable extensions.
 email:
@@ -42,7 +42,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: Forwardable with hash, and instance variable extensions.