trenni-formatters 0.2.1 → 0.3.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NGYwNzExYWY3NjEzOGI5MTlhYTY5NjdlMjkwZTZmZWY0NGNjM2I3Nw==
-  data.tar.gz: !binary |-
-    MTk3MmY0MDg4NjFjN2E1MDQwYTNlZGRmNWM2ODMxZDJmMzQ1NmMzYg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    YmQ1NDA0Zjc1ZGYzZTIxNjYxYjA4YmNlOTUwMjg1NTBkOWJlZWY4NmQ4ZjIy
-    ZWFhYzhhZDA5YTY1OTUyZTc4ZmY4ZmJmNGUyOWYyYjU4YTI2ZWRkMzNjYTRk
-    YTYwZDliN2YzNmM0ODg4MzI3MDI4NWUxZWU2MjMxMzk0M2MyM2E=
-  data.tar.gz: !binary |-
-    YjcwZmM0OTY4YjczMTk5MjQ4NTdlNGRmZjU3MTE1ZmJlMzY1OTU1OGI2Zjhj
-    OGE2OTk2ZTI4NzRkNTdhMzkyMDZkODcwMTc5MTk3NDJmOWNkNjg3MDQ1MTE4
-    NDY2Yzg1OTMwMjkzMmMxMjZjZDcyNzYwMGVkZDY3YTEyY2RjNGU=
+SHA1:
+  metadata.gz: 541558e37b2508160c0f53b739a55fca59dc2bbb
+  data.tar.gz: 57e9b3758e6ea0bfb835cc39358d441a6d3bc08c
+SHA512:
+  metadata.gz: 7f0c5bf2ecddaa4031ab0cc05fe75a91fea59671f12787d4f2ff0b37be6b5671f80346eac8e55d9502e24a135df7459195ca2818789673e7ef25e43fd19c800f
+  data.tar.gz: a6d55bbf536c9b503b5f89b10d8e35c343ea15e3fdf74d9accf07a0e7244718881031d5771cb75be1b59d0fb854b6710560d77f80783eefa798317134fd73c51

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

@@ -53,17 +53,28 @@ module Trenni
 				end
 
 				def pattern_for(options)
-					nil
+					options[:pattern]
+				end
+
+				def placeholder_for(options)
+					options[:placeholder]
 				end
 
 				def input_attributes_for(options)
-					return {
-							:type => options[:type],
-							:name => name_for(options),
-							:value => value_for(options),
-							:required => options[:required] ? true : false,
-							:pattern => pattern_for(options)
+					attributes = {
+						:type => options[:type],
+						:name => name_for(options),
+						:value => value_for(options),
+						:required => options[:required] ? true : false,
+						:pattern => pattern_for(options),
+						:placeholder => placeholder_for(options)
 					}
+					
+					if explicit_attributes = options[:attributes]
+						attributes.update(explicit_attributes)
+					end
+					
+					return attributes
 				end
 
 				# An input field (single line text).
@@ -83,6 +94,7 @@ module Trenni
 					return {
 						:name => name_for(options),
 						:required => options[:required] ? true : false,
+						:placeholder => placeholder_for(options),
 					}
 				end
 

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

@@ -36,6 +36,8 @@ module Trenni
 					@object = formatter.object
 					@field = options[:field]
 					
+					@options = options
+					
 					@builder = builder
 				end
 
@@ -54,7 +56,7 @@ module Trenni
 				def option_attributes_for(options)
 					return {
 						:value => value_for(options),
-						:selected => options[:selected],
+						:selected => options.fetch(:selected){ value_for(@options) == value_for(options) },
 					}
 				end
 

data/lib/trenni/formatters/version.rb

@@ -20,6 +20,6 @@
 
 module Trenni
 	module Formatters
-		VERSION = "0.2.1"
+		VERSION = "0.3.1"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trenni-formatters
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-31 00:00:00.000000000 Z
+date: 2014-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trenni
@@ -24,11 +24,10 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.0
-description: ! "\tTrenni is a templating system, and these formatters assist with
-  the development\n\tof typical view and form based web interface. A formatter is
-  a high-level\n\tadapter that turns model data into presentation text.\n\n\tFormatters
-  are designed to be customised, typically per-project, for specific\n\tformatting
-  needs.\n"
+description: "\tTrenni is a templating system, and these formatters assist with the
+  development\n\tof typical view and form based web interface. A formatter is a high-level\n\tadapter
+  that turns model data into presentation text.\n\n\tFormatters are designed to be
+  customised, typically per-project, for specific\n\tformatting needs.\n"
 email:
 - samuel.williams@oriontransfer.co.nz
 executables: []
@@ -58,20 +57,21 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Formatters for Trenni, to assist with typical views and form based interfaces.
 test_files:
 - test/test_formatters.rb
 - test/test_forms_formatter.rb
+has_rdoc: