forme 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abf3346d90f5f4eddb69a0c0c2a63a2fcee549cf2b928bec7ab8a9505a8135aa
-  data.tar.gz: 577dccded6b59dae158e5275b7bed4dcb87a9756b29d2e3f367accca1f32313b
+  metadata.gz: 581902a62cc974ce05fecf52a4b7debd41b5d89f5ba151c1c03a2f0589f15e7e
+  data.tar.gz: 5252e5dca95690ddf46341e443954058644f41c67e2109d7692a6dfb8c3b3ee8
 SHA512:
-  metadata.gz: 35dbc13c7de3c746a229b0f4d6026a0dfc3b8fa9dda3952ae3aa2117c6b1ad843ec07c3c40ab754cd2ae91c3ffea83cb281ee48539b886b48b832f2f1f887bab
-  data.tar.gz: 39fdd8a5b87777f1fd1831adf05c100624619e7e1cdf09d9e207d8118a8ab154971f6d229d7db1c3141faf423816a68a66b67001fd4e0b29462af2a545493e09
+  metadata.gz: 39c198d2db64a06eacf30e1ed2e5af10bce818fe45f81c17ab8fcd4db7b1693afb3c2e82d013615105dd71907e96eead22104340068b04361492b853fe03da65
+  data.tar.gz: 33bfcf058c9ffc34f9581f3aa78e924b6764b034c56495ebaebd241eb07f5984e4330ddbab3f3a934cc77e66412e01c07decbf81bee07bb10c5d829eb00dff6f

data/CHANGELOG

@@ -1,3 +1,25 @@
+=== 1.10.0 (2019-05-13)
+
+* Make readonly formatter ignore hidden inputs (jeremyevans)
+
+* Add :select_labels for date inputs using :as=>:select to use labels for the inputs for better accessibility (jeremyevans)
+
+* Add :after_legend error_handler for adding error message after legend when using :legend labeler (jeremyevans)
+
+* Add aria-describedby to all inputs with errors where possible for better accessibility (jeremyevans)
+
+* Add aria-invalid to all inputs with errors for better accessibility (jeremyevans)
+
+* Support :fieldset wrapper and :legend labeler, can be used for accessible radioset/checkboxset (jeremyevans)
+
+* Support :tag_label_attr option for radioset and checkbox set for label attributes for each radio/checkbox label (jeremyevans)
+
+* Support custom :error_handler in radioset and checkboxset inputs (jeremyevans)
+
+* Support custom :labeler in radioset and checkboxset inputs (jeremyevans)
+
+* Avoid calling Proc.new with an implicit block, which is deprecated starting in ruby 2.7 (jeremyevans)
+
 === 1.9.0 (2018-11-16)
 
 * Automatically add maxlength attributes to text and textarea inputs in the Sequel plugin based on maximum database column length (jeremyevans)

data/README.rdoc

@@ -822,6 +822,8 @@ creates multiple select options. Options:
           for the select field and string to use a string
           (:date default: <tt>[:year, '-', :month, '-', :day]</tt>)
           (:datetime default: <tt>[:year, '-', :month, '-', :day, ' ', :hour, ':', :minute, ':', :second]</tt>)
+:select_labels :: The labels to use for the select boxes.  Should be a hash keyed by the
+                   symbol used in order.  By default, no labels are used.
 :select_options :: The options to use for the select boxes.  Should be a hash keyed by the
                    symbol used in order (e.g. <tt>{:year=>1970..2020}</tt>)
 
@@ -862,6 +864,7 @@ the following options:
 
 :tag_wrapper :: The wrapper transformer for individual tags in the set
 :tag_labeler :: The labeler transformer for individual tags in the set
+:tag_label_attr :: The attributes to use for labels for individual tags in the set
 
 === :radioset
 
@@ -980,7 +983,9 @@ Forme ships with a bunch of built-in transformers that you can use:
 
 === +error_handler+
 
+:after_legend :: designed for usage with :legend labeler, putting error message after legend, adding error for first input in the set
 :default :: modifies tag to add an error class and adds a span with the error message
+:set :: default error_handler for checkboxset and radioset inputs, that adds an error to the last input in the set
 
 This supports the following options:
 
@@ -998,8 +1003,10 @@ This supports the following options:
 
 :default :: uses implicit labels, where the tag is a child of the label tag
 :explicit :: uses explicit labels with the for attribute, where tag is a sibling of the label tag
+:legend :: adds a legend before the tags, mostly useful for accessible checkboxset and radioset inputs
+:span :: default labeler for checkboxset and radioset inputs that adds a span before the tags
 
-Both of these respect the following options:
+The :default and :explicit labelers respect the following options:
 
 :label_position :: Can be set to :before or :after to place the label before or after the the input.
 :label_attr :: A hash of attributes to use for the label tag
@@ -1008,6 +1015,7 @@ Both of these respect the following options:
 
 :default :: returns tag without wrapping
 :div :: wraps tag in div tag
+:fieldset :: wraps tags in a fieldset, mostly useful for accessible checkboxset and radioset inputs
 :fieldset_ol :: same as :li, but also sets +inputs_wrapper+ to :fieldset_ol
 :li :: wraps tag in li tag
 :ol :: same as :li, but also sets +inputs_wrapper+ to :ol

data/lib/forme/bs3.rb

@@ -214,7 +214,7 @@ module Forme
           yield
         end
       else
-        form.tag(:fieldset, attr, &Proc.new)
+        form.tag(:fieldset, attr, &block)
       end
     end
   end

data/lib/forme/form.rb

@@ -59,7 +59,7 @@ module Forme
       ins = opts[:inputs]
       button = opts[:button]
       if ins || button
-        block = Proc.new do |form|
+        block = proc do |form|
           form._inputs(ins, opts) if ins
           yield form if block_given?
           form.emit(form.button(button)) if button

data/lib/forme/transformers/error_handler.rb

@@ -11,10 +11,55 @@ module Forme
 
     # Return tag with error message span tag after it.
     def call(tag, input)
+      [tag, error_tag(input)]
+    end
+
+    private
+
+    def error_tag(input)
       attr = input.opts[:error_attr]
       attr = attr ? attr.dup : {}
       Forme.attr_classes(attr, 'error_message')
-      [tag, input.tag(:span, attr, input.opts[:error])]
+
+      if id = input.opts[:error_id]
+        unless attr['id'] || attr[:id]
+          attr['id'] = id
+        end
+      end
+
+      input.tag(:span, attr, input.opts[:error])
+    end
+  end
+
+  class ErrorHandler::Set < ErrorHandler
+    Forme.register_transformer(:error_handler, :set, new)
+
+    def call(tag, input)
+      return super unless last_input = input.opts[:last_input]
+
+      last_input.opts[:error] = input.opts[:error]
+      last_input.opts[:error_attr] = input.opts[:error_attr] if input.opts[:error_attr]
+      last_input.opts[:error_handler] = :default
+
+      tag
+    end
+  end
+
+  class ErrorHandler::AfterLegend < ErrorHandler
+    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
+
+      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))
     end
   end
 end

data/lib/forme/transformers/formatter.rb

@@ -61,7 +61,6 @@ module Forme
       @attr = attr ? attr.dup : {}
       @opts = input.opts
       normalize_options
-
       tag = if html = input.opts[:html]
         html = html.call(input) if html.respond_to?(:call)
         form.raw(html)
@@ -158,9 +157,10 @@ module Forme
       ops = ops.merge(@opts[:select_options]) if @opts[:select_options]
       first_input = true
       format = DATE_SELECT_FORMAT
+      @opts[:select_labels] ||= {}
       order.map do |x|
         next x if x.is_a?(String)
-        opts = @opts.merge(:label=>nil, :wrapper=>nil, :error=>nil, :name=>"#{name}[#{x}]", :value=>values[x], :options=>ops[x].map{|y| [sprintf(format, y), y]})
+        opts = @opts.merge(:label=>@opts[:select_labels][x], :wrapper=>nil, :error=>nil, :name=>"#{name}[#{x}]", :value=>values[x], :options=>ops[x].map{|y| [sprintf(format, y), y]})
         opts[:id] = if first_input
           first_input = false
           id
@@ -221,23 +221,22 @@ module Forme
       key = @opts[:key]
       name = @opts[:name]
       id = @opts[:id]
-      if @opts[:error]
-        @opts[:set_error] = @opts.delete(:error)
-      end
-      if @opts[:label]
-        @opts[:set_label] = @opts.delete(:label)
-      end
+      @opts[:labeler] ||= :span
+      @opts[:error_handler] ||= :set
 
       tag_wrapper = Forme.transformer(:tag_wrapper, @opts.delete(:tag_wrapper), @input.form_opts) || :default
       tag_labeler = Forme.transformer(:labeler, @opts.delete(:tag_labeler), @input.form_opts) || :default
       wrapper = @opts.fetch(:wrapper){@opts[:wrapper] = @input.form_opts[:set_wrapper] || @input.form_opts[:wrapper]}
       wrapper = Forme.transformer(:wrapper, wrapper)
+      tag_label_attr = @opts[:tag_label_attr] || @opts[:label_attr]
 
-      tags = process_select_optgroups(:_format_set_optgroup) do |label, value, sel, attrs|
+      first_input = nil
+      last_input = nil
+      ret = process_select_optgroups(:_format_set_optgroup) do |label, value, sel, attrs|
         value = label if value.nil?
         label_attr = {:class=>:option}
-        label_attr.merge!(@opts[:label_attr]) if @opts[:label_attr]
-        r_opts = attrs.merge(tag_attrs).merge(:label=>label||value, :label_attr=>label_attr, :wrapper=>tag_wrapper, :labeler=>tag_labeler)
+        label_attr.merge!(tag_label_attr) if tag_label_attr
+        r_opts = attrs.merge(tag_attrs).merge(:label=>label||value, :label_attr=>label_attr, :wrapper=>tag_wrapper, :labeler=>tag_labeler, :error=>nil, :error_attr=>nil)
         if r_opts[:value].nil?
           r_opts[:value] = value unless value.nil?
         end
@@ -255,31 +254,15 @@ module Forme
           r_opts[:key_id] ||= value
         end
 
-        form._input(type, r_opts)
-      end
-
-      if @opts[:set_error]
-        _add_set_error(tags)
+        input = form._input(type, r_opts)
+        first_input ||= input
+        last_input = input
       end
 
-      tags.unshift(set_label) if @opts[:set_label]
-
-      tags
-    end
+      @opts[:first_input] = first_input
+      @opts[:last_input] = last_input
 
-    def set_label
-      form._tag(:span, {:class=>:label}, @opts[:set_label])
-    end
-
-    def _add_set_error(tags)
-      if (last_input = tags.last) && last_input.is_a?(Input)
-        last_input.opts[:error] = @opts[:set_error]
-        last_input.opts[:error_attr] = @opts[:error_attr] if @opts[:error_attr]
-      else
-        attr = @opts[:error_attr] || {}
-        Forme.attr_classes(attr, 'error_message')
-        tags << form._tag(:span, attr, [@opts[:set_error]])
-      end
+      ret
     end
 
     # Formats a textarea.  Respects the following options:
@@ -321,7 +304,19 @@ module Forme
       handle_errors_option
 
       Forme.attr_classes(@attr, @opts[:class]) if @opts.has_key?(:class)
-      Forme.attr_classes(@attr, 'error') if @opts[:error]
+
+      if @opts[:error]
+        Forme.attr_classes(@attr, 'error')
+        @attr["aria-invalid"] = "true"
+        if @opts.fetch(:error_handler, true)
+          unless @opts[:error_id]
+            if id = @attr[:id] || @attr['id']
+              error_id = @attr['aria-describedby'] ||= "#{id}_error_message"
+              @opts[:error_id] = error_id
+            end
+          end
+        end
+      end
 
       if data = opts[:data]
         data.each do |k, v|
@@ -540,8 +535,11 @@ module Forme
     end
 
     # Use a span with text instead of an input field.
+    # For hidden inputs, do not show anything
     def _format_input(type)
-      tag(:span, {'class'=>'readonly-text'}, @attr[:value])
+      unless type.to_s == 'hidden'
+        tag(:span, {'class'=>'readonly-text'}, @attr[:value])
+      end
     end
 
     # Disabled radio button inputs.

data/lib/forme/transformers/inputs_wrapper.rb

@@ -10,7 +10,7 @@ module Forme
     # Wrap the inputs in a <fieldset>.  If the :legend
     # option is given, add a <legend> tag as the first
     # child of the fieldset.
-    def call(form, opts)
+    def call(form, opts, &block)
       attr = opts[:attr] ? opts[:attr].dup : {}
       Forme.attr_classes(attr, 'inputs')
       if legend = opts[:legend]
@@ -19,7 +19,7 @@ module Forme
           yield
         end
       else
-        form.tag(:fieldset, attr, &Proc.new)
+        form.tag(:fieldset, attr, &block)
       end
     end
   end

data/lib/forme/transformers/labeler.rb

@@ -77,4 +77,23 @@ module Forme
       t
     end
   end
+
+  class Labeler::Span
+    Forme.register_transformer(:labeler, :span, new)
+
+    def call(tag, input)
+      label_attr = input.opts[:label_attr]
+      label_attr = label_attr ? label_attr.dup : {}
+      Forme.attr_classes(label_attr, "label")
+      [input.tag(:span, label_attr, input.opts[:label]), tag]
+    end
+  end
+
+  class Labeler::Legend
+    Forme.register_transformer(:labeler, :legend, new)
+
+    def call(tag, input)
+      [input.tag(:legend, input.opts[:label_attr], input.opts[:label]), tag]
+    end
+  end
 end

data/lib/forme/transformers/wrapper.rb

@@ -23,7 +23,7 @@ module Forme
       input.tag(@type, input.opts[:wrapper_attr], super)
     end
 
-    [:li, :p, :div, :span, :td].each do |x|
+    [:li, :p, :div, :span, :td, :fieldset].each do |x|
       Forme.register_transformer(:wrapper, x, new(x))
     end
   end

data/lib/forme/version.rb

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

data/spec/forme_spec.rb

@@ -116,13 +116,13 @@ describe "Forme plain forms" do
 
   it "should consider form's :errors hash based on the :key option" do
     @f.opts[:errors] = { 'foo' => 'must be present' }
-    @f.input(:text, :key=>"foo").to_s.must_equal "<input class=\"error\" id=\"foo\" name=\"foo\" type=\"text\"/><span class=\"error_message\">must be present</span>"
+    @f.input(:text, :key=>"foo").to_s.must_equal "<input aria-describedby=\"foo_error_message\" aria-invalid=\"true\" class=\"error\" id=\"foo\" name=\"foo\" type=\"text\"/><span class=\"error_message\" id=\"foo_error_message\">must be present</span>"
   end
 
   it "should consider form's :errors hash based on the :key option when using namespaces" do
     @f.opts[:errors] = { 'bar' => { 'foo' => 'must be present' } }
     @f.with_opts(:namespace=>['bar']) do
-      @f.input(:text, :key=>"foo").to_s.must_equal "<input class=\"error\" id=\"bar_foo\" name=\"bar[foo]\" type=\"text\"/><span class=\"error_message\">must be present</span>"
+      @f.input(:text, :key=>"foo").to_s.must_equal "<input aria-describedby=\"bar_foo_error_message\" aria-invalid=\"true\" class=\"error\" id=\"bar_foo\" name=\"bar[foo]\" type=\"text\"/><span class=\"error_message\" id=\"bar_foo_error_message\">must be present</span>"
     end
   end
 
@@ -301,6 +301,10 @@ describe "Forme plain forms" do
     @f.input(:date, :name=>"foo", :id=>"bar", :as=>:select, :value=>Date.new(2011, 6, 5)).to_s.must_equal %{<select id="bar" name="foo[year]">#{sel(1900..2050, 2011)}</select>-<select id="bar_month" name="foo[month]">#{sel(1..12, 6)}</select>-<select id="bar_day" name="foo[day]">#{sel(1..31, 5)}</select>}
   end
 
+  it "should use labels for select boxes for dates if the :as=>:select and :select_labels options are given" do
+    @f.input(:date, :name=>"foo", :id=>"bar", :as=>:select, :value=>Date.new(2011, 6, 5), :select_labels=>{:year=>'Y', :month=>'M', :day=>'D'}, :labeler=>:explicit).to_s.must_equal %{<label class="label-before" for="bar">Y</label><select id="bar" name="foo[year]">#{sel(1900..2050, 2011)}</select>-<label class="label-before" for="bar_month">M</label><select id="bar_month" name="foo[month]">#{sel(1..12, 6)}</select>-<label class="label-before" for="bar_day">D</label><select id="bar_day" name="foo[day]">#{sel(1..31, 5)}</select>}
+  end
+
   it "should allow ordering date select boxes via :order" do
     @f.input(:date, :name=>"foo", :id=>"bar", :as=>:select, :value=>Date.new(2011, 6, 5), :order=>[:month, '/', :day, '/', :year]).to_s.must_equal %{<select id="bar" name="foo[month]">#{sel(1..12, 6)}</select>/<select id="bar_day" name="foo[day]">#{sel(1..31, 5)}</select>/<select id="bar_year" name="foo[year]">#{sel(1900..2050, 2011)}</select>}
   end
@@ -433,7 +437,11 @@ describe "Forme plain forms" do
   end
 
   it "should create set of radio buttons with :error and :error_attr options" do
-    @f.input(:radioset, :options=>[1, 2, 3], :selected=>2, :error=>'foo', :error_attr=>{'bar'=>'baz'}).to_s.must_equal '<label class="option"><input type="radio" value="1"/> 1</label><label class="option"><input checked="checked" type="radio" value="2"/> 2</label><label class="option"><input class="error" type="radio" value="3"/> 3</label><span bar="baz" class="error_message">foo</span>'
+    @f.input(:radioset, :options=>[1, 2, 3], :selected=>2, :error=>'foo', :error_attr=>{'bar'=>'baz'}).to_s.must_equal '<label class="option"><input type="radio" value="1"/> 1</label><label class="option"><input checked="checked" type="radio" value="2"/> 2</label><label class="option"><input aria-invalid="true" class="error" type="radio" value="3"/> 3</label><span bar="baz" class="error_message">foo</span>'
+  end
+
+  it "should support custom error_handler for set of radio buttons" do
+    @f.input(:radioset, :options=>[1, 2, 3], :selected=>2, :error=>'foo', :error_attr=>{'bar'=>'baz'}, :error_handler=>lambda{|tag, input| input.tag(:div, {}, tag)}).to_s.must_equal '<div><label class="option"><input type="radio" value="1"/> 1</label><label class="option"><input checked="checked" type="radio" value="2"/> 2</label><label class="option"><input type="radio" value="3"/> 3</label></div>'
   end
 
   it "should create set of checkbox buttons" do
@@ -457,10 +465,26 @@ describe "Forme plain forms" do
     @f.input(:checkboxset, :options=>[[:a, 1], [:b, 2], [:c, 3]], :label=>'foo').to_s.must_equal '<span class="label">foo</span><label class="option"><input type="checkbox" value="1"/> a</label><label class="option"><input type="checkbox" value="2"/> b</label><label class="option"><input type="checkbox" value="3"/> c</label>'
   end
 
+  it "should support fieldset/legend for checkboxsets" do
+    @f.input(:checkboxset, :options=>[[:a, 1], [:b, 2], [:c, 3]], :label=>'foo', :labeler=>:legend, :wrapper=>:fieldset).to_s.must_equal '<fieldset><legend>foo</legend><label class="option"><input type="checkbox" value="1"/> a</label><label class="option"><input type="checkbox" value="2"/> b</label><label class="option"><input type="checkbox" value="3"/> c</label></fieldset>'
+  end
+
+  it "should support legend with attributes for checkboxsets" do
+    @f.input(:checkboxset, :options=>[[:a, 1], [:b, 2], [:c, 3]], :label=>'foo', :label_attr=>{:class=>"baz"}, :tag_label_attr=>{:class=>"bar"}, :labeler=>:legend, :wrapper=>:fieldset).to_s.must_equal '<fieldset><legend class="baz">foo</legend><label class="bar"><input type="checkbox" value="1"/> a</label><label class="bar"><input type="checkbox" value="2"/> b</label><label class="bar"><input type="checkbox" value="3"/> c</label></fieldset>'
+  end
+
+  it "should support legend with attributes for checkboxsets, handling errors with :error_handler=>:after_legend" do
+    @f.input(:checkboxset, :options=>[[:a, 1], [:b, 2], [:c, 3]], :id=>:quux, :label=>'foo', :label_attr=>{:class=>"baz"}, :tag_label_attr=>{:class=>"bar"}, :labeler=>:legend, :wrapper=>:fieldset, :error=>'bar2', :error_handler=>:after_legend).to_s.must_equal '<fieldset><legend class="baz">foo</legend><span class="error_message" id="quux_1_error_message">bar2</span><label class="bar"><input aria-describedby="quux_1_error_message" aria-invalid="true" class="error" id="quux_1" type="checkbox" value="1"/> a</label><label class="bar"><input id="quux_2" type="checkbox" value="2"/> b</label><label class="bar"><input id="quux_3" type="checkbox" value="3"/> c</label></fieldset>'
+  end
+
   it "should support :tag_labeler for checkboxsets" do
     @f.input(:checkboxset, :options=>[[:a, 1], [:b, 2], [:c, 3]], :tag_labeler=>:explicit).to_s.must_equal '<input type="checkbox" value="1"/><label class="option label-after">a</label><input type="checkbox" value="2"/><label class="option label-after">b</label><input type="checkbox" value="3"/><label class="option label-after">c</label>'
   end
 
+  it "should support custom :labeler for checkboxsets" do
+    @f.input(:checkboxset, :options=>[[:a, 1], [:b, 2], [:c, 3]], :label=>'foo', :labeler=>lambda{|tag, input| input.tag(:div, {}, tag)}).to_s.must_equal '<div><label class="option"><input type="checkbox" value="1"/> a</label><label class="option"><input type="checkbox" value="2"/> b</label><label class="option"><input type="checkbox" value="3"/> c</label></div>'
+  end
+
   it "should create set of checkbox buttons with options and values with hashes" do
     @f.input(:checkboxset, :options=>[[:a, {:attr=>{:foo=>1}}], [:b, {:class=>'foo', :value=>2}], [:c, {:id=>:baz}]], :selected=>2).to_s.must_equal '<label class="option"><input foo="1" type="checkbox" value="a"/> a</label><label class="option"><input checked="checked" class="foo" type="checkbox" value="2"/> b</label><label class="option"><input id="baz" type="checkbox" value="c"/> c</label>'
   end
@@ -491,7 +515,7 @@ describe "Forme plain forms" do
   end
 
   it "should respect the :error option for checkbox sets" do
-    @f.input(:checkboxset, :options=>[1, 2, 3], :error=>'foo', :value=>2).to_s.must_equal '<label class="option"><input type="checkbox" value="1"/> 1</label><label class="option"><input checked="checked" type="checkbox" value="2"/> 2</label><label class="option"><input class="error" type="checkbox" value="3"/> 3</label><span class="error_message">foo</span>'
+    @f.input(:checkboxset, :options=>[1, 2, 3], :error=>'foo', :value=>2).to_s.must_equal '<label class="option"><input type="checkbox" value="1"/> 1</label><label class="option"><input checked="checked" type="checkbox" value="2"/> 2</label><label class="option"><input aria-invalid="true" class="error" type="checkbox" value="3"/> 3</label><span class="error_message">foo</span>'
   end
 
   it "should create set of checkbox buttons with fieldsets and legends for optgroups" do
@@ -558,19 +582,23 @@ describe "Forme plain forms" do
   end
 
   it "should automatically note the input has errors if :error option is used" do
-    @f.input(:text, :error=>'Bad Stuff!', :value=>'foo').to_s.must_equal '<input class="error" type="text" value="foo"/><span class="error_message">Bad Stuff!</span>'
+    @f.input(:text, :error=>'Bad Stuff!', :value=>'foo').to_s.must_equal '<input aria-invalid="true" class="error" type="text" value="foo"/><span class="error_message">Bad Stuff!</span>'
   end
 
   it "should add an error message after the label" do
-    @f.input(:text, :error=>'Bad Stuff!', :value=>'foo', :label=>"Foo").to_s.must_equal '<label>Foo: <input class="error" type="text" value="foo"/></label><span class="error_message">Bad Stuff!</span>'
+    @f.input(:text, :error=>'Bad Stuff!', :value=>'foo', :label=>"Foo").to_s.must_equal '<label>Foo: <input aria-invalid="true" class="error" type="text" value="foo"/></label><span class="error_message">Bad Stuff!</span>'
   end
 
   it "should add to existing :class option if :error option is used" do
-    @f.input(:text, :error=>'Bad Stuff!', :class=>'bar', :value=>'foo').to_s.must_equal '<input class="bar error" type="text" value="foo"/><span class="error_message">Bad Stuff!</span>'
+    @f.input(:text, :error=>'Bad Stuff!', :class=>'bar', :value=>'foo').to_s.must_equal '<input aria-invalid="true" class="bar error" type="text" value="foo"/><span class="error_message">Bad Stuff!</span>'
   end
 
   it "should respect :error_attr option for setting the attributes for the error message span" do
-    @f.input(:text, :error=>'Bad Stuff!', :value=>'foo', :error_attr=>{:class=>'foo'}).to_s.must_equal '<input class="error" type="text" value="foo"/><span class="foo error_message">Bad Stuff!</span>'
+    @f.input(:text, :error=>'Bad Stuff!', :value=>'foo', :error_attr=>{:class=>'foo'}).to_s.must_equal '<input aria-invalid="true" class="error" type="text" value="foo"/><span class="foo error_message">Bad Stuff!</span>'
+  end
+
+  it "should use aria-describedby and aria-invalid tags for errors with where the id attribute can be determined" do
+    @f.input(:text, :error=>'Bad Stuff!', :id=>:bar, :value=>'foo', :error_attr=>{:class=>'foo'}).to_s.must_equal '<input aria-describedby="bar_error_message" aria-invalid="true" class="error" id="bar" type="text" value="foo"/><span class="foo error_message" id="bar_error_message">Bad Stuff!</span>'
   end
 
   it "#open should return an opening tag" do
@@ -696,7 +724,7 @@ describe "Forme plain forms" do
   end
 
   it "inputs should have helper displayed inside wrapper, after error" do
-    @f.input(:text, :help=>"List type of foo", :error=>'bad', :wrapper=>:li).to_s.must_equal '<li><input class="error" type="text"/><span class="error_message">bad</span><span class="helper">List type of foo</span></li>'
+    @f.input(:text, :help=>"List type of foo", :error=>'bad', :wrapper=>:li).to_s.must_equal '<li><input aria-invalid="true" class="error" type="text"/><span class="error_message">bad</span><span class="helper">List type of foo</span></li>'
   end
 
   it "inputs should accept a :formatter option to use a custom formatter" do
@@ -729,7 +757,7 @@ describe "Forme plain forms" do
   end
 
   it "inputs should accept a :error_handler option to use a custom error_handler" do
-    @f.input(:textarea, :error_handler=>proc{|t, i| [t, "!!! #{i.opts[:error]}"]}, :error=>'bar', :id=>:foo).to_s.must_equal '<textarea class="error" id="foo"></textarea>!!! bar'
+    @f.input(:textarea, :error_handler=>proc{|t, i| [t, "!!! #{i.opts[:error]}"]}, :error=>'bar', :id=>:foo).to_s.must_equal '<textarea aria-describedby="foo_error_message" aria-invalid="true" class="error" id="foo"></textarea>!!! bar'
   end
 
   it "#inputs should accept a :inputs_wrapper option to use a custom inputs_wrapper" do
@@ -745,7 +773,7 @@ describe "Forme plain forms" do
   end
 
   it "inputs should accept a :error_handler=>nil option to not use an error_handler" do
-    @f.input(:textarea, :error_handler=>nil, :error=>'bar', :id=>:foo).to_s.must_equal '<textarea class="error" id="foo"></textarea>'
+    @f.input(:textarea, :error_handler=>nil, :error=>'bar', :id=>:foo).to_s.must_equal '<textarea aria-invalid="true" class="error" id="foo"></textarea>'
   end
 
   it "#inputs should accept a :inputs_wrapper=>nil option to not use an inputs_wrapper" do
@@ -819,7 +847,7 @@ describe "Forme custom" do
   end
 
   it "error_handlers can be specified as a proc" do
-    Forme::Form.new(:error_handler=>proc{|t, i| [t, "!!! #{i.opts[:error]}"]}).input(:textarea, :name=>'foo', :error=>'bar').to_s.must_equal '<textarea class="error" name="foo"></textarea>!!! bar'
+    Forme::Form.new(:error_handler=>proc{|t, i| [t, "!!! #{i.opts[:error]}"]}).input(:textarea, :name=>'foo', :error=>'bar').to_s.must_equal '<textarea aria-invalid="true" class="error" name="foo"></textarea>!!! bar'
   end
 
   it "wrappers can be specified as a proc" do
@@ -854,6 +882,10 @@ describe "Forme built-in custom" do
     Forme::Form.new(:formatter=>:readonly).input(:select, :label=>"Foo", :options=>[1, 2, 3], :value=>2).to_s.must_equal "<label>Foo: <span>2</span></label>"
   end
 
+  it "formatter: readonly removes hidden inputs" do
+    Forme::Form.new(:formatter=>:readonly).input(:hidden, :value=>"Bar").to_s.must_equal ""
+  end
+
   it "formatter: readonly formats text into paragraphs for textarea inputs" do
     Forme::Form.new(:formatter=>:readonly).input(:textarea, :label=>"Foo", :value=>"\n Bar\nBaz\n\nQuuz\n\n1\n2 \n").to_s.must_equal "<label>Foo: <div class=\"readonly-textarea\"><p> Bar<br />Baz</p><p>Quuz</p><p>1<br />2 </p></div></label>"
   end
@@ -877,7 +909,7 @@ describe "Forme built-in custom" do
   end
 
   it "labeler: explicit should handle tags with errors" do
-    Forme::Form.new(:labeler=>:explicit).input(:text, :error=>'Bad Stuff!', :value=>'f', :id=>'foo', :label=>'bar').to_s.must_equal '<label class="label-before" for="foo">bar</label><input class="error" id="foo" type="text" value="f"/><span class="error_message">Bad Stuff!</span>'
+    Forme::Form.new(:labeler=>:explicit).input(:text, :error=>'Bad Stuff!', :value=>'f', :id=>'foo', :label=>'bar').to_s.must_equal '<label class="label-before" for="foo">bar</label><input aria-describedby="foo_error_message" aria-invalid="true" class="error" id="foo" type="text" value="f"/><span class="error_message" id="foo_error_message">Bad Stuff!</span>'
   end
 
   it "wrapper: li wraps tag in an li" do
@@ -915,7 +947,7 @@ describe "Forme built-in custom" do
   end
 
   it "wrapper: trtd should use at most 2 td tags" do
-    Forme::Form.new(:wrapper=>:trtd, :labeler=>:explicit).input(:textarea, :id=>'foo', :label=>'Foo', :error=>'Bar').to_s.must_equal '<tr><td><label class="label-before" for="foo">Foo</label></td><td><textarea class="error" id="foo"></textarea><span class="error_message">Bar</span></td></tr>'
+    Forme::Form.new(:wrapper=>:trtd, :labeler=>:explicit).input(:textarea, :id=>'foo', :label=>'Foo', :error=>'Bar').to_s.must_equal '<tr><td><label class="label-before" for="foo">Foo</label></td><td><textarea aria-describedby="foo_error_message" aria-invalid="true" class="error" id="foo"></textarea><span class="error_message" id="foo_error_message">Bar</span></td></tr>'
   end
 
   it "wrapper: trtd should handle inputs with label after" do

data/spec/roda_integration_spec.rb

@@ -20,7 +20,15 @@ rescue LoadError
 end
 
 class FormeRodaTest < Roda
-  use Rack::Session::Cookie, :secret => "__a_very_long_string__"
+  opts[:check_dynamic_arity] = opts[:check_arity] = :warn
+  
+  if defined?(Roda::RodaVersionNumber) && Roda::RodaVersionNumber >= 30100
+    require 'roda/session_middleware'
+    opts[:sessions_convert_symbols] = true
+    use RodaSessionMiddleware, :secret=>SecureRandom.random_bytes(64), :key=>'rack.session'
+  else
+    use Rack::Session::Cookie, :secret => "__a_very_long_string__"
+  end
 
   def erb(s, opts={})
     render(opts.merge(:inline=>s))

data/spec/sequel_plugin_spec.rb

@@ -134,7 +134,7 @@ describe "Forme Sequel::Model forms" do
   
   it "should handle errors on radio buttons for boolean fields if :as=>:radio is used" do
     @ab.errors.add(:platinum, 'foo')
-    @b.input(:platinum, :as=>:radio).to_s.must_equal '<span class="label">Platinum</span><label class="option"><input id="album_platinum_yes" name="album[platinum]" type="radio" value="t"/> Yes</label><label class="option"><input checked="checked" class="error" id="album_platinum_no" name="album[platinum]" type="radio" value="f"/> No</label><span class="error_message">foo</span>'
+    @b.input(:platinum, :as=>:radio).to_s.must_equal '<span class="label">Platinum</span><label class="option"><input id="album_platinum_yes" name="album[platinum]" type="radio" value="t"/> Yes</label><label class="option"><input aria-describedby="album_platinum_no_error_message" aria-invalid="true" checked="checked" class="error" id="album_platinum_no" name="album[platinum]" type="radio" value="f"/> No</label><span class="error_message" id="album_platinum_no_error_message">foo</span>'
   end
   
   it "should handle Raw :label options if :as=>:radio is used" do
@@ -272,8 +272,8 @@ describe "Forme Sequel::Model forms" do
 
   it "should handle an error message on the underlying column for pg_array_to_many associations" do
     @ab.errors.add(:atag_ids, 'tis not valid')
-    @b.input(:atags).to_s.must_equal '<label>Atags: <select class="error" id="album_atag_ids" multiple="multiple" name="album[atag_ids][]"><option selected="selected" value="1">s</option><option selected="selected" value="2">t</option><option value="3">u</option></select></label><span class="error_message">tis not valid</span>'
-    @b.input(:atags, :as=>:checkbox).to_s.must_equal '<span class="label">Atags</span><label class="option"><input checked="checked" id="album_atag_ids_1" name="album[atag_ids][]" type="checkbox" value="1"/> s</label><label class="option"><input checked="checked" id="album_atag_ids_2" name="album[atag_ids][]" type="checkbox" value="2"/> t</label><label class="option"><input class="error" id="album_atag_ids_3" name="album[atag_ids][]" type="checkbox" value="3"/> u</label><span class="error_message">tis not valid</span>'
+    @b.input(:atags).to_s.must_equal '<label>Atags: <select aria-describedby="album_atag_ids_error_message" aria-invalid="true" class="error" id="album_atag_ids" multiple="multiple" name="album[atag_ids][]"><option selected="selected" value="1">s</option><option selected="selected" value="2">t</option><option value="3">u</option></select></label><span class="error_message" id="album_atag_ids_error_message">tis not valid</span>'
+    @b.input(:atags, :as=>:checkbox).to_s.must_equal '<span class="label">Atags</span><label class="option"><input checked="checked" id="album_atag_ids_1" name="album[atag_ids][]" type="checkbox" value="1"/> s</label><label class="option"><input checked="checked" id="album_atag_ids_2" name="album[atag_ids][]" type="checkbox" value="2"/> t</label><label class="option"><input aria-describedby="album_atag_ids_3_error_message" aria-invalid="true" class="error" id="album_atag_ids_3" name="album[atag_ids][]" type="checkbox" value="3"/> u</label><span class="error_message" id="album_atag_ids_3_error_message">tis not valid</span>'
   end
   
   it "should use a regular select box for *_to_many associations if multiple if false" do
@@ -318,7 +318,7 @@ describe "Forme Sequel::Model forms" do
 
   it "should handle errors on methods not backed by columns" do
     @ab.errors.add(:artist_name, 'foo')
-    @b.input(:artist_name).to_s.must_equal '<label>Artist name: <input class="error" id="album_artist_name" name="album[artist_name]" type="text" value="a"/></label><span class="error_message">foo</span>'
+    @b.input(:artist_name).to_s.must_equal '<label>Artist name: <input aria-describedby="album_artist_name_error_message" aria-invalid="true" class="error" id="album_artist_name" name="album[artist_name]" type="text" value="a"/></label><span class="error_message" id="album_artist_name_error_message">foo</span>'
   end
 
   it "should respect a :type option with a schema type as the input type for methods not backed by columns" do
@@ -333,12 +333,12 @@ describe "Forme Sequel::Model forms" do
 
   it "should correctly show an error message if there is one" do
     @ab.errors.add(:name, 'tis not valid')
-    @b.input(:name).to_s.must_equal '<label>Name: <input class="error" id="album_name" maxlength="255" name="album[name]" type="text" value="b"/></label><span class="error_message">tis not valid</span>'
+    @b.input(:name).to_s.must_equal '<label>Name: <input aria-describedby="album_name_error_message" aria-invalid="true" class="error" id="album_name" maxlength="255" name="album[name]" type="text" value="b"/></label><span class="error_message" id="album_name_error_message">tis not valid</span>'
   end
   
   it "should correctly show an error message for many_to_one associations if there is one" do
     @ab.errors.add(:artist_id, 'tis not valid')
-    @b.input(:artist).to_s.must_equal '<label>Artist: <select class="error" id="album_artist_id" name="album[artist_id]"><option value=""></option><option selected="selected" value="1">a</option><option value="2">d</option></select></label><span class="error_message">tis not valid</span>'
+    @b.input(:artist).to_s.must_equal '<label>Artist: <select aria-describedby="album_artist_id_error_message" aria-invalid="true" class="error" id="album_artist_id" name="album[artist_id]"><option value=""></option><option selected="selected" value="1">a</option><option value="2">d</option></select></label><span class="error_message" id="album_artist_id_error_message">tis not valid</span>'
   end
   
   it "should raise an error for unhandled associations" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forme
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-16 00:00:00.000000000 Z
+date: 2019-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -220,8 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: HTML forms library