trenni-formatters 2.8.1 → 2.12.2

data/lib/trenni/formatters/relative_time.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,7 +27,7 @@ module Trenni
 	module Formatters
 		module RelativeTime
 			def self.included(base)
-				base.map(Time) do |object, options|
+				base.map(Time) do |object, **options|
 					current_time = options.fetch(:current_time) {Time.now}
 					
 					# Ensure we display the time in localtime, and show the year if it is different:

data/lib/trenni/formatters/truncated_text.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,28 +26,30 @@ require 'mapping/model'
 module Trenni
 	module Formatters
 		module TruncatedText
-			def truncated_text(content, options = {})
+			def truncated_text(content, length: 30, **options)
 				if content
-					length  = options.fetch(:length, 30)
-					
-					content = TruncatedText.truncate_text(content, length, options)
+					content = TruncatedText.truncate_text(content, length, **options)
 					
 					return self.format(content)
 				end
 			end
 			
-			def self.truncate_text(text, truncate_at, options = {})
+			def self.truncate_text(text, truncate_at, omission: nil, separator: nil, **options)
 				return text.dup unless text.length > truncate_at
 				
-				options[:omission] ||= '...'
-				length_with_room_for_omission = truncate_at - options[:omission].length
-				stop = if options[:separator]
-					text.rindex(options[:separator], length_with_room_for_omission) || length_with_room_for_omission
-				else
-					length_with_room_for_omission
+				omission ||= '...'
+				
+				length_with_room_for_omission = truncate_at - omission.length
+				
+				stop = nil
+				
+				if separator
+					stop = text.rindex(separator, length_with_room_for_omission)
 				end
 				
-				"#{text[0...stop]}#{options[:omission]}"
+				stop ||= length_with_room_for_omission
+				
+				"#{text[0...stop]}#{omission}"
 			end
 		end
 	end

data/lib/trenni/formatters/version.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
@@ -20,6 +22,6 @@
 
 module Trenni
 	module Formatters
-		VERSION = "2.8.1"
+		VERSION = "2.12.2"
 	end
 end

metadata

@@ -1,43 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: trenni-formatters
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.12.2
 platform: ruby
 authors:
 - Samuel Williams
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-01-28 00:00:00.000000000 Z
+date: 2020-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: trenni
+  name: mapping
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: mapping
+  name: trenni
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: bake
+  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'
+- !ruby/object:Gem::Dependency
+  name: bake-bundler
+  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'
+- !ruby/object:Gem::Dependency
+  name: bake-modernize
+  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'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -53,21 +95,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: covered
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -80,45 +122,30 @@ dependencies:
     - - ">="
       - !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
-  customised, typically per-project, for specific\n\tformatting needs.\n"
+description:
 email:
-- samuel.williams@oriontransfer.co.nz
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".simplecov"
-- ".travis.yml"
-- Gemfile
-- README.md
-- Rakefile
 - lib/trenni/formatters.rb
 - lib/trenni/formatters/formatter.rb
+- lib/trenni/formatters/html/accept_checkbox.rb
 - lib/trenni/formatters/html/definition_list_form.rb
 - lib/trenni/formatters/html/form_formatter.rb
+- lib/trenni/formatters/html/label_form.rb
 - lib/trenni/formatters/html/option_select.rb
 - lib/trenni/formatters/html/radio_select.rb
 - lib/trenni/formatters/markdown.rb
 - lib/trenni/formatters/relative_time.rb
 - lib/trenni/formatters/truncated_text.rb
 - lib/trenni/formatters/version.rb
-- spec/trenni/formatters/formatters_spec.rb
-- spec/trenni/formatters/html/form_formatter_spec.rb
-- spec/trenni/formatters/html/option_select_spec.rb
-- spec/trenni/formatters/html/radio_select_spec.rb
-- spec/trenni/formatters/markdown_spec.rb
-- spec/trenni/formatters/relative_time_spec.rb
-- spec/trenni/formatters/truncated_text_spec.rb
-- trenni-formatters.gemspec
 homepage: https://github.com/ioquatix/trenni-formatters
-licenses: []
-metadata: {}
-post_install_message: 
+licenses:
+- MIT
+metadata:
+  funding_uri: https://github.com/sponsors/ioquatix/
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -126,22 +153,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Formatters for Trenni, to assist with typical views and form based interfaces.
-test_files:
-- spec/trenni/formatters/formatters_spec.rb
-- spec/trenni/formatters/html/form_formatter_spec.rb
-- spec/trenni/formatters/html/option_select_spec.rb
-- spec/trenni/formatters/html/radio_select_spec.rb
-- spec/trenni/formatters/markdown_spec.rb
-- spec/trenni/formatters/relative_time_spec.rb
-- spec/trenni/formatters/truncated_text_spec.rb
+test_files: []

data/.gitignore

@@ -1,17 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp

data/.rspec

@@ -1,4 +0,0 @@
---color
---format documentation
---backtrace
---warnings

data/.simplecov

@@ -1,9 +0,0 @@
-
-SimpleCov.start do
-	add_filter "/spec/"
-end
-
-if ENV['TRAVIS']
-	require 'coveralls'
-	Coveralls.wear!
-end

data/.travis.yml

@@ -1,8 +0,0 @@
-language: ruby
-
-rvm:
-  - 2.3
-  - 2.4
-  - 2.5
-  - 2.6
-  - ruby-head

data/Gemfile

@@ -1,12 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in trenni-formatters.gemspec
-gemspec
-
-group :test do
-	gem 'sanitize'
-	gem 'kramdown'
-	
-	gem 'simplecov'
-	gem 'coveralls', require: false
-end

data/README.md

@@ -1,77 +0,0 @@
-# Trenni::Formatters
-
-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.
-
-Formatters are designed to be customised, typically per-project, for specific
-formatting needs.
-
-[![Build Status](https://travis-ci.org/ioquatix/trenni-formatters.svg?branch=master)](https://travis-ci.org/ioquatix/trenni-formatters)
-[![Code Climate](https://codeclimate.com/github/ioquatix/trenni-formatters.png)](https://codeclimate.com/github/ioquatix/trenni-formatters)
-[![Coverage Status](https://coveralls.io/repos/ioquatix/trenni-formatters/badge.svg)](https://coveralls.io/r/ioquatix/trenni-formatters)
-
-## Motivation
-
-`Trenni::Formatters` was a library extracted from [Financier](https://github.com/ioquatix/financier) which is a CouchDB backed invoicing system, itself, derived from an old Rails app. I was a bit envious of `form_for` in terms of the ease of generating forms, but found that it wasn't very extendable. I also found myself generating code to format model data as rich HTML. `Trenni::Formatters` attempts to be an easily extendable formatting module which can generate rich text, links and HTML.
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-	gem 'trenni-formatters'
-
-And then execute:
-
-	$ bundle
-
-Or install it yourself as:
-
-	$ gem install trenni-formatters
-
-## Usage
-
-The most basic usage involves converting model data into presentation text by
-a mapping corresponding to the objects type:
-
-	formatter = Trenni::Formatters::Formatter.new
-		
-	formatter.for(String) do |value, options|
-		"String: #{value}"
-	end
-		
-	expect(formatter.format("foobar")).to be == "String: foobar"
-
-For more examples please see `spec/`.
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
-
-## License
-
-Released under the MIT license.
-
-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
-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.

data/Rakefile

@@ -1,8 +0,0 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec) do |task|
-	task.rspec_opts = ["--require", "simplecov"] if ENV['COVERAGE']
-end
-
-task :default => :spec

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

@@ -1,186 +0,0 @@
-# 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/formatters'
-require 'trenni/formatters/html/definition_list_form'
-
-module Trenni::Formatters::FormFormatterSpec
-	class FormFormatter < Trenni::Formatters::Formatter
-		include Trenni::Formatters::HTML::DefinitionListForm
-	end
-	
-	describe Trenni::Formatters do
-		let(:formatter) {FormFormatter.for(double(bar: 10))}
-		
-		it "should generate form" do
-			result = formatter.input(:field => :bar)
-			expect(result).to be == %Q{<dt>Bar</dt>\n<dd><input name="bar" value="10"/></dd>}
-		end
-		
-		it "should have default value" do
-			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
-			result = formatter.input(:field => :bar, :title => "Title")
-			expect(result).to be == %Q{<dt>Title</dt>\n<dd><input name="bar" value="10"/></dd>}
-		end
-		
-		context "with key" do
-			let(:formatter) {FormFormatter.for(double(bar: 10), nested_name: 'attributes')}
-			
-			it "should generate form with nested name" do
-				result = formatter.input(:field => :bar)
-				expect(result).to be == %Q{<dt>Bar</dt>\n<dd><input name="attributes[bar]" value="10"/></dd>}
-			end
-		end
-		
-		context "with nested object" do
-			let(:formatter) {FormFormatter.for(double(animal: double(name: "cat")))}
-			
-			it "can generate nested attributes" do
-				result = formatter.nested(:animal) do |formatter|
-					formatter.input(field: :name)
-				end
-				
-				expect(result).to be == %Q{<dt>Name</dt>\n<dd><input name="animal[name]" value="cat"/></dd>}
-			end
-		end
-	end
-	
-	describe "<input>" do
-		let(:formatter) {FormFormatter.new(:object => double(bar: 10, bob: true, dole: false))}
-		
-		it "should support support min, max and step" do
-			attributes = formatter.input_attributes_for(:min => 10, :max => 20, :step => 2)
-			
-			expect(attributes[:min]).to be == 10
-			expect(attributes[:max]).to be == 20
-			expect(attributes[:step]).to be == 2
-			
-			result = formatter.input(:field => :bar, :min => 10)
-			expect(result).to be == %Q{<dt>Bar</dt>\n<dd><input name="bar" value="10" min="10"/></dd>}
-		end
-		
-		it "should not specify required, readonly or disabled" do
-			attributes = formatter.input_attributes_for(:field => :bar)
-			expect(attributes[:required]).to be nil
-			expect(attributes[:readonly]).to be nil
-			expect(attributes[:disabled]).to be nil
-		end
-		
-		it "should specify required, readonly or disabled" do
-			attributes = formatter.input_attributes_for(:field => :bar, :required => true, :readonly => true, :disabled => true)
-			expect(attributes[:required]).to be true
-			expect(attributes[:readonly]).to be true
-			expect(attributes[:disabled]).to be true
-		end
-		
-		it "should generate checked checkbox" do
-			attributes = formatter.checkbox_attributes_for(:value => true)
-			expect(attributes[:checked]).to be true
-			
-			result = formatter.checkbox(:field => :bob)
-			expect(result).to be == %Q{<dd>\n\t<input type="hidden" name="bob" value="false"/>\n\t<label><input type="checkbox" name="bob" value="true" checked/> Bob</label>\n</dd>}
-		end
-		
-		it "should generate unchecked checkbox" do
-			attributes = formatter.checkbox_attributes_for(:value => false)
-			expect(attributes[:checked]).to be nil
-			
-			result = formatter.checkbox(:field => :dole)
-			expect(result).to be == %Q{<dd>\n\t<input type="hidden" name="dole" value="false"/>\n\t<label><input type="checkbox" name="dole" value="true"/> Dole</label>\n</dd>}
-		end
-	end
-	
-	describe '<input type="hidden">' do
-		let(:formatter) {FormFormatter.new(:object => double(age: 20))}
-		
-		it "should generate hidden field" do
-			result = formatter.hidden(:field => :age)
-			expect(result).to be == %Q{<input type="hidden" name="age" value="20"/>}
-		end
-		
-		it "should escape characters correctly" do
-			expect(formatter.object).to receive(:new_record?).and_return(false)
-			
-			result = formatter.submit
-			expect(result).to be == %Q{<input type="submit" value="Update"/>}
-		end
-		
-		it "can have custom title" do
-			result = formatter.submit(title: 'Alice')
-			expect(result).to be == %Q{<input type="submit" value="Alice"/>}
-		end
-	end
-	
-	describe '<input type="submit">' do
-		let(:new_record_formatter) {FormFormatter.new(:object => double(new_record?: true))}
-		let(:formatter) {FormFormatter.new(:object => double(new_record?: false))}
-		
-		it "should have correct title for new_record?" do
-			result = new_record_formatter.submit
-			expect(result).to be == %Q{<input type="submit" value="Create"/>}
-		end
-		
-		it "should escape characters correctly" do
-			result = formatter.submit
-			expect(result).to be == %Q{<input type="submit" value="Update"/>}
-		end
-		
-		it "can have custom title" do
-			result = formatter.submit(title: 'Alice')
-			expect(result).to be == %Q{<input type="submit" value="Alice"/>}
-		end
-	end
-	
-	describe "<textarea>" do
-		let(:formatter) {FormFormatter.new(:object => double(details: "foo<bar>"))}
-		
-		it "should escape characters correctly" do
-			result = formatter.textarea(:field => :details)
-			expect(result).to be == %Q{<dt>\n\tDetails\n</dt>\n<dd><textarea name=\"details\">foo&lt;bar&gt;</textarea></dd>}
-		end
-	end
-	
-	describe "<output>" do
-		let(:formatter) {FormFormatter.new(:object => double(bar: 10, bob: true, dole: false))}
-		
-		it "should show output value" do
-			result = formatter.output(:field => :bar)
-			expect(result).to be == %Q{<dt>Bar</dt>\n<dd><output name=\"bar\">10</output></dd>}
-		end
-		
-		it "should show output value" do
-			result = formatter.output(:name => :total)
-			expect(result).to be == %Q{<dt></dt>\n<dd><output name=\"total\"></output></dd>}
-		end
-	end
-	
-	describe "<button>" do
-		let(:formatter) {FormFormatter.new}
-		
-		it "should generate reset button" do
-			result = formatter.button(:type => :reset)
-			expect(result).to be == %Q{<button type="reset">Reset</button>}
-		end
-	end
-end