@@ -1 +1,2 @@ +*.tmproj doc .gitignore @@ -8,19 +8,48 @@ module Roxy module ClassMethods # Set up this class to proxy on the given name - def proxy(name, options = {}, &block) + def proxy(name, options = {}, &block) - # If we don't have the :to option then we are proxying an existing - # method - if(!options[:to]) - alias_method "proxied_#{name}", "#{name}" - options[:to] = lambda { |owner| owner.send("proxied_#{name}") } - end + # Make sure args are OK + original_method = method_defined?(name) ? instance_method(name) : nil + 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] - define_method(name) do - instance_variable_get("@#{name}_proxy") || - instance_variable_set("@#{name}_proxy", Proxy.new(self, options, &block)) + # If we're proxying an existing method, we need to 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) } 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 + 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], + &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 + + end + end + + def roxy_proxy_methods + @roxy_proxy_methods ||= {} end end end lib/roxy/moxie.rb @@ -27,4 +27,20 @@ class Person end proxy :neighbors, :to => ['neighbor1', 'neighbor2'], :extend => [NeighborGeographics, NeighborDemographics] + + def ancestors(maternal = true, paternal = true) + paternal_ancestors = ['p_ancestor1', 'p_ancestor2'] + maternal_ancestors = ['m_ancestor1', 'm_ancestor2'] + (maternal ? maternal_ancestors : []) + (paternal ? paternal_ancestors : []) + end + + proxy :ancestors do + def men + proxy_target.select { |ancestor| ancestor[-1, 1] == '1' } + end + + def women + proxy_target.select { |ancestor| ancestor[-1, 1] == '2' } + end + end end \ No newline at end of file spec/fixtures/person.rb @@ -32,4 +32,23 @@ describe "Roxy" do @person.neighbors.nearby?.should be_true @person.neighbors.caucasian?.should be_false end + + it "should be able to pass arguments through the proxy" do + @person.ancestors(true, false).should == ['m_ancestor1', 'm_ancestor2'] + @person.ancestors(false, true).should == ['p_ancestor1', 'p_ancestor2'] + @person.ancestors(true, true).should == ['m_ancestor1', 'm_ancestor2'] + ['p_ancestor1', 'p_ancestor2'] + end + + it "should be able to retain default argument values" do + @person.ancestors.should == ['m_ancestor1', 'm_ancestor2'] + ['p_ancestor1', 'p_ancestor2'] + end + + it "should be able to call a proxy method through a method with arguments" do + @person.ancestors(true, false).men.should == ['m_ancestor1'] + @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'] + end end \ No newline at end of file spec/roxy_spec.rb 74929ea964f041165407365698e4c3d9305dbbbc Ryan Daigle ryan.daigle@gmail.com http://github.com/yfactorial/roxy/commit/583e0a6fba3ffe83975a7ab02bf36bc9a3b861af 583e0a6fba3ffe83975a7ab02bf36bc9a3b861af 2008-11-13T18:57:20-08:00 2008-11-13T18:57:20-08:00 Start on allowing methods with arguments to be proxied 76d7b0c1df01c961eb9195b58bbc9d9e2e4ef2e1 Ryan Daigle ryan.daigle@gmail.com