simple_form 1.5.0 → 1.5.1

data/CHANGELOG.rdoc

@@ -1,3 +1,12 @@
+== 1.5.1
+
+* enhancements
+  * `:components` options is now deprecated
+
+* bug fix
+  * Fallback to default label when block is provided (github.com/pivotal-casebook)
+  * Do not override default selection through attribute value in collection select when label/value methods are lambdas
+
 == 1.5.0
 
 * enhancements

data/lib/simple_form/action_view_extensions/builder.rb

@@ -178,8 +178,11 @@ class ActionView::Helpers::FormBuilder
 
         [value, text, selected, disabled]
       end
-      options[:disabled] = collection.map(&:pop).compact
-      options[:selected] = collection.map(&:pop).compact
+
+      [:disabled, :selected].each do |option|
+        option_value    = collection.map(&:pop).compact
+        options[option] = option_value if option_value.present?
+      end
       value_method, text_method = :first, :last
     end
 

data/lib/simple_form/form_builder.rb

@@ -266,7 +266,7 @@ module SimpleForm
     #    f.label :name, :id => "cool_label"
     #
     def label(attribute_name, *args)
-      return super if args.first.is_a?(String)
+      return super if args.first.is_a?(String) || block_given?
       options = args.extract_options!
       options[:label_html] = options.dup
       options[:label]      = options.delete(:label)

data/lib/simple_form/inputs/base.rb

@@ -82,7 +82,12 @@ module SimpleForm
       end
 
       def components_list
-        options[:components] || SimpleForm.components
+        if components = options[:components]
+          ActiveSupport::Deprecation.warn "The option :components of f.input is deprecated. Please turn off each component individually instead."
+          components
+        else
+          SimpleForm.components
+        end
       end
 
       def has_autofocus?

data/lib/simple_form/version.rb

@@ -1,3 +1,3 @@
 module SimpleForm
-  VERSION = "1.5.0".freeze
+  VERSION = "1.5.1".freeze
 end

data/test/form_builder_test.rb

@@ -39,9 +39,9 @@ class FormBuilderTest < ActionView::TestCase
     end
   end
 
-  def with_label_for(object, *args)
+  def with_label_for(object, *args, &block)
     with_concat_form_for(object) do |f|
-      f.label(*args)
+      f.label(*args, &block)
     end
   end
 
@@ -453,50 +453,60 @@ class FormBuilderTest < ActionView::TestCase
 
   # ONLY THE INPUT TAG
   test "builder input_field should only render the input tag, nothing else" do
-    with_concat_form_for(@user) do |f|
-      f.input_field :name
+    ActiveSupport::Deprecation.silence do
+      with_concat_form_for(@user) do |f|
+        f.input_field :name
+      end
+      assert_select 'form > input.required.string'
+      assert_no_select 'div.string'
+      assert_no_select 'label'
+      assert_no_select '.hint'
     end
-    assert_select 'form > input.required.string'
-    assert_no_select 'div.string'
-    assert_no_select 'label'
-    assert_no_select '.hint'
   end
 
   test 'builder input_field should allow overriding default input type' do
-    with_concat_form_for(@user) do |f|
-      f.input_field :name, :as => :text
-    end
+    ActiveSupport::Deprecation.silence do
+      with_concat_form_for(@user) do |f|
+        f.input_field :name, :as => :text
+      end
 
-    assert_no_select 'input#user_name'
-    assert_select 'textarea#user_name.text'
+      assert_no_select 'input#user_name'
+      assert_select 'textarea#user_name.text'
+    end
   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'
-    end
+    ActiveSupport::Deprecation.silence do
+      with_concat_form_for(@user) do |f|
+        f.input_field :name, :id => 'name_input', :class => 'name'
+      end
 
-    assert_select 'input.string.name#name_input'
+      assert_select 'input.string.name#name_input'
+    end
   end
 
   test 'builder input_field should generate an input tag with a clean HTML' do
-    with_concat_form_for(@user) do |f|
-      f.input_field :name, :as => :integer, :class => 'name'
-    end
+    ActiveSupport::Deprecation.silence do
+      with_concat_form_for(@user) do |f|
+        f.input_field :name, :as => :integer, :class => 'name'
+      end
 
-    assert_no_select 'input.integer[input_html]'
-    assert_no_select 'input.integer[as]'
+      assert_no_select 'input.integer[input_html]'
+      assert_no_select 'input.integer[as]'
+    end
   end
 
   test 'builder collection input_field should generate input tag with a clean HTML' do
-    with_concat_form_for(@user) do |f|
-      f.input_field :status, :collection => ['Open', 'Closed'], :class => 'status', :label_method => :to_s, :value_method => :to_s
-    end
+    ActiveSupport::Deprecation.silence do
+      with_concat_form_for(@user) do |f|
+        f.input_field :status, :collection => ['Open', 'Closed'], :class => 'status', :label_method => :to_s, :value_method => :to_s
+      end
 
-    assert_no_select 'select.status[input_html]'
-    assert_no_select 'select.status[collection]'
-    assert_no_select 'select.status[label_method]'
-    assert_no_select 'select.status[value_method]'
+      assert_no_select 'select.status[input_html]'
+      assert_no_select 'select.status[collection]'
+      assert_no_select 'select.status[label_method]'
+      assert_no_select 'select.status[value_method]'
+    end
   end
 
   # WITHOUT OBJECT
@@ -627,6 +637,14 @@ class FormBuilderTest < ActionView::TestCase
     assert_no_select 'label.string'
   end
 
+  test 'builder should fallback to default label when block is given' do
+    with_label_for @user, :name do
+      'Nome do usuário'
+    end
+    assert_select 'label', 'Nome do usuário'
+    assert_no_select 'label.string'
+  end
+
   test 'builder allows label order to be changed' do
     swap SimpleForm, :label_text => lambda { |l, r| "#{l}:" } do
       with_label_for @user, :age

data/test/inputs_test.rb

@@ -104,30 +104,38 @@ class InputTest < ActionView::TestCase
     end
   end
 
+  test 'components option is deprecated' do
+    assert_deprecated(/The option :components of f\.input is deprecated/) do
+      with_input_for @user, :name, :string, :components => [:input]
+    end
+  end
+
   test 'input should render components according to an optional :components option' do
-    with_input_for @user, :name, :string, :components => [:input, :label]
-    assert_select 'input + label'
+    ActiveSupport::Deprecation.silence do
+      with_input_for @user, :name, :string, :components => [:input, :label]
+      assert_select 'input + label'
 
-    with_input_for @user, :age, :integer, :components => [:input, :label]
-    assert_select 'input + label'
+      with_input_for @user, :age, :integer, :components => [:input, :label]
+      assert_select 'input + label'
 
-    with_input_for @user, :active, :boolean, :components => [:label, :input]
-    assert_select 'label + input'
+      with_input_for @user, :active, :boolean, :components => [:label, :input]
+      assert_select 'label + input'
 
-    with_input_for @user, :description, :text, :components => [:input, :label]
-    assert_select 'textarea + label'
+      with_input_for @user, :description, :text, :components => [:input, :label]
+      assert_select 'textarea + label'
 
-    with_input_for @user, :password, :password, :components => [:input, :label]
-    assert_select 'input + label'
+      with_input_for @user, :password, :password, :components => [:input, :label]
+      assert_select 'input + label'
 
-    with_input_for @user, :name, :file, :components => [:input, :label]
-    assert_select 'input + label'
+      with_input_for @user, :name, :file, :components => [:input, :label]
+      assert_select 'input + label'
 
-    with_input_for @user, :country, :country, :components => [:input, :label]
-    assert_select 'select + label'
+      with_input_for @user, :country, :country, :components => [:input, :label]
+      assert_select 'select + label'
 
-    with_input_for @user, :time_zone, :time_zone, :components => [:input, :label]
-    assert_select 'select + label'
+      with_input_for @user, :time_zone, :time_zone, :components => [:input, :label]
+      assert_select 'select + label'
+    end
   end
 
   # StringInput
@@ -839,6 +847,15 @@ class InputTest < ActionView::TestCase
     assert_no_select 'select option[value=Antonio][selected]'
   end
 
+  test 'input should not override default selection through attribute value with label method as lambda for collection select' do
+    @user.name = "Carlos"
+    with_input_for @user, :name, :select, :collection => ["Carlos", "Antonio"],
+      :label_method => lambda { |x| x.upcase }
+    assert_select 'select option[value=Carlos][selected=selected]', 'CARLOS'
+    assert_select 'select option[value=Antonio]', 'ANTONIO'
+    assert_no_select 'select option[value=Antonio][selected]'
+  end
+
   test 'input should allow overriding collection for radio types' do
     with_input_for @user, :name, :radio, :collection => ['Jose', 'Carlos']
     assert_select 'input[type=radio][value=Jose]'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_form
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 1
   - 5
-  - 0
-  version: 1.5.0
+  - 1
+  version: 1.5.1
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -16,13 +16,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-08 00:00:00 -03:00
+date: 2011-09-15 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activemodel
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -33,11 +33,11 @@ dependencies:
         - 0
         version: "3.0"
   type: :runtime
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
   name: actionpack
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -48,7 +48,7 @@ dependencies:
         - 0
         version: "3.0"
   type: :runtime
-  version_requirements: *id002
+  requirement: *id002
 description: Forms made easy!
 email: contact@plataformatec.com.br
 executables: []