simple_form 3.1.0 → 3.5.0

data/test/support/misc_helpers.rb

@@ -46,7 +46,7 @@ module MiscHelpers
     end
   end
 
-  def swap_wrapper(name = :default, wrapper = self.custom_wrapper)
+  def swap_wrapper(name = :default, wrapper = custom_wrapper)
     old = SimpleForm.wrappers[name.to_s]
     SimpleForm.wrappers[name.to_s] = wrapper
     yield
@@ -91,6 +91,20 @@ module MiscHelpers
     end
   end
 
+  def custom_wrapper_with_input_data_modal
+    SimpleForm.build tag: :div, class: "custom_wrapper" do |b|
+      b.use :label
+      b.use :input, data: { modal: 'data-modal', wrapper: 'data-wrapper' }
+    end
+  end
+
+  def custom_wrapper_with_input_aria_modal
+    SimpleForm.build tag: :div, class: "custom_wrapper" do |b|
+      b.use :label
+      b.use :input, aria: { modal: 'aria-modal', wrapper: 'aria-wrapper' }
+    end
+  end
+
   def custom_wrapper_with_label_class
     SimpleForm.build tag: :div, class: "custom_wrapper" do |b|
       b.use :label, class: 'inline-class'
@@ -184,6 +198,13 @@ module MiscHelpers
     end
   end
 
+  def custom_wrapper_with_required_input
+    SimpleForm.build tag: :span, class: 'custom_wrapper' do |b|
+      b.use :html5
+      b.use :input, required: true
+    end
+  end
+
   def custom_form_for(object, *args, &block)
     simple_form_for(object, *args, { builder: CustomFormBuilder }, &block)
   end

data/test/support/mock_controller.rb

@@ -9,7 +9,7 @@ class MockController
     defined?(@action_name) ? @action_name : "edit"
   end
 
-  def url_for(*args)
+  def url_for(*)
     "http://example.com"
   end
 
@@ -17,6 +17,8 @@ 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

data/test/support/models.rb

@@ -1,10 +1,6 @@
 Association = Struct.new(:klass, :name, :macro, :scope, :options)
 
 Column = Struct.new(:name, :type, :limit) do
-  # Returns +true+ if the column is either of type integer, float or decimal.
-  def number?
-    type == :integer || type == :float || type == :decimal
-  end
 end
 
 Relation = Struct.new(:records) do
@@ -130,6 +126,42 @@ class User
     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]
+        when 'description'   then [:text, 200]
+        when 'age'           then :integer
+        when 'credit_limit'  then [:decimal, 15]
+        when 'active'        then :boolean
+        when 'born_at'       then :date
+        when 'delivery_time' then :time
+        when 'created_at'    then :datetime
+        when 'updated_at'    then :datetime
+        when 'lock_version'  then :integer
+        when 'home_picture'  then :string
+        when 'amount'        then :integer
+        when 'attempts'      then :integer
+        when 'action'        then :string
+        when 'credit_card'   then :string
+        when 'uuid'          then :string
+      end
+
+      ActiveModel::Type.lookup(column_type, limit: limit)
+    end
+  rescue LoadError
+  end
+
   def has_attribute?(attribute)
     case attribute.to_sym
       when :name, :status, :password, :description, :age,
@@ -213,9 +245,11 @@ 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 :action, maximum: 10, tokenizer: lambda { |str| str.scan(/\w+/) }
+  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

data/test/test_helper.rb

@@ -36,6 +36,10 @@ else
   ActionDispatch::Assertions::NO_STRIP << "label"
 end
 
+if ActiveSupport::TestCase.respond_to?(:test_order=)
+  ActiveSupport::TestCase.test_order = :random
+end
+
 class ActionView::TestCase
   include MiscHelpers
   include SimpleForm::ActionViewExtensions::FormHelper
@@ -51,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.1.0
+  version: 3.5.0
 platform: ruby
 authors:
 - José Valim
@@ -10,36 +10,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-25 00:00:00.000000000 Z
+date: 2017-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        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: '4.0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        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: '4.0'
+        version: '5.2'
 description: Forms made easy!
 email: opensource@plataformatec.com.br
 executables: []
@@ -70,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
@@ -166,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: simple_form
-rubygems_version: 2.2.2
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Forms made easy!