speedo-formstrap 1.2.3 → 1.2.4

data/lib/{speedo-formstrap → formtastic-bootstrap}/helpers/fieldset_wrapper.rb

@@ -1,15 +1,19 @@
-module SpeedoFormstrap
+module FormtasticBootstrap
   module Helpers
     module FieldsetWrapper
 
       include Formtastic::Helpers::FieldsetWrapper
-
+      
       protected
 
       def field_set_and_list_wrapping(*args, &block) #:nodoc:
         contents = args.last.is_a?(::Hash) ? '' : args.pop.flatten
         html_options = args.extract_options!
 
+        legend  = (html_options[:name] || '').to_s
+        legend %= parent_child_index(html_options[:parent]) if html_options[:parent]
+        legend  = template.content_tag(:legend, Formtastic::Util.html_safe(legend)) unless legend.blank?
+
         if block_given?
           contents = if template.respond_to?(:is_haml?) && template.is_haml?
             template.capture_haml(&block)
@@ -20,8 +24,6 @@ module SpeedoFormstrap
 
         # Ruby 1.9: String#to_s behavior changed, need to make an explicit join.
         contents = contents.join if contents.respond_to?(:join)
-
-        legend = field_set_legend(html_options)
         fieldset = template.content_tag(:fieldset,
           Formtastic::Util.html_safe(legend) << Formtastic::Util.html_safe(contents),
           html_options.except(:builder, :parent, :name)
@@ -30,13 +32,6 @@ module SpeedoFormstrap
         fieldset
       end
 
-      def field_set_legend(html_options)
-        legend  = (html_options[:name] || '').to_s
-        legend %= parent_child_index(html_options[:parent]) if html_options[:parent]
-        legend  = template.content_tag(:legend, Formtastic::Util.html_safe(legend)) unless legend.blank?
-        legend
-      end
-
     end
   end
-end
+end

data/lib/{speedo-formstrap → formtastic-bootstrap}/helpers/input_helper.rb

@@ -1,10 +1,10 @@
-module SpeedoFormstrap
+module FormtasticBootstrap
   module Helpers
     module InputHelper
       include Formtastic::Helpers::InputHelper
       
       def standard_input_class_name(as)
-        "SpeedoFormstrap::Inputs::#{as.to_s.camelize}Input"
+        "FormtasticBootstrap::Inputs::#{as.to_s.camelize}Input"
       end
       
     end

data/lib/{speedo-formstrap → formtastic-bootstrap}/helpers/inputs_helper.rb

@@ -1,12 +1,12 @@
-module SpeedoFormstrap
+module FormtasticBootstrap
   module Helpers
     module InputsHelper
-      include SpeedoFormstrap::Helpers::FieldsetWrapper
+      include FormtasticBootstrap::Helpers::FieldsetWrapper
 
         def inputs(*args, &block)
           wrap_it = @already_in_an_inputs_block ? true : false
           @already_in_an_inputs_block = true
-
+        
           title = field_set_title_from_args(*args)
           html_options = args.extract_options!
           html_options[:class] ||= "inputs"
@@ -25,12 +25,12 @@ module SpeedoFormstrap
               field_set_and_list_wrapping(*((args << html_options) << contents))
             end
           end
-
+        
           # out = template.content_tag(:li, out, :class => "input") if wrap_it
-          @already_in_an_inputs_block = wrap_it
+          @already_in_an_inputs_block = false
           out
         end
 
     end
   end
-end
+end

data/lib/{speedo-formstrap → formtastic-bootstrap}/helpers.rb

@@ -1,11 +1,9 @@
-require "speedo-formstrap/helpers/buttons_helper"
-require "speedo-formstrap/helpers/fieldset_wrapper"
-require "speedo-formstrap/helpers/action_helper"
-require "speedo-formstrap/helpers/actions_helper"
-require "speedo-formstrap/helpers/input_helper"
-require "speedo-formstrap/helpers/inputs_helper"
+require "formtastic-bootstrap/helpers/buttons_helper"
+require "formtastic-bootstrap/helpers/fieldset_wrapper"
+require "formtastic-bootstrap/helpers/input_helper"
+require "formtastic-bootstrap/helpers/inputs_helper"
 
-module SpeedoFormstrap
+module FormtasticBootstrap
   module Helpers
     # autoload :ErrorsHelper, 'formtastic/helpers/errors_helper'
     # autoload :FieldsetWrapper, 'formtastic/helpers/fieldset_wrapper'
@@ -13,7 +11,7 @@ module SpeedoFormstrap
     # autoload :FormHelper, 'formtastic/helpers/form_helper'
     # autoload :InputHelper, 'formtastic/helpers/input_helper'
     # autoload :InputsHelper, 'formtastic/helpers/inputs_helper'
-    # autoload :LabelHelper, 'formtastic/helpers/label_helper'
+    # autoload :LabelHelper, 'formtastic/helpers/label_helper' 
     # autoload :SemanticFormHelper, 'formtastic/helpers/semantic_form_helper'
     # autoload :Reflection, 'formtastic/helpers/reflection'
   end

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

@@ -0,0 +1,49 @@
+module FormtasticBootstrap
+  module Inputs
+    module Base
+      module Choices
+
+        def input_div_wrapping(&block)
+          template.content_tag(:div, choices_wrapping_html_options) do
+            [yield, error_html(:block), hint_html(:block)].join("\n").html_safe  
+          end
+        end
+
+        def choices_wrapping_html_options
+          # TODO Call the Formtastic one explicity and append?
+          { :class => "choices input" }
+        end
+
+        def choices_group_wrapping(&block)
+          template.content_tag(:ul,
+            template.capture(&block),
+            choices_group_wrapping_html_options
+          )
+        end
+
+        def choices_group_wrapping_html_options
+          { :class => "choices-group inputs-list" }
+        end
+
+        def choice_label(choice)
+          "\n".html_safe + template.content_tag(:span) do
+            # (choice.is_a?(Array) ? choice.first : choice).to_s
+            (choice.is_a?(Array) ? choice.first : choice).to_s
+          end
+        end
+
+        # This is actually a label in Bootstrap.
+        def legend_html
+          template.content_tag(:label, label_html_options) do
+            render_label? ? label_text : "".html_safe
+          end
+        end
+
+        def label_html_options
+          super.merge(:for => nil)
+        end
+
+      end
+    end
+  end
+end

data/lib/{speedo-formstrap → formtastic-bootstrap}/inputs/base/errors.rb

@@ -1,4 +1,4 @@
-module SpeedoFormstrap
+module FormtasticBootstrap
   module Inputs
     module Base
       module Errors

data/lib/{speedo-formstrap → formtastic-bootstrap}/inputs/base/hints.rb

@@ -1,4 +1,4 @@
-module SpeedoFormstrap
+module FormtasticBootstrap
   module Inputs
     module Base
       module Hints

data/lib/{speedo-formstrap → formtastic-bootstrap}/inputs/base/html.rb

@@ -1,4 +1,4 @@
-module SpeedoFormstrap
+module FormtasticBootstrap
   module Inputs
     module Base
       module Html

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

@@ -0,0 +1,18 @@
+module FormtasticBootstrap
+  module Inputs
+    module Base
+      module Labelling
+
+        include Formtastic::Inputs::Base::Labelling
+
+        def label_html_options
+          {}.tap do |opts|
+            opts[:for] ||= input_html_options[:id]
+            opts[:class] = [opts[:class]]
+          end
+        end
+        
+      end
+    end
+  end
+end

data/lib/{speedo-formstrap → formtastic-bootstrap}/inputs/base/stringish.rb

@@ -1,6 +1,6 @@
 # Alas, I need to duplicate code from Formtastic::Inputs::Base::Stringish because
 # there's no way to re-import that module.
-module SpeedoFormstrap
+module FormtasticBootstrap
   module Inputs
     module Base
       module Stringish

data/lib/{speedo-formstrap → formtastic-bootstrap}/inputs/base/timeish.rb

@@ -1,8 +1,15 @@
-module SpeedoFormstrap
+module FormtasticBootstrap
   module Inputs
     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
+          end
+        end
+
         def date_input_html
           fragment_input_html(:date, "small")
         end
@@ -10,19 +17,19 @@ module SpeedoFormstrap
         def time_input_html
           fragment_input_html(:time, "mini")
         end
-
+        
         def fragment_id(fragment)
           # TODO is this right?
           # "#{input_html_options[:id]}_#{position(fragment)}i"
           "#{input_html_options[:id]}[#{fragment}]"
         end
-
+        
         def fragment_input_html(fragment, klass)
-          opts = input_options.merge(:prefix => fragment_prefix, :field_name => fragment_name(fragment), :default => value, :include_blank => include_blank?)
+          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))
         end
-
+     
       end
     end
   end
-end
+end

data/lib/{speedo-formstrap → formtastic-bootstrap}/inputs/base/wrapping.rb

@@ -1,4 +1,4 @@
-module SpeedoFormstrap
+module FormtasticBootstrap
   module Inputs
     module Base
       module Wrapping
@@ -6,29 +6,23 @@ module SpeedoFormstrap
         include Formtastic::Inputs::Base::Wrapping
 
         def generic_input_wrapping(&block)
-          control_group_div_wrapping do
+          clearfix_div_wrapping do
             label_html <<
             input_div_wrapping do
-              if options[:prepend]
-                prepended_input_wrapping do
-                  [template.content_tag(:span, options[:prepend], :class => 'add-on'), yield].join("\n").html_safe
-                end
-              else
-                yield
-              end
+              yield
             end
           end
         end
 
-        def control_group_div_wrapping(&block)
+        def clearfix_div_wrapping(&block)
           template.content_tag(:div, wrapper_html_options) do
             yield
           end
         end
 
         def input_div_wrapping(inline_or_block_errors = :inline)
-          template.content_tag(:div, :class => "controls") do
-            [yield, error_html(inline_or_block_errors), hint_html(inline_or_block_errors)].join("\n").html_safe
+          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
         end
 
@@ -39,36 +33,24 @@ module SpeedoFormstrap
         end
 
         def wrapper_html_options
-          opts = (options[:wrapper_html] || {}).dup
-          opts[:class] =
-            case opts[:class]
-            when Array
-              opts[:class].dup
-            when nil
-              []
-            else
-              [opts[:class].to_s]
-            end
-          opts[:class] << "#{as}-wrapper"
-          opts[:class] << "control-group"
+          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
         end
-        
-        def prepended_input_wrapping(&block)
-          template.content_tag(:div, :class => 'input-prepend') do
-            yield
-          end
-        end
+
       end
     end
   end
-end
+end

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

@@ -0,0 +1,22 @@
+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
+
+      include Errors
+      include Hints
+      include Html
+      include Labelling
+      include Wrapping
+      
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+# TODO See if this can be refactored to make use of some of the Choices code.
+module FormtasticBootstrap
+  module Inputs
+    class BooleanInput < Formtastic::Inputs::BooleanInput
+      include Base
+
+      def to_html
+        clearfix_div_wrapping do
+          empty_label <<
+          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
+          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
+      end
+
+    end
+  end
+end

data/lib/{speedo-formstrap → formtastic-bootstrap}/inputs/check_boxes_input.rb

@@ -1,17 +1,21 @@
-module SpeedoFormstrap
+module FormtasticBootstrap
   module Inputs
     class CheckBoxesInput < Formtastic::Inputs::CheckBoxesInput
       include Base
       include Base::Choices
 
       def to_html
-        control_group_div_wrapping do
+        clearfix_div_wrapping do
           legend_html <<
           hidden_field_for_all <<
           input_div_wrapping do
-            collection.map { |choice|
-              choice_html(choice)
-            }.join("\n").html_safe
+            choices_group_wrapping do
+              collection.map { |choice|
+                choice_wrapping(choice_wrapping_html_options(choice)) do
+                  choice_html(choice)
+                end
+              }.join("\n").html_safe
+            end
           end
         end
       end
@@ -22,15 +26,10 @@ module SpeedoFormstrap
             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)).merge(choice_wrapping_html_options(choice))
+          label_html_options.merge(:for => choice_input_dom_id(choice), :class => nil)
         )
       end
 
-      def choice_wrapping_html_options(choice)
-        new_class = [super[:class], 'checkbox'].join(' ')
-        super.merge(:class => new_class)
-      end
-
     end
   end
 end