simple_form 2.1.0 → 3.0.0.rc

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
@@ -112,7 +118,7 @@ class User
       when :first_company
         Association.new(Company, association, :has_one, {})
       when :special_company
-        Association.new(Company, association, :belongs_to, { :conditions => { :id => 1 } })
+        Association.new(Company, association, :belongs_to, { conditions: { id: 1 } })
     end
   end
 
@@ -120,11 +126,11 @@ class User
     @errors ||= begin
       hash = Hash.new { |h,k| h[k] = [] }
       hash.merge!(
-        :name => ["can't be blank"],
-        :description => ["must be longer than 15 characters"],
-        :age => ["is not a number", "must be greater than 18"],
-        :company => ["company must be present"],
-        :company_id => ["must be valid"]
+        name: ["can't be blank"],
+        description: ["must be longer than 15 characters"],
+        age: ["is not a number", "must be greater than 18"],
+        company: ["company must be present"],
+        company_id: ["must be valid"]
       )
     end
   end
@@ -136,31 +142,31 @@ end
 
 class ValidatingUser < User
   include ActiveModel::Validations
-  validates :name, :presence => true
-  validates :company, :presence => true
-  validates :age, :presence => true, :if => Proc.new { |user| user.name }
-  validates :amount, :presence => true, :unless => Proc.new { |user| user.age }
+  validates :name, presence: true
+  validates :company, presence: true
+  validates :age, presence: true, if: Proc.new { |user| user.name }
+  validates :amount, presence: true, unless: Proc.new { |user| user.age }
 
-  validates :action,            :presence => true, :on => :create
-  validates :credit_limit,      :presence => true, :on => :save
-  validates :phone_number,      :presence => true, :on => :update
+  validates :action,            presence: true, on: :create
+  validates :credit_limit,      presence: true, on: :save
+  validates :phone_number,      presence: true, on: :update
 
   validates_numericality_of :age,
-    :greater_than_or_equal_to => 18,
-    :less_than_or_equal_to => 99,
-    :only_integer => true
+    greater_than_or_equal_to: 18,
+    less_than_or_equal_to: 99,
+    only_integer: true
   validates_numericality_of :amount,
-    :greater_than => :min_amount,
-    :less_than => :max_amount,
-    :only_integer => true
+    greater_than: :min_amount,
+    less_than: :max_amount,
+    only_integer: true
   validates_numericality_of :attempts,
-    :greater_than_or_equal_to => :min_attempts,
-    :less_than_or_equal_to => :max_attempts,
-    :only_integer => true
-  validates_length_of :name, :maximum => 25
-  validates_length_of :description, :maximum => 50
-  validates_length_of :action, :maximum => 10, :tokenizer => lambda { |str| str.scan(/\w+/) }
-  validates_length_of :home_picture, :is => 12
+    greater_than_or_equal_to: :min_attempts,
+    less_than_or_equal_to: :max_attempts,
+    only_integer: true
+  validates_length_of :name, maximum: 25
+  validates_length_of :description, maximum: 50
+  validates_length_of :action, maximum: 10, tokenizer: lambda { |str| str.scan(/\w+/) }
+  validates_length_of :home_picture, is: 12
 
   def min_amount
     10
@@ -182,26 +188,21 @@ end
 class OtherValidatingUser < User
   include ActiveModel::Validations
   validates_numericality_of :age,
-    :greater_than => 17,
-    :less_than => 100,
-    :only_integer => true
+    greater_than: 17,
+    less_than: 100,
+    only_integer: true
   validates_numericality_of :amount,
-    :greater_than => Proc.new { |user| user.age },
-    :less_than => Proc.new { |user| user.age + 100},
-    :only_integer => true
+    greater_than: Proc.new { |user| user.age },
+    less_than: Proc.new { |user| user.age + 100 },
+    only_integer: true
   validates_numericality_of :attempts,
-    :greater_than_or_equal_to => Proc.new { |user| user.age },
-    :less_than_or_equal_to => Proc.new { |user| user.age + 100},
-    :only_integer => true
-
-  validates_format_of :country, :with => /\w+/
+    greater_than_or_equal_to: Proc.new { |user| user.age },
+    less_than_or_equal_to: Proc.new { |user| user.age + 100 },
+    only_integer: true
 
-  # TODO: Remove this check when we drop Rails 3.0 support
-  if ActiveModel::VERSION::MAJOR == 3 && ActiveModel::VERSION::MINOR >= 1
-    validates_format_of :name, :with => Proc.new { /\w+/ }
-  else
-    validates_format_of :name, :with => /\w+/
-  end
+  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
@@ -47,31 +43,31 @@ class ActionView::TestCase
 
   def setup_new_user(options={})
     @user = User.new({
-      :id => 1,
-      :name => 'New in SimpleForm!',
-      :description => 'Hello!',
-      :created_at => Time.now
+      id: 1,
+      name: 'New in SimpleForm!',
+      description: 'Hello!',
+      created_at: Time.now
     }.merge(options))
 
     @validating_user = ValidatingUser.new({
-      :id => 1,
-      :name => 'New in SimpleForm!',
-      :description => 'Hello!',
-      :home_picture => 'Home picture',
-      :created_at => Time.now,
-      :age => 19,
-      :amount => 15,
-      :attempts => 1,
-      :company => [1]
+      id: 1,
+      name: 'New in SimpleForm!',
+      description: 'Hello!',
+      home_picture: 'Home picture',
+      created_at: Time.now,
+      age: 19,
+      amount: 15,
+      attempts: 1,
+      company: [1]
     }.merge(options))
 
     @other_validating_user = OtherValidatingUser.new({
-      :id => 1,
-      :name => 'New in SimpleForm!',
-      :description => 'Hello!',
-      :created_at => Time.now,
-      :age => 19,
-      :company => 1
+      id: 1,
+      name: 'New in SimpleForm!',
+      description: 'Hello!',
+      created_at: Time.now,
+      age: 19,
+      company: 1
     }.merge(options))
   end
 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_form
 version: !ruby/object:Gem::Version
-  version: 2.1.0
-  prerelease: 
+  version: 3.0.0.rc
 platform: ruby
 authors:
 - José Valim
@@ -11,40 +10,48 @@ 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: '3.0'
+        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.rc1
+    - - <
       - !ruby/object:Gem::Version
-        version: '3.0'
+        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.rc1
+    - - <
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 4.0.0.rc1
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.1'
 description: Forms made easy!
 email: contact@plataformatec.com.br
 executables: []
@@ -65,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
@@ -78,10 +84,8 @@ files:
 - lib/simple_form/components/placeholders.rb
 - lib/simple_form/components/readonly.rb
 - lib/simple_form/components.rb
-- lib/simple_form/core_ext/hash.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
@@ -108,8 +112,9 @@ files:
 - 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/builder.rb
 - lib/simple_form/wrappers/many.rb
 - lib/simple_form/wrappers/root.rb
@@ -153,34 +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: -389428450847468473
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -389428450847468473
+      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

data/lib/simple_form/core_ext/hash.rb

@@ -1,16 +0,0 @@
-# TODO: Delete this file when we drop support for Rails 3.0
-#   This method is already implemented in active_support 3.1
-
-unless Hash.new.respond_to?(:deep_dup)
-  class Hash
-    # Returns a deep copy of hash.
-    def deep_dup
-      duplicate = self.dup
-      duplicate.each_pair do |k,v|
-        tv = duplicate[k]
-        duplicate[k] = tv.is_a?(Hash) && v.is_a?(Hash) ? tv.deep_dup : v
-      end
-      duplicate
-    end
-  end
-end