trenni-formatters 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc3cefa3c833f41f4a54287eb8b4e49b38a386f2
-  data.tar.gz: 4c87174bfcb5aa9892beb03918bc4bcc0fabfaa2
+  metadata.gz: 1d07510393a4aecacebc320982d9382532413cce
+  data.tar.gz: b6a714803a220c15b55bd7b231fb2b62c60b1b14
 SHA512:
-  metadata.gz: 3c9a7c3eb4efc74fe0c99bbaf69e15c89caad2b17f9837981a8e4c8554e4447dd4885db509ab09dfed02179ff134c7baae45b9a3321b5415e61cebd9f890e6e6
-  data.tar.gz: dc8837a2db6db5a06a8b484b765549eafc304dfe191e65972693dd0e88f802151e5dbb3f113658ab7c06bd63a0bc99177f9e96db121fb0fc67f82f705f068546
+  metadata.gz: 828c3ea8d67b34e7d1f5d3ab04aa5666d6b47028e45f2e63585bbff812a4baeced3ef6b6d7550b5b28b23c6b311c3e0a304ea763ad04ac260cfccc1fafe7ae52
+  data.tar.gz: 2add9c98f3c1af745192bf3acadc3c6112b3a67406fa0c31df25c85af48072956599ee3dbf486e3c75e0f8056207074ac9621e60789d5993c2f8d298a30dcb05

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

@@ -19,6 +19,7 @@
 # THE SOFTWARE.
 
 require 'trenni/builder'
+require 'trenni/template'
 
 require_relative 'form_formatter'
 
@@ -85,9 +86,9 @@ module Trenni
 				# A submission button
 				def submit(options = {})
 					options = @options.merge(options)
-
-					unless options[:field]
-						options[:title] ||= self.object.saved? ? 'Update' : 'Create'
+					
+					unless title = title_for(options)
+						options[:title] ||= new_record? ? 'Create' : 'Update'
 					end
 
 					Builder.fragment do |builder|

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

@@ -29,6 +29,15 @@ module Trenni
 					@options[:object]
 				end
 
+				# Return true if the object is begin created or false if it is being updated.
+				def new_record?
+					if object.respond_to? :new_record?
+						return object.new_record?
+					elsif self.object.respond_to? :saved?
+						return !object.saved?
+					end
+				end
+
 				# The name of the field, used for the name attribute of an input.
 				def name_for(options)
 					options[:name] || options[:field]
@@ -37,12 +46,14 @@ module Trenni
 				def field_for(options)
 					options[:field]
 				end
-
-				# The human presentable title for the field.
+				
+				# 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)
-					title = options[:title] || Strings::to_title(options[:field].to_s)
+					title = options[:title]
+					return Strings::to_html(title) if title
 					
-					Strings::to_html(title)
+					field_name = field_for(options)
+					return Strings::to_title(field_name.to_s) if field_name
 				end
 
 				def object_value_for(options)
@@ -85,6 +96,9 @@ module Trenni
 						:min => options[:min],
 						:max => options[:max],
 						:step => options[:step],
+						# for <input type="text">
+						:minlength => options[:minlength],
+						:maxlength => options[:maxlength],
 					}
 					
 					return attributes
@@ -110,7 +124,10 @@ module Trenni
 						:required => options[:required],
 						:disabled => options[:disabled],
 						:readonly => options[:readonly],
+						:pattern => pattern_for(options),
 						:placeholder => placeholder_for(options),
+						:minlength => options[:minlength],
+						:maxlength => options[:maxlength],
 					}
 				end
 
@@ -131,10 +148,10 @@ module Trenni
 				def submit_attributes_for(options)
 					return {
 						:type => options[:type] || 'submit',
+						:name => name_for(options),
 						:id => options[:id],
 						:class => options[:class],
 						:disabled => options[:disabled],
-						:name => name_for(options),
 						:value => title_for(options),
 					}
 				end

data/lib/trenni/formatters/version.rb

@@ -20,6 +20,6 @@
 
 module Trenni
 	module Formatters
-		VERSION = "0.4.2"
+		VERSION = "0.4.3"
 	end
 end

data/spec/trenni/formatters/form_formatter_spec.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 # Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -31,21 +29,22 @@ module Trenni::Formatters::FormFormatterSpec
 	end
 	
 	describe Trenni::Formatters do
+		let(:formatter) {FormFormatter.new(:object => double(:bar => 10))}
+		
 		it "should generate form" do
-			object = double(:bar => 10)
-			
-			formatter = FormFormatter.new(:object => object)
-			
 			output_tag = formatter.input(:field => :bar)
 			expect(output_tag).to be == %Q{<dt>Bar</dt>\n<dd><input name="bar" value="10"/></dd>}
 		end
 		
 		it "should have default value" do
-			formatter = FormFormatter.new
-			
 			expect(formatter.value_for(:value => 10)).to be == "10"
 			expect(formatter.value_for(:value => nil, :default => 10)).to be == "10"
 		end
+		
+		it "should have a different title" do
+			output_tag = formatter.input(:field => :bar, :title => "Title")
+			expect(output_tag).to be == %Q{<dt>Title</dt>\n<dd><input name="bar" value="10"/></dd>}
+		end
 	end
 	
 	describe "<input>" do

data/spec/trenni/formatters/formatters_spec.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 # Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/spec/trenni/formatters/html/option_select_spec.rb

@@ -0,0 +1,46 @@
+# Copyright, 2014, 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
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'trenni/formatters'
+
+module Trenni::Formatters::HTML::OptionSelectSpec
+	class FormFormatter < Trenni::Formatters::Formatter
+		include Trenni::Formatters::HTML::DefinitionListForm
+		
+		def select(options = {}, &block)
+			element(Trenni::Formatters::HTML::OptionSelect, options, &block)
+		end
+	end
+	
+	describe Trenni::Formatters::HTML::OptionSelect do
+		let(:formatter) {FormFormatter.new(:object => double(:bar => 10))}
+		
+		it "should format items" do
+			_out = []
+			
+			formatter.select :field => :bar do |select|
+				_out << select.item(:title => "A", :value => 0)
+				_out << select.item(:title => "B", :value => 10)
+			end
+			
+			expect(_out.join).to be == "<dt>Bar</dt>\n<dd>\n\t<select name=\"bar\">\n\t\t<option value=\"0\">A</option><option value=\"10\" selected>B</option>\n\t</select>\n</dd>"
+		end
+	end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trenni-formatters
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-07 00:00:00.000000000 Z
+date: 2014-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trenni
@@ -90,6 +90,7 @@ files:
 - lib/trenni/formatters/version.rb
 - spec/trenni/formatters/form_formatter_spec.rb
 - spec/trenni/formatters/formatters_spec.rb
+- spec/trenni/formatters/html/option_select_spec.rb
 - trenni-formatters.gemspec
 homepage: https://github.com/ioquatix/trenni-formatters
 licenses: []
@@ -117,3 +118,4 @@ summary: Formatters for Trenni, to assist with typical views and form based inte
 test_files:
 - spec/trenni/formatters/form_formatter_spec.rb
 - spec/trenni/formatters/formatters_spec.rb
+- spec/trenni/formatters/html/option_select_spec.rb