simple_form 3.0.0.rc → 3.0.0

data/lib/simple_form/inputs/base.rb

@@ -65,6 +65,10 @@ module SimpleForm
         @html_classes = SimpleForm.additional_classes_for(:input) { additional_classes }
 
         @input_html_classes = @html_classes.dup
+        if SimpleForm.input_class && !input_html_classes.empty?
+          input_html_classes << SimpleForm.input_class
+        end
+
         @input_html_options = html_options_for(:input, input_html_classes).tap do |o|
           o[:readonly]  = true if has_readonly?
           o[:disabled]  = true if has_disabled?

data/lib/simple_form/inputs/boolean_input.rb

@@ -17,6 +17,7 @@ module SimpleForm
           input
         elsif nested_boolean_style?
           html_options = label_html_options.dup
+          html_options[:class] ||= []
           html_options[:class].push(:checkbox)
 
           build_hidden_field_for_checkbox +

data/lib/simple_form/inputs/collection_input.rb

@@ -66,7 +66,7 @@ module SimpleForm
         collection_translated = translate_collection if collection_classes == [Symbol]
 
         if collection_translated || collection_classes.include?(Array)
-          { label: :first, value: :last }
+          { label: :first, value: :second }
         elsif collection_includes_basic_objects?(collection_classes)
           { label: :to_s, value: :to_s }
         else

data/lib/simple_form/inputs/date_time_input.rb

@@ -11,7 +11,7 @@ module SimpleForm
         position = case input_type
         when :date, :datetime
           date_order = input_options[:order] || I18n.t('date.order')
-          date_order.first
+          date_order.first.to_sym
         else
           :hour
         end

data/lib/simple_form/tags.rb

@@ -11,8 +11,9 @@ module SimpleForm
           value = value_for_collection(item, @value_method)
           text  = value_for_collection(item, @text_method)
           default_html_options = default_html_options_for_collection(item, value)
+          additional_html_options = option_html_attributes(item)
 
-          rendered_item = yield item, value, text, default_html_options
+          rendered_item = yield item, value, text, default_html_options.merge(additional_html_options)
 
           item_wrapper_tag ? @template_object.content_tag(item_wrapper_tag, rendered_item, class: item_wrapper_class) : rendered_item
         end.join.html_safe

data/lib/simple_form/version.rb

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

data/lib/simple_form/version.rb.orig

@@ -0,0 +1,7 @@
+module SimpleForm
+<<<<<<< HEAD
+  VERSION = "2.0.4".freeze
+=======
+  VERSION = "2.1.0.dev".freeze
+>>>>>>> issue-720
+end

data/test/action_view_extensions/builder_test.rb

@@ -49,8 +49,7 @@ class BuilderTest < ActionView::TestCase
   end
 
   test "collection radio checks the correct value to local variables" do
-    user = User.new
-    user.active = false
+    user = User.build(active: false)
     with_collection_radio_buttons user, :active, [true, false], :to_s, :to_s
 
     assert_select 'form input[type=radio][value=true]'
@@ -297,9 +296,9 @@ class BuilderTest < ActionView::TestCase
   end
 
   test "collection check box checks the correct value to local variables" do
-    user = User.new
-    user.tag_ids = [1, 3]
+    user = User.build(tag_ids: [1, 3])
     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]'

data/test/form_builder/association_test.rb

@@ -105,6 +105,14 @@ class AssociationTest < ActionView::TestCase
     assert_select 'form input.radio_buttons#user_company_id_3'
   end
 
+  test 'builder allows collection to have a proc as a condition' do
+    with_association_for @user, :extra_special_company
+    assert_select 'form select.select#user_extra_special_company_id'
+    assert_select 'form select option[value=1]'
+    assert_no_select 'form select option[value=2]'
+    assert_no_select 'form select option[value=3]'
+  end
+
   test 'builder marks the record which already belongs to the user' do
     @user.company_id = 2
     with_association_for @user, :company, as: :radio_buttons

data/test/form_builder/general_test.rb

@@ -87,6 +87,19 @@ class FormBuilderTest < ActionView::TestCase
     end
   end
 
+  test 'builder allow to use numbers in the model name' do
+    user = UserNumber1And2.build(tags: [Tag.new(nil, 'Tag1')])
+
+    with_concat_form_for(user, url: '/') do |f|
+      f.simple_fields_for(:tags) do |tags|
+        tags.input :name
+      end
+    end
+
+    assert_select 'form .user_number1_and2_tags_name'
+    assert_no_select 'form .user_number1_and2_tags_1_name'
+  end
+
   # INPUT TYPES
   test 'builder should generate text fields for string columns' do
     with_form_for @user, :name

data/test/form_builder/input_field_test.rb

@@ -21,6 +21,23 @@ class InputFieldTest < ActionView::TestCase
     assert_select 'textarea#user_name.text'
   end
 
+  test 'builder input_field should generate input type based on column type' do
+    with_concat_form_for(@user) do |f|
+      f.input_field :age
+    end
+
+    assert_select 'input[type=number].integer#user_age'
+  end
+
+  test 'builder input_field should be able to disable any component' do
+    with_concat_form_for(@user) do |f|
+      f.input_field :age, html5: false
+    end
+
+    assert_no_select 'input[html5=false]#user_age'
+    assert_select 'input[type=text].integer#user_age'
+  end
+
   test 'builder input_field should allow passing options to input tag' do
     with_concat_form_for(@user) do |f|
       f.input_field :name, id: 'name_input', class: 'name'

data/test/form_builder/label_test.rb

@@ -19,7 +19,7 @@ class LabelTest < ActionView::TestCase
     assert_no_select 'label[as=boolean]'
   end
 
-  test 'builder should generate a label componet tag with a clean HTML' do
+  test 'builder should generate a label component tag with a clean HTML' do
     with_label_for @user, :name
     assert_no_select 'label.string[label_html]'
   end

data/test/inputs/boolean_input_test.rb

@@ -137,4 +137,16 @@ class BooleanInputTest < ActionView::TestCase
       end
     end
   end
+
+  test 'input boolean without additional classes should add "checkbox" class to label' do
+    swap_wrapper :default, self.custom_wrapper_without_top_level do
+      swap SimpleForm, boolean_style: :nested, generate_additional_classes_for: [:input] do
+        with_input_for @user, :active, :boolean
+
+        assert_select 'label'
+        assert_select 'label.checkbox'
+        assert_no_select 'label.boolean'
+      end
+    end
+  end
 end

data/test/inputs/collection_check_boxes_input_test.rb

@@ -60,6 +60,11 @@ class CollectionCheckBoxesInputTest < ActionView::TestCase
     assert_no_select 'form ul'
   end
 
+  test 'input check boxes accepts html options as the last element of collection' do
+    with_input_for @user, :name, :check_boxes, collection: [['Jose', 'jose', class: 'foo']]
+    assert_select 'input.foo[type=checkbox][value=jose]'
+  end
+
   test 'input check boxes wraps the collection in the configured collection wrapper tag' do
     swap SimpleForm, collection_wrapper_tag: :ul do
       with_input_for @user, :active, :check_boxes

data/test/inputs/collection_radio_buttons_input_test.rb

@@ -82,6 +82,11 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
     assert_select 'input[type=radio][value=Carlos][checked=checked]'
   end
 
+  test 'input should accept html options as the last element of collection' do
+    with_input_for @user, :name, :radio_buttons, collection: [['Jose', 'jose', class: 'foo']]
+    assert_select 'input.foo[type=radio][value=jose]'
+  end
+
   test 'input should allow using a collection with text/value arrays' do
     with_input_for @user, :name, :radio_buttons, collection: [['Jose', 'jose'], ['Carlos', 'carlos']]
     assert_select 'input[type=radio][value=jose]'

data/test/inputs/collection_select_input_test.rb

@@ -56,6 +56,12 @@ class CollectionSelectInputTest < ActionView::TestCase
     assert_select 'select option[selected=selected]', 'Carlos'
   end
 
+  test 'input should accept html options as the last element of collection' do
+    with_input_for @user, :name, :select, collection: [['Jose', class: 'foo']]
+    assert_select 'select.select#user_name'
+    assert_select 'select option.foo', 'Jose'
+  end
+
   test 'input should mark the selected value also when using integers' do
     @user.age = 18
     with_input_for @user, :age, :select, collection: 18..60
@@ -112,7 +118,7 @@ class CollectionSelectInputTest < ActionView::TestCase
   end
 
   test 'input should detect label and value on collections' do
-    users = [ setup_new_user(id: 1, name: "Jose"), setup_new_user(id: 2, name: "Carlos") ]
+    users = [User.build(id: 1, name: "Jose"), User.build(id: 2, name: "Carlos")]
     with_input_for @user, :description, :select, collection: users
     assert_select 'select option[value=1]', 'Jose'
     assert_select 'select option[value=2]', 'Carlos'

data/test/inputs/datetime_input_test.rb

@@ -63,26 +63,26 @@ class DateTimeInputTest < ActionView::TestCase
   end
 
   test 'label should use i18n to get target for date input type' do
-    store_translations(:en, date: { order: [:month, :day, :year] }) do
+    store_translations(:en, date: { order: ['month', 'day', 'year'] }) do
       with_input_for :project, :created_at, :date
       assert_select 'label[for=project_created_at_2i]'
     end
   end
 
   test 'label should use i18n to get target for datetime input type' do
-    store_translations(:en, date: { order: [:month, :day, :year] }) do
+    store_translations(:en, date: { order: ['month', 'day', 'year'] }) do
       with_input_for :project, :created_at, :datetime
       assert_select 'label[for=project_created_at_2i]'
     end
   end
 
   test 'label should use order to get target when date input type' do
-    with_input_for :project, :created_at, :date, order: [:month, :year, :day]
+    with_input_for :project, :created_at, :date, order: ['month', 'year', 'day']
     assert_select 'label[for=project_created_at_2i]'
   end
 
   test 'label should use order to get target when datetime input type' do
-    with_input_for :project, :created_at, :datetime, order: [:month, :year, :day]
+    with_input_for :project, :created_at, :datetime, order: ['month', 'year', 'day']
     assert_select 'label[for=project_created_at_2i]'
   end
 

data/test/inputs/general_test.rb

@@ -20,6 +20,22 @@ class InputTest < ActionView::TestCase
     assert_select 'input.string[autofocus]'
   end
 
+  test 'input accepts input_class configuration' do
+    swap SimpleForm, input_class: :xlarge do
+      with_input_for @user, :name, :string
+      assert_select 'input.xlarge'
+      assert_no_select 'div.xlarge'
+    end
+  end
+
+  test 'input does not add input_class when configured to not generate additional classes for input' do
+    swap SimpleForm, input_class: 'xlarge', generate_additional_classes_for: [:wrapper] do
+      with_input_for @user, :name, :string
+      assert_select 'input'
+      assert_no_select '.xlarge'
+    end
+  end
+
   test 'text input should generate autofocus attribute when autofocus option is true' do
     with_input_for @user, :description, :text, autofocus: true
     assert_select 'textarea.text[autofocus]'

data/test/inputs/grouped_collection_select_input_test.rb

@@ -130,4 +130,17 @@ class GroupedCollectionSelectInputTest < ActionView::TestCase
       end
     end
   end
+
+  test 'grouped collection should accept html options as the last element of collection' do
+    with_input_for @user, :tag_ids, :grouped_select,
+      collection: [['Authors', [['Jose', 'jose', class: 'foo'], ['Carlos', 'carlos', class: 'bar']]]],
+      group_method: :last
+
+    assert_select 'select.grouped_select#user_tag_ids' do
+      assert_select 'optgroup[label=Authors]' do
+        assert_select 'option.foo', 'Jose'
+        assert_select 'option.bar', 'Carlos'
+      end
+    end
+  end
 end

data/test/support/models.rb

@@ -52,7 +52,19 @@ class User
     :description, :created_at, :updated_at, :credit_limit, :password, :url,
     :delivery_time, :born_at, :special_company_id, :country, :tags, :tag_ids,
     :avatar, :home_picture, :email, :status, :residence_country, :phone_number,
-    :post_count, :lock_version, :amount, :attempts, :action, :credit_card, :gender
+    :post_count, :lock_version, :amount, :attempts, :action, :credit_card, :gender,
+    :extra_special_company_id
+
+  def self.build(extra_attributes = {})
+    attributes = {
+      id: 1,
+      name: 'New in SimpleForm!',
+      description: 'Hello!',
+      created_at: Time.now
+    }.merge! extra_attributes
+
+    new attributes
+  end
 
   def initialize(options={})
     @new_record = false
@@ -119,6 +131,8 @@ class User
         Association.new(Company, association, :has_one, {})
       when :special_company
         Association.new(Company, association, :belongs_to, { conditions: { id: 1 } })
+      when :extra_special_company
+        Association.new(Company, association, :belongs_to, { conditions: proc { { id: 1 } } })
     end
   end
 
@@ -215,3 +229,6 @@ class HashBackedAuthor < Hash
     'hash backed author'
   end
 end
+
+class UserNumber1And2 < User
+end

data/test/test_helper.rb

@@ -35,40 +35,27 @@ class ActionView::TestCase
   include SimpleForm::ActionViewExtensions::FormHelper
 
   setup :set_controller
-  setup :setup_new_user
+  setup :setup_users
 
   def set_controller
     @controller = MockController.new
   end
 
-  def setup_new_user(options={})
-    @user = User.new({
-      id: 1,
-      name: 'New in SimpleForm!',
-      description: 'Hello!',
-      created_at: Time.now
-    }.merge(options))
-
-    @validating_user = ValidatingUser.new({
-      id: 1,
-      name: 'New in SimpleForm!',
-      description: 'Hello!',
+  def setup_users(extra_attributes = {})
+    @user = User.build(extra_attributes)
+
+    @validating_user = ValidatingUser.build({
       home_picture: 'Home picture',
-      created_at: Time.now,
       age: 19,
       amount: 15,
       attempts: 1,
       company: [1]
-    }.merge(options))
+    }.merge!(extra_attributes))
 
-    @other_validating_user = OtherValidatingUser.new({
-      id: 1,
-      name: 'New in SimpleForm!',
-      description: 'Hello!',
-      created_at: Time.now,
+    @other_validating_user = OtherValidatingUser.build({
       age: 19,
       company: 1
-    }.merge(options))
+    }.merge!(extra_attributes))
   end
 
   def protect_against_forgery?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_form
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc
+  version: 3.0.0
 platform: ruby
 authors:
 - José Valim
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-10 00:00:00.000000000 Z
+date: 2013-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc1
+        version: 4.0.0
     - - <
       - !ruby/object:Gem::Version
         version: '4.1'
@@ -28,7 +28,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc1
+        version: 4.0.0
     - - <
       - !ruby/object:Gem::Version
         version: '4.1'
@@ -38,7 +38,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc1
+        version: 4.0.0
     - - <
       - !ruby/object:Gem::Version
         version: '4.1'
@@ -48,7 +48,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc1
+        version: 4.0.0
     - - <
       - !ruby/object:Gem::Version
         version: '4.1'
@@ -72,6 +72,7 @@ files:
 - lib/generators/simple_form/templates/README
 - lib/generators/simple_form/USAGE
 - lib/simple_form/action_view_extensions/builder.rb
+- lib/simple_form/action_view_extensions/builder.rb.orig
 - lib/simple_form/action_view_extensions/form_helper.rb
 - lib/simple_form/components/errors.rb
 - lib/simple_form/components/hints.rb
@@ -86,6 +87,7 @@ files:
 - lib/simple_form/components.rb
 - lib/simple_form/error_notification.rb
 - lib/simple_form/form_builder.rb
+- lib/simple_form/form_builder.rb.orig
 - lib/simple_form/helpers/autofocus.rb
 - lib/simple_form/helpers/disabled.rb
 - lib/simple_form/helpers/readonly.rb
@@ -115,6 +117,7 @@ files:
 - lib/simple_form/railtie.rb
 - lib/simple_form/tags.rb
 - lib/simple_form/version.rb
+- lib/simple_form/version.rb.orig
 - lib/simple_form/wrappers/builder.rb
 - lib/simple_form/wrappers/many.rb
 - lib/simple_form/wrappers/root.rb
@@ -172,12 +175,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: simple_form
-rubygems_version: 2.0.3
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Forms made easy!