trenni-formatters 2.8.1 → 2.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3394bc79205491b32b1ccda3d66f2bf61dac01306735d375c33568386bbae6c1
-  data.tar.gz: 3d150680e6494f6b7abaa10eb3b4622f772c69b740c886de05d8c6b371151ffb
+  metadata.gz: 7fc81bd7424d62a51946525bfadb198b184223b85f39924b090c4917866e4e07
+  data.tar.gz: 2b68b00618ebff45b414dd7f4cd29eb770cdc4093ce0e80738a2b20dcba60377
 SHA512:
-  metadata.gz: 62458096a57b44c43fd13cb5b03d7e75907eea995b8776d7dc60ebac74326b6747d8386c9757aa2e6fbf8549c084b6ffa5245dbf353c6394935fc9b80e4f6f9e
-  data.tar.gz: 34a072f941bf47d5ebd6e9959064f5b18ad5bb8aee6002977540ec692e3bc8a33db6b695549f113e2b958a28edc50b956de0f97627cb4a1f5c5f627f262cfbee
+  metadata.gz: bb61c211734823ed5d5c198532d892bd881309c90799cdd939d025e0edc59582fcc11b92292c8cbfeaf748fc60ea81c883967aaf58c0f46bcd9067ba5c362bbd
+  data.tar.gz: 2fc540df7f46b5dd4209517143fbe50d603cfd9857000c86906bc50c2c0302d8ae467cdbc8758e00f6360ba3e6dd99ca79bb9b4a232af11e9ab8f9cacc18e6dd

data/lib/trenni/formatters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2012 Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/trenni/formatters/formatter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -79,17 +81,17 @@ module Trenni
 			
 			attr :options
 			
-			def format_unspecified(object, options)
+			def format_unspecified(object, **options)
 				object.to_s
 			end
 
-			def format(object, options = {})
+			def format(object, **options)
 				method_name = self.method_for_mapping(object)
 				
 				if self.respond_to?(method_name)
-					self.send(method_name, object, options)
+					self.send(method_name, object, **options)
 				else
-					format_unspecified(object, options)
+					format_unspecified(object, **options)
 				end
 			end
 
@@ -99,15 +101,15 @@ module Trenni
 				@options[key]
 			end
 			
-			map(String) do |object, options|
+			map(String) do |object, **options|
 				object
 			end
 			
-			map(NilClass) do |object, options|
+			map(NilClass) do |object, **options|
 				options[:blank] || @options[:blank] || ""
 			end
 			
-			map(TrueClass, FalseClass, *Mapping.lookup_descendants(Numeric)) do |object, options|
+			map(TrueClass, FalseClass, *Mapping.lookup_descendants(Numeric)) do |object, **options|
 				object.to_s
 			end
 		end

data/{spec/trenni/formatters/formatters_spec.rb → lib/trenni/formatters/html/accept_checkbox.rb}

@@ -1,4 +1,6 @@
-# Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# frozen_string_literal: true
+
+# Copyright, 2020, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -18,40 +20,46 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'trenni/formatters'
+require 'trenni/builder'
 
-module Trenni::FormattersSpec
-	class TestFormatter < Trenni::Formatters::Formatter
-		def initialize(*)
-			@count = 0
-			
-			super
-		end
-		
-		attr :count
-		
-		map(String) do |value, options|
-			@count += 1
-			
-			"String: #{value}"
-		end
-	end
-	
-	describe Trenni::Formatters do
-		let(:test_formatter) {TestFormatter.new(foo: :bar)}
-	
-		it "should format string" do
-			expect(test_formatter.format("foobar")).to be == "String: foobar"
-			expect(test_formatter.count).to be == 1
-		end
-	
-		it "should format numbers" do
-			expect(test_formatter.format(10)).to be == "10"
-			expect(test_formatter.count).to be == 0
-		end
-		
-		it "has options" do
-			expect(test_formatter[:foo]).to be == :bar
+module Trenni
+	module Formatters
+		module HTML
+			class AcceptCheckbox
+				def self.call(formatter, builder, **options, &block)
+					instance = self.new(formatter, builder, **options)
+					
+					instance.call(&block)
+				end
+				
+				def initialize(formatter, builder, **options)
+					@formatter = formatter
+					@builder = builder
+					@options = options
+				end
+				
+				def name_for(**options)
+					@formatter.name_for(**options)
+				end
+				
+				def checkbox_attributes_for(**options)
+					@formatter.checkbox_attributes_for(**options)
+				end
+				
+				def call(&block)
+					Builder.fragment(@builder) do |builder|
+						builder.inline('span') do
+							builder.inline :input, type: :hidden, name: name_for(**@options), value: 'false'
+							
+							builder.tag :input, checkbox_attributes_for(**@options)
+							
+							builder.text " "
+							
+							builder.capture(self, &block)
+						end
+					end
+				end
+			end
 		end
 	end
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -30,109 +32,117 @@ module Trenni
 				include FormFormatter
 				
 				# An input field (single line text).
-				def input(options = {})
-					options = @options.merge(options)
+				def input(**options)
+					options = @options.merge(**options)
 
 					Builder.fragment do |builder|
 						builder.inline(:dt) do
-							builder.text title_for(options)
+							builder.text title_for(**options)
 						end
 						
 						builder.inline(:dd) do
-							builder.tag :input, input_attributes_for(options)
+							builder.tag :input, input_attributes_for(**options)
 							
-							if details = details_for(options)
-								builder.inline(:small, class: 'details') { builder.text details }
+							if details = details_for(**options)
+								builder.inline(:small, class: 'details') {builder.text details}
 							end
 						end
 					end
 				end
 
 				# An output field for the result of a computation.
-				def output(options = {})
-					options = @options.merge(options)
+				def output(**options)
+					options = @options.merge(**options)
 
 					Builder.fragment do |builder|
-						builder.inline(:dt) { builder.text title_for(options) }
+						builder.inline(:dt) {builder.text title_for(**options)}
 
 						builder.inline(:dd) do
-							builder.inline :output, output_attributes_for(options) do
-								builder.text value_for(options)
+							builder.inline :output, output_attributes_for(**options) do
+								builder.text value_for(**options)
 							end
 						end
 					end
 				end
 
 				# A textarea field (multi-line text).
-				def textarea(options = {})
-					options = @options.merge(options)
+				def textarea(**options)
+					options = @options.merge(**options)
 
 					Builder.fragment do |builder|
 						builder.tag(:dt) do
-								builder.text title_for(options)
+								builder.text title_for(**options)
 								
-								if details = details_for(options)
-									builder.inline(:small, class: 'details') { builder.text details }
+								if details = details_for(**options)
+									builder.inline(:small, class: 'details') {builder.text details}
 								end
 						end
 
 						builder.inline(:dd) do
-							builder.tag :textarea, textarea_attributes_for(options) do
-								builder.text value_for(options)
+							builder.tag :textarea, textarea_attributes_for(**options) do
+								builder.text value_for(**options)
 							end
 						end
 					end
 				end
 
 				# A checkbox field.
-				def checkbox(options)
-					options = @options.merge(options)
+				def checkbox(**options)
+					options = @options.merge(**options)
 
 					Builder.fragment do |builder|
 						builder.tag(:dd) do
-							builder.tag :input, :type => :hidden, :name => name_for(options), :value => 'false'
+							builder.tag :input, :type => :hidden, :name => name_for(**options), :value => 'false'
 							
 							builder.inline(:label) do
-								builder.tag :input, checkbox_attributes_for(options)
+								builder.tag :input, checkbox_attributes_for(**options)
 								# We would like a little bit of whitespace between the checkbox and the title.
-								builder.text " " + title_for(options)
+								builder.text " " + title_for(**options)
 							end
 							
-							if details = details_for(options)
-								builder.inline(:small, class: 'details') { builder.text details }
+							if details = details_for(**options)
+								builder.inline(:small, class: 'details') {builder.text details}
 							end
 						end
 					end
 				end
 
 				# A submission button
-				def submit(options = {})
-					options = @options.merge(options)
-					options[:title] ||= submit_title_for(options)
+				def submit(**options)
+					options = @options.merge(**options)
+					options[:title] ||= submit_title_for(**options)
 					
 					Builder.fragment do |builder|
-						builder.tag :input, submit_attributes_for(options)
+						builder.tag :input, submit_attributes_for(**options)
 					end
 				end
-
-				def element(klass, options = {}, &block)
-					options = @options.merge(options)
+				
+				def element(klass, **options, &block)
+					options = @options.merge(**options)
 					buffer = Trenni::Template.buffer(block.binding)
 					
 					buffer << Builder.fragment do |builder|
 						builder.inline(:dt) do
-							builder.text title_for(options)
+							builder.text title_for(**options)
 						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 }
+							if details = details_for(**options)
+								builder.inline(:small, class: 'details') {builder.text details}
 							end
 						end
 					end
 				end
+				
+				def fieldset(**options, &block)
+					super do |builder|
+						builder.tag(:dl) do
+							yield(builder)
+						end
+					end
+				end
 			end
 		end
 	end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -30,83 +32,83 @@ module Trenni
 				end
 				
 				# Any additional details relating to a field (e.g. explanation text)
-				def details_for(options)
+				def details_for(**options)
 					options[:details]
 				end
 				
-				def field_for(options)
+				def field_for(**options)
 					options[:field]
 				end
 				
 				# A title is a text string that will be displayed next to or on top of the control to describe it or its value:
-				def title_for(options)
+				def title_for(**options)
 					if title = options[:title]
 						return title
 					end
 					
 					# Generate a title from a field name:
-					if field_name = field_for(options)
+					if field_name = field_for(**options)
 						# Remove postfix "_id" or "_ids":
 						return Strings::to_title(field_name.to_s.sub(/_ids?/, ''))
 					end
 				end
 
-				def object_value_for(options)
-					if object = options[:object] and field = field_for(options)
+				def object_value_for(**options)
+					if object = options[:object] and field = field_for(**options)
 						object.send(field)
 					end
 				end
 
-				def raw_value_for(options)
-					value = options.fetch(:value) { object_value_for(options) }
+				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]
 				end
 
 				# The value of the field.
-				def value_for(options)
-					if value = raw_value_for(options)
-						self.format(value, options)
+				def value_for(**options)
+					if value = raw_value_for(**options)
+						self.format(value, **options)
 					end
 				end
 
-				def pattern_for(options)
+				def pattern_for(**options)
 					options[:pattern]
 				end
 
-				def placeholder_for(options)
+				def placeholder_for(**options)
 					options[:placeholder]
 				end
 
-				def input_attributes_for(options)
+				def input_attributes_for(**options)
 					attributes = {
 						:type => options[:type],
-						:name => name_for(options),
+						:name => name_for(**options),
 						:id => options[:id],
 						:class => options[:class],
-						:value => value_for(options),
+						:value => value_for(**options),
 						:required => options[:required],
 						:disabled => options[:disabled],
 						:readonly => options[:readonly],
-						:pattern => pattern_for(options),
-						:placeholder => placeholder_for(options),
+						:pattern => pattern_for(**options),
+						:placeholder => placeholder_for(**options),
 						# for <input type="range|number">
-						:min => options[:min],
-						:max => options[:max],
+						:min => options[:minimum] || options[:min],
+						:max => options[:maximum] || options[:max],
 						:step => options[:step],
 						# for <input type="text">
-						:minlength => options[:minlength],
-						:maxlength => options[:maxlength],
+						:minlength => options[:minimum] || options[:minlength],
+						:maxlength => options[:maximum] || options[:maxlength],
 						:data => options[:data],
 					}
 					
 					return attributes
 				end
 
-				def output_attributes_for(options)
+				def output_attributes_for(**options)
 					attributes = {
-						:name => name_for(options),
+						:name => name_for(**options),
 						:id => options[:id],
 						:class => options[:class],
 						:for => options[:for],
@@ -117,30 +119,30 @@ module Trenni
 					return attributes
 				end
 
-				def textarea_attributes_for(options)
+				def textarea_attributes_for(**options)
 					return {
-						:name => name_for(options),
+						:name => name_for(**options),
 						:id => options[:id],
 						:class => options[:class],
 						:required => options[:required],
 						:disabled => options[:disabled],
 						:readonly => options[:readonly],
-						:pattern => pattern_for(options),
-						:placeholder => placeholder_for(options),
+						:pattern => pattern_for(**options),
+						:placeholder => placeholder_for(**options),
 						:minlength => options[:minlength],
 						:maxlength => options[:maxlength],
 						:data => options[:data],
 					}
 				end
 
-				def checkbox_attributes_for(options)
+				def checkbox_attributes_for(**options)
 					return {
 						:type => options[:type] || 'checkbox',
 						:id => options[:id],
 						:class => options[:class],
-						:name => name_for(options),
+						:name => name_for(**options),
 						:value => 'true',
-						:checked => raw_value_for(options),
+						:checked => raw_value_for(**options),
 						:required => options[:required],
 						:disabled => options[:disabled],
 						:readonly => options[:readonly],
@@ -148,71 +150,86 @@ module Trenni
 					}
 				end
 
-				def submit_attributes_for(options)
+				def submit_attributes_for(**options)
 					return {
 						:type => options[:type] || 'submit',
-						:name => name_for(options),
+						:name => name_for(**options),
 						:id => options[:id],
 						:class => options[:class],
 						:disabled => options[:disabled],
-						:value => title_for(options),
+						:value => title_for(**options),
 						:data => options[:data],
 					}
 				end
 				
-				def submit_title_for(options)
-					title_for(options) || (new_record? ? 'Create' : 'Update')
+				def submit_title_for(**options)
+					title_for(**options) || (new_record? ? 'Create' : 'Update')
 				end
 				
-				def hidden_attributes_for(options)
+				def hidden_attributes_for(**options)
 					return {
 						:type => options[:type] || 'hidden',
 						:id => options[:id],
 						:class => options[:class],
-						:name => name_for(options),
-						:value => value_for(options),
+						:name => name_for(**options),
+						:value => value_for(**options),
 						:data => options[:data],
 					}
 				end
 
 				# A hidden field.
-				def hidden(options = {})
-					options = @options.merge(options)
+				def hidden(**options)
+					options = @options.merge(**options)
 
 					Builder.fragment do |builder|
-						builder.tag :input, hidden_attributes_for(options)
+						builder.tag :input, hidden_attributes_for(**options)
 					end
 				end
 				
-				def button_attributes_for(options)
+				def button_attributes_for(**options)
 					return {
 						:type => options[:type] || 'submit',
-						:name => name_for(options),
+						:name => name_for(**options),
 						:id => options[:id],
 						:class => options[:class],
 						:disabled => options[:disabled],
-						:value => value_for(options),
+						:value => value_for(**options),
 						:data => options[:data],
 					}
 				end
 				
-				def button_title_for(options)
+				def button_title_for(**options)
 					type = options.fetch(:type, 'submit').to_sym
 					
 					if type == :submit
-						submit_title_for(options)
+						submit_title_for(**options)
 					else
-						title_for(options) || Strings::to_title(type.to_s)
+						title_for(**options) || Strings::to_title(type.to_s)
 					end
 				end
 				
 				# A hidden field.
-				def button(options = {})
-					options = @options.merge(options)
+				def button(**options)
+					options = @options.merge(**options)
 
 					Builder.fragment do |builder|
-						builder.inline :button, button_attributes_for(options) do
-							builder.text button_title_for(options)
+						builder.inline :button, button_attributes_for(**options) do
+							builder.text button_title_for(**options)
+						end
+					end
+				end
+				
+				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
+							
+							yield(builder)
 						end
 					end
 				end