trenni-formatters 2.12.2 → 2.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fc81bd7424d62a51946525bfadb198b184223b85f39924b090c4917866e4e07
-  data.tar.gz: 2b68b00618ebff45b414dd7f4cd29eb770cdc4093ce0e80738a2b20dcba60377
+  metadata.gz: a733cfc023aed3ce78ce8278b8d4ef57ee05215440d5bcf0304280115b002cc5
+  data.tar.gz: 374dade3208878129d786ef7917085ee5f05e5df50a62eb2d969ce970be944b3
 SHA512:
-  metadata.gz: bb61c211734823ed5d5c198532d892bd881309c90799cdd939d025e0edc59582fcc11b92292c8cbfeaf748fc60ea81c883967aaf58c0f46bcd9067ba5c362bbd
-  data.tar.gz: 2fc540df7f46b5dd4209517143fbe50d603cfd9857000c86906bc50c2c0302d8ae467cdbc8758e00f6360ba3e6dd99ca79bb9b4a232af11e9ab8f9cacc18e6dd
+  metadata.gz: a6663a34484d4fdc67cc9771df53959941e8c514bf03b752bb2c63680ac1e041ee7da4c95a6d8bb45430dd230093cc9b5911c1fef394dc6d179fafd4e9632121
+  data.tar.gz: a469d0252fdf4dd7fecd68048350e68a938bb28bbfe3347b47d2c04c39cc40fd7f5fd6dc3477c05d7eb360190f58c526d9fc900930183868ff3cadc2538486b6

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

@@ -119,9 +119,8 @@ module Trenni
 				
 				def element(klass, **options, &block)
 					options = @options.merge(**options)
-					buffer = Trenni::Template.buffer(block.binding)
 					
-					buffer << Builder.fragment do |builder|
+					Builder.fragment(block&.binding) do |builder|
 						builder.inline(:dt) do
 							builder.text title_for(**options)
 						end

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

@@ -126,7 +126,7 @@ module Trenni
 					options = @options.merge(**options)
 					buffer = Trenni::Template.buffer(block.binding)
 					
-					buffer << Builder.fragment do |builder|
+					Builder.fragment(buffer) do |builder|
 						builder.inline(:label) do
 							builder.inline(:span) do
 								builder.text title_for(**options)

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

@@ -75,11 +75,17 @@ module Trenni
 					}
 				end
 				
-				def item(builder = nil, **options)
+				def item(**options, &block)
 					options[:field] ||= 'id'
 					
-					Builder.fragment(builder) do |builder|
-						builder.inline(:option, option_attributes_for(**options)) {builder.text title_for(**options)}
+					Builder.fragment(block&.binding || @builder) do |builder|
+						builder.inline(:option, option_attributes_for(**options)) do
+							if block_given?
+								builder.capture(self, &block)
+							else
+								builder.text title_for(**options)
+							end
+						end
 					end
 				end
 				
@@ -101,14 +107,12 @@ module Trenni
 				end
 				
 				def group(**options, &block)
-					Builder.fragment(@builder) do |builder|
-						builder.tag :optgroup, group_attributes_for(**options) do
-							if options[:optional]
-								item(@builder, title: optional_title_for(**options), value: nil)
-							end
-							
-							builder.capture(&block)
+					@builder.tag :optgroup, group_attributes_for(**options) do
+						if options[:optional]
+							item(title: optional_title_for(**options), value: nil)
 						end
+						
+						@builder.capture(&block)
 					end
 				end
 				
@@ -131,7 +135,7 @@ module Trenni
 					Builder.fragment(@builder) do |builder|
 						builder.tag :select, select_attributes_for(**@options) do
 							if self.optional?
-								item(builder, title: optional_title_for(**@options), value: nil)
+								builder << item(title: optional_title_for(**@options), value: nil)
 							end
 							
 							builder.capture(self, &block)

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

@@ -72,8 +72,8 @@ module Trenni
 					}
 				end
 				
-				def item(builder = nil, **options, &block)
-					Builder.fragment(builder) do |builder|
+				def item(**options, &block)
+					Builder.fragment do |builder|
 						builder.tag :tr do
 							builder.inline(:td, :class => :handle) do
 								builder.tag :input, radio_attributes_for(**options)
@@ -87,7 +87,7 @@ module Trenni
 								end
 							end
 						end
-					end >> block
+					end
 				end
 
 				def optional_title_for(**options)
@@ -107,7 +107,7 @@ module Trenni
 						builder.tag :table do
 							builder.tag :tbody do
 								if self.optional?
-									item(builder, title: optional_title_for(**@options), value: nil)
+									builder << item(title: optional_title_for(**@options), value: nil)
 								end
 								
 								builder.capture(self, &block)

data/lib/trenni/formatters/version.rb

@@ -22,6 +22,6 @@
 
 module Trenni
 	module Formatters
-		VERSION = "2.12.2"
+		VERSION = "2.13.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trenni-formatters
 version: !ruby/object:Gem::Version
-  version: 2.12.2
+  version: 2.13.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-06 00:00:00.000000000 Z
+date: 2020-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mapping
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: bake
   requirement: !ruby/object:Gem::Requirement