proxy_for_template 0.0.6 → 0.0.7

data/lib/proxy_for_template.rb

@@ -84,14 +84,12 @@ module ProxyForTemplate
 		self.class.treat_as_nil
 	end
 	
-	def treat_as_nil?(method, template_value)
+	def treat_as_nil?(method, template_value, self_value)
 
 		proc = treat_as_nil[method.to_sym]
 		
 		is_nil = false
 		
-		self_value = self.send(method.to_s + '_orig')
-		
 		if(proc)
 			call_info = TemplateProxyCall.new(method, template_value, self_value)
 			
@@ -107,6 +105,7 @@ module ProxyForTemplate
 
   def proxy_attribute_read(method)   
     self_value = nil
+    template_value = nil
 
     if(template_responds_to?(method))
       template_value = template.attributes[method]
@@ -114,7 +113,7 @@ module ProxyForTemplate
 
     self_value = self.attributes[method]
 
-    if !(template_value.nil? || template_value == '')
+    if !(template_value.nil? || template_value == '' || treat_as_nil?(method, template_value, self_value))
       self_value = template_value
     end
 
@@ -122,7 +121,6 @@ module ProxyForTemplate
   end
 
   def proxy_read(method)
-
     template_value = value_from_template(method)
     self_value = nil
 
@@ -142,8 +140,10 @@ module ProxyForTemplate
       template_value = template.send(method)
     end
 
-		if(!template_value.nil? && treat_as_nil?(method, template_value))
-			template_value = nil
+		if(!template_value.nil?)
+		  self_value = self.send(method.to_s + '_orig')
+		  
+			template_value = nil if treat_as_nil?(method, template_value, self_value)
 		end
 		
 		template_value

data/lib/proxy_for_template/version.rb

@@ -1,3 +1,3 @@
 module ProxyForTemplate
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/activerecord_spec.rb

@@ -20,7 +20,7 @@ class Spork < ActiveRecord::Base
   belongs_to :template, :class_name => Spork.name
   include ProxyForTemplate
 
-  template_method :some_value
+  template_method :some_value, :treat_as_nil => lambda { |instance, call_info| call_info.template_value == 987 }
 end
 
 describe ProxyForTemplate, '#activerecord' do
@@ -96,4 +96,11 @@ describe ProxyForTemplate, '#activerecord' do
 
     base.some_value_before_type_cast.should eq(10)
   end
+  
+  it 'value_before_type_cast should respect treat_as_nil' do
+    template = Spork.create(:some_value => 987)
+    base = Spork.create(:some_value => 1024, :template => template)
+
+    base.some_value_before_type_cast.should eq(1024)
+  end
 end

data/spec/proxy_spec.rb

@@ -92,7 +92,7 @@ describe ProxyForTemplate do
 	it 'should be able to enumerate treat_as_nil methods' do
 		@f.treat_as_nil.keys.to_a.should eq([:a])
 		
-		@f.treat_as_nil?(:a, false).should eq(true)
+		@f.treat_as_nil?(:a, false, false).should eq(true)
 	end
 
 	it 'should obey treat false as nil' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: proxy_for_template
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Mike Emery
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-20 00:00:00 -08:00
-default_executable: 
+date: 2012-01-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -112,7 +111,6 @@ files:
 - spec/activerecord_spec.rb
 - spec/proxy_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: ""
 licenses: []
 
@@ -142,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: proxy_for_template
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Allows method calls to be delegated to a template object.