trenni-formatters 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa50c8010c607b2a6ba876ae66c8e82f89aa4035
-  data.tar.gz: d623ed6dc7f3b3d63b66352c084f63ee424b72d3
+  metadata.gz: 813dd7a079305803edf022d92a7658a693d44ece
+  data.tar.gz: db77a770b99e7f978900df8f8f2c67bde1851a0c
 SHA512:
-  metadata.gz: 8694ad8a47b4023b168f5dd4dedb423a03c2070c4f53aa5b5051adce68495deb909b19c0096bd832d1aaa8c8d1aa363ecd28baf3912bb109a971dfd78f2d6757
-  data.tar.gz: b34050e3251ad1842122c0c2cd05d6d310cfe0c271fa35aaa557920b95094cbab49e4b0af3cd38fb93ec149da50ff76d783f04822ffb898433245a0200ef1e7a
+  metadata.gz: bb3a8bf65681533a7f6b33a534f7d2697e7df74f59ba28b29c5b4dd5bb469cf20b6d314207adc4decfda790968cda362cdab9451962e9c852f45d27d9c95f3e0
+  data.tar.gz: 5d49a158f25c5f7f0afda482419c470d5a67b9f3f39666556da293c9705fafa136c553e82dc4930ad7debfd99bfce657af9a5534b583c72ec9275ea6ef6cba6f

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

@@ -41,6 +41,19 @@ module Trenni
 					end
 				end
 
+				# An output field for the result of a computation.
+				def output(options = {})
+					options = @options.merge(options)
+
+					Builder.fragment do |builder|
+						builder.inline(:dt) { builder.text title_for(options) }
+
+						builder.inline(:dd) do
+							builder.tag :output, output_attributes_for(options)
+						end
+					end
+				end
+
 				# A textarea field (multi-line text).
 				def textarea(options = {})
 					options = @options.merge(options)

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

@@ -29,9 +29,13 @@ module Trenni
 					@options[:object]
 				end
 
-				# The name of the field.
+				# The name of the field, used for the name attribute of an input.
 				def name_for(options)
-					options[:field] || title_for(options).downcase.gsub(/\s+/, '_').to_sym
+					options[:name] || options[:field]
+				end
+				
+				def field_for(options)
+					options[:field]
 				end
 
 				# The human presentable title for the field.
@@ -46,7 +50,7 @@ module Trenni
 					value = options[:value]
 
 					if options[:object]
-						value ||= options[:object].send(name_for(options))
+						value ||= options[:object].send(field_for(options))
 					end
 
 					# Allow to specify a default value if the value given, usually from an object, is nil.
@@ -67,6 +71,8 @@ module Trenni
 					attributes = {
 						:type => options[:type],
 						:name => name_for(options),
+						:id => options[:id],
+						:class => options[:class],
 						:value => value_for(options),
 						:required => options[:required] ? true : false,
 						:pattern => pattern_for(options),
@@ -77,9 +83,17 @@ module Trenni
 						:step => options[:step],
 					}
 					
-					if explicit_attributes = options[:attributes]
-						attributes.update(explicit_attributes)
-					end
+					return attributes
+				end
+
+				def output_attributes_for(options)
+					attributes = {
+						:name => name_for(options),
+						:id => options[:id],
+						:class => options[:class],
+						:for => options[:for],
+						:form => options[:form],
+					}
 					
 					return attributes
 				end
@@ -87,6 +101,8 @@ module Trenni
 				def textarea_attributes_for(options)
 					return {
 						:name => name_for(options),
+						:id => options[:id],
+						:class => options[:class],
 						:required => options[:required] ? true : false,
 						:placeholder => placeholder_for(options),
 					}
@@ -95,6 +111,8 @@ module Trenni
 				def checkbox_attributes_for(options)
 					return {
 						:type => options[:type] || 'checkbox',
+						:id => options[:id],
+						:class => options[:class],
 						:checked => options[:object].send(name),
 						:name => name_for(options),
 						:required => options[:required] ? true : false,
@@ -105,6 +123,8 @@ module Trenni
 				def submit_attributes_for(options)
 					return {
 						:type => options[:type] || 'submit',
+						:id => options[:id],
+						:class => options[:class],
 						:name => name_for(options),
 						:value => title_for(options),
 					}
@@ -113,6 +133,8 @@ module Trenni
 				def hidden_attributes_for(options)
 					return {
 						:type => options[:type] || 'hidden',
+						:id => options[:id],
+						:class => options[:class],
 						:name => name_for(options),
 						:value => value_for(options),
 					}

data/lib/trenni/formatters/version.rb

@@ -20,6 +20,6 @@
 
 module Trenni
 	module Formatters
-		VERSION = "0.3.3"
+		VERSION = "0.4.0"
 	end
 end

metadata

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