trenni-formatters 2.8.1 → 2.12.2

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

@@ -0,0 +1,146 @@
+# 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
+# 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'
+require 'trenni/template'
+
+require_relative 'form_formatter'
+
+module Trenni
+	module Formatters
+		module HTML
+			module LabelForm
+				include FormFormatter
+				
+				# An input field (single line text).
+				def input(**options)
+					options = @options.merge(**options)
+					
+					Builder.fragment do |builder|
+						builder.inline(:label) do
+							builder.inline(:span) do
+								builder.text title_for(**options)
+								
+								if details = details_for(**options)
+									builder.inline(:small) {builder.text details}
+								end
+							end
+							
+							builder.inline :input, input_attributes_for(**options)
+						end
+					end
+				end
+				
+				# An output field for the result of a computation.
+				def output(**options)
+					options = @options.merge(**options)
+					
+					builder.inline(:label) do
+						builder.inline(:span) do
+							builder.text title_for(**options)
+							
+							if details = details_for(**options)
+								builder.inline(:small) {builder.text details}
+							end
+						end
+						
+						builder.inline :output, output_attributes_for(**options) do
+							builder.text value_for(**options)
+						end
+					end
+				end
+				
+				# A textarea field (multi-line text).
+				def textarea(**options)
+					options = @options.merge(**options)
+					
+					Builder.fragment do |builder|
+						builder.inline(:label) do
+							builder.inline(:span) do
+								builder.text title_for(**options)
+								
+								if details = details_for(**options)
+									builder.inline(:small) {builder.text details}
+								end
+							end
+							
+							builder.tag :textarea, textarea_attributes_for(**options) do
+								builder.text value_for(**options)
+							end
+						end
+					end
+				end
+				
+				# A checkbox field.
+				def checkbox(**options)
+					options = @options.merge(**options)
+					
+					Builder.fragment do |builder|
+						builder.inline(:label) do
+							builder.inline :input, :type => :hidden, :name => name_for(**options), :value => 'false'
+							
+							builder.inline(:span) do
+								if details = details_for(**options)
+									builder.inline(:small) {builder.text details}
+								end
+							end
+							
+							builder.tag :input, checkbox_attributes_for(**options)
+							
+							# We would like a little bit of whitespace between the checkbox and the title:
+							builder.text " " + title_for(**options)
+						end
+					end
+				end
+				
+				# A submission button
+				def submit(**options)
+					options = @options.merge(**options)
+					options[:title] ||= submit_title_for(**options)
+					
+					Builder.fragment do |builder|
+						builder.inline :input, submit_attributes_for(**options)
+					end
+				end
+				
+				def element(klass, **options, &block)
+					options = @options.merge(**options)
+					buffer = Trenni::Template.buffer(block.binding)
+					
+					buffer << Builder.fragment do |builder|
+						builder.inline(:label) do
+							builder.inline(:span) do
+								builder.text title_for(**options)
+								
+								if details = details_for(**options)
+									builder.inline(:small) {builder.text details}
+								end
+							end
+							
+							klass.call(self, builder, **options, &block)
+						end
+					end
+				end
+			end
+		end
+	end
+end

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
@@ -25,24 +27,20 @@ module Trenni
 		module HTML
 			# Standard drop-down select box:
 			class OptionSelect
-				def self.call(formatter, options, builder, &block)
-					instance = self.new(formatter, options, builder)
+				def self.call(formatter, builder, **options, &block)
+					instance = self.new(formatter, builder, **options)
 					
-					instance.call(options, &block)
+					instance.call(&block)
 				end
 				
-				def initialize(formatter, options, builder)
+				def initialize(formatter, builder, **options)
 					@formatter = formatter
-					@object = formatter.object
-					@field = options[:field]
-					
-					@options = options
-					
 					@builder = builder
+					@options = options
 				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
@@ -50,85 +48,90 @@ module Trenni
 						return name
 					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],
 					}
 				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) }
+						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
 						options[:optional]
 					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],
 					}
 				end
-
-				def group(options = {}, &block)
+				
+				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(@builder, title: optional_title_for(**options), value: nil)
 							end
 							
 							builder.capture(&block)
 						end
 					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],
 						:data => options[:data],
+						: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

@@ -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,85 +27,87 @@ module Trenni
 		module HTML
 			# Table based select boxes using per-row checkboxes.
 			class RadioSelect
-				def self.call(formatter, options, builder, &block)
-					instance = self.new(formatter, options, builder)
+				def self.call(formatter, builder, **options, &block)
+					instance = self.new(formatter, builder, **options)
 					
-					instance.call(options, &block)
+					instance.call(&block)
 				end
 				
-				def initialize(formatter, options, builder)
+				def initialize(formatter, builder, **options)
 					@formatter = formatter
-					@object = formatter.object
-					
+					@builder = builder
 					@options = options
-					@field = options[:field]
 					
-					@builder = builder
+					@field = options[:field]
 				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
-
-				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
-								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
 						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/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