trenni-formatters 2.12.1 → 2.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 518b46786862caa9ff2dced015ea7f14299c274f42bbe7556f9d85ef4fe5a21c
-  data.tar.gz: af3c874086ff1d37d39f2294a2037d4cbc63fafc4e3a783f6d2481d579404c14
+  metadata.gz: 7fc81bd7424d62a51946525bfadb198b184223b85f39924b090c4917866e4e07
+  data.tar.gz: 2b68b00618ebff45b414dd7f4cd29eb770cdc4093ce0e80738a2b20dcba60377
 SHA512:
-  metadata.gz: b044fd11db20ab856fe9608dea7039020c1ec42850260deb3b2ca27c6c56884e7a98aeb52ef53347dde510dc0070a6ab38ac2453e7b9d1fb4cc91f36e3d853f4
-  data.tar.gz: 2e59bdcdfec2617347c0dd4ccbdc786057ea3cd2d1618f1f00c51c8cf9506a6f075489a0442163025bb2bb9c08468bee285c44e5a22e91a906a8b3aeb545c68d
+  metadata.gz: bb61c211734823ed5d5c198532d892bd881309c90799cdd939d025e0edc59582fcc11b92292c8cbfeaf748fc60ea81c883967aaf58c0f46bcd9067ba5c362bbd
+  data.tar.gz: 2fc540df7f46b5dd4209517143fbe50d603cfd9857000c86906bc50c2c0302d8ae467cdbc8758e00f6360ba3e6dd99ca79bb9b4a232af11e9ab8f9cacc18e6dd

data/lib/trenni/formatters/formatter.rb

@@ -81,17 +81,17 @@ module Trenni
 			
 			attr :options
 			
-			def format_unspecified(object, options)
+			def format_unspecified(object, **options)
 				object.to_s
 			end
 
-			def format(object, options = {})
+			def format(object, **options)
 				method_name = self.method_for_mapping(object)
 				
 				if self.respond_to?(method_name)
-					self.send(method_name, object, options)
+					self.send(method_name, object, **options)
 				else
-					format_unspecified(object, options)
+					format_unspecified(object, **options)
 				end
 			end
 
@@ -101,15 +101,15 @@ module Trenni
 				@options[key]
 			end
 			
-			map(String) do |object, options|
+			map(String) do |object, **options|
 				object
 			end
 			
-			map(NilClass) do |object, options|
+			map(NilClass) do |object, **options|
 				options[:blank] || @options[:blank] || ""
 			end
 			
-			map(TrueClass, FalseClass, *Mapping.lookup_descendants(Numeric)) do |object, options|
+			map(TrueClass, FalseClass, *Mapping.lookup_descendants(Numeric)) do |object, **options|
 				object.to_s
 			end
 		end

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

@@ -29,37 +29,29 @@ module Trenni
 				def self.call(formatter, builder, **options, &block)
 					instance = self.new(formatter, builder, **options)
 					
-					instance.call(options, &block)
+					instance.call(&block)
 				end
 				
 				def initialize(formatter, builder, **options)
 					@formatter = formatter
-					@object = formatter.object
-					
 					@builder = builder
-					
 					@options = options
-					@field = options[:field]
 				end
 				
 				def name_for(**options)
 					@formatter.name_for(**options)
 				end
 				
-				def title_for(**options)
-					@formatter.title_for(**options)
-				end
-				
 				def checkbox_attributes_for(**options)
 					@formatter.checkbox_attributes_for(**options)
 				end
 				
-				def call(**options, &block)
+				def call(&block)
 					Builder.fragment(@builder) do |builder|
 						builder.inline('span') do
-							builder.inline :input, :type => :hidden, :name => name_for(**options), :value => 'false'
+							builder.inline :input, type: :hidden, name: name_for(**@options), value: 'false'
 							
-							builder.tag :input, checkbox_attributes_for(**options)
+							builder.tag :input, checkbox_attributes_for(**@options)
 							
 							builder.text " "
 							

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

@@ -117,23 +117,6 @@ module Trenni
 					end
 				end
 				
-				def fieldset(**options, &block)
-					options = @options.merge(**options)
-					buffer = Trenni::Template.buffer(block.binding)
-					
-					Builder.fragment(buffer) do |builder|
-						builder.tag('fieldset') do
-							builder.inline('legend') do
-								builder.text title_for(**options)
-							end
-							
-							builder.tag('dl') do
-								yield(builder)
-							end
-						end
-					end
-				end
-				
 				def element(klass, **options, &block)
 					options = @options.merge(**options)
 					buffer = Trenni::Template.buffer(block.binding)
@@ -155,7 +138,9 @@ module Trenni
 				
 				def fieldset(**options, &block)
 					super do |builder|
-						builder.tag(:dl, &block)
+						builder.tag(:dl) do
+							yield(builder)
+						end
 					end
 				end
 			end

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

@@ -69,7 +69,7 @@ module Trenni
 				# The value of the field.
 				def value_for(**options)
 					if value = raw_value_for(**options)
-						self.format(value, options)
+						self.format(value, **options)
 					end
 				end
 

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

@@ -30,19 +30,15 @@ module Trenni
 				def self.call(formatter, builder, **options, &block)
 					instance = self.new(formatter, builder, **options)
 					
-					instance.call(options, &block)
+					instance.call(&block)
 				end
 				
 				def initialize(formatter, builder, **options)
 					@formatter = formatter
-					@object = formatter.object
-					
 					@builder = builder
-					
 					@options = options
-					@field = options[:field]
 				end
-
+				
 				def name_for(**options)
 					if name = @formatter.name_for(**options)
 						if options[:multiple]
@@ -52,23 +48,23 @@ module Trenni
 						return name
 					end
 				end
-
+				
 				def raw_value_for(**options)
 					@formatter.raw_value_for(**options)
 				end
-
+				
 				def raw_value
 					@raw_value ||= raw_value_for(**@options)
 				end
-
+				
 				def value_for(**options)
 					@formatter.value_for(**options)
 				end
-
+				
 				def title_for(**options)
 					@formatter.title_for(**options)
 				end
-
+				
 				def option_attributes_for(**options)
 					return {
 						:value => value_for(**options),
@@ -78,15 +74,15 @@ module Trenni
 						:data => options[:data],
 					}
 				end
-
-				def item(builder: nil, **options)
+				
+				def item(builder = nil, **options)
 					options[:field] ||= 'id'
 					
 					Builder.fragment(builder) do |builder|
 						builder.inline(:option, option_attributes_for(**options)) {builder.text title_for(**options)}
 					end
 				end
-
+				
 				def optional_title_for(**options)
 					if options[:optional] == true
 						options[:blank] || ''
@@ -94,7 +90,7 @@ module Trenni
 						options[:optional]
 					end
 				end
-
+				
 				def group_attributes_for(**options)
 					return {
 						:label => title_for(**options),
@@ -103,19 +99,19 @@ module Trenni
 						:data => options[:data],
 					}
 				end
-
-				def group(options = {}, &block)
+				
+				def group(**options, &block)
 					Builder.fragment(@builder) do |builder|
 						builder.tag :optgroup, group_attributes_for(**options) do
 							if options[:optional]
-								item(:title => optional_title_for(**options), :value => nil, :builder => builder)
+								item(@builder, title: optional_title_for(**options), value: nil)
 							end
 							
 							builder.capture(&block)
 						end
 					end
 				end
-
+				
 				def select_attributes_for(**options)
 					return {
 						:name => name_for(**options),
@@ -126,12 +122,16 @@ module Trenni
 						:required => options[:required],
 					}
 				end
-
-				def call(**options, &block)
+				
+				def optional?
+					@options[:optional]
+				end
+				
+				def call(&block)
 					Builder.fragment(@builder) do |builder|
-						builder.tag :select, select_attributes_for(**options) do
-							if options[:optional]
-								item(:title => optional_title_for(**options), :value => nil, :builder => builder)
+						builder.tag :select, select_attributes_for(**@options) do
+							if self.optional?
+								item(builder, title: optional_title_for(**@options), value: nil)
 							end
 							
 							builder.capture(self, &block)

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

@@ -30,19 +30,17 @@ module Trenni
 				def self.call(formatter, builder, **options, &block)
 					instance = self.new(formatter, builder, **options)
 					
-					instance.call(options, &block)
+					instance.call(&block)
 				end
 				
 				def initialize(formatter, builder, **options)
 					@formatter = formatter
-					@object = formatter.object
-					
 					@builder = builder
-					
 					@options = options
+					
 					@field = options[:field]
 				end
-
+				
 				def name_for(**options)
 					@formatter.name_for(**options)
 				end
@@ -50,19 +48,19 @@ module Trenni
 				def raw_value_for(**options)
 					@formatter.raw_value_for(**options)
 				end
-
+				
 				def raw_value
 					@raw_value ||= raw_value_for(**@options)
 				end
-
+				
 				def value_for(**options)
 					@formatter.value_for(**options)
 				end
-
+				
 				def title_for(**options)
 					@formatter.title_for(**options)
 				end
-
+				
 				def radio_attributes_for(**options)
 					return {
 						:type => :radio,
@@ -73,8 +71,8 @@ module Trenni
 						:data => options[:data],
 					}
 				end
-
-				def item(builder: nil, **options, &block)
+				
+				def item(builder = nil, **options, &block)
 					Builder.fragment(builder) do |builder|
 						builder.tag :tr do
 							builder.inline(:td, :class => :handle) do
@@ -99,13 +97,17 @@ module Trenni
 						options[:optional]
 					end
 				end
-
-				def call(**options, &block)
+				
+				def optional?
+					@options[:optional]
+				end
+				
+				def call(&block)
 					Builder.fragment(@builder) do |builder|
 						builder.tag :table do
 							builder.tag :tbody do
-								if options[:optional]
-									item(:title => optional_title_for(**options), :value => nil, :builder => builder)
+								if self.optional?
+									item(builder, title: optional_title_for(**@options), value: nil)
 								end
 								
 								builder.capture(self, &block)

data/lib/trenni/formatters/relative_time.rb

@@ -27,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

@@ -26,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

@@ -22,6 +22,6 @@
 
 module Trenni
 	module Formatters
-		VERSION = "2.12.1"
+		VERSION = "2.12.2"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trenni-formatters
 version: !ruby/object:Gem::Version
-  version: 2.12.1
+  version: 2.12.2
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-05 00:00:00.000000000 Z
+date: 2020-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mapping