forme 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13efa41ba160d80619b779cda0ad94581b37695e9fb8caedc696d26c91c92d87
-  data.tar.gz: 6558cf408b4573b3822c566c8e48b856de47009c6293831e0cdcc3fed7f4ebc2
+  metadata.gz: 7427b1117f14a93c292826f8d5d25ceacc3d8948d720176a4a5c131b40875284
+  data.tar.gz: 8d992d583b50af76e3abf54ca3bcbd385f23bf3434d4d6bd761ee0c82ec75975
 SHA512:
-  metadata.gz: 42d8dd057d905a8cb44610c9b3c20c9d055d0f0495b8ec94b020a637d0b10f5c1919ebc697e0b4f8970a29fcb511661cc56d622dc1d91eb8f347ab62fe36d7c4
-  data.tar.gz: 10beb8c2109850be4c1fb5d0c46d13218269c8b65f604cda930024eab8ff3838f32ab70256696d93f5c17f3e011d5dad0450511051a6abda40e75e37c1bbf2eb
+  metadata.gz: a6fab6a2f89db35fea78cfa851bc6632d8c88d56bc683ebdd5af7f674325f71ab57efa8f327c00150afc5e24cdb7a39b8e4d2a734dafe228bca1794bf5a70514
+  data.tar.gz: fb11b777c89ac1ffdf18265ddc563d527cfd531505d23748957b233f87abd3e14ff5a52e43b335969ae41d71502e7bb5dec8fb12280bf3869ffc3159f7b688dc

data/CHANGELOG

@@ -1,3 +1,13 @@
+=== 2.4.0 (2023-04-05)
+
+* Support Sequel::Model#forme_use_required_abbr? to control whether to add abbr * tag for required inputs (jeremyevans) (#105)
+
+* Make select input with option groups and a :value option correctly set selected attribute on options in all optgroups (v-kolesnikov) (#111, #110)
+
+* Make Roda forme_set plugin only include metadata for inputs in the same form, and not inputs on other forms on the same page (jeremyevans) (#109)
+
+* Use erb/escape for faster HTML escaping if available (jeremyevans)
+
 === 2.3.0 (2022-11-15)
 
 * Add forme/bs5 for Bootstrap 5 support (janko) (#106)

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2022 Jeremy Evans
+Copyright (c) 2011-2023 Jeremy Evans
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

data/README.rdoc

@@ -53,7 +53,7 @@ This results in the following HTML:
     </label>
   </form>
 
-In addition to integrating with Sequel, Form also integrates into
+In addition to integrating with Sequel, Forme also integrates into
 three separate web frameworks, Roda, Rails, and Sinatra, allowing
 use of forms inside templates.  This is the most common usage of Forme.
 

data/lib/forme/transformers/formatter.rb

@@ -417,6 +417,7 @@ module Forme
         return unless @opts[:options]
         process_select_options(@opts[:options], &block)
       end
+      @attr.delete(:value)
 
       if prompt = @opts[:add_blank]
         unless prompt.is_a?(String)
@@ -434,7 +435,7 @@ module Forme
     def process_select_options(os)
       vm = @opts[:value_method]
       tm = @opts[:text_method]
-      sel = @opts[:selected] || @attr.delete(:value)
+      sel = @opts[:selected] || @attr[:value]
 
       if @opts[:multiple]
         sel = Array(sel)

data/lib/forme/transformers/helper.rb

@@ -7,7 +7,7 @@ module Forme
   class Helper
     Forme.register_transformer(:helper, :default, new)
 
-    # Return tag with error message span tag after it.
+    # Return tag with help message span tag after it.
     def call(tag, input)
       attr = input.opts[:helper_attr]
       attr = attr ? attr.dup : {}

data/lib/forme/version.rb

@@ -6,7 +6,7 @@ module Forme
   MAJOR = 2
 
   # The minor version of Forme, updated for new feature releases of Forme.
-  MINOR = 3
+  MINOR = 4
 
   # The patch version of Forme, updated only for bug fixes from the last
   # feature release.

data/lib/forme.rb

@@ -9,27 +9,32 @@ module Forme
   end
 
   begin
-    require 'cgi/escape'
+    require 'erb/escape'
+    define_singleton_method(:h, ERB::Escape.instance_method(:html_escape))
   # :nocov:
-    unless CGI.respond_to?(:escapeHTML) # work around for JRuby 9.1
-      CGI = Object.new
-      CGI.extend(defined?(::CGI::Escape) ? ::CGI::Escape : ::CGI::Util)
-    end
-    def self.h(value)
-      CGI.escapeHTML(value.to_s)
-    end
   rescue LoadError
-    ESCAPE_TABLE = {'&' => '&amp;', '<' => '&lt;', '>' => '&gt;', '"' => '&quot;', "'" => '&#39;'}.freeze
-    ESCAPE_TABLE.each_value(&:freeze)
-    if RUBY_VERSION >= '1.9'
-      # Escape the following characters with their HTML/XML
-      # equivalents.
-      def self.h(value)
-        value.to_s.gsub(/[&<>"']/, ESCAPE_TABLE)
+    begin
+      require 'cgi/escape'
+      unless CGI.respond_to?(:escapeHTML) # work around for JRuby 9.1
+        CGI = Object.new
+        CGI.extend(defined?(::CGI::Escape) ? ::CGI::Escape : ::CGI::Util)
       end
-    else
       def self.h(value)
-        value.to_s.gsub(/[&<>"']/){|s| ESCAPE_TABLE[s]}
+        CGI.escapeHTML(value.to_s)
+      end
+    rescue LoadError
+      ESCAPE_TABLE = {'&' => '&amp;', '<' => '&lt;', '>' => '&gt;', '"' => '&quot;', "'" => '&#39;'}.freeze
+      ESCAPE_TABLE.each_value(&:freeze)
+      if RUBY_VERSION >= '1.9'
+        # Escape the following characters with their HTML/XML
+        # equivalents.
+        def self.h(value)
+          value.to_s.gsub(/[&<>"']/, ESCAPE_TABLE)
+        end
+      else
+        def self.h(value)
+          value.to_s.gsub(/[&<>"']/){|s| ESCAPE_TABLE[s]}
+        end
       end
     end
   end

data/lib/roda/plugins/forme_set.rb

@@ -37,6 +37,18 @@ class Roda
       }.freeze
 
       module InstanceMethods
+        # If a Sequel::Model object that supports forme_set is passed,
+        # isolate the inputs so that each form only includes metadata
+        # for inputs on the form, and not inputs for earlier forms on
+        # the same page.
+        def form(obj=nil, attr={}, opts={}, &block)
+          if obj.is_a?(Sequel::Plugins::FormeSet::InstanceMethods)
+            obj.isolate_forme_inputs{super}
+          else
+            super
+          end
+        end
+
         # Return hash based on submitted parameters, with :values key
         # being submitted values for the object, and :validations key
         # being a hash of validation metadata for the object.

data/lib/sequel/plugins/forme.rb

@@ -207,7 +207,7 @@ module Sequel # :nodoc:
         # is required.
         def handle_label(f)
           opts[:label] = humanize(field) unless opts.has_key?(:label)
-          opts[:label] = [opts[:label], form._tag(:abbr, {:title=>'required'}, '*')] if opts[:label] && opts[:required]
+          opts[:label] = [opts[:label], form._tag(:abbr, {:title=>'required'}, '*')] if opts[:label] && opts[:required] && obj.forme_use_required_abbr?
         end
 
         # Update the attributes and options for any recognized validations
@@ -492,6 +492,11 @@ module Sequel # :nodoc:
           'post'
         end
 
+        # Whether to set an abbr tag in labels for required inputs.
+        def forme_use_required_abbr?
+          true
+        end
+
         # Use the underscored model name as the default namespace.
         def forme_namespace
           model.send(:underscore, model.name)

data/lib/sequel/plugins/forme_set.rb

@@ -24,6 +24,21 @@ module Sequel # :nodoc:
           @forme_inputs ||= {}
         end
 
+        # Temporarily reset forme_inputs to the empty hash before yielding to the block.  
+        # Used by the Roda forme_set plugin to make sure each form only includes metadata
+        # for inputs in that form, and not metadata for inputs for earlier forms on the same page.
+        def isolate_forme_inputs
+          return yield if frozen?
+
+          forme_inputs = self.forme_inputs
+          begin
+            @forme_inputs = {}
+            yield
+          ensure
+            @forme_inputs = forme_inputs.merge(@forme_inputs)
+          end
+        end
+
         # Hash with column name symbol keys and <tt>[subset, allowed_values]</tt> values.  +subset+
         # is a boolean flag, if true, the uploaded values should be a subset of the allowed values,
         # otherwise, there should be a single uploaded value that is a member of the allowed values.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forme
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-15 00:00:00.000000000 Z
+date: 2023-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -225,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: HTML forms library