forwardable 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8729830e9c34626b9912c4ea6424e9edadd6c86d6dc6816ee4c2b1defc5923a1
-  data.tar.gz: 69b7122793c8d0b6dac6a4f03b20c70481f1c1ec3ac4f8641639249d5c7f9024
+  metadata.gz: 6f67b8d19bf47af7db2c6fa95434a20fac51dbff63ba5d6366de98f7c4dd8170
+  data.tar.gz: b946e9f5faaf788fe9cc39bc5782846b77e12e1e82e51fa4a975d91c893f651a
 SHA512:
-  metadata.gz: 67bb1876e2ac2da9367b3744332ee376de7ffebeaaf20d7bbc01a5af537d087c4bcbed6eebaad140a4c20cd1f8dafa46f1250a14c8617e22ee20eda688683045
-  data.tar.gz: 1a244c0a3ce5227258862e7632fd28d224cf1b2d65f9ec67eabb93e2c6369c177a199ea465f366bc5a15d53177ba1b565b591eb6a1c940a4454bb74cc6488d24
+  metadata.gz: 8901d57fed19e8955b8557b1a0a0f50cb97c6edb430aa3f3c5704953d683b2ef6f339648167c6982def47cf8aa8e89431998a0fea4125b1a90b7a3b7f3a8b296
+  data.tar.gz: d01d6e8d55e884802f54240d98d91938cea740540f724821bcccd80e0e08c5dbb5b047ec5a87e547256093ab2f18eb0b66d7b1ae974ec3fa9cac951c1d66b150

data/forwardable.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
   spec.licenses      = ["Ruby", "BSD-2-Clause"]
 
   spec.required_ruby_version = '>= 2.4.0'
-  spec.files         = ["forwardable.gemspec", "lib/forwardable.rb", "lib/forwardable/impl.rb"]
+  spec.files         = ["forwardable.gemspec", "lib/forwardable.rb"]
   spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.executables   = []
   spec.require_paths = ["lib"]
 end

data/lib/forwardable.rb

@@ -76,7 +76,7 @@
 #     def_delegators :@q, :clear, :first, :push, :shift, :size
 #   end
 #
-#   q = Queue.new
+#   q = Thread::Queue.new
 #   q.enq 1, 2, 3, 4, 5
 #   q.push 6
 #
@@ -109,11 +109,13 @@
 # +delegate.rb+.
 #
 module Forwardable
-  require 'forwardable/impl'
-
   # Version of +forwardable.rb+
-  VERSION = "1.3.2"
+  VERSION = "1.4.0"
+  VERSION.freeze
+
+  # Version for backward compatibility
   FORWARDABLE_VERSION = VERSION
+  FORWARDABLE_VERSION.freeze
 
   @debug = nil
   class << self
@@ -188,9 +190,7 @@ module Forwardable
 
     # If it's not a class or module, it's an instance
     mod = Module === self ? self : singleton_class
-    ret = mod.module_eval(&gen)
-    mod.__send__(:ruby2_keywords, ali) if RUBY_VERSION >= '2.7'
-    ret
+    mod.module_eval(&gen)
   end
 
   alias delegate instance_delegate
@@ -204,36 +204,33 @@ module Forwardable
     if Module === obj ?
          obj.method_defined?(accessor) || obj.private_method_defined?(accessor) :
          obj.respond_to?(accessor, true)
-      accessor = "#{accessor}()"
+      accessor = "(#{accessor}())"
     end
 
-    method_call = ".__send__(:#{method}, *args, &block)"
-    if _valid_method?(method)
+    args = RUBY_VERSION >= '2.7' ? '...' : '*args, &block'
+    method_call = ".__send__(:#{method}, #{args})"
+    if method.match?(/\A[_a-zA-Z]\w*[?!]?\z/)
       loc, = caller_locations(2,1)
       pre = "_ ="
       mesg = "#{Module === obj ? obj : obj.class}\##{ali} at #{loc.path}:#{loc.lineno} forwarding to private method "
-      method_call = "#{<<-"begin;"}\n#{<<-"end;".chomp}"
-        begin;
-          unless defined? _.#{method}
-            ::Kernel.warn #{mesg.dump}"\#{_.class}"'##{method}', uplevel: 1
-            _#{method_call}
-          else
-            _.#{method}(*args, &block)
-          end
-        end;
+      method_call = <<~RUBY.chomp
+        if defined?(_.#{method})
+          _.#{method}(#{args})
+        else
+          ::Kernel.warn #{mesg.dump}"\#{_.class}"'##{method}', uplevel: 1
+          _#{method_call}
+        end
+      RUBY
     end
 
-    _compile_method("#{<<-"begin;"}\n#{<<-"end;"}", __FILE__, __LINE__+1)
-    begin;
+    eval(<<~RUBY, nil, __FILE__, __LINE__ + 1)
       proc do
-        def #{ali}(*args, &block)
-          #{pre}
-          begin
-            #{accessor}
-          end#{method_call}
+        def #{ali}(#{args})
+          #{pre}#{accessor}
+          #{method_call}
         end
       end
-    end;
+    RUBY
   end
 end
 
@@ -308,9 +305,7 @@ module SingleForwardable
   def def_single_delegator(accessor, method, ali = method)
     gen = Forwardable._delegator_method(self, accessor, method, ali)
 
-    ret = instance_eval(&gen)
-    singleton_class.__send__(:ruby2_keywords, ali) if RUBY_VERSION >= '2.7'
-    ret
+    instance_eval(&gen)
   end
 
   alias delegate single_delegate

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: forwardable
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Keiju ISHITSUKA
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-22 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 description: Provides delegation of specified methods to a designated object.
 email:
@@ -19,13 +18,11 @@ extra_rdoc_files: []
 files:
 - forwardable.gemspec
 - lib/forwardable.rb
-- lib/forwardable/impl.rb
 homepage: https://github.com/ruby/forwardable
 licenses:
 - Ruby
 - BSD-2-Clause
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -40,8 +37,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.2
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Provides delegation of specified methods to a designated object.
 test_files: []

data/lib/forwardable/impl.rb

@@ -1,16 +0,0 @@
-# :stopdoc:
-module Forwardable
-  def self._valid_method?(method)
-    catch {|tag|
-      eval("BEGIN{throw tag}; ().#{method}", binding, __FILE__, __LINE__)
-    }
-  rescue SyntaxError
-    false
-  else
-    true
-  end
-
-  def self._compile_method(src, file, line)
-    eval(src, nil, file, line)
-  end
-end