simple_form 3.0.0.beta1 → 3.0.0.rc

data/test/inputs/collection_select_input_test.rb

@@ -136,7 +136,7 @@ class CollectionSelectInputTest < ActionView::TestCase
 
   test 'input should allow overriding label and value method using a lambda for collection selects' do
     with_input_for @user, :name, :select,
-                          collection: ['Jose' , 'Carlos'],
+                          collection: ['Jose', 'Carlos'],
                           label_method: lambda { |i| i.upcase },
                           value_method: lambda { |i| i.downcase }
     assert_select 'select option[value=jose]', "JOSE"
@@ -145,7 +145,7 @@ class CollectionSelectInputTest < ActionView::TestCase
 
   test 'input should allow overriding only label but not value method using a lambda for collection select' do
     with_input_for @user, :name, :select,
-                          collection: ['Jose' , 'Carlos'],
+                          collection: ['Jose', 'Carlos'],
                           label_method: lambda { |i| i.upcase }
     assert_select 'select option[value=Jose]', "JOSE"
     assert_select 'select option[value=Carlos]', "CARLOS"
@@ -153,7 +153,7 @@ class CollectionSelectInputTest < ActionView::TestCase
 
   test 'input should allow overriding only value but not label method using a lambda for collection select' do
     with_input_for @user, :name, :select,
-                          collection: ['Jose' , 'Carlos'],
+                          collection: ['Jose', 'Carlos'],
                           value_method: lambda { |i| i.downcase }
     assert_select 'select option[value=jose]', "Jose"
     assert_select 'select option[value=carlos]', "Carlos"
@@ -167,29 +167,54 @@ class CollectionSelectInputTest < ActionView::TestCase
   end
 
   test 'collection input with select type should generate required html attribute only with blank option' do
-    with_input_for @user, :name, :select, include_blank: true, collection: ['Jose' , 'Carlos']
+    with_input_for @user, :name, :select, include_blank: true, collection: ['Jose', 'Carlos']
     assert_select 'select.required'
     assert_select 'select[required]'
   end
 
   test 'collection input with select type should not generate required html attribute without blank option' do
-    with_input_for @user, :name, :select, include_blank: false, collection: ['Jose' , 'Carlos']
+    with_input_for @user, :name, :select, include_blank: false, collection: ['Jose', 'Carlos']
     assert_select 'select.required'
     assert_no_select 'select[required]'
+    assert_no_select 'select[aria-required=true]'
   end
 
   test 'collection input with select type with multiple attribute should generate required html attribute without blank option' do
-    with_input_for @user, :name, :select, include_blank: false, input_html: {multiple: true}, collection: ['Jose' , 'Carlos']
+    with_input_for @user, :name, :select, include_blank: false, input_html: { multiple: true }, collection: ['Jose', 'Carlos']
     assert_select 'select.required'
     assert_select 'select[required]'
   end
 
   test 'collection input with select type with multiple attribute should generate required html attribute with blank option' do
-    with_input_for @user, :name, :select, include_blank: true, input_html: {multiple: true}, collection: ['Jose' , 'Carlos']
+    with_input_for @user, :name, :select, include_blank: true, input_html: { multiple: true }, collection: ['Jose', 'Carlos']
     assert_select 'select.required'
     assert_select 'select[required]'
   end
 
+  test 'with a blank option, a collection input of type select has an aria-required html attribute' do
+    with_input_for @user, :name, :select, include_blank: true, collection: ['Jose', 'Carlos']
+    assert_select 'select.required'
+    assert_select 'select[aria-required=true]'
+  end
+
+  test 'without a blank option, a collection input of type select does not have an aria-required html attribute' do
+    with_input_for @user, :name, :select, include_blank: false, collection: ['Jose', 'Carlos']
+    assert_select 'select.required'
+    assert_no_select 'select[aria-required]'
+  end
+
+  test 'without a blank option and with a multiple option, a collection input of type select has an aria-required html attribute' do
+    with_input_for @user, :name, :select, include_blank: false, input_html: { multiple: true }, collection: ['Jose', 'Carlos']
+    assert_select 'select.required'
+    assert_select 'select[aria-required=true]'
+  end
+
+  test 'with a blank option and a multiple option, a collection input of type select has an aria-required html attribute' do
+    with_input_for @user, :name, :select, include_blank: true, input_html: { multiple: true }, collection: ['Jose', 'Carlos']
+    assert_select 'select.required'
+    assert_select 'select[aria-required]'
+  end
+
   test 'input should allow disabled options with a lambda for collection select' do
     with_input_for @user, :name, :select, collection: ["Carlos", "Antonio"],
       disabled: lambda { |x| x == "Carlos" }

data/test/inputs/datetime_input_test.rb

@@ -96,4 +96,10 @@ class DateTimeInputTest < ActionView::TestCase
     assert_select 'select.required'
     assert_select 'select[required]'
   end
+
+  test 'date time input has an aria-required html attribute' do
+    with_input_for @user, :delivery_time, :time, required: true
+    assert_select 'select.required'
+    assert_select 'select[aria-required=true]'
+  end
 end

data/test/inputs/hidden_input_test.rb

@@ -20,10 +20,11 @@ class HiddenInputTest < ActionView::TestCase
     assert_no_select 'label'
   end
 
-  test 'required/optional options should not be generated for hidden inputs' do
+  test 'required/aria-required/optional options should not be generated for hidden inputs' do
     with_input_for @user, :name, :hidden
     assert_no_select 'input.required'
     assert_no_select 'input[required]'
+    assert_no_select 'input[aria-required]'
     assert_no_select 'input.optional'
     assert_select 'input.hidden#user_name'
   end

data/test/inputs/priority_input_test.rb

@@ -40,4 +40,10 @@ class PriorityInputTest < ActionView::TestCase
     assert_select 'select.required'
     assert_no_select 'select[required]'
   end
+
+  test 'priority input should not generate invalid aria-required html attribute' do
+    with_input_for @user, :country, :country
+    assert_select 'select.required'
+    assert_no_select 'select[aria-required]'
+  end
 end

data/test/inputs/string_input_test.rb

@@ -90,6 +90,11 @@ class StringInputTest < ActionView::TestCase
     assert_select 'input[pattern="\d+"]'
   end
 
+  test 'input should not use pattern if model has :without validation option' do
+    with_input_for @other_validating_user, :description, :string, pattern: true
+    assert_no_select 'input[pattern="\d+"]'
+  end
+
   test 'input should use i18n to translate placeholder text' do
     store_translations(:en, simple_form: { placeholders: { user: {
       name: 'Name goes here'

data/test/support/misc_helpers.rb

@@ -24,6 +24,28 @@ module MiscHelpers
     end
   end
 
+  def stub_any_instance(klass, method, value)
+    klass.class_eval do
+      alias_method :"new_#{method}", method
+
+      define_method(method) do
+        if value.respond_to?(:call)
+          value.call
+        else
+          value
+        end
+      end
+    end
+
+    yield
+  ensure
+    klass.class_eval do
+      undef_method method
+      alias_method method, :"new_#{method}"
+      undef_method :"new_#{method}"
+    end
+  end
+
   def swap_wrapper(name=:default, wrapper=self.custom_wrapper)
     old = SimpleForm.wrappers[name]
     SimpleForm.wrappers[name] = wrapper
@@ -91,11 +113,11 @@ module MiscHelpers
   end
 
   def custom_form_for(object, *args, &block)
-    simple_form_for(object, *(args << { builder: CustomFormBuilder }), &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)
+    simple_form_for(object, *args, { builder: CustomMapTypeFormBuilder }, &block)
   end
 
   def with_concat_form_for(*args, &block)
@@ -129,7 +151,7 @@ end
 
 class CustomFormBuilder < SimpleForm::FormBuilder
   def input(attribute_name, *args, &block)
-    super(attribute_name, *(args << { input_html: { class: 'custom' } }), &block)
+    super(attribute_name, *args, { input_html: { class: 'custom' } }, &block)
   end
 end
 

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.merge_conditions(a, b)
-    (a || {}).merge(b || {})
+  def self._relation
+    Relation.new(all)
+  end
+
+  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
@@ -187,15 +193,16 @@ class OtherValidatingUser < User
     only_integer: true
   validates_numericality_of :amount,
     greater_than: Proc.new { |user| user.age },
-    less_than: Proc.new { |user| user.age + 100},
+    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},
+    less_than_or_equal_to: Proc.new { |user| user.age + 100 },
     only_integer: true
 
   validates_format_of :country, with: /\w+/
   validates_format_of :name, with: Proc.new { /\w+/ }
+  validates_format_of :description, without: /\d+/
 end
 
 class HashBackedAuthor < Hash

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

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_form
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta1
-  prerelease: 6
+  version: 3.0.0.rc
 platform: ruby
 authors:
 - José Valim
@@ -11,49 +10,45 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-05-10 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: 4.0.0.beta
+        version: 4.0.0.rc1
     - - <
       - !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.beta
+        version: 4.0.0.rc1
     - - <
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta
+        version: 4.0.0.rc1
     - - <
       - !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.beta
+        version: 4.0.0.rc1
     - - <
       - !ruby/object:Gem::Version
         version: '4.1'
@@ -77,7 +72,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
@@ -92,7 +86,6 @@ files:
 - lib/simple_form/components.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
@@ -122,7 +115,6 @@ files:
 - 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/many.rb
 - lib/simple_form/wrappers/root.rb
@@ -166,31 +158,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: 2771371477718210215
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 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

data/lib/simple_form/action_view_extensions/builder.rb.orig

@@ -1,247 +0,0 @@
-module SimpleForm
-  module ActionViewExtensions
-    # A collection of methods required by simple_form but added to rails default form.
-    # This means that you can use such methods outside simple_form context.
-    module Builder
-
-      # Wrapper for using SimpleForm inside a default rails form.
-      # Example:
-      #
-      #   form_for @user do |f|
-      #     f.simple_fields_for :posts do |posts_form|
-      #       # Here you have all simple_form methods available
-      #       posts_form.input :title
-      #     end
-      #   end
-      def simple_fields_for(*args, &block)
-        options = args.extract_options!
-        options[:wrapper] = self.options[:wrapper] if options[:wrapper].nil?
-        options[:defaults] ||= self.options[:defaults]
-
-        if self.class < ActionView::Helpers::FormBuilder
-          options[:builder] ||= self.class
-        else
-          options[:builder] ||= SimpleForm::FormBuilder
-        end
-        fields_for(*(args << options), &block)
-      end
-    end
-  end
-end
-
-module SimpleForm
-  module Tags
-    module CollectionExtensions
-      private
-
-      def render_collection
-        item_wrapper_tag   = @options.fetch(:item_wrapper_tag, :span)
-        item_wrapper_class = @options[:item_wrapper_class]
-
-        @collection.map do |item|
-          value = value_for_collection(item, @value_method)
-          text  = value_for_collection(item, @text_method)
-          default_html_options = default_html_options_for_collection(item, value)
-
-          rendered_item = yield item, value, text, default_html_options
-
-          item_wrapper_tag ? @template_object.content_tag(item_wrapper_tag, rendered_item, :class => item_wrapper_class) : rendered_item
-        end.join.html_safe
-      end
-
-      def wrap_rendered_collection(collection)
-        wrapper_tag = @options[:collection_wrapper_tag]
-
-        if wrapper_tag
-          wrapper_class = @options[:collection_wrapper_class]
-          @template_object.content_tag(wrapper_tag, collection, :class => wrapper_class)
-        else
-          collection
-        end
-      end
-    end
-
-    class CollectionRadioButtons < ActionView::Helpers::Tags::CollectionRadioButtons
-      include CollectionExtensions
-
-      def render
-        wrap_rendered_collection(super)
-      end
-
-      private
-
-      def render_component(builder)
-        builder.radio_button + builder.label(:class => "collection_radio_buttons")
-      end
-    end
-
-    class CollectionCheckBoxes < ActionView::Helpers::Tags::CollectionCheckBoxes
-      include CollectionExtensions
-
-      def render
-        wrap_rendered_collection(super)
-      end
-
-      private
-
-      def render_component(builder)
-        builder.check_box + builder.label(:class => "collection_check_boxes")
-      end
-    end
-  end
-end
-
-module ActionView::Helpers
-  class FormBuilder
-    include SimpleForm::ActionViewExtensions::Builder
-  end
-
-<<<<<<< HEAD
-    # Create a collection of radio inputs for the attribute. Basically this
-    # helper will create a radio input associated with a label for each
-    # text/value option in the collection, using value_method and text_method
-    # to convert these text/value. You can give a symbol or a proc to both
-    # value_method and text_method, that will be evaluated for each item in
-    # the collection.
-    #
-    # == Examples
-    #
-    #   form_for @user do |f|
-    #     f.collection_radio_buttons :options, [[true, 'Yes'] ,[false, 'No']], :first, :last
-    #   end
-    #
-    #   <input id="user_options_true" name="user[options]" type="radio" value="true" />
-    #   <label class="collection_radio_buttons" for="user_options_true">Yes</label>
-    #   <input id="user_options_false" name="user[options]" type="radio" value="false" />
-    #   <label class="collection_radio_buttons" for="user_options_false">No</label>
-    #
-    # It is also possible to give a block that should generate the radio +
-    # label. To wrap the radio with the label, for instance:
-    #
-    #   form_for @user do |f|
-    #     f.collection_radio_buttons(
-    #       :options, [[true, 'Yes'] ,[false, 'No']], :first, :last
-    #     ) do |b|
-    #       b.label { b.radio_button + b.text }
-    #     end
-    #   end
-    #
-    # == Options
-    #
-    # Collection radio accepts some extra options:
-    #
-    #   * checked  => the value that should be checked initially.
-    #
-    #   * disabled => the value or values that should be disabled. Accepts a single
-    #                 item or an array of items.
-    #
-    #   * collection_wrapper_tag   => the tag to wrap the entire collection.
-    #
-    #   * collection_wrapper_class => the CSS class to use for collection_wrapper_tag
-    #
-    #   * item_wrapper_tag         => the tag to wrap each item in the collection.
-    #
-    #   * item_wrapper_class       => the CSS class to use for item_wrapper_tag
-    #
-    #   * a block                  => to generate the label + radio or any other component.
-    def collection_radio_buttons(method, collection, value_method, text_method, options = {}, html_options = {}, &block)
-      SimpleForm::Tags::CollectionRadioButtons.new(@object_name, method, @template, collection, value_method, text_method, objectify_options(options), @default_options.merge(html_options)).render(&block)
-=======
-  module FormOptionsHelper
-    # Override Rails options_from_collection_for_select to handle lambdas/procs in
-    # text and value methods, so it works the same way as collection_radio_buttons
-    # and collection_check_boxes in SimpleForm. If none of text/value methods is a
-    # callable object, then it just delegates back to original collection select.
-    # FIXME: remove when support only Rails 4.0 forward
-    #        https://github.com/rails/rails/commit/9035324367526af0300477a58b6d3efc15d1a5a8
-    alias :original_options_from_collection_for_select :options_from_collection_for_select
-    def options_from_collection_for_select(collection, value_method, text_method, selected = nil)
-      if value_method.respond_to?(:call) || text_method.respond_to?(:call)
-        collection = collection.map do |item|
-          value = value_for_collection(item, value_method)
-          text  = value_for_collection(item, text_method)
-
-          [value, text]
-        end
-
-        value_method, text_method = :first, :last
-        selected = extract_selected_and_disabled_and_call_procs selected, collection
-      end
-
-      original_options_from_collection_for_select collection, value_method, text_method, selected
-    end
-
-    private
-
-    def extract_selected_and_disabled_and_call_procs(selected, collection)
-      selected, disabled = extract_selected_and_disabled selected
-      selected_disabled = { :selected => selected, :disabled => disabled }
-
-      selected_disabled.each do |key, check|
-        if check.is_a? Proc
-          values = collection.map { |option| option.first if check.call(option.first) }
-          selected_disabled[key] = values
-        end
-      end
-    end
-
-    def value_for_collection(item, value) #:nodoc:
-      value.respond_to?(:call) ? value.call(item) : item.send(value)
->>>>>>> master
-    end
-
-    # Creates a collection of check boxes for each item in the collection,
-    # associated with a clickable label. Use value_method and text_method to
-    # convert items in the collection for use as text/value in check boxes.
-    # You can give a symbol or a proc to both value_method and text_method,
-    # that will be evaluated for each item in the collection.
-    #
-    # == Examples
-    #
-    #   form_for @user do |f|
-    #     f.collection_check_boxes :options, [[true, 'Yes'] ,[false, 'No']], :first, :last
-    #   end
-    #
-    #   <input name="user[options][]" type="hidden" value="" />
-    #   <input id="user_options_true" name="user[options][]" type="checkbox" value="true" />
-    #   <label class="collection_check_boxes" for="user_options_true">Yes</label>
-    #   <input name="user[options][]" type="hidden" value="" />
-    #   <input id="user_options_false" name="user[options][]" type="checkbox" value="false" />
-    #   <label class="collection_check_boxes" for="user_options_false">No</label>
-    #
-    # It is also possible to give a block that should generate the check box +
-    # label. To wrap the check box with the label, for instance:
-    #
-    #   form_for @user do |f|
-    #     f.collection_check_boxes(
-    #       :options, [[true, 'Yes'] ,[false, 'No']], :first, :last
-    #     ) do |b|
-    #       b.label { b.check_box + b.text }
-    #     end
-    #   end
-    #
-    # == Options
-    #
-    # Collection check box accepts some extra options:
-    #
-    #   * checked  => the value or values that should be checked initially. Accepts
-    #                 a single item or an array of items. It overrides existing associations.
-    #
-    #   * disabled => the value or values that should be disabled. Accepts a single
-    #                 item or an array of items.
-    #
-    #   * collection_wrapper_tag   => the tag to wrap the entire collection.
-    #
-    #   * collection_wrapper_class => the CSS class to use for collection_wrapper_tag. This option
-    #                                 is ignored if the :collection_wrapper_tag option is blank.
-    #
-    #   * item_wrapper_tag         => the tag to wrap each item in the collection.
-    #
-    #   * item_wrapper_class       => the CSS class to use for item_wrapper_tag
-    #
-    #   * a block                  => to generate the label + check box or any other component.
-    def collection_check_boxes(method, collection, value_method, text_method, options = {}, html_options = {}, &block)
-      SimpleForm::Tags::CollectionCheckBoxes.new(@object_name, method, @template, collection, value_method, text_method, objectify_options(options), @default_options.merge(html_options)).render(&block)
-    end
-  end
-end