proxy_for_template 0.0.5 → 0.0.6

data/lib/proxy_for_template.rb

@@ -66,26 +66,36 @@ module ProxyForTemplate
     end
   end
 
+	class TemplateProxyCall
+		attr_reader :method, :template_value, :self_value, :instance
+		
+		def initialize(method, template_value, self_value)
+			@method = method
+			@template_value = template_value
+			@self_value = self_value
+		end
+	end
+
   def self.included(base)
     base.extend(ClassMethods)
   end
 
-  def template_takes_precedence(method)
-    true
-  end
-
 	def treat_as_nil
 		self.class.treat_as_nil
 	end
 	
-	def treat_as_nil?(method, value)
-		
+	def treat_as_nil?(method, template_value)
+
 		proc = treat_as_nil[method.to_sym]
 		
 		is_nil = false
 		
+		self_value = self.send(method.to_s + '_orig')
+		
 		if(proc)
-			is_nil = proc.call(value)
+			call_info = TemplateProxyCall.new(method, template_value, self_value)
+			
+			is_nil = proc.call(self, call_info)
 		end
 		
 		is_nil
@@ -95,9 +105,7 @@ module ProxyForTemplate
     self.class.templated_methods
   end
 
-  def proxy_attribute_read(method)
-
-   
+  def proxy_attribute_read(method)   
     self_value = nil
 
     if(template_responds_to?(method))
@@ -106,7 +114,7 @@ module ProxyForTemplate
 
     self_value = self.attributes[method]
 
-    if template_takes_precedence(method) && !(template_value.nil? || template_value == '')
+    if !(template_value.nil? || template_value == '')
       self_value = template_value
     end
 
@@ -120,7 +128,7 @@ module ProxyForTemplate
 
     self_value = self.send(method + '_orig')
 
-    if template_takes_precedence(method) && !(template_value.nil? || template_value == '')
+    if !(template_value.nil? || template_value == '')
       self_value = template_value
     end
 
@@ -145,6 +153,7 @@ module ProxyForTemplate
     value = value_from_template(method)
 
     blank = (value.nil? || value == '')
+
     !blank
   end
 

data/lib/proxy_for_template/version.rb

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

data/spec/activerecord_spec.rb

@@ -20,12 +20,6 @@ class Spork < ActiveRecord::Base
   belongs_to :template, :class_name => Spork.name
   include ProxyForTemplate
 
-  attr_accessor :template_takes_precedence
-
-  def template_takes_precedence(method)
-    @template_takes_precedence.nil? ? true : @template_takes_precedence
-  end
-
   template_method :some_value
 end
 
@@ -102,13 +96,4 @@ describe ProxyForTemplate, '#activerecord' do
 
     base.some_value_before_type_cast.should eq(10)
   end
-
-  it 'the base should take precedence over the template when specified and using before type cast' do
-    template = Spork.create(:some_value => 10)
-    base = Spork.create(:some_value => 5, :template => template)
-    
-    base.template_takes_precedence = false
-
-    base.some_value_before_type_cast.should eq(5)
-  end
 end

data/spec/proxy_spec.rb

@@ -6,21 +6,19 @@ class Foo
   attr_accessor :a
   attr_accessor :b
 	attr_accessor :c
-  attr_writer :template_takes_precedence
+	
+	def check_if_false(call_info)
+		call_info.template_value == false
+	end
 
-	template_method :a, :treat_as_nil => Proc.new { |value| value == false }
+	template_method :a, :treat_as_nil => Proc.new { |instance, call_info| instance.check_if_false(call_info) }
 	
   attr_accessor :template
 
-  def template_takes_precedence(method)
-    @template_takes_precedence
-  end
-
   def initialize
     @template = Bar.new('abc123')
     @a = 'abc'
     @b = '123'
-    @template_takes_precedence = true
   end
 end
 
@@ -91,26 +89,9 @@ describe ProxyForTemplate do
     @f.a.should eq('abc')
   end
 
-  it "should be able to control whether proxying is turned off or on" do
-    @f.template_takes_precedence(:a).should eq(true)
-    @f.template_takes_precedence = false
-    @f.template_takes_precedence(:a).should eq(false)
-  end
-
-  it 'the template should not take precedence if its marked as a theme' do
-    @f.template_takes_precedence = false
-
-    @f.template_takes_precedence(:a).should eq(false)
-
-    @f.a = 123
-    @f.a.should eq(123)
-  end
-
-	it 'should be able to enumerate treat_false_as_nil methods' 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].call(false).should eq(true)
-		
 		@f.treat_as_nil?(:a, false).should eq(true)
 	end
 
@@ -118,5 +99,4 @@ describe ProxyForTemplate do
 		@f.template.a = false	
 		@f.a.should eq('abc')
 	end
-	
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: proxy_for_template
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Mike Emery
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-18 00:00:00 -08:00
+date: 2012-01-20 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency