simple_form 2.0.0 → 2.1.0

data/lib/simple_form/inputs/boolean_input.rb

@@ -5,7 +5,7 @@ module SimpleForm
         if nested_boolean_style?
           build_hidden_field_for_checkbox +
             template.label_tag(nil, :class => "checkbox") {
-              build_check_box_without_hidden_field
+              build_check_box_without_hidden_field + inline_label
             }
         else
           build_check_box
@@ -34,8 +34,8 @@ 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='0')
-        @builder.check_box(attribute_name, input_html_options, '1', unchecked_value)
+      def build_check_box(unchecked_value = unchecked_value)
+        @builder.check_box(attribute_name, input_html_options, checked_value, unchecked_value)
       end
 
       # Build a checkbox without generating the hidden field. See
@@ -49,8 +49,14 @@ module SimpleForm
       # we need the hidden field to be *outside* the label (otherwise it
       # generates invalid html - html5 only).
       def build_hidden_field_for_checkbox
-        @builder.hidden_field(attribute_name, :value => '0', :id => nil,
-                              :disabled => input_html_options[:disabled])
+        @builder.hidden_field(attribute_name, :value => unchecked_value, :id => nil,
+                              :disabled => input_html_options[:disabled],
+                              :name => input_html_options[:name])
+      end
+
+      def inline_label
+        inline_option = options[:inline_label]
+        inline_option == true ? label_text : inline_option
       end
 
       # Booleans are not required by default because in most of the cases
@@ -59,6 +65,14 @@ module SimpleForm
       def required_by_default?
         false
       end
+
+      def checked_value
+        options.fetch(:checked_value, '1')
+      end
+
+      def unchecked_value
+        options.fetch(:unchecked_value, '0')
+      end
     end
   end
 end

data/lib/simple_form/inputs/collection_radio_buttons_input.rb

@@ -20,16 +20,12 @@ module SimpleForm
       protected
 
       def apply_default_collection_options!(options)
-        unless options.key?(:item_wrapper_tag)
-          options[:item_wrapper_tag] = SimpleForm.item_wrapper_tag
-        end
+        options[:item_wrapper_tag] ||= options.fetch(:item_wrapper_tag, SimpleForm.item_wrapper_tag)
         options[:item_wrapper_class] = [
           item_wrapper_class, options[:item_wrapper_class], SimpleForm.item_wrapper_class
         ].compact.presence
 
-        unless options.key?(:collection_wrapper_tag)
-          options[:collection_wrapper_tag] = SimpleForm.collection_wrapper_tag
-        end
+        options[:collection_wrapper_tag] ||= options.fetch(:collection_wrapper_tag, SimpleForm.collection_wrapper_tag)
         options[:collection_wrapper_class] = [
           options[:collection_wrapper_class], SimpleForm.collection_wrapper_class
         ].compact.presence

data/lib/simple_form/inputs/date_time_input.rb

@@ -5,10 +5,6 @@ module SimpleForm
         @builder.send(:"#{input_type}_select", attribute_name, input_options, input_html_options)
       end
 
-      def has_required?
-        false
-      end
-
       private
 
       def label_target

data/lib/simple_form/inputs.rb

@@ -1,21 +1,23 @@
 module SimpleForm
   module Inputs
-    autoload :Base,                         'simple_form/inputs/base'
-    autoload :BlockInput,                   'simple_form/inputs/block_input'
-    autoload :BooleanInput,                 'simple_form/inputs/boolean_input'
-    autoload :CollectionCheckBoxesInput,    'simple_form/inputs/collection_check_boxes_input'
-    autoload :CollectionInput,              'simple_form/inputs/collection_input'
-    autoload :CollectionRadioButtonsInput,  'simple_form/inputs/collection_radio_buttons_input'
-    autoload :CollectionSelectInput,        'simple_form/inputs/collection_select_input'
-    autoload :DateTimeInput,                'simple_form/inputs/date_time_input'
-    autoload :FileInput,                    'simple_form/inputs/file_input'
-    autoload :GroupedCollectionSelectInput, 'simple_form/inputs/grouped_collection_select_input'
-    autoload :HiddenInput,                  'simple_form/inputs/hidden_input'
-    autoload :NumericInput,                 'simple_form/inputs/numeric_input'
-    autoload :PasswordInput,                'simple_form/inputs/password_input'
-    autoload :PriorityInput,                'simple_form/inputs/priority_input'
-    autoload :RangeInput,                   'simple_form/inputs/range_input'
-    autoload :StringInput,                  'simple_form/inputs/string_input'
-    autoload :TextInput,                    'simple_form/inputs/text_input'
+    extend ActiveSupport::Autoload
+
+    autoload :Base
+    autoload :BlockInput
+    autoload :BooleanInput
+    autoload :CollectionCheckBoxesInput
+    autoload :CollectionInput
+    autoload :CollectionRadioButtonsInput
+    autoload :CollectionSelectInput
+    autoload :DateTimeInput
+    autoload :FileInput
+    autoload :GroupedCollectionSelectInput
+    autoload :HiddenInput
+    autoload :NumericInput
+    autoload :PasswordInput
+    autoload :PriorityInput
+    autoload :RangeInput
+    autoload :StringInput
+    autoload :TextInput
   end
 end

data/lib/simple_form/version.rb

@@ -1,3 +1,3 @@
 module SimpleForm
-  VERSION = "2.0.0".freeze
+  VERSION = "2.1.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/many.rb

@@ -56,11 +56,15 @@ module SimpleForm
         return content unless tag
 
         klass = html_classes(input, options)
-        opts  = options[:"#{namespace}_html"] || {}
+        opts  = html_options(options)
         opts[:class] = (klass << opts[:class]).join(' ').strip unless klass.empty?
         input.template.content_tag(tag, content, opts)
       end
 
+      def html_options(options)
+        options[:"#{namespace}_html"] || {}
+      end
+
       def html_classes(input, options)
         @defaults[:class].dup
       end

data/lib/simple_form/wrappers/root.rb

@@ -24,10 +24,12 @@ module SimpleForm
 
       def html_classes(input, options)
         css = options[:wrapper_class] ? Array.wrap(options[:wrapper_class]) : @defaults[:class]
-        css += SimpleForm.additional_classes_for(:wrapper) { input.html_classes }
+        css += SimpleForm.additional_classes_for(:wrapper) do
+          input.additional_classes + [input.input_class]
+        end
         css << (options[:wrapper_error_class] || @defaults[:error_class]) if input.has_errors?
         css << (options[:wrapper_hint_class] || @defaults[:hint_class]) if input.has_hint?
-        css
+        css.compact
       end
     end
   end

data/lib/simple_form/wrappers/single.rb

@@ -13,6 +13,12 @@ module SimpleForm
           wrap(input, options, content) if content
         end
       end
+
+      private
+
+      def html_options(options)
+        [:label, :input].include?(namespace) ? {} : super
+      end
     end
   end
 end

data/lib/simple_form.rb

@@ -6,14 +6,17 @@ require 'active_support/core_ext/hash/except'
 require 'active_support/core_ext/hash/reverse_merge'
 
 module SimpleForm
-  autoload :Components,        'simple_form/components'
-  autoload :ErrorNotification, 'simple_form/error_notification'
-  autoload :FormBuilder,       'simple_form/form_builder'
-  autoload :Helpers,           'simple_form/helpers'
-  autoload :I18nCache,         'simple_form/i18n_cache'
-  autoload :Inputs,            'simple_form/inputs'
-  autoload :MapType,           'simple_form/map_type'
-  autoload :Wrappers,          'simple_form/wrappers'
+  extend ActiveSupport::Autoload
+
+  autoload :Helpers
+  autoload :Wrappers
+
+  eager_autoload do
+    autoload :Components
+    autoload :ErrorNotification
+    autoload :FormBuilder
+    autoload :Inputs
+  end
 
   ## CONFIGURATION OPTIONS
 
@@ -95,6 +98,12 @@ module SimpleForm
   mattr_accessor :input_mappings
   @@input_mappings = nil
 
+  # 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 }
+  mattr_accessor :wrapper_mappings
+  @@wrapper_mappings = nil
+
   # Default priority for time_zone inputs.
   mattr_accessor :time_zone_priority
   @@time_zone_priority = nil