yfactorial-roxy 0.1.2 → 0.2

data/lib/roxy/moxie.rb

@@ -8,19 +8,52 @@ 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 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] = 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)
+              Proxy.new(self, self.class.roxy_proxy_methods[:#{name}][0],
+                              args,
+                              &self.class.roxy_proxy_methods[:#{name}][1])
+            end
+          EOS
+                              
+        end        
+      end
+            
+      def roxy_proxy_methods
+        @roxy_proxy_methods ||= {}
       end
     end
   end

data/lib/roxy/proxy.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,14 @@ module Roxy
       
     def proxy_owner; @owner; end
     def proxy_target
-      @proxy_target_object ||= @target.is_a?(Proc) ? @target.call(@owner) : @target
+      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

data/spec/family_person_spec.rb

@@ -0,0 +1,77 @@
+require File.join(File.dirname(__FILE__), *%w[abstract_spec])
+
+describe "Whole family example" do
+
+  before do
+    uses_fixture(:family_person)
+    @ryan = FamilyPerson.new('Ryan', 'Daigle')
+    @ryan_parents = [FamilyPerson.new('Dad', 'Daigle'), FamilyPerson.new('Mom', 'Daigle')]
+    @ryan.parents = @ryan_parents
+    @ryan_children = [FamilyPerson.new('Child1', 'Daigle'), FamilyPerson.new('Child2', 'Daigle')]
+    @ryan.children = @ryan_children
+  end
+  
+  it "should know a person's parents (proxy should not overwrite target method)" do
+    @ryan.parents.should == @ryan_parents
+  end
+  
+  it "should know if a person's parents are divorced" do
+    @ryan.parents.divorced?.should be_false
+  end
+  
+  it "should know how to print out parents names' to a string when not divorced" do
+    @ryan.parents.to_s.should == "Mr. and Mrs. Daigle"
+  end
+  
+  it "should know how to get a person's step-children" do
+    @ryan.children.step.should be_empty
+  end
+end
+
+describe "Divorced family example" do
+
+  before do
+    uses_fixture(:family_person)
+    @ryan = FamilyPerson.new('Ryan', 'Daigle')
+    @ryan_parents = [FamilyPerson.new('Dad', 'Daigle'), FamilyPerson.new('Mom', 'NotDaigle')]
+    @ryan.parents = @ryan_parents
+    @ryan_children = [FamilyPerson.new('Child1', 'Daigle'), FamilyPerson.new('Child2', 'NotDaigle')]
+    @ryan.children = @ryan_children
+  end
+  
+  it "should know if a person's parents are divorced" do
+     @ryan.parents.divorced?.should be_true
+  end
+  
+  it "should know how to print out parents names' to a string when divorced" do
+    @ryan.parents.to_s.should == "Dad Daigle and Mom NotDaigle"
+  end
+  
+  it "should know how to get a person's step-children" do
+    @ryan.children.step.should == [@ryan_children.last]
+  end
+end
+
+describe "Ancestors example" do
+  
+  before do
+    uses_fixture(:family_person)
+    @ryan = FamilyPerson.new('Ryan', 'Daigle')
+  end
+  
+  it "should proxy through the ancestors method and retain arguments" do
+    @ryan.ancestors(true).sort.should == ['rancestor1', 'rancestor3', 'rancestor2', 'rancestor4'].sort
+  end
+  
+  it "should call proxied ancestor methods and retain arguments" do
+    @ryan.ancestors(true).men.sort.should == ['rancestor1', 'rancestor3'].sort
+    @ryan.ancestors(true).women.sort.should == ['rancestor2', 'rancestor4'].sort
+    @ryan.ancestors(false).men.sort.should == ['ancestor1', 'ancestor3'].sort
+    @ryan.ancestors(false).women.sort.should == ['ancestor2', 'ancestor4'].sort
+  end
+  
+  it "should call proxied ancestor methods and retain default arguments" do
+    @ryan.ancestors.men.sort.should == ['ancestor1', 'ancestor3'].sort
+    @ryan.ancestors.women.sort.should == ['ancestor2', 'ancestor4'].sort
+  end
+end

data/spec/fixtures/{family.rb → family_person.rb}

@@ -1,4 +1,4 @@
-class Person
+class FamilyPerson
   
   include Roxy::Moxie
   
@@ -28,11 +28,24 @@ class Person
     def step
       proxy_target.select { |child| proxy_owner.last != child.last }
     end    
-  end    
+  end
   
   def initialize(first, last)
     @first, @last = first, last
   end
   
+  def ancestors(reload = false)
+    1.upto(4).to_a.collect { |i| "#{reload ? 'r' : ''}ancestor#{i}" }      
+  end
+  
+  proxy :ancestors do
+    def men
+      proxy_target.select { |a| a.include?('1') || a.include?('3') }
+    end
+    def women
+      proxy_target - men
+    end
+  end
+  
   def to_s; "#{first} #{last}"; end
 end

data/spec/fixtures/person.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

data/spec/proxy_spec.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
     

data/spec/roxy_spec.rb

@@ -32,4 +32,26 @@ 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.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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: yfactorial-roxy
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: "0.2"
 platform: ruby
 authors: 
 - Ryan Daigle
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-11 00:00:00 -08:00
+date: 2008-11-14 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -39,10 +39,10 @@ files:
 - spec/abstract_spec.rb
 - spec/proxy_spec.rb
 - spec/roxy_spec.rb
-- spec/family_spec.rb
+- spec/family_person_spec.rb
 - spec/fixtures
 - spec/fixtures/person.rb
-- spec/fixtures/family.rb
+- spec/fixtures/family_person.rb
 has_rdoc: true
 homepage: http://github.com/yfactorial/roxy
 post_install_message: 

data/spec/family_spec.rb

@@ -1,53 +0,0 @@
-require File.join(File.dirname(__FILE__), *%w[abstract_spec])
-
-describe "Whole family example" do
-
-  before do
-    uses_fixture(:family)
-    @ryan = Person.new('Ryan', 'Daigle')
-    @ryan_parents = [Person.new('Dad', 'Daigle'), Person.new('Mom', 'Daigle')]
-    @ryan.parents = @ryan_parents
-    @ryan_children = [Person.new('Child1', 'Daigle'), Person.new('Child2', 'Daigle')]
-    @ryan.children = @ryan_children
-  end
-  
-  it "should know a person's parents (proxy should not overwrite target method)" do
-    @ryan.parents.should == @ryan_parents
-  end
-  
-  it "should know if a person's parents are divorced" do
-    @ryan.parents.divorced?.should be_false
-  end
-  
-  it "should know how to print out parents names' to a string when not divorced" do
-    @ryan.parents.to_s.should == "Mr. and Mrs. Daigle"
-  end
-  
-  it "should know how to get a person's step-children" do
-    @ryan.children.step.should be_empty
-  end
-end
-
-describe "Divorced family example" do
-
-  before do
-    uses_fixture(:family)
-    @ryan = Person.new('Ryan', 'Daigle')
-    @ryan_parents = [Person.new('Dad', 'Daigle'), Person.new('Mom', 'NotDaigle')]
-    @ryan.parents = @ryan_parents
-    @ryan_children = [Person.new('Child1', 'Daigle'), Person.new('Child2', 'NotDaigle')]
-    @ryan.children = @ryan_children
-  end
-  
-  it "should know if a person's parents are divorced" do
-     @ryan.parents.divorced?.should be_true
-  end
-  
-  it "should know how to print out parents names' to a string when divorced" do
-    @ryan.parents.to_s.should == "Dad Daigle and Mom NotDaigle"
-  end
-  
-  it "should know how to get a person's step-children" do
-    @ryan.children.step.should == [@ryan_children.last]
-  end
-end