simple_form 2.1.0 → 3.0.0

data/test/support/models.rb

@@ -1,27 +1,38 @@
 Association = Struct.new(:klass, :name, :macro, :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(:all) do
+  def where(conditions = nil)
+    self.class.new conditions ? all.first : all
+  end
+
+  def order(conditions = nil)
+    self.class.new conditions ? all.last : all
+  end
+
+  alias_method :to_a, :all
+end
+
+Company = 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?
-    all
+  class << self
+    delegate :order, :where, to: :_relation
+  end
+
+  def self._relation
+    Relation.new(all)
   end
 
-  def self.merge_conditions(a, b)
-    (a || {}).merge(b || {})
+  def self.all
+    (1..3).map { |i| new(i, "#{name} #{i}") }
   end
 
   def persisted?
@@ -29,14 +40,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,7 +52,19 @@ 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
+
+  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={})
     @new_record = false
@@ -112,7 +130,9 @@ class User
       when :first_company
         Association.new(Company, association, :has_one, {})
       when :special_company
-        Association.new(Company, association, :belongs_to, { :conditions => { :id => 1 } })
+        Association.new(Company, association, :belongs_to, { conditions: { id: 1 } })
+      when :extra_special_company
+        Association.new(Company, association, :belongs_to, { conditions: proc { { id: 1 } } })
     end
   end
 
@@ -120,11 +140,11 @@ class User
     @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"]
+        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"]
       )
     end
   end
@@ -136,31 +156,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 +202,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
+    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+/
-
-  # 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 +229,6 @@ class HashBackedAuthor < Hash
     'hash backed author'
   end
 end
+
+class UserNumber1And2 < User
+end

data/test/test_helper.rb

@@ -1,16 +1,12 @@
-require 'rubygems'
 require 'bundler/setup'
 
-require 'test/unit'
-require 'mocha/setup'
+require 'minitest/autorun'
 
 require 'active_model'
 require 'action_controller'
 require 'action_view'
 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
@@ -39,40 +35,27 @@ class ActionView::TestCase
   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.0.0
 platform: ruby
 authors:
 - José Valim
@@ -11,40 +10,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-09-21 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.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+    - - <
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 4.0.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+    - - <
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.1'
 description: Forms made easy!
 email: contact@plataformatec.com.br
 executables: []
@@ -78,7 +85,6 @@ 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
@@ -108,6 +114,8 @@ 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
@@ -153,34 +161,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.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Forms made easy!
 test_files:
 - test/action_view_extensions/builder_test.rb

data/lib/simple_form/core_ext/hash.rb

@@ -1,16 +0,0 @@
-# TODO: Delete this file when we drop support for Rails 3.0
-#   This method is already implemented in active_support 3.1
-
-unless Hash.new.respond_to?(:deep_dup)
-  class Hash
-    # Returns a deep copy of hash.
-    def deep_dup
-      duplicate = self.dup
-      duplicate.each_pair do |k,v|
-        tv = duplicate[k]
-        duplicate[k] = tv.is_a?(Hash) && v.is_a?(Hash) ? tv.deep_dup : v
-      end
-      duplicate
-    end
-  end
-end