delegate 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8537e6d97d8707e29a37239baccb6be764d37aadc748d7bc525ca6f426e3bdc
-  data.tar.gz: 0cb5bcee38006db2d540ed5ea84fa8f9e08e71abbfc6875f2931153fa6c89a23
+  metadata.gz: 2d02460e71183326465e98626c5be2bec0c71f3b9dead6a1355b849c885e23b8
+  data.tar.gz: 1745c691350c2555270eac9eaa7b5846be73c01ba906a72989fb972156c671ec
 SHA512:
-  metadata.gz: 3ba0a2a005054b94f0789a242300e6e5f63cf5133a58bdd751ab6edcce84b129cf12a181b7e782577dd1eb44b633edde25ffc8dd2ea25aa547f27e4f3f9a8d80
-  data.tar.gz: f0e941c1b05ff024b2dbc2d864bcda01f1c12db5d8304bfda2aba988f42b875d76fc92541415911dd9b917587fdc01b16beac340426ea8e2999cb46077f7efc0
+  metadata.gz: 2e5d5301e00017f3fc7d330c9eb50a7ac1723e2a0df9a18b46281c2170b8ccb384fac9c21273e8ae183a84a2638408d67a613a5175eae89380168938c86d580b
+  data.tar.gz: ac6bb3db8b1007c1ec136c66234aef9b12bc5401a9ea0deccc72ae24caccfc2f00503889058b5d91d08ad48a4797012d6452fdc923e35dd15dc66964e3109920

data/.github/workflows/push_gem.yml

@@ -23,11 +23,11 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@e14015d583714f6e62063499dc959a02595150a1 # v2.21.1
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - name: Set up Ruby
         uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # v1.267.0
@@ -36,7 +36,7 @@ jobs:
           ruby-version: ruby
 
       - name: Publish to RubyGems
-        uses: rubygems/release-gem@1c162a739e8b4cb21a676e97b087e8268d8fc40b # v1.1.2
+        uses: rubygems/release-gem@7f9650160c1a4e7989fdc9855807bdbd421d8b6b # v1.4.1
 
       - name: Create GitHub release
         run: |

data/.github/workflows/sync-ruby.yml

@@ -8,11 +8,11 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.repository_owner == 'ruby' }}
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - name: Create GitHub App token
         id: app-token
-        uses: actions/create-github-app-token@v2
+        uses: actions/create-github-app-token@v3
         with:
           app-id: 2060836
           private-key: ${{ secrets.RUBY_SYNC_DEFAULT_GEMS_PRIVATE_KEY }}

data/.github/workflows/test.yml

@@ -17,7 +17,7 @@ jobs:
         os: [ ubuntu-latest, macos-latest ]
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/lib/delegate.rb

@@ -40,7 +40,7 @@
 #
 class Delegator < BasicObject
   # The version string
-  VERSION = "0.6.1"
+  VERSION = "0.7.0"
 
   kernel = ::Kernel.dup
   kernel.class_eval do
@@ -252,6 +252,8 @@ end
 # and even to change the object being delegated to at a later time with
 # #__setobj__.
 #
+#   require 'date'
+#
 #   class User
 #     def born_on
 #       Date.new(1989, 9, 10)
@@ -344,13 +346,6 @@ class SimpleDelegator < Delegator
   end
 end
 
-def Delegator.delegating_block(mid) # :nodoc:
-  lambda do |*args, &block|
-    target = self.__getobj__
-    target.__send__(mid, *args, &block)
-  end.ruby2_keywords
-end
-
 #
 # The primary interface to this library.  Use to setup delegation when defining
 # your class.
@@ -400,14 +395,29 @@ def DelegateClass(superclass, &block)
   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/) }
+  methods_to_define =
+    public_instance_methods.map { |x| [x, false] } +
+    protected_instance_methods.map { |x| [x, true] }
 
-  source = normal.map do |method|
-    "def #{method}(...); __getobj__.#{method}(...); end"
-  end
+  source = []
+
+  methods_to_define.each do |target_name, is_protected|
+    unless target_name.match?(/\A[_a-zA-Z]\w*[!\?]?\z/)
+      placeholder_name = :__delegate
+    end
 
-  protected_instance_methods.each do |method|
-    source << "def #{method}(...); __getobj__.__send__(#{method.inspect}, ...); end"
+    send_source =
+      if is_protected || placeholder_name
+        "__getobj__.__send__(#{target_name.inspect}, ...)"
+      else
+        "__getobj__.#{target_name}(...)"
+      end
+    source << "def #{placeholder_name || target_name}(...); #{send_source}; end"
+
+    if placeholder_name
+      source << "alias_method #{target_name.inspect}, :#{placeholder_name}"
+      source << "remove_method :#{placeholder_name}"
+    end
   end
 
   klass.module_eval do
@@ -426,10 +436,6 @@ def DelegateClass(superclass, &block)
 
     class_eval(source.join(";"), __FILE__, __LINE__)
 
-    special.each do |method|
-      define_method(method, Delegator.delegating_block(method))
-    end
-
     protected(*protected_instance_methods)
   end
 

metadata

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