simple_form 3.4.0 → 5.1.0

data/test/inputs/string_input_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # encoding: UTF-8
 require 'test_helper'
 
@@ -7,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]']"
@@ -37,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"]'
@@ -87,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
@@ -104,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
@@ -132,7 +126,7 @@ class StringInputTest < ActionView::TestCase
     end
   end
 
-  [:email, :url, :search, :tel].each do |type|
+  %i[email url search tel].each do |type|
     test "input allows type #{type}" do
       with_input_for @user, :name, type
       assert_select "input.string.#{type}"

data/test/inputs/text_input_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # encoding: UTF-8
 require 'test_helper'
 

data/test/simple_form_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 class SimpleFormTest < ActiveSupport::TestCase

data/test/support/discovery_inputs.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class StringInput < SimpleForm::Inputs::StringInput
   def input(wrapper_options = nil)
     "<section>#{super}</section>".html_safe
@@ -36,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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module MiscHelpers
   def store_translations(locale, translations, &block)
     I18n.backend.store_translations locale, translations
@@ -181,7 +182,7 @@ module MiscHelpers
   end
 
   def custom_wrapper_with_label_text
-    SimpleForm.build :label_text => proc { |label, required| "**#{label}**" } do |b|
+    SimpleForm.build label_text: proc { |label, required| "**#{label}**" } do |b|
       b.use :label_input
     end
   end
@@ -205,6 +206,20 @@ module MiscHelpers
     end
   end
 
+  def custom_wrapper_with_input_error_class
+    SimpleForm.build tag: :div, class: "custom_wrapper", error_class: :field_with_errors do |b|
+      b.use :label
+      b.use :input, class: 'inline-class', error_class: 'is-invalid'
+    end
+  end
+
+  def custom_wrapper_with_input_valid_class(valid_class: :field_without_errors)
+    SimpleForm.build tag: :div, class: "custom_wrapper", valid_class: valid_class do |b|
+      b.use :label
+      b.use :input, class: 'inline-class', valid_class: 'is-valid'
+    end
+  end
+
   def custom_form_for(object, *args, &block)
     simple_form_for(object, *args, { builder: CustomFormBuilder }, &block)
   end
@@ -240,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/mock_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class MockController
   attr_writer :action_name
 
@@ -9,7 +10,7 @@ class MockController
     defined?(@action_name) ? @action_name : "edit"
   end
 
-  def url_for(*args)
+  def url_for(*)
     "http://example.com"
   end
 
@@ -17,8 +18,13 @@ class MockController
     {}
   end
 
+  def polymorphic_mappings(*); {}; end
+
   def hash_for_user_path(*); end
+
   def hash_for_validating_user_path(*); end
+
   def hash_for_other_validating_user_path(*); end
+  
   def hash_for_users_path(*); end
 end

data/test/support/models.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Association = Struct.new(:klass, :name, :macro, :scope, :options)
 
 Column = Struct.new(:name, :type, :limit) do
@@ -7,7 +8,7 @@ Relation = Struct.new(:records) do
   delegate :each, to: :records
 
   def where(conditions = nil)
-    self.class.new conditions ? records.first : records
+    self.class.new conditions ? [records.first] : records
   end
 
   def order(conditions = nil)
@@ -18,6 +19,12 @@ Relation = Struct.new(:records) do
   alias_method :to_ary, :records
 end
 
+Decorator = Struct.new(:object) do
+  def to_model
+    object
+  end
+end
+
 Picture = Struct.new(:id, :name) do
   extend ActiveModel::Naming
   include ActiveModel::Conversion
@@ -56,7 +63,24 @@ Company = Struct.new(:id, :name) do
   end
 end
 
-class Tag < Company; end
+Friend = Struct.new(:id, :name) do
+  extend ActiveModel::Naming
+  include ActiveModel::Conversion
+
+  def self.all
+    (1..3).map { |i| new(i, "#{name} #{i}") }
+  end
+
+  def persisted?
+    true
+  end
+end
+
+class Tag < Company
+  def group_method
+    ["category-1"]
+  end
+end
 
 TagGroup = Struct.new(:id, :name, :tags)
 
@@ -70,7 +94,8 @@ class User
     :avatar, :home_picture, :email, :status, :residence_country, :phone_number,
     :post_count, :lock_version, :amount, :attempts, :action, :credit_card, :gender,
     :extra_special_company_id, :pictures, :picture_ids, :special_pictures,
-    :special_picture_ids, :uuid
+    :special_picture_ids, :uuid, :friends, :friend_ids, :special_tags, :special_tag_ids,
+    :citext, :hstore, :json, :jsonb, :hourly, :favorite_color
 
   def self.build(extra_attributes = {})
     attributes = {
@@ -121,13 +146,22 @@ class User
       when :attempts      then :integer
       when :action        then :string
       when :credit_card   then :string
-      when :uuid          then :uuid
+      else attribute.to_sym
     end
     Column.new(attribute, column_type, limit)
   end
 
   begin
     require 'active_model/type'
+    begin
+      ActiveModel::Type.lookup(:text)
+    rescue ArgumentError        # :text is no longer an ActiveModel::Type
+      # But we don't want our tests to depend on ActiveRecord
+      class ::ActiveModel::Type::Text < ActiveModel::Type::String
+        def type; :text; end
+      end
+      ActiveModel::Type.register(:text, ActiveModel::Type::Text)
+    end
     def type_for_attribute(attribute)
       column_type, limit = case attribute
         when 'name', 'status', 'password' then [:string, 100]
@@ -146,6 +180,10 @@ class User
         when 'action'        then :string
         when 'credit_card'   then :string
         when 'uuid'          then :string
+        when 'citext'        then :string
+        when 'hstore'        then [:text, 200]
+        when 'json'          then [:text, 200]
+        when 'jsonb'         then [:text, 200]
       end
 
       ActiveModel::Type.lookup(column_type, limit: limit)
@@ -158,14 +196,15 @@ class User
       when :name, :status, :password, :description, :age,
         :credit_limit, :active, :born_at, :delivery_time,
         :created_at, :updated_at, :lock_version, :home_picture,
-        :amount, :attempts, :action, :credit_card, :uuid then true
+        :amount, :attempts, :action, :credit_card, :uuid,
+        :citext, :hstore, :json, :jsonb then true
       else false
     end
   end
 
   def self.human_attribute_name(attribute, options = {})
     case attribute
-      when 'name'
+      when 'name', :name
         'Super User Name!'
       when 'description'
         'User Description!'
@@ -182,16 +221,20 @@ class User
         Association.new(Company, association, :belongs_to, nil, {})
       when :tags
         Association.new(Tag, association, :has_many, nil, {})
+      when :special_tags
+        Association.new(Tag, association, :has_many, ->(user) { where(id: user.id) }, {})
       when :first_company
         Association.new(Company, association, :has_one, nil, {})
       when :special_company
-        Association.new(Company, association, :belongs_to, nil, { conditions: { id: 1 } })
+        Association.new(Company, association, :belongs_to, nil, conditions: { id: 1 })
       when :extra_special_company
-        Association.new(Company, association, :belongs_to, nil, { conditions: proc { { id: self.id } } })
+        Association.new(Company, association, :belongs_to, nil, conditions: proc { { id: self.id } })
       when :pictures
         Association.new(Picture, association, :has_many, nil, {})
       when :special_pictures
         Association.new(Picture, association, :has_many, proc { where(name: self.name) }, {})
+      when :friends
+        Association.new(Friend, association, :has_many, nil, {})
     end
   end
 
@@ -217,8 +260,8 @@ class ValidatingUser < User
   include ActiveModel::Validations
   validates :name, presence: true
   validates :company, presence: true
-  validates :age, presence: true, if: Proc.new { |user| user.name }
-  validates :amount, presence: true, unless: Proc.new { |user| user.age }
+  validates :age, presence: true, if: proc { |user| user.name }
+  validates :amount, presence: true, unless: proc { |user| user.age }
 
   validates :action,            presence: true, on: :create
   validates :credit_limit,      presence: true, on: :save
@@ -238,9 +281,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: lambda { |str| str.scan(/\w+/) }
-  end
   validates_length_of :home_picture, is: 12
 
   def min_amount
@@ -267,16 +307,16 @@ class OtherValidatingUser < User
     less_than: 100,
     only_integer: true
   validates_numericality_of :amount,
-    greater_than: Proc.new { |user| user.age },
-    less_than: Proc.new { |user| user.age + 100 },
+    greater_than: proc { |user| user.age },
+    less_than: proc { |user| user.age + 100 },
     only_integer: true
   validates_numericality_of :attempts,
-    greater_than_or_equal_to: Proc.new { |user| user.age },
-    less_than_or_equal_to: Proc.new { |user| user.age + 100 },
+    greater_than_or_equal_to: proc { |user| user.age },
+    less_than_or_equal_to: proc { |user| user.age + 100 },
     only_integer: true
 
   validates_format_of :country, with: /\w+/
-  validates_format_of :name, with: Proc.new { /\w+/ }
+  validates_format_of :name, with: proc { /\w+/ }
   validates_format_of :description, without: /\d+/
 end
 
@@ -293,3 +333,25 @@ end
 
 class UserNumber1And2 < User
 end
+
+class UserWithAttachment < User
+  def avatar_attachment
+    OpenStruct.new
+  end
+
+  def avatars_attachments
+    OpenStruct.new
+  end
+
+  def remote_cover_url
+    "/uploads/cover.png"
+  end
+
+  def profile_image_attacher
+    OpenStruct.new
+  end
+
+  def portrait_file_name
+    "portrait.png"
+  end
+end

data/test/test_helper.rb

@@ -1,14 +1,13 @@
-require 'bundler/setup'
-
+# frozen_string_literal: true
 require 'minitest/autorun'
 
 require 'active_model'
 require 'action_controller'
 require 'action_view'
+
 ActionView::RoutingUrlFor.send(:include, ActionDispatch::Routing::UrlFor)
 
 require 'action_view/template'
-
 require 'action_view/test_case'
 
 module Rails
@@ -40,10 +39,14 @@ if ActiveSupport::TestCase.respond_to?(:test_order=)
   ActiveSupport::TestCase.test_order = :random
 end
 
+require "rails/test_unit/line_filtering"
+
 class ActionView::TestCase
   include MiscHelpers
   include SimpleForm::ActionViewExtensions::FormHelper
 
+  extend Rails::LineFiltering
+
   setup :set_controller
   setup :setup_users
 
@@ -53,10 +56,11 @@ class ActionView::TestCase
 
   def setup_users(extra_attributes = {})
     @user = User.build(extra_attributes)
+    @decorated_user = Decorator.new(@user)
 
     @validating_user = ValidatingUser.build({
       name: 'Tester McTesterson',
-      description: 'A test user of the most distinguised caliber',
+      description: 'A test user of the most distinguished caliber',
       home_picture: 'Home picture',
       age: 19,
       amount: 15,
@@ -87,4 +91,5 @@ class ActionView::TestCase
   alias :validating_user_path :user_path
   alias :validating_users_path :user_path
   alias :other_validating_user_path :user_path
+  alias :user_with_attachment_path :user_path
 end

metadata

@@ -1,59 +1,47 @@
 --- !ruby/object:Gem::Specification
 name: simple_form
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 5.1.0
 platform: ruby
 authors:
 - José Valim
 - Carlos Antônio
 - Rafael França
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-01-06 00:00:00.000000000 Z
+date: 2021-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '4'
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '4'
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 description: Forms made easy!
-email: opensource@plataformatec.com.br
+email: heartcombo@googlegroups.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -94,7 +82,6 @@ files:
 - lib/simple_form/helpers/readonly.rb
 - lib/simple_form/helpers/required.rb
 - lib/simple_form/helpers/validators.rb
-- lib/simple_form/i18n_cache.rb
 - lib/simple_form/inputs.rb
 - lib/simple_form/inputs/base.rb
 - lib/simple_form/inputs/block_input.rb
@@ -103,6 +90,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
@@ -111,6 +99,7 @@ files:
 - lib/simple_form/inputs/password_input.rb
 - lib/simple_form/inputs/priority_input.rb
 - lib/simple_form/inputs/range_input.rb
+- lib/simple_form/inputs/rich_text_area_input.rb
 - lib/simple_form/inputs/string_input.rb
 - lib/simple_form/inputs/text_input.rb
 - lib/simple_form/map_type.rb
@@ -125,6 +114,7 @@ files:
 - lib/simple_form/wrappers/single.rb
 - 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
@@ -140,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
@@ -151,6 +142,7 @@ files:
 - test/inputs/priority_input_test.rb
 - test/inputs/readonly_test.rb
 - test/inputs/required_test.rb
+- test/inputs/rich_text_area_input_test.rb
 - test/inputs/string_input_test.rb
 - test/inputs/text_input_test.rb
 - test/simple_form_test.rb
@@ -159,11 +151,11 @@ files:
 - test/support/mock_controller.rb
 - test/support/models.rb
 - test/test_helper.rb
-homepage: https://github.com/plataformatec/simple_form
+homepage: https://github.com/heartcombo/simple_form
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -171,52 +163,54 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: simple_form
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.2.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/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/rich_text_area_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

data/lib/simple_form/i18n_cache.rb

@@ -1,22 +0,0 @@
-module SimpleForm
-  # A lot of configuration values are retrived from I18n,
-  # like boolean collection, required string. This module provides
-  # caching facility to speed up form construction.
-  module I18nCache
-    def i18n_cache(key)
-      get_i18n_cache(key)[I18n.locale] ||= yield.freeze
-    end
-
-    def get_i18n_cache(key)
-      if class_variable_defined?(:"@@#{key}")
-        class_variable_get(:"@@#{key}")
-      else
-        reset_i18n_cache(key)
-      end
-    end
-
-    def reset_i18n_cache(key)
-      class_variable_set(:"@@#{key}", {})
-    end
-  end
-end