speedo-formstrap 1.2.0 → 1.2.1

data/README.md

@@ -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 = FormtasticBootstrap::FormBuilder
+    Formtastic::Helpers::FormHelper.builder = SpeedoFormstrap::FormBuilder
 
 Make sure the CSS `.hidden {display:none;}` is in your project.
 
@@ -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/formtastic-bootstrap/contributors)!
+A big thank you [to all contributors](https://github.com/mjbellantoni/speedo-formstrap/contributors)!
 
 ### Submitting Issues
 

data/Rakefile

@@ -15,7 +15,7 @@ require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "speedo-formstrap"
-  gem.homepage = "http://github.com/thugsb/formtastic-bootstrap"
+  gem.homepage = "http://github.com/thugsb/speedo-formstrap"
   gem.license = "MIT"
   gem.summary = %Q{Formtastic form builder to generate Twitter Bootstrap-friendly markup.}
   gem.description = gem.summary

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

data/formtastic-bootstrap.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
     "README.md"
   ]
   s.files = `git ls-files`.split("\n")
-  s.homepage = "http://github.com/thugsb/formtastic-bootstrap"
+  s.homepage = "http://github.com/thugsb/speedo-formstrap"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.10"

data/lib/formtastic-bootstrap.rb

@@ -1,7 +1,7 @@
 require "formtastic"
-require "formtastic-bootstrap/engine" if defined?(::Rails) # For tests
-require "formtastic-bootstrap/helpers"
-require "formtastic-bootstrap/inputs"
-require "formtastic-bootstrap/actions"
-require "formtastic-bootstrap/form_builder"
+require "speedo-formstrap/engine" if defined?(::Rails) # For tests
+require "speedo-formstrap/helpers"
+require "speedo-formstrap/inputs"
+require "speedo-formstrap/actions"
+require "speedo-formstrap/form_builder"
 require "action_view/helpers/text_field_date_helper"

data/lib/formtastic-bootstrap/actions.rb

@@ -1,4 +1,4 @@
-require "formtastic-bootstrap/actions/base"
-require "formtastic-bootstrap/actions/input_action"
-require "formtastic-bootstrap/actions/link_action"
-require "formtastic-bootstrap/actions/button_action"
+require "speedo-formstrap/actions/base"
+require "speedo-formstrap/actions/input_action"
+require "speedo-formstrap/actions/link_action"
+require "speedo-formstrap/actions/button_action"

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

@@ -1,4 +1,4 @@
-module FormtasticBootstrap
+module SpeedoFormstrap
 	module Actions
 		module Base
 

data/lib/formtastic-bootstrap/actions/button_action.rb

@@ -1,4 +1,4 @@
-module FormtasticBootstrap
+module SpeedoFormstrap
 	module Actions
 		class ButtonAction < Formtastic::Actions::ButtonAction
 			include Base

data/lib/formtastic-bootstrap/actions/input_action.rb

@@ -1,4 +1,4 @@
-module FormtasticBootstrap
+module SpeedoFormstrap
 	module Actions
 		class InputAction < Formtastic::Actions::InputAction
 			include Base

data/lib/formtastic-bootstrap/actions/link_action.rb

@@ -1,4 +1,4 @@
-module FormtasticBootstrap
+module SpeedoFormstrap
 	module Actions
 		class LinkAction < Formtastic::Actions::LinkAction
 			include Base

data/lib/formtastic-bootstrap/engine.rb

@@ -1,4 +1,4 @@
-module FormtasticBootstrap
+module SpeedoFormstrap
   class Engine < ::Rails::Engine
   end
 end

data/lib/formtastic-bootstrap/form_builder.rb

@@ -1,5 +1,5 @@
-module FormtasticBootstrap
-
+module SpeedoFormstrap
+  
   class FormBuilder < Formtastic::FormBuilder
 
     configure :default_inline_error_class, 'help-inline'
@@ -11,30 +11,28 @@ module FormtasticBootstrap
       # 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
       raise
     end
 
-    include FormtasticBootstrap::Helpers::InputHelper
-    include FormtasticBootstrap::Helpers::InputsHelper
-    include FormtasticBootstrap::Helpers::ButtonsHelper
-    include FormtasticBootstrap::Helpers::ActionHelper
-    include FormtasticBootstrap::Helpers::ActionsHelper
+    include SpeedoFormstrap::Helpers::InputHelper
+    include SpeedoFormstrap::Helpers::InputsHelper
+    include SpeedoFormstrap::Helpers::ButtonsHelper
 
   end
 
-end
+end

data/lib/formtastic-bootstrap/helpers.rb

@@ -1,11 +1,9 @@
-require "formtastic-bootstrap/helpers/buttons_helper"
-require "formtastic-bootstrap/helpers/fieldset_wrapper"
-require "formtastic-bootstrap/helpers/action_helper"
-require "formtastic-bootstrap/helpers/actions_helper"
-require "formtastic-bootstrap/helpers/input_helper"
-require "formtastic-bootstrap/helpers/inputs_helper"
+require "speedo-formstrap/helpers/buttons_helper"
+require "speedo-formstrap/helpers/fieldset_wrapper"
+require "speedo-formstrap/helpers/input_helper"
+require "speedo-formstrap/helpers/inputs_helper"
 
-module FormtasticBootstrap
+module SpeedoFormstrap
   module Helpers
     # autoload :ErrorsHelper, 'formtastic/helpers/errors_helper'
     # autoload :FieldsetWrapper, 'formtastic/helpers/fieldset_wrapper'
@@ -13,7 +11,7 @@ module FormtasticBootstrap
     # 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/helpers/action_helper.rb

@@ -1,10 +1,10 @@
-module FormtasticBootstrap
+module SpeedoFormstrap
 	module Helpers
 		module ActionHelper
 			include Formtastic::Helpers::ActionHelper
 
 			def standard_action_class_name(as)
-			  "FormtasticBootstrap::Actions::#{as.to_s.camelize}Action"
+			  "SpeedoFormstrap::Actions::#{as.to_s.camelize}Action"
 			end
 
 		end

data/lib/formtastic-bootstrap/helpers/actions_helper.rb

@@ -1,9 +1,9 @@
-module FormtasticBootstrap
+module SpeedoFormstrap
 	module Helpers
 		module ActionsHelper
 
 			include Formtastic::Helpers::ActionsHelper
-			include FormtasticBootstrap::Helpers::FieldsetWrapper
+			include SpeedoFormstrap::Helpers::FieldsetWrapper
 
 			def actions(*args, &block)
 				html_options = args.extract_options!

data/lib/formtastic-bootstrap/helpers/buttons_helper.rb

@@ -1,15 +1,14 @@
-module FormtasticBootstrap
+module SpeedoFormstrap
   module Helpers
     module ButtonsHelper
 
       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] ||= "form-actions"
-
+        html_options[:class] ||= "actions"
+  
         if html_options.has_key?(:name)
           ActiveSupport::Deprecation.warn('The :name option is not supported')
         end
@@ -17,7 +16,7 @@ module FormtasticBootstrap
         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") }
@@ -29,28 +28,25 @@ module FormtasticBootstrap
       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/formtastic-bootstrap/helpers/fieldset_wrapper.rb

@@ -1,15 +1,19 @@
-module FormtasticBootstrap
+module SpeedoFormstrap
   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 FormtasticBootstrap
 
         # 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 FormtasticBootstrap
         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/formtastic-bootstrap/helpers/input_helper.rb

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

data/lib/formtastic-bootstrap/helpers/inputs_helper.rb

@@ -1,12 +1,12 @@
-module FormtasticBootstrap
+module SpeedoFormstrap
   module Helpers
     module InputsHelper
-      include FormtasticBootstrap::Helpers::FieldsetWrapper
+      include SpeedoFormstrap::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 FormtasticBootstrap
               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/formtastic-bootstrap/inputs.rb

@@ -1,25 +1,25 @@
-require "formtastic-bootstrap/inputs/base"
-require "formtastic-bootstrap/inputs/boolean_input"
-require "formtastic-bootstrap/inputs/check_boxes_input"
-require "formtastic-bootstrap/inputs/date_input"
-require "formtastic-bootstrap/inputs/datetime_input"
-require "formtastic-bootstrap/inputs/email_input"
-require "formtastic-bootstrap/inputs/file_input"
-require "formtastic-bootstrap/inputs/hidden_input"
-require "formtastic-bootstrap/inputs/number_input"
-require "formtastic-bootstrap/inputs/password_input"
-require "formtastic-bootstrap/inputs/phone_input"
-require "formtastic-bootstrap/inputs/radio_input"
-require "formtastic-bootstrap/inputs/range_input"
-require "formtastic-bootstrap/inputs/search_input"
-require "formtastic-bootstrap/inputs/select_input"
-require "formtastic-bootstrap/inputs/string_input"
-require "formtastic-bootstrap/inputs/text_input"
-require "formtastic-bootstrap/inputs/time_input"
-require "formtastic-bootstrap/inputs/time_zone_input"
-require "formtastic-bootstrap/inputs/url_input"
+require "speedo-formstrap/inputs/base"
+require "speedo-formstrap/inputs/boolean_input"
+require "speedo-formstrap/inputs/check_boxes_input"
+require "speedo-formstrap/inputs/date_input"
+require "speedo-formstrap/inputs/datetime_input"
+require "speedo-formstrap/inputs/email_input"
+require "speedo-formstrap/inputs/file_input"
+require "speedo-formstrap/inputs/hidden_input"
+require "speedo-formstrap/inputs/number_input"
+require "speedo-formstrap/inputs/password_input"
+require "speedo-formstrap/inputs/phone_input"
+require "speedo-formstrap/inputs/radio_input"
+require "speedo-formstrap/inputs/range_input"
+require "speedo-formstrap/inputs/search_input"
+require "speedo-formstrap/inputs/select_input"
+require "speedo-formstrap/inputs/string_input"
+require "speedo-formstrap/inputs/text_input"
+require "speedo-formstrap/inputs/time_input"
+require "speedo-formstrap/inputs/time_zone_input"
+require "speedo-formstrap/inputs/url_input"
 
-module FormtasticBootstrap
+module SpeedoFormstrap
   module Inputs
 
     include Base

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

@@ -1,14 +1,13 @@
-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/numeric"
-require "formtastic-bootstrap/inputs/base/stringish"
-require "formtastic-bootstrap/inputs/base/timeish"
-require "formtastic-bootstrap/inputs/base/wrapping"
+require "speedo-formstrap/inputs/base/choices"
+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/stringish"
+require "speedo-formstrap/inputs/base/timeish"
+require "speedo-formstrap/inputs/base/wrapping"
 
-module FormtasticBootstrap
+module SpeedoFormstrap
   module Inputs
     module Base
 
@@ -17,7 +16,7 @@ module FormtasticBootstrap
       include Html
       include Labelling
       include Wrapping
-
+      
     end
   end
 end

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

@@ -1,38 +1,49 @@
-module FormtasticBootstrap
+module SpeedoFormstrap
   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
+            [yield, error_html(:block), hint_html(:block)].join("\n").html_safe  
           end
         end
 
         def choices_wrapping_html_options
-          new_class = [super[:class], "controls"].compact.join(" ")
-          super.merge(:class => new_class)
+          # 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(&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, control_label_html_options) do
+          template.content_tag(:label, label_html_options) do
             render_label? ? label_text : "".html_safe
           end
         end
 
-        def control_label_html_options
+        def label_html_options
           super.merge(:for => nil)
         end
 
       end
     end
   end
-end
+end