simple_form 3.3.1 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d026bcdacbcb386673f3785a25ef90cfd238ad9
-  data.tar.gz: d1172ebf284c52c339aa055de433138c49b65f55
+  metadata.gz: 534c9396c2be271ccbb32518e9e5026b5ff523e1
+  data.tar.gz: bb8085d4a664110a941f6cd7e732db16f9eef1ec
 SHA512:
-  metadata.gz: e18ee8cf266597533f6b732a544299eb46168013c6c20cbea36805b5da7c2d419ed2403011f22b015fbf26aa1a6d02ef71f3a4ad9ead7b60e4966bfec41c3d5a
-  data.tar.gz: 21e536b6a81a608cf18c472cccc78c3e49ca382afb398867fbf74a2f5e9614d87ebc40602051fdec005810f39b49d8cfa2302259bc4ceef3f9a6536941c641c5
+  metadata.gz: d8e81c8af57b65150d3b9a53433c9d9adb3c5d64fa00ae70b1263a33ce05173d2dc65775ab66e91507d1db452e0f59cb254c0b5eb1ca905ec4b95bbc4eb98282
+  data.tar.gz: 249e0e56f352267ab529db921125ac214d6baeb17153278cba26c61951ce31867cf9d94b4188dab9e50457d2e23d6aebabacf29e475b31c8f7c85c382ab318f2

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## Unreleased
 
+## 3.4.0
+
+* Removed Ruby 2.4.0 `Integer` unification deprecation warning.
+* Removed EOL Ruby 1.9.3 from the build matrix.
+* Added `minlength` component.
+* `boolean_label_class` can be set on a per-input basis.
+
 ## 3.3.1
 
 ### Bug fix

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

@@ -28,8 +28,12 @@ SimpleForm.setup do |config|
     # extensions by default, you can change `b.optional` to `b.use`.
 
     # Calculates maxlength from length validations for string inputs
+    # and/or database column lengths
     b.optional :maxlength
 
+    # Calculate minlength from length validations for string inputs
+    b.optional :minlength
+
     # Calculates pattern from format validations for string inputs
     b.optional :pattern
 

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

@@ -8,6 +8,7 @@ SimpleForm.setup do |config|
     b.use :html5
     b.use :placeholder
     b.optional :maxlength
+    b.optional :minlength
     b.optional :pattern
     b.optional :min_max
     b.optional :readonly
@@ -22,6 +23,7 @@ SimpleForm.setup do |config|
     b.use :html5
     b.use :placeholder
     b.optional :maxlength
+    b.optional :minlength
     b.optional :readonly
     b.use :label, class: 'control-label'
 
@@ -55,6 +57,7 @@ SimpleForm.setup do |config|
     b.use :html5
     b.use :placeholder
     b.optional :maxlength
+    b.optional :minlength
     b.optional :pattern
     b.optional :min_max
     b.optional :readonly
@@ -71,6 +74,7 @@ SimpleForm.setup do |config|
     b.use :html5
     b.use :placeholder
     b.optional :maxlength
+    b.optional :minlength
     b.optional :readonly
     b.use :label, class: 'col-sm-3 control-label'
 
@@ -112,6 +116,7 @@ SimpleForm.setup do |config|
     b.use :html5
     b.use :placeholder
     b.optional :maxlength
+    b.optional :minlength
     b.optional :pattern
     b.optional :min_max
     b.optional :readonly

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

@@ -11,6 +11,7 @@ SimpleForm.setup do |config|
     b.use :html5
     b.use :placeholder
     b.optional :maxlength
+    b.optional :minlength
     b.optional :pattern
     b.optional :min_max
     b.optional :readonly
@@ -24,6 +25,7 @@ SimpleForm.setup do |config|
     b.use :html5
     b.use :placeholder
     b.optional :maxlength
+    b.optional :minlength
     b.optional :pattern
     b.optional :min_max
     b.optional :readonly
@@ -65,6 +67,7 @@ SimpleForm.setup do |config|
     b.use :html5
     b.use :placeholder
     b.optional :maxlength
+    b.optional :minlength
     b.optional :pattern
     b.optional :min_max
     b.optional :readonly

data/lib/simple_form.rb

@@ -232,6 +232,7 @@ See https://github.com/plataformatec/simple_form/pull/997 for more information.
 
     b.use :min_max
     b.use :maxlength
+    b.use :minlength
     b.use :placeholder
     b.optional :pattern
     b.optional :readonly

data/lib/simple_form/components.rb

@@ -15,6 +15,7 @@ module SimpleForm
     autoload :Labels
     autoload :MinMax
     autoload :Maxlength
+    autoload :Minlength
     autoload :Pattern
     autoload :Placeholders
     autoload :Readonly

data/lib/simple_form/components/minlength.rb

@@ -0,0 +1,47 @@
+module SimpleForm
+  module Components
+    # Needs to be enabled in order to do automatic lookups.
+    module Minlength
+      def minlength(wrapper_options = nil)
+        input_html_options[:minlength] ||= minimum_length_from_validation || limit
+        nil
+      end
+
+      private
+
+      def minimum_length_from_validation
+        minlength = options[:minlength]
+        if minlength.is_a?(String) || minlength.is_a?(Integer)
+          minlength
+        else
+          length_validator = find_length_validator
+          minimum_length_value_from(length_validator)
+        end
+      end
+
+      def find_length_validator
+        find_validator(:length)
+      end
+
+      def has_tokenizer?(length_validator)
+        length_validator.options[:tokenizer]
+      end
+
+      # Use validation with tokenizer if version of Rails is less than 5,
+      # if not validate without the tokenizer, if version is greater than Rails 4.
+      if ActionPack::VERSION::STRING < '5'
+        def minimum_length_value_from(length_validator)
+          if length_validator && !has_tokenizer?(length_validator)
+            length_validator.options[:is] || length_validator.options[:minimum]
+          end
+        end
+      elsif ActionPack::VERSION::STRING >= '5'
+        def minimum_length_value_from(length_validator)
+          if length_validator
+            length_validator.options[:is] || length_validator.options[:minimum]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/simple_form/form_builder.rb

@@ -12,7 +12,7 @@ module SimpleForm
       'update' => 'edit'
     }
 
-    ATTRIBUTE_COMPONENTS = [:html5, :min_max, :maxlength, :placeholder, :pattern, :readonly]
+    ATTRIBUTE_COMPONENTS = [:html5, :min_max, :maxlength, :minlength, :placeholder, :pattern, :readonly]
 
     extend MapType
     include SimpleForm::Inputs

data/lib/simple_form/inputs/base.rb

@@ -21,6 +21,7 @@ module SimpleForm
       include SimpleForm::Components::HTML5
       include SimpleForm::Components::LabelInput
       include SimpleForm::Components::Maxlength
+      include SimpleForm::Components::Minlength
       include SimpleForm::Components::MinMax
       include SimpleForm::Components::Pattern
       include SimpleForm::Components::Placeholders
@@ -50,7 +51,7 @@ module SimpleForm
       enable :hint
 
       # Usually disabled, needs to be enabled explicitly passing true as option.
-      disable :maxlength, :placeholder, :pattern, :min_max
+      disable :maxlength, :minlength, :placeholder, :pattern, :min_max
 
       def initialize(builder, attribute_name, column, input_type, options = {})
         super

data/lib/simple_form/inputs/boolean_input.rb

@@ -6,7 +6,7 @@ module SimpleForm
 
         if nested_boolean_style?
           build_hidden_field_for_checkbox +
-            template.label_tag(nil, class: SimpleForm.boolean_label_class) {
+            template.label_tag(nil, class: boolean_label_class) {
               build_check_box_without_hidden_field(merged_input_options) +
                 inline_label
             }
@@ -21,7 +21,7 @@ module SimpleForm
         elsif nested_boolean_style?
           html_options = label_html_options.dup
           html_options[:class] ||= []
-          html_options[:class].push(SimpleForm.boolean_label_class) if SimpleForm.boolean_label_class
+          html_options[:class].push(boolean_label_class) if boolean_label_class
 
           merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)
 
@@ -36,6 +36,10 @@ module SimpleForm
 
       private
 
+      def boolean_label_class
+        options[:boolean_label_class] || SimpleForm.boolean_label_class
+      end
+
       # Build a checkbox tag using default unchecked value. This allows us to
       # reuse the method for nested boolean style, but with no unchecked value,
       # which won't generate the hidden checkbox. This is the default functionality

data/lib/simple_form/inputs/collection_input.rb

@@ -1,6 +1,9 @@
 module SimpleForm
   module Inputs
     class CollectionInput < Base
+      BASIC_OBJECT_CLASSES = [String, Integer, Float, NilClass, Symbol, TrueClass, FalseClass]
+      BASIC_OBJECT_CLASSES.push(Fixnum, Bignum) unless 1.class == Integer
+
       # Default boolean collection for use with selects/radios when no
       # collection is given. Always fallback to this boolean collection.
       # Texts can be translated using i18n in "simple_form.yes" and
@@ -90,9 +93,7 @@ module SimpleForm
       end
 
       def collection_includes_basic_objects?(collection_classes)
-        (collection_classes & [
-          String, Integer, Fixnum, Bignum, Float, NilClass, Symbol, TrueClass, FalseClass
-        ]).any?
+        (collection_classes & BASIC_OBJECT_CLASSES).any?
       end
 
       def translate_collection

data/lib/simple_form/inputs/password_input.rb

@@ -1,7 +1,7 @@
 module SimpleForm
   module Inputs
     class PasswordInput < Base
-      enable :placeholder, :maxlength
+      enable :placeholder, :maxlength, :minlength
 
       def input(wrapper_options = nil)
         merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)

data/lib/simple_form/inputs/string_input.rb

@@ -1,7 +1,7 @@
 module SimpleForm
   module Inputs
     class StringInput < Base
-      enable :placeholder, :maxlength, :pattern
+      enable :placeholder, :maxlength, :minlength, :pattern
 
       def input(wrapper_options = nil)
         unless string?

data/lib/simple_form/inputs/text_input.rb

@@ -1,7 +1,7 @@
 module SimpleForm
   module Inputs
     class TextInput < Base
-      enable :placeholder, :maxlength
+      enable :placeholder, :maxlength, :minlength
 
       def input(wrapper_options = nil)
         merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)

data/lib/simple_form/version.rb

@@ -1,3 +1,3 @@
 module SimpleForm
-  VERSION = "3.3.1".freeze
+  VERSION = "3.4.0".freeze
 end

data/test/form_builder/input_field_test.rb

@@ -87,7 +87,7 @@ class InputFieldTest < ActionView::TestCase
     assert_select 'input[pattern="\w+"]'
   end
 
-  test 'builder input_field accepts custom patter' do
+  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+"]'
@@ -105,6 +105,12 @@ class InputFieldTest < ActionView::TestCase
     assert_select 'input.string[maxlength="25"]'
   end
 
+  test 'builder input_field uses minlength component' do
+    with_input_field_for @validating_user, :name, as: :string
+
+    assert_select 'input.string[minlength="5"]'
+  end
+
   test 'builder collection input_field generates input tag with a clean HTML' do
     with_input_field_for @user, :status, collection: ['Open', 'Closed'],
       class: 'status', label_method: :to_s, value_method: :to_s
@@ -151,6 +157,14 @@ class InputFieldTest < ActionView::TestCase
     end
   end
 
+  test 'build input_field without minlength component use the minlength string' do
+    swap_wrapper :default, custom_wrapper_with_html5_components do
+      with_input_field_for @user, :name, minlength: 5
+
+      assert_select 'input[minlength="5"]'
+    end
+  end
+
   test 'build input_field without readonly component use the readonly string' do
     swap_wrapper :default, custom_wrapper_with_html5_components do
       with_input_field_for @user, :name, readonly: true

data/test/inputs/boolean_input_test.rb

@@ -164,6 +164,16 @@ class BooleanInputTest < ActionView::TestCase
     end
   end
 
+  test 'input boolean allows specifying boolean_label_class on a per-input basis' do
+    swap_wrapper do
+      swap SimpleForm, boolean_style: :nested, boolean_label_class: 'foo' do
+        with_input_for @user, :active, :boolean, boolean_label_class: 'baz'
+
+        assert_select 'label.boolean + input[type=hidden] + label.baz > input.boolean'
+      end
+    end
+  end
+
   test 'input boolean with nested style works using :input only in wrapper config (no label_input), adding the extra label wrapper with custom class' do
     swap_wrapper do
       swap SimpleForm, boolean_style: :nested, boolean_label_class: 'foo' do

data/test/inputs/string_input_test.rb

@@ -32,11 +32,21 @@ class StringInputTest < ActionView::TestCase
     assert_select 'input.string[maxlength="25"]'
   end
 
+  test 'input infers minlength column definition from validation when present' do
+    with_input_for @validating_user, :name, :string
+    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
@@ -44,6 +54,11 @@ class StringInputTest < ActionView::TestCase
     assert_select 'input.string[maxlength="12"]'
   end
 
+  test 'input gets minlength from validation when :is option present' do
+    with_input_for @validating_user, :home_picture, :string
+    assert_select 'input.string[minlength="12"]'
+  end
+
   test 'input maxlength is the column limit plus one to make room for decimal point' do
     with_input_for @user, :credit_limit, :string
 

data/test/inputs/text_input_test.rb

@@ -28,4 +28,9 @@ class TextInputTest < ActionView::TestCase
     with_input_for @validating_user, :description, :text
     assert_select 'textarea.text[maxlength="50"]'
   end
+
+  test 'input infers minlength column definition from validation when present for text attributes' do
+    with_input_for @validating_user, :description, :text
+    assert_select 'textarea.text[minlength="15"]'
+  end
 end

data/test/support/models.rb

@@ -236,8 +236,8 @@ class ValidatingUser < User
     greater_than_or_equal_to: :min_attempts,
     less_than_or_equal_to: :max_attempts,
     only_integer: true
-  validates_length_of :name, maximum: 25
-  validates_length_of :description, maximum: 50
+  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: lambda { |str| str.scan(/\w+/) }
   end

data/test/test_helper.rb

@@ -55,6 +55,8 @@ class ActionView::TestCase
     @user = User.build(extra_attributes)
 
     @validating_user = ValidatingUser.build({
+      name: 'Tester McTesterson',
+      description: 'A test user of the most distinguised caliber',
       home_picture: 'Home picture',
       age: 19,
       amount: 15,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_form
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.4.0
 platform: ruby
 authors:
 - José Valim
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-26 00:00:00.000000000 Z
+date: 2017-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -82,6 +82,7 @@ files:
 - lib/simple_form/components/labels.rb
 - lib/simple_form/components/maxlength.rb
 - lib/simple_form/components/min_max.rb
+- lib/simple_form/components/minlength.rb
 - lib/simple_form/components/pattern.rb
 - lib/simple_form/components/placeholders.rb
 - lib/simple_form/components/readonly.rb
@@ -178,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: simple_form
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Forms made easy!