trenni-formatters 2.10.0 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73f7c57bec0e5a3a6a532780308ca6e15569b3f26772876cdd2442c4d9e88a9b
-  data.tar.gz: 7e56a4f516c1306d708ad88716000eff4778023e3976ad9b44bced6fa5dacbf3
+  metadata.gz: 6d6feaaa592cf7b7ee7470871eb4a169485b1141978ca45fc0bae655e76494fc
+  data.tar.gz: 78e3dec788ea4b9439d64a281f13b1dd8a4b4845d65340d595e4e8489437d93c
 SHA512:
-  metadata.gz: f0a149e19f9a21e00335da046d7721c102ee30c6a0bec7382e855058fa5ae28ff51318a917c28d8eee09c4192499fa9a5908d6e7b365843176d18e7392869d91
-  data.tar.gz: ce08752246ea4f8529a9bd1adbbd008912a0b34ac1d8927a7cb43453dc45eee612a076ad01f5c39e0dc9696180562417d6338dd634a99c45ddbe5e2fb18d803c
+  metadata.gz: 1ed0633355b499980dadbcb900a651020f9718d43bae54b8dbbe2f8e0c491d06dec7bb9cf63e4eab58f6aa5bdba84742a31f1824711c124e95c2a24f8930fd0f
+  data.tar.gz: 151c6d08577bfc6481591c3b2c0733083b5d847c02f633525c5225629dc717f45b532b6c957fb27450cda2787e88d939e63d1bc4e6c15fe15bc4e570f2b78c4b

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

@@ -116,8 +116,25 @@ module Trenni
 						builder.tag :input, submit_attributes_for(**options)
 					end
 				end
-
-				def element(klass, options = {}, &block)
+				
+				def fieldset(**options, &block)
+					options = @options.merge(**options)
+					buffer = Trenni::Template.buffer(block.binding)
+					
+					Builder.fragment(buffer) do |builder|
+						builder.tag('fieldset') do
+							builder.inline('legend') do
+								builder.text title_for(**options)
+							end
+							
+							builder.tag('dl') do
+								yield(builder)
+							end
+						end
+					end
+				end
+				
+				def element(klass, **options, &block)
 					options = @options.merge(**options)
 					buffer = Trenni::Template.buffer(block.binding)
 					
@@ -127,7 +144,7 @@ module Trenni
 						end
 						
 						builder.tag(:dd) do
-							klass.call(self, options, builder, &block)
+							klass.call(self, builder, **options, &block)
 							
 							if details = details_for(**options)
 								builder.inline(:small, class: 'details') {builder.text details}

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

@@ -124,7 +124,7 @@ module Trenni
 					end
 				end
 				
-				def element(klass, options = {}, &block)
+				def element(klass, **options, &block)
 					options = @options.merge(**options)
 					buffer = Trenni::Template.buffer(block.binding)
 					
@@ -138,7 +138,7 @@ module Trenni
 								end
 							end
 							
-							klass.call(self, options, builder, &block)
+							klass.call(self, builder, **options, &block)
 						end
 					end
 				end

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

@@ -27,20 +27,20 @@ module Trenni
 		module HTML
 			# Standard drop-down select box:
 			class OptionSelect
-				def self.call(formatter, options, builder, &block)
-					instance = self.new(formatter, options, builder)
+				def self.call(formatter, builder, **options, &block)
+					instance = self.new(formatter, builder, **options)
 					
 					instance.call(options, &block)
 				end
 				
-				def initialize(formatter, options, builder)
+				def initialize(formatter, builder, **options)
 					@formatter = formatter
 					@object = formatter.object
-					@field = options[:field]
-					
-					@options = options
 					
 					@builder = builder
+					
+					@options = options
+					@field = options[:field]
 				end
 
 				def name_for(**options)
@@ -123,6 +123,7 @@ module Trenni
 						:class => options[:class],
 						:multiple => options[:multiple],
 						:data => options[:data],
+						:required => options[:required],
 					}
 				end
 

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

@@ -27,20 +27,20 @@ module Trenni
 		module HTML
 			# Table based select boxes using per-row checkboxes.
 			class RadioSelect
-				def self.call(formatter, options, builder, &block)
-					instance = self.new(formatter, options, builder)
+				def self.call(formatter, builder, **options, &block)
+					instance = self.new(formatter, builder, **options)
 					
 					instance.call(options, &block)
 				end
 				
-				def initialize(formatter, options, builder)
+				def initialize(formatter, builder, **options)
 					@formatter = formatter
 					@object = formatter.object
 					
+					@builder = builder
+					
 					@options = options
 					@field = options[:field]
-					
-					@builder = builder
 				end
 
 				def name_for(**options)

data/lib/trenni/formatters/version.rb

@@ -22,6 +22,6 @@
 
 module Trenni
 	module Formatters
-		VERSION = "2.10.0"
+		VERSION = "2.11.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trenni-formatters
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.11.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-31 00:00:00.000000000 Z
+date: 2020-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mapping