proxy_for_template 0.0.4 → 0.0.5

data/lib/proxy_for_template/version.rb

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

data/lib/proxy_for_template.rb

@@ -97,7 +97,7 @@ module ProxyForTemplate
 
   def proxy_attribute_read(method)
 
-    template_value = nil
+   
     self_value = nil
 
     if(template_responds_to?(method))
@@ -115,17 +115,9 @@ module ProxyForTemplate
 
   def proxy_read(method)
 
-    template_value = nil
+    template_value = value_from_template(method)
     self_value = nil
 
-    if(template_responds_to?(method))
-      template_value = template.send(method)
-    end
-
-		if(!template_value.nil? && treat_as_nil?(method, template_value))
-			template_value = nil
-		end
-
     self_value = self.send(method + '_orig')
 
     if template_takes_precedence(method) && !(template_value.nil? || template_value == '')
@@ -135,18 +127,28 @@ module ProxyForTemplate
     self_value
   end
 
-  def templated?(method)
-    value = nil
-
-    if(templated_methods.include?(method) && template_responds_to?(method))
-      value = template.send(method)
+	def value_from_template(method)
+		template_value = nil
+		
+    if(template_responds_to?(method))
+      template_value = template.send(method)
     end
 
+		if(!template_value.nil? && treat_as_nil?(method, template_value))
+			template_value = nil
+		end
+		
+		template_value
+	end
+
+  def templated?(method)
+    value = value_from_template(method)
+
     blank = (value.nil? || value == '')
     !blank
   end
 
   def template_responds_to?(method)
-    (respond_to?(:template) && template && template.respond_to?(method))
+    (respond_to?(:template) && templated_methods.include?(method.to_sym) && template && template.respond_to?(method))
   end
 end

metadata

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