simple_form 1.2.0 → 1.4.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,34 @@ module MiscHelpers
       object.send :"#{key}=", value
     end
   end
+
+  def with_concat_form_for(object, &block)
+    concat simple_form_for(object, &block)
+  end
+
+  def with_concat_custom_form_for(object, &block)
+    concat custom_form_for(object, &block)
+  end
+
+  def custom_form_for(object, *args, &block)
+    simple_form_for(object, *(args << { :builder => CustomFormBuilder }), &block)
+  end
+
+  def custom_mapping_form_for(object, *args, &block)
+    simple_form_for(object, *(args << { :builder => CustomMapTypeFormBuilder }), &block)
+  end
+
+  def with_concat_custom_mapping_form_for(object, &block)
+    concat custom_mapping_form_for(object, &block)
+  end
+end
+
+class CustomFormBuilder < SimpleForm::FormBuilder
+  def input(attribute_name, *args, &block)
+    super(attribute_name, *(args << { :input_html => { :class => 'custom' } }), &block)
+  end
+end
+
+class CustomMapTypeFormBuilder < SimpleForm::FormBuilder
+  map_type :custom_type, :to => SimpleForm::Inputs::StringInput
 end

data/test/support/mock_controller.rb

@@ -1,12 +1,12 @@
 class MockController
   attr_accessor :action_name
 
-  def action_name
-    @action_name || "edit"
+  def _routes
+    self
   end
 
-  def _router
-    self
+  def action_name
+    @action_name || "edit"
   end
 
   def url_for(*args)

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,28 @@ 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
-
-  # Get rid of deprecation warnings
-  undef_method :id
+  include ActiveModel::Conversion
+
+  attr_accessor :id, :name, :company, :company_id, :time_zone, :active, :age,
+    :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
+
+  def initialize(options={})
+    options.each do |key, value|
+      send("#{key}=", value)
+    end if options
+  end
 
   def new_record!
     @new_record = true
@@ -60,6 +72,10 @@ class User < OpenStruct
       when :delivery_time then :time
       when :created_at    then :datetime
       when :updated_at    then :timestamp
+      when :lock_version  then :integer
+      when :home_picture  then :string
+      when :amount        then :integer
+      when :attempts      then :integer
     end
     Column.new(attribute, column_type, limit)
   end
@@ -91,17 +107,65 @@ class User < OpenStruct
   end
 
   def errors
-    @errors ||= {
-      :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 ||= 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"]
+      )
+    end
   end
 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
+  validates_numericality_of :amount,
+    :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
+
+  def min_amount
+    10
+  end
+
+  def max_amount
+    100
+  end
+
+  def min_attempts
+    1
+  end
+
+  def max_attempts
+    100
+  end
+end
+
+class OtherValidatingUser < User
+  include ActiveModel::Validations
+  validates_numericality_of :age,
+    :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
+  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
 end

data/test/test_helper.rb

@@ -1,18 +1,25 @@
 require 'rubygems'
+require 'bundler/setup'
+
 require 'test/unit'
+require 'mocha'
 
 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'
 
-begin
-  require 'ruby-debug'
-rescue LoadError
+module Rails
+  def self.env
+    ActiveSupport::StringInquirer.new("test")
+  end
 end
 
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib', 'simple_form')
+$:.unshift File.expand_path("../../lib", __FILE__)
 require 'simple_form'
 
 Dir["#{File.dirname(__FILE__)}/support/*.rb"].each { |f| require f }
@@ -27,14 +34,9 @@ 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
-
-  tests SimpleForm::ActionViewExtensions::FormHelper
+  include SimpleForm::ActionViewExtensions::FormHelper
 
   setup :set_controller
   setup :set_response
@@ -55,12 +57,25 @@ class ActionView::TestCase
       :description => 'Hello!',
       :created_at => Time.now
     }.merge(options))
-    
+
     @validating_user = ValidatingUser.new({
       :id => 1,
       :name => 'New in Simple Form!',
       :description => 'Hello!',
-      :created_at => Time.now
+      :created_at => Time.now,
+      :age => 19,
+      :amount => 15,
+      :attempts => 1,
+      :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
 
@@ -74,4 +89,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

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_form
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 7
+  prerelease: 
   segments: 
   - 1
-  - 2
+  - 4
   - 0
-  version: 1.2.0
+  version: 1.4.0
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-24 00:00:00 +02:00
+date: 2011-05-18 00:00:00 -03:00
 default_executable: 
 dependencies: []
 
@@ -25,13 +26,24 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
+- .gitignore
+- .gitmodules
+- .travis.yml
+- CHANGELOG.rdoc
+- Gemfile
+- Gemfile.lock
+- MIT-LICENSE
+- README.rdoc
+- Rakefile
 - init.rb
 - lib/generators/simple_form/USAGE
 - lib/generators/simple_form/install_generator.rb
 - lib/generators/simple_form/templates/_form.html.erb
+- lib/generators/simple_form/templates/_form.html.haml
+- lib/generators/simple_form/templates/_form.html.slim
 - lib/generators/simple_form/templates/en.yml
 - lib/generators/simple_form/templates/simple_form.rb
 - lib/simple_form.rb
@@ -40,13 +52,18 @@ files:
 - lib/simple_form/components.rb
 - lib/simple_form/components/errors.rb
 - 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
 - lib/simple_form/inputs/block_input.rb
+- lib/simple_form/inputs/boolean_input.rb
 - lib/simple_form/inputs/collection_input.rb
 - lib/simple_form/inputs/date_time_input.rb
 - lib/simple_form/inputs/hidden_input.rb
@@ -56,34 +73,54 @@ files:
 - lib/simple_form/inputs/string_input.rb
 - lib/simple_form/map_type.rb
 - lib/simple_form/version.rb
-- README.rdoc
+- simple_form.gemspec
+- test/action_view_extensions/builder_test.rb
+- test/action_view_extensions/form_helper_test.rb
+- test/components/error_test.rb
+- test/components/hint_test.rb
+- test/components/label_test.rb
+- test/components/wrapper_test.rb
+- test/discovery_inputs.rb
+- test/error_notification_test.rb
+- test/form_builder_test.rb
+- test/inputs_test.rb
+- test/simple_form_test.rb
+- test/support/misc_helpers.rb
+- test/support/mock_controller.rb
+- test/support/mock_response.rb
+- test/support/models.rb
+- test/test_helper.rb
 has_rdoc: true
 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 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.6
+rubyforge_project: simple_form
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Forms made easy!
@@ -93,6 +130,9 @@ test_files:
 - test/components/error_test.rb
 - test/components/hint_test.rb
 - test/components/label_test.rb
+- test/components/wrapper_test.rb
+- test/discovery_inputs.rb
+- test/error_notification_test.rb
 - test/form_builder_test.rb
 - test/inputs_test.rb
 - test/simple_form_test.rb