forme 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16429cabb255a24eacd8d108a6c0d1ed771581148f5f344a876ceb1da4082a3f
-  data.tar.gz: 7fc3607cba35093e78bdfb3f6892bd94289c698b6d015e1a701303e5f5435b1a
+  metadata.gz: 81ec9ce1b755276902340c709aa7addbd73b6b80252fcf0cbaac236098c62ac1
+  data.tar.gz: 35e17dd67304585e027dca62d6181eff1d30a0fcc7aa128879c9d8d54fd78f55
 SHA512:
-  metadata.gz: e399a4c2aa701ee112c1c3ed4f95854611781929b5ebcdc7b0c925c703d80b79d5cb77c1b1427e60be98b47e6308aac3cb2a231895874696a8265502fced126a
-  data.tar.gz: 4397400180f4398ca5a553acf2b2845607952cfadfa8126ea88e473b161b8ac7e04589fcf89a62291b3e6218dbb6cf29d83825090c076d020181d3d1f2b05de7
+  metadata.gz: 16f13f8ba1ba9fdae6b26b80f0b2e1fa2ce9ef520a3a29936597771f9f5424d2b49afc6debdb173e2aee6d672a471bb1aa8cee8e73d82ce7f5d30a1fc8ced578
+  data.tar.gz: 89d6f1ef00b4a9b28b55d9a6f42fb5250d10eaec78a7921d6220451f2fe7ea5c4ecea7907bcef5567e5e1dbcb60ccf2ec52195a6a4bfaacf2c4c353c785e9049

data/CHANGELOG

@@ -1,3 +1,13 @@
+=== 2.2.0 (2022-06-28)
+
+* Use inputmode and pattern attributes instead of type=number for integer fields in the Sequel forme plugin (jeremyevans)
+
+* Respect explicit nil/false :value option for boolean inputs in the Sequel forme plugin (jeremyevans)
+
+* In bs3 support, make sure error spans have id referenced by aria-describedby (jeremyevans)
+
+* Set aria-describedby attribute automatically even if :error_id is given manually (jeremyevans)
+
 === 2.1.0 (2022-05-25)
 
 * Avoid hidden inputs inside tbody tags in subform in the Sequel::Model support, since that results in invalid HTML (jeremyevans)

data/README.rdoc

@@ -49,7 +49,7 @@ This results in the following HTML:
       <input id="album_name" name="album[name]" type="text" value="Rising Force"/>
     </label>
     <label>Copies Sold:
-      <input id="album_copies_sold" name="album[copies_sold]" type="number" value="100000"/>
+      <input id="album_copies_sold" inputmode="numeric" name="album[copies_sold]" pattern="-?[0-9]*" type="text" value="100000"/>
     </label>
   </form>
 
@@ -443,12 +443,12 @@ form similar to:
   
     <input id="album_tracks_attributes_0_id" name="album[tracks_attributes][0][id]" type="hidden" value="1"/>
     <fieldset class="inputs"><legend>Track #1</legend>
-      <label>Number: <input id="album_tracks_attributes_0_number" name="album[tracks_attributes][0][number]" type="number" value="1"/></label>
+      <label>Number: <input id="album_tracks_attributes_0_number" inputmode="numeric" name="album[tracks_attributes][0][number]" pattern="-?[0-9]*" type="text" value="1"/></label>
       <label>Name: <input id="album_tracks_attributes_0_name" name="album[tracks_attributes][0][name]" type="text" value="Blue Hawaii"/></label>
     </fieldset>
     <input id="album_tracks_attributes_1_id" name="album[tracks_attributes][1][id]" type="hidden" value="2"/>
     <fieldset class="inputs"><legend>Track #2</legend>
-      <label>Number: <input id="album_tracks_attributes_1_number" name="album[tracks_attributes][1][number]" type="number" value="2"/></label>
+      <label>Number: <input id="album_tracks_attributes_1_number" inputmode="numeric" name="album[tracks_attributes][1][number]" pattern="-?[0-9]*" type="text" value="2"/></label>
       <label>Name: <input id="album_tracks_attributes_1_name" name="album[tracks_attributes][1][name]" type="text" value="Almost Always True"/></label>
     </fieldset>
   

data/lib/forme/bs3.rb

@@ -24,6 +24,7 @@ module Forme
       attr = attr ? attr.dup : {}
       Forme.attr_classes(attr, 'help-block with-errors')
       return [tag] if input.opts[:skip_error_message]
+      attr[:id] ||= input.opts[:error_id]
 
       case input.type
       when :submit, :reset
@@ -84,11 +85,13 @@ module Forme
 
       Forme.attr_classes(@attr, @opts[:class]) if @opts.has_key?(:class)
 
-      if @opts[:error]
+      if @opts[:error] && input.type != :submit && input.type != :reset
         # Forme.attr_classes(@attr, 'error')
         @attr["aria-invalid"] = "true"
         if @opts.fetch(:error_handler, true)
-          unless @opts[:error_id]
+          if @opts[:error_id]
+            @attr['aria-describedby'] ||= @opts[:error_id]
+          else
             if id = @attr[:id] || @attr['id']
               error_id = @attr['aria-describedby'] ||= "#{id}_error_message"
               @opts[:error_id] = error_id
@@ -127,7 +130,7 @@ module Forme
     end
     
     def _format_set(type, tag_attrs={})
-      raise Error, "can't have radioset with no options" unless @opts[:optgroups] || @opts[:options]
+      raise Error, "can't have radioset or checkboxset with no options" unless @opts[:optgroups] || @opts[:options]
       key = @opts[:key]
       name = @opts[:name]
       id = @opts[:id]
@@ -282,7 +285,7 @@ module Forme
       label_attr = input.opts[:label_attr]
       label_attr = label_attr ? label_attr.dup : {}
       
-      label_attr[:for] = label_attr[:for] === false ? nil : input.opts.fetch(:label_for, id)
+      label_attr[:for] = label_attr[:for] == false ? nil : input.opts.fetch(:label_for, id)
       label = input.opts[:label]
       lpos = input.opts[:label_position] || ([:radio, :checkbox].include?(input.type) ? :after : :before)
       
@@ -317,9 +320,6 @@ module Forme
       
       case input.type
       when :submit, :reset
-        klass.delete('form-group')
-        attr[:class] = klass.sort.uniq.join(' ').strip
-        attr.delete(:class) if attr[:class].empty?
         [tag]
       when :radio, :checkbox
         klass.delete('form-group')

data/lib/forme/form.rb

@@ -333,7 +333,9 @@ module Forme
       copy_inputs_wrapper_from_wrapper(opts, @opts)
       yield
     ensure
+      # :nocov:
       @opts = orig_opts if orig_opts
+      # :nocov:
     end
 
     private

data/lib/forme/transformers/error_handler.rb

@@ -49,17 +49,17 @@ module Forme
     Forme.register_transformer(:error_handler, :after_legend, new)
 
     def call(tag, input)
-      return super unless tag.is_a?(Array)
-      return super unless tag.first.is_a?(Tag)
-      return super unless tag.first.type == :legend
+      if tag.is_a?(Array) && tag.first.is_a?(Tag) && tag.first.type == :legend
+        first_input = input.opts[:first_input]
+        attr = first_input.opts[:attr] ||= {}
+        Forme.attr_classes(attr, 'error')
+        attr['aria-invalid'] = 'true'
+        attr['aria-describedby'] = input.opts[:error_id] = "#{first_input.opts[:id]}_error_message"
 
-      first_input = input.opts[:first_input]
-      attr = first_input.opts[:attr] ||= {}
-      Forme.attr_classes(attr, 'error')
-      attr['aria-invalid'] = 'true'
-      attr['aria-describedby'] = input.opts[:error_id] = "#{first_input.opts[:id]}_error_message"
-
-      tag.insert(1, error_tag(input))
+        tag.insert(1, error_tag(input))
+      else
+        super 
+      end
     end
   end
 end

data/lib/forme/transformers/formatter.rb

@@ -220,7 +220,7 @@ module Forme
     end
 
     def _format_set(type, tag_attrs={})
-      raise Error, "can't have radioset with no options" unless @opts[:optgroups] || @opts[:options]
+      raise Error, "can't have radioset or checkboxset with no options" unless @opts[:optgroups] || @opts[:options]
       key = @opts[:key]
       name = @opts[:name]
       id = @opts[:id]
@@ -312,7 +312,9 @@ module Forme
         Forme.attr_classes(@attr, 'error')
         @attr["aria-invalid"] = "true"
         if @opts.fetch(:error_handler, true)
-          unless @opts[:error_id]
+          if @opts[:error_id]
+            @attr['aria-describedby'] ||= @opts[:error_id]
+          else
             if id = @attr[:id] || @attr['id']
               error_id = @attr['aria-describedby'] ||= "#{id}_error_message"
               @opts[:error_id] = error_id
@@ -397,9 +399,7 @@ module Forme
 
     def set_error_from_namespaced_errors(namespaces, errors, key)
       namespaces.each do |ns|
-        e = errors[ns] || errors[ns.to_s]
-        return unless e
-        errors = e
+        return unless errors = errors[ns] || errors[ns.to_s]
       end
 
       @opts[:error] = errors.fetch(key){errors.fetch(key.to_s){return}}
@@ -432,38 +432,36 @@ module Forme
     # Iterate over the given options, yielding the option text, value, whether it is selected, and any attributes.
     # The block should return an appropriate tag object.
     def process_select_options(os)
-      if os
-        vm = @opts[:value_method]
-        tm = @opts[:text_method]
-        sel = @opts[:selected] || @attr.delete(:value)
-
-        if @opts[:multiple]
-          sel = Array(sel)
-          cmp = lambda{|v| sel.include?(v)}
-        else
-          cmp = lambda{|v| v == sel}
-        end
+      vm = @opts[:value_method]
+      tm = @opts[:text_method]
+      sel = @opts[:selected] || @attr.delete(:value)
 
-        os.map do |x|
-          attr = {}
-          if tm
-            text = x.send(tm)
-            val = x.send(vm) if vm
-          elsif x.is_a?(Array)
-            text = x.first
-            val = x.last
-
-            if val.is_a?(Hash)
-              value = val[:value]
-              attr.merge!(val)
-              val = value
-            end
-          else
-            text = x
-          end
+      if @opts[:multiple]
+        sel = Array(sel)
+        cmp = lambda{|v| sel.include?(v)}
+      else
+        cmp = lambda{|v| v == sel}
+      end
 
-          yield [text, val, !val.nil? ? cmp.call(val) : cmp.call(text), attr]
+      os.map do |x|
+        attr = {}
+        if tm
+          text = x.send(tm)
+          val = x.send(vm) if vm
+        elsif x.is_a?(Array)
+          text = x.first
+          val = x.last
+
+          if val.is_a?(Hash)
+            value = val[:value]
+            attr.merge!(val)
+            val = value
+          end
+        else
+          text = x
         end
+
+        yield [text, val, !val.nil? ? cmp.call(val) : cmp.call(text), attr]
       end
     end
 

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 = 1
+  MINOR = 2
 
   # The patch version of Forme, updated only for bug fixes from the last
   # feature release.

data/lib/sequel/plugins/forme.rb

@@ -95,7 +95,7 @@ module Sequel # :nodoc:
             end
             
             if grid
-              labels = opts.fetch(:labels){opts[:inputs].map{|l, *| humanize(l)} if opts[:inputs]}
+              labels = opts.fetch(:labels){opts[:inputs].map{|l,| humanize(l)} if opts[:inputs]}
               legend = opts.fetch(:legend){humanize(association)}
               inputs_opts = opts[:inputs_opts] || {}
               inputs(inputs_opts.merge(:inputs_wrapper=>:table, :nested_inputs_wrapper=>:tr, :wrapper=>:td, :labeler=>nil, :labels=>labels, :legend=>legend), &contents)
@@ -363,9 +363,10 @@ module Sequel # :nodoc:
             opts[:as] = (sch[:allow_null] || opts[:required] == false) ? :select : :checkbox
           end
 
+          v = opts.has_key?(:value) ? opts[:value] : obj.send(field)
+
           case opts[:as]
           when :radio
-            v = opts.has_key?(:value) ? opts[:value] : obj.send(field)
             true_value = opts[:true_value]||'t'
             false_value = opts[:false_value]||'f'
             opts[:options] = [[opts[:true_label]||'Yes', {:value=>true_value, :key_id=>'yes'}], [opts[:false_label]||'No', {:value=>false_value, :key_id=>'no'}]]
@@ -374,13 +375,12 @@ module Sequel # :nodoc:
             end
             _input(:radioset, opts)
           when :select
-            v = opts[:value] || obj.send(field)
             opts[:value] = (v ? 't' : 'f') unless v.nil?
             opts[:add_blank] = true unless opts.has_key?(:add_blank)
             opts[:options] = [[opts[:true_label]||'True', opts[:true_value]||'t'], [opts[:false_label]||'False', opts[:false_value]||'f']]
             _input(:select, opts)
           else
-            opts[:checked] = obj.send(field)
+            opts[:checked] = v
             opts[:value] = 't'
             _input(:checkbox, opts)
           end
@@ -424,9 +424,11 @@ module Sequel # :nodoc:
           end
         end
 
-        # Use number inputs for integers.
+        # Use inputmode and pattern attributes for integers.
         def input_integer(sch)
-          standard_input(:number)
+          opts[:attr][:inputmode] ||= 'numeric'
+          opts[:attr][:pattern] ||= '-?[0-9]*'
+          standard_input(:text)
         end
 
         # Use date inputs for dates.

data/lib/sequel/plugins/forme_set.rb

@@ -105,10 +105,8 @@ module Sequel # :nodoc:
           opts = input.opts
           return if SKIP_FORMATTERS.include?(opts.fetch(:formatter){input.form_opts[:formatter]})
 
-          if attr = opts[:attr]
-            name = attr[:name] || attr['name']
-          end
-          return unless name ||= opts[:name] || opts[:key]
+          attr = opts[:attr] || {}
+          return unless name ||= attr[:name] || attr['name'] || opts[:name] || opts[:key]
 
           # Pull out last component of the name if there is one
           column = name.to_s.chomp('[]')