Add small fixes for bootstrap 3. Add tests.

.gitignore

@@ -0,0 +1,13 @@
+/.bundle
+/db/*.sqlite3
+/db/*.sqlite3-journal
+/log/*.log
+/tmp
+/test/dummy/db/*.sqlite3
+/test/dummy/db/*.sqlite3-journal
+/test/dummy/log/*.log
+/test/dummy/tmp
+.DS_Store
+.rvmrc
+/bin
+Gemfile.lock

Gemfile

@@ -0,0 +1,14 @@
+source "https://rubygems.org"
+
+# Declare your gem's dependencies in hive.gemspec.
+# Bundler will treat runtime dependencies like base dependencies, and
+# development dependencies will be added by default to the :development group.
+gemspec
+
+# Declare any dependencies that are still in development here instead of in
+# your gemspec. These might include edge Rails or gems from your path or
+# Git. Remember to move these dependencies to your gemspec before releasing
+# your gem to rubygems.org.
+
+# To use debugger
+# gem 'debugger'

README.markdown

@@ -1,8 +1,6 @@
 Twitter Bootstrap Form For
 ==========================
 
-*_WARNING! This is for Rails 4 and Bootstrap 3 (current in RC)._*
-
 `twitter_bootstrap_form_for` is a Rails FormBuilder DSL that, like Formtastic,
 makes it easier to create semantically awesome, readily-stylable, and
 wonderfully accessible HTML forms in your Rails applications. It abides by
@@ -16,82 +14,127 @@ Formtastic does), it only lightly wraps the existing Rails form tag helpers.
 ## Dependencies ##
 
  * Rails 4
- * Bootstrap-sass, pull from branch 3 off github
-
-`
-    gem 'bootstrap-sass', :git => 'git://github.com/thomas-mcdonald/bootstrap-sass.git', :branch => '3'
-`
+ * Bootstrap 3 (Checkout the [bootstrap-sass] gem.)
 
 ## Syntax ##
 
 ```haml
-= twitter_bootstrap_form_for @user, layout: 'vertical (default) OR horizontal OR inline', default_div_class: 'col-lg-10 (default)', role: 'form (default)' do |user|
+= twitter_bootstrap_form_for @user, layout: [:vertical (default) OR :horizontal OR :inline], default_div_class: 'col-lg-10 (default)', role: 'form (default)' do |f|
+  // By default error messages on fields are rendered inline with the field and you
+  // don't have to do something special to display them. But if you have error messages
+  // on your model that have no corresponding field in the form such as hidden fields
+  // or if you use *model.errors.add :base* for example you can use the following helper.
+  // To prevent errors from beeing listed twice you can use the *only* or *except*
+  // option like this *= f.errors only: :base* for example.
+  = f.errors
 
   / wraps a section in a fieldset with the provided legend text
-  = user.inputs 'Sign up', :class => 'sign_up' do
+  = f.inputs 'Sign up', class: 'sign_up' do
+
+    / generate a email field
+    = f.email_field :email
+
+    / required fields are marked with an * prepended to their labels.
+    / A field is required if the model responds with "true" to "[attribute]_required?"
+    / or if you specify "required: true|false" on the form field.
+    = f.email_field :email, required: true
 
-    / generates a standard email field; also showing overriding the div_class around the input element on a horizontal form
-    = user.email_field :email, :placeholder => '[email protected]', div_class: 'col-md-6'
+    / generate a text field with a custom label, a placeholder text, custom attributes
+    / (class and id) for the input element, a custom class for the wrapper around the input element
+    / and custom attributes for the form-group wrapper.
+    = f.text_field :name, 'Username', placeholder: 'Choose your user name.', class: 'input-lg', id: 'username-input',
+        div_class: 'col-md-6',
+        form_group_html: { id: 'bar', class: 'foo' }
 
-    / generates a password field with a descriptive aside
-    = user.password_field :password do
+    / generate a password field with a descriptive aside
+    = f.password_field :password do
       %span.help-block
         Must be no larger than 6 characters<br/>
         Must contain only the letters 'x' or 'p'
 
-    / a field with a custom label
-    = user.password_field :password_confirmation, 'Confirm Password'
+    / generate a field with a custom label
+    = f.password_field :password_confirmation, 'Confirm Password'
 
-    / input fields with custom add-ons
-    = user.text_field :twitter_id, 'Twitter', :class => 'medium', :add_on => :prepend do
-      %span.add-on @
+    / generate a field with custom add-ons
+    = f.text_field :twitter_id, 'Twitter', add_on: :prepend do
+      %span.input-group-addon @
 
-    / select fields now have the second parameter as a label
-    = user.date_select :born_on, 'Born on', {}, :class => 'small'
+    / generate a datepicker (to generate a regulare date_select field use
+    / "datepicker: false" as a option)
+    = f.date_select :born_on
 
-    / inline inputs are not automatically labeled
-    = user.inline 'Interests' do |inline|
-      #{inline.text_field :interest_1, :class => 'small'},
-      #{inline.text_field :interest_2, :class => 'small'}, and
-      #{inline.text_field :interest_3, :class => 'small'}
+    / generate a single checkbox
+    = f.check_box :agree
 
-    / group of radio buttons
-    = user.toggles 'Email Preferences' do
-      = user.radio_button :email, 'HTML Email', :html, :checked => true
-      = user.radio_button :email, 'Plain Text', :plain
+    / generate a group of checkboxes using the *toggles* method and add custom labels
+    = f.toggles 'Agreements' do
+      = f.check_box :agree,   'I agree to the abusive Terms and Conditions'
+      = f.check_box :spam,    'I agree to receive all sorts of spam'
+      = f.check_box :spammer, 'I agree to let the site spam others through my Twitter account'
 
-    / group of checkboxes
-    = user.toggles 'Agreements' do
-      = user.check_box :agree,   'I agree to the abusive Terms and Conditions'
-      = user.check_box :spam,    'I agree to receive all sorts of spam'
-      = user.check_box :spammer, 'I agree to let the site spam others through my Twitter account'
+    / generate a group of radio buttons using the *toggles* method and add custom labels
+    = f.toggles 'Email Preferences' do
+      = f.radio_button :email, 'HTML Email', :html, checked: true
+      = f.radio_button :email, 'Plain Text', :plain
 
   / wraps buttons in a distinctive style
-  = user.actions do
-    = user.submit 'Sign up'
-    = button_tag  'Cancel', :type => 'reset', :class => 'btn'
+  = f.actions do
+    = f.submit 'Sign up'
+    = button_tag  'Cancel', type: 'reset', class: 'btn'
 ```
 
 That code produces the following output, with no custom stylesheets.
 
-![](https://github.com/stouset/twitter_bootstrap_form_for/raw/master/examples/screenshot.png)
+![](examples/screenshot.png?raw=true)
 
 That's it. All of the Rails field helpers you know and love work just like
 their normal FormBuilder counterparts, but with minor extensions to expose
 the functionality anticipated by Twitter Bootstrap.
 
-## Form Helper Changes ##
+## Datepicker ##
+
+By default a datepicker is rendered for date and/or time inputs via the
+bootstrap-datepicker-rails Gem. You need require "twitter_bootstrap_form_for"
+in your stylesheet and javascript manifest files to make it work.
+
+In "app/assets/javascripts/application.js" add
+
+  //= require twitter_bootstrap_form_for
+
+In "app/assets/stylesheets/application.css" add
+
+  *= require twitter_bootstrap_form_for
+
+To create a datepicker in your form use
+
+  = f.date_select :born_on
+
+To customize the datepicker use
+
+  = f.date_select :born_on, datepicker: { language: 'de', today_btn: 'linked', today_highlight: true, autoclose: true }
+
+Datepicker options are documented at https://github.com/eternicode/bootstrap-datepicker but
+make sure you use the Ruby dash syntax when specifying the options via the form helper.
+Write "today_btn" instead of "todayBtn". More examples via http://eternicode.github.io/bootstrap-datepicker/
+
+If you set a language different from english "en" you need to include the localized
+javascript files in your "app/assets/javascripts/application.js" file right where you
+require "twitter_bootstrap_form_for" like this:
+
+  //= require bootstrap-datepicker/locales/bootstrap-datepicker.de.js
+  //= require bootstrap-datepicker/locales/bootstrap-datepicker.es.js
+  //= require bootstrap-datepicker/locales/bootstrap-datepicker.fr.js
+  ...
 
-The changes this `FormBuilder` effects to the existing Rails form helpers is
-simple:
+To disable the datepicker and render a regular input field use
 
-  * the second parameter becomes the label (pass false to disable, nil for default)
-  * the last options hash accepts an `:add_on` key
-  * if a block is passed, the HTML it outputs is placed immediately after the input
+  = f.date_select :born_on, datepicker: false
 
-## Known Bugs ##
+Important! The datepicker uses the Rails default date format from I18n.t('date.formats.default').
+If change that via the "format" option on the datepicker make sure Rails can parse that
+custom format. You might need to overwrite the attribute setter on your model for that.
 
-  - inline fields don't receive error markup ([issue #28])
 
-[Twitter Bootstrap]: http://twitter.github.com/bootstrap/
-[issue #28]:          https://github.com/stouset/twitter_bootstrap_form_for/issues/28
+[Twitter Bootstrap]: http://twitter.github.com/bootstrap
+[bootstrap-sass]: https://github.com/twbs/bootstrap-sass
+[bootstrap-datepicker-rails]: https://github.com/Nerian/bootstrap-datepicker-rails

Rakefile

@@ -0,0 +1,31 @@
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+
+require 'rdoc/task'
+
+RDoc::Task.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'TwitterBootstrapFormFor'
+  rdoc.options << '--line-numbers'
+  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+load 'rails/tasks/engine.rake'
+
+Bundler::GemHelper.install_tasks
+
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
+end
+
+task default: :test

app/assets/javascripts/twitter_bootstrap_form_for.js

@@ -0,0 +1,23 @@
+//= require bootstrap-datepicker/core
+
+$(function() {
+  // Initialize the datepicker.
+  $('[data-behaviour~=datepicker]').each(function(){
+    var element = $(this);
+    var options = {};
+
+    // Convert data attributes whoes names begin with "datepicker" to options
+    // on the datepicker.
+    $.each(element.data(), function(k,v) {
+      if (k.match("^datepicker")) {
+        // Remove "datepicker" from the name and make the first letter lower case
+        // "datepickerAutoclose" becomes "autoclose"
+        option = k.replace(/^datepicker/, '');
+        option = option.charAt(0).toLowerCase() + option.slice(1);
+        options[option] = v;
+      }
+    });
+
+    element.datepicker(options);
+  });
+});

app/assets/stylesheets/twitter_bootstrap_form_for.css

@@ -0,0 +1,3 @@
+/*
+ *= require bootstrap-datepicker
+ */

lib/twitter_bootstrap_form_for.rb

@@ -1,10 +1,10 @@
-require 'action_view'
+require 'bootstrap-datepicker-rails'
 
 module TwitterBootstrapFormFor
   autoload :FormBuilder, 'twitter_bootstrap_form_for/form_builder'
   autoload :FormHelpers, 'twitter_bootstrap_form_for/form_helpers'
-  autoload :Railtie,     'twitter_bootstrap_form_for/railtie'
+  autoload :Datepicker,  'twitter_bootstrap_form_for/datepicker'
   autoload :VERSION,     'twitter_bootstrap_form_for/version'
 end
 
-TwitterBootstrapFormFor::Railtie # trigger loading the Railtie
+require 'twitter_bootstrap_form_for/engine'