trenni-formatters 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 541558e37b2508160c0f53b739a55fca59dc2bbb
-  data.tar.gz: 57e9b3758e6ea0bfb835cc39358d441a6d3bc08c
+  metadata.gz: 3b94680567298f92a104b915eb9394dbcbba604a
+  data.tar.gz: e63108af3f7dd07993a4b299bad3bc596e5138a8
 SHA512:
-  metadata.gz: 7f0c5bf2ecddaa4031ab0cc05fe75a91fea59671f12787d4f2ff0b37be6b5671f80346eac8e55d9502e24a135df7459195ca2818789673e7ef25e43fd19c800f
-  data.tar.gz: a6d55bbf536c9b503b5f89b10d8e35c343ea15e3fdf74d9accf07a0e7244718881031d5771cb75be1b59d0fb854b6710560d77f80783eefa798317134fd73c51
+  metadata.gz: 70478b6fe86057a00dd1a497c78ebd037dc09966dd2ce29f7a61ac8e05c14cc7cb4ece5d2442378889b7f9ce4a33012a6b6bb6e8ab4aa3f719d62d5ac723b0fe
+  data.tar.gz: 10030cb89fa77e24efa96bec0aa21517076dd49bdfad29560cbec0c7fe3779d15116d90c7aa7ade3e3d8afad85753a13b4d36cada63b7216001445fa2dfc47af

data/.travis.yml

@@ -1,9 +1,5 @@
 language: ruby
 rvm:
-  - "1.8.7"
-  - "1.9.2"
-  - "1.9.3"
-  - jruby-18mode # JRuby in 1.8 mode
-  - jruby-19mode # JRuby in 1.9 mode
-  - rbx-18mode
-  - rbx-19mode
+  - "1.9"
+  - "2.0"
+  - "2.1"

data/Gemfile

@@ -2,7 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in trenni-formatters.gemspec
 gemspec
-
-group :test do
-	gem "rake"
-end

data/README.md

@@ -7,7 +7,7 @@ adapter that turns model data into presentation text.
 Formatters are designed to be customised, typically per-project, for specific
 formatting needs.
 
-[![Build Status](https://secure.travis-ci.org/ioquatix/trenni-formatters.png)](http://travis-ci.org/ioquatix/trenni-formatters)
+[![Build Status](https://travis-ci.org/ioquatix/trenni-formatters.svg?branch=master)](https://travis-ci.org/ioquatix/trenni-formatters)
 
 ## Installation
 
@@ -50,7 +50,7 @@ For more examples please see `test/`.
 
 Released under the MIT license.
 
-Copyright, 2012, by [Samuel G. D. Williams](http://www.codeotaku.com/samuel-williams).
+Copyright, 2014, by [Samuel G. D. Williams](http://www.codeotaku.com/samuel-williams).
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/Rakefile

@@ -1,9 +1,6 @@
 require "bundler/gem_tasks"
-require "rake/testtask"
+require "rspec/core/rake_task"
 
-Rake::TestTask.new do |t|
-	t.libs << 'test'
-end
+RSpec::Core::RakeTask.new(:spec)
 
-desc "Run tests"
-task :default => :test
+task :default => :spec

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

@@ -20,63 +20,14 @@
 
 require 'trenni/builder'
 
+require_relative 'form_formatter'
+
 module Trenni
 	module Formatters
 		module HTML
 			module DefinitionListForm
-				# The target object of the form.
-				def object
-					@options[:object]
-				end
-
-				# The name of the field.
-				def name_for(options)
-					options[:field] || title_for(options).downcase.gsub(/\s+/, '_').to_sym
-				end
-
-				# The human presentable title for the field.
-				def title_for(options)
-					title = options[:title] || Strings::to_title(options[:field].to_s)
-					
-					Strings::to_html(title)
-				end
-
-				# The value of the field.
-				def value_for(options)
-					value = options[:value]
-
-					if options[:object]
-						value ||= options[:object].send(name_for(options))
-					end
-
-					self.format(value, options)
-				end
-
-				def pattern_for(options)
-					options[:pattern]
-				end
-
-				def placeholder_for(options)
-					options[:placeholder]
-				end
-
-				def input_attributes_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
-
+				include FormFormatter
+				
 				# An input field (single line text).
 				def input(options = {})
 					options = @options.merge(options)
@@ -90,14 +41,6 @@ module Trenni
 					end
 				end
 
-				def textarea_attributes_for(options)
-					return {
-						:name => name_for(options),
-						:required => options[:required] ? true : false,
-						:placeholder => placeholder_for(options),
-					}
-				end
-
 				# A textarea field (multi-line text).
 				def textarea(options = {})
 					options = @options.merge(options)
@@ -113,16 +56,6 @@ module Trenni
 					end
 				end
 
-				def checkbox_attributes_for(options)
-					return {
-						:type => options[:type] || 'checkbox',
-						:checked => options[:object].send(name),
-						:name => name_for(options),
-						:required => options[:required] ? true : false,
-						:value => 'true',
-					}
-				end
-
 				# A checkbox field.
 				def checkbox(options)
 					options = @options.merge(options)
@@ -136,14 +69,6 @@ module Trenni
 					end
 				end
 
-				def submit_attributes_for(options)
-					return {
-						:type => options[:type] || 'submit',
-						:name => name_for(options),
-						:value => title_for(options),
-					}
-				end
-
 				# A submission button
 				def submit(options = {})
 					options = @options.merge(options)
@@ -157,23 +82,6 @@ module Trenni
 					end
 				end
 
-				def hidden_attributes_for(options)
-					return {
-						:type => options[:type] || 'hidden',
-						:name => name_for(options),
-						:value => value_for(options),
-					}
-				end
-
-				# A hidden field.
-				def hidden(options = {})
-					options = @options.merge(options)
-
-					Builder.fragment do |builder|
-						builder.tag :input, hidden_attributes_for(options)
-					end
-				end
-
 				def element(klass, options = {}, &block)
 					options = @options.merge(options)
 					buffer = Trenni::Template.buffer(block.binding)

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

@@ -0,0 +1,128 @@
+# Copyright, 2012, 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/builder'
+
+module Trenni
+	module Formatters
+		module HTML
+			module FormFormatter
+				# The target object of the form.
+				def object
+					@options[:object]
+				end
+
+				# The name of the field.
+				def name_for(options)
+					options[:field] || title_for(options).downcase.gsub(/\s+/, '_').to_sym
+				end
+
+				# The human presentable title for the field.
+				def title_for(options)
+					title = options[:title] || Strings::to_title(options[:field].to_s)
+					
+					Strings::to_html(title)
+				end
+
+				# The value of the field.
+				def value_for(options)
+					value = options[:value]
+
+					if options[:object]
+						value ||= options[:object].send(name_for(options))
+					end
+
+					# Allow to specify a default value if the value given, usually from an object, is nil.
+					value ||= options[:default]
+
+					self.format(value, options)
+				end
+
+				def pattern_for(options)
+					options[:pattern]
+				end
+
+				def placeholder_for(options)
+					options[:placeholder]
+				end
+
+				def input_attributes_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
+
+				def textarea_attributes_for(options)
+					return {
+						:name => name_for(options),
+						:required => options[:required] ? true : false,
+						:placeholder => placeholder_for(options),
+					}
+				end
+
+				def checkbox_attributes_for(options)
+					return {
+						:type => options[:type] || 'checkbox',
+						:checked => options[:object].send(name),
+						:name => name_for(options),
+						:required => options[:required] ? true : false,
+						:value => 'true',
+					}
+				end
+
+				def submit_attributes_for(options)
+					return {
+						:type => options[:type] || 'submit',
+						:name => name_for(options),
+						:value => title_for(options),
+					}
+				end
+
+				def hidden_attributes_for(options)
+					return {
+						:type => options[:type] || 'hidden',
+						:name => name_for(options),
+						:value => value_for(options),
+					}
+				end
+
+				# A hidden field.
+				def hidden(options = {})
+					options = @options.merge(options)
+
+					Builder.fragment do |builder|
+						builder.tag :input, hidden_attributes_for(options)
+					end
+				end
+			end
+		end
+	end
+end

data/lib/trenni/formatters/version.rb

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

data/{test/test_formatters.rb → spec/trenni/formatters/formatters_spec.rb}

@@ -20,27 +20,32 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'pathname'
-require 'test/unit'
-require 'stringio'
-
-require 'trenni'
 require 'trenni/formatters'
 
-class TestFormatters < Test::Unit::TestCase
-	def test_basic_formatter
-		count = 0
-		formatter = Trenni::Formatters::Formatter.new
-		
-		formatter.for(String) do |value, options|
-			count += 1
-			"String: #{value}"
+module Trenni
+	module Formatters
+		module FormattersSpec
+			describe Formatters do
+				before do
+					@count = 0
+					@formatter = Trenni::Formatters::Formatter.new
+				
+					@formatter.for(String) do |value, options|
+						@count += 1
+						"String: #{value}"
+					end
+				end
+			
+				it "should format string" do
+					expect(@formatter.format("foobar")).to be == "String: foobar"
+					expect(@count).to be == 1
+				end
+			
+				it "should format numbers" do
+					expect(@formatter.format(10)).to be == "10"
+					expect(@count).to be == 0
+				end
+			end
 		end
-		
-		assert_equal "String: foobar", formatter.format("foobar")
-		assert_equal 1, count
-		
-		assert_equal "10", formatter.format(10)
-		assert_equal 1, count
 	end
 end

data/{test → spec/trenni/formatters}/test_forms_formatter.rb

@@ -20,30 +20,34 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'pathname'
-require 'test/unit'
-require 'stringio'
-
 require 'trenni/formatters'
 require 'trenni/formatters/html/definition_list_form'
 require 'trenni/formatters/html/option_select'
 require 'trenni/formatters/html/table_select'
 
-class TestFormsFormatter < Test::Unit::TestCase
-	class BasicFormatter < Trenni::Formatters::Formatter
-		include Trenni::Formatters::HTML::DefinitionListForm
-	end
-	
-	class Foo
-		attr :bar, true
-	end
-	
-	def test_basic_formatter
-		object = Foo.new
-		object.bar = 10
-
-		formatter = BasicFormatter.new(:object => object)
-
-		assert_equal %Q{<dt>Bar</dt>\n<dd><input name="bar" value="10"/></dd>}, formatter.input(:field => :bar)
+module Trenni
+	module Formatters
+		module FormFormattersSpec
+			class FormFormatter < Trenni::Formatters::Formatter
+				include Trenni::Formatters::HTML::DefinitionListForm
+			end
+			
+			describe Formatters do
+				it "should generate form" do
+					object = double(:bar => 10)
+					
+					formatter = FormFormatter.new(:object => object)
+					
+					expect(formatter.input(:field => :bar)).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
+			end
+		end
 	end
 end

data/trenni-formatters.gemspec

@@ -3,12 +3,12 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'trenni/formatters/version'
 
-Gem::Specification.new do |gem|
-	gem.name          = "trenni-formatters"
-	gem.version       = Trenni::Formatters::VERSION
-	gem.authors       = ["Samuel Williams"]
-	gem.email         = ["samuel.williams@oriontransfer.co.nz"]
-	gem.description   = <<-EOF
+Gem::Specification.new do |spec|
+	spec.name          = "trenni-formatters"
+	spec.version       = Trenni::Formatters::VERSION
+	spec.authors       = ["Samuel Williams"]
+	spec.email         = ["samuel.williams@oriontransfer.co.nz"]
+	spec.description   = <<-EOF
 	Trenni is a templating system, and these formatters assist with the development
 	of typical view and form based web interface. A formatter is a high-level
 	adapter that turns model data into presentation text.
@@ -16,13 +16,17 @@ Gem::Specification.new do |gem|
 	Formatters are designed to be customised, typically per-project, for specific
 	formatting needs.
 	EOF
-	gem.summary       = %q{Formatters for Trenni, to assist with typical views and form based interfaces.}
-	gem.homepage      = "https://github.com/ioquatix/trenni-formatters"
+	spec.summary       = %q{Formatters for Trenni, to assist with typical views and form based interfaces.}
+	spec.homepage      = "https://github.com/ioquatix/trenni-formatters"
 
-	gem.files         = `git ls-files`.split($/)
-	gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-	gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-	gem.require_paths = ["lib"]
+	spec.files         = `git ls-files`.split($/)
+	spec.executables   = spec.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+	spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+	spec.require_paths = ["lib"]
 	
-	gem.add_dependency "trenni", "~> 1.2.0"
+	spec.add_dependency "trenni", "~> 1.2.0"
+	
+	spec.add_development_dependency "bundler", "~> 1.3"
+	spec.add_development_dependency "rspec", "~> 3.0.0.rc1"
+	spec.add_development_dependency "rake"
 end

metadata

@@ -1,29 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: trenni-formatters
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-12 00:00:00.000000000 Z
+date: 2014-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trenni
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0.rc1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0.rc1
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '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
@@ -34,19 +76,20 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
 - lib/trenni/formatters.rb
 - lib/trenni/formatters/formatter.rb
 - lib/trenni/formatters/html/definition_list_form.rb
+- lib/trenni/formatters/html/form_formatter.rb
 - lib/trenni/formatters/html/option_select.rb
 - lib/trenni/formatters/html/table_select.rb
 - lib/trenni/formatters/version.rb
-- test/test_formatters.rb
-- test/test_forms_formatter.rb
+- spec/trenni/formatters/formatters_spec.rb
+- spec/trenni/formatters/test_forms_formatter.rb
 - trenni-formatters.gemspec
 homepage: https://github.com/ioquatix/trenni-formatters
 licenses: []
@@ -57,21 +100,20 @@ 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.3
+rubygems_version: 2.2.2
 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: 
+- spec/trenni/formatters/formatters_spec.rb
+- spec/trenni/formatters/test_forms_formatter.rb