simple_form 3.4.0 → 4.0.0

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,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
 
   def self.build(extra_attributes = {})
     attributes = {
@@ -121,13 +142,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 +176,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,7 +192,8 @@ 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
@@ -182,16 +217,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 +256,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
@@ -239,7 +278,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
 
@@ -267,16 +306,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.4.0
+  version: 4.0.0
 platform: ruby
 authors:
 - José Valim
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-06 00:00:00.000000000 Z
+date: 2018-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -19,9 +19,6 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '4'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,9 +26,6 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '4'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
@@ -39,9 +33,6 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '4'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,9 +40,6 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '4'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.1'
 description: Forms made easy!
 email: opensource@plataformatec.com.br
 executables: []
@@ -125,6 +113,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
@@ -179,13 +168,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: simple_form
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 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/custom_components_test.rb
 - test/components/label_test.rb
 - test/form_builder/association_test.rb
 - test/form_builder/button_test.rb