delegate 0.5.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c3016b29b2e5293f2a1640abbf72cf0fe819f0745ca5bdf007c87ef7ed4abfe
-  data.tar.gz: e3b42b7d7213d92697d0246250dee6ba6c7ac2e76455dabe68e991e4c126a51b
+  metadata.gz: a8537e6d97d8707e29a37239baccb6be764d37aadc748d7bc525ca6f426e3bdc
+  data.tar.gz: 0cb5bcee38006db2d540ed5ea84fa8f9e08e71abbfc6875f2931153fa6c89a23
 SHA512:
-  metadata.gz: f9ffc701e9a7323a98cb5437abc35150507c1908232d8ef86bd0bd2c0aa3fa69da3ee9105d064427cda5d3e6bf073babf996c99e1783b494b01a729793228cad
-  data.tar.gz: b906eb55858d81abc66dfce6c3468417cbac4023960ab143fca5e6c36a0fe00976a6d2bee3f55f07d988e5c9897a5037c6690ca91c7cb2fb536098fc64eaff1a
+  metadata.gz: 3ba0a2a005054b94f0789a242300e6e5f63cf5133a58bdd751ab6edcce84b129cf12a181b7e782577dd1eb44b633edde25ffc8dd2ea25aa547f27e4f3f9a8d80
+  data.tar.gz: f0e941c1b05ff024b2dbc2d864bcda01f1c12db5d8304bfda2aba988f42b875d76fc92541415911dd9b917587fdc01b16beac340426ea8e2999cb46077f7efc0

data/lib/delegate.rb

@@ -40,7 +40,7 @@
 #
 class Delegator < BasicObject
   # The version string
-  VERSION = "0.5.0"
+  VERSION = "0.6.1"
 
   kernel = ::Kernel.dup
   kernel.class_eval do
@@ -345,16 +345,10 @@ class SimpleDelegator < Delegator
 end
 
 def Delegator.delegating_block(mid) # :nodoc:
-  prok = lambda do |*args, &block|
+  lambda do |*args, &block|
     target = self.__getobj__
     target.__send__(mid, *args, &block)
-  end
-  prok.ruby2_keywords
-  if defined?(Ractor.shareable_proc)
-    Ractor.shareable_proc(&prok)
-  else
-    prok
-  end
+  end.ruby2_keywords
 end
 
 #
@@ -405,6 +399,17 @@ def DelegateClass(superclass, &block)
   protected_instance_methods -= ignores
   public_instance_methods = superclass.public_instance_methods
   public_instance_methods -= ignores
+
+  normal, special = public_instance_methods.partition { |m| m.match?(/\A[a-zA-Z]\w*[!\?]?\z/) }
+
+  source = normal.map do |method|
+    "def #{method}(...); __getobj__.#{method}(...); end"
+  end
+
+  protected_instance_methods.each do |method|
+    source << "def #{method}(...); __getobj__.__send__(#{method.inspect}, ...); end"
+  end
+
   klass.module_eval do
     def __getobj__ # :nodoc:
       unless defined?(@delegate_dc_obj)
@@ -413,18 +418,21 @@ def DelegateClass(superclass, &block)
       end
       @delegate_dc_obj
     end
+
     def __setobj__(obj)  # :nodoc:
       __raise__ ::ArgumentError, "cannot delegate to self" if self.equal?(obj)
       @delegate_dc_obj = obj
     end
-    protected_instance_methods.each do |method|
-      define_method(method, Delegator.delegating_block(method))
-      protected method
-    end
-    public_instance_methods.each do |method|
+
+    class_eval(source.join(";"), __FILE__, __LINE__)
+
+    special.each do |method|
       define_method(method, Delegator.delegating_block(method))
     end
+
+    protected(*protected_instance_methods)
   end
+
   klass.define_singleton_method :public_instance_methods do |all=true|
     super(all) | superclass.public_instance_methods
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delegate
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Yukihiro Matsumoto