simple_form 1.2.2 → 1.3.0

data/test/support/misc_helpers.rb

@@ -8,10 +8,8 @@ module MiscHelpers
     end
   end
 
-  def assert_no_select(*args)
-    assert_raise Test::Unit::AssertionFailedError do
-      assert_select(*args)
-    end
+  def assert_no_select(selector, value = nil)
+    assert_select(selector, :text => value, :count => 0)
   end
 
   def swap(object, new_values)
@@ -26,4 +24,8 @@ module MiscHelpers
       object.send :"#{key}=", value
     end
   end
+
+  def with_concat_form_for(object, &block)
+    concat simple_form_for(object, &block)
+  end
 end

data/test/support/models.rb

@@ -5,6 +5,7 @@ Association = Struct.new(:klass, :name, :macro, :options)
 
 class Company < Struct.new(:id, :name)
   extend ActiveModel::Naming
+  include ActiveModel::Conversion
 
   def self.all(options={})
     all = (1..3).map{|i| Company.new(i, "Company #{i}")}
@@ -26,17 +27,26 @@ end
 
 class Tag < Company
   extend ActiveModel::Naming
+  include ActiveModel::Conversion
 
   def self.all(options={})
     (1..3).map{|i| Tag.new(i, "Tag #{i}")}
   end
 end
 
-class User < OpenStruct
+class User
   extend ActiveModel::Naming
+  include ActiveModel::Conversion
 
-  # Get rid of deprecation warnings
-  undef_method :id if respond_to?(:id)
+  attr_accessor :id, :name, :company, :company_id, :time_zone, :active, :description, :created_at, :updated_at,
+    :credit_limit, :age, :password, :delivery_time, :born_at, :special_company_id, :country, :url, :tag_ids,
+    :avatar, :email, :status, :residence_country, :phone_number, :post_count
+
+  def initialize(options={})
+    options.each do |key, value|
+      send("#{key}=", value)
+    end if options
+  end
 
   def new_record!
     @new_record = true
@@ -107,4 +117,17 @@ end
 class ValidatingUser < User
   include ActiveModel::Validations
   validates :name, :presence => true
+  validates :company, :presence => true
+  validates_numericality_of :age,
+    :greater_than_or_equal_to => 18,
+    :less_than_or_equal_to => 99,
+    :only_integer => true
+end
+
+class OtherValidatingUser < User
+  include ActiveModel::Validations
+  validates_numericality_of :age,
+    :greater_than => 17,
+    :less_than => 100,
+    :only_integer => true
 end

data/test/test_helper.rb

@@ -27,10 +27,6 @@ else
   raise "Could not find country_select plugin in test/support. Please execute git submodule update --init."
 end
 
-class SimpleForm::FormBuilder
-  attr_accessor :attribute_name, :column, :reflection, :input_type, :options
-end
-
 class ActionView::TestCase
   include MiscHelpers
   include SimpleForm::ActionViewExtensions::FormHelper
@@ -59,7 +55,18 @@ class ActionView::TestCase
       :id => 1,
       :name => 'New in Simple Form!',
       :description => 'Hello!',
-      :created_at => Time.now
+      :created_at => Time.now,
+      :age => 19,
+      :company => 1
+    }.merge(options))
+
+    @other_validating_user = OtherValidatingUser.new({
+      :id => 1,
+      :name => 'New in Simple Form!',
+      :description => 'Hello!',
+      :created_at => Time.now,
+      :age => 19,
+      :company => 1
     }.merge(options))
   end
 
@@ -73,4 +80,5 @@ class ActionView::TestCase
   alias :users_path :user_path
   alias :super_user_path :user_path
   alias :validating_user_path :user_path
+  alias :other_validating_user_path :user_path
 end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 2
-  - 2
-  version: 1.2.2
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -16,10 +16,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-27 00:00:00 +02:00
+date: 2010-12-08 00:00:00 -02:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
+  name: rails
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
+  requirement: *id001
 description: Forms made easy!
 email: contact@plataformatec.com.br
 executables: []
@@ -44,9 +59,11 @@ files:
 - lib/simple_form/components/hints.rb
 - lib/simple_form/components/label_input.rb
 - lib/simple_form/components/labels.rb
+- lib/simple_form/components/placeholders.rb
 - lib/simple_form/components/wrapper.rb
 - lib/simple_form/error_notification.rb
 - lib/simple_form/form_builder.rb
+- lib/simple_form/has_errors.rb
 - lib/simple_form/i18n_cache.rb
 - lib/simple_form/inputs.rb
 - lib/simple_form/inputs/base.rb
@@ -82,8 +99,8 @@ homepage: http://github.com/plataformatec/simple_form
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement