forme 1.9.0 → 2.0.0

data/lib/roda/plugins/forme_set.rb

@@ -0,0 +1,177 @@
+# frozen-string-literal: true
+
+require 'rack/utils'
+require_relative '../../forme/template'
+
+class Roda
+  module RodaPlugins
+    module FormeSet
+      # Require the forme_route_csrf plugin.
+      def self.load_dependencies(app, _ = nil)
+        app.plugin :forme_route_csrf 
+      end
+
+      # Set the HMAC secret.
+      def self.configure(app, opts = OPTS, &block)
+        app.opts[:forme_set_hmac_secret] = opts[:secret] || app.opts[:forme_set_hmac_secret]
+
+        if block
+          app.send(:define_method, :_forme_set_handle_error, &block)
+          app.send(:private, :_forme_set_handle_error)
+        end
+      end
+
+      # Error class raised for invalid form submissions.
+      class Error < StandardError
+      end
+
+      # Map of error types to error messages
+      ERROR_MESSAGES = {
+        :missing_data=>"_forme_set_data parameter not submitted",
+        :missing_hmac=>"_forme_set_data_hmac parameter not submitted",
+        :hmac_mismatch=>"_forme_set_data_hmac does not match _forme_set_data",
+        :csrf_mismatch=>"_forme_set_data CSRF token does not match submitted CSRF token",
+        :missing_namespace=>"no content in expected namespace"
+      }.freeze
+
+      module InstanceMethods
+        # 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.
+        def forme_parse(obj)
+          h = _forme_parse(obj)
+          
+          params = h.delete(:params)
+          columns = h.delete(:columns)
+          h[:validations] ||= {}
+
+          values = h[:values] = {}
+          columns.each do |col|
+            values[col.to_sym] = params[col]
+          end
+
+          h
+        end
+
+        # Set fields on the object based on submitted parameters, as
+        # well as validations for associated object values.
+        def forme_set(obj)
+          h = _forme_parse(obj)
+
+          obj.set_fields(h[:params], h[:columns])
+
+          if h[:validations]
+            obj.forme_validations.merge!(h[:validations])
+          end
+
+          if block_given?
+            yield h[:form_version], obj
+          end
+
+          obj
+        end
+
+        private
+
+        # Raise error with message based on type
+        def _forme_set_handle_error(type, _obj)
+        end
+
+        # Raise error with message based on type
+        def _forme_parse_error(type, obj)
+          _forme_set_handle_error(type, obj)
+          raise Error, ERROR_MESSAGES[type]
+        end
+
+        # Include a reference to the current scope to the form.  This reference is needed
+        # to correctly construct the HMAC.
+        def _forme_form_options(obj, attr, opts)
+          super
+
+          opts[:_after] = lambda do |form|
+            if (obj = form.opts[:obj]) && obj.respond_to?(:forme_inputs) && (forme_inputs = obj.forme_inputs)
+              columns = []
+              valid_values = {}
+
+              forme_inputs.each do |field, input|
+                next unless col = obj.send(:forme_column_for_input, input)
+                col = col.to_s
+                columns << col
+
+                next unless validation = obj.send(:forme_validation_for_input, field, input)
+                validation[0] = validation[0].to_s
+                has_nil = false
+                validation[1] = validation[1].map do |v|
+                  has_nil ||= v.nil?
+                  v.to_s
+                end
+                validation[1] << nil if has_nil
+                valid_values[col] = validation
+              end
+
+              return if columns.empty?
+
+              data = {}
+              data['columns'] = columns
+              data['namespaces'] = form.opts[:namespace]
+              data['csrf'] = form.opts[:csrf]
+              data['valid_values'] = valid_values unless valid_values.empty?
+              data['form_version'] = form.opts[:form_version] if form.opts[:form_version]
+
+              data = data.to_json
+              form.tag(:input, :type=>:hidden, :name=>:_forme_set_data, :value=>data)
+              form.tag(:input, :type=>:hidden, :name=>:_forme_set_data_hmac, :value=>OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA512.new, self.class.opts[:forme_set_hmac_secret], data))
+            end
+          end
+        end
+
+        # Internals of forme_parse_hmac and forme_set_hmac.
+        def _forme_parse(obj)
+          params = request.params
+          return _forme_parse_error(:missing_data, obj) unless data = params['_forme_set_data']
+          return _forme_parse_error(:missing_hmac, obj) unless hmac = params['_forme_set_data_hmac']
+
+          data = data.to_s
+          hmac = hmac.to_s
+          actual = OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA512.new, self.class.opts[:forme_set_hmac_secret], data)
+          unless Rack::Utils.secure_compare(hmac.ljust(64), actual) && hmac.length == actual.length
+            return _forme_parse_error(:hmac_mismatch, obj)
+          end
+
+          data = JSON.parse(data)
+          csrf_field, hmac_csrf_value = data['csrf']
+          if csrf_field
+            csrf_value = params[csrf_field].to_s
+            hmac_csrf_value = hmac_csrf_value.to_s
+            unless Rack::Utils.secure_compare(csrf_value.ljust(hmac_csrf_value.length), hmac_csrf_value) && csrf_value.length == hmac_csrf_value.length
+              return _forme_parse_error(:csrf_mismatch, obj)
+            end
+          end
+
+          namespaces = data['namespaces']
+          namespaces.each do |key|
+            return _forme_parse_error(:missing_namespace, obj) unless params = params[key]
+          end
+
+          if valid_values = data['valid_values']
+            validations = {}
+            valid_values.each do |col, (type, values)|
+              value = params[col]
+              valid = if type == "subset"
+                !value || (value - values).empty?
+              else # type == "include"
+                values.include?(value)
+              end
+
+              validations[col.to_sym] = [:valid, valid]
+            end
+          end
+
+          {:params=>params, :columns=>data["columns"], :validations=>validations, :form_version=>data['form_version']}
+        end
+      end
+    end
+
+    register_plugin(:forme_set, FormeSet)
+  end
+end

data/lib/sequel/plugins/forme.rb

@@ -1,7 +1,6 @@
 # frozen-string-literal: true
 
-require 'forme'
-require 'thread'
+require_relative '../../forme'
 
 module Sequel # :nodoc:
   module Plugins # :nodoc:
@@ -37,7 +36,8 @@ module Sequel # :nodoc:
         # of the association for the form's +obj+. Inside the block, calls to
         # the +input+ and +inputs+ methods for the receiver treat the associated
         # object as the recevier's +obj+, using name and id attributes that work
-        # with the Sequel +nested_attributes+ plugin.
+        # with the Sequel +nested_attributes+ plugin. Returns the HTML generated by
+        # the subform.
         #
         # The following options are currently supported:
         # :inputs :: Automatically call +inputs+ with the given values.  Using
@@ -59,45 +59,47 @@ module Sequel # :nodoc:
         # :skip_primary_key :: Skip adding a hidden primary key field for existing
         #                      objects.
         def subform(association, opts={}, &block)
-          nested_obj = opts.has_key?(:obj) ? opts[:obj] : obj.send(association)
-          ref = obj.class.association_reflection(association)
-          multiple = ref.returns_array?
-          grid = opts[:grid]
-          ns = "#{association}_attributes"
-
-          contents = proc do
-            send(multiple ? :each_obj : :with_obj, nested_obj, ns) do |no, i|
-              emit(input(ref.associated_class.primary_key, :type=>:hidden, :label=>nil, :wrapper=>nil)) unless no.new? || opts[:skip_primary_key]
-              options = opts.dup
-              if grid
-                options.delete(:legend)
-              else
-                if options.has_key?(:legend)
-                  if options[:legend].respond_to?(:call)
-                    options[:legend] = multiple ? options[:legend].call(no, i) : options[:legend].call(no)
-                  end
+          content_added do
+            nested_obj = opts.has_key?(:obj) ? opts[:obj] : obj.send(association)
+            ref = obj.class.association_reflection(association)
+            multiple = ref.returns_array?
+            grid = opts[:grid]
+            ns = "#{association}_attributes"
+
+            contents = proc do
+              send(multiple ? :each_obj : :with_obj, nested_obj, ns) do |no, i|
+                input(ref.associated_class.primary_key, :type=>:hidden, :label=>nil, :wrapper=>nil) unless no.new? || opts[:skip_primary_key]
+                options = opts.dup
+                if grid
+                  options.delete(:legend)
                 else
-                  if multiple
-                    options[:legend] = humanize("#{obj.model.send(:singularize, association)} ##{i+1}")
+                  if options.has_key?(:legend)
+                    if options[:legend].respond_to?(:call)
+                      options[:legend] = multiple ? options[:legend].call(no, i) : options[:legend].call(no)
+                    end
                   else
-                    options[:legend] = humanize(association)
+                    if multiple
+                      options[:legend] = humanize("#{obj.model.send(:singularize, association)} ##{i+1}")
+                    else
+                      options[:legend] = humanize(association)
+                    end
                   end
                 end
+                options[:subform] = true
+
+                inputs(options[:inputs]||[], options, &block)
               end
-              options[:subform] = true
-              _inputs(options[:inputs]||[], options, &block)
+            end
+            
+            if grid
+              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)
+            else
+              contents.call
             end
           end
-          
-          if grid
-            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)
-          else
-            contents.call
-          end
-          nil
         end
       end
 
@@ -192,6 +194,7 @@ module Sequel # :nodoc:
 
         # Set the error option correctly if the field contains errors
         def handle_errors(f)
+          return if opts.has_key?(:error)
           if e = obj.errors.on(f)
             opts[:error] = e.join(', ')
           end
@@ -346,7 +349,7 @@ module Sequel # :nodoc:
 
         # Delegate to the +form+.
         def humanize(s)
-          form.humanize(s)
+          form.respond_to?(:humanize) ? form.humanize(s) : s.to_s.gsub(/_id$/, "").gsub(/_/, " ").capitalize
         end
 
         # If the column allows +NULL+ values, use a three-valued select
@@ -451,29 +454,14 @@ module Sequel # :nodoc:
         end
       end
 
-      # Helper module used for Sequel forms using ERB template integration.  Necessary for
-      # proper subform handling when using such forms with partials.
-      module ERBSequelForm
-        # Capture the inside of the inputs, injecting it into the template
-        # if a block is given, or returning it as a string if not.
-        def subform(*, &block)
-          if block
-            capture(block){super}
-          else
-            capture{super}
-          end
-        end
-      end
-      SinatraSequelForm = ERBSequelForm
-
       class Form < ::Forme::Form
         include SequelForm
       end
 
-      module InstanceMethods
-        MUTEX = Mutex.new
-        FORM_CLASSES = {::Forme::Form=>Form}
+      MUTEX = Mutex.new
+      FORM_CLASSES = {::Forme::Form=>Form}
 
+      module InstanceMethods
         # Configure the +form+ with support for <tt>Sequel::Model</tt>
         # specific code, such as support for nested attributes.
         def forme_config(form)
@@ -485,7 +473,6 @@ module Sequel # :nodoc:
           unless klass = MUTEX.synchronize{FORM_CLASSES[base]}
             klass = Class.new(base)
             klass.send(:include, SequelForm)
-            klass.send(:include, ERBSequelForm) if defined?(::Forme::ERB::Form) && base == ::Forme::ERB::Form
             MUTEX.synchronize{FORM_CLASSES[base] = klass}
           end
           klass

data/lib/sequel/plugins/forme_i18n.rb

@@ -1,5 +1,7 @@
+# frozen-string-literal: true
+
 require 'i18n'
-require 'sequel/plugins/forme'
+require_relative 'forme'
 
 module Sequel # :nodoc:
   module Plugins # :nodoc:

data/lib/sequel/plugins/forme_set.rb

@@ -3,7 +3,7 @@
 module Sequel # :nodoc:
   module Plugins # :nodoc:
     # The forme_set plugin makes the model instance keep track of which form
-    # inputs have been added for it. It adds a forme_set method to handle
+    # inputs have been added for it. It adds a <tt>forme_set(params['model_name'])</tt> method to handle
     # the intake of submitted data from the form.  For more complete control,
     # it also adds a forme_parse method that returns a hash of information that can be
     # used to modify and validate the object.
@@ -18,6 +18,7 @@ module Sequel # :nodoc:
       module InstanceMethods
         # Hash with column name symbol keys and Forme::SequelInput values
         def forme_inputs
+          return (@forme_inputs || {}) if frozen?
           @forme_inputs ||= {}
         end
 
@@ -25,12 +26,13 @@ module Sequel # :nodoc:
         # 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.
         def forme_validations
+          return (@forme_validations || {}) if frozen?
           @forme_validations ||= {}
         end
 
         # Keep track of the inputs used.
         def forme_input(_form, field, _opts)
-          forme_inputs[field] = super
+          frozen? ? super : (forme_inputs[field] = super)
         end
 
         # Given the hash of submitted parameters, return a hash containing information on how to
@@ -47,34 +49,11 @@ module Sequel # :nodoc:
           validations = hash[:validations] = {}
 
           forme_inputs.each do |field, input|
-            opts = input.opts
-            next if SKIP_FORMATTERS.include?(opts.fetch(:formatter){input.form_opts[:formatter]})
-
-            if attr = opts[:attr]
-              name = attr[:name] || attr['name']
-            end
-            name ||= opts[:name] || opts[:key] || next
-
-            # Pull out last component of the name if there is one
-            column = (name =~ /\[([^\[\]]+)\]\z/ ? $1 : name)
-            column = column.to_s.sub(/\[\]\z/, '').to_sym
-
+            next unless column = forme_column_for_input(input)
             hash_values[column] = params[column] || params[column.to_s]
 
-            next unless ref = model.association_reflection(field)
-            next unless options = opts[:options]
-
-            values = if opts[:text_method]
-              value_method = opts[:value_method] || opts[:text_method]
-              options.map(&value_method)
-            else
-              options.map{|obj| obj.is_a?(Array) ? obj.last : obj}
-            end
-
-            if ref[:type] == :many_to_one && !opts[:required]
-              values << nil
-            end
-            validations[column] = [ref[:type] != :many_to_one ? :subset : :include, values]
+            next unless validation = forme_validation_for_input(field, input)
+            validations[column] = validation
           end
 
           hash
@@ -88,6 +67,7 @@ module Sequel # :nodoc:
           unless hash[:validations].empty?
             forme_validations.merge!(hash[:validations])
           end
+          nil
         end
 
         # Check associated values to ensure they match one of options in the form.
@@ -105,6 +85,8 @@ module Sequel # :nodoc:
                 !value || (value - values).empty?
               when :include
                 values.include?(value)
+              when :valid
+                values
               else
                 raise Forme::Error, "invalid type used in forme_validations"
               end
@@ -115,6 +97,46 @@ module Sequel # :nodoc:
             end
           end
         end
+
+        private
+
+        # Return the model column name to use for the given form input.
+        def forme_column_for_input(input)
+          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]
+
+          # Pull out last component of the name if there is one
+          column = name.to_s.chomp('[]')
+          if column =~ /\[([^\[\]]+)\]\z/
+            $1
+          else
+            column
+          end.to_sym
+        end
+
+        # Return the validation metadata to use for the given field name and form input.
+        def forme_validation_for_input(field, input)
+          return unless ref = model.association_reflection(field)
+          opts = input.opts
+          return unless options = opts[:options]
+
+          values = if opts[:text_method]
+            value_method = opts[:value_method] || opts[:text_method]
+            options.map(&value_method)
+          else
+            options.map{|obj| obj.is_a?(Array) ? obj.last : obj}
+          end
+
+          if ref[:type] == :many_to_one && !opts[:required]
+            values << nil
+          end
+          [ref[:type] != :many_to_one ? :subset : :include, values]
+        end
       end
     end
   end

data/spec/all.rb

@@ -1,2 +1,2 @@
 $: << 'lib'
-Dir['./spec/*_spec.rb'].each{|f| require f}
+Dir.new(File.dirname(__FILE__)).each{|f| require_relative f if f.end_with?('_spec.rb')}

data/spec/bs3_reference_spec.rb

@@ -1,6 +1,6 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
-require File.join(File.dirname(File.expand_path(__FILE__)), 'sequel_helper.rb')
-require 'forme/bs3'
+require_relative 'spec_helper'
+require_relative 'sequel_helper'
+require_relative '../lib/forme/bs3'
 
 describe "Forme Bootstrap3 (BS3) forms" do
   def sel(opts, s)
@@ -33,7 +33,7 @@ describe "Forme Bootstrap3 (BS3) forms" do
     end
     
     it "should create an input[:text] tag with a label when ':id => bar' with an error" do
-      @f.input(:text, :label=>"Name", :id=>'bar', :class=>'foo', :error=>'input-text-error').to_s.must_equal '<div class="form-group has-error"><label for="bar">Name</label> <input class="form-control foo" id="bar" type="text"/><span class="help-block with-errors">input-text-error</span></div>'
+      @f.input(:text, :label=>"Name", :id=>'bar', :class=>'foo', :error=>'input-text-error').to_s.must_equal '<div class="form-group has-error"><label for="bar">Name</label> <input aria-describedby="bar_error_message" aria-invalid="true" class="form-control foo" id="bar" type="text"/><span class="help-block with-errors">input-text-error</span></div>'
     end
     
     describe 'from a Sequel model' do
@@ -43,7 +43,7 @@ describe "Forme Bootstrap3 (BS3) forms" do
       
       it "should correctly handle an input[:text] tag from Sequel model with error" do
         @ac.errors.add(:name, 'name not valid')
-        @c.input(:name).to_s.must_equal '<div class="form-group has-error string"><label for="album_name">Name</label> <input class="form-control" id="album_name" maxlength="255" name="album[name]" type="text" value="c"/><span class="help-block with-errors">name not valid</span></div>'
+        @c.input(:name).to_s.must_equal '<div class="form-group has-error string"><label for="album_name">Name</label> <input aria-describedby="album_name_error_message" aria-invalid="true" class="form-control" id="album_name" maxlength="255" name="album[name]" type="text" value="c"/><span class="help-block with-errors">name not valid</span></div>'
       end
     end
   end
@@ -66,7 +66,7 @@ describe "Forme Bootstrap3 (BS3) forms" do
     end
     
     it "should create an input[:password] tag with a label when ':id => bar' with an error" do
-      @f.input(:password, :label=>"Name", :id=>'bar', :class=>'foo', :error=>'input-password-error').to_s.must_equal '<div class="form-group has-error"><label for="bar">Name</label> <input class="form-control foo" id="bar" type="password"/><span class="help-block with-errors">input-password-error</span></div>'
+      @f.input(:password, :label=>"Name", :id=>'bar', :class=>'foo', :error=>'input-password-error').to_s.must_equal '<div class="form-group has-error"><label for="bar">Name</label> <input aria-describedby="bar_error_message" aria-invalid="true" class="form-control foo" id="bar" type="password"/><span class="help-block with-errors">input-password-error</span></div>'
     end
   end
   
@@ -88,7 +88,7 @@ describe "Forme Bootstrap3 (BS3) forms" do
     end
     
     it "should create an input[:email] tag with a label when ':id => bar' with an error" do
-      @f.input(:email, :label=>"Name", :id=>'bar', :class=>'foo', :error=>'input-email-error').to_s.must_equal '<div class="form-group has-error"><label for="bar">Name</label> <input class="form-control foo" id="bar" type="email"/><span class="help-block with-errors">input-email-error</span></div>'
+      @f.input(:email, :label=>"Name", :id=>'bar', :class=>'foo', :error=>'input-email-error').to_s.must_equal '<div class="form-group has-error"><label for="bar">Name</label> <input aria-describedby="bar_error_message" aria-invalid="true" class="form-control foo" id="bar" type="email"/><span class="help-block with-errors">input-email-error</span></div>'
     end
   end
   
@@ -110,7 +110,7 @@ describe "Forme Bootstrap3 (BS3) forms" do
     end
     
     it "should create an input[:file] tag with a label when ':id => bar' with an error" do
-      @f.input(:file, :label=>"Name", :id=>'bar', :class=>'foo', :error=>'input-file-error').to_s.must_equal '<div class="form-group has-error"><label for="bar">Name</label> <input class="foo" id="bar" type="file"/><span class="help-block with-errors">input-file-error</span></div>'
+      @f.input(:file, :label=>"Name", :id=>'bar', :class=>'foo', :error=>'input-file-error').to_s.must_equal '<div class="form-group has-error"><label for="bar">Name</label> <input aria-describedby="bar_error_message" aria-invalid="true" class="foo" id="bar" type="file"/><span class="help-block with-errors">input-file-error</span></div>'
     end
   end
   
@@ -132,7 +132,7 @@ describe "Forme Bootstrap3 (BS3) forms" do
     end
     
     it "should create an input[:submit] tag without error message " do
-      @f.input(:submit, :value=>'Save', :id=>'foo', :error=>'error-message').to_s.must_equal '<input class="btn btn-default" id="foo" type="submit" value="Save"/>'
+      @f.input(:submit, :value=>'Save', :id=>'foo', :error=>'error-message').to_s.must_equal '<input aria-describedby="foo_error_message" aria-invalid="true" class="btn btn-default" id="foo" type="submit" value="Save"/>'
     end
   end
   
@@ -154,7 +154,7 @@ describe "Forme Bootstrap3 (BS3) forms" do
     end
   
     it "should create an input[:reset] tag without error message " do
-      @f.input(:reset, :value=>'Save', :id=>'foo', :error=>'error-message').to_s.must_equal '<input class="btn btn-default" id="foo" type="reset" value="Save"/>'
+      @f.input(:reset, :value=>'Save', :id=>'foo', :error=>'error-message').to_s.must_equal '<input aria-describedby="foo_error_message" aria-invalid="true" class="btn btn-default" id="foo" type="reset" value="Save"/>'
     end
   end
   
@@ -180,7 +180,7 @@ describe "Forme Bootstrap3 (BS3) forms" do
     end
   
     it "should create a textarea tag with .has-error and error message when ':error => is-a-string'" do
-      @f.input(:textarea, :error=>'input-textarea-error').to_s.must_equal '<div class="form-group has-error"><textarea class="form-control"></textarea><span class="help-block with-errors">input-textarea-error</span></div>'
+      @f.input(:textarea, :error=>'input-textarea-error').to_s.must_equal '<div class="form-group has-error"><textarea aria-invalid="true" class="form-control"></textarea><span class="help-block with-errors">input-textarea-error</span></div>'
     end
     
     describe 'from a Sequel model' do
@@ -190,7 +190,7 @@ describe "Forme Bootstrap3 (BS3) forms" do
       
       it "should correctly handle an input[:text] tag from Sequel model with error" do
         @ac.errors.add(:name, 'name not valid')
-        @c.input(:name, :as=>:textarea).to_s.must_equal '<div class="form-group has-error string"><label for="album_name">Name</label> <textarea class="form-control" id="album_name" maxlength="255" name="album[name]">c</textarea><span class="help-block with-errors">name not valid</span></div>'
+        @c.input(:name, :as=>:textarea).to_s.must_equal '<div class="form-group has-error string"><label for="album_name">Name</label> <textarea aria-describedby="album_name_error_message" aria-invalid="true" class="form-control" id="album_name" maxlength="255" name="album[name]">c</textarea><span class="help-block with-errors">name not valid</span></div>'
       end
     end
   end
@@ -225,7 +225,7 @@ describe "Forme Bootstrap3 (BS3) forms" do
     end
     
     it "should create a select tag with .has-error and error message when ':error => is-a-string'" do
-      @f.input(:select, :error=>'input-select-error').to_s.must_equal '<div class="form-group has-error"><select class="form-control"></select><span class="help-block with-errors">input-select-error</span></div>'
+      @f.input(:select, :error=>'input-select-error').to_s.must_equal '<div class="form-group has-error"><select aria-invalid="true" class="form-control"></select><span class="help-block with-errors">input-select-error</span></div>'
     end
     
     it "should correctly handle a Sequel model output :as => :select" do
@@ -234,7 +234,7 @@ describe "Forme Bootstrap3 (BS3) forms" do
     
     it "should correctly handle a Sequel model output :as => :select with error" do
       @ac.errors.add(:artist, 'error message')
-      @c.input(:artist, :as=>:select).to_s.must_equal '<div class="form-group has-error many_to_one"><label for="album_artist_id">Artist</label> <select class="form-control" id="album_artist_id" name="album[artist_id]"><option value=""></option><option value="1">a</option><option selected="selected" value="2">d</option></select><span class="help-block with-errors">error message</span></div>'
+      @c.input(:artist, :as=>:select).to_s.must_equal '<div class="form-group has-error many_to_one"><label for="album_artist_id">Artist</label> <select aria-describedby="album_artist_id_error_message" aria-invalid="true" class="form-control" id="album_artist_id" name="album[artist_id]"><option value=""></option><option value="1">a</option><option selected="selected" value="2">d</option></select><span class="help-block with-errors">error message</span></div>'
     end
     
     describe 'from a Sequel model' do
@@ -244,7 +244,7 @@ describe "Forme Bootstrap3 (BS3) forms" do
       
       it "should correctly handle a boolean attribute from a Sequel model with an error" do
         @ac.errors.add(:gold, 'error message')
-        @c.input(:gold).to_s.must_equal '<div class="boolean form-group has-error"><label for="album_gold">Gold</label> <select class="form-control" id="album_gold" name="album[gold]"><option value=""></option><option selected="selected" value="t">True</option><option value="f">False</option></select><span class="help-block with-errors">error message</span></div>'
+        @c.input(:gold).to_s.must_equal '<div class="boolean form-group has-error"><label for="album_gold">Gold</label> <select aria-describedby="album_gold_error_message" aria-invalid="true" class="form-control" id="album_gold" name="album[gold]"><option value=""></option><option selected="selected" value="t">True</option><option value="f">False</option></select><span class="help-block with-errors">error message</span></div>'
       end
     end
   end
@@ -267,7 +267,7 @@ describe "Forme Bootstrap3 (BS3) forms" do
     end
     
     it "should create an input[:checkbox] tag with a label when ':id => bar' with an error" do
-      @f.input(:checkbox, :label=>"Gold", :id=>'bar', :class=>'foo', :error=>'input-checkbox-error').to_s.must_equal '<div class="has-error"><div class="checkbox"><label for="bar"><input class="foo" id="bar" type="checkbox"/> Gold</label></div><span class="help-block with-errors">input-checkbox-error</span></div>'
+      @f.input(:checkbox, :label=>"Gold", :id=>'bar', :class=>'foo', :error=>'input-checkbox-error').to_s.must_equal '<div class="has-error"><div class="checkbox"><label for="bar"><input aria-describedby="bar_error_message" aria-invalid="true" class="foo" id="bar" type="checkbox"/> Gold</label></div><span class="help-block with-errors">input-checkbox-error</span></div>'
     end
     
     describe 'from a Sequel model' do
@@ -277,7 +277,7 @@ describe "Forme Bootstrap3 (BS3) forms" do
     
       it "should correctly handle a boolean attribute ':as=>:checkbox' with an error" do
         @ac.errors.add(:gold, 'error message')
-        @c.input(:gold, :as=>:checkbox).to_s.must_equal '<div class="boolean has-error"><div class="checkbox"><label for="album_gold"><input id="album_gold_hidden" name="album[gold]" type="hidden" value="f"/><input checked="checked" id="album_gold" name="album[gold]" type="checkbox" value="t"/> Gold</label></div><span class="help-block with-errors">error message</span></div>'
+        @c.input(:gold, :as=>:checkbox).to_s.must_equal '<div class="boolean has-error"><div class="checkbox"><label for="album_gold"><input id="album_gold_hidden" name="album[gold]" type="hidden" value="f"/><input aria-describedby="album_gold_error_message" aria-invalid="true" checked="checked" id="album_gold" name="album[gold]" type="checkbox" value="t"/> Gold</label></div><span class="help-block with-errors">error message</span></div>'
       end
     end
   end
@@ -301,7 +301,7 @@ describe "Forme Bootstrap3 (BS3) forms" do
     end
     
     it "should create an input[:radio] tag with a label when ':id => bar' with an error" do
-      @f.input(:radio, :label=>"Gold", :id=>'bar', :class=>'foo', :error=>'input-radio-error').to_s.must_equal '<div class="has-error"><div class="radio"><label for="bar"><input class="foo" id="bar" type="radio"/> Gold</label></div><span class="help-block with-errors">input-radio-error</span></div>'
+      @f.input(:radio, :label=>"Gold", :id=>'bar', :class=>'foo', :error=>'input-radio-error').to_s.must_equal '<div class="has-error"><div class="radio"><label for="bar"><input aria-describedby="bar_error_message" aria-invalid="true" class="foo" id="bar" type="radio"/> Gold</label></div><span class="help-block with-errors">input-radio-error</span></div>'
     end
     
     describe 'from a Sequel model' do