simple_form 3.0.0 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bda3ec212b0e4f1da3e765b704b417893098679
-  data.tar.gz: 81b0e670aae4612d40793b872f6fc553fd6d05ab
+  metadata.gz: ffed0afbf1694b8176a255206fc6d658e4a539af
+  data.tar.gz: 7af2a7a0199551b2b17491d9510c2477aa125265
 SHA512:
-  metadata.gz: e242bc383e74b99f508350376d007c18bd7aedb325632d2d3a8a28043275efa03a9c5b90e6d4a00cec68b53de6636bdb43b3a0af5a83160b8a8bad88919d6248
-  data.tar.gz: 70b1845d8a357e8e4ff85def7540d849a8fcd4d070a78e185f2c369da7a453b7def368309dc3339a5a5c2b2f8f47613db2be328ac0dbbb90c3fa74aef996f80a
+  metadata.gz: bbf22389176622fe689c4d401526d5c973124245cb3b587b3ff2428053377930a358c31eaf8088ffb2b030cef016d0b59ee790984fdedd1219c4d3daab76ff23
+  data.tar.gz: a3e826bd625da954e73d5df1cfe546117024c5b7eb08a1ea9eb37e187e25b3479d9549a13b6e853520e68e8eb3d54ed1ead89e2f0de7318df3478d624654c611

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+## 3.0.4
+
+### bug fix
+  * Fix method reflection for Ruby 2.1+. [@badosu](https://github.com/badosu)
+  * Do not remove HTML attributes if components are not present.
+
+## 3.0.3
+
+### bug fix
+  * Fix XSS vulnerability on error components.
+
+## 3.0.2
+
+### enhancements
+
+  * Support Rails 4.1
+
+## 3.0.1
+
+### bug fix
+  * Fix XSS vulnerability on label, hint and error components.
+
 ## 3.0.0
 
 ### enhancements

data/lib/simple_form/components/errors.rb

@@ -12,7 +12,9 @@ module SimpleForm
       protected
 
       def error_text
-        "#{options[:error_prefix]} #{errors.send(error_method)}".lstrip.html_safe
+        text = has_error_in_options? ? options[:error] : errors.send(error_method)
+
+        "#{html_escape(options[:error_prefix])} #{html_escape(text)}".lstrip.html_safe
       end
 
       def error_method
@@ -30,6 +32,10 @@ module SimpleForm
       def errors_on_association
         reflection ? object.errors[reflection.name] : []
       end
+
+      def has_error_in_options?
+        options[:error] && !options[:error].nil?
+      end
     end
   end
 end

data/lib/simple_form/components/hints.rb

@@ -5,8 +5,13 @@ module SimpleForm
       def hint
         @hint ||= begin
           hint = options[:hint]
-          hint_content = hint.is_a?(String) ? hint : translate(:hints)
-          hint_content.html_safe if hint_content
+
+          if hint.is_a?(String)
+            html_escape(hint)
+          else
+            content = translate(:hints)
+            content.html_safe if content
+          end
         end
       end
 

data/lib/simple_form/components/labels.rb

@@ -30,7 +30,7 @@ module SimpleForm
       end
 
       def label_text
-        SimpleForm.label_text.call(raw_label_text, required_label_text).strip.html_safe
+        SimpleForm.label_text.call(html_escape(raw_label_text), required_label_text).strip.html_safe
       end
 
       def label_target

data/lib/simple_form/form_builder.rb

@@ -136,11 +136,13 @@ module SimpleForm
     #        name="user[name]" type="text" value="Carlos" />
     #
     def input_field(attribute_name, options={})
+      components = (wrapper.components & ATTRIBUTE_COMPONENTS)
+
       options = options.dup
-      options[:input_html] = options.except(:as, :collection, :label_method, :value_method, *ATTRIBUTE_COMPONENTS)
+      options[:input_html] = options.except(:as, :collection, :label_method, :value_method, *components)
       options = @defaults.deep_dup.deep_merge(options) if @defaults
 
-      SimpleForm::Wrappers::Root.new(ATTRIBUTE_COMPONENTS + [:input], wrapper: false).render find_input(attribute_name, options)
+      SimpleForm::Wrappers::Root.new(components + [:input], wrapper: false).render find_input(attribute_name, options)
     end
 
     # Helper for dealing with association selects/radios, generating the

data/lib/simple_form/inputs/base.rb

@@ -1,8 +1,11 @@
 require 'simple_form/i18n_cache'
+require 'active_support/core_ext/string/output_safety'
 
 module SimpleForm
   module Inputs
     class Base
+      include ERB::Util
+
       extend I18nCache
 
       include SimpleForm::Helpers::Autofocus
@@ -42,7 +45,7 @@ module SimpleForm
       end
 
       # Always enabled.
-      enable :hint
+      enable :hint, :error
 
       # Usually disabled, needs to be enabled explicitly passing true as option.
       disable :maxlength, :placeholder, :pattern, :min_max

data/lib/simple_form/inputs/boolean_input.rb

@@ -35,7 +35,7 @@ module SimpleForm
       # reuse the method for nested boolean style, but with no unchecked value,
       # which won't generate the hidden checkbox. This is the default functionality
       # in Rails > 3.2.1, and is backported in SimpleForm AV helpers.
-      def build_check_box(unchecked_value = unchecked_value)
+      def build_check_box(unchecked_value = unchecked_value())
         @builder.check_box(attribute_name, input_html_options, checked_value, unchecked_value)
       end
 

data/lib/simple_form/version.rb

@@ -1,3 +1,3 @@
 module SimpleForm
-  VERSION = "3.0.0".freeze
+  VERSION = "3.0.4".freeze
 end

data/test/form_builder/error_test.rb

@@ -14,6 +14,10 @@ class ErrorTest < ActionView::TestCase
     end
   end
 
+  def with_custom_error_for(object, *args)
+    with_form_for(object, *args)
+  end
+
   test 'error should not generate content for attribute without errors' do
     with_error_for @user, :active
     assert_no_select 'span.error'
@@ -32,7 +36,7 @@ class ErrorTest < ActionView::TestCase
 
   test 'error should generate messages for attribute with single error' do
     with_error_for @user, :name
-    assert_select 'span.error', "can't be blank"
+    assert_select 'span.error', "can&#39;t be blank"
   end
 
   test 'error should generate messages for attribute with one error when using first' do
@@ -80,9 +84,23 @@ class ErrorTest < ActionView::TestCase
     assert_no_select 'p.error[error_method]'
   end
 
-  test 'error should generate an error message with raw HTML tags' do
+  test 'error should escape error prefix text' do
     with_error_for @user, :name, error_prefix: '<b>Name</b>'
-    assert_select 'span.error', "Name can't be blank"
+    assert_select 'span.error', "&lt;b&gt;Name&lt;/b&gt; can&#39;t be blank"
+  end
+
+  test 'error escapes error text' do
+    @user.errors.merge!(action: ['must not contain <b>markup</b>'])
+
+    with_error_for @user, :action
+
+    assert_select 'span.error'
+    assert_no_select 'span.error b', 'markup'
+  end
+
+  test 'error should generate an error message with raw HTML tags' do
+    with_error_for @user, :name, error_prefix: '<b>Name</b>'.html_safe
+    assert_select 'span.error', "Name can&#39;t be blank"
     assert_select 'span.error b', "Name"
   end
 
@@ -90,7 +108,7 @@ class ErrorTest < ActionView::TestCase
 
   test 'full error should generate an full error tag for the attribute' do
     with_full_error_for @user, :name
-    assert_select 'span.error', "Super User Name! can't be blank"
+    assert_select 'span.error', "Super User Name! can&#39;t be blank"
   end
 
   test 'full error should generate an full error tag with a clean HTML' do
@@ -100,13 +118,13 @@ class ErrorTest < ActionView::TestCase
 
   test 'full error should allow passing options to full error tag' do
     with_full_error_for @user, :name, id: 'name_error', error_prefix: "Your name"
-    assert_select 'span.error#name_error', "Your name can't be blank"
+    assert_select 'span.error#name_error', "Your name can&#39;t be blank"
   end
 
   test 'full error should not modify the options hash' do
     options = { id: 'name_error' }
     with_full_error_for @user, :name, options
-    assert_select 'span.error#name_error', "Super User Name! can't be blank"
+    assert_select 'span.error#name_error', "Super User Name! can&#39;t be blank"
     assert_equal({ id: 'name_error' }, options)
   end
 
@@ -115,7 +133,36 @@ class ErrorTest < ActionView::TestCase
   test 'error with custom wrappers works' do
     swap_wrapper do
       with_error_for @user, :name
-      assert_select 'span.omg_error', "can't be blank"
+      assert_select 'span.omg_error', "can&#39;t be blank"
     end
   end
+
+  # CUSTOM ERRORS
+
+  test 'input with custom error works' do
+    with_custom_error_for(@user, :name, error: "Super User Name! can't be blank")
+
+    assert_select 'span.error', "Super User Name! can&#39;t be blank"
+  end
+
+  test 'input with custom error does not generate the error if there is no error on the attribute' do
+    error_text = "Super User Active! can't be blank"
+    with_form_for @user, :active, error: error_text
+
+    assert_no_select 'span.error'
+  end
+
+  test 'input with custom error escapes the error text' do
+    with_form_for @user, :name, error: 'error must not contain <b>markup</b>'
+
+    assert_select 'span.error'
+    assert_no_select 'span.error b', 'markup'
+  end
+
+  test 'input with custom error does not escape the error text if it is safe' do
+    with_form_for @user, :name, error: 'error must contain <b>markup</b>'.html_safe
+
+    assert_select 'span.error'
+    assert_select 'span.error b', 'markup'
+  end
 end

data/test/form_builder/general_test.rb

@@ -302,7 +302,7 @@ class FormBuilderTest < ActionView::TestCase
 
   test 'builder should generate errors for attribute with errors' do
     with_form_for @user, :name
-    assert_select 'span.error', "can't be blank"
+    assert_select 'span.error', "can&#39;t be blank"
   end
 
   test 'builder should be able to disable showing errors for a input' do
@@ -312,7 +312,7 @@ class FormBuilderTest < ActionView::TestCase
 
   test 'builder should pass options to errors' do
     with_form_for @user, :name, error_html: { id: "cool" }
-    assert_select 'span.error#cool', "can't be blank"
+    assert_select 'span.error#cool', "can&#39;t be blank"
   end
 
   test 'placeholder should not be generated when set to false' do

data/test/form_builder/hint_test.rb

@@ -43,8 +43,14 @@ class HintTest < ActionView::TestCase
   end
 
   test 'hint should be output as html_safe' do
-    with_hint_for @user, :name, hint: '<b>Bold</b> and not...'
+    with_hint_for @user, :name, hint: '<b>Bold</b> and not...'.html_safe
     assert_select 'span.hint', 'Bold and not...'
+    assert_select 'span.hint b', 'Bold'
+  end
+
+  test 'builder should escape hint text' do
+    with_hint_for @user, :name, hint: '<script>alert(1337)</script>'
+    assert_select 'span.hint', "&lt;script&gt;alert(1337)&lt;/script&gt;"
   end
 
   # Without attribute name
@@ -132,7 +138,7 @@ class HintTest < ActionView::TestCase
   test 'hint with custom wrappers works' do
     swap_wrapper do
       with_hint_for @user, :name, hint: "can't be blank"
-      assert_select 'div.omg_hint', "can't be blank"
+      assert_select 'div.omg_hint', "can&#39;t be blank"
     end
   end
 end

data/test/form_builder/input_field_test.rb

@@ -122,4 +122,44 @@ class InputFieldTest < ActionView::TestCase
     assert_no_select 'select.status[label_method]'
     assert_no_select 'select.status[value_method]'
   end
+
+  test 'build input_field without pattern component use the pattern string' do
+    swap_wrapper :default, self.custom_wrapper_with_html5_components do
+      with_concat_form_for(@user) do |f|
+        f.input_field :name, pattern: '\w+'
+      end
+
+      assert_select 'input[pattern="\w+"]'
+    end
+  end
+
+  test 'build input_field without placeholder component use the placeholder string' do
+    swap_wrapper :default, self.custom_wrapper_with_html5_components do
+      with_concat_form_for(@user) do |f|
+        f.input_field :name, placeholder: 'Placeholder'
+      end
+
+      assert_select 'input[placeholder="Placeholder"]'
+    end
+  end
+
+  test 'build input_field without maxlength component use the maxlength string' do
+    swap_wrapper :default, self.custom_wrapper_with_html5_components do
+      with_concat_form_for(@user) do |f|
+        f.input_field :name, maxlength: 5
+      end
+
+      assert_select 'input[maxlength="5"]'
+    end
+  end
+
+  test 'build input_field without readonly component use the readonly string' do
+    swap_wrapper :default, self.custom_wrapper_with_html5_components do
+      with_concat_form_for(@user) do |f|
+        f.input_field :name, readonly: true
+      end
+
+      assert_select 'input[readonly="readonly"]'
+    end
+  end
 end

data/test/form_builder/label_test.rb

@@ -29,6 +29,16 @@ class LabelTest < ActionView::TestCase
     assert_select 'label.string.required[for=validating_user_name]', /Name/
   end
 
+  test 'builder should escape label text' do
+    with_label_for @user, :name, label: '<script>alert(1337)</script>', required: false
+    assert_select 'label.string', "&lt;script&gt;alert(1337)&lt;/script&gt;"
+  end
+
+  test 'builder should not escape label text if it is safe' do
+    with_label_for @user, :name, label: '<script>alert(1337)</script>'.html_safe, required: false
+    assert_select 'label.string script', "alert(1337)"
+  end
+
   test 'builder should allow passing options to label tag' do
     with_label_for @user, :name, label: 'My label', id: 'name_label'
     assert_select 'label.string#name_label', /My label/

data/test/support/misc_helpers.rb

@@ -112,6 +112,12 @@ module MiscHelpers
     end
   end
 
+  def custom_wrapper_with_html5_components
+    SimpleForm.build tag: :span, class: 'custom_wrapper' do |b|
+      b.use :label_text
+    end
+  end
+
   def custom_form_for(object, *args, &block)
     simple_form_for(object, *args, { builder: CustomFormBuilder }, &block)
   end

data/test/test_helper.rb

@@ -5,6 +5,8 @@ require 'minitest/autorun'
 require 'active_model'
 require 'action_controller'
 require 'action_view'
+ActionView::RoutingUrlFor.send(:include, ActionDispatch::Routing::UrlFor)
+
 require 'action_view/template'
 
 require 'action_view/test_case'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_form
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.4
 platform: ruby
 authors:
 - José Valim
@@ -10,48 +10,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-21 00:00:00.000000000 Z
+date: 2015-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-    - - <
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-    - - <
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.0'
 description: Forms made easy!
 email: contact@plataformatec.com.br
 executables: []
@@ -61,7 +49,9 @@ files:
 - CHANGELOG.md
 - MIT-LICENSE
 - README.md
+- lib/generators/simple_form/USAGE
 - lib/generators/simple_form/install_generator.rb
+- lib/generators/simple_form/templates/README
 - lib/generators/simple_form/templates/_form.html.erb
 - lib/generators/simple_form/templates/_form.html.haml
 - lib/generators/simple_form/templates/_form.html.slim
@@ -69,11 +59,10 @@ files:
 - lib/generators/simple_form/templates/config/initializers/simple_form_bootstrap.rb
 - lib/generators/simple_form/templates/config/initializers/simple_form_foundation.rb
 - lib/generators/simple_form/templates/config/locales/simple_form.en.yml
-- lib/generators/simple_form/templates/README
-- lib/generators/simple_form/USAGE
+- lib/simple_form.rb
 - 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.rb
 - lib/simple_form/components/errors.rb
 - lib/simple_form/components/hints.rb
 - lib/simple_form/components/html5.rb
@@ -84,17 +73,16 @@ files:
 - lib/simple_form/components/pattern.rb
 - lib/simple_form/components/placeholders.rb
 - lib/simple_form/components/readonly.rb
-- 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.rb
 - lib/simple_form/helpers/autofocus.rb
 - lib/simple_form/helpers/disabled.rb
 - lib/simple_form/helpers/readonly.rb
 - lib/simple_form/helpers/required.rb
 - lib/simple_form/helpers/validators.rb
-- lib/simple_form/helpers.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
@@ -112,18 +100,15 @@ files:
 - lib/simple_form/inputs/range_input.rb
 - lib/simple_form/inputs/string_input.rb
 - 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.rb
 - lib/simple_form/wrappers/builder.rb
 - lib/simple_form/wrappers/many.rb
 - lib/simple_form/wrappers/root.rb
 - lib/simple_form/wrappers/single.rb
-- lib/simple_form/wrappers.rb
-- lib/simple_form.rb
 - test/action_view_extensions/builder_test.rb
 - test/action_view_extensions/form_helper_test.rb
 - test/components/label_test.rb
@@ -170,17 +155,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: simple_form
-rubygems_version: 2.0.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Forms made easy!
@@ -221,3 +206,4 @@ test_files:
 - test/support/mock_controller.rb
 - test/support/models.rb
 - test/test_helper.rb
+has_rdoc: 

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

data/lib/simple_form/form_builder.rb.orig

@@ -1,486 +0,0 @@
-<<<<<<< HEAD
-require 'simple_form/core_ext/hash'
-=======
-require 'active_support/core_ext/object/deep_dup'
-require 'simple_form/map_type'
->>>>>>> beeac4d... These modules don't need to be autoloaded
-
-module SimpleForm
-  class FormBuilder < ActionView::Helpers::FormBuilder
-    attr_reader :template, :object_name, :object, :wrapper
-
-    # When action is create or update, we still should use new and edit
-    ACTIONS = {
-      :create => :new,
-      :update => :edit
-    }
-
-    extend MapType
-    include SimpleForm::Inputs
-
-    map_type :text,                                :to => SimpleForm::Inputs::TextInput
-    map_type :file,                                :to => SimpleForm::Inputs::FileInput
-    map_type :string, :email, :search, :tel, :url, :to => SimpleForm::Inputs::StringInput
-    map_type :password,                            :to => SimpleForm::Inputs::PasswordInput
-    map_type :integer, :decimal, :float,           :to => SimpleForm::Inputs::NumericInput
-    map_type :range,                               :to => SimpleForm::Inputs::RangeInput
-    map_type :check_boxes,                         :to => SimpleForm::Inputs::CollectionCheckBoxesInput
-    map_type :radio_buttons,                       :to => SimpleForm::Inputs::CollectionRadioButtonsInput
-    map_type :select,                              :to => SimpleForm::Inputs::CollectionSelectInput
-    map_type :grouped_select,                      :to => SimpleForm::Inputs::GroupedCollectionSelectInput
-    map_type :date, :time, :datetime,              :to => SimpleForm::Inputs::DateTimeInput
-    map_type :country, :time_zone,                 :to => SimpleForm::Inputs::PriorityInput
-    map_type :boolean,                             :to => SimpleForm::Inputs::BooleanInput
-
-    def self.discovery_cache
-      @discovery_cache ||= {}
-    end
-
-    def initialize(*) #:nodoc:
-      super
-      @defaults = options[:defaults]
-      @wrapper  = SimpleForm.wrapper(options[:wrapper] || SimpleForm.default_wrapper)
-    end
-
-    # Basic input helper, combines all components in the stack to generate
-    # input html based on options the user define and some guesses through
-    # database column information. By default a call to input will generate
-    # label + input + hint (when defined) + errors (when exists), and all can
-    # be configured inside a wrapper html.
-    #
-    # == Examples
-    #
-    #   # Imagine @user has error "can't be blank" on name
-    #   simple_form_for @user do |f|
-    #     f.input :name, :hint => 'My hint'
-    #   end
-    #
-    # This is the output html (only the input portion, not the form):
-    #
-    #     <label class="string required" for="user_name">
-    #       <abbr title="required">*</abbr> Super User Name!
-    #     </label>
-    #     <input class="string required" id="user_name" maxlength="100"
-    #        name="user[name]" size="100" type="text" value="Carlos" />
-    #     <span class="hint">My hint</span>
-    #     <span class="error">can't be blank</span>
-    #
-    # Each database type will render a default input, based on some mappings and
-    # heuristic to determine which is the best option.
-    #
-    # You have some options for the input to enable/disable some functions:
-    #
-    #   :as => allows you to define the input type you want, for instance you
-    #          can use it to generate a text field for a date column.
-    #
-    #   :required => defines whether this attribute is required or not. True
-    #               by default.
-    #
-    # The fact SimpleForm is built in components allow the interface to be unified.
-    # So, for instance, if you need to disable :hint for a given input, you can pass
-    # :hint => false. The same works for :error, :label and :wrapper.
-    #
-    # Besides the html for any component can be changed. So, if you want to change
-    # the label html you just need to give a hash to :label_html. To configure the
-    # input html, supply :input_html instead and so on.
-    #
-    # == Options
-    #
-    # Some inputs, as datetime, time and select allow you to give extra options, like
-    # prompt and/or include blank. Such options are given in plainly:
-    #
-    #    f.input :created_at, :include_blank => true
-    #
-    # == Collection
-    #
-    # When playing with collections (:radio_buttons, :check_boxes and :select
-    # inputs), you have three extra options:
-    #
-    #   :collection => use to determine the collection to generate the radio or select
-    #
-    #   :label_method => the method to apply on the array collection to get the label
-    #
-    #   :value_method => the method to apply on the array collection to get the value
-    #
-    # == Priority
-    #
-    # Some inputs, as :time_zone and :country accepts a :priority option. If none is
-    # given SimpleForm.time_zone_priority and SimpleForm.country_priority are used respectively.
-    #
-    def input(attribute_name, options={}, &block)
-      options = @defaults.deep_dup.deep_merge(options) if @defaults
-      input = find_input(attribute_name, options, &block)
-
-      chosen =
-        if name = options[:wrapper] || find_wrapper_mapping(input.input_type)
-          name.respond_to?(:render) ? name : SimpleForm.wrapper(name)
-        else
-          wrapper
-        end
-
-      chosen.render input
-    end
-    alias :attribute :input
-
-    # Creates a input tag for the given attribute. All the given options
-    # are sent as :input_html.
-    #
-    # == Examples
-    #
-    #   simple_form_for @user do |f|
-    #     f.input_field :name
-    #   end
-    #
-    # This is the output html (only the input portion, not the form):
-    #
-    #     <input class="string required" id="user_name" maxlength="100"
-    #        name="user[name]" size="100" type="text" value="Carlos" />
-    #
-    def input_field(attribute_name, options={})
-      options = options.dup
-      options[:input_html] = options.except(:as, :collection, :label_method, :value_method)
-      options = @defaults.deep_dup.deep_merge(options) if @defaults
-
-      SimpleForm::Wrappers::Root.new([:input], :wrapper => false).render find_input(attribute_name, options)
-    end
-
-    # Helper for dealing with association selects/radios, generating the
-    # collection automatically. It's just a wrapper to input, so all options
-    # supported in input are also supported by association. Some extra options
-    # can also be given:
-    #
-    # == Examples
-    #
-    #   simple_form_for @user do |f|
-    #     f.association :company          # Company.all
-    #   end
-    #
-    #   f.association :company, :collection => Company.all(:order => 'name')
-    #   # Same as using :order option, but overriding collection
-    #
-    # == Block
-    #
-    # When a block is given, association simple behaves as a proxy to
-    # simple_fields_for:
-    #
-    #   f.association :company do |c|
-    #     c.input :name
-    #     c.input :type
-    #   end
-    #
-    # From the options above, only :collection can also be supplied.
-    #
-    def association(association, options={}, &block)
-      options = options.dup
-
-      return simple_fields_for(*[association,
-        options.delete(:collection), options].compact, &block) if block_given?
-
-      raise ArgumentError, "Association cannot be used in forms not associated with an object" unless @object
-
-      reflection = find_association_reflection(association)
-      raise "Association #{association.inspect} not found" unless reflection
-
-      options[:as] ||= :select
-      options[:collection] ||= options.fetch(:collection) {
-        reflection.klass.all(reflection.options.slice(:conditions, :order))
-      }
-
-      attribute = case reflection.macro
-        when :belongs_to
-          (reflection.respond_to?(:options) && reflection.options[:foreign_key]) || :"#{reflection.name}_id"
-        when :has_one
-          raise ArgumentError, ":has_one associations are not supported by f.association"
-        else
-          if options[:as] == :select
-            html_options = options[:input_html] ||= {}
-            html_options[:size]   ||= 5
-            html_options[:multiple] = true unless html_options.key?(:multiple)
-          end
-
-          # Force the association to be preloaded for performance.
-          if options[:preload] != false && object.respond_to?(association)
-            target = object.send(association)
-            target.to_a if target.respond_to?(:to_a)
-          end
-
-          :"#{reflection.name.to_s.singularize}_ids"
-      end
-
-      input(attribute, options.merge(:reflection => reflection))
-    end
-
-    # Creates a button:
-    #
-    #   form_for @user do |f|
-    #     f.button :submit
-    #   end
-    #
-    # It just acts as a proxy to method name given. We also alias original Rails
-    # button implementation (3.2 forward (to delegate to the original when
-    # calling `f.button :button`.
-    #
-    # TODO: remove if condition when supporting only Rails 3.2 forward.
-    alias_method :button_button, :button if method_defined?(:button)
-    def button(type, *args, &block)
-      options = args.extract_options!.dup
-      options[:class] = [SimpleForm.button_class, options[:class]].compact
-      args << options
-      if respond_to?("#{type}_button")
-        send("#{type}_button", *args, &block)
-      else
-        send(type, *args, &block)
-      end
-    end
-
-    # Creates an error tag based on the given attribute, only when the attribute
-    # contains errors. All the given options are sent as :error_html.
-    #
-    # == Examples
-    #
-    #    f.error :name
-    #    f.error :name, :id => "cool_error"
-    #
-    def error(attribute_name, options={})
-      options = options.dup
-
-      options[:error_html] = options.except(:error_tag, :error_prefix, :error_method)
-      column      = find_attribute_column(attribute_name)
-      input_type  = default_input_type(attribute_name, column, options)
-      wrapper.find(:error).
-        render(SimpleForm::Inputs::Base.new(self, attribute_name, column, input_type, options))
-    end
-
-    # Return the error but also considering its name. This is used
-    # when errors for a hidden field need to be shown.
-    #
-    # == Examples
-    #
-    #    f.full_error :token #=> <span class="error">Token is invalid</span>
-    #
-    def full_error(attribute_name, options={})
-      options = options.dup
-
-      options[:error_prefix] ||= if object.class.respond_to?(:human_attribute_name)
-        object.class.human_attribute_name(attribute_name.to_s)
-      else
-        attribute_name.to_s.humanize
-      end
-
-      error(attribute_name, options)
-    end
-
-    # Creates a hint tag for the given attribute. Accepts a symbol indicating
-    # an attribute for I18n lookup or a string. All the given options are sent
-    # as :hint_html.
-    #
-    # == Examples
-    #
-    #    f.hint :name # Do I18n lookup
-    #    f.hint :name, :id => "cool_hint"
-    #    f.hint "Don't forget to accept this"
-    #
-    def hint(attribute_name, options={})
-      options = options.dup
-
-      options[:hint_html] = options.except(:hint_tag, :hint)
-      if attribute_name.is_a?(String)
-        options[:hint] = attribute_name
-        attribute_name, column, input_type = nil, nil, nil
-      else
-        column      = find_attribute_column(attribute_name)
-        input_type  = default_input_type(attribute_name, column, options)
-      end
-
-      wrapper.find(:hint).
-        render(SimpleForm::Inputs::Base.new(self, attribute_name, column, input_type, options))
-    end
-
-    # Creates a default label tag for the given attribute. You can give a label
-    # through the :label option or using i18n. All the given options are sent
-    # as :label_html.
-    #
-    # == Examples
-    #
-    #    f.label :name                     # Do I18n lookup
-    #    f.label :name, "Name"             # Same behavior as Rails, do not add required tag
-    #    f.label :name, :label => "Name"   # Same as above, but adds required tag
-    #
-    #    f.label :name, :required => false
-    #    f.label :name, :id => "cool_label"
-    #
-    def label(attribute_name, *args)
-      return super if args.first.is_a?(String) || block_given?
-
-      options = args.extract_options!.dup
-      options[:label_html] = options.except(:label, :required, :as)
-
-      column      = find_attribute_column(attribute_name)
-      input_type  = default_input_type(attribute_name, column, options)
-      SimpleForm::Inputs::Base.new(self, attribute_name, column, input_type, options).label
-    end
-
-    # Creates an error notification message that only appears when the form object
-    # has some error. You can give a specific message with the :message option,
-    # otherwise it will look for a message using I18n. All other options given are
-    # passed straight as html options to the html tag.
-    #
-    # == Examples
-    #
-    #    f.error_notification
-    #    f.error_notification :message => 'Something went wrong'
-    #    f.error_notification :id => 'user_error_message', :class => 'form_error'
-    #
-    def error_notification(options={})
-      SimpleForm::ErrorNotification.new(self, options).render
-    end
-
-    # Extract the model names from the object_name mess, ignoring numeric and
-    # explicit child indexes.
-    #
-    # Example:
-    #
-    # route[blocks_attributes][0][blocks_learning_object_attributes][1][foo_attributes]
-    # ["route", "blocks", "blocks_learning_object", "foo"]
-    #
-    def lookup_model_names
-      @lookup_model_names ||= begin
-        child_index = options[:child_index]
-        names = object_name.to_s.scan(/([a-zA-Z_]+)/).flatten
-        names.delete(child_index) if child_index
-        names.each { |name| name.gsub!('_attributes', '') }
-        names.freeze
-      end
-    end
-
-    # The action to be used in lookup.
-    def lookup_action
-      @lookup_action ||= begin
-        action = template.controller.action_name
-        return unless action
-        action = action.to_sym
-        ACTIONS[action] || action
-      end
-    end
-
-    private
-
-    # Find an input based on the attribute name.
-    def find_input(attribute_name, options={}, &block) #:nodoc:
-      column     = find_attribute_column(attribute_name)
-      input_type = default_input_type(attribute_name, column, options)
-
-      if input_type == :radio
-        SimpleForm.deprecation_warn "Using `:as => :radio` as input type is " \
-          "deprecated, please change it to `:as => :radio_buttons`."
-        input_type = :radio_buttons
-      end
-
-      if block_given?
-        SimpleForm::Inputs::BlockInput.new(self, attribute_name, column, input_type, options, &block)
-      else
-        find_mapping(input_type).new(self, attribute_name, column, input_type, options)
-      end
-    end
-
-    # Attempt to guess the better input type given the defined options. By
-    # default alwayls fallback to the user :as option, or to a :select when a
-    # collection is given.
-    def default_input_type(attribute_name, column, options) #:nodoc:
-      return options[:as].to_sym if options[:as]
-      return :select             if options[:collection]
-      custom_type = find_custom_type(attribute_name.to_s) and return custom_type
-
-      input_type = column.try(:type)
-      case input_type
-      when :timestamp
-        :datetime
-      when :string, nil
-        case attribute_name.to_s
-        when /password/  then :password
-        when /time_zone/ then :time_zone
-        when /country/   then :country
-        when /email/     then :email
-        when /phone/     then :tel
-        when /url/       then :url
-        else
-          file_method?(attribute_name) ? :file : (input_type || :string)
-        end
-      else
-        input_type
-      end
-    end
-
-    def find_custom_type(attribute_name) #:nodoc:
-      SimpleForm.input_mappings.find { |match, type|
-        attribute_name =~ match
-      }.try(:last) if SimpleForm.input_mappings
-    end
-
-    def file_method?(attribute_name) #:nodoc:
-      file = @object.send(attribute_name) if @object.respond_to?(attribute_name)
-      file && SimpleForm.file_methods.any? { |m| file.respond_to?(m) }
-    end
-
-    def find_attribute_column(attribute_name) #:nodoc:
-      if @object.respond_to?(:column_for_attribute)
-        @object.column_for_attribute(attribute_name)
-      end
-    end
-
-    def find_association_reflection(association) #:nodoc:
-      if @object.class.respond_to?(:reflect_on_association)
-        @object.class.reflect_on_association(association)
-      end
-    end
-
-    # Attempts to find a mapping. It follows the following rules:
-    #
-    # 1) It tries to find a registered mapping, if succeeds:
-    #    a) Try to find an alternative with the same name in the Object scope
-    #    b) Or use the found mapping
-    # 2) If not, fallbacks to #{input_type}Input
-    # 3) If not, fallbacks to SimpleForm::Inputs::#{input_type}Input
-    def find_mapping(input_type) #:nodoc:
-      discovery_cache[input_type] ||=
-        if mapping = self.class.mappings[input_type]
-          mapping_override(mapping) || mapping
-        else
-          camelized = "#{input_type.to_s.camelize}Input"
-          attempt_mapping(camelized, Object) || attempt_mapping(camelized, self.class) ||
-            raise("No input found for #{input_type}")
-        end
-    end
-
-    def find_wrapper_mapping(input_type) #:nodoc:
-      SimpleForm.wrapper_mappings && SimpleForm.wrapper_mappings[input_type]
-    end
-
-    # If cache_discovery is enabled, use the class level cache that persists
-    # between requests, otherwise use the instance one.
-    def discovery_cache #:nodoc:
-      if SimpleForm.cache_discovery
-        self.class.discovery_cache
-      else
-        @discovery_cache ||= {}
-      end
-    end
-
-    def mapping_override(klass) #:nodoc:
-      name = klass.name
-      if name =~ /^SimpleForm::Inputs/
-        attempt_mapping name.split("::").last, Object
-      end
-    end
-
-    def attempt_mapping(mapping, at) #:nodoc:
-      return if SimpleForm.inputs_discovery == false && at == Object
-
-      begin
-        at.const_get(mapping)
-      rescue NameError => e
-        raise if e.message !~ /#{mapping}$/
-      end
-    end
-  end
-end

data/lib/simple_form/version.rb.orig

@@ -1,7 +0,0 @@
-module SimpleForm
-<<<<<<< HEAD
-  VERSION = "2.0.4".freeze
-=======
-  VERSION = "2.1.0.dev".freeze
->>>>>>> issue-720
-end