proxy_for_template 0.0.2 → 0.0.3

data/lib/proxy_for_template/version.rb

@@ -1,3 +1,3 @@
 module ProxyForTemplate
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/proxy_for_template.rb

@@ -4,8 +4,8 @@ module ProxyForTemplate
 
   module ClassMethods
 	
-		def treat_false_as_nil
-			@treat_false_as_nil ||= Set.new
+		def treat_as_nil
+			@treat_as_nil ||= {}
 		end
 
     def templated_methods
@@ -27,7 +27,7 @@ module ProxyForTemplate
 			end
 	
       method_names.each do |method|
-        define_proxy(method, options[:treat_false_as_nil])
+        define_proxy(method, options[:treat_as_nil])
       end
     end
 
@@ -35,11 +35,11 @@ module ProxyForTemplate
       @rails ||= defined?(ActiveRecord::Base)
     end
 
-    def define_proxy(method_name, special_false = false)
+    def define_proxy(method_name, false_eval = false)
       templated_methods << method_name
 
-			if special_false
-				treat_false_as_nil << method_name
+			if false_eval
+				treat_as_nil[method_name] = false_eval
 			end
 
       define_attribute_methods if respond_to?(:define_attribute_methods)
@@ -74,8 +74,21 @@ module ProxyForTemplate
     true
   end
 
-	def treat_false_as_nil
-		self.class.treat_false_as_nil
+	def treat_as_nil
+		self.class.treat_as_nil
+	end
+	
+	def treat_as_nil?(method, value)
+		
+		proc = treat_as_nil[method.to_sym]
+		
+		is_nil = false
+		
+		if(proc)
+			is_nil = proc.call(value)
+		end
+		
+		is_nil
 	end
 
   def templated_methods
@@ -109,7 +122,7 @@ module ProxyForTemplate
       template_value = template.send(method)
     end
 
-		if(template_value == false && treat_false_as_nil.include?(method.to_sym))
+		if(template_value && treat_as_nil?(method, template_value))
 			template_value = nil
 		end
 

data/spec/proxy_spec.rb

@@ -8,7 +8,7 @@ class Foo
 	attr_accessor :c
   attr_writer :template_takes_precedence
 
-	template_method :a, :treat_false_as_nil => true
+	template_method :a, :treat_as_nil => Proc.new { |value| value == false }
 	
   attr_accessor :template
 
@@ -107,7 +107,11 @@ describe ProxyForTemplate do
   end
 
 	it 'should be able to enumerate treat_false_as_nil methods' do
-		@f.treat_false_as_nil.to_a.should eq([:a])
+		@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
 
 	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: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Mike Emery