formtastic-bootstrap 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a4c8ccd643acebbf6e74e39dd50f116ec11aecf
-  data.tar.gz: ffdc3de2dcf7c48ffa0254f054331e873c96562c
+  metadata.gz: 867c007b1b33a3d99b593be86a16d0f90ca7c6eb
+  data.tar.gz: 8f42c1f7139d95b8caa27b743e21bb54e2c524b7
 SHA512:
-  metadata.gz: 1263c8854ccb91e32f3f561d901f28382f52f4cf539e862cb051b3b329470d202951cb64a1b4102a432628cd8d0ad548fee93d5bca151aac9431ef99452e6eb4
-  data.tar.gz: 6a3d94a0a0afd6c74f8c259e78c736da4c4ccecf691333e47e5501fdac374107b71883c57d8e03637013aa8eea579e6e05b436f34867a98b3029088199b8ccaf
+  metadata.gz: dedefd2ee40290f0fdbbabf898b1ef9de71f308a2e3b57c083c05ed64c5926b7ce19f8ee77bc3fb049b9698e1b938588177cc74e36f03947669294a4c17aa5d5
+  data.tar.gz: 877d3ca5c502ce2e26293e40da5eb3476f3b7ac3d5d665a3b2a14c55d0952b7097b998ab0940a821a7f656bdf290571e3adad5da1415dd7bd6bd6b4bad14b190

data/README.md

@@ -1,5 +1,7 @@
 # Formtastic Bootstrap
 
+[![Build Status](https://travis-ci.org/mjbellantoni/formtastic-bootstrap.svg?branch=master)](https://travis-ci.org/mjbellantoni/formtastic-bootstrap)
+
 A [Formtastic](https://github.com/justinfrench/formtastic) form builder that creates markup suitable for the [Twitter Bootstrap](http://twitter.github.com/bootstrap/) framework.  In theory, it should just work.  Two great tastes in one!
 
 You can follow [FormBoot on twitter](http://twitter.com/FormBoot) for update announcements and other relevant info.
@@ -17,7 +19,7 @@ This version of Formtastic Bootstrap should support the following:
 *Rails*
 
 * Rails 3.2.x
-* Rails 4.0.x
+* Rails 4.x.x
 
 *Formtastic*
 
@@ -28,11 +30,11 @@ This version of Formtastic Bootstrap should support the following:
 
 * 1.9.2
 * 1.9.3
-* 2.0.x
+* 2.x.x
 
 #### Installation
 
-Install the gem with 
+Install the gem with
 
     gem install formtastic-bootstrap
 
@@ -63,9 +65,9 @@ THIS SECTION IS OUT OF DATE.
 
 ### Overview
 
-In general, Formtastic creates very verbose HTML whereas 
+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 
+made to generate the HTML expected by Bootstrap while still
 generating the rich HTML provided by Formtastic.  When there
 is a conflict, Bootstrap wins.
 
@@ -88,9 +90,9 @@ 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 
+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:
@@ -144,7 +146,7 @@ use the ```:append_content``` or ```:prepend_content``` option.
     <% end %>
 
 ## Contributing
- 
+
 ### Contributors
 
 A big thank you [to all contributors](https://github.com/mjbellantoni/formtastic-bootstrap/contributors)!
@@ -185,7 +187,7 @@ 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!
+ * Fill in all pending specs
  * Refactor
  * More -- See if I'm making sure the Bootstrap classes are present.
 * Documentation
@@ -196,5 +198,5 @@ Source contributions are very welcome!  Most of the recent work on this package
 
 ## Copyright
 
-Copyright (c) 2013 Matthew Bellantoni. See LICENSE.txt for further details.
+Copyright (c) 2013-2015 Matthew Bellantoni. See LICENSE.txt for further details.
 

data/VERSION

@@ -1 +1 @@
-3.1.0
+3.1.1

data/lib/formtastic-bootstrap.rb

@@ -1,4 +1,5 @@
 require "formtastic"
+require "formtastic/version"
 require "formtastic-bootstrap/engine" if defined?(::Rails) # For tests
 require "formtastic-bootstrap/helpers"
 require "formtastic-bootstrap/inputs"

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

@@ -11,6 +11,15 @@ module FormtasticBootstrap
           :second => "col-xs-1"
         }
 
+        FRAGMENT_PLACEHOLDERS = {
+          :year   => nil,
+          :month  => nil,
+          :day    => nil,
+          :hour   => nil,
+          :minute => nil,
+          :second => nil
+        }
+
         def to_html
           bootstrap_wrapping do
             hidden_fragments <<
@@ -45,12 +54,11 @@ module FormtasticBootstrap
         end
 
         def fragment_class(fragment)
-          options[:fragment_classes] || self.class::FRAGMENT_CLASSES[fragment]
+          (options[:fragment_classes] || self.class::FRAGMENT_CLASSES)[fragment.to_sym]
         end
 
         def fragment_placeholder(fragment)
-          # TODO This sets a useless placeholer right now.
-          "." + fragment_class(fragment)
+          (options[:fragment_placeholders] || self.class::FRAGMENT_PLACEHOLDERS)[fragment.to_sym]
         end
 
       end

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

@@ -10,7 +10,7 @@ module FormtasticBootstrap
             label_html <<
             template.content_tag(:span, :class => 'form-wrapper') do
               input_content(&block) <<
-              hint_html <<
+              hint_html(:block) <<
               error_html(:block)
             end
           end

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

@@ -4,11 +4,15 @@ module FormtasticBootstrap
     class BooleanInput < Formtastic::Inputs::BooleanInput
       include Base
 
+      # Skip rendering of .form-label in #bootstrap_wrapping
+      def render_label?
+        false
+      end
+
       def to_html
         bootstrap_wrapping do
           hidden_field_html <<
-          "".html_safe <<
-          [label_with_nested_checkbox, hint_html].join("\n").html_safe
+          label_with_nested_checkbox
         end
       end
 
@@ -33,7 +37,7 @@ module FormtasticBootstrap
 
       def wrapper_html_options
         super.tap do |options|
-          options[:class] = (options[:class].split - ["form-group"] + ["checkbox"]).join(" ")
+          options[:class] = (options[:class].split + ["checkbox"]).join(" ")
         end
       end
 

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

@@ -3,6 +3,13 @@ module FormtasticBootstrap
     class ColorInput < Formtastic::Inputs::ColorInput
       include Base
       include Base::Stringish
+
+      def to_html
+        raise "The :color input requires the color_field form helper, which is only available in Rails 4+" unless builder.respond_to?(:color_field)
+        bootstrap_wrapping do
+          builder.color_field(method, form_control_input_html_options)
+        end
+      end
     end
   end
 end

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

@@ -5,29 +5,12 @@ module FormtasticBootstrap
       include Base
       include Base::Collections
 
-      def select_html
-        builder.select(input_name, collection, input_options, form_control_input_html_options)
-      end
-
-      def grouped_select_html
-        builder.grouped_collection_select(
-          input_name,
-          grouped_collection,
-          group_association,
-          group_label_method,
-          value_method,
-          label_method,
-          input_options,
-          form_control_input_html_options
-        )
-      end
-      
       def to_html
         bootstrap_wrapping do
-          options[:group_by] ? grouped_select_html : select_html
+          builder.select(input_name, collection, input_options, form_control_input_html_options)
         end
       end
 
     end
   end
-end
+end

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

@@ -4,7 +4,7 @@ module FormtasticBootstrap
       FRAGMENT_CLASSES = {
         :hour    => "col-xs-4",
         :minute  => "col-xs-4",
-        :secound => "col-xs-4"
+        :second => "col-xs-4"
       }
 
       include Base

data/lib/formtastic-bootstrap/version.rb

@@ -1,3 +1,3 @@
 module FormtasticBootstrap
-  VERSION = "3.1.0"
+  VERSION = "3.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formtastic-bootstrap
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Matthew Bellantoni
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-11 00:00:00.000000000 Z
+date: 2015-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: formtastic
@@ -81,34 +81,6 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 1.6.0
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.14'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.14'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.14'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rspec_tag_matchers
   requirement: !ruby/object:Gem::Requirement