trenni-formatters 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac162860960979c57091379978f2bacfb93ef759
-  data.tar.gz: 9c31ab0d5f6c847a97512dfd1513bd83c87b1124
+  metadata.gz: 8211316a3883ea35000eac2f2d7577066801285c
+  data.tar.gz: 1e663830ec43445a1580b330d1d3285633b40c46
 SHA512:
-  metadata.gz: 0ca42bc7c0c37c207f9ed0db93696cde7c3c899788d3c0f8c7a0537bc43ebdc7045144fdee8b5336dfc12d364fb9b44069423c90a7fe9402f023656a3a10b895
-  data.tar.gz: d17162fb3e392f9001d2e6c95f46d9140211b8b28d6ebfcd7854e76237e36ca4234a35cd41a66a8dd92c5cd19306d4655c3e576af3d54667731d67da5616cd4b
+  metadata.gz: 2883f0457f3bdb1c6a82390be80d435ed68ee6532cbe50129a3e283cb97e9ced70007e086a993cd4fc912e8ed1c04ad61d2904f3d38b9c3ea4bd7d93c02eb8cf
+  data.tar.gz: 875cc5c45745c8f1e67e4ad5c814ec101529459cf72a52f6dd46811b8d36e6e3117f4d164ef5a81dace38e2049b336802a03f80620b2dc32d60602f7a5d077fb

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

@@ -77,14 +77,22 @@ module Trenni
 					}
 				end
 
-				def item(options = {})
+				def item(builder: nil, **options)
 					options[:field] ||= 'id'
 					
-					Builder.fragment(options[:builder]) do |builder|
+					Builder.fragment(builder) do |builder|
 						builder.inline(:option, option_attributes_for(options)) { builder.text title_for(options) }
 					end
 				end
 
+				def optional_title_for(options)
+					if options[:optional] == true
+						options[:blank] || ''
+					else
+						options[:optional]
+					end
+				end
+
 				def group_attributes_for(options)
 					return {
 						:label => title_for(options),
@@ -98,7 +106,7 @@ module Trenni
 					Builder.fragment(@builder) do |builder|
 						builder.tag :optgroup, group_attributes_for(options) do
 							if options[:optional]
-								item(:title => '', :value => '', :builder => builder)
+								item(:title => optional_title_for(options), :value => nil, :builder => builder)
 							end
 							
 							builder.append Trenni::Template.capture(&block)
@@ -120,7 +128,7 @@ module Trenni
 					Builder.fragment(@builder) do |builder|
 						builder.tag :select, select_attributes_for(options) do
 							if options[:optional]
-								item(:title => '', :value => '', :builder => builder)
+								item(:title => optional_title_for(options), :value => nil, :builder => builder)
 							end
 							
 							builder.append Trenni::Template.capture(self, &block)

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

@@ -72,8 +72,8 @@ module Trenni
 					}
 				end
 
-				def item(options = {}, &block)
-					Builder.fragment do |builder|
+				def item(builder: nil, **options, &block)
+					Builder.fragment(builder) do |builder|
 						builder.tag :tr do
 							builder.inline(:td, :class => :handle) do
 								builder.tag :input, radio_attributes_for(options)
@@ -90,10 +90,22 @@ module Trenni
 					end >> block
 				end
 
+				def optional_title_for(options)
+					if options[:optional] == true
+						options[:blank] || ''
+					else
+						options[:optional]
+					end
+				end
+
 				def call(options = {}, &block)
 					Builder.fragment(@builder) do |builder|
 						builder.tag :table do
 							builder.tag :tbody do
+								if options[:optional]
+									item(:title => optional_title_for(options), :value => nil, :builder => builder)
+								end
+								
 								builder.append Trenni::Template.capture(self, &block)
 							end
 						end

data/lib/trenni/formatters/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trenni-formatters
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Samuel Williams