simple_form 4.0.1 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 36ca6e532e2f506a2946b385aa3137f28d1fb6bb
-  data.tar.gz: b24a8f5bd77dcab385219132ccb6216376299ba2
+SHA256:
+  metadata.gz: 1461390ccbd2b434d67a43a84ada68f255d08bc48a9e23d7734075c8f105b400
+  data.tar.gz: c81c4b918e6f9e467081e8b534273ef8807ef6e508da40077fe4c91b5b85a66f
 SHA512:
-  metadata.gz: fe6cabc6ab3f055f83bcd6ab214f5cc8f9593aa0b1231fdf87deb8ffc612c3b6fab1d76d493a2cd9e9c1fad28b1d259a350160aaf0b1b58e712bb49f60b67646
-  data.tar.gz: '008c90e740e05c719fdd4dfe1357c4ec6036c356f3746f813993696c8d849ef8f0122bfdbaa153cc93a12d9de9496efe32be7e72073d614969634448f139b30d'
+  metadata.gz: 71d69573ae8125232a436ea4c23115584497647de1a3b5fa996c9c95f78599b3a3e9ff07ce0812cd5370a1e2c0351dc8fdc43bbea30b7f35d6c68213c68a5f84
+  data.tar.gz: dacdc01de808196a155ad1219f913bafff072578ad0bb3c0a9602a9f0377d4359f03e54880dd77a3e27307a35754568064d9dd5dcec95abf8a93f5f0164149a8

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 ## Unreleased
 
+### Enhancements
+* Guess input type more carefully. [@sringling](https://github.com/sringling)
+* Allow custom error on forms without model. [@victorperez](https://github.com/victorperez)
+* Do not support Ruby < 2.3 anymore. [@gssbzn](https://github.com/gssbzn)
+* Add color inout type. [@gssbzn](https://github.com/gssbzn)
+
+### Bug fix
+* Improve disabled option to input_field. [@betelgeuse](https://github.com/betelgeuse)
+* Memoize `input_html_classes` in `SimpleForm::Inputs::Base`. [@RigoTheDev](https://github.com/RigoTheDev)
+* Fix column type citext HTML5 input type bug. [@brucew](https://github.com/brucew)
+* Use form attribute in the nested boolean hidden field when it is given. [@feliperenan](https://github.com/feliperenan)
+
 ## 4.0.1
 
 ### Bug fix

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

@@ -87,9 +87,6 @@ SimpleForm.setup do |config|
   # CSS class to add for error notification helper.
   config.error_notification_class = 'error_notification'
 
-  # ID to add for error notification helper.
-  # config.error_notification_id = nil
-
   # Series of attempts to detect a default label method for collection.
   # config.collection_label_methods = [ :to_label, :name, :title, :to_s ]
 

data/lib/simple_form/components/errors.rb

@@ -11,7 +11,7 @@ module SimpleForm
       end
 
       def has_errors?
-        object && object.respond_to?(:errors) && errors.present?
+        object_with_errors? || object.nil? && has_custom_error?
       end
 
       def has_value?
@@ -34,6 +34,10 @@ module SimpleForm
         has_custom_error? ? options[:error] : full_errors.send(error_method)
       end
 
+      def object_with_errors?
+        object && object.respond_to?(:errors) && errors.present?
+      end
+
       def error_method
         options[:error_method] || SimpleForm.error_method
       end

data/lib/simple_form/form_builder.rb

@@ -165,7 +165,7 @@ module SimpleForm
       components = (wrapper.components.map(&:namespace) & ATTRIBUTE_COMPONENTS)
 
       options = options.dup
-      options[:input_html] = options.except(:as, :boolean_style, :collection, :label_method, :value_method, :prompt, *components)
+      options[:input_html] = options.except(:as, :boolean_style, :collection, :disabled, :label_method, :value_method, :prompt, *components)
       options = @defaults.deep_dup.deep_merge(options) if @defaults
 
       input      = find_input(attribute_name, options)
@@ -552,12 +552,12 @@ module SimpleForm
         :datetime
       when :string, :citext, nil
         case attribute_name.to_s
-        when /password/  then :password
-        when /time_zone/ then :time_zone
-        when /country/   then :country
-        when /email/     then :email
-        when /phone/     then :tel
-        when /url/       then :url
+        when /(?:\b|\W|_)password(?:\b|\W|_)/  then :password
+        when /(?:\b|\W|_)time_zone(?:\b|\W|_)/ then :time_zone
+        when /(?:\b|\W|_)country(?:\b|\W|_)/   then :country
+        when /(?:\b|\W|_)email(?:\b|\W|_)/     then :email
+        when /(?:\b|\W|_)phone(?:\b|\W|_)/     then :tel
+        when /(?:\b|\W|_)url(?:\b|\W|_)/       then :url
         else
           file_method?(attribute_name) ? :file : (input_type || :string)
         end

data/lib/simple_form/inputs.rb

@@ -10,6 +10,7 @@ module SimpleForm
     autoload :CollectionInput
     autoload :CollectionRadioButtonsInput
     autoload :CollectionSelectInput
+    autoload :ColorInput
     autoload :DateTimeInput
     autoload :FileInput
     autoload :GroupedCollectionSelectInput

data/lib/simple_form/inputs/base.rb

@@ -72,7 +72,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 = self.input_html_classes
+
+        if SimpleForm.input_class && input_html_classes.any?
           input_html_classes << SimpleForm.input_class
         end
 

data/lib/simple_form/inputs/boolean_input.rb

@@ -63,6 +63,7 @@ module SimpleForm
         return "" if !include_hidden? || !unchecked_value
         options = { value: unchecked_value, id: nil, disabled: input_html_options[:disabled] }
         options[:name] = input_html_options[:name] if input_html_options.key?(:name)
+        options[:form] = input_html_options[:form] if input_html_options.key?(:form)
 
         @builder.hidden_field(attribute_name, options)
       end

data/lib/simple_form/inputs/color_input.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+module SimpleForm
+  module Inputs
+    class ColorInput < Base
+      def input(wrapper_options = nil)
+        input_html_options[:type] ||= "color" if html5?
+
+        merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)
+
+        @builder.text_field(attribute_name, merged_input_options)
+      end
+    end
+  end
+end

data/lib/simple_form/inputs/string_input.rb

@@ -18,7 +18,7 @@ module SimpleForm
       private
 
       def string?
-        input_type == :string
+        input_type == :string || input_type == :citext
       end
     end
   end

data/lib/simple_form/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module SimpleForm
-  VERSION = "4.0.1".freeze
+  VERSION = "4.1.0".freeze
 end

data/test/form_builder/error_test.rb

@@ -224,6 +224,12 @@ class ErrorTest < ActionView::TestCase
     assert_no_select 'span.error'
   end
 
+  test 'input with custom error works when form does not use a model' do
+    with_form_for :user, :active, error: "Super User Active! cannot be blank"
+
+    assert_select 'span.error'
+  end
+
   test 'input with custom error works when using full_error component' do
     swap_wrapper :default, custom_wrapper_with_full_error do
       error_text = "Super User Name! cannot be blank"

data/test/form_builder/general_test.rb

@@ -271,6 +271,12 @@ class FormBuilderTest < ActionView::TestCase
     assert_select 'form select#user_age.select'
   end
 
+  test 'builder does not generate url fields for columns that contain only the letters url' do
+    with_form_for @user, :hourly
+    assert_no_select 'form input#user_url.string.url'
+    assert_select 'form input#user_hourly.string'
+  end
+
   test 'builder allows overriding default input type for text' do
     with_form_for @user, :name, as: :text
     assert_no_select 'form input#user_name'

data/test/form_builder/input_field_test.rb

@@ -3,12 +3,6 @@ require 'test_helper'
 
 # Tests for f.input_field
 class InputFieldTest < ActionView::TestCase
-  def with_input_field_for(object, *args)
-    with_concat_form_for(object) do |f|
-      f.input_field(*args)
-    end
-  end
-
   test "builder input_field only renders the input tag, nothing else" do
     with_input_field_for @user, :name
 
@@ -85,13 +79,13 @@ class InputFieldTest < ActionView::TestCase
   test 'builder input_field infers pattern from attributes' do
     with_input_field_for @other_validating_user, :country, as: :string, pattern: true
 
-    assert_select 'input[pattern="\w+"]'
+    assert_select "input:match('pattern', ?)", /\w+/
   end
 
   test 'builder input_field accepts custom pattern' do
     with_input_field_for @other_validating_user, :country, as: :string, pattern: '\d+'
 
-    assert_select 'input[pattern="\d+"]'
+    assert_select "input:match('pattern', ?)", /\\d+/
   end
 
   test 'builder input_field uses readonly component' do
@@ -138,7 +132,7 @@ class InputFieldTest < ActionView::TestCase
     swap_wrapper :default, custom_wrapper_with_html5_components do
       with_input_field_for @user, :name, pattern: '\w+'
 
-      assert_select 'input[pattern="\w+"]'
+      assert_select "input:match('pattern', ?)", /\w+/
     end
   end
 

data/test/inputs/boolean_input_test.rb

@@ -107,6 +107,14 @@ class BooleanInputTest < ActionView::TestCase
     end
   end
 
+  test 'input boolean with nested generates a disabled hidden field with the form attribute when it is given' do
+    swap SimpleForm, boolean_style: :nested do
+      with_input_for @user, :active, :boolean, input_html: { form: 'form_id' }
+
+      assert_select "input[type=hidden][form=form_id]+ label.boolean > input.boolean"
+    end
+  end
+
   test 'input accepts changing boolean style to nested through given options' do
     with_input_for @user, :active, :boolean, boolean_style: :nested
     assert_select 'label[for=user_active]', 'Active'

data/test/inputs/color_input_test.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+class ColorInputTest < ActionView::TestCase
+  test 'input generates a color field' do
+    with_input_for @user, :favorite_color, :color
+    assert_select 'input[type=color].color#user_favorite_color'
+  end
+end

data/test/inputs/datetime_input_test.rb

@@ -6,12 +6,7 @@ require 'test_helper'
 class DateTimeInputWithHtml5Test < ActionView::TestCase
   test 'input generates a datetime input for datetime attributes if HTML5 compatibility is explicitly enbled' do
     with_input_for @user, :created_at, :datetime, html5: true
-
-    if ActionPack::VERSION::STRING >= '5'
-      assert_select 'input[type="datetime-local"]'
-    elsif ActionPack::VERSION::STRING < '5'
-      assert_select 'input[type="datetime"]'
-    end
+    assert_select 'input[type="datetime-local"]'
   end
 
   test 'input generates a datetime select for datetime attributes' do
@@ -80,12 +75,7 @@ class DateTimeInputWithoutHtml5Test < ActionView::TestCase
   test 'input generates a datetime input for datetime attributes if HTML5 compatibility is explicitly enabled' do
     swap_wrapper do
       with_input_for @user, :created_at, :datetime, html5: true
-
-      if ActionPack::VERSION::STRING >= '5'
-        assert_select 'input[type="datetime-local"]'
-      elsif ActionPack::VERSION::STRING < '5'
-        assert_select 'input[type="datetime"]'
-      end
+      assert_select 'input[type="datetime-local"]'
     end
   end
 

data/test/inputs/disabled_test.rb

@@ -76,4 +76,17 @@ class DisabledTest < ActionView::TestCase
     with_input_for @user, :created_at, :datetime
     assert_no_select 'select.datetime.disabled[disabled]'
   end
+
+  test 'input_field collection allows disabled select' do
+    with_input_field_for @user, :description, collection: ['foo', 'bar'], disabled: true
+    assert_select 'select[disabled]'
+    assert_no_select 'option[disabled]'
+  end
+
+  test 'input_field collection allows individual disabled options' do
+    with_input_field_for @user, :description, collection: ['foo', 'bar'], disabled: 'bar'
+    assert_no_select 'select[disabled]'
+    assert_no_select 'option[disabled][value=foo]'
+    assert_select 'option[disabled][value=bar]'
+  end
 end

data/test/inputs/discovery_test.rb

@@ -15,6 +15,7 @@ class DiscoveryTest < ActionView::TestCase
         Object.send :remove_const, :CustomizedInput
         Object.send :remove_const, :DeprecatedInput
         Object.send :remove_const, :CollectionSelectInput
+        Object.send :remove_const, :FileInput
         CustomInputs.send :remove_const, :CustomizedInput
         CustomInputs.send :remove_const, :PasswordInput
         CustomInputs.send :remove_const, :NumericInput
@@ -109,6 +110,26 @@ class DiscoveryTest < ActionView::TestCase
     end
   end
 
+  test 'does not duplicate the html classes giving a extra class' do
+    discovery do
+      swap SimpleForm, input_class: 'custom-default-input-class' do
+        with_form_for @user, :active, as: :select
+        assert_select 'form select#user_active.select' do
+          # Make sure class list contains 'chosen' only once.
+          assert_select ":match('class', ?)", /^(?!.*\bchosen\b.*\bchosen\b).*\bchosen\b.*$/
+        end
+      end
+    end
+  end
+
+  test 'new inputs can override the default input_html_classes' do
+    discovery do
+      with_form_for @user, :avatar, as: :file
+      assert_no_select 'form input[type=file]#user_avatar.file.file-upload'
+      assert_select 'form input[type=file]#user_avatar.file-upload'
+    end
+  end
+  
   test 'inputs method without wrapper_options are deprecated' do
     discovery do
       assert_deprecated do

data/test/inputs/priority_input_test.rb

@@ -6,22 +6,14 @@ class PriorityInputTest < ActionView::TestCase
   test 'input generates a country select field' do
     with_input_for @user, :country, :country
     assert_select 'select#user_country'
-    if ActionPack::VERSION::STRING >= '5'
-      assert_select 'select option[value=BR]', 'Brazil'
-    elsif ActionPack::VERSION::STRING < '5'
-      assert_select 'select option[value=Brazil]', 'Brazil'
-    end
+    assert_select 'select option[value=BR]', 'Brazil'
     assert_no_select 'select option[value=""][disabled=disabled]'
   end
 
   test 'input generates a country select with SimpleForm default' do
     swap SimpleForm, country_priority: [ 'Brazil' ] do
       with_input_for @user, :country, :country
-      if ActionPack::VERSION::STRING >= '5'
-        assert_select 'select option[value="---------------"][disabled=disabled]'
-      elsif ActionPack::VERSION::STRING < '5'
-        assert_select 'select option[value=""][disabled=disabled]'
-      end
+      assert_select 'select option[value="---------------"][disabled=disabled]'
     end
   end
 

data/test/inputs/string_input_test.rb

@@ -8,6 +8,11 @@ class StringInputTest < ActionView::TestCase
     assert_select "input#user_name[type=text][name='user[name]'][value='New in SimpleForm!']"
   end
 
+  test 'input maps text field to citext attribute' do
+    with_input_for @user, :name, :citext
+    assert_select "input#user_name[type=text][name='user[name]'][value='New in SimpleForm!']"
+  end
+
   test 'input generates a password field for password attributes' do
     with_input_for @user, :password, :password
     assert_select "input#user_password.password[type=password][name='user[password]']"
@@ -38,18 +43,6 @@ class StringInputTest < ActionView::TestCase
     assert_select 'input.string[minlength="5"]'
   end
 
-  if ActionPack::VERSION::STRING < '5'
-    test 'input does not get maxlength from validation when tokenizer present' do
-      with_input_for @validating_user, :action, :string
-      assert_no_select 'input.string[maxlength]'
-    end
-
-    test 'input does not get minlength from validation when tokenizer present' do
-      with_input_for @validating_user, :action, :string
-      assert_no_select 'input.string[minlength]'
-    end
-  end
-
   test 'input gets maxlength from validation when :is option present' do
     with_input_for @validating_user, :home_picture, :string
     assert_select 'input.string[maxlength="12"]'
@@ -88,12 +81,12 @@ class StringInputTest < ActionView::TestCase
 
   test 'input infers pattern from attributes' do
     with_input_for @other_validating_user, :country, :string, pattern: true
-    assert_select 'input[pattern="\w+"]'
+    assert_select "input:match('pattern', ?)", /\w+/
   end
 
   test 'input infers pattern from attributes using proc' do
     with_input_for @other_validating_user, :name, :string, pattern: true
-    assert_select 'input[pattern="\w+"]'
+    assert_select "input:match('pattern', ?)", /\w+/
   end
 
   test 'input does not infer pattern from attributes if root default is false' do
@@ -105,7 +98,7 @@ class StringInputTest < ActionView::TestCase
 
   test 'input uses given pattern from attributes' do
     with_input_for @other_validating_user, :country, :string, input_html: { pattern: "\\d+" }
-    assert_select 'input[pattern="\d+"]'
+    assert_select "input:match('pattern', ?)", /\\d+/
   end
 
   test 'input does not use pattern if model has :without validation option' do

data/test/support/discovery_inputs.rb

@@ -37,6 +37,13 @@ class CollectionSelectInput < SimpleForm::Inputs::CollectionSelectInput
   end
 end
 
+class FileInput < SimpleForm::Inputs::FileInput
+  def input_html_classes
+    super.delete_if { |html_class| html_class == :file }
+    super.push('file-upload')
+  end
+end
+
 module CustomInputs
   class CustomizedInput < SimpleForm::Inputs::StringInput
     def input_html_classes

data/test/support/misc_helpers.rb

@@ -255,6 +255,12 @@ module MiscHelpers
       f.input(attribute_name, options.merge(as: type))
     end
   end
+
+  def with_input_field_for(object, *args)
+    with_concat_form_for(object) do |f|
+      f.input_field(*args)
+    end
+  end
 end
 
 class CustomFormBuilder < SimpleForm::FormBuilder

data/test/support/models.rb

@@ -91,7 +91,7 @@ class User
     :post_count, :lock_version, :amount, :attempts, :action, :credit_card, :gender,
     :extra_special_company_id, :pictures, :picture_ids, :special_pictures,
     :special_picture_ids, :uuid, :friends, :friend_ids, :special_tags, :special_tag_ids,
-    :citext, :hstore, :json, :jsonb
+    :citext, :hstore, :json, :jsonb, :hourly, :favorite_color
 
   def self.build(extra_attributes = {})
     attributes = {
@@ -277,9 +277,6 @@ class ValidatingUser < User
     only_integer: true
   validates_length_of :name, maximum: 25, minimum: 5
   validates_length_of :description, in: 15..50
-  if ActionPack::VERSION::STRING < '5'
-    validates_length_of :action, maximum: 10, tokenizer: ->(str) { str.scan(/\w+/) }
-  end
   validates_length_of :home_picture, is: 12
 
   def min_amount

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_form
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.1.0
 platform: ruby
 authors:
 - José Valim
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-18 00:00:00.000000000 Z
+date: 2018-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -91,6 +91,7 @@ files:
 - lib/simple_form/inputs/collection_input.rb
 - lib/simple_form/inputs/collection_radio_buttons_input.rb
 - lib/simple_form/inputs/collection_select_input.rb
+- lib/simple_form/inputs/color_input.rb
 - lib/simple_form/inputs/date_time_input.rb
 - lib/simple_form/inputs/file_input.rb
 - lib/simple_form/inputs/grouped_collection_select_input.rb
@@ -129,6 +130,7 @@ files:
 - test/inputs/collection_check_boxes_input_test.rb
 - test/inputs/collection_radio_buttons_input_test.rb
 - test/inputs/collection_select_input_test.rb
+- test/inputs/color_input_test.rb
 - test/inputs/datetime_input_test.rb
 - test/inputs/disabled_test.rb
 - test/inputs/discovery_test.rb
@@ -168,45 +170,46 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: simple_form
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Forms made easy!
 test_files:
-- test/action_view_extensions/builder_test.rb
-- test/action_view_extensions/form_helper_test.rb
-- test/components/custom_components_test.rb
 - test/components/label_test.rb
-- test/form_builder/association_test.rb
-- test/form_builder/button_test.rb
-- test/form_builder/error_notification_test.rb
+- test/components/custom_components_test.rb
+- test/support/discovery_inputs.rb
+- test/support/misc_helpers.rb
+- test/support/mock_controller.rb
+- test/support/models.rb
+- test/test_helper.rb
 - test/form_builder/error_test.rb
-- test/form_builder/general_test.rb
 - test/form_builder/hint_test.rb
+- test/form_builder/error_notification_test.rb
+- test/form_builder/general_test.rb
+- test/form_builder/button_test.rb
 - test/form_builder/input_field_test.rb
 - test/form_builder/label_test.rb
 - test/form_builder/wrapper_test.rb
+- test/form_builder/association_test.rb
 - test/generators/simple_form_generator_test.rb
-- test/inputs/boolean_input_test.rb
+- test/action_view_extensions/builder_test.rb
+- test/action_view_extensions/form_helper_test.rb
+- test/simple_form_test.rb
+- test/inputs/string_input_test.rb
+- test/inputs/numeric_input_test.rb
+- test/inputs/readonly_test.rb
+- test/inputs/grouped_collection_select_input_test.rb
+- test/inputs/text_input_test.rb
 - test/inputs/collection_check_boxes_input_test.rb
-- test/inputs/collection_radio_buttons_input_test.rb
-- test/inputs/collection_select_input_test.rb
-- test/inputs/datetime_input_test.rb
+- test/inputs/boolean_input_test.rb
 - test/inputs/disabled_test.rb
 - test/inputs/discovery_test.rb
-- test/inputs/file_input_test.rb
+- test/inputs/collection_select_input_test.rb
 - test/inputs/general_test.rb
-- test/inputs/grouped_collection_select_input_test.rb
-- test/inputs/hidden_input_test.rb
-- test/inputs/numeric_input_test.rb
-- test/inputs/priority_input_test.rb
-- test/inputs/readonly_test.rb
+- test/inputs/color_input_test.rb
 - test/inputs/required_test.rb
-- test/inputs/string_input_test.rb
-- test/inputs/text_input_test.rb
-- test/simple_form_test.rb
-- test/support/discovery_inputs.rb
-- test/support/misc_helpers.rb
-- test/support/mock_controller.rb
-- test/support/models.rb
-- test/test_helper.rb
+- test/inputs/collection_radio_buttons_input_test.rb
+- test/inputs/priority_input_test.rb
+- test/inputs/hidden_input_test.rb
+- test/inputs/file_input_test.rb
+- test/inputs/datetime_input_test.rb