simple_form 1.3.0 → 1.4.0

data/.gitignore

@@ -0,0 +1,2 @@
+.bundle/
+pkg/

data/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "test/support/country_select"]
+	path = test/support/country_select
+	url = git://github.com/rails/country_select

data/.travis.yml

@@ -0,0 +1,6 @@
+script: "git submodule update --init && rake test"
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - ree
+  - jruby

data/CHANGELOG.rdoc

@@ -0,0 +1,109 @@
+== 1.4.0
+
+* enhancements
+  * Add label class configuration option (by github.com/reu)
+  * Improve i18n lookup (labels/hints/placeholders) for nested models
+  * Use the given custom builder with simple_fields_for (by github.com/giniedp)
+  * Add slim form generator (by github.com/fagiani)
+  * Add form_class configuration option (by github.com/fagiani)
+  * Default step of "any" for number input with non integer attributes (by github.com/fedesoria)
+  * Add option to disable HTML5 browser validations on all forms (by github.com/coryschires)
+  * Add option to disable all HTML5 extensions (by github.com/wolframarnold)
+  * Add input_field helper to form builder (by github.com/jeroenhouben)
+  * Allow inputs to be discovered on demand by placing them at app/inputs (a la formtastic)
+  * Add full_error on that shows the error with the attribute name
+
+* bug fix
+  * Fix for file attributes automatic detection, to work with virtual attributes
+  * Fix for numeric fields validation options using symbols and procs
+  * Fix password attributes to add size and maxlength options the same way as string (by github.com/fedesoria)
+  * Fix bug with custom form builders and new mappings being added to the superclass builder (by github.com/rdvdijk)
+  * Fix HTML validation issue with collection_check_boxes
+
+== 1.3.1
+
+* enhancements
+  * Add :autofocus HTML5 attribute support (by github.com/jpzwarte)
+  * Add possibility to specify custom builder and inherit mappings (by github.com/rejeep)
+  * Make custom mappings work with all attributes types (by github.com/rafaelfranca)
+  * Add support for procs/lambdas in text/value methods for collection_select
+
+* deprecation
+  * removed the deprecated :remote_form_for
+
+* bug fix
+  * Only add the "required" HTML 5 attribute for valid inputs, disable in selects (not allowed)
+  * Fix error when using hints without an attribute (by github.com/butsjoh and github.com/rafaelfranca)
+  * Fix messy html output for hint, error and label components (by github.com/butsjoh and github.com/rafaelfranca)
+  * Allow direct setting of for attribute on label (by github.com/Bertg)
+
+== 1.3.0
+
+* enhancements
+  * Allow collection input to accept a collection of symbols
+  * Add default css class to button
+  * Allow forms for objects that don't respond to the "errors" method
+  * collection_check_boxes and collection_radio now wrap the input in the label
+  * Automatic add min/max values for numeric attributes based on validations and step for integers - HTML5 (by github.com/dasch)
+  * Add :placeholder option for string inputs, allowing customization through I18n - HTML5 (by github.com/jonathan)
+  * Add :search and :tel input types, with :tel mapping automatically from attributes matching "phone" - HTML5
+  * Add :required html attribute for required inputs - HTML5
+  * Add optional :components option to input to control component rendering (by github.com/khoan)
+  * Add SimpleForm.translate as an easy way to turn off SimpleForm internal translations
+  * Add :disabled option for all inputs (by github.com/fabiob)
+  * Add collection wrapper tag and item wrapper tag to wrap elements in collection helpers - radio / check boxes
+  * Add SimpleForm.input_mappings to allow configuring custom mappings for inputs (by github.com/TMaYaD)
+
+* bug fix
+  * Search for validations on both association and attribute
+  * Use controller.action_name to lookup action only when available, to fix issue with Rspec views tests (by github.com/rafaelfranca)
+
+== 1.2.2
+
+* enhancements
+  * Compatibility with Rails 3 RC
+
+== 1.2.1
+
+* enhancements
+  * Added haml generator support (by github.com/grimen)
+  * Added error_notification message to form builder
+  * Added required by default as configuration option
+  * Added label_input as component, allowing boolean to change its order (input appearing first than label)
+  * Added error_method to tidy up how errors are exhibited
+  * Added error class on wrappers (by github.com/jduff)
+  * Changed numeric types to have type=number for HTML5
+
+== 1.2.0
+
+* deprecation
+  * Changed simple_form_install generator to simple_form:install
+
+* enhancements
+  * Added support to presence validation to check if attribute is required or not (by github.com/gcirne)
+  * Added .input as class to wrapper tag
+  * Added config options for hint and error tags (by github.com/tjogin)
+
+== 1.1.3
+
+* deprecation
+  * removed :conditions, :order, :joins and :include support in f.association
+
+== 1.1.2
+
+* bug fix
+  * Ensure type is set to "text" and not "string"
+
+== 1.1.1
+
+* bug fix
+  * Fix some escaping issues
+
+== 1.1.0
+
+* enhancements
+  * Rails 3 support with generators, templates and HTML 5
+
+== 1.0
+
+* First release

data/Gemfile

@@ -0,0 +1,8 @@
+source "http://rubygems.org"
+
+gem "rails", "~> 3.0.7"
+
+group :test do
+  gem "mocha",      :require => false
+  gem "ruby-debug", :require => false, :platform => :ruby_18
+end

data/Gemfile.lock

@@ -0,0 +1,82 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.7)
+      actionpack (= 3.0.7)
+      mail (~> 2.2.15)
+    actionpack (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.5.0)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.7)
+      activesupport (= 3.0.7)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+    activesupport (3.0.7)
+    arel (2.0.9)
+    builder (2.1.2)
+    columnize (0.3.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    i18n (0.5.0)
+    linecache (0.43)
+    mail (2.2.18)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    mocha (0.9.10)
+      rake
+    polyglot (0.3.1)
+    rack (1.2.2)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.7)
+      actionmailer (= 3.0.7)
+      actionpack (= 3.0.7)
+      activerecord (= 3.0.7)
+      activeresource (= 3.0.7)
+      activesupport (= 3.0.7)
+      bundler (~> 1.0)
+      railties (= 3.0.7)
+    railties (3.0.7)
+      actionpack (= 3.0.7)
+      activesupport (= 3.0.7)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
+    rake (0.8.7)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
+    thor (0.14.6)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.27)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  mocha
+  rails (~> 3.0.7)
+  ruby-debug

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2011 PlataformaTec http://blog.plataformatec.com.br/
+
+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.

data/README.rdoc

@@ -127,17 +127,18 @@ SimpleForm accepts same options as their corresponding input type helper in Rail
     <%= f.button :submit %>
   <% end %>
 
-SimpleForm also allows you using label, hint and error helpers it provides:
+SimpleForm also allows you to use label, hint, input_field, error and full_error helpers it provides (please take a look at the rdocs for each method for more info):
 
   <%= simple_form_for @user do |f| %>
     <%= f.label :username %>
-    <%= f.text_field :username %>
-    <%= f.error :username, :id => 'user_name_error' %>
+    <%= f.input_field :username %>
     <%= f.hint 'No special characters, please!' %>
+    <%= f.error :username, :id => 'user_name_error' %>
+    <%= f.full_error :token %>
     <%= f.submit 'Save' %>
   <% end %>
 
-Any extra option passed to label, hint or error will be rendered as html option.
+Any extra option passed to these methods will be rendered as html option.
 
 === Collections
 
@@ -157,7 +158,7 @@ Collection inputs accepts two other options beside collections:
 
 * value_method => the value method to be applied to the collection to retrieve the value
 
-Those methods are useful to manipulate the given collection. Both of these options also except lambda/procs incase you want to calculate the value or label in a special way eg. custom translation. All other options given are sent straight to the underlying helper. For example, you can give prompt as:
+Those methods are useful to manipulate the given collection. Both of these options also except lambda/procs in case you want to calculate the value or label in a special way eg. custom translation. All other options given are sent straight to the underlying helper. For example, you can give prompt as:
 
   f.input :age, :collection => 18..60, :prompt => "Select your age"
 
@@ -302,6 +303,50 @@ SimpleForm comes with a lot of default mappings:
   country               country select          string with name matching "country"
   time_zone             time zone select        string with name matching "time_zone"
 
+== Custom inputs
+
+It is very easy to add custom inputs to SimpleForm. For instance, if you want to add a custom input that extends the string one, you just need to add this file:
+
+    # app/inputs/currency_input.rb
+    class CurrencyInput < SimpleForm::Inputs::StringInput
+      def input
+        "$ #{super}".html_safe
+      end
+    end
+
+And use it in your views:
+
+    f.input :money, :as => :currency
+
+You can also redefine existing SimpleForm inputs by creating a new class with the same name. For instance, if you want to wrap date/time/datetime in a div, you can do:
+
+    # app/inputs/date_time_input.rb
+    class DateTimeInput < SimpleForm::Inputs::DateTimeInput
+      def input
+        "<div>#{super}</div>".html_safe
+      end
+    end
+
+== Custom form builder
+
+You can create a custom form builder that uses SimpleForm.
+
+Create a helper method that calls simple_form_for with a custom builder:
+
+  def custom_form_for(object, *args, &block)
+    options = args.extract_options!
+    simple_form_for(object, *(args << options.merge(:builder => CustomFormBuilder)), &block)
+  end
+
+Create a form builder class that inherits from SimpleForm::FormBuilder.
+
+  class CustomFormBuilder < SimpleForm::FormBuilder
+    def input(attribute_name, options = {}, &block)
+      options[:input_html].merge! :class => 'custom'
+      super
+    end
+  end
+
 == I18n
 
 SimpleForm uses all power of I18n API to lookup labels, hints and placeholders. To customize your forms you can create a locale file like this:
@@ -364,21 +409,37 @@ It's also possible to translate buttons, using Rails' built-in I18n support:
 
 There are other options that can be configured through I18n API, such as required text and boolean. Be sure to check our locale file or the one copied to your application after you run "rails generate simple_form:install".
 
+== HTML 5 Notice
+
+By default, SimpleForm will generate input field types and attributes that are supported in HTML5, but are considered invalid HTML for older document types such as HTML4 or XHTML1.0. The HTML5 extensions include the new field types such as email, number, search, url, tel, and the new attributes such as required, autofocus, maxlength, min, max, step.
+
+Most browsers will not care, but some of the newer ones - in particular Chrome 10+ - use the required attribute to force a value into an input and will prevent form submission without it. Depending on the design of the application this may or may not be desired. In many cases it can break existing UI's.
+
+It is possible to disable all HTML 5 extensions in SimpleForm with the following configuration:
+
+  SimpleForm.html5 = false # default is true
+
+If you want to have all other HTML 5 features, such as the new field types, you can disable only the browser validation:
+
+  SimpleForm.browser_validations = false # default is true
+
+This option adds a new `novalidate` property to the form, instructing it to skip all HTML 5 validation. The inputs will still be generated with the required and other attributes, that might help you to use some generic javascript validation.
+
+Please notice that any of the configurations above will disable the `placeholder` component, which is an HTML 5 feature. We believe most of the newest browsers are handling this attribute fine, and if they aren't, any plugin you use would take of using the placeholder attribute to do it. However, you can disable it if you want, by removing the placeholder component from the components list in SimpleForm configuration file.
+
 == Configuration
 
 SimpleForm has several configuration values. You can read and change them in the initializer created by SimpleForm, so if you haven't executed the command below yet, please do:
 
   rails generate simple_form:install
 
-== TODO
-
-Please refer to TODO file.
-
 == Maintainers
 
-* José Valim (http://github.com/josevalim)
-* Carlos Antonio da Silva (http://github.com/carlosantoniodasilva)
+* José Valim (https://github.com/josevalim)
+* Carlos Antonio da Silva (https://github.com/carlosantoniodasilva)
+* Rafael Mendonça França (https://github.com/rafaelfranca)
 
 == License
 
-MIT License. Copyright 2010 Plataforma Tecnologia. http://blog.plataformatec.com.br
+MIT License. Copyright 2011 Plataforma Tecnologia. http://blog.plataformatec.com.br
+

data/Rakefile

@@ -0,0 +1,27 @@
+# encoding: UTF-8
+
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+desc 'Default: run unit tests.'
+task :default => :test
+
+desc 'Test the simple_form plugin.'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+end
+
+desc 'Generate documentation for the simple_form plugin.'
+Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'SimpleForm'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/lib/generators/simple_form/templates/_form.html.erb

@@ -1,4 +1,4 @@
-<%%= simple_form_for(@<%= singular_name %>) do |f| %>
+<%%= simple_form_for(@<%= singular_table_name %>) do |f| %>
   <%%= f.error_notification %>
 
   <div class="inputs">

data/lib/generators/simple_form/templates/_form.html.haml

@@ -1,13 +1,5 @@
-= simple_form_for(@<%= singular_name %>) do |f|
-  - if @<%= singular_name %>.errors.any?
-    #error_explanation
-      %h2
-        = pluralize(@<%= singular_name %>.errors.count, "error")
-        prohibited this <%= singular_name %> from being saved:
-
-      %ul
-      - @<%= singular_name %>.errors.full_messages.each do |msg|
-        %li= msg
+= simple_form_for(@<%= singular_table_name %>) do |f|
+  = f.error_notification
 
   .inputs
   <%- attributes.each do |attribute| -%>

data/lib/generators/simple_form/templates/_form.html.slim

@@ -0,0 +1,10 @@
+= simple_form_for(@<%= singular_table_name %>) do |f|
+  = f.error_notification
+
+  .inputs
+  | <%- attributes.each do |attribute| -%>
+    = f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %>
+  | <%- end -%>
+
+  .actions
+    = f.button :submit

data/lib/generators/simple_form/templates/simple_form.rb

@@ -10,7 +10,7 @@ SimpleForm.setup do |config|
   # CSS class to add to all hint tags.
   # config.hint_class = :hint
 
-  # Default tag used on errors.
+  # CSS class used on errors.
   # config.error_class = :error
 
   # Default tag used on errors.
@@ -40,8 +40,8 @@ SimpleForm.setup do |config|
   # You can wrap a collection of radio/check boxes in a pre-defined tag, defaulting to none.
   # config.collection_wrapper_tag = nil
 
-  # You can wrap each item in a collection of radio/check boxes with a tag, defaulting to none.
-  # config.item_wrapper_tag = nil
+  # You can wrap each item in a collection of radio/check boxes with a tag, defaulting to span.
+  # config.item_wrapper_tag = :span
 
   # Series of attemps to detect a default label method for collection.
   # config.collection_label_methods = [ :to_label, :name, :title, :to_s ]
@@ -52,16 +52,32 @@ SimpleForm.setup do |config|
   # How the label text should be generated altogether with the required text.
   # config.label_text = lambda { |label, required| "#{required} #{label}" }
 
+  # You can define the class to use on all labels. Default is nil.
+  # config.label_class = nil
+
+  # You can define the class to use on all forms. Default is simple_form.
+  # config.form_class = :simple_form
+
   # Whether attributes are required by default (or not). Default is true.
   # config.required_by_default = true
 
+  # Tell browsers whether to use default HTML5 validations (novalidate option).
+  # Default is enabled.
+  # config.browser_validations = true
+
+  # Determines whether HTML5 types (:email, :url, :search, :tel) and attributes
+  # (e.g. required) are used or not. True by default.
+  # Having this on in non-HTML5 compliant sites can cause odd behavior in
+  # HTML5-aware browsers such as Chrome.
+  # config.html5 = true
+
   # Custom mappings for input types. This should be a hash containing a regexp
   # to match as key, and the input type that will be used when the field name
   # matches the regexp as value.
   # config.input_mappings = { /count/ => :integer }
 
   # Collection of methods to detect if a file type was given.
-  # config.file_methods = [ :file?, :public_filename ]
+  # config.file_methods = [ :mounted_as, :file?, :public_filename ]
 
   # Default priority for time_zone inputs.
   # config.time_zone_priority = nil

data/lib/simple_form/action_view_extensions/builder.rb

@@ -7,7 +7,9 @@ module SimpleForm
       # Create a collection of radio inputs for the attribute. Basically this
       # helper will create a radio input associated with a label for each
       # text/value option in the collection, using value_method and text_method
-      # to convert these text/value. Based on collection_select.
+      # to convert these text/value. You can give a symbol or a proc to both
+      # value_method and text_method, that will be evaluated for each item in
+      # the collection.
       #
       # == Examples
       #
@@ -37,14 +39,16 @@ module SimpleForm
         render_collection(
           attribute, collection, value_method, text_method, options, html_options
         ) do |value, text, default_html_options|
-          radio = radio_button(attribute, value, default_html_options)
-          collection_label(attribute, value, radio, text, :class => "collection_radio")
+          radio_button(attribute, value, default_html_options) +
+            label(sanitize_attribute_name(attribute, value), text, :class => "collection_radio")
         end
       end
 
-      # Creates a collection of check boxes for each item in the collection, associated
-      # with a clickable label. Use value_method and text_method to convert items in
-      # the collection for use as text/value in check boxes.
+      # Creates a collection of check boxes for each item in the collection,
+      # associated with a clickable label. Use value_method and text_method to
+      # convert items in the collection for use as text/value in check boxes.
+      # You can give a symbol or a proc to both value_method and text_method,
+      # that will be evaluated for each item in the collection.
       #
       # == Examples
       #
@@ -79,8 +83,8 @@ module SimpleForm
         ) do |value, text, default_html_options|
           default_html_options[:multiple] = true
 
-          check_box = check_box(attribute, default_html_options, value, '')
-          collection_label(attribute, value, check_box, text, :class => "collection_check_boxes")
+          check_box(attribute, default_html_options, value, '') +
+            label(sanitize_attribute_name(attribute, value), text, :class => "collection_check_boxes")
         end
       end
 
@@ -95,17 +99,16 @@ module SimpleForm
       #   end
       def simple_fields_for(*args, &block)
         options = args.extract_options!
-        options[:builder] = SimpleForm::FormBuilder
+        if self.class < ActionView::Helpers::FormBuilder
+          options[:builder] ||= self.class
+        else
+          options[:builder] ||= SimpleForm::FormBuilder
+        end
         fields_for(*(args << options), &block)
       end
 
     private
 
-      # Wraps the given component in a label, for better accessibility with collections.
-      def collection_label(attribute, value, component_tag, label_text, html_options) #:nodoc:
-        label(sanitize_attribute_name(attribute, value), component_tag << label_text.to_s, html_options)
-      end
-
       # Generate default options for collection helpers, such as :checked and
       # :disabled.
       def default_html_options_for_collection(item, value, options, html_options) #:nodoc:
@@ -154,4 +157,25 @@ module SimpleForm
   end
 end
 
-ActionView::Helpers::FormBuilder.send :include, SimpleForm::ActionViewExtensions::Builder
+class ActionView::Helpers::FormBuilder
+  include SimpleForm::ActionViewExtensions::Builder
+
+  # Override default Rails collection_select helper to handle lambdas/procs in
+  # text and value methods, so it works the same way as collection_radio and
+  # collection_check_boxes in SimpleForm. If none of text/value methods is a
+  # callable object, then it just delegates back to original collection select.
+  #
+  alias :original_collection_select :collection_select
+  def collection_select(attribute, collection, value_method, text_method, options={}, html_options={})
+    if value_method.respond_to?(:call) || text_method.respond_to?(:call)
+      collection = collection.map do |item|
+        value = value_for_collection(item, value_method)
+        text  = value_for_collection(item, text_method)
+        [value, text]
+      end
+      value_method, text_method = :first, :last
+    end
+
+    original_collection_select(attribute, collection, value_method, text_method, options, html_options)
+  end
+end

data/lib/simple_form/action_view_extensions/form_helper.rb

@@ -1,7 +1,6 @@
 module SimpleForm
   module ActionViewExtensions
-    # This modules create simple form wrappers around default form_for,
-    # fields_for and remote_form_for.
+    # This module creates simple form wrappers around default form_for and fields_for.
     #
     # Example:
     #
@@ -30,18 +29,19 @@ module SimpleForm
         result
       end
 
-      [:form_for, :fields_for, :remote_form_for].each do |helper|
+      [:form_for, :fields_for].each do |helper|
         class_eval <<-METHOD, __FILE__, __LINE__
           def simple_#{helper}(record_or_name_or_array, *args, &block)
             options = args.extract_options!
-            options[:builder] = SimpleForm::FormBuilder
+            options[:builder] ||= SimpleForm::FormBuilder
             css_class = case record_or_name_or_array
               when String, Symbol then record_or_name_or_array.to_s
               when Array then dom_class(record_or_name_or_array.last)
               else dom_class(record_or_name_or_array)
             end
             options[:html] ||= {}
-            options[:html][:class] = "simple_form \#{css_class} \#{options[:html][:class]}".strip
+            options[:html][:novalidate] = !SimpleForm.browser_validations
+            options[:html][:class] = "\#{SimpleForm.form_class} \#{css_class} \#{options[:html][:class]}".strip
 
             with_custom_field_error_proc do
               #{helper}(record_or_name_or_array, *(args << options), &block)

data/lib/simple_form/components/errors.rb

@@ -12,7 +12,11 @@ module SimpleForm
       end
 
       def error_text
-        errors.send(error_method)
+        if options[:error_prefix]
+          options[:error_prefix] + " " + errors.send(error_method)
+        else
+          errors.send(error_method)
+        end
       end
 
       def error_method

data/lib/simple_form/components/labels.rb

@@ -36,8 +36,8 @@ module SimpleForm
       end
 
       def label_html_options
-        label_options = html_options_for(:label, [input_type, required_class])
-        label_options[:for] = options[:input_html][:id] if options.key?(:input_html)
+        label_options = html_options_for(:label, [input_type, required_class, SimpleForm.label_class])
+        label_options[:for] = options[:input_html][:id] if options.key?(:input_html) && options[:input_html].key?(:id)
         label_options
       end