simple_form 3.0.0.beta1 → 3.0.0.rc

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: eebdc48d53472ed80e668fd6c2fa30ebf30695a1
+  data.tar.gz: 368a258b70c60fcb73ed568a21f357b39c1fa93f
+SHA512:
+  metadata.gz: fd1c37c0fffa1d3f3b5a06d19790f37a6aec133ab9d98d792c0c60ba40ea64628085ef8f26ab8f44a50bb17af3b0ee3e8dfdcd6d2997dfea021bc41240c300ed
+  data.tar.gz: ee7024a3684a698d0267fd2469723bfca7775270f064b0e11680cc85891c8d6d235189bd608d636fc551c7d3726b3d8167577ebc49869bc8c6969254c7ee5d00

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## master
+
+### enhancements
+  * Make `field_error_proc` configurable [@dfens](https://github.com/dfens)
+
+### bug fix
+  * Remove deprecation warnings related to `Relation#all` from Rails 4.
+  * Form builder can be used outside the context of a controller [@jasonwebster](https://github.com/jasonwebster)
+  * Skip pattern attribute when using `validates_format_of` with `:without` option [@glebm](https://github.com/glebm)
+
 ## 3.0.0.beta1
 
 ### enhancements
@@ -5,5 +15,6 @@
   * Removed deprecated methods.
   * SimpleForm no longer sets the `size` attribute automatically and the `default_input_size` setting
   is now deprecated.
+  * Support to aria-required attribute to required fields [@ckundo](https://github.com/ckundo)
 
 Please check [v2.1](https://github.com/plataformatec/simple_form/blob/v2.1/CHANGELOG.md) for previous changes.

data/README.md

@@ -1,5 +1,12 @@
-# SimpleForm - Rails forms made easy.
-[![Build Status](https://secure.travis-ci.org/plataformatec/simple_form.png?branch=master)](http://travis-ci.org/plataformatec/simple_form)
+![Simple Form Logo](https://raw.github.com/plataformatec/simple_form/master/simple_form.png)
+
+By [Plataformatec](http://plataformatec.com.br/).
+
+[![Gem Version](https://fury-badge.herokuapp.com/rb/simple_form.png)](http://badge.fury.io/rb/simple_form)
+[![Build Status](https://api.travis-ci.org/plataformatec/simple_form.png?branch=master)](http://travis-ci.org/plataformatec/simple_form)
+[![Code Climate](https://codeclimate.com/github/plataformatec/simple_form.png)](https://codeclimate.com/github/plataformatec/simple_form)
+
+Rails forms made easy.
 
 **SimpleForm** aims to be as flexible as possible while helping you with powerful components to create
 your forms. The basic goal of SimpleForm is to not touch your way of defining the layout, letting
@@ -7,10 +14,7 @@ you find the better design for your eyes. Most of the DSL was inherited from For
 which we are thankful for and should make you feel right at home.
 
 INFO: This README is [also available in a friendly navigable format](http://simple-form.plataformatec.com.br/)
-and refers to **SimpleForm** 2.0. If you are using **SimpleForm** in the versions 1.x, you should
-check this branch:
-
-https://github.com/plataformatec/simple_form/tree/v1.5
+and refers to **SimpleForm** 3.0. For older releases, check the related branch for your version.
 
 ## Installation
 
@@ -41,7 +45,7 @@ gem 'country_select'
 
 ### Twitter Bootstrap
 
-**SimpleForm** 2.0 can be easily integrated to the [Twitter Bootstrap](http://twitter.github.com/bootstrap).
+**SimpleForm** can be easily integrated to the [Twitter Bootstrap](http://twitter.github.com/bootstrap).
 To do that you have to use the `bootstrap` option in the install generator, like this:
 
 ```console
@@ -67,7 +71,7 @@ rails generate simple_form:install --foundation
 
 Please note that the Foundation wrapper does not support the `:hint` option by default. In order to enable hints, please uncomment the appropriate line in `config/initializers/simple_form_foundation.rb`. You will need to provide your own CSS styles for hints.
 
-Please see the [instructions on how to install Foundation in a Rails app](http://foundation.zurb.com/docs/rails.php).
+Please see the [instructions on how to install Foundation in a Rails app](http://foundation.zurb.com/old-docs/f3/rails.php).
 
 ## Usage
 
@@ -809,7 +813,7 @@ end
 
 **SimpleForm** also allows you to use optional elements. For instance, let's suppose you want to use
 hints or placeholders, but you don't want them to be generated automatically. You can set their
-default values to `false` or use the `optional` method. Is preferible to use the `optional` syntax:
+default values to `false` or use the `optional` method. Is preferable to use the `optional` syntax:
 
 ```ruby
 config.wrappers placeholder: false do |b|
@@ -823,7 +827,7 @@ end
 ```
 
 By setting it as `optional`, a hint will only be generated when `hint: true` is explicitly used.
-The same for placehold.
+The same for placeholder.
 
 ## HTML 5 Notice
 
@@ -902,3 +906,5 @@ https://github.com/plataformatec/simple_form/issues
 ## License
 
 MIT License. Copyright 2009-2013 Plataformatec. http://plataformatec.com.br
+
+You are not granted rights or licenses to the trademarks of the Plataformatec, including without limitation the Simple Form name or logo.

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

@@ -106,8 +106,11 @@ SimpleForm.setup do |config|
   # 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.
+  # Tell browsers whether to use the native HTML5 validations (novalidate form option).
+  # These validations are enabled in SimpleForm's internal config but disabled by default
+  # in this configuration, which is recommended due to some quirks from different browsers.
+  # To stop SimpleForm from generating the novalidate option, enabling the HTML5 validations,
+  # change this configuration to true.
   config.browser_validations = false
 
   # Collection of methods to detect if a file type was given.

data/lib/simple_form.rb

@@ -139,6 +139,14 @@ module SimpleForm
   mattr_accessor :button_class
   @@button_class = 'button'
 
+  # Override the default ActiveModelHelper behaviour of wrapping the input.
+  # This gets taken care of semantically by adding an error class to the wrapper tag
+  # containing the input.
+  mattr_accessor :field_error_proc
+  @@field_error_proc = proc do |html_tag, instance_tag|
+    html_tag
+  end
+
   ## WRAPPER CONFIGURATION
   # The default wrapper to be used by the FormBuilder.
   mattr_accessor :default_wrapper

data/lib/simple_form/action_view_extensions/builder.rb

@@ -23,7 +23,7 @@ module SimpleForm
         else
           options[:builder] ||= SimpleForm::FormBuilder
         end
-        fields_for(*(args << options), &block)
+        fields_for(*args, options, &block)
       end
     end
   end

data/lib/simple_form/action_view_extensions/form_helper.rb

@@ -9,13 +9,6 @@ module SimpleForm
     #   end
     #
     module FormHelper
-      # Override the default ActiveRecordHelper behaviour of wrapping the input.
-      # This gets taken care of semantically by adding an error class to the wrapper tag
-      # containing the input.
-      #
-      FIELD_ERROR_PROC = proc do |html_tag, instance_tag|
-        html_tag
-      end
 
       def simple_form_for(record, options={}, &block)
         options[:builder] ||= SimpleForm::FormBuilder
@@ -44,7 +37,7 @@ module SimpleForm
       def with_simple_form_field_error_proc
         default_field_error_proc = ::ActionView::Base.field_error_proc
         begin
-          ::ActionView::Base.field_error_proc = FIELD_ERROR_PROC
+          ::ActionView::Base.field_error_proc = SimpleForm.field_error_proc
           yield
         ensure
           ::ActionView::Base.field_error_proc = default_field_error_proc

data/lib/simple_form/components/html5.rb

@@ -7,7 +7,10 @@ module SimpleForm
 
       def html5
         @html5 = true
-        input_html_options[:required] = true if has_required?
+        if has_required?
+          input_html_options[:required] = true
+          input_html_options[:'aria-required'] = true
+        end
         nil
       end
 

data/lib/simple_form/components/pattern.rb

@@ -13,8 +13,8 @@ module SimpleForm
         pattern = options[:pattern]
         if pattern.is_a?(String)
           pattern
-        elsif pattern_validator = find_pattern_validator
-          evaluate_format_validator_option(pattern_validator.options[:with]).source
+        elsif (pattern_validator = find_pattern_validator) && (with = pattern_validator.options[:with])
+          evaluate_format_validator_option(with).source
         end
       end
 

data/lib/simple_form/form_builder.rb

@@ -180,7 +180,7 @@ module SimpleForm
 
       options[:as] ||= :select
       options[:collection] ||= options.fetch(:collection) {
-        reflection.klass.all(reflection.options.slice(:conditions, :order))
+        reflection.klass.where(reflection.options[:conditions]).order(reflection.options[:order]).to_a
       }
 
       attribute = case reflection.macro
@@ -443,7 +443,7 @@ module SimpleForm
     # route[blocks_attributes][0][blocks_learning_object_attributes][1][foo_attributes]
     # ["route", "blocks", "blocks_learning_object", "foo"]
     #
-    def lookup_model_names
+    def lookup_model_names #:nodoc:
       @lookup_model_names ||= begin
         child_index = options[:child_index]
         names = object_name.to_s.scan(/([a-zA-Z_]+)/).flatten
@@ -454,9 +454,9 @@ module SimpleForm
     end
 
     # The action to be used in lookup.
-    def lookup_action
+    def lookup_action #:nodoc:
       @lookup_action ||= begin
-        action = template.controller.action_name
+        action = template.controller && template.controller.action_name
         return unless action
         action = action.to_sym
         ACTIONS[action] || action

data/lib/simple_form/version.rb

@@ -1,3 +1,3 @@
 module SimpleForm
-  VERSION = "3.0.0.beta1".freeze
+  VERSION = "3.0.0.rc".freeze
 end

data/test/action_view_extensions/builder_test.rb

@@ -299,7 +299,7 @@ class BuilderTest < ActionView::TestCase
   test "collection check box checks the correct value to local variables" do
     user = User.new
     user.tag_ids = [1, 3]
-    collection = (1..3).map{|i| [i, "Tag #{i}"] }
+    collection = (1..3).map { |i| [i, "Tag #{i}"] }
     with_collection_check_boxes user, :tag_ids, collection, :first, :last
 
     assert_select 'form input[type=checkbox][value=1][checked=checked]'
@@ -308,7 +308,7 @@ class BuilderTest < ActionView::TestCase
   end
 
   test "collection check box accepts selected values as :checked option" do
-    collection = (1..3).map{|i| [i, "Tag #{i}"] }
+    collection = (1..3).map { |i| [i, "Tag #{i}"] }
     with_collection_check_boxes @user, :tag_ids, collection, :first, :last, checked: [1, 3]
 
     assert_select 'form input[type=checkbox][value=1][checked=checked]'
@@ -317,7 +317,7 @@ class BuilderTest < ActionView::TestCase
   end
 
   test "collection check boxes accepts selected string values as :checked option" do
-    collection = (1..3).map{|i| [i, "Category #{i}"] }
+    collection = (1..3).map { |i| [i, "Category #{i}"] }
     with_collection_check_boxes :user, :category_ids, collection, :first, :last, checked: ['1', '3']
 
     assert_select 'input[type=checkbox][value=1][checked=checked]'
@@ -326,7 +326,7 @@ class BuilderTest < ActionView::TestCase
   end
 
   test "collection check box accepts a single checked value" do
-    collection = (1..3).map{|i| [i, "Tag #{i}"] }
+    collection = (1..3).map { |i| [i, "Tag #{i}"] }
     with_collection_check_boxes @user, :tag_ids, collection, :first, :last, checked: 3
 
     assert_select 'form input[type=checkbox][value=3][checked=checked]'
@@ -335,7 +335,7 @@ class BuilderTest < ActionView::TestCase
   end
 
   test "collection check box accepts selected values as :checked option and override the model values" do
-    collection = (1..3).map{|i| [i, "Tag #{i}"] }
+    collection = (1..3).map { |i| [i, "Tag #{i}"] }
     @user.tag_ids = [2]
     with_collection_check_boxes @user, :tag_ids, collection, :first, :last, checked: [1, 3]
 
@@ -345,7 +345,7 @@ class BuilderTest < ActionView::TestCase
   end
 
   test "collection check box accepts multiple disabled items" do
-    collection = (1..3).map{|i| [i, "Tag #{i}"] }
+    collection = (1..3).map { |i| [i, "Tag #{i}"] }
     with_collection_check_boxes @user, :tag_ids, collection, :first, :last, disabled: [1, 3]
 
     assert_select 'form input[type=checkbox][value=1][disabled=disabled]'
@@ -354,7 +354,7 @@ class BuilderTest < ActionView::TestCase
   end
 
   test "collection check box accepts single disable item" do
-    collection = (1..3).map{|i| [i, "Tag #{i}"] }
+    collection = (1..3).map { |i| [i, "Tag #{i}"] }
     with_collection_check_boxes @user, :tag_ids, collection, :first, :last, disabled: 1
 
     assert_select 'form input[type=checkbox][value=1][disabled=disabled]'
@@ -363,7 +363,7 @@ class BuilderTest < ActionView::TestCase
   end
 
   test "collection check box accepts a proc to disabled items" do
-    collection = (1..3).map{|i| [i, "Tag #{i}"] }
+    collection = (1..3).map { |i| [i, "Tag #{i}"] }
     with_collection_check_boxes @user, :tag_ids, collection, :first, :last, disabled: proc { |i| i.first == 1 }
 
     assert_select 'form input[type=checkbox][value=1][disabled=disabled]'

data/test/action_view_extensions/form_helper_test.rb

@@ -131,6 +131,15 @@ class FormHelperTest < ActionView::TestCase
     end
   end
 
+  test 'SimpleForm for swaps default action view field_error_proc' do
+    expected_error_proc = lambda {}
+    swap SimpleForm, field_error_proc: expected_error_proc do
+      simple_form_for :user do |f|
+        assert_equal expected_error_proc, ::ActionView::Base.field_error_proc
+      end
+    end
+  end
+
   private
 
   def swap_field_error_proc(expected_error_proc = lambda {})

data/test/form_builder/association_test.rb

@@ -41,36 +41,46 @@ class AssociationTest < ActionView::TestCase
   end
 
   test 'builder preloads collection association' do
-    value = @user.tags = Object.new
-    value.expects(:to_a).returns(value)
+    value = @user.tags = MiniTest::Mock.new
+    value.expect(:to_a, value)
 
     with_association_for @user, :tags
     assert_select 'form select.select#user_tag_ids'
     assert_select 'form select option[value=1]', 'Tag 1'
     assert_select 'form select option[value=2]', 'Tag 2'
     assert_select 'form select option[value=3]', 'Tag 3'
+
+    value.verify
   end
 
   test 'builder does not preload collection association if preload is false' do
-    value = @user.tags = Object.new
-    value.expects(:to_a).never
+    value = @user.tags = MiniTest::Mock.new
+    value.expect(:to_a, nil)
 
     with_association_for @user, :tags, preload: false
     assert_select 'form select.select#user_tag_ids'
     assert_select 'form select option[value=1]', 'Tag 1'
     assert_select 'form select option[value=2]', 'Tag 2'
     assert_select 'form select option[value=3]', 'Tag 3'
+
+    assert_raises MockExpectationError do
+      value.verify
+    end
   end
 
   test 'builder does not preload non-collection association' do
-    value = @user.company = Object.new
-    value.expects(:to_a).never
+    value = @user.company = MiniTest::Mock.new
+    value.expect(:to_a, nil)
 
     with_association_for @user, :company
     assert_select 'form select.select#user_company_id'
     assert_select 'form select option[value=1]', 'Company 1'
     assert_select 'form select option[value=2]', 'Company 2'
     assert_select 'form select option[value=3]', 'Company 3'
+
+    assert_raises MockExpectationError do
+      value.verify
+    end
   end
 
   # ASSOCIATIONS - BELONGS TO

data/test/form_builder/general_test.rb

@@ -22,6 +22,14 @@ class FormBuilderTest < ActionView::TestCase
     end
   end
 
+  test 'builder should work without controller' do
+    stub_any_instance ActionView::TestCase, :controller, nil do
+      simple_form_for @user do |f|
+        assert f.input(:name)
+      end
+    end
+  end
+
   test 'builder input should allow a block to configure input' do
     with_form_for @user, :name do
       text_field_tag :foo, :bar, id: :cool
@@ -156,18 +164,16 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   test 'builder should generate file for file columns' do
-    @user.avatar = mock("file")
-    @user.avatar.expects(:respond_to?).with(:mounted_as).returns(false)
-    @user.avatar.expects(:respond_to?).with(:file?).returns(false)
-    @user.avatar.expects(:respond_to?).with(:public_filename).returns(true)
+    @user.avatar = MiniTest::Mock.new
+    @user.avatar.expect(:public_filename, true)
 
     with_form_for @user, :avatar
     assert_select 'form input#user_avatar.file'
   end
 
   test 'builder should generate file for attributes that are real db columns but have file methods' do
-    @user.home_picture = mock("file")
-    @user.home_picture.expects(:respond_to?).with(:mounted_as).returns(true)
+    @user.home_picture = MiniTest::Mock.new
+    @user.home_picture.expect(:mounted_as, true)
 
     with_form_for @user, :home_picture
     assert_select 'form input#user_home_picture.file'
@@ -264,10 +270,10 @@ class FormBuilderTest < ActionView::TestCase
 
   test 'builder should be able to disable a hint even if it exists in i18n' do
     store_translations(:en, simple_form: { hints: { name: 'Hint test' } }) do
-      SimpleForm::Inputs::Base.any_instance.expects(:hint).never
-
-      with_form_for @user, :name, hint: false
-      assert_no_select 'span.hint'
+      stub_any_instance(SimpleForm::Inputs::Base, :hint, -> { raise 'Never' }) do
+        with_form_for @user, :name, hint: false
+        assert_no_select 'span.hint'
+      end
     end
   end
 

data/test/form_builder/hint_test.rb

@@ -94,7 +94,7 @@ class HintTest < ActionView::TestCase
 
   test 'hint should use i18n under defaults namespace to lookup translation' do
     store_translations(:en, simple_form: {
-      hints: {defaults: {name: 'Content of this input will be downcased...' } }
+      hints: { defaults: { name: 'Content of this input will be downcased...' } }
     }) do
       with_hint_for @user, :name
       assert_select 'span.hint', 'Content of this input will be downcased...'

data/test/inputs/collection_check_boxes_input_test.rb

@@ -18,11 +18,17 @@ class CollectionCheckBoxesInputTest < ActionView::TestCase
   end
 
   test 'collection input with check_boxes type should not generate required html attribute' do
-    with_input_for @user, :name, :check_boxes, collection: ['Jose' , 'Carlos']
+    with_input_for @user, :name, :check_boxes, collection: ['Jose', 'Carlos']
     assert_select 'input.required'
     assert_no_select 'input[required]'
   end
 
+  test 'collection input with check_boxes type should not generate aria-required html attribute' do
+    with_input_for @user, :name, :check_boxes, collection: ['Jose', 'Carlos']
+    assert_select 'input.required'
+    assert_no_select 'input[aria-required]'
+  end
+
   test 'input should do automatic collection translation for check_box types using defaults key' do
     store_translations(:en, simple_form: { options: { defaults: {
       gender: { male: 'Male', female: 'Female'}

data/test/inputs/collection_radio_buttons_input_test.rb

@@ -98,7 +98,7 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
 
   test 'input should allow overriding only label method for collections' do
     with_input_for @user, :name, :radio_buttons,
-                          collection: ['Jose' , 'Carlos'],
+                          collection: ['Jose', 'Carlos'],
                           label_method: :upcase
     assert_select 'label.collection_radio_buttons', 'JOSE'
     assert_select 'label.collection_radio_buttons', 'CARLOS'
@@ -106,7 +106,7 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
 
   test 'input should allow overriding only value method for collections' do
     with_input_for @user, :name, :radio_buttons,
-                          collection: ['Jose' , 'Carlos'],
+                          collection: ['Jose', 'Carlos'],
                           value_method: :upcase
     assert_select 'input[type=radio][value=JOSE]'
     assert_select 'input[type=radio][value=CARLOS]'
@@ -114,7 +114,7 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
 
   test 'input should allow overriding label and value method for collections' do
     with_input_for @user, :name, :radio_buttons,
-                          collection: ['Jose' , 'Carlos'],
+                          collection: ['Jose', 'Carlos'],
                           label_method: :upcase,
                           value_method: :downcase
     assert_select 'input[type=radio][value=jose]'
@@ -125,7 +125,7 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
 
   test 'input should allow overriding label and value method using a lambda for collections' do
     with_input_for @user, :name, :radio_buttons,
-                          collection: ['Jose' , 'Carlos'],
+                          collection: ['Jose', 'Carlos'],
                           label_method: lambda { |i| i.upcase },
                           value_method: lambda { |i| i.downcase }
     assert_select 'input[type=radio][value=jose]'
@@ -135,11 +135,17 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
   end
 
   test 'collection input with radio type should generate required html attribute' do
-    with_input_for @user, :name, :radio_buttons, collection: ['Jose' , 'Carlos']
+    with_input_for @user, :name, :radio_buttons, collection: ['Jose', 'Carlos']
     assert_select 'input[type=radio].required'
     assert_select 'input[type=radio][required]'
   end
 
+  test 'collection input with radio type should generate aria-required html attribute' do
+    with_input_for @user, :name, :radio_buttons, collection: ['Jose', 'Carlos']
+    assert_select 'input[type=radio].required'
+    assert_select 'input[type=radio][aria-required=true]'
+  end
+
   test 'input radio does not wrap the collection by default' do
     with_input_for @user, :active, :radio_buttons