formtastic-bootstrap 2.1.3 → 3.0.0.rc.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ecb19013ed0931f06bd003f1ea90049610323e95
+  data.tar.gz: 689d4e4702a9fe931cc3123291dada9d8df21d35
+SHA512:
+  metadata.gz: 5be322ff2419bc7915198e7d34bcdf98ff62843f6119c6f293ce87d799f33972e0fadfcb9dbd7d9bb10aa08dc0fca56c777612bc15c5ab20d1c3b74e55979049
+  data.tar.gz: 0b30ebf52df315ad4223bb91f28804c74161c2a59fe33d45723a752e7dc11c5a1d330d1b237e1023e737424038e6c4f6b291fa2e7f0d1ea758419fc910fe8243

data/README.md

@@ -8,7 +8,27 @@ 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.2.x, Formtastic 2.2.x and Twitter Bootstrap 2.x.
+This version of Formtastic Bootstrap should support the following:
+
+*Bootstrap*
+
+* Bootstrap 3.x
+
+*Rails*
+
+* Rails 3.2.x
+* Rails 4.0.x
+
+*Formtastic*
+
+* Formtastic 2.2.x
+* Formtastic 2.3.x
+
+*Ruby*
+
+* 1.9.2
+* 1.9.3
+* 2.0.x
 
 #### Installation
 
@@ -43,58 +63,12 @@ THIS SECTION IS OUT OF DATE.
 
 ### Overview
 
-In general, Formtastic creates very verbose HTML whereas Bootstrap expects simpler HTML.  Every attempt has been
-made to generate the HTML expected by Bootstrap while still generating the rich HTML provided by Formtastic.  Here's a pretty typical (simplified) example of what Formtastic generates and what Formtastic Bootstrap generates.
-
-#### ERB
-
-    <%= semantic_form_for @post do |f| %>
-      <%= f.semantic_errors %>
-      <%= f.inputs do %>
-        <%= f.input :title, :hint => "This is the title!" %>
-      <% end %>
-      <%= f.actions do %>
-        <%= f.action :submit %>
-      <% end %>
-    <% end %>
+In general, Formtastic creates very verbose HTML whereas 
+Bootstrap expects (ever) simpler HTML.  Every attempt has been
+made to generate the HTML expected by Bootstrap while still 
+generating the rich HTML provided by Formtastic.  When there
+is a conflict, Bootstrap wins.
 
-#### Formtastic
-
-    <form accept-charset="UTF-8" action="/posts" class="formtastic post" id="new_post" method="post">
-      <fieldset class="inputs">
-        <ol>
-          <li class="string input optional stringish" id="post_title_input">
-            <label class=" label" for="post_title">Title</label>
-            <input id="post_title" maxlength="255" name="post[title]" type="text" value="" />
-            <p class="inline-hints">This is the title!</p>
-          </li>
-        </ol>
-      </fieldset>
-      <fieldset class="buttons">
-        <ol>
-          <li class="commit button">
-            <input class="create" name="commit" type="submit" value="Create Post" />
-          </li>
-        </ol>
-      </fieldset>
-    </form>
-
-#### Formtastic Bootstrap
-
-    <form accept-charset="UTF-8" action="/posts" class="formtastic post" id="new_post" method="post">
-      <fieldset class="inputs">
-        <div class="string clearfix optional stringish" id="post_title_input">
-          <label class="" for="post_title">Title</label>
-          <div class="input">
-            <input id="post_title" maxlength="255" name="post[title]" type="text" value="" />
-            <span class="help-inline">This is the title!</span>
-          </div>
-        </div>
-      </fieldset>
-      <div class="actions">
-        <input class="btn create commit" name="commit" type="submit" value="Create Post" />
-      </div>
-    </form>
 
 ### Major Difference in Behavior
 
@@ -114,7 +88,10 @@ The gem also provides some "shim" CSS where Bootstrap is missing styles provided
 
 ### Other
 
-A lot of the code (especially the test suite) was copied over from Formtastic and then beaten into submission.  I'm sure you'll find some ugliness in there.  In general, I mimicked the Formtastic code structure as much as possible.
+A lot of the code (especially the test suite) was copied 
+over from Formtastic and then beaten into submission.  I'm 
+sure you'll find some ugliness in there.  In general, I 
+mimicked the Formtastic code structure as much as possible.
 
 In particular:
 
@@ -130,7 +107,7 @@ In particular:
 Contributions are welcome!
 
 * Formtastic's <tt>:country</tt> has not yet been implemented.
-* Twitter Bootstrap's Date Range, Prepend Checkbox and Appended Checkbox controls have not yet been implemented.
+* I'm sure there's lots ...
 
 ## Usage
 
@@ -156,6 +133,16 @@ To create an Appended Text field, use the ```:append``` option.  This works on a
       <% end %>
     <% end %>
 
+#### Appended Content
+To add appended elements that are not contained within an add-on span
+use the ```:append_content``` or ```:prepend_content``` option.
+
+    <%= semantic_form_for @user do |f| %>
+      <%= f.inputs do %>
+        <%= f.input :handle, :append_content => content_tag(:a, "Click Here", :class => 'btn') %>
+      <% end %>
+    <% end %>
+
 ## Contributing
  
 ### Contributors
@@ -198,16 +185,16 @@ Source contributions are very welcome!  Most of the recent work on this package
  * As rich functionally as their Rails counterparts.
  * Extract into a standalone gem.
 * Tests
+ * Get them passing!
  * Refactor
  * More -- See if I'm making sure the Bootstrap classes are present.
 * Documentation
 * Refactor :boolean to use common "choices" code (if possible.) (Not sure it is.)
 * Boostrap
-  * Ask why they use 'inline-inputs' class instead of a fieldset tag.
   * Why 'help-inline' and 'help-block' when they could have done p.help and span.help?
 
 
 ## Copyright
 
-Copyright (c) 2011 Matthew Bellantoni. See LICENSE.txt for further details.
+Copyright (c) 2013 Matthew Bellantoni. See LICENSE.txt for further details.
 

data/VERSION

@@ -1 +1 @@
-2.1.3
+3.0.0.rc.1

data/lib/action_view/helpers/text_field_date_helper.rb

@@ -40,8 +40,8 @@ module ActionView
         @options[:discard_day]    ||= true if @options[:discard_month] || !order.include?(:day)
 
         # Save this so we can restore it.
-        original_datetime_separator_separator = @options[:datetime_separator] 
-        original_date_separator = @options[:date_separator] 
+        original_datetime_separator_separator = @options[:datetime_separator]
+        original_date_separator = @options[:date_separator]
 
         @options[:datetime_separator] = ""
         @options[:date_separator] = " "
@@ -71,8 +71,8 @@ module ActionView
 
         # Save this so we can restore it.
         original_datetime_separator = @options[:datetime_separator]
-        original_time_separator = @options[:time_separator] 
-        original_date_separator = @options[:date_separator] 
+        original_time_separator = @options[:time_separator]
+        original_date_separator = @options[:date_separator]
 
         @options[:datetime_separator] = ''
         @options[:time_separator] = ':'
@@ -85,7 +85,7 @@ module ActionView
 
         build_text_field_from_types(order).tap do
           # Restore.
-          @options[:datetime_separator] = original_datetime_separator 
+          @options[:datetime_separator] = original_datetime_separator
           @options[:date_separator] = original_date_separator
           @options[:time_separator] = original_time_separator
         end
@@ -131,7 +131,7 @@ module ActionView
         input = ''
         order.reverse.each do |type|
           separator = separator(type) unless type == order.first # don't add on last field
-          input.insert(0, separator.to_s + send("text_field_#{type}").to_s) 
+          input.insert(0, separator.to_s + send("text_field_#{type}").to_s)
         end
         text_field_tag("", input.html_safe, @html_options).html_safe
       end
@@ -163,4 +163,4 @@ module ActionView
     include TextFieldDateHelper
 
   end
-end
+end

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

@@ -4,19 +4,24 @@ module FormtasticBootstrap
 
       # 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
 
+      # Default button class
+      def default_wrapper_classes
+        ["btn"]
+      end
+
+      # :wrapper_html member :class is prefixed with btn
+      # :button_html member :class is all encompassing
       def default_button_html
-        { 
+        {
           :accesskey => accesskey,
-          :class => "btn"
+          :class => wrapper_class.strip,
+          :id => wrapper_id
          }
       end
 
     end
   end
-end
+end

data/lib/formtastic-bootstrap/form_builder.rb

@@ -1,5 +1,5 @@
 module FormtasticBootstrap
-  
+
   class FormBuilder < Formtastic::FormBuilder
 
     configure :default_inline_error_class, 'help-inline'
@@ -11,18 +11,18 @@ 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
@@ -38,4 +38,4 @@ module FormtasticBootstrap
 
   end
 
-end
+end

data/lib/formtastic-bootstrap/helpers.rb

@@ -9,7 +9,7 @@ module FormtasticBootstrap
     # autoload :FormHelper, 'formtastic/helpers/form_helper'
     autoload :InputHelper, 'formtastic-bootstrap/helpers/input_helper'
     autoload :InputsHelper, 'formtastic-bootstrap/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/actions_helper.rb

@@ -4,12 +4,12 @@ module FormtasticBootstrap
 
       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
@@ -18,7 +18,7 @@ module FormtasticBootstrap
           field_set_and_list_wrapping(html_options, contents)
         end
       end
-      
+
     end
   end
-end
+end

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

@@ -59,7 +59,7 @@ module FormtasticBootstrap
         end
 
         template.content_tag(:div, html_options) do
-          template.content_tag(:button, "×".html_safe, :class => "close", "data-dismiss" => "alert") +
+          template.content_tag(:a, "×".html_safe, :class => "close", "data-dismiss" => "alert") +
           template.content_tag(:ul, {:class => "error-list"}) do
             Formtastic::Util.html_safe(full_errors.map { |error| template.content_tag(:li, Formtastic::Util.html_safe(error)) }.join)
           end

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

@@ -3,7 +3,7 @@ module FormtasticBootstrap
     module FieldsetWrapper
 
       include Formtastic::Helpers::FieldsetWrapper
-      
+
       protected
 
       def field_set_and_list_wrapping(*args, &block) #:nodoc:
@@ -32,4 +32,4 @@ module FormtasticBootstrap
 
     end
   end
-end
+end

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

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

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

@@ -5,7 +5,7 @@ module FormtasticBootstrap
         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"
@@ -24,11 +24,11 @@ module FormtasticBootstrap
               field_set_and_list_wrapping(*((args << html_options) << contents))
             end
           end
-        
+
           @already_in_an_inputs_block = false
           out
         end
 
     end
   end
-end
+end

data/lib/formtastic-bootstrap/inputs.rb

@@ -2,33 +2,33 @@ module FormtasticBootstrap
   module Inputs
 
     autoload :Base,                "formtastic-bootstrap/inputs/base"
-    # autoload :Basic          
-    autoload :BooleanInput,        "formtastic-bootstrap/inputs/boolean_input" 
+    # autoload :Basic
+    autoload :BooleanInput,        "formtastic-bootstrap/inputs/boolean_input"
     autoload :CheckBoxesInput,     "formtastic-bootstrap/inputs/check_boxes_input"
-    autoload :CountryInput,        "formtastic-bootstrap/inputs/country_input" 
-    autoload :DateInput,           "formtastic-bootstrap/inputs/date_input" 
-    autoload :DatePickerInput,     "formtastic-bootstrap/inputs/date_picker_input" 
-    autoload :DatetimePickerInput, "formtastic-bootstrap/inputs/datetime_picker_input" 
+    autoload :CountryInput,        "formtastic-bootstrap/inputs/country_input"
+    autoload :DateInput,           "formtastic-bootstrap/inputs/date_input"
+    autoload :DatePickerInput,     "formtastic-bootstrap/inputs/date_picker_input"
+    autoload :DatetimePickerInput, "formtastic-bootstrap/inputs/datetime_picker_input"
     autoload :DateSelectInput,     "formtastic-bootstrap/inputs/date_select_input"
-    autoload :DatetimeInput,       "formtastic-bootstrap/inputs/datetime_input" 
-    autoload :DatetimeSelectInput, "formtastic-bootstrap/inputs/datetime_select_input" 
-    autoload :EmailInput,          "formtastic-bootstrap/inputs/email_input" 
-    autoload :FileInput,           "formtastic-bootstrap/inputs/file_input" 
-    autoload :HiddenInput,         "formtastic-bootstrap/inputs/hidden_input" 
-    autoload :NumberInput,         "formtastic-bootstrap/inputs/number_input" 
+    autoload :DatetimeInput,       "formtastic-bootstrap/inputs/datetime_input"
+    autoload :DatetimeSelectInput, "formtastic-bootstrap/inputs/datetime_select_input"
+    autoload :EmailInput,          "formtastic-bootstrap/inputs/email_input"
+    autoload :FileInput,           "formtastic-bootstrap/inputs/file_input"
+    autoload :HiddenInput,         "formtastic-bootstrap/inputs/hidden_input"
+    autoload :NumberInput,         "formtastic-bootstrap/inputs/number_input"
     # autoload :NumericInput       # TODO Where does Formtastic actually define this?
-    autoload :PasswordInput,       "formtastic-bootstrap/inputs/password_input" 
-    autoload :PhoneInput,          "formtastic-bootstrap/inputs/phone_input" 
-    autoload :RadioInput,          "formtastic-bootstrap/inputs/radio_input" 
-    autoload :RangeInput,          "formtastic-bootstrap/inputs/range_input" 
-    autoload :SearchInput,         "formtastic-bootstrap/inputs/search_input" 
-    autoload :SelectInput,         "formtastic-bootstrap/inputs/select_input" 
+    autoload :PasswordInput,       "formtastic-bootstrap/inputs/password_input"
+    autoload :PhoneInput,          "formtastic-bootstrap/inputs/phone_input"
+    autoload :RadioInput,          "formtastic-bootstrap/inputs/radio_input"
+    autoload :RangeInput,          "formtastic-bootstrap/inputs/range_input"
+    autoload :SearchInput,         "formtastic-bootstrap/inputs/search_input"
+    autoload :SelectInput,         "formtastic-bootstrap/inputs/select_input"
     autoload :StringInput,         "formtastic-bootstrap/inputs/string_input"
     autoload :TextInput,           "formtastic-bootstrap/inputs/text_input"
     autoload :TimeInput,           "formtastic-bootstrap/inputs/time_input"
     # autoload :TimePickerInput    # TODO Come back to this.
     autoload :TimeSelectInput,     "formtastic-bootstrap/inputs/time_select_input"
-    autoload :TimeZoneInput,       "formtastic-bootstrap/inputs/time_zone_input"      
+    autoload :TimeZoneInput,       "formtastic-bootstrap/inputs/time_zone_input"
     # autoload :Timeish            # This seems like a mistake.
     autoload :UrlInput,            "formtastic-bootstrap/inputs/url_input"
 

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

@@ -26,7 +26,7 @@ module FormtasticBootstrap
       autoload :Timeish,      "formtastic-bootstrap/inputs/base/timeish"
       # autoload :Validations
       autoload :Wrapping,     "formtastic-bootstrap/inputs/base/wrapping"
-      
+
       include Html
       # include Options
       # include Database

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

@@ -27,7 +27,7 @@ module FormtasticBootstrap
           # end
           # template.content_tag(:ul, Formtastic::Util.html_safe(list_elements.join("\n")), :class => error_class)
         end
-        
+
         def error_first_html(inline_or_block = :inline)
           error_class = if inline_or_block == :inline
             options[:error_class] || builder.default_inline_error_class
@@ -45,4 +45,4 @@ module FormtasticBootstrap
       end
     end
   end
-end
+end