trenni-formatters 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e2814d2a4811d2a066fd96b9cc0c9bc78f7dbe4
-  data.tar.gz: 525e508d5b65000040c12b3c09b5452c2f899ef3
+  metadata.gz: ac162860960979c57091379978f2bacfb93ef759
+  data.tar.gz: 9c31ab0d5f6c847a97512dfd1513bd83c87b1124
 SHA512:
-  metadata.gz: 5fbaeb44cb3ad9a3d6f3b499043f2a8e2703b03dd59b998349423384e32be1c927a89d2ec662f13edfe5eeb3f5e2621160231df9d32ae82aa506e0ab118a7c41
-  data.tar.gz: 1fe8760cbe647bc9ab1266666bdde4bc6e6b771f86bfc874af30b29cab7d3b4f1815610612b3e9222c2f007434ff0d3fb84832b03b54395f20d54e524ac7d41b
+  metadata.gz: 0ca42bc7c0c37c207f9ed0db93696cde7c3c899788d3c0f8c7a0537bc43ebdc7045144fdee8b5336dfc12d364fb9b44069423c90a7fe9402f023656a3a10b895
+  data.tar.gz: d17162fb3e392f9001d2e6c95f46d9140211b8b28d6ebfcd7854e76237e36ca4234a35cd41a66a8dd92c5cd19306d4655c3e576af3d54667731d67da5616cd4b

data/lib/trenni/formatters/formatter.rb

@@ -27,13 +27,11 @@ module Trenni
 			def initialize(options = {})
 				@options = options
 			end
+			
+			attr :options
 
 			def format_unspecified(object, options)
-				if object
-					object
-				else
-					options[:blank] || ""
-				end
+				object.to_s
 			end
 
 			def format(object, options = {})
@@ -43,7 +41,7 @@ module Trenni
 					self.send(method_name, object, options)
 				else
 					format_unspecified(object, options)
-				end.to_s
+				end
 			end
 
 			alias text format
@@ -51,6 +49,20 @@ module Trenni
 			def [] key
 				@options[key]
 			end
+			
+			map(String) do |object, options|
+				object
+			end
+			
+			map(NilClass) do |object, options|
+				options[:blank] || @options[:blank] || ""
+			end
+			
+			[TrueClass, FalseClass, Fixnum, Bignum, Float, Rational].each do |klass|
+				map(klass) do |object, options|
+					object.to_s
+				end
+			end
 		end
 	end
 end

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

@@ -26,16 +26,12 @@ module Trenni
 			module FormFormatter
 				# The target object of the form.
 				def object
-					@options[:object]
+					@object ||= @options[:object]
 				end
 
 				# Return true if the object is begin created or false if it is being updated.
 				def new_record?
-					if object.respond_to? :new_record?
-						return object.new_record?
-					elsif self.object.respond_to? :saved?
-						return !object.saved?
-					end
+					object.new_record?
 				end
 				
 				# Any additional details relating to a field (e.g. explanation text)

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

@@ -51,6 +51,14 @@ module Trenni
 					end
 				end
 
+				def raw_value_for(options)
+					@formatter.raw_value_for(options)
+				end
+
+				def raw_value
+					@raw_value ||= raw_value_for(@options)
+				end
+
 				def value_for(options)
 					@formatter.value_for(options)
 				end
@@ -62,7 +70,7 @@ module Trenni
 				def option_attributes_for(options)
 					return {
 						:value => value_for(options),
-						:selected => options.fetch(:selected){ value_for(@options) == value_for(options) },
+						:selected => options.fetch(:selected){ raw_value == raw_value_for(options) },
 						:id => options[:id],
 						:class => options[:class],
 						:data => options[:data],

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

@@ -44,6 +44,14 @@ module Trenni
 				def name_for(options)
 					@formatter.name_for(options)
 				end
+				
+				def raw_value_for(options)
+					@formatter.raw_value_for(options)
+				end
+
+				def raw_value
+					@raw_value ||= raw_value_for(@options)
+				end
 
 				def value_for(options)
 					@formatter.value_for(options)
@@ -59,7 +67,7 @@ module Trenni
 						:name => @field,
 						# We set a default value to empty string, otherwise it becomes "on".
 						:value => value_for(options) || "",
-						:checked => options.fetch(:selected){ value_for(@options) == value_for(options) },
+						:checked => options.fetch(:selected){ raw_value == raw_value_for(options) },
 						:data => options[:data],
 					}
 				end

data/lib/trenni/formatters/version.rb

@@ -20,6 +20,6 @@
 
 module Trenni
 	module Formatters
-		VERSION = "2.2.0"
+		VERSION = "2.3.0"
 	end
 end

data/spec/trenni/formatters/form_formatter_spec.rb

@@ -99,6 +99,8 @@ module Trenni::Formatters::FormFormatterSpec
 		end
 		
 		it "should escape characters correctly" do
+			expect(formatter.object).to receive(:new_record?).and_return(false)
+			
 			result = formatter.submit
 			expect(result).to be == %Q{<input type="submit" value="Update"/>}
 		end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trenni-formatters
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-14 00:00:00.000000000 Z
+date: 2017-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trenni
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Formatters for Trenni, to assist with typical views and form based interfaces.