Skip to content

Let DelegateClass respect the original method's arity in case of 0 #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
amatsuda wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Let DelegateClass respect the original method's arity in case of 0 #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions lib/delegate.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,11 +343,18 @@ def __setobj__(obj)
end
end

def Delegator.delegating_block(mid) # :nodoc:
lambda do |*args, &block|
target = self.__getobj__
target.__send__(mid, *args, &block)
end.ruby2_keywords
def Delegator.delegating_block(mid, arity = nil) # :nodoc:
if arity != 0
Copy link
Member

@eregon eregon Dec 30, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was thinking if def m(**h) would also have arity 0 but it does not, that's -1 (makes sense, it's 0+ arguments).

lambda do |*args, &block|
target = self.__getobj__
target.__send__(mid, *args, &block)
end.ruby2_keywords
else
lambda do |&block|
target = self.__getobj__
target.__send__(mid, &block)
end
end
end

#
Expand Down Expand Up @@ -411,11 +418,13 @@ def __setobj__(obj) # :nodoc:
@delegate_dc_obj = obj
end
protected_instance_methods.each do |method|
define_method(method, Delegator.delegating_block(method))
arity = superclass.instance_method(method).arity
define_method(method, Delegator.delegating_block(method, arity))
protected method
end
public_instance_methods.each do |method|
define_method(method, Delegator.delegating_block(method))
arity = superclass.instance_method(method).arity
define_method(method, Delegator.delegating_block(method, arity))
end
end
klass.define_singleton_method :public_instance_methods do |all=true|
Expand Down