formtastic-bootstrap 1.2.0 → 2.0.0

data/lib/formtastic-bootstrap/inputs/base/hints.rb

@@ -5,7 +5,7 @@ module FormtasticBootstrap
         
         include Formtastic::Inputs::Base::Hints
 
-        def hint_html(inline_or_block = :inline)
+        def hint_html(inline_or_block = :block)
           if hint?
             hint_class = if inline_or_block == :inline
               options[:hint_class] || builder.default_inline_hint_class

data/lib/formtastic-bootstrap/inputs/base/labelling.rb

@@ -6,12 +6,23 @@ module FormtasticBootstrap
         include Formtastic::Inputs::Base::Labelling
 
         def label_html_options
-          {}.tap do |opts|
-            opts[:for] ||= input_html_options[:id]
-            opts[:class] = [opts[:class]]
+          super.tap do |options|
+            # Bootstrap defines class 'label'
+            options[:class] = options[:class].reject { |c| c == 'label' }
+            # options[:class] << "control-label"
           end
         end
         
+        def control_label_html_options
+          label_html_options.tap do |options|
+            options[:class] << "control-label"
+          end
+        end
+
+        def control_label_html
+          render_label? ? builder.label(input_name, label_text, control_label_html_options) : "".html_safe
+        end
+
       end
     end
   end

data/lib/formtastic-bootstrap/inputs/base/numeric.rb

@@ -0,0 +1,9 @@
+module FormtasticBootstrap
+  module Inputs
+    module Base
+      module Numeric
+        include Formtastic::Inputs::Base::Numeric
+      end
+    end
+  end
+end

data/lib/formtastic-bootstrap/inputs/base/stringish.rb

@@ -1,5 +1,3 @@
-# Alas, I need to duplicate code from Formtastic::Inputs::Base::Stringish because
-# there's no way to re-import that module.
 module FormtasticBootstrap
   module Inputs
     module Base
@@ -7,9 +5,10 @@ module FormtasticBootstrap
         
         include Formtastic::Inputs::Base::Stringish
 
-        def wrapper_html_options
-          new_class = [super[:class], "stringish"].compact.join(" ")
-          super.merge(:class => new_class)
+        def to_html
+          bootstrap_wrapping do
+            builder.text_field(method, input_html_options)
+          end
         end
         
       end

data/lib/formtastic-bootstrap/inputs/base/timeish.rb

@@ -3,32 +3,52 @@ module FormtasticBootstrap
     module Base
       module Timeish
 
-        def label_html
-          # TODO Supress the "for" field?
-          template.content_tag(:label, label_html_options) do
-            render_label? ? label_text : "".html_safe
+        def to_html
+          control_group_wrapping do
+            control_label_html <<
+            controls_wrapping do
+              hidden_fragments <<
+              fragments.map do |fragment|
+                fragment_input_html(fragment)
+              end.join.html_safe
+            end
           end
         end
 
-        def date_input_html
-          fragment_input_html(:date, "small")
+        def controls_wrapper_html_options
+          super.tap do |options|
+            options[:class] = (options[:class].split << "controls-row").join(" ")
+          end
         end
 
-        def time_input_html
-          fragment_input_html(:time, "mini")
+        def fragment_input_html(fragment)
+          opts = input_options.merge(:prefix => fragment_prefix, :field_name => fragment_name(fragment), :default => value, :include_blank => include_blank?)
+          template.send(:"select_#{fragment}", value, opts, fragment_input_html_options(fragment))
         end
-        
-        def fragment_id(fragment)
-          # TODO is this right?
-          # "#{input_html_options[:id]}_#{position(fragment)}i"
-          "#{input_html_options[:id]}[#{fragment}]"
+
+        def fragment_input_html_options(fragment)
+          input_html_options.tap do |options|
+            options[:id] = fragment_id(fragment)
+            options[:class] = ((options[:class] || "").split << fragment_class(fragment)).join(" ")
+            options[:placeholder] = fragment_placeholder(fragment)
+          end
         end
-        
-        def fragment_input_html(fragment, klass)
-          opts = input_options.merge(:prefix => object_name, :field_name => fragment_name(fragment), :default => value, :include_blank => include_blank?)
-          template.send(:"text_field_#{fragment}", value, opts, input_html_options.merge(:id => fragment_id(fragment), :class => klass))
+
+        def fragment_class(fragment) 
+          { 
+            :year   => "span1", 
+            :month  => "span2",
+            :day    => "span1",
+            :hour   => "span1",
+            :minute => "span1",
+            :second => "span1"
+          }[fragment]
         end
-     
+
+        def fragment_placeholder(fragment)
+          "." + fragment_class(fragment) 
+        end
+
       end
     end
   end

data/lib/formtastic-bootstrap/inputs/base/wrapping.rb

@@ -5,57 +5,45 @@ module FormtasticBootstrap
 
         include Formtastic::Inputs::Base::Wrapping
 
-        def generic_input_wrapping(&block)
-          clearfix_div_wrapping do
-            label_html <<
-            input_div_wrapping do
+        def bootstrap_wrapping(&block)
+          control_group_wrapping do
+            control_label_html <<
+            controls_wrapping do
               if options[:prepend]
                 prepended_input_wrapping do
-                  [template.content_tag(:span, options[:prepend], :class => 'add-on'), yield].join("\n").html_safe
+                  [template.content_tag(:span, options[:prepend], :class => 'add-on'), yield, hint_html].join("\n").html_safe
                 end
               else
-                yield
+                [yield, hint_html].join("\n").html_safe
               end
             end
           end
         end
 
-        def clearfix_div_wrapping(&block)
-          template.content_tag(:div, wrapper_html_options) do
-            yield
-          end
+        def control_group_wrapping(&block)
+          template.content_tag(:div, 
+          [template.capture(&block), error_html].join("\n").html_safe, 
+            wrapper_html_options
+          )
         end
 
-        def input_div_wrapping(inline_or_block_errors = :inline)
-          template.content_tag(:div, :class => "input") do 
-            [yield, error_html(inline_or_block_errors), hint_html(inline_or_block_errors)].join("\n").html_safe  
-          end
+        def controls_wrapping(&block)
+          template.content_tag(:div, template.capture(&block).html_safe, controls_wrapper_html_options)
         end
-
-        def inline_inputs_div_wrapping(&block)
-          template.content_tag(:div, :class => "inline-inputs") do
-            yield
-          end
+        
+        def controls_wrapper_html_options
+          {
+            :class => "controls"
+          }
         end
 
         def wrapper_html_options
-          opts = options[:wrapper_html] || {}
-          opts[:class] ||= []
-          opts[:class] = [opts[:class].to_s] unless opts[:class].is_a?(Array)
-          opts[:class] << as
-          opts[:class] << "clearfix"
-          # opts[:class] << "input"
-          opts[:class] << "error" if errors?
-          opts[:class] << "optional" if optional?
-          opts[:class] << "required" if required?
-          opts[:class] << "autofocus" if autofocus?
-          opts[:class] = opts[:class].join(' ')
-        
-          opts[:id] ||= wrapper_dom_id
-      
-          opts
+          super.tap do |options|
+            options[:class] << " control-group"
+          end
         end
         
+        # Bootstrap prepend feature
         def prepended_input_wrapping(&block)
           template.content_tag(:div, :class => 'input-prepend') do
             yield

data/lib/formtastic-bootstrap/inputs/base.rb

@@ -1,22 +1,45 @@
-require "formtastic-bootstrap/inputs/base/choices"
 require "formtastic-bootstrap/inputs/base/errors"
 require "formtastic-bootstrap/inputs/base/hints"
 require "formtastic-bootstrap/inputs/base/html"
 require "formtastic-bootstrap/inputs/base/labelling"
-require "formtastic-bootstrap/inputs/base/stringish"
-require "formtastic-bootstrap/inputs/base/timeish"
-require "formtastic-bootstrap/inputs/base/wrapping"
 
 module FormtasticBootstrap
   module Inputs
     module Base
 
+      # autoload :DatetimePickerish
+      # autoload :Associations
+      autoload :Collections,  "formtastic-bootstrap/inputs/base/collections"
+      autoload :Choices,      "formtastic-bootstrap/inputs/base/choices"
+      # autoload :Database
+      # autoload :Errors
+      # autoload :Fileish
+      autoload :GroupedCollections, "formtastic-bootstrap/inputs/base/grouped_collections"
+      # autoload :Hints
+      # autoload :Html
+      # autoload :Labelling
+      # autoload :Naming
+      autoload :Numeric,      "formtastic-bootstrap/inputs/base/numeric"
+      # autoload :Options
+      # autoload :Placeholder
+      autoload :Stringish,    "formtastic-bootstrap/inputs/base/stringish"
+      autoload :Timeish,      "formtastic-bootstrap/inputs/base/timeish"
+      # autoload :Validations
+      autoload :Wrapping,     "formtastic-bootstrap/inputs/base/wrapping"
+      
+      include Html
+      # include Options
+      # include Database
+      # include Database
       include Errors
       include Hints
-      include Html
+      # include Naming
+      # include Validations
+      # include Fileish
+      # include Associations
       include Labelling
       include Wrapping
-      
+
     end
   end
 end

data/lib/formtastic-bootstrap/inputs/boolean_input.rb

@@ -2,30 +2,26 @@
 module FormtasticBootstrap
   module Inputs
     class BooleanInput < Formtastic::Inputs::BooleanInput
-      include Base
-
+      include Base      
+      
       def to_html
-        clearfix_div_wrapping do
-          empty_label <<
+        control_group_wrapping do
+          control_label_html <<
           hidden_field_html <<
-          input_div_wrapping(:block) do
-            template.content_tag(:ul, :class => "inputs-list") do
-              template.content_tag(:li) do
-                label_with_nested_checkbox
-              end
-            end
+          controls_wrapping do
+            label_with_nested_checkbox
           end
         end
       end
 
-      def label_text_with_embedded_checkbox
-        # That newline matters!  Why, I do no not know.
-        check_box_html << "\n" << template.content_tag(:span) do label_text end
-      end
-
-      # Need this for formatting to work.
-      def empty_label
-        template.content_tag(:label) do end
+      def label_with_nested_checkbox
+        builder.label(
+          method,
+          label_text_with_embedded_checkbox,
+          label_html_options.tap do |options|
+            options[:class] << "checkbox"
+          end
+        )
       end
 
     end

data/lib/formtastic-bootstrap/inputs/check_boxes_input.rb

@@ -4,29 +4,34 @@ module FormtasticBootstrap
       include Base
       include Base::Choices
 
+      # TODO Make sure help blocks work correctly.
+      # TODO Support .inline
+
       def to_html
-        clearfix_div_wrapping do
-          legend_html <<
+        control_group_wrapping do
+          control_label_html <<
           hidden_field_for_all <<
-          input_div_wrapping do
-            choices_group_wrapping do
-              collection.map { |choice|
-                choice_wrapping(choice_wrapping_html_options(choice)) do
-                  choice_html(choice)
-                end
-              }.join("\n").html_safe
-            end
+          controls_wrapping do
+            collection.map { |choice|
+              choice_html(choice)
+            }.join("\n").html_safe
           end
         end
       end
 
+      def choice_wrapping_html_options(choice)
+        super(choice).tap do |options|
+          options[:class] = ((options[:class].split) << "checkbox").join(" ")
+        end
+      end
+
       def choice_html(choice)
         template.content_tag(:label,
           hidden_fields? ?
             check_box_with_hidden_input(choice) :
             check_box_without_hidden_input(choice) <<
           choice_label(choice),
-          label_html_options.merge(:for => choice_input_dom_id(choice), :class => nil)
+          label_html_options.merge(choice_label_html_options(choice))
         )
       end
 

data/lib/formtastic-bootstrap/inputs/date_input.rb

@@ -1,16 +1,10 @@
 module FormtasticBootstrap
   module Inputs
-    class DateInput < Formtastic::Inputs::DateInput
-      include Base
-      include Base::Stringish
-      include Base::Timeish
-
+    class DateInput < FormtasticBootstrap::Inputs::DateSelectInput
       def to_html
-        generic_input_wrapping do
-          date_input_html
-        end
+        ::ActiveSupport::Deprecation.warn("DateInput (:as => :date) has been renamed to DateSelectInput (:as => :date_select) and will be removed or changed in the next version of Formtastic, please update your forms.", caller(2))
+        super
       end
-
     end
   end
 end

data/lib/formtastic-bootstrap/inputs/date_select_input.rb

@@ -0,0 +1,8 @@
+module FormtasticBootstrap
+  module Inputs
+    class DateSelectInput < Formtastic::Inputs::DateSelectInput
+      include Base
+      include Base::Timeish
+    end
+  end
+end

data/lib/formtastic-bootstrap/inputs/datetime_input.rb

@@ -1,19 +1,10 @@
 module FormtasticBootstrap
   module Inputs
-    class DatetimeInput < Formtastic::Inputs::DatetimeInput
-      include Base
-      include Base::Stringish
-      include Base::Timeish
-
+    class DatetimeInput < FormtasticBootstrap::Inputs::DatetimeSelectInput
       def to_html
-        generic_input_wrapping do
-          inline_inputs_div_wrapping do
-            # This newline matters.
-            date_input_html << "\n".html_safe << time_input_html
-          end
-        end
+        ::ActiveSupport::Deprecation.warn("DatetimeInput (:as => :datetime) has been renamed to DatetimeSelectInput (:as => :datetime_select) and will be removed or changed in the next version of Formtastic, please update your forms.", caller(2))
+        super
       end
-
     end
   end
 end

data/lib/formtastic-bootstrap/inputs/datetime_select_input.rb

@@ -0,0 +1,8 @@
+module FormtasticBootstrap
+  module Inputs
+    class DatetimeSelectInput < Formtastic::Inputs::DatetimeSelectInput
+      include Base
+      include Base::Timeish
+    end
+  end
+end

data/lib/formtastic-bootstrap/inputs/email_input.rb

@@ -5,7 +5,7 @@ module FormtasticBootstrap
       include Base::Stringish
 
       def to_html
-        generic_input_wrapping do
+        bootstrap_wrapping do
           builder.email_field(method, input_html_options)
         end
       end

data/lib/formtastic-bootstrap/inputs/file_input.rb

@@ -4,7 +4,7 @@ module FormtasticBootstrap
       include Base
 
       def to_html
-        generic_input_wrapping do
+        bootstrap_wrapping do
           builder.file_field(method, input_html_options)
         end
       end

data/lib/formtastic-bootstrap/inputs/hidden_input.rb

@@ -3,7 +3,7 @@ module FormtasticBootstrap
     class HiddenInput < Formtastic::Inputs::HiddenInput
       include Base
       def to_html
-        generic_input_wrapping do
+        bootstrap_wrapping do
           builder.hidden_field(method, input_html_options)
         end
       end

data/lib/formtastic-bootstrap/inputs/number_input.rb

@@ -2,14 +2,14 @@ module FormtasticBootstrap
   module Inputs
     class NumberInput < Formtastic::Inputs::NumberInput
       include Base
-      include Base::Stringish
+      include Base::Numeric
 
       def to_html
-        generic_input_wrapping do
+        bootstrap_wrapping do
           builder.number_field(method, input_html_options)
         end
       end
-
+      
     end
   end
 end

data/lib/formtastic-bootstrap/inputs/password_input.rb

@@ -5,7 +5,7 @@ module FormtasticBootstrap
       include Base::Stringish
 
       def to_html
-        generic_input_wrapping do
+        bootstrap_wrapping do
           builder.password_field(method, input_html_options)
         end
       end

data/lib/formtastic-bootstrap/inputs/phone_input.rb

@@ -5,7 +5,7 @@ module FormtasticBootstrap
       include Base::Stringish
 
       def to_html
-        generic_input_wrapping do
+        bootstrap_wrapping do
           builder.phone_field(method, input_html_options)
         end
       end

data/lib/formtastic-bootstrap/inputs/radio_input.rb

@@ -4,29 +4,43 @@ module FormtasticBootstrap
       include Base
       include Base::Choices
 
+      # TODO Make sure help blocks work correctly.
+      # TODO Support .inline
+
       def to_html
-        clearfix_div_wrapping do
-          legend_html <<
-          input_div_wrapping do
-            choices_group_wrapping do
-              collection.map { |choice| 
-                choice_wrapping(choice_wrapping_html_options(choice)) do
-                  choice_html(choice)
-                end
-              }.join("\n").html_safe
-            end
+        control_group_wrapping do
+          control_label_html <<
+          controls_wrapping do
+            collection.map { |choice|
+              choice_html(choice)
+            }.join("\n").html_safe
           end
         end
       end
 
-      def choice_html(choice)        
-        template.content_tag(:label, label_html_options.merge(:for => choice_input_dom_id(choice), :class => nil)) do
-          builder.radio_button(input_name, choice_value(choice), input_html_options.merge(choice_html_options(choice)).merge(:required => false)) << 
+      def wrapper_html_options
+        # Formtastic marks these as 'radio' but Bootstrap does something
+        # with that, so change it to 'radio_buttons'.
+        super.tap do |options|
+          options[:class] = options[:class].gsub("radio", "radio_buttons")
+        end
+      end
 
-          choice_label(choice)
+      # This came from check_boxes.  Do needed refactoring.
+      def choice_wrapping_html_options(choice)
+        super(choice).tap do |options|
+          options[:class] = ((options[:class].split) << "radio").join(" ")
         end
       end
 
+      def choice_html(choice)        
+        template.content_tag(:label,
+          builder.radio_button(input_name, choice_value(choice), input_html_options.merge(choice_html_options(choice)).merge(:required => false)) << 
+          choice_label(choice),
+          label_html_options.merge(choice_label_html_options(choice))
+        )
+      end
+      
     end
   end
 end

data/lib/formtastic-bootstrap/inputs/range_input.rb

@@ -5,7 +5,7 @@ module FormtasticBootstrap
       include Base::Stringish
 
       def to_html
-        generic_input_wrapping do
+        bootstrap_wrapping do
           builder.range_field(method, input_html_options)
         end
       end

data/lib/formtastic-bootstrap/inputs/search_input.rb

@@ -5,7 +5,7 @@ module FormtasticBootstrap
       include Base::Stringish
 
       def to_html
-        generic_input_wrapping do
+        bootstrap_wrapping do
           builder.search_field(method, input_html_options)
         end
       end

data/lib/formtastic-bootstrap/inputs/select_input.rb

@@ -2,9 +2,11 @@ module FormtasticBootstrap
   module Inputs
     class SelectInput < Formtastic::Inputs::SelectInput
       include Base
+      include Base::Collections
+      include Base::GroupedCollections
 
       def to_html
-        generic_input_wrapping do
+        bootstrap_wrapping do
           options[:group_by] ? grouped_select_html : select_html
         end
       end

data/lib/formtastic-bootstrap/inputs/string_input.rb

@@ -3,13 +3,6 @@ module FormtasticBootstrap
     class StringInput < Formtastic::Inputs::StringInput
       include Base
       include Base::Stringish
-
-      def to_html
-        generic_input_wrapping do
-          builder.text_field(method, input_html_options)
-        end
-      end
-
     end
   end
 end

data/lib/formtastic-bootstrap/inputs/text_input.rb

@@ -4,7 +4,7 @@ module FormtasticBootstrap
       include Base 
 
       def to_html
-        generic_input_wrapping do
+        bootstrap_wrapping do
           builder.text_area(method, input_html_options)
         end
       end

data/lib/formtastic-bootstrap/inputs/time_input.rb

@@ -1,16 +1,10 @@
 module FormtasticBootstrap
   module Inputs
-    class TimeInput < Formtastic::Inputs::TimeInput
-      include Base
-      include Base::Stringish
-      include Base::Timeish
-
+    class TimeInput < FormtasticBootstrap::Inputs::TimeSelectInput
       def to_html
-        generic_input_wrapping do
-          time_input_html
-        end
+        ::ActiveSupport::Deprecation.warn("TimeInput (:as => :time) has been renamed to TimeSelectInput (:as => :time_select) and will be removed or changed in the next version of Formtastic, please update your forms.", caller(2))
+        super
       end
-
     end
   end
 end

data/lib/formtastic-bootstrap/inputs/time_select_input.rb

@@ -0,0 +1,8 @@
+module FormtasticBootstrap
+  module Inputs
+    class TimeSelectInput < Formtastic::Inputs::TimeSelectInput
+      include Base
+      include Base::Timeish
+    end
+  end
+end

data/lib/formtastic-bootstrap/inputs/time_zone_input.rb

@@ -4,7 +4,7 @@ module FormtasticBootstrap
       include Base
 
       def to_html
-        generic_input_wrapping do
+        bootstrap_wrapping do
           builder.time_zone_select(method, priority_zones, input_options, input_html_options)
         end
       end