simple_form 4.1.0 → 5.1.0

data/test/inputs/collection_radio_buttons_input_test.rb

@@ -3,10 +3,6 @@
 require 'test_helper'
 
 class CollectionRadioButtonsInputTest < ActionView::TestCase
-  setup do
-    SimpleForm::Inputs::CollectionRadioButtonsInput.reset_i18n_cache :boolean_collection
-  end
-
   test 'input generates boolean radio buttons by default for radio types' do
     with_input_for @user, :active, :radio_buttons
     assert_select 'input[type=radio][value=true].radio_buttons#user_active_true'
@@ -439,4 +435,12 @@ class CollectionRadioButtonsInputTest < ActionView::TestCase
       assert_select 'span.radio > label', '200'
     end
   end
+
+  test 'input check boxes with inline style support label custom classes' do
+    swap SimpleForm, boolean_style: :inline do
+      with_input_for @user, :gender, :radio_buttons, collection: %i[male female], item_label_class: 'beautiful-label'
+
+      assert_select 'label.beautiful-label', count: 2
+    end
+  end
 end

data/test/inputs/collection_select_input_test.rb

@@ -3,10 +3,6 @@
 require 'test_helper'
 
 class CollectionSelectInputTest < ActionView::TestCase
-  setup do
-    SimpleForm::Inputs::CollectionSelectInput.reset_i18n_cache :boolean_collection
-  end
-
   test 'input generates a boolean select with options by default for select types' do
     with_input_for @user, :active, :select
     assert_select 'select.select#user_active'
@@ -284,6 +280,12 @@ class CollectionSelectInputTest < ActionView::TestCase
     assert_select 'select[required]'
   end
 
+  test "collection input generated aria-label should contain 'true'" do
+    with_input_for @user, :age, :select, collection: 18..30, prompt: "Please select foo"
+    assert_select 'select.required'
+    assert_select 'select[aria-required=true]'
+  end
+
   test 'collection input with select type does not generate required html attribute without blank option' do
     with_input_for @user, :name, :select, include_blank: false, collection: %w[Jose Carlos]
     assert_select 'select.required'

data/test/inputs/priority_input_test.rb

@@ -36,15 +36,15 @@ class PriorityInputTest < ActionView::TestCase
     assert_no_select 'select option[value=""]', /^$/
   end
 
-  test 'priority input does not generate invalid required html attribute' do
+  test 'priority input does generate select element with required html attribute' do
     with_input_for @user, :country, :country
     assert_select 'select.required'
-    assert_no_select 'select[required]'
+    assert_select 'select[required]'
   end
 
-  test 'priority input does not generate invalid aria-required html attribute' do
+  test 'priority input does generate select element with aria-required html attribute' do
     with_input_for @user, :country, :country
     assert_select 'select.required'
-    assert_no_select 'select[aria-required]'
+    assert_select 'select[aria-required]'
   end
 end

data/test/inputs/rich_text_area_input_test.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+# encoding: UTF-8
+require 'test_helper'
+
+class RichTextAreaInputTest < ActionView::TestCase
+  test 'input generates a text area for text attributes' do
+    with_input_for @user, :description, :text
+    assert_select 'textarea.text#user_description'
+  end
+
+  test 'input generates a text area for text attributes that accept placeholder' do
+    with_input_for @user, :description, :text, placeholder: 'Put in some text'
+    assert_select 'textarea.text[placeholder="Put in some text"]'
+  end
+end

data/test/support/misc_helpers.rb

@@ -213,8 +213,8 @@ module MiscHelpers
     end
   end
 
-  def custom_wrapper_with_input_valid_class
-    SimpleForm.build tag: :div, class: "custom_wrapper", valid_class: :field_without_errors do |b|
+  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

data/test/support/models.rb

@@ -76,7 +76,11 @@ Friend = Struct.new(:id, :name) do
   end
 end
 
-class Tag < Company; end
+class Tag < Company
+  def group_method
+    ["category-1"]
+  end
+end
 
 TagGroup = Struct.new(:id, :name, :tags)
 
@@ -200,7 +204,7 @@ class User
 
   def self.human_attribute_name(attribute, options = {})
     case attribute
-      when 'name'
+      when 'name', :name
         'Super User Name!'
       when 'description'
         'User Description!'
@@ -329,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,15 +1,13 @@
 # frozen_string_literal: true
-require 'bundler/setup'
-
 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
@@ -41,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
 
@@ -58,7 +60,7 @@ class ActionView::TestCase
 
     @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,
@@ -89,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,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: simple_form
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 5.1.0
 platform: ruby
 authors:
 - José Valim
 - Carlos Antônio
 - Rafael França
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-22 00:00:00.000000000 Z
+date: 2021-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -18,30 +18,30 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
 description: Forms made easy!
-email: opensource@plataformatec.com.br
+email: heartcombo@googlegroups.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -82,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
@@ -100,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
@@ -142,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
@@ -150,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
@@ -162,16 +163,15 @@ 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.7.6
-signing_key: 
+rubygems_version: 3.2.6
+signing_key:
 specification_version: 4
 summary: Forms made easy!
 test_files:
@@ -197,6 +197,7 @@ test_files:
 - 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

data/lib/simple_form/i18n_cache.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-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