spec/family_person_spec.rb spec/fixtures/family_person.rb @@ -15,35 +15,39 @@ module Roxy raise "Cannot proxy an existing method, \"#{name}\", and also have a :to option. Please use one or the other." if original_method and options[:to] - # If we're proxying an existing method, we need to move it out - # of the way so we can take over + # If we're proxying an existing method, we need to store + # the original method and move it out of the way so + # we can take over if original_method new_method = "proxied_#{name}" alias_method new_method, "#{name}" - options[:to] = lambda { |owner| owner.send(new_method) } + options[:to] = original_method end roxy_proxy_methods[name] = [options, block] # If we have a no-arg method we're proxying, or if we're not # proxying an existing method at all, we can do a basic def + # and memoize the proxy if !original_method or original_method.arity == 0 class_eval <<-EOS, __FILE__, __LINE__ def #{name} @#{name}_proxy ||= Proxy.new(self, self.class.roxy_proxy_methods[:#{name}][0], + nil, &self.class.roxy_proxy_methods[:#{name}][1]) end EOS # If we have a proxied method with arguments, we need to # retain them - # else - # class_eval <<-EOS, __FILE__, __LINE__ - # def #{name}(*args) - # @#{name}_proxy ||= Proxy.new(self, self.class.roxy_proxy_methods[:#{name}][0], - # &self.class.roxy_proxy_methods[:#{name}][1]) - # end - # EOS + else + class_eval <<-EOS, __FILE__, __LINE__ + def #{name}(*args) + Proxy.new(self, self.class.roxy_proxy_methods[:#{name}][0], + args, + &self.class.roxy_proxy_methods[:#{name}][1]) + end + EOS end end lib/roxy/moxie.rb @@ -12,9 +12,10 @@ module Roxy # http://onestepback.org/index.cgi/Tech/Ruby/BlankSlate.rdoc instance_methods.each { |m| undef_method m unless m =~ /(^__|^proxy_)/ } - def initialize(owner, options, &block) + def initialize(owner, options, args, &block) @owner = owner - @target = options[:to] + @target = options[:to] + @args = args # Adorn with user-provided proxy methods [options[:extend]].flatten.each { |ext| proxy_extend(ext) } if options[:extend] @@ -23,7 +24,15 @@ module Roxy def proxy_owner; @owner; end def proxy_target - @proxy_target_object ||= @target.is_a?(Proc) ? @target.call(@owner) : @target + @proxy_target_object ||= + if @target.is_a?(Proc) + @target.call(@owner) + elsif @target.is_a?(UnboundMethod) + bound_method = @target.bind(proxy_owner) + bound_method.arity == 0 ? bound_method.call : bound_method.call(*@args) + else + @target + end end # Delegate all method calls we don't know about to target object lib/roxy/proxy.rb @@ -9,19 +9,19 @@ describe "Proxy" do end it "should properly evaluate a block-based target" do - proxy = Roxy::Proxy.new(@owner, :to => @lambda_target) + proxy = Roxy::Proxy.new(@owner, {:to => @lambda_target}, nil) proxy.should == @target end it "should properly adorn the proxy with proxy methods" do - proxy = Roxy::Proxy.new(@owner, :to => @target) do + proxy = Roxy::Proxy.new(@owner, {:to => @target}, nil) do def poop; 'poop'; end end proxy.poop.should == 'poop' end it "should make the proxy owner accessible to the target block" do - proxy = Roxy::Proxy.new(@owner, :to => proc { |owner| owner }) + proxy = Roxy::Proxy.new(@owner, {:to => proc { |owner| owner }}, nil) proxy.should == @owner end spec/proxy_spec.rb @@ -48,7 +48,10 @@ describe "Roxy" do @person.ancestors(true, false).women.should == ['m_ancestor2'] @person.ancestors(false, true).men.should == ['p_ancestor1'] @person.ancestors(false, true).women.should == ['p_ancestor2'] - @person.ancestors(true, true).men.should == ['p_ancestor1', 'm_ancestor1'] - @person.ancestors.women.should == ['p_ancestor2', 'm_ancestor2'] + @person.ancestors(true, true).men.sort.should == ['p_ancestor1', 'm_ancestor1'].sort + end + + it "should retain default argument values when calling a proxied method with arguments" do + @person.ancestors.women.sort.should == ['p_ancestor2', 'm_ancestor2'].sort end end \ No newline at end of file spec/roxy_spec.rb spec/family_spec.rb spec/fixtures/family.rb 583e0a6fba3ffe83975a7ab02bf36bc9a3b861af Ryan Daigle ryan.daigle@gmail.com http://github.com/yfactorial/roxy/commit/0acd2df2b41f8f657a9323845aaeda1d7fea0673 0acd2df2b41f8f657a9323845aaeda1d7fea0673 2008-11-14T06:20:24-08:00 2008-11-14T06:20:24-08:00 Added ability to proxy methods with arguments b6d62e64e8747c1f7be6616295464698ad869068 Ryan Daigle ryan.daigle@gmail.com