trenni-formatters 2.8.1 → 2.10.0

data/lib/trenni/formatters/html/option_select.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
@@ -41,8 +43,8 @@ module Trenni
 					@builder = builder
 				end
 
-				def name_for(options)
-					if name = @formatter.name_for(options)
+				def name_for(**options)
+					if name = @formatter.name_for(**options)
 						if options[:multiple]
 							name = "#{name}[]"
 						end
@@ -51,26 +53,26 @@ module Trenni
 					end
 				end
 
-				def raw_value_for(options)
-					@formatter.raw_value_for(options)
+				def raw_value_for(**options)
+					@formatter.raw_value_for(**options)
 				end
 
 				def raw_value
-					@raw_value ||= raw_value_for(@options)
+					@raw_value ||= raw_value_for(**@options)
 				end
 
-				def value_for(options)
-					@formatter.value_for(options)
+				def value_for(**options)
+					@formatter.value_for(**options)
 				end
 
-				def title_for(options)
-					@formatter.title_for(options)
+				def title_for(**options)
+					@formatter.title_for(**options)
 				end
 
-				def option_attributes_for(options)
+				def option_attributes_for(**options)
 					return {
-						:value => value_for(options),
-						:selected => options.fetch(:selected){ raw_value == raw_value_for(options) },
+						:value => value_for(**options),
+						:selected => options.fetch(:selected) {raw_value == raw_value_for(**options)},
 						:id => options[:id],
 						:class => options[:class],
 						:data => options[:data],
@@ -81,11 +83,11 @@ module Trenni
 					options[:field] ||= 'id'
 					
 					Builder.fragment(builder) do |builder|
-						builder.inline(:option, option_attributes_for(options)) { builder.text title_for(options) }
+						builder.inline(:option, option_attributes_for(**options)) {builder.text title_for(**options)}
 					end
 				end
 
-				def optional_title_for(options)
+				def optional_title_for(**options)
 					if options[:optional] == true
 						options[:blank] || ''
 					else
@@ -93,9 +95,9 @@ module Trenni
 					end
 				end
 
-				def group_attributes_for(options)
+				def group_attributes_for(**options)
 					return {
-						:label => title_for(options),
+						:label => title_for(**options),
 						:id => options[:id],
 						:class => options[:class],
 						:data => options[:data],
@@ -104,9 +106,9 @@ module Trenni
 
 				def group(options = {}, &block)
 					Builder.fragment(@builder) do |builder|
-						builder.tag :optgroup, group_attributes_for(options) do
+						builder.tag :optgroup, group_attributes_for(**options) do
 							if options[:optional]
-								item(:title => optional_title_for(options), :value => nil, :builder => builder)
+								item(:title => optional_title_for(**options), :value => nil, :builder => builder)
 							end
 							
 							builder.capture(&block)
@@ -114,9 +116,9 @@ module Trenni
 					end
 				end
 
-				def select_attributes_for(options)
+				def select_attributes_for(**options)
 					return {
-						:name => name_for(options),
+						:name => name_for(**options),
 						:id => options[:id],
 						:class => options[:class],
 						:multiple => options[:multiple],
@@ -126,9 +128,9 @@ module Trenni
 
 				def call(options = {}, &block)
 					Builder.fragment(@builder) do |builder|
-						builder.tag :select, select_attributes_for(options) do
+						builder.tag :select, select_attributes_for(**options) do
 							if options[:optional]
-								item(:title => optional_title_for(options), :value => nil, :builder => builder)
+								item(:title => optional_title_for(**options), :value => nil, :builder => builder)
 							end
 							
 							builder.capture(self, &block)

data/lib/trenni/formatters/html/radio_select.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
@@ -41,33 +43,33 @@ module Trenni
 					@builder = builder
 				end
 
-				def name_for(options)
-					@formatter.name_for(options)
+				def name_for(**options)
+					@formatter.name_for(**options)
 				end
 				
-				def raw_value_for(options)
-					@formatter.raw_value_for(options)
+				def raw_value_for(**options)
+					@formatter.raw_value_for(**options)
 				end
 
 				def raw_value
-					@raw_value ||= raw_value_for(@options)
+					@raw_value ||= raw_value_for(**@options)
 				end
 
-				def value_for(options)
-					@formatter.value_for(options)
+				def value_for(**options)
+					@formatter.value_for(**options)
 				end
 
-				def title_for(options)
-					@formatter.title_for(options)
+				def title_for(**options)
+					@formatter.title_for(**options)
 				end
 
-				def radio_attributes_for(options)
+				def radio_attributes_for(**options)
 					return {
 						:type => :radio,
 						:name => @field,
 						# We set a default value to empty string, otherwise it becomes "on".
-						:value => value_for(options) || "",
-						:checked => options.fetch(:selected){ raw_value == raw_value_for(options) },
+						:value => value_for(**options) || "",
+						:checked => options.fetch(:selected) {raw_value == raw_value_for(**options)},
 						:data => options[:data],
 					}
 				end
@@ -76,21 +78,21 @@ module Trenni
 					Builder.fragment(builder) do |builder|
 						builder.tag :tr do
 							builder.inline(:td, :class => :handle) do
-								builder.tag :input, radio_attributes_for(options)
+								builder.tag :input, radio_attributes_for(**options)
 							end
 							
 							builder.inline(:td, :class => :item) do
 								if block_given?
 									builder.capture(self, &block)
 								else
-									builder.text title_for(options)
+									builder.text title_for(**options)
 								end
 							end
 						end
 					end >> block
 				end
 
-				def optional_title_for(options)
+				def optional_title_for(**options)
 					if options[:optional] == true
 						options[:blank] || ''
 					else
@@ -103,7 +105,7 @@ module Trenni
 						builder.tag :table do
 							builder.tag :tbody do
 								if options[:optional]
-									item(:title => optional_title_for(options), :value => nil, :builder => builder)
+									item(:title => optional_title_for(**options), :value => nil, :builder => builder)
 								end
 								
 								builder.capture(self, &block)

data/lib/trenni/formatters/markdown.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
@@ -18,20 +20,18 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'sanitize'
-require 'kramdown'
+require 'markly'
 
 require 'trenni/markup'
+require 'trenni/sanitize/fragment'
 
 module Trenni
 	module Formatters
 		module Markdown
-			def markdown(text)
-				config = Sanitize::Config::BASIC.dup
-				
-				config[:elements] += ['h1', 'h2', 'h3']
+			def markdown(text, filter = Trenni::Sanitize::Fragment, **options)
+				root = Markly.parse(text, **options)
 				
-				html = Sanitize.clean(Kramdown::Document.new(text).to_html, config)
+				html = filter.parse(root.to_html).output
 				
 				return MarkupString.raw(html)
 			end

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

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

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.10.0"
 	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.10.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-28 00:00:00.000000000 Z
+date: 2020-05-31 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,44 +122,28 @@ 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"
-email:
-- samuel.williams@oriontransfer.co.nz
+description: 
+email: 
 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/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: {}
+licenses:
+- MIT
+metadata:
+  funding_uri: https://github.com/sponsors/ioquatix/
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -126,22 +152,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
+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: []