simple_form 3.0.1 → 4.0.0

data/test/support/models.rb

@@ -1,22 +1,45 @@
-Association = Struct.new(:klass, :name, :macro, :options)
+# frozen_string_literal: true
+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(:all) do
+Relation = Struct.new(:records) do
+  delegate :each, to: :records
+
   def where(conditions = nil)
-    self.class.new conditions ? all.first : all
+    self.class.new conditions ? [records.first] : records
   end
 
   def order(conditions = nil)
-    self.class.new conditions ? all.last : all
+    self.class.new conditions ? records.last : records
   end
 
-  alias_method :to_a, :all
+  alias_method :to_a,   :records
+  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
+
+  def self.where(conditions = nil)
+    if conditions.is_a?(Hash) && conditions[:name]
+      all.to_a.last
+    else
+      all
+    end
+  end
+
+  def self.all
+    Relation.new((1..3).map { |i| new(i, "#{name} #{i}") })
+  end
 end
 
 Company = Struct.new(:id, :name) do
@@ -28,8 +51,21 @@ Company = Struct.new(:id, :name) do
   end
 
   def self._relation
-    Relation.new(all)
+    all
+  end
+
+  def self.all
+    Relation.new((1..3).map { |i| new(i, "#{name} #{i}") })
+  end
+
+  def persisted?
+    true
   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}") }
@@ -53,7 +89,9 @@ class User
     :delivery_time, :born_at, :special_company_id, :country, :tags, :tag_ids,
     :avatar, :home_picture, :email, :status, :residence_country, :phone_number,
     :post_count, :lock_version, :amount, :attempts, :action, :credit_card, :gender,
-    :extra_special_company_id
+    :extra_special_company_id, :pictures, :picture_ids, :special_pictures,
+    :special_picture_ids, :uuid, :friends, :friend_ids, :special_tags, :special_tag_ids,
+    :citext, :hstore, :json, :jsonb
 
   def self.build(extra_attributes = {})
     attributes = {
@@ -66,7 +104,7 @@ class User
     new attributes
   end
 
-  def initialize(options={})
+  def initialize(options = {})
     @new_record = false
     options.each do |key, value|
       send("#{key}=", value)
@@ -104,11 +142,63 @@ class User
       when :attempts      then :integer
       when :action        then :string
       when :credit_card   then :string
+      else attribute.to_sym
     end
     Column.new(attribute, column_type, limit)
   end
 
-  def self.human_attribute_name(attribute)
+  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
+        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)
+    end
+  rescue LoadError
+  end
+
+  def has_attribute?(attribute)
+    case attribute.to_sym
+      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,
+        :citext, :hstore, :json, :jsonb then true
+      else false
+    end
+  end
+
+  def self.human_attribute_name(attribute, options = {})
     case attribute
       when 'name'
         'Super User Name!'
@@ -117,35 +207,43 @@ class User
       when 'company'
         'Company Human Name!'
       else
-        attribute.humanize
+        attribute.to_s.humanize
     end
   end
 
   def self.reflect_on_association(association)
     case association
       when :company
-        Association.new(Company, association, :belongs_to, {})
+        Association.new(Company, association, :belongs_to, nil, {})
       when :tags
-        Association.new(Tag, association, :has_many, {})
+        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, {})
+        Association.new(Company, association, :has_one, nil, {})
       when :special_company
-        Association.new(Company, association, :belongs_to, { conditions: { id: 1 } })
+        Association.new(Company, association, :belongs_to, nil, conditions: { id: 1 })
       when :extra_special_company
-        Association.new(Company, association, :belongs_to, { conditions: proc { { id: 1 } } })
+        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
 
   def errors
     @errors ||= begin
-      hash = Hash.new { |h,k| h[k] = [] }
-      hash.merge!(
-        name: ["can't be blank"],
-        description: ["must be longer than 15 characters"],
-        age: ["is not a number", "must be greater than 18"],
-        company: ["company must be present"],
-        company_id: ["must be valid"]
-      )
+      errors = ActiveModel::Errors.new(self)
+      errors.add(:name, "cannot be blank")
+      errors.add(:description, 'must be longer than 15 characters')
+      errors.add(:age, 'is not a number')
+      errors.add(:age, 'must be greater than 18')
+      errors.add(:company, 'company must be present')
+      errors.add(:company_id, 'must be valid')
+      errors
     end
   end
 
@@ -158,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
@@ -177,9 +275,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: ->(str) { str.scan(/\w+/) }
+  end
   validates_length_of :home_picture, is: 12
 
   def min_amount
@@ -206,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'
@@ -5,6 +6,8 @@ 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'
@@ -28,7 +31,15 @@ I18n.default_locale = :en
 
 require 'country_select'
 
-ActionDispatch::Assertions::NO_STRIP << "label"
+if defined?(HTMLSelector::NO_STRIP)
+  HTMLSelector::NO_STRIP << "label"
+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
@@ -43,8 +54,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',
       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.0.1
+  version: 4.0.0
 platform: ruby
 authors:
 - José Valim
@@ -10,50 +10,38 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-29 00:00:00.000000000 Z
+date: 2018-04-11 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.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-    - - <
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-    - - <
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 4.0.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4'
 description: Forms made easy!
-email: contact@plataformatec.com.br
+email: opensource@plataformatec.com.br
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -61,7 +49,9 @@ files:
 - CHANGELOG.md
 - MIT-LICENSE
 - README.md
+- lib/generators/simple_form/USAGE
 - lib/generators/simple_form/install_generator.rb
+- lib/generators/simple_form/templates/README
 - lib/generators/simple_form/templates/_form.html.erb
 - lib/generators/simple_form/templates/_form.html.haml
 - lib/generators/simple_form/templates/_form.html.slim
@@ -69,10 +59,10 @@ files:
 - lib/generators/simple_form/templates/config/initializers/simple_form_bootstrap.rb
 - lib/generators/simple_form/templates/config/initializers/simple_form_foundation.rb
 - lib/generators/simple_form/templates/config/locales/simple_form.en.yml
-- lib/generators/simple_form/templates/README
-- lib/generators/simple_form/USAGE
+- lib/simple_form.rb
 - lib/simple_form/action_view_extensions/builder.rb
 - lib/simple_form/action_view_extensions/form_helper.rb
+- lib/simple_form/components.rb
 - lib/simple_form/components/errors.rb
 - lib/simple_form/components/hints.rb
 - lib/simple_form/components/html5.rb
@@ -80,19 +70,20 @@ 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
-- lib/simple_form/components.rb
 - lib/simple_form/error_notification.rb
 - lib/simple_form/form_builder.rb
+- lib/simple_form/helpers.rb
 - lib/simple_form/helpers/autofocus.rb
 - lib/simple_form/helpers/disabled.rb
 - lib/simple_form/helpers/readonly.rb
 - lib/simple_form/helpers/required.rb
 - lib/simple_form/helpers/validators.rb
-- lib/simple_form/helpers.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
 - lib/simple_form/inputs/boolean_input.rb
@@ -110,19 +101,19 @@ files:
 - lib/simple_form/inputs/range_input.rb
 - lib/simple_form/inputs/string_input.rb
 - lib/simple_form/inputs/text_input.rb
-- lib/simple_form/inputs.rb
 - lib/simple_form/map_type.rb
 - lib/simple_form/railtie.rb
 - lib/simple_form/tags.rb
 - lib/simple_form/version.rb
+- lib/simple_form/wrappers.rb
 - lib/simple_form/wrappers/builder.rb
+- lib/simple_form/wrappers/leaf.rb
 - lib/simple_form/wrappers/many.rb
 - lib/simple_form/wrappers/root.rb
 - lib/simple_form/wrappers/single.rb
-- lib/simple_form/wrappers.rb
-- lib/simple_form.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
@@ -167,23 +158,24 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: simple_form
-rubygems_version: 2.1.11
+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