simple_form 1.1.2 → 1.1.3

data/README.rdoc

@@ -160,16 +160,7 @@ Simple enough right? This is going to render a :select input for choosing the :c
   f.association :company, :as => :radio
   f.association :roles, :as => :check_boxes
 
-And you will get a set of radios to select the company and another set of check boxes for the roles. Some options are available for refining the collection for associations: :conditions, :include, :joins, :order. These options are given straight to the find method. Here is an example of how to use these options:
-
-  f.association :company, :order => 'name'
-  f.association :roles, :conditions => { :active => true }
-
-You also have the ability to call named scopes using the association:
-
-  f.association :company, :scope => [:active, :available]
-
-The association helper just invokes input under the hood, so all options available to :select, :radio and :check_boxes are also available to association. For example, you can specify the collection by hand, all together with the prompt:
+The association helper just invokes input under the hood, so all options available to :select, :radio and :check_boxes are also available to association. Additionally, you can specify the collection by hand, all together with the prompt:
 
   f.association :company, :collection => Company.active.all(:order => 'name'), :prompt => "Choose a Company"
 
@@ -235,8 +226,8 @@ SimpleForm comes with a lot of default mappings:
 
   boolean               check box               boolean
   string                text field              string
-  email                 email field             string
-  url                   url field               string
+  email                 email field             string with name matching "email"
+  url                   url field               string with name matching "url"
   password              password field          string with name matching "password"
   text                  text area               text
   file                  file field              string, responding to file methods

data/lib/simple_form/form_builder.rb

@@ -96,36 +96,15 @@ module SimpleForm
     # supported in input are also supported by association. Some extra options
     # can also be given:
     #
-    # == Options
-    #
-    # * :conditions - Given as conditions when retrieving the collection
-    #
-    # * :include - Given as include when retrieving the collection
-    #
-    # * :joins - Given as joins when retrieving the collection
-    #
-    # * :order - Given as order when retrieving the collection
-    #
-    # * :scope - Given as scopes when retrieving the collection
-    #
     # == Examples
     #
     #   simple_form_for @user do |f|
     #     f.association :company          # Company.all
     #   end
     #
-    #   f.association :company, :order => 'name'
-    #   # Company.all(:order => 'name')
-    #
-    #   f.association :company, :conditions => { :active => true }
-    #   # Company.all(:conditions => { :active => true })
-    #
     #   f.association :company, :collection => Company.all(:order => 'name')
     #   # Same as using :order option, but overriding collection
     #
-    #   f.association :company, :scope => [ :public, :not_broken ]
-    #   # Same as doing Company.public.not_broken.all
-    #
     # == Block
     #
     # When a block is given, association simple behaves as a proxy to
@@ -163,15 +142,9 @@ module SimpleForm
           end
       end
 
-      options[:collection] ||= begin
-        finders = options.slice(:conditions, :order, :include, :joins)
-        finders[:conditions] = @reflection.klass.merge_conditions(finders[:conditions],
-          @reflection.options[:conditions])
-        klass = Array(options[:scope]).inject(@reflection.klass) do |klass, scope|
-          klass.send(scope)
-        end
-        klass.all(finders)
-      end
+      options[:collection] ||= @reflection.klass.all(
+        :conditions => @reflection.options[:conditions], :order => @reflection.options[:order]
+      )
 
       returning(input(attribute, options)) { @reflection = nil }
     end

data/lib/simple_form/version.rb

@@ -1,3 +1,3 @@
 module SimpleForm
-  VERSION = "1.1.2".freeze
+  VERSION = "1.1.3".freeze
 end

data/test/action_view_extensions/builder_test.rb

@@ -3,27 +3,27 @@ require 'test_helper'
 class BuilderTest < ActionView::TestCase
   # COLLECTION RADIO
   test 'collection radio accepts a collection and generate inputs from value method' do
-    form_for @user do |f|
+    concat(form_for @user do |f|
       concat f.collection_radio :active, [true, false], :to_s, :to_s
-    end
+    end)
 
     assert_select 'form input[type=radio][value=true]#user_active_true'
     assert_select 'form input[type=radio][value=false]#user_active_false'
   end
 
   test 'collection radio accepts a collection and generate inputs from label method' do
-    form_for @user do |f|
+    concat(form_for @user do |f|
       concat f.collection_radio :active, [true, false], :to_s, :to_s
-    end
+    end)
 
     assert_select 'form label.collection_radio[for=user_active_true]', 'true'
     assert_select 'form label.collection_radio[for=user_active_false]', 'false'
   end
 
   test 'collection radio accepts checked item' do
-    form_for @user do |f|
+    concat(form_for @user do |f|
       concat f.collection_radio :active, [[1, true], [0, false]], :last, :first, :checked => true
-    end
+    end)
 
     assert_select 'form input[type=radio][value=true][checked=checked]'
     assert_no_select 'form input[type=radio][value=false][checked=checked]'
@@ -31,9 +31,9 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection radio accepts multiple disabled items' do
     collection = [[1, true], [0, false], [2, 'other']]
-    form_for @user do |f|
+    concat(form_for @user do |f|
       concat f.collection_radio :active, collection, :last, :first, :disabled => [true, false]
-    end
+    end)
 
     assert_select 'form input[type=radio][value=true][disabled=disabled]'
     assert_select 'form input[type=radio][value=false][disabled=disabled]'
@@ -42,18 +42,18 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection radio accepts single disable item' do
     collection = [[1, true], [0, false]]
-    form_for @user do |f|
+    concat(form_for @user do |f|
       concat f.collection_radio :active, collection, :last, :first, :disabled => true
-    end
+    end)
 
     assert_select 'form input[type=radio][value=true][disabled=disabled]'
     assert_no_select 'form input[type=radio][value=false][disabled=disabled]'
   end
 
   test 'collection radio accepts html options as input' do
-    form_for @user do |f|
+    concat(form_for @user do |f|
       concat f.collection_radio :active, [[1, true], [0, false]], :last, :first, {}, :class => 'radio'
-    end
+    end)
 
     assert_select 'form input[type=radio][value=true].radio#user_active_true'
     assert_select 'form input[type=radio][value=false].radio#user_active_false'
@@ -62,9 +62,9 @@ class BuilderTest < ActionView::TestCase
   # COLLECTION CHECK BOX
   test 'collection check box accepts a collection and generate a serie of checkboxes for value method' do
     collection = [Tag.new(1, 'Tag 1'), Tag.new(2, 'Tag 2')]
-    form_for @user do |f|
+    concat(form_for @user do |f|
       concat f.collection_check_boxes :tag_ids, collection, :id, :name
-    end
+    end)
 
     assert_select "form input[type=hidden][name='user[tag_ids][]'][value=]"
     assert_select 'form input#user_tag_ids_1[type=checkbox][value=1]'
@@ -73,9 +73,9 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection check box accepts a collection and generate a serie of checkboxes with labels for label method' do
     collection = [Tag.new(1, 'Tag 1'), Tag.new(2, 'Tag 2')]
-    form_for @user do |f|
+    concat(form_for @user do |f|
       concat f.collection_check_boxes :tag_ids, collection, :id, :name
-    end
+    end)
 
     assert_select 'form label.collection_check_boxes[for=user_tag_ids_1]', 'Tag 1'
     assert_select 'form label.collection_check_boxes[for=user_tag_ids_2]', 'Tag 2'
@@ -83,9 +83,9 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection check box accepts selected values as :checked option' do
     collection = (1..3).map{|i| [i, "Tag #{i}"] }
-    form_for @user do |f|
+    concat(form_for @user do |f|
       concat f.collection_check_boxes :tag_ids, collection, :first, :last, :checked => [1, 3]
-    end
+    end)
 
     assert_select 'form input[type=checkbox][value=1][checked=checked]'
     assert_select 'form input[type=checkbox][value=3][checked=checked]'
@@ -94,9 +94,9 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection check box accepts a single checked value' do
     collection = (1..3).map{|i| [i, "Tag #{i}"] }
-    form_for @user do |f|
+    concat(form_for @user do |f|
       concat f.collection_check_boxes :tag_ids, collection, :first, :last, :checked => 3
-    end
+    end)
 
     assert_select 'form input[type=checkbox][value=3][checked=checked]'
     assert_no_select 'form input[type=checkbox][value=1][checked=checked]'
@@ -105,9 +105,9 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection check box accepts multiple disabled items' do
     collection = (1..3).map{|i| [i, "Tag #{i}"] }
-    form_for @user do |f|
+    concat(form_for @user do |f|
       concat f.collection_check_boxes :tag_ids, collection, :first, :last, :disabled => [1, 3]
-    end
+    end)
 
     assert_select 'form input[type=checkbox][value=1][disabled=disabled]'
     assert_select 'form input[type=checkbox][value=3][disabled=disabled]'
@@ -116,9 +116,9 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection check box accepts single disable item' do
     collection = (1..3).map{|i| [i, "Tag #{i}"] }
-    form_for @user do |f|
+    concat(form_for @user do |f|
       concat f.collection_check_boxes :tag_ids, collection, :first, :last, :disabled => 1
-    end
+    end)
 
     assert_select 'form input[type=checkbox][value=1][disabled=disabled]'
     assert_no_select 'form input[type=checkbox][value=3][disabled=disabled]'
@@ -127,9 +127,9 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection check box accepts a proc to disabled items' do
     collection = (1..3).map{|i| [i, "Tag #{i}"] }
-    form_for @user do |f|
+    concat(form_for @user do |f|
       concat f.collection_check_boxes :tag_ids, collection, :first, :last, :disabled => proc { |i| i.first == 1 }
-    end
+    end)
 
     assert_select 'form input[type=checkbox][value=1][disabled=disabled]'
     assert_no_select 'form input[type=checkbox][value=3][disabled=disabled]'
@@ -138,9 +138,9 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection check box accepts html options' do
     collection = [[1, 'Tag 1'], [2, 'Tag 2']]
-    form_for @user do |f|
+    concat(form_for @user do |f|
       concat f.collection_check_boxes :tag_ids, collection, :first, :last, {}, :class => 'check'
-    end
+    end)
 
     assert_select 'form input.check[type=checkbox][value=1]'
     assert_select 'form input.check[type=checkbox][value=2]'
@@ -148,11 +148,11 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection check box with fields for' do
     collection = [Tag.new(1, 'Tag 1'), Tag.new(2, 'Tag 2')]
-    form_for @user do |f|
-      f.fields_for :post do |p|
+    concat(form_for @user do |f|
+      concat(f.fields_for :post do |p|
         concat p.collection_check_boxes :tag_ids, collection, :id, :name
-      end
-    end
+      end)
+    end)
 
     assert_select 'form input#user_post_tag_ids_1[type=checkbox][value=1]'
     assert_select 'form input#user_post_tag_ids_2[type=checkbox][value=2]'
@@ -163,10 +163,10 @@ class BuilderTest < ActionView::TestCase
 
   # SIMPLE FIELDS
   test 'simple fields for is available and yields an instance of FormBuilder' do
-    form_for @user do |f|
-      f.simple_fields_for :posts do |posts_form|
+    concat(form_for @user do |f|
+      concat(f.simple_fields_for :posts do |posts_form|
         assert posts_form.instance_of?(SimpleForm::FormBuilder)
-      end
-    end
+      end)
+    end)
   end
 end

data/test/action_view_extensions/form_helper_test.rb

@@ -9,29 +9,29 @@ class FormHelperTest < ActionView::TestCase
   end
 
   test 'simple form should add default class to form' do
-    simple_form_for :user do |f| end
+    concat(simple_form_for :user do |f| end)
     assert_select 'form.simple_form'
   end
 
   test 'simple form should add object name as css class to form when object is not present' do
-    simple_form_for :user do |f| end
+    concat(simple_form_for :user do |f| end)
     assert_select 'form.simple_form.user'
   end
 
   test 'simple form should add object class name as css class to form' do
-    simple_form_for @user do |f| end
+    concat(simple_form_for @user do |f| end)
     assert_select 'form.simple_form.user'
   end
 
   test 'pass options to simple form' do
-    simple_form_for :user, :url => '/account', :html => { :id => 'my_form' } do |f| end
+    concat(simple_form_for :user, :url => '/account', :html => { :id => 'my_form' } do |f| end)
     assert_select 'form#my_form'
     assert_select 'form[action=/account]'
   end
 
   test 'fields for yields an instance of FormBuilder' do
-    simple_fields_for :user do |f|
+    concat(simple_fields_for :user do |f|
       assert f.instance_of?(SimpleForm::FormBuilder)
-    end
+    end)
   end
 end

data/test/components/error_test.rb

@@ -3,14 +3,14 @@ require 'test_helper'
 class ErrorTest < ActionView::TestCase
 
   def with_error_for(object, attribute_name, type, options={}, &block)
-    simple_form_for object do |f|
+    concat(simple_form_for object do |f|
       f.attribute_name = attribute_name
       f.reflection     = Association.new(Company, :company, {}) if options.delete(:setup_association)
       f.input_type     = type
       f.options        = options
 
       concat(SimpleForm::Inputs::Base.new(f).error.to_s)
-    end
+    end)
   end
 
   test 'error should not generate content for attribute without errors' do

data/test/components/hint_test.rb

@@ -3,14 +3,14 @@ require 'test_helper'
 class HintTest < ActionView::TestCase
 
   def with_hint_for(object, attribute_name, type, options={}, &block)
-    simple_form_for object do |f|
+    concat(simple_form_for object do |f|
       f.attribute_name = attribute_name
       f.reflection     = Association.new(Company, :company, {}) if options.delete(:setup_association)
       f.input_type     = type
       f.options        = options
 
       concat(SimpleForm::Inputs::Base.new(f).hint.to_s)
-    end
+    end)
   end
 
   test 'hint should not be generated by default' do

data/test/components/label_test.rb

@@ -7,14 +7,14 @@ class LabelTest < ActionView::TestCase
   end
 
   def with_label_for(object, attribute_name, type, options={})
-    simple_form_for object do |f|
+    concat(simple_form_for object do |f|
       f.attribute_name = attribute_name
       f.reflection     = Association.new(Company, :company, {}) if options.delete(:setup_association)
       f.input_type     = type
       f.options        = options
 
       concat(SimpleForm::Inputs::Base.new(f).label)
-    end
+    end)
   end
 
   test 'label should generate a default humanized description' do

data/test/form_builder_test.rb

@@ -3,39 +3,39 @@ require 'test_helper'
 class FormBuilderTest < ActionView::TestCase
 
   def with_form_for(object, *args, &block)
-    simple_form_for object do |f|
+    concat(simple_form_for object do |f|
       concat f.input(*args, &block)
-    end
+    end)
   end
 
   def with_button_for(object, *args)
-    simple_form_for object do |f|
+    concat(simple_form_for object do |f|
       concat f.button(*args)
-    end
+    end)
   end
 
   def with_error_for(object, *args)
-    simple_form_for object do |f|
+    concat(simple_form_for object do |f|
       concat f.error(*args)
-    end
+    end)
   end
 
   def with_hint_for(object, *args)
-    simple_form_for object do |f|
+    concat(simple_form_for object do |f|
       concat f.hint(*args)
-    end
+    end)
   end
 
   def with_label_for(object, *args)
-    simple_form_for object do |f|
+    concat(simple_form_for object do |f|
       concat f.label(*args)
-    end
+    end)
   end
 
   def with_association_for(object, *args)
-    simple_form_for object do |f|
+    concat(simple_form_for object do |f|
       concat f.association(*args)
-    end
+    end)
   end
 
   # All
@@ -267,9 +267,9 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   test 'builder allows wrapper tag to be given on demand' do
-    simple_form_for @user do |f|
+    concat(simple_form_for @user do |f|
       concat f.input :name, :wrapper_tag => :b
-    end
+    end)
     assert_select 'form b.required.string'
   end
 
@@ -414,14 +414,6 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   # ASSOCIATIONS - FINDERS
-  test 'builder should allow passing conditions to find collection' do
-    with_association_for @user, :company, :conditions => { :id => 1 }
-    assert_select 'form select.select#user_company_id'
-    assert_select 'form select option[value=1]'
-    assert_no_select 'form select option[value=2]'
-    assert_no_select 'form select option[value=3]'
-  end
-
   test 'builder should use reflection conditions to find collection' do
     with_association_for @user, :special_company
     assert_select 'form select.select#user_special_company_id'
@@ -430,30 +422,6 @@ class FormBuilderTest < ActionView::TestCase
     assert_no_select 'form select option[value=3]'
   end
 
-  test 'builder should allow passing order to find collection' do
-    with_association_for @user, :company, :order => 'name'
-    assert_select 'form select.select#user_company_id'
-    assert_no_select 'form select option[value=1]'
-    assert_no_select 'form select option[value=2]'
-    assert_select 'form select option[value=3]'
-  end
-
-  test 'builder should allow passing include option to find collection' do
-    with_association_for @user, :company, :include => :city
-    assert_select 'form select.select#user_company_id'
-    assert_select 'form select option[value=1]'
-    assert_select 'form select option[value=2]'
-    assert_no_select 'form select option[value=3]'
-  end
-
-  test 'builder should allow passing joins option to find collection' do
-    with_association_for @user, :company, :joins => :city
-    assert_select 'form select.select#user_company_id'
-    assert_select 'form select option[value=2]'
-    assert_select 'form select option[value=3]'
-    assert_no_select 'form select option[value=1]'
-  end
-
   test 'builder should allow overriding collection to association input' do
     with_association_for @user, :company, :include_blank => false,
                          :collection => [Company.new(999, 'Teste')]

data/test/inputs_test.rb

@@ -7,9 +7,9 @@ class InputTest < ActionView::TestCase
   end
   
   def with_input_for(object, attribute_name, type, options={})
-    simple_form_for object do |f|
+    concat(simple_form_for object do |f|
       concat f.input(attribute_name, options.merge(:as => type))
-    end
+    end)
   end
   
   # ALL

data/test/test_helper.rb

@@ -3,6 +3,8 @@ require 'test/unit'
 
 require 'active_model'
 require 'action_controller'
+require 'action_view'
+require 'action_view/template'
 require 'action_view/test_case'
 
 begin
@@ -16,8 +18,14 @@ require 'simple_form'
 Dir["#{File.dirname(__FILE__)}/support/*.rb"].each { |f| require f }
 I18n.default_locale = :en
 
-$:.unshift "#{File.dirname(__FILE__)}/support/country_select/lib"
-require 'country_select'
+country_select = "#{File.dirname(__FILE__)}/support/country_select/lib"
+
+if File.exists?(country_select)
+  $:.unshift country_select
+  require 'country_select'
+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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-16 00:00:00 +01:00
+date: 2010-04-03 00:00:00 +02:00
 default_executable: 
 dependencies: []