Wrap the date helpers inside a div with the multiple selects fix class

lib/bootstrap_form/form_builder.rb

@@ -4,7 +4,9 @@ class FormBuilder < ActionView::Helpers::FormBuilder
 
     FORM_HELPERS = %w{text_field password_field text_area file_field
                      number_field email_field telephone_field phone_field url_field
-                     select collection_select date_select time_select datetime_select}
+                     select collection_select}
+
+    DATE_HELPERS = %w{date_select time_select datetime_select}
 
     delegate :content_tag, to: :@template
     delegate :capture, to: :@template
@@ -34,6 +36,22 @@ def initialize(object_name, object, template, options, proc=nil)
       end
     end
 
+    DATE_HELPERS.each do |method_name|
+      define_method(method_name) do |name, options = {}, html_options = {}|
+        options.symbolize_keys!
+        html_options.symbolize_keys!
+
+        label = options.delete(:label)
+        label_class = hide_class if options.delete(:hide_label)
+        help = options.delete(:help)
+
+        form_group(name, label: { text: label, class: label_class }, help: help) do
+          html_options[:class] = "form-control #{html_options[:class]}".rstrip
+          content_tag(:div, super(name, options, html_options), class: multiple_selects_class)
+        end
+      end
+    end
+
     def check_box(name, options = {}, checked_value = '1', unchecked_value = '0')
       options = options.symbolize_keys!
 
@@ -123,8 +141,6 @@ def normalize_args!(method_name, args)
         args << {} while args.length < 3
       elsif method_name == "collection_select"
         args << {} while args.length < 5
-      elsif method_name =~ /_select/
-        args << {} while args.length < 2
       end
     end
 
@@ -148,6 +164,10 @@ def static_class
       "form-control-static"
     end
 
+    def multiple_selects_class
+      'rails-bootstrap-forms-multiple-selects'
+    end
+
     def has_error?(name)
       object.respond_to?(:errors) && !(name.nil? || object.errors[name].empty?)
     end