simple_form 1.5.1 → 1.5.2

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== 1.5.2
+
+* bug fix
+  * Remove the internal usage of deprecated `:components`
+
 == 1.5.1
 
 * enhancements

data/lib/simple_form/form_builder.rb

@@ -112,9 +112,12 @@ module SimpleForm
     #        name="user[name]" size="100" type="text" value="Carlos" />
     #
     def input_field(attribute_name, options={})
+      column     = find_attribute_column(attribute_name)
+      input_type = default_input_type(attribute_name, column, options)
+
       options[:input_html] = options.except(:as, :collection, :label_method, :value_method)
-      options.merge!(:components => [:input], :wrapper => false)
-      input(attribute_name, options)
+
+      find_mapping(input_type).new(self, attribute_name, column, input_type, options).input
     end
 
     # Helper for dealing with association selects/radios, generating the

data/lib/simple_form/version.rb

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

data/test/custom_components.rb

@@ -0,0 +1,7 @@
+module Div
+  def div
+    template.content_tag(:div, 'Custom Component', :class => 'custom_input')
+  end
+end
+
+SimpleForm::Inputs::Base.send(:include, Div)

data/test/form_builder_test.rb

@@ -453,60 +453,50 @@ class FormBuilderTest < ActionView::TestCase
 
   # ONLY THE INPUT TAG
   test "builder input_field should only render the input tag, nothing else" do
-    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'
+    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
 
   test 'builder input_field should allow overriding default input type' do
-    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'
+    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'
   end
 
   test 'builder input_field should allow passing options to input tag' do
-    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'
+    with_concat_form_for(@user) do |f|
+      f.input_field :name, :id => 'name_input', :class => 'name'
     end
+
+    assert_select 'input.string.name#name_input'
   end
 
   test 'builder input_field should generate an input tag with a clean HTML' do
-    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]'
+    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]'
   end
 
   test 'builder collection input_field should generate input tag with a clean HTML' do
-    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]'
+    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]'
   end
 
   # WITHOUT OBJECT
@@ -904,4 +894,37 @@ class FormBuilderTest < ActionView::TestCase
       assert_select 'form section input#user_age.numeric.integer'
     end
   end
+
+  # CUSTOM COMPONENTS
+  # Setup new components and remove them after the test.
+  def custom_component(components=[:label_input, :div])
+    swap SimpleForm, :components => components do
+      begin
+        load "custom_components.rb"
+        yield
+      ensure
+        Div.send(:undef_method, :div)
+        Object.send :remove_const, :Div
+      end
+    end
+  end
+
+  test 'builder should accept new components' do
+    custom_component do
+      with_form_for @user, :age
+      assert_select 'form input#user_age.numeric.integer'
+      assert_select 'form .custom_input'
+    end
+  end
+
+  test 'input field should render only the input' do
+    custom_component do
+      with_concat_form_for(@user) do |f|
+        f.input_field :age
+      end
+
+      assert_select 'form input#user_age.numeric.integer'
+      assert_no_select 'form .custom_input'
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_form
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: 
   segments: 
   - 1
   - 5
-  - 1
-  version: 1.5.1
+  - 2
+  version: 1.5.2
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -16,13 +16,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-15 00:00:00 -03:00
+date: 2011-09-23 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activemodel
   prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -33,11 +33,11 @@ dependencies:
         - 0
         version: "3.0"
   type: :runtime
-  requirement: *id001
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: actionpack
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -48,7 +48,7 @@ dependencies:
         - 0
         version: "3.0"
   type: :runtime
-  requirement: *id002
+  version_requirements: *id002
 description: Forms made easy!
 email: contact@plataformatec.com.br
 executables: []
@@ -115,6 +115,7 @@ files:
 - test/components/hint_test.rb
 - test/components/label_test.rb
 - test/components/wrapper_test.rb
+- test/custom_components.rb
 - test/discovery_inputs.rb
 - test/error_notification_test.rb
 - test/form_builder_test.rb
@@ -166,6 +167,7 @@ test_files:
 - test/components/hint_test.rb
 - test/components/label_test.rb
 - test/components/wrapper_test.rb
+- test/custom_components.rb
 - test/discovery_inputs.rb
 - test/error_notification_test.rb
 - test/form_builder_test.rb