simple_form 3.5.0 → 3.5.1

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

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

data/test/support/mock_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class MockController
   attr_writer :action_name
 
@@ -20,7 +21,10 @@ class MockController
   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,6 +63,19 @@ Company = Struct.new(:id, :name) do
   end
 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; end
 
 TagGroup = Struct.new(:id, :name, :tags)
@@ -70,7 +90,7 @@ 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
 
   def self.build(extra_attributes = {})
     attributes = {
@@ -191,16 +211,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
 
@@ -226,8 +250,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
@@ -248,7 +272,7 @@ class ValidatingUser < User
   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+/) }
+    validates_length_of :action, maximum: 10, tokenizer: ->(str) { str.scan(/\w+/) }
   end
   validates_length_of :home_picture, is: 12
 
@@ -276,16 +300,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
 

data/test/test_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'bundler/setup'
 
 require 'minitest/autorun'
@@ -53,6 +54,7 @@ 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',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_form
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.5.1
 platform: ruby
 authors:
 - José Valim
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-17 00:00:00.000000000 Z
+date: 2018-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -179,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: simple_form
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Forms made easy!