simple_form 3.0.0 → 3.1.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_form
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - José Valim
@@ -10,50 +10,38 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-21 00:00:00.000000000 Z
+date: 2014-11-25 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
+email: opensource@plataformatec.com.br
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -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,16 @@ 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/leaf.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 +156,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.2.2
 signing_key: 
 specification_version: 4
 summary: Forms made easy!

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