speedo-formstrap 1.2.2 → 1.2.3

data/Gemfile

@@ -3,7 +3,6 @@ source "http://rubygems.org"
 gem 'formtastic', '~> 2.1.0.beta1'
 gem 'rails', '>= 3.1.0'
 
-
 group :development, :test do
   gem "rspec"
   gem "bundler"

data/README.md

@@ -8,7 +8,7 @@ You can follow [FormBoot on twitter](http://twitter.com/FormBoot) for update ann
 
 ### Dependencies
 
-Sppedo Formstrap (forked from Formtastic Bootstrap) has only been tested with Ruby 1.9.2, Rails 3.2, Formtastic 2.1 and Twitter Bootstrap 2.0.4.
+Formtastic Bootstrap has only been tested with Ruby 1.9.2, Rails 3.1, Formtastic 2.0 and Twitter Bootstrap 1.3.
 
 #### Installation
 
@@ -27,7 +27,7 @@ And install it with <tt>bundle install</tt>.
 Add the following line to your Formtastic initialization file:
 
     # config/initializers/formtastic.rb
-    Formtastic::Helpers::FormHelper.builder = SpeedoFormstrap::FormBuilder
+    Formtastic::Helpers::FormHelper.builder = FormtasticBootstrap::FormBuilder
 
 Make sure the CSS `.hidden {display:none;}` is in your project.
 
@@ -75,7 +75,7 @@ made to generate the HTML expected by Bootstrap while still generating the rich
       </fieldset>
     </form>
 
-#### Speedo's Formstrap
+#### Formtastic Bootstrap
 
     <form accept-charset="UTF-8" action="/posts" class="formtastic post" id="new_post" method="post">
       <fieldset class="inputs">
@@ -141,7 +141,7 @@ To create a Prepended Text field, use the ```:prepend``` option.  This works on
  
 ### Contributors
 
-A big thank you [to all contributors](https://github.com/mjbellantoni/speedo-formstrap/contributors)!
+A big thank you [to all contributors](https://github.com/mjbellantoni/formtastic-bootstrap/contributors)!
 
 ### Submitting Issues
 

data/Rakefile

@@ -19,7 +19,7 @@ Jeweler::Tasks.new do |gem|
   gem.license = "MIT"
   gem.summary = %Q{Formtastic form builder to generate Twitter Bootstrap-friendly markup.}
   gem.description = gem.summary
-  gem.email = "mjbellantoni@yahoo.com"
+  gem.email = "stu@t.apio.ca"
   gem.authors = ["Matthew Bellantoni", "Stu Basden"]
   # dependencies defined in Gemfile
 end

data/VERSION

@@ -1 +1 @@
-1.2.2
+1.2.3

data/lib/speedo-formstrap/form_builder.rb

@@ -1,5 +1,5 @@
 module SpeedoFormstrap
-  
+
   class FormBuilder < Formtastic::FormBuilder
 
     configure :default_inline_error_class, 'help-inline'
@@ -11,18 +11,18 @@ module SpeedoFormstrap
       # self.default_inline_error_class
       raise
     end
-    
+
     def self.default_error_class=(error_class)
       # self.default_inline_error_class = error_class
       # self.default_block_error_class = error_class
       raise
     end
-    
+
     def self.default_hint_class
       # self.default_inline_hint_class
       raise
     end
-    
+
     def self.default_hint_class=(hint_class)
       # self.default_inline_hint_class = hint_class
       # self.default_block_hint_class = hint_class
@@ -32,7 +32,9 @@ module SpeedoFormstrap
     include SpeedoFormstrap::Helpers::InputHelper
     include SpeedoFormstrap::Helpers::InputsHelper
     include SpeedoFormstrap::Helpers::ButtonsHelper
+    include SpeedoFormstrap::Helpers::ActionHelper
+    include SpeedoFormstrap::Helpers::ActionsHelper
 
   end
 
-end
+end

data/lib/speedo-formstrap/helpers.rb

@@ -1,5 +1,7 @@
 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"
 
@@ -11,7 +13,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/speedo-formstrap/helpers/buttons_helper.rb

@@ -5,10 +5,11 @@ module SpeedoFormstrap
       include Formtastic::Helpers::ButtonsHelper
 
       def buttons(*args, &block)
+        ::ActiveSupport::Deprecation.warn("f.buttons is deprecated in favour of f.actions and will be removed from Formtastic after 2.1. Please see ActionsHelper and InputAction or ButtonAction for more information")
 
         html_options = args.extract_options!
-        html_options[:class] ||= "actions"
-  
+        html_options[:class] ||= "form-actions"
+
         if html_options.has_key?(:name)
           ActiveSupport::Deprecation.warn('The :name option is not supported')
         end
@@ -16,7 +17,7 @@ module SpeedoFormstrap
         if block_given?
           template.content_tag(:div, html_options) do
             yield
-          end          
+          end
         else
           args = [:commit] if args.empty?
           contents = args.map { |button_name| send(:"#{button_name}_button") }
@@ -28,25 +29,28 @@ module SpeedoFormstrap
       end
 
       def commit_button(*args)
+        ::ActiveSupport::Deprecation.warn("f.commit_button is deprecated in favour of f.action(:submit) and will be removed from Formtastic after 2.1. Please see ActionsHelper and InputAction or ButtonAction for more information")
+
         options = args.extract_options!
         text = options.delete(:label) || args.shift
-      
+
         text = (localized_string(commit_button_i18n_key, text, :action, :model => commit_button_object_name) ||
                 Formtastic::I18n.t(commit_button_i18n_key, :model => commit_button_object_name)) unless text.is_a?(::String)
-      
+
         button_html = options.delete(:button_html) || {}
+        button_html[:id] ||= "#{@object_name}_submit"
         button_html.merge!(:class => [button_html[:class], "btn commit", commit_button_i18n_key].compact.join(' '))
-      
+
         # TODO We don't have a wrapper. Add deprecation message.
         # wrapper_html = options.delete(:wrapper_html) || {}
         # wrapper_html[:class] = (commit_button_wrapper_html_class << wrapper_html[:class]).flatten.compact.join(' ')
-      
+
         accesskey = (options.delete(:accesskey) || default_commit_button_accesskey) unless button_html.has_key?(:accesskey)
         button_html = button_html.merge(:accesskey => accesskey) if accesskey
-        
+
         Formtastic::Util.html_safe(submit(text, button_html))
       end
 
     end
   end
-end
+end

data/lib/speedo-formstrap/helpers/fieldset_wrapper.rb

@@ -3,17 +3,13 @@ module SpeedoFormstrap
     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)
@@ -24,6 +20,8 @@ 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)
@@ -32,6 +30,13 @@ 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/helpers/inputs_helper.rb

@@ -6,7 +6,7 @@ module SpeedoFormstrap
         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 = false
+          @already_in_an_inputs_block = wrap_it
           out
         end
 
     end
   end
-end
+end

data/lib/speedo-formstrap/inputs/base.rb

@@ -3,6 +3,7 @@ require "speedo-formstrap/inputs/base/errors"
 require "speedo-formstrap/inputs/base/hints"
 require "speedo-formstrap/inputs/base/html"
 require "speedo-formstrap/inputs/base/labelling"
+require "speedo-formstrap/inputs/base/numeric"
 require "speedo-formstrap/inputs/base/stringish"
 require "speedo-formstrap/inputs/base/timeish"
 require "speedo-formstrap/inputs/base/wrapping"
@@ -16,7 +17,7 @@ module SpeedoFormstrap
       include Html
       include Labelling
       include Wrapping
-      
+
     end
   end
 end

data/lib/speedo-formstrap/inputs/base/choices.rb

@@ -5,45 +5,34 @@ module SpeedoFormstrap
 
         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  
+            [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" }
+          new_class = [super[:class], "controls"].compact.join(" ")
+          super.merge(:class => new_class)
         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
+        #def choices_group_wrapping(&block)
+        #  template.content_tag(:ul,
+        #    template.capture(&block),
+        #    choices_group_wrapping_html_options
+        #  )
+        #end
 
         # This is actually a label in Bootstrap.
         def legend_html
-          template.content_tag(:label, label_html_options) do
+          template.content_tag(:label, control_label_html_options) do
             render_label? ? label_text : "".html_safe
           end
         end
 
-        def label_html_options
+        def control_label_html_options
           super.merge(:for => nil)
         end
 
       end
     end
   end
-end
+end

data/lib/speedo-formstrap/inputs/base/labelling.rb

@@ -5,14 +5,24 @@ module SpeedoFormstrap
 
         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
-          {}.tap do |opts|
-            opts[:for] ||= input_html_options[:id]
-            opts[:class] = [opts[:class]]
-          end
+          opts = {}
+          opts[:for] ||= input_html_options[:id]
+          opts[:class] = [opts[:class]]
+
+          opts
         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/speedo-formstrap/inputs/base/timeish.rb

@@ -3,13 +3,6 @@ module SpeedoFormstrap
     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
@@ -17,19 +10,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 => object_name, :field_name => fragment_name(fragment), :default => value, :include_blank => include_blank?)
+          opts = input_options.merge(:prefix => fragment_prefix, :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/inputs/base/wrapping.rb

@@ -6,23 +6,29 @@ module SpeedoFormstrap
         include Formtastic::Inputs::Base::Wrapping
 
         def generic_input_wrapping(&block)
-          clearfix_div_wrapping do
+          control_group_div_wrapping do
             label_html <<
             input_div_wrapping do
-              yield
+              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
             end
           end
         end
 
-        def clearfix_div_wrapping(&block)
+        def control_group_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 => "input") do 
-            [yield, error_html(inline_or_block_errors), hint_html(inline_or_block_errors)].join("\n").html_safe  
+          template.content_tag(:div, :class => "controls") do
+            [yield, error_html(inline_or_block_errors), hint_html(inline_or_block_errors)].join("\n").html_safe
           end
         end
 
@@ -33,24 +39,36 @@ module SpeedoFormstrap
         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 = (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[: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