simple_form 1.3.1 → 1.4.0

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

@@ -1,3 +1,27 @@
+== 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)

data/Gemfile

@@ -1,13 +1,8 @@
 source "http://rubygems.org"
 
-gem "rails", "~> 3.0.0"
+gem "rails", "~> 3.0.7"
 
 group :test do
-  gem "mocha", :require => false
-
-  if RUBY_VERSION < "1.9"
-    gem "ruby-debug", :require => false
-  else
-    gem "test-unit", :require => false
-  end
+  gem "mocha",      :require => false
+  gem "ruby-debug", :require => false, :platform => :ruby_18
 end

data/Gemfile.lock

@@ -2,40 +2,40 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.3)
-      actionpack (= 3.0.3)
-      mail (~> 2.2.9)
-    actionpack (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+    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.4)
+      i18n (~> 0.5.0)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.6)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
+    activemodel (3.0.7)
+      activesupport (= 3.0.7)
       builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+      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.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-    activesupport (3.0.3)
-    arel (2.0.6)
+    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.12)
+    mail (2.2.18)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -44,22 +44,22 @@ GEM
     mocha (0.9.10)
       rake
     polyglot (0.3.1)
-    rack (1.2.1)
-    rack-mount (0.6.13)
+    rack (1.2.2)
+    rack-mount (0.6.14)
       rack (>= 1.0.0)
-    rack-test (0.5.6)
+    rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.3)
-      actionmailer (= 3.0.3)
-      actionpack (= 3.0.3)
-      activerecord (= 3.0.3)
-      activeresource (= 3.0.3)
-      activesupport (= 3.0.3)
+    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.3)
-    railties (3.0.3)
-      actionpack (= 3.0.3)
-      activesupport (= 3.0.3)
+      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)
@@ -71,12 +71,12 @@ GEM
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.23)
+    tzinfo (0.3.27)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   mocha
-  rails (~> 3.0.0)
+  rails (~> 3.0.7)
   ruby-debug

data/MIT-LICENSE

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

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,35 +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".
 
-== Configuration
+== HTML 5 Notice
 
-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:
+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.
 
-  rails generate simple_form:install
+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.
 
-== Custom form builder
+It is possible to disable all HTML 5 extensions in SimpleForm with the following configuration:
 
-You can create a custom form builder that uses SimpleForm.
+  SimpleForm.html5 = false # default is true
 
-Create a helper method that calls simple_form_for with a custom builder:
+If you want to have all other HTML 5 features, such as the new field types, you can disable only the browser validation:
 
-  def custom_form_for(object, *args, &block)
-    simple_form_for(object, *(args << { :builder => CustomFormBuilder }), &block)
-  end
+  SimpleForm.browser_validations = false # default is true
 
-Create a form builder class that inherits from SimpleForm::FormBuilder.
+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.
 
-  class CustomFormBuilder < SimpleForm::FormBuilder
-    def input(attribute_name, *args, &block)
-      super(attribute_name, *(args << { :input_html => { :class => 'custom' } }), &block)
-    end
-  end
+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
 
 == 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/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.rb

@@ -61,7 +61,7 @@ module SimpleForm
 
   # You can wrap each item in a collection of radio/check boxes with a tag, defaulting to none.
   mattr_accessor :item_wrapper_tag
-  @@item_wrapper_tag = nil
+  @@item_wrapper_tag = :span
 
   # You can wrap all inputs in a pre-defined tag. Default is a div.
   mattr_accessor :wrapper_tag
@@ -79,10 +79,29 @@ module SimpleForm
   mattr_accessor :label_text
   @@label_text = lambda { |label, required| "#{required} #{label}" }
 
+  # You can define the class to use on all labels. Default is nil.
+  mattr_accessor :label_class
+  @@label_class = nil
+
+  # You can define the class to use on all forms. Default is simple_form.
+  mattr_accessor :form_class
+  @@form_class = :simple_form
+
   # Whether attributes are required by default (or not).
   mattr_accessor :required_by_default
   @@required_by_default = true
 
+  # Tell browsers whether to use default HTML5 validations (novalidate option).
+  mattr_accessor :browser_validations
+  @@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.
+  mattr_accessor :html5
+  @@html5 = true
+
   # Collection of methods to detect if a file type was given.
   mattr_accessor :file_methods
   @@file_methods = [ :mounted_as, :file?, :public_filename ]
@@ -110,6 +129,14 @@ module SimpleForm
   mattr_accessor :translate
   @@translate = true
 
+  # Automatically discover new inputs in Rails' autoload path.
+  mattr_accessor :inputs_discovery
+  @@inputs_discovery = true
+
+  # Cache simple form inputs discovery
+  mattr_accessor :cache_discovery
+  @@cache_discovery = !Rails.env.development?
+
   # Default way to setup SimpleForm. Run rails generate simple_form:install
   # to create a fresh initializer with all configuration values.
   def self.setup