simple_form 2.1.0 → 3.2.0

data/test/support/mock_controller.rb

@@ -13,12 +13,12 @@ class MockController
     "http://example.com"
   end
 
-  def url_helpers
-    self
+  def url_options
+    {}
   end
 
-  def hash_for_user_path(*args); end
-  def hash_for_validating_user_path(*args); end
-  def hash_for_other_validating_user_path(*args); end
-  def hash_for_users_path(*args); 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,27 +1,58 @@
-Association = Struct.new(:klass, :name, :macro, :options)
+Association = Struct.new(:klass, :name, :macro, :scope, :options)
 
-class Column < Struct.new(:name, :type, :limit)
+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
 
-class Company < Struct.new(:id, :name)
+Relation = Struct.new(:records) do
+  delegate :each, to: :records
+
+  def where(conditions = nil)
+    self.class.new conditions ? records.first : records
+  end
+
+  def order(conditions = nil)
+    self.class.new conditions ? records.last : records
+  end
+
+  alias_method :to_a,   :records
+  alias_method :to_ary, :records
+end
+
+Picture = Struct.new(:id, :name) do
   extend ActiveModel::Naming
   include ActiveModel::Conversion
 
-  def self.all(options={})
-    all = (1..3).map{|i| Company.new(i, "Company #{i}")}
-    return [all.first] if options[:conditions].present?
-    return [all.last]  if options[:order].present?
-    return all[0..1] if options[:include].present?
-    return all[1..2] if options[:joins].present?
+  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
+  extend ActiveModel::Naming
+  include ActiveModel::Conversion
+
+  class << self
+    delegate :order, :where, to: :_relation
+  end
+
+  def self._relation
     all
   end
 
-  def self.merge_conditions(a, b)
-    (a || {}).merge(b || {})
+  def self.all
+    Relation.new((1..3).map { |i| new(i, "#{name} #{i}") })
   end
 
   def persisted?
@@ -29,14 +60,9 @@ class Company < Struct.new(:id, :name)
   end
 end
 
-class Tag < Company
-  def self.all(options={})
-    (1..3).map{|i| Tag.new(i, "Tag #{i}")}
-  end
-end
+class Tag < Company; end
 
-class TagGroup < Struct.new(:id, :name, :tags)
-end
+TagGroup = Struct.new(:id, :name, :tags)
 
 class User
   extend ActiveModel::Naming
@@ -46,9 +72,22 @@ class User
     :description, :created_at, :updated_at, :credit_limit, :password, :url,
     :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
+    :post_count, :lock_version, :amount, :attempts, :action, :credit_card, :gender,
+    :extra_special_company_id, :pictures, :picture_ids, :special_pictures,
+    :special_picture_ids, :uuid
+
+  def self.build(extra_attributes = {})
+    attributes = {
+      id: 1,
+      name: 'New in SimpleForm!',
+      description: 'Hello!',
+      created_at: Time.now
+    }.merge! extra_attributes
+
+    new attributes
+  end
 
-  def initialize(options={})
+  def initialize(options = {})
     @new_record = false
     options.each do |key, value|
       send("#{key}=", value)
@@ -86,11 +125,22 @@ class User
       when :attempts      then :integer
       when :action        then :string
       when :credit_card   then :string
+      when :uuid          then :uuid
     end
     Column.new(attribute, column_type, limit)
   end
 
-  def self.human_attribute_name(attribute)
+  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 then true
+      else false
+    end
+  end
+
+  def self.human_attribute_name(attribute, options = {})
     case attribute
       when 'name'
         'Super User Name!'
@@ -99,33 +149,39 @@ 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 :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, 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) }, {})
     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
 
@@ -136,31 +192,31 @@ end
 
 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 :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 :action,            :presence => true, :on => :create
-  validates :credit_limit,      :presence => true, :on => :save
-  validates :phone_number,      :presence => true, :on => :update
+  validates :action,            presence: true, on: :create
+  validates :credit_limit,      presence: true, on: :save
+  validates :phone_number,      presence: true, on: :update
 
   validates_numericality_of :age,
-    :greater_than_or_equal_to => 18,
-    :less_than_or_equal_to => 99,
-    :only_integer => true
+    greater_than_or_equal_to: 18,
+    less_than_or_equal_to: 99,
+    only_integer: true
   validates_numericality_of :amount,
-    :greater_than => :min_amount,
-    :less_than => :max_amount,
-    :only_integer => true
+    greater_than: :min_amount,
+    less_than: :max_amount,
+    only_integer: true
   validates_numericality_of :attempts,
-    :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 :home_picture, :is => 12
+    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 :home_picture, is: 12
 
   def min_amount
     10
@@ -182,26 +238,21 @@ end
 class OtherValidatingUser < User
   include ActiveModel::Validations
   validates_numericality_of :age,
-    :greater_than => 17,
-    :less_than => 100,
-    :only_integer => true
+    greater_than: 17,
+    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},
-    :only_integer => true
+    greater_than: Proc.new { |user| user.age },
+    less_than: Proc.new { |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},
-    :only_integer => true
-
-  validates_format_of :country, :with => /\w+/
+    greater_than_or_equal_to: Proc.new { |user| user.age },
+    less_than_or_equal_to: Proc.new { |user| user.age + 100 },
+    only_integer: true
 
-  # TODO: Remove this check when we drop Rails 3.0 support
-  if ActiveModel::VERSION::MAJOR == 3 && ActiveModel::VERSION::MINOR >= 1
-    validates_format_of :name, :with => Proc.new { /\w+/ }
-  else
-    validates_format_of :name, :with => /\w+/
-  end
+  validates_format_of :country, with: /\w+/
+  validates_format_of :name, with: Proc.new { /\w+/ }
+  validates_format_of :description, without: /\d+/
 end
 
 class HashBackedAuthor < Hash
@@ -214,3 +265,6 @@ class HashBackedAuthor < Hash
     'hash backed author'
   end
 end
+
+class UserNumber1And2 < User
+end

data/test/test_helper.rb

@@ -1,16 +1,14 @@
-require 'rubygems'
 require 'bundler/setup'
 
-require 'test/unit'
-require 'mocha/setup'
+require 'minitest/autorun'
 
 require 'active_model'
 require 'action_controller'
 require 'action_view'
+ActionView::RoutingUrlFor.send(:include, ActionDispatch::Routing::UrlFor)
+
 require 'action_view/template'
 
-# Rails 3.0.4 is missing this "deprecation" require.
-require 'active_support/core_ext/module/deprecation'
 require 'action_view/test_case'
 
 module Rails
@@ -32,47 +30,42 @@ 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
   include SimpleForm::ActionViewExtensions::FormHelper
 
   setup :set_controller
-  setup :setup_new_user
+  setup :setup_users
 
   def set_controller
     @controller = MockController.new
   end
 
-  def setup_new_user(options={})
-    @user = User.new({
-      :id => 1,
-      :name => 'New in SimpleForm!',
-      :description => 'Hello!',
-      :created_at => Time.now
-    }.merge(options))
-
-    @validating_user = ValidatingUser.new({
-      :id => 1,
-      :name => 'New in SimpleForm!',
-      :description => 'Hello!',
-      :home_picture => 'Home picture',
-      :created_at => Time.now,
-      :age => 19,
-      :amount => 15,
-      :attempts => 1,
-      :company => [1]
-    }.merge(options))
-
-    @other_validating_user = OtherValidatingUser.new({
-      :id => 1,
-      :name => 'New in SimpleForm!',
-      :description => 'Hello!',
-      :created_at => Time.now,
-      :age => 19,
-      :company => 1
-    }.merge(options))
+  def setup_users(extra_attributes = {})
+    @user = User.build(extra_attributes)
+
+    @validating_user = ValidatingUser.build({
+      home_picture: 'Home picture',
+      age: 19,
+      amount: 15,
+      attempts: 1,
+      company: [1]
+    }.merge!(extra_attributes))
+
+    @other_validating_user = OtherValidatingUser.build({
+      age: 19,
+      company: 1
+    }.merge!(extra_attributes))
   end
 
   def protect_against_forgery?

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_form
 version: !ruby/object:Gem::Version
-  version: 2.1.0
-  prerelease: 
+  version: 3.2.0
 platform: ruby
 authors:
 - José Valim
@@ -11,42 +10,38 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2015-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 description: Forms made easy!
-email: contact@plataformatec.com.br
+email: opensource@plataformatec.com.br
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -65,7 +60,6 @@ files:
 - lib/generators/simple_form/templates/README
 - lib/generators/simple_form/USAGE
 - lib/simple_form/action_view_extensions/builder.rb
-- lib/simple_form/action_view_extensions/builder.rb.orig
 - lib/simple_form/action_view_extensions/form_helper.rb
 - lib/simple_form/components/errors.rb
 - lib/simple_form/components/hints.rb
@@ -78,10 +72,8 @@ files:
 - lib/simple_form/components/placeholders.rb
 - lib/simple_form/components/readonly.rb
 - lib/simple_form/components.rb
-- lib/simple_form/core_ext/hash.rb
 - lib/simple_form/error_notification.rb
 - lib/simple_form/form_builder.rb
-- lib/simple_form/form_builder.rb.orig
 - lib/simple_form/helpers/autofocus.rb
 - lib/simple_form/helpers/disabled.rb
 - lib/simple_form/helpers/readonly.rb
@@ -108,9 +100,11 @@ files:
 - 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/version.rb.orig
 - 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
@@ -153,34 +147,28 @@ files:
 - test/support/models.rb
 - test/test_helper.rb
 homepage: https://github.com/plataformatec/simple_form
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -389428450847468473
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -389428450847468473
 requirements: []
 rubyforge_project: simple_form
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Forms made easy!
 test_files:
 - test/action_view_extensions/builder_test.rb