speedo-formstrap 1.2.0 → 1.2.1

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

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

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

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

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

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

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

@@ -1,28 +1,18 @@
-module FormtasticBootstrap
+module SpeedoFormstrap
   module Inputs
     module Base
       module Labelling
 
         include Formtastic::Inputs::Base::Labelling
 
-        def label_html
-          render_label? ? builder.label(input_name, label_text, control_label_html_options) : "".html_safe
-        end
-
         def label_html_options
-          opts = {}
-          opts[:for] ||= input_html_options[:id]
-          opts[:class] = [opts[:class]]
-
-          opts
+          {}.tap do |opts|
+            opts[:for] ||= input_html_options[:id]
+            opts[:class] = [opts[:class]]
+          end
         end
-
-        def control_label_html_options
-          new_class = [label_html_options[:class], "control-label"].compact.join(" ")
-          label_html_options.merge(:class => new_class)
-        end
-
+        
       end
     end
   end
-end
+end

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

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

data/lib/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 FormtasticBootstrap
+module SpeedoFormstrap
   module Inputs
     module Base
       module Stringish

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

@@ -1,8 +1,15 @@
-module FormtasticBootstrap
+module SpeedoFormstrap
   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 FormtasticBootstrap
         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/formtastic-bootstrap/inputs/base/wrapping.rb

@@ -1,4 +1,4 @@
-module FormtasticBootstrap
+module SpeedoFormstrap
   module Inputs
     module Base
       module Wrapping
@@ -6,29 +6,23 @@ module FormtasticBootstrap
         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 FormtasticBootstrap
         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/boolean_input.rb

@@ -1,5 +1,5 @@
 # TODO See if this can be refactored to make use of some of the Choices code.
-module FormtasticBootstrap
+module SpeedoFormstrap
   module Inputs
     class BooleanInput < Formtastic::Inputs::BooleanInput
       include Base

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

@@ -1,4 +1,4 @@
-module FormtasticBootstrap
+module SpeedoFormstrap
   module Inputs
     class CheckBoxesInput < Formtastic::Inputs::CheckBoxesInput
       include Base

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

@@ -1,4 +1,4 @@
-module FormtasticBootstrap
+module SpeedoFormstrap
   module Inputs
     class DateInput < Formtastic::Inputs::DateInput
       include Base

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

@@ -1,4 +1,4 @@
-module FormtasticBootstrap
+module SpeedoFormstrap
   module Inputs
     class DatetimeInput < Formtastic::Inputs::DatetimeInput
       include Base

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

@@ -1,4 +1,4 @@
-module FormtasticBootstrap
+module SpeedoFormstrap
   module Inputs
     class EmailInput < Formtastic::Inputs::EmailInput
       include Base

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

@@ -1,4 +1,4 @@
-module FormtasticBootstrap
+module SpeedoFormstrap
   module Inputs
     class FileInput < Formtastic::Inputs::FileInput
       include Base

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

@@ -1,4 +1,4 @@
-module FormtasticBootstrap
+module SpeedoFormstrap
   module Inputs
     class HiddenInput < Formtastic::Inputs::HiddenInput
       include Base

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

@@ -1,8 +1,8 @@
-module FormtasticBootstrap
+module SpeedoFormstrap
   module Inputs
     class NumberInput < Formtastic::Inputs::NumberInput
       include Base
-      include Base::Numeric
+      include Base::Stringish
 
       def to_html
         generic_input_wrapping do
@@ -12,4 +12,4 @@ module FormtasticBootstrap
 
     end
   end
-end
+end

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

@@ -1,4 +1,4 @@
-module FormtasticBootstrap
+module SpeedoFormstrap
   module Inputs
     class PasswordInput < Formtastic::Inputs::PasswordInput
       include Base

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

@@ -1,4 +1,4 @@
-module FormtasticBootstrap
+module SpeedoFormstrap
   module Inputs
     class PhoneInput < Formtastic::Inputs::PhoneInput
       include Base

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

@@ -1,33 +1,32 @@
-module FormtasticBootstrap
+module SpeedoFormstrap
   module Inputs
     class RadioInput < Formtastic::Inputs::RadioInput
       include Base
       include Base::Choices
 
       def to_html
-        control_group_div_wrapping do
+        clearfix_div_wrapping do
           legend_html <<
           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
 
-      def choice_html(choice)
-        template.content_tag(:label, label_html_options.merge(:for => choice_input_dom_id(choice)).merge(choice_wrapping_html_options(choice))) do
-          builder.radio_button(input_name, choice_value(choice), input_html_options.merge(choice_html_options(choice)).merge(:required => false)) <<
+      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)) << 
 
           choice_label(choice)
         end
       end
 
-      def choice_wrapping_html_options(choice)
-        new_class = [super[:class], 'radio'].join(' ')
-        super.merge(:class => new_class)
-      end
-
     end
   end
-end
+end

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

@@ -1,8 +1,8 @@
-module FormtasticBootstrap
+module SpeedoFormstrap
   module Inputs
     class RangeInput < Formtastic::Inputs::RangeInput
       include Base
-      include Base::Numeric
+      include Base::Stringish
 
       def to_html
         generic_input_wrapping do
@@ -12,4 +12,4 @@ module FormtasticBootstrap
 
     end
   end
-end
+end

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

@@ -1,4 +1,4 @@
-module FormtasticBootstrap
+module SpeedoFormstrap
   module Inputs
     class SearchInput < Formtastic::Inputs::SearchInput
       include Base

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

@@ -1,4 +1,4 @@
-module FormtasticBootstrap
+module SpeedoFormstrap
   module Inputs
     class SelectInput < Formtastic::Inputs::SelectInput
       include Base

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

@@ -1,4 +1,4 @@
-module FormtasticBootstrap
+module SpeedoFormstrap
   module Inputs
     class StringInput < Formtastic::Inputs::StringInput
       include Base

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

@@ -1,4 +1,4 @@
-module FormtasticBootstrap
+module SpeedoFormstrap
   module Inputs
     class TextInput < Formtastic::Inputs::TextInput
       include Base 

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

@@ -1,4 +1,4 @@
-module FormtasticBootstrap
+module SpeedoFormstrap
   module Inputs
     class TimeInput < Formtastic::Inputs::TimeInput
       include Base

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

@@ -1,4 +1,4 @@
-module FormtasticBootstrap
+module SpeedoFormstrap
   module Inputs
     class TimeZoneInput < Formtastic::Inputs::TimeZoneInput
       include Base

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

@@ -1,4 +1,4 @@
-module FormtasticBootstrap
+module SpeedoFormstrap
   module Inputs
     class UrlInput < Formtastic::Inputs::UrlInput
       include Base

data/spec/actions/button_action_spec.rb

@@ -8,7 +8,7 @@ describe 'ButtonAction', 'when submitting' do
   before do
     @output_buffer = ''
     mock_everything
-    Formtastic::Helpers::FormHelper.builder = FormtasticBootstrap::FormBuilder
+    Formtastic::Helpers::FormHelper.builder = SpeedoFormstrap::FormBuilder
 
     concat(semantic_form_for(@new_post) do |builder|
       concat(builder.action(:submit, :as => :button))

data/spec/actions/generic_action_spec.rb

@@ -23,7 +23,7 @@ describe 'InputAction::Base' do
   before do
     @output_buffer = ''
     mock_everything
-    Formtastic::Helpers::FormHelper.builder = FormtasticBootstrap::FormBuilder
+    Formtastic::Helpers::FormHelper.builder = SpeedoFormstrap::FormBuilder
   end
 
   describe 'wrapping HTML' do

data/spec/actions/input_action_spec.rb

@@ -8,7 +8,7 @@ describe 'InputAction', 'when submitting' do
   before do
     @output_buffer = ''
     mock_everything
-    Formtastic::Helpers::FormHelper.builder = FormtasticBootstrap::FormBuilder
+    Formtastic::Helpers::FormHelper.builder = SpeedoFormstrap::FormBuilder
 
     concat(semantic_form_for(@new_post) do |builder|
       concat(builder.action(:submit, :as => :input))

data/spec/actions/link_action_spec.rb

@@ -8,7 +8,7 @@ describe 'LinkAction', 'when cancelling' do
   before do
     @output_buffer = ''
     mock_everything
-    Formtastic::Helpers::FormHelper.builder = FormtasticBootstrap::FormBuilder
+    Formtastic::Helpers::FormHelper.builder = SpeedoFormstrap::FormBuilder
   end
 
   context 'without a :url' do