simple_form 2.1.3 → 3.0.0

data/lib/simple_form/tags.rb

@@ -0,0 +1,62 @@
+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)
+          additional_html_options = option_html_attributes(item)
+
+          rendered_item = yield item, value, text, default_html_options.merge(additional_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

data/lib/simple_form/version.rb

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

data/lib/simple_form/version.rb.orig

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

data/lib/simple_form/wrappers/builder.rb

@@ -12,18 +12,18 @@ module SimpleForm
     #       b.optional :placeholder
     #
     #       # Use a component with specific wrapper options
-    #       b.use :error, :wrap_with => { :tag => "span", :class => "error" }
+    #       b.use :error, wrap_with: { tag: "span", class: "error" }
     #
     #       # Use a set of components by wrapping them in a tag+class.
-    #       b.wrapper :tag => "div", :class => "another" do |ba|
+    #       b.wrapper tag: "div", class: "another" do |ba|
     #         ba.use :label
     #         ba.use :input
     #       end
     #
     #       # Use a set of components by wrapping them in a tag+class.
     #       # This wrapper is identified by :label_input, which means it can
-    #       # be turned off on demand with `f.input :name, :label_input => false`
-    #       b.wrapper :label_input, :tag => "div", :class => "another" do |ba|
+    #       # be turned off on demand with `f.input :name, label_input: false`
+    #       b.wrapper :label_input, tag: "div", class: "another" do |ba|
     #         ba.use :label
     #         ba.use :input
     #       end
@@ -32,7 +32,7 @@ module SimpleForm
     # The builder also accepts default options at the root level. This is usually
     # used if you want a component to be disabled by default:
     #
-    #     config.wrappers :hint => false do |b|
+    #     config.wrappers hint: false do |b|
     #       b.use :hint
     #       b.use :label_input
     #     end
@@ -46,18 +46,6 @@ module SimpleForm
       end
 
       def use(name, options=nil, &block)
-        if block_given?
-          ActiveSupport::Deprecation.warn "Passing a block to use is deprecated. " \
-            "Please use wrapper instead of use."
-          return wrapper(name, options, &block)
-        end
-
-        if options && options.keys != [:wrap_with]
-          ActiveSupport::Deprecation.warn "Passing :tag, :class and others to use is deprecated. " \
-            "Please invoke b.use #{name.inspect}, :wrap_with => #{options.inspect} instead."
-          options = { :wrap_with => options }
-        end
-
         if options && wrapper = options[:wrap_with]
           @components << Single.new(name, wrapper)
         else
@@ -66,18 +54,6 @@ module SimpleForm
       end
 
       def optional(name, options=nil, &block)
-        if block_given?
-          ActiveSupport::Deprecation.warn "Passing a block to optional is deprecated. " \
-            "Please use wrapper instead of optional."
-          return wrapper(name, options, &block)
-        end
-
-        if options && options.keys != [:wrap_with]
-          ActiveSupport::Deprecation.warn "Passing :tag, :class and others to optional is deprecated. " \
-            "Please invoke b.optional #{name.inspect}, :wrap_with => #{options.inspect} instead."
-          options = { :wrap_with => options }
-        end
-
         @options[name] = false
         use(name, options, &block)
       end

data/lib/simple_form/wrappers/many.rb

@@ -17,7 +17,7 @@ module SimpleForm
         @components = components
         @defaults   = defaults
         @defaults[:tag]   = :div unless @defaults.key?(:tag)
-        @defaults[:class] = Array.wrap(@defaults[:class])
+        @defaults[:class] = Array(@defaults[:class])
       end
 
       def render(input)

data/lib/simple_form/wrappers/root.rb

@@ -23,7 +23,7 @@ module SimpleForm
       private
 
       def html_classes(input, options)
-        css = options[:wrapper_class] ? Array.wrap(options[:wrapper_class]) : @defaults[:class]
+        css = options[:wrapper_class] ? Array(options[:wrapper_class]) : @defaults[:class]
         css += SimpleForm.additional_classes_for(:wrapper) do
           input.additional_classes + [input.input_class]
         end

data/lib/simple_form/wrappers.rb

@@ -5,4 +5,4 @@ module SimpleForm
     autoload :Root,    'simple_form/wrappers/root'
     autoload :Single,  'simple_form/wrappers/single'
   end
-end
+end

data/lib/simple_form.rb

@@ -18,6 +18,12 @@ module SimpleForm
     autoload :Inputs
   end
 
+  def self.eager_load!
+    super
+    SimpleForm::Inputs.eager_load!
+    SimpleForm::Components.eager_load!
+  end
+
   ## CONFIGURATION OPTIONS
 
   # Method used to tidy up errors.
@@ -34,11 +40,11 @@ module SimpleForm
 
   # Series of attemps to detect a default label method for collection.
   mattr_accessor :collection_label_methods
-  @@collection_label_methods = [ :to_label, :name, :title, :to_s ]
+  @@collection_label_methods = [:to_label, :name, :title, :to_s]
 
   # Series of attemps to detect a default value method for collection.
   mattr_accessor :collection_value_methods
-  @@collection_value_methods = [ :id, :to_s ]
+  @@collection_value_methods = [:id, :to_s]
 
   # You can wrap a collection of radio/check boxes in a pre-defined tag, defaulting to none.
   mattr_accessor :collection_wrapper_tag
@@ -49,7 +55,7 @@ module SimpleForm
   @@collection_wrapper_class = nil
 
   # You can wrap each item in a collection of radio/check boxes with a tag,
-  # defaulting to none. Please note that when using :boolean_style = :nested,
+  # defaulting to span. Please note that when using :boolean_style = :nested,
   # SimpleForm will force this option to be a :label.
   mattr_accessor :item_wrapper_tag
   @@item_wrapper_tag = :span
@@ -62,25 +68,25 @@ module SimpleForm
   mattr_accessor :label_text
   @@label_text = lambda { |label, required| "#{required} #{label}" }
 
-  # You can define the class to use on all labels. Default is nil.
+  # You can define the class to be used on all labels. Defaults to none.
   mattr_accessor :label_class
   @@label_class = nil
 
   # Define the way to render check boxes / radio buttons with labels.
-  #   :inline => input + label (default)
-  #   :nested => label > input
+  #   inline: input + label (default)
+  #   nested: label > input
   mattr_accessor :boolean_style
   @@boolean_style = :inline
 
-  # You can define the class to use on all forms. Default is simple_form.
+  # You can define the class to be used on all forms. Default is simple_form.
   mattr_accessor :form_class
   @@form_class = :simple_form
 
-  # You can define which elements should obtain additional classes
+  # You can define which elements should obtain additional classes.
   mattr_accessor :generate_additional_classes_for
   @@generate_additional_classes_for = [:wrapper, :label, :input]
 
-  # Whether attributes are required by default (or not).
+  # Whether attributes are required by default or not.
   mattr_accessor :required_by_default
   @@required_by_default = true
 
@@ -90,7 +96,7 @@ module SimpleForm
 
   # Collection of methods to detect if a file type was given.
   mattr_accessor :file_methods
-  @@file_methods = [ :mounted_as, :file?, :public_filename ]
+  @@file_methods = [:mounted_as, :file?, :public_filename]
 
   # Custom mappings for input types. This should be a hash containing a regexp
   # to match as key, and the input type that will be used when the field name
@@ -100,7 +106,7 @@ module SimpleForm
 
   # Custom wrappers for input types. This should be a hash containing an input
   # type as key and the wrapper that will be used for all inputs with specified type.
-  # e.g { :string => :string_wrapper, :boolean => :boolean_wrapper }
+  # e.g { string: :string_wrapper, boolean: :boolean_wrapper }
   mattr_accessor :wrapper_mappings
   @@wrapper_mappings = nil
 
@@ -112,9 +118,9 @@ module SimpleForm
   mattr_accessor :country_priority
   @@country_priority = nil
 
-  # Maximum size allowed for inputs.
+  # DEPRECATED: Maximum size allowed for inputs.
   mattr_accessor :default_input_size
-  @@default_input_size = 50
+  @@default_input_size = nil
 
   # When off, do not use translations in labels. Disabling translation in
   # hints and placeholders can be done manually in the wrapper API.
@@ -125,14 +131,26 @@ module SimpleForm
   mattr_accessor :inputs_discovery
   @@inputs_discovery = true
 
-  # Cache SimpleForm inputs discovery
+  # Cache SimpleForm inputs discovery.
   mattr_accessor :cache_discovery
   @@cache_discovery = defined?(Rails) && !Rails.env.development?
 
-  # Adds a class to each generated button, mostly for compatiblity
+  # Adds a class to each generated button, mostly for compatiblity.
   mattr_accessor :button_class
   @@button_class = 'button'
 
+  # Override the default ActiveModelHelper behaviour of wrapping the input.
+  # This gets taken care of semantically by adding an error class to the wrapper tag
+  # containing the input.
+  mattr_accessor :field_error_proc
+  @@field_error_proc = proc do |html_tag, instance_tag|
+    html_tag
+  end
+
+  # Adds a class to each generated inputs
+  mattr_accessor :input_class
+  @@input_class = nil
+
   ## WRAPPER CONFIGURATION
   # The default wrapper to be used by the FormBuilder.
   mattr_accessor :default_wrapper
@@ -168,7 +186,7 @@ module SimpleForm
     SimpleForm::Wrappers::Root.new(builder.to_a, options)
   end
 
-  wrappers :class => :input, :hint_class => :field_with_hint, :error_class => :field_with_errors do |b|
+  wrappers class: :input, hint_class: :field_with_hint, error_class: :field_with_errors do |b|
     b.use :html5
 
     b.use :min_max
@@ -178,47 +196,25 @@ module SimpleForm
     b.optional :readonly
 
     b.use :label_input
-    b.use :hint,  :wrap_with => { :tag => :span, :class => :hint }
-    b.use :error, :wrap_with => { :tag => :span, :class => :error }
+    b.use :hint,  wrap_with: { tag: :span, class: :hint }
+    b.use :error, wrap_with: { tag: :span, class: :error }
   end
 
-  ## SETUP
-
-  DEPRECATED = %w(hint_tag hint_class error_tag error_class error_notification_id wrapper_tag wrapper_class wrapper_error_class components html5)
-  @@deprecated = []
-
-  DEPRECATED.each do |method|
-    class_eval "def self.#{method}=(*); @@deprecated << :#{method}=; end"
-    class_eval "def self.#{method}; deprecation_warn 'SimpleForm.#{method} is deprecated and has no effect'; end"
-  end
-
-  def self.translate=(value)
-    deprecation_warn "SimpleForm.translate= is disabled in favor of translate_labels="
-    self.translate_labels = value
-  end
-
-  def self.translate
-    deprecation_warn "SimpleForm.translate is disabled in favor of translate_labels"
-    self.translate_labels
+  def self.additional_classes_for(component)
+    generate_additional_classes_for.include?(component) ? yield : []
   end
 
-  def self.deprecation_warn(message)
-    ActiveSupport::Deprecation.warn "[SIMPLE_FORM] #{message}", caller
-  end
+  ## SETUP
 
-  def self.additional_classes_for(component)
-    generate_additional_classes_for.include?(component) ? yield : []
+  def self.default_input_size=(*)
+    ActiveSupport::Deprecation.warn "[SIMPLE_FORM] SimpleForm.default_input_size= is deprecated and has no effect", caller
   end
 
   # Default way to setup SimpleForm. Run rails generate simple_form:install
   # to create a fresh initializer with all configuration values.
   def self.setup
     yield self
-
-    unless @@deprecated.empty?
-      raise "[SIMPLE FORM] Your SimpleForm initializer file is using the following methods: #{@@deprecated.to_sentence}. " <<
-        "Those methods are part of the outdated configuration API. Updating to the new API is easy and fast. " <<
-        "Check for more info here: https://github.com/plataformatec/simple_form/wiki/Upgrading-to-Simple-Form-2.0"
-    end
   end
 end
+
+require 'simple_form/railtie' if defined?(Rails)