kotovalexarian-likes-github/sinatra
1
0
Fork 0
mirror of https://github.com/sinatra/sinatra synced 2023-03-27 23:18:01 -04:00
Code Releases Activity

use respond_to? rather than arity checks to play nice with method_missing proxies

Browse source
This commit is contained in:
Konstantin Haase 2011-04-17 10:30:21 +02:00
parent 1d64be6471
commit 7e1449a4ea
2 changed files with 9 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/sinatra/base.rb
View file

@ -1490,14 +1490,7 @@ module Sinatra
methods.each do |method_name|
eval <<-RUBY, binding, '(__DELEGATE__)', 1
def #{method_name}(*args, &b)
arity = ::Sinatra::Delegator.target.method(#{method_name.inspect}).arity
if arity < 0 ? args.size < -arity - 1 : args.size != arity
begin
return super
rescue NameError => e
raise e unless e.message.include? #{method_name.to_s.inspect}
end
end
return super if respond_to? #{method_name.inspect}
::Sinatra::Delegator.target.send(#{method_name.inspect}, *args, &b)
end
private #{method_name.inspect}

63
test/delegator_test.rb
View file

@ -115,70 +115,23 @@ class DelegatorTest < Test::Unit::TestCase
it "should work with method_missing proxies for options" do
mixin = Module.new do
def respond_to?(method, *)
method.to_sym == :options or super
end
def method_missing(method, *args, &block)
return super unless method.to_sym == :options
{:some => :option}
end
end
app = mirror
def app.options(arg, *rest) "yay" end
a = b = c = nil
delegate do
value = nil
mirror do
extend mixin
a, b, c = options, options(1), options(1, 2)
value = options
end
assert_equal({:some => :option}, a)
assert_equal("yay", b)
assert_equal("yay", c)
end
it "should work with method_missing proxies for methods arity > 0" do
mixin = Module.new do
def method_missing(method, *args, &block)
return super unless method.to_sym == :options
{:some => :option}
end
end
app = mirror
def app.options(arg) "yay" end
a = b = c = nil
delegate do
extend mixin
a, b, c = options, options(1), options(1, 2)
end
assert_equal({:some => :option}, a)
assert_equal("yay", b)
assert_equal({:some => :option}, c)
end
it "should not raise a NameError for methods not handled by a proxy" do
app = mirror
def app.options(arg) "yay" end
assert_raises(ArgumentError) { delegate { options }}
end
it "should not swallow any NameErrors" do
mixin = Module.new do
def method_missing(method, *args, &block)
return super unless method.to_sym == :options
foobar
end
end
app = mirror
def app.options(arg) "yay" end
assert_raises NameError do
delegate do
extend mixin
options
end
end
assert_equal({:some => :option}, value)
end
delegates 'get'