trenni-formatters 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a57557f077c2dbb156b3a99f74ce6c8aa516a373
-  data.tar.gz: f5a01135f2c7c2349a97a46c58be7fc09b9375ec
+  metadata.gz: dc3cefa3c833f41f4a54287eb8b4e49b38a386f2
+  data.tar.gz: 4c87174bfcb5aa9892beb03918bc4bcc0fabfaa2
 SHA512:
-  metadata.gz: 08018e55d97cc99a2a751d51834988f3f3980a255855c6f4e55682dfa881d03b380c10a07f08ea510b4251ff36ce4493e57ee3d6720526c9a2fef176a87a769e
-  data.tar.gz: e1a1ca5a88f82461bbeeba4163957e68d963871ab76434fb9bf0cad2668ab386556c6625910bde79cdac060ce461eed35c868095d383706c5b876c7e7cf0cde1
+  metadata.gz: 3c9a7c3eb4efc74fe0c99bbaf69e15c89caad2b17f9837981a8e4c8554e4447dd4885db509ab09dfed02179ff134c7baae45b9a3321b5415e61cebd9f890e6e6
+  data.tar.gz: dc8837a2db6db5a06a8b484b765549eafc304dfe191e65972693dd0e88f802151e5dbb3f113658ab7c06bd63a0bc99177f9e96db121fb0fc67f82f705f068546

data/lib/trenni/formatters/formatter.rb

@@ -49,12 +49,6 @@ module Trenni
 			def for(klass, &block)
 				@formatters[klass] = block
 			end
-
-			protected
-
-			def merged_options(options = {})
-				@options.merge(options)
-			end
 		end
 	end
 end

data/lib/trenni/formatters/html/form_formatter.rb

@@ -45,18 +45,20 @@ module Trenni
 					Strings::to_html(title)
 				end
 
-				# The value of the field.
-				def value_for(options)
-					value = options[:value]
-
-					if options[:object]
-						value ||= options[:object].send(field_for(options))
-					end
+				def object_value_for(options)
+					options[:object].send(field_for(options)) if options[:object]
+				end
 
+				def raw_value_for(options)
+					value = options.fetch(:value) { object_value_for(options) }
+					
 					# Allow to specify a default value if the value given, usually from an object, is nil.
-					value ||= options[:default]
+					value || options[:default]
+				end
 
-					self.format(value, options)
+				# The value of the field.
+				def value_for(options)
+					self.format(raw_value_for(options), options)
 				end
 
 				def pattern_for(options)
@@ -117,12 +119,12 @@ module Trenni
 						:type => options[:type] || 'checkbox',
 						:id => options[:id],
 						:class => options[:class],
-						:checked => options[:object].send(name),
 						:name => name_for(options),
+						:value => 'true',
+						:checked => raw_value_for(options),
 						:required => options[:required],
 						:disabled => options[:disabled],
 						:readonly => options[:readonly],
-						:value => 'true',
 					}
 				end
 

data/lib/trenni/formatters/version.rb

@@ -20,6 +20,6 @@
 
 module Trenni
 	module Formatters
-		VERSION = "0.4.1"
+		VERSION = "0.4.2"
 	end
 end

data/spec/trenni/formatters/form_formatter_spec.rb

@@ -49,7 +49,7 @@ module Trenni::Formatters::FormFormatterSpec
 	end
 	
 	describe "<input>" do
-		let(:formatter) {FormFormatter.new(:object => double(:bar => 10))}
+		let(:formatter) {FormFormatter.new(:object => double(bar: 10, bob: true, dole: false))}
 		
 		it "should support support min, max and step" do
 			attributes = formatter.input_attributes_for(:min => 10, :max => 20, :step => 2)
@@ -75,5 +75,21 @@ module Trenni::Formatters::FormFormatterSpec
 			expect(attributes[:readonly]).to be true
 			expect(attributes[:disabled]).to be true
 		end
+		
+		it "should generate checked checkbox" do
+			attributes = formatter.checkbox_attributes_for(:value => true)
+			expect(attributes[:checked]).to be true
+			
+			output_tag = formatter.checkbox(:field => :bob)
+			expect(output_tag).to be == %Q{<dd>\n\t<input type="hidden" name="bob" value="false"/>\t<input type="checkbox" name="bob" value="true" checked/>\tBob\n</dd>}
+		end
+		
+		it "should generate unchecked checkbox" do
+			attributes = formatter.checkbox_attributes_for(:value => false)
+			expect(attributes[:checked]).to be nil
+			
+			output_tag = formatter.checkbox(:field => :dole)
+			expect(output_tag).to be == %Q{<dd>\n\t<input type="hidden" name="dole" value="false"/>\t<input type="checkbox" name="dole" value="true"/>\tDole\n</dd>}
+		end
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trenni-formatters
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-16 00:00:00.000000000 Z
+date: 2014-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trenni