formtastic-bootstrap 1.2.0 → 2.0.0

data/Gemfile

@@ -1,10 +1,12 @@
 source "http://rubygems.org"
 
-gem 'formtastic'
-gem 'rails', '~> 3.1.0'
+gemspec
+
+gem 'formtastic', "~> 2.2"
 
 group :development, :test do
-  gem "rspec"
+  gem "ammeter"
+  gem "rspec-rails", "~> 2.8.0"
   gem "bundler"
   gem "jeweler"
   gem "rcov", ">= 0"

data/Gemfile.lock

@@ -1,40 +1,51 @@
+PATH
+  remote: .
+  specs:
+    formtastic-bootstrap (1.2.0)
+      formtastic
+      rails (>= 3.1.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.3)
-      actionpack (= 3.1.3)
-      mail (~> 2.3.0)
-    actionpack (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
+    actionmailer (3.2.3)
+      actionpack (= 3.2.3)
+      mail (~> 2.4.4)
+    actionpack (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.5)
-      rack-cache (~> 1.1)
-      rack-mount (~> 0.8.2)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.3)
-    activemodel (3.1.3)
-      activesupport (= 3.1.3)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-      arel (~> 2.2.1)
+    activerecord (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-    activesupport (3.1.3)
+    activeresource (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+    activesupport (3.2.3)
+      i18n (~> 0.6)
       multi_json (~> 1.0)
-    arel (2.2.1)
+    ammeter (0.2.4)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec (>= 2.2)
+      rspec-rails (>= 2.2)
+    arel (3.0.2)
     builder (3.0.0)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    formtastic (2.0.2)
-      rails (~> 3.0)
+    formtastic (2.2.0)
+      actionpack (>= 3.0)
     git (1.2.5)
     hike (1.2.1)
     i18n (0.6.0)
@@ -42,35 +53,34 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json (1.6.3)
-    mail (2.3.0)
+    journey (1.0.3)
+    json (1.7.3)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.17.2)
-    multi_json (1.0.4)
-    nokogiri (1.5.0)
+    mime-types (1.18)
+    multi_json (1.3.6)
+    nokogiri (1.5.3)
     polyglot (0.3.3)
-    rack (1.3.5)
-    rack-cache (1.1)
+    rack (1.4.1)
+    rack-cache (1.2)
       rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.1.3)
-      actionmailer (= 3.1.3)
-      actionpack (= 3.1.3)
-      activerecord (= 3.1.3)
-      activeresource (= 3.1.3)
-      activesupport (= 3.1.3)
+    rails (3.2.3)
+      actionmailer (= 3.2.3)
+      actionpack (= 3.2.3)
+      activerecord (= 3.2.3)
+      activeresource (= 3.2.3)
+      activesupport (= 3.2.3)
       bundler (~> 1.0)
-      railties (= 3.1.3)
-    railties (3.1.3)
-      actionpack (= 3.1.3)
-      activesupport (= 3.1.3)
+      railties (= 3.2.3)
+    railties (3.2.3)
+      actionpack (= 3.2.3)
+      activesupport (= 3.2.3)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -79,23 +89,23 @@ GEM
     rcov (0.9.11)
     rdoc (3.12)
       json (~> 1.4)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
-    rspec-rails (2.7.0)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      railties (~> 3.0)
-      rspec (~> 2.7.0)
+    rspec-mocks (2.8.0)
+    rspec-rails (2.8.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec (~> 2.8.0)
     rspec_tag_matchers (1.0.0)
       nokogiri (>= 1.4.0)
       rspec-rails (>= 1.2.6)
-    sprockets (2.0.3)
+    sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
@@ -104,16 +114,18 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
+    tzinfo (0.3.33)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  ammeter
   bundler
-  formtastic
+  formtastic (~> 2.2)
+  formtastic-bootstrap!
   jeweler
-  rails (~> 3.1.0)
   rcov
   rspec
+  rspec-rails (~> 2.8.0)
   rspec_tag_matchers

data/README.md

@@ -8,7 +8,7 @@ You can follow [FormBoot on twitter](http://twitter.com/FormBoot) for update ann
 
 ### Dependencies
 
-Formtastic Bootstrap has only been tested with Ruby 1.9.2, Rails 3.1, Formtastic 2.0 and Twitter Bootstrap 1.3.
+Formtastic Bootstrap has only been tested with Ruby 1.9.2, Rails 3.2.x, Formtastic 2.2.x and Twitter Bootstrap 2.x.
 
 #### Installation
 
@@ -39,6 +39,7 @@ Make sure you've already downloaded and installed Formtastic!
 
 ## Formtastic vs. Formtastic Bootstrap
 
+THIS SECTION IS OUT OF DATE.
 
 ### Overview
 
@@ -97,6 +98,8 @@ made to generate the HTML expected by Bootstrap while still generating the rich
 
 ### Major Difference in Behavior
 
+THIS SECTION IS OUT OF DATE
+
 * Formtastic Bootstrap omits the <tt>label</tt> class on label tags since Twitter Bootstrap uses this tag in another context (and it makes bad things happen.)
 * Formtastic Bootstrap puts the <tt>input</tt> label in a different place because it makes Bootstrap behave correctly.
 * Formtastic Bootstrap renders <tt>:date</tt>, <tt>:datetime</tt> and <tt>:time</tt> as text fields since this is how Twitter Bootstrap presents these data types  (Formtastic renders them as dropdowns.) Some Rails magic may have been lost here.  Additionally:

data/Rakefile

@@ -38,7 +38,7 @@ end
 
 task :default => :spec
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-1.2.0
+2.0.0

data/formtastic-bootstrap.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "formtastic-bootstrap"
-  s.version = "1.2.0"
+  s.version = "2.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matthew Bellantoni"]
-  s.date = "2012-02-05"
+  s.date = "2012-09-05"
   s.description = "Formtastic form builder to generate Twitter Bootstrap-friendly markup."
   s.email = "mjbellantoni@yahoo.com"
   s.extra_rdoc_files = [
@@ -28,27 +28,38 @@ Gem::Specification.new do |s|
     "formtastic-bootstrap.gemspec",
     "lib/action_view/helpers/text_field_date_helper.rb",
     "lib/formtastic-bootstrap.rb",
+    "lib/formtastic-bootstrap/actions.rb",
+    "lib/formtastic-bootstrap/actions/base.rb",
+    "lib/formtastic-bootstrap/actions/button_action.rb",
+    "lib/formtastic-bootstrap/actions/input_action.rb",
+    "lib/formtastic-bootstrap/actions/link_action.rb",
     "lib/formtastic-bootstrap/engine.rb",
     "lib/formtastic-bootstrap/form_builder.rb",
     "lib/formtastic-bootstrap/helpers.rb",
-    "lib/formtastic-bootstrap/helpers/buttons_helper.rb",
+    "lib/formtastic-bootstrap/helpers/action_helper.rb",
+    "lib/formtastic-bootstrap/helpers/actions_helper.rb",
     "lib/formtastic-bootstrap/helpers/fieldset_wrapper.rb",
     "lib/formtastic-bootstrap/helpers/input_helper.rb",
     "lib/formtastic-bootstrap/helpers/inputs_helper.rb",
     "lib/formtastic-bootstrap/inputs.rb",
     "lib/formtastic-bootstrap/inputs/base.rb",
     "lib/formtastic-bootstrap/inputs/base/choices.rb",
+    "lib/formtastic-bootstrap/inputs/base/collections.rb",
     "lib/formtastic-bootstrap/inputs/base/errors.rb",
+    "lib/formtastic-bootstrap/inputs/base/grouped_collections.rb",
     "lib/formtastic-bootstrap/inputs/base/hints.rb",
     "lib/formtastic-bootstrap/inputs/base/html.rb",
     "lib/formtastic-bootstrap/inputs/base/labelling.rb",
+    "lib/formtastic-bootstrap/inputs/base/numeric.rb",
     "lib/formtastic-bootstrap/inputs/base/stringish.rb",
     "lib/formtastic-bootstrap/inputs/base/timeish.rb",
     "lib/formtastic-bootstrap/inputs/base/wrapping.rb",
     "lib/formtastic-bootstrap/inputs/boolean_input.rb",
     "lib/formtastic-bootstrap/inputs/check_boxes_input.rb",
     "lib/formtastic-bootstrap/inputs/date_input.rb",
+    "lib/formtastic-bootstrap/inputs/date_select_input.rb",
     "lib/formtastic-bootstrap/inputs/datetime_input.rb",
+    "lib/formtastic-bootstrap/inputs/datetime_select_input.rb",
     "lib/formtastic-bootstrap/inputs/email_input.rb",
     "lib/formtastic-bootstrap/inputs/file_input.rb",
     "lib/formtastic-bootstrap/inputs/hidden_input.rb",
@@ -62,17 +73,22 @@ Gem::Specification.new do |s|
     "lib/formtastic-bootstrap/inputs/string_input.rb",
     "lib/formtastic-bootstrap/inputs/text_input.rb",
     "lib/formtastic-bootstrap/inputs/time_input.rb",
+    "lib/formtastic-bootstrap/inputs/time_select_input.rb",
     "lib/formtastic-bootstrap/inputs/time_zone_input.rb",
     "lib/formtastic-bootstrap/inputs/url_input.rb",
-    "spec/builder/errors_spec.rb",
+    "spec/actions/button_action_spec.rb",
+    "spec/actions/input_action_spec.rb",
+    "spec/actions/link_action_spec.rb",
     "spec/builder/semantic_fields_for_spec.rb",
-    "spec/helpers/buttons_helper_spec.rb",
+    "spec/helpers/action_helper_spec.rb",
+    "spec/helpers/actions_helper_spec.rb",
     "spec/helpers/input_helper_spec.rb",
     "spec/helpers/inputs_helper_spec.rb",
     "spec/inputs/boolean_input_spec.rb",
     "spec/inputs/check_boxes_input_spec.rb",
-    "spec/inputs/date_input_spec.rb",
-    "spec/inputs/datetime_input_spec.rb",
+    "spec/inputs/date_select_input_spec.rb",
+    "spec/inputs/datetime_select_input_spec.rb",
+    "spec/inputs/deprecated_time_date_datetime_inputs_spec.rb",
     "spec/inputs/email_input_spec.rb",
     "spec/inputs/file_input_spec.rb",
     "spec/inputs/hidden_input_spec.rb",
@@ -85,13 +101,12 @@ Gem::Specification.new do |s|
     "spec/inputs/select_input_spec.rb",
     "spec/inputs/string_input_spec.rb",
     "spec/inputs/text_input_spec.rb",
-    "spec/inputs/time_input_spec.rb",
+    "spec/inputs/time_select_input_spec.rb",
     "spec/inputs/time_zone_input_spec.rb",
     "spec/inputs/url_input_spec.rb",
     "spec/spec_helper.rb",
     "spec/support/custom_macros.rb",
-    "spec/support/depracation.rb",
-    "spec/support/formtastic_spec_helper.rb",
+    "spec/support/fb_custom_macros.rb",
     "vendor/assets/stylesheets/formtastic-bootstrap.css"
   ]
   s.homepage = "http://github.com/mjbellantoni/formtastic-bootstrap"
@@ -104,30 +119,48 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<formtastic>, [">= 0"])
-      s.add_runtime_dependency(%q<rails>, ["~> 3.1.0"])
+      s.add_runtime_dependency(%q<formtastic-bootstrap>, [">= 0"])
+      s.add_runtime_dependency(%q<formtastic>, ["~> 2.2"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<rspec_tag_matchers>, [">= 0"])
+      s.add_development_dependency(%q<ammeter>, [">= 0"])
+      s.add_development_dependency(%q<rspec-rails>, ["~> 2.8.0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<rspec_tag_matchers>, [">= 0"])
     else
-      s.add_dependency(%q<formtastic>, [">= 0"])
-      s.add_dependency(%q<rails>, ["~> 3.1.0"])
+      s.add_dependency(%q<formtastic-bootstrap>, [">= 0"])
+      s.add_dependency(%q<formtastic>, ["~> 2.2"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<rspec_tag_matchers>, [">= 0"])
+      s.add_dependency(%q<ammeter>, [">= 0"])
+      s.add_dependency(%q<rspec-rails>, ["~> 2.8.0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<rspec_tag_matchers>, [">= 0"])
     end
   else
-    s.add_dependency(%q<formtastic>, [">= 0"])
-    s.add_dependency(%q<rails>, ["~> 3.1.0"])
+    s.add_dependency(%q<formtastic-bootstrap>, [">= 0"])
+    s.add_dependency(%q<formtastic>, ["~> 2.2"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<rspec_tag_matchers>, [">= 0"])
+    s.add_dependency(%q<ammeter>, [">= 0"])
+    s.add_dependency(%q<rspec-rails>, ["~> 2.8.0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<rspec_tag_matchers>, [">= 0"])
   end
 end
 

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

@@ -0,0 +1,22 @@
+module FormtasticBootstrap
+  module Actions
+    module Base
+
+      # Bootstrap doesn't have wrappers.
+      def wrapper(&block)
+        # TODO Detect if user passed wrapper_html_options and issue
+        #      a warning that they're ignored. (See the original in
+        #      Formtastic.)
+        template.capture(&block)
+      end
+
+      def default_button_html
+        { 
+          :accesskey => accesskey,
+          :class => "btn"
+         }
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+# <form...>
+#   <fieldset class="form-actions">
+#     <button class="btn" type="reset" value="Reset">
+#     <button class="btn" type="submit" value="Create Post">
+#   </fieldset>
+# </form>
+module FormtasticBootstrap
+  module Actions
+    class ButtonAction < Formtastic::Actions::ButtonAction
+      include Base
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+# <form...>
+#   <fieldset class="form-actions">
+#     <input class="btn" type="reset" value="Reset">
+#     <input class="btn" type="submit" value="Create Post">
+#   </fieldset>
+# </form>
+module FormtasticBootstrap
+  module Actions
+    class InputAction < Formtastic::Actions::InputAction
+      include Base
+    end
+  end
+end

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

@@ -0,0 +1,12 @@
+# <form...>
+#   <fieldset class="form-actions">
+#     <a class="btn" href="">Link</a>
+#   </fieldset>
+# </form>
+module FormtasticBootstrap
+  module Actions
+    class LinkAction < Formtastic::Actions::LinkAction
+      include Base
+    end
+  end
+end

data/lib/formtastic-bootstrap/actions.rb

@@ -0,0 +1,10 @@
+module FormtasticBootstrap
+  module Actions
+    extend ActiveSupport::Autoload
+
+    autoload :Base,         'formtastic-bootstrap/actions/base'
+    autoload :InputAction,  'formtastic-bootstrap/actions/input_action'
+    autoload :LinkAction,   'formtastic-bootstrap/actions/link_action'
+    autoload :ButtonAction, 'formtastic-bootstrap/actions/button_action'
+  end
+end

data/lib/formtastic-bootstrap/form_builder.rb

@@ -29,9 +29,11 @@ module FormtasticBootstrap
       raise
     end
 
-    include FormtasticBootstrap::Helpers::InputHelper
+    include FormtasticBootstrap::Helpers::InputHelper # Revisit
     include FormtasticBootstrap::Helpers::InputsHelper
-    include FormtasticBootstrap::Helpers::ButtonsHelper
+    include FormtasticBootstrap::Helpers::ActionHelper
+    include FormtasticBootstrap::Helpers::ActionsHelper
+    # include Formtastic::Helpers::ErrorsHelper
 
   end
 

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

@@ -0,0 +1,12 @@
+module FormtasticBootstrap
+  module Helpers
+    module ActionHelper
+
+      # :as => :button # => FormtasticBootstrap::Actions::ButtonAction
+      def standard_action_class_name(as)
+        "FormtasticBootstrap::Actions::#{as.to_s.camelize}Action"
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+module FormtasticBootstrap
+  module Helpers
+    module ActionsHelper
+
+      include Formtastic::Helpers::ActionsHelper
+      include FormtasticBootstrap::Helpers::FieldsetWrapper
+      
+      def actions(*args, &block)
+
+        html_options = args.extract_options!
+        html_options[:class] ||= "form-actions"
+      
+        if block_given?
+          field_set_and_list_wrapping(html_options, &block)
+        else
+          args = default_actions if args.empty?
+          contents = args.map { |action_name| action(action_name) }
+          field_set_and_list_wrapping(html_options, contents)
+        end
+      end
+      
+    end
+  end
+end

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

@@ -10,10 +10,6 @@ module FormtasticBootstrap
         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 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)

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

@@ -1,7 +1,6 @@
 module FormtasticBootstrap
   module Helpers
     module InputsHelper
-      include FormtasticBootstrap::Helpers::FieldsetWrapper
 
         def inputs(*args, &block)
           wrap_it = @already_in_an_inputs_block ? true : false
@@ -26,7 +25,6 @@ module FormtasticBootstrap
             end
           end
         
-          # out = template.content_tag(:li, out, :class => "input") if wrap_it
           @already_in_an_inputs_block = false
           out
         end

data/lib/formtastic-bootstrap/helpers.rb

@@ -1,16 +1,14 @@
-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 FormtasticBootstrap
   module Helpers
+
+    autoload :ActionHelper,  'formtastic-bootstrap/helpers/action_helper'
+    autoload :ActionsHelper, 'formtastic-bootstrap/helpers/actions_helper'
     # autoload :ErrorsHelper, 'formtastic/helpers/errors_helper'
-    # autoload :FieldsetWrapper, 'formtastic/helpers/fieldset_wrapper'
+    autoload :FieldsetWrapper, 'formtastic-bootstrap/helpers/fieldset_wrapper'
     # autoload :FileColumnDetection, 'formtastic/helpers/file_column_detection'
     # autoload :FormHelper, 'formtastic/helpers/form_helper'
-    # autoload :InputHelper, 'formtastic/helpers/input_helper'
-    # autoload :InputsHelper, 'formtastic/helpers/inputs_helper'
+    autoload :InputHelper, 'formtastic-bootstrap/helpers/input_helper'
+    autoload :InputsHelper, 'formtastic-bootstrap/helpers/inputs_helper'
     # autoload :LabelHelper, 'formtastic/helpers/label_helper' 
     # autoload :SemanticFormHelper, 'formtastic/helpers/semantic_form_helper'
     # autoload :Reflection, 'formtastic/helpers/reflection'

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

@@ -2,45 +2,16 @@ module FormtasticBootstrap
   module Inputs
     module Base
       module Choices
+        include Formtastic::Inputs::Base::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  
+        def choice_wrapping_html_options(choice)
+          super(choice).tap do |options|
+            options[:for]   = choice_input_dom_id(choice)
           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)
+        def choice_label_html_options(choice)
+          choice_wrapping_html_options(choice)
         end
 
       end

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

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

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

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