trenni-formatters 2.6.0 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 492fe49e4a836ae2bfd931e505dc45744e50387a
-  data.tar.gz: 789f8f795d95e35576f8841fbb43cf0ba7665bf6
+SHA256:
+  metadata.gz: 6d6feaaa592cf7b7ee7470871eb4a169485b1141978ca45fc0bae655e76494fc
+  data.tar.gz: 78e3dec788ea4b9439d64a281f13b1dd8a4b4845d65340d595e4e8489437d93c
 SHA512:
-  metadata.gz: 795ef68fecbeb39740a104bd80916a50f723fd16d94987bb9b4118264d6e0cc485cca9e8f82871343214f22fa80e4ea47fa438f54ee5137b51fd43a64aaa1a7d
-  data.tar.gz: 5d6a141d9ae4ed0cce880ce4747ba9e4eab6e6e312c4343676345a9ea5dc4c2515d995b1e31a3f10d6944804c97f0e3aa7ba29598d2098f96a825ccdb2ea3236
+  metadata.gz: 1ed0633355b499980dadbcb900a651020f9718d43bae54b8dbbe2f8e0c491d06dec7bb9cf63e4eab58f6aa5bdba84742a31f1824711c124e95c2a24f8930fd0f
+  data.tar.gz: 151c6d08577bfc6481591c3b2c0733083b5d847c02f633525c5225629dc717f45b532b6c957fb27450cda2787e88d939e63d1bc4e6c15fe15bc4e570f2b78c4b

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
@@ -25,12 +27,60 @@ require 'mapping/descendants'
 module Trenni
 	module Formatters
 		class Formatter < Mapping::Model
-			def initialize(options = {})
+			def self.for(object, **options)
+				self.new(object: object, **options)
+			end
+			
+			def initialize(**options)
 				@options = options
+				
+				@object = nil
+			end
+			
+			# The target object of the form.
+			def object
+				@object ||= @options[:object]
+			end
+			
+			def nested_name(**options)
+				options[:nested_name] || @options[:nested_name]
+			end
+			
+			# The name of the field, used for the name attribute of an input.
+			def name_for(**options)
+				name = options[:name] || options[:field]
+				
+				if suffix = options[:suffix]
+					name = "#{name}#{suffix}"
+				end
+				
+				if nested_name = self.nested_name(**options)
+					"#{nested_name}[#{name}]"
+				else
+					name
+				end
+			end
+			
+			def nested_name_for(**options)
+				name_for(**options)
+			end
+			
+			def nested(name, key = name, klass: self.class)
+				options = @options.dup
+				target = self.object.send(name)
+				
+				options[:object] = target
+				options[:nested_name] = nested_name_for(name: key)
+				
+				formatter = klass.new(**options)
+				
+				return formatter unless block_given?
+				
+				yield formatter
 			end
 			
 			attr :options
-
+			
 			def format_unspecified(object, options)
 				object.to_s
 			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,104 +32,132 @@ 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)
-							
-							if details = details_for(options)
-								builder.inline(:small) { builder.text details }
-							end
+							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}
+							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) { 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}
 							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 fieldset(**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.fragment(buffer) do |builder|
+						builder.tag('fieldset') do
+							builder.inline('legend') do
+								builder.text title_for(**options)
+							end
 							
-							if details = details_for(options)
-								builder.inline(:small) { builder.text details }
+							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)
+					
+					buffer << Builder.fragment do |builder|
+						builder.inline(:dt) do
+							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}
+							end
 						end
 					end
 				end
+				
+				def fieldset(**options, &block)
+					super do |builder|
+						builder.tag(:dl, &block)
+					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
@@ -24,99 +26,89 @@ module Trenni
 	module Formatters
 		module HTML
 			module FormFormatter
-				# The target object of the form.
-				def object
-					@object ||= @options[:object]
-				end
-
 				# Return true if the object is begin created or false if it is being updated.
 				def new_record?
 					object.new_record?
 				end
 				
 				# Any additional details relating to a field (e.g. explanation text)
-				def details_for(options)
+				def details_for(**options)
 					options[:details]
 				end
 				
-				# The name of the field, used for the name attribute of an input.
-				def name_for(options)
-					options[:name] || options[:field]
-				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)
+				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],
@@ -127,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],
@@ -158,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