formtastic-bootstrap 3.0.0.rc.2 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 855a2f02f93378b601e8184fd54e0c614fab55fa
-  data.tar.gz: 7a808dcd0f182e21fcfabd56c3a0148f411507bc
+  metadata.gz: 64b433e690559fd1f31b9ca9eb8d9ff10a1d5818
+  data.tar.gz: b1d6b9565b53ac962973ddff1de78ace485db272
 SHA512:
-  metadata.gz: 8739521afff71a81e72353ad8d8afc821726402484f245c961ebaf0542eda69e2780c4130cad115c4d88c07d7ba057626cbc5cb5ffb40eb226745da74d7e2218
-  data.tar.gz: 455841cca4609d8fc6981836c629e830eb59aad8715ad856de126b8ac006aa4c62b4b56aa461bee02fc64602d19e7f100d70de406c20f0bc94963c592722b55a
+  metadata.gz: bf8be1a24e398d57860c8929a483d9c9da7770aacb46a704645a54e8f08a7fffd43d6b10d19f8b6610d8a75d1194eed6b0b4465764dfef43ff0c11d924f64148
+  data.tar.gz: 4dbdce5ad3cafad6d69d9dadcd0ac37bda0861cea640df4ea1e876d7c91019de2dc936e5c32a15dbbabb7f1a9302382bb0a270c6327543abc08811a08b80a9bc

data/VERSION

@@ -1 +1 @@
-3.0.0.rc.2
+3.0.0

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

@@ -2,52 +2,50 @@ module FormtasticBootstrap
   module Inputs
     module Base
       module Timeish
+        FRAGMENT_CLASSES = {
+          :year   => "col-xs-2",
+          :month  => "col-xs-3",
+          :day    => "col-xs-1",
+          :hour   => "col-xs-offset-3 col-xs-1",
+          :minute => "col-xs-1",
+          :second => "col-xs-1"
+        }
 
         def to_html
-          form_group_wrapping do
-            label_html <<
+          bootstrap_wrapping do
             hidden_fragments <<
-            form_control_row_wrapping do
+            row_wrapping do
               fragments.map do |fragment|
-                fragment_input_html(fragment.to_sym)
+                fragment_html(fragment.to_sym)
               end.join.html_safe
             end
           end
         end
 
-        def form_control_row_wrapping(&block)
+        def row_wrapping(&block)
           template.content_tag(:div,
             template.capture(&block).html_safe,
-            form_control_row_wrapper_html_options
+            :class => 'row'
           )
         end
 
-        def form_control_row_wrapper_html_options
-          { :class => "form-control" }
-        end
-
-        def fragment_input_html(fragment)
-          opts = input_options.merge(:prefix => fragment_prefix, :field_name => fragment_name(fragment), :default => value, :include_blank => include_blank?)
-          template.send(:"select_#{fragment}", value, opts, fragment_input_html_options(fragment))
+        def fragment_html(fragment)
+          template.content_tag(:div, :class => fragment_class(fragment)) do
+            opts = input_options.merge(:prefix => fragment_prefix, :field_name => fragment_name(fragment), :default => value, :include_blank => include_blank?)
+            template.send(:"select_#{fragment}", value, opts, fragment_input_html_options(fragment))
+          end
         end
 
         def fragment_input_html_options(fragment)
           input_html_options.tap do |options|
             options[:id] = fragment_id(fragment)
-            options[:class] = ((options[:class] || "").split << fragment_class(fragment)).join(" ")
+            options[:class] = ((options[:class] || "").split << "form-control").join(" ")
             options[:placeholder] = fragment_placeholder(fragment)
           end
         end
 
         def fragment_class(fragment)
-          {
-            :year   => "col-xs-1",
-            :month  => "col-xs-2",
-            :day    => "col-xs-1",
-            :hour   => "col-xs-1",
-            :minute => "col-xs-1",
-            :second => "col-xs-1"
-          }[fragment]
+          options[:fragment_classes] || self.class::FRAGMENT_CLASSES[fragment]
         end
 
         def fragment_placeholder(fragment)

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

@@ -6,24 +6,29 @@ module FormtasticBootstrap
         include Formtastic::Inputs::Base::Wrapping
 
         def bootstrap_wrapping(&block)
-          input_content = [
+          form_group_wrapping do
+            label_html <<
+            template.content_tag(:span, :class => 'form-wrapper') do
+              input_content(&block) <<
+              hint_html <<
+              error_html(:block)
+            end
+          end
+        end
+
+        def input_content(&block)
+          content = [
             add_on_content(options[:prepend]),
             options[:prepend_content],
             yield,
             add_on_content(options[:append]),
-            options[:append_content],
-            hint_html
+            options[:append_content]
           ].compact.join("\n").html_safe
 
-          form_group_wrapping do
-            label_html <<
-            if prepended_or_appended?(options)
-              template.content_tag(:div, :class => add_on_wrapper_classes(options).join(" ")) do
-                input_content
-              end
-            else
-              input_content
-            end
+          if prepended_or_appended?(options)
+            template.content_tag(:div, content, :class => add_on_wrapper_classes(options).join(" "))
+          else
+            content
           end
         end
 
@@ -33,7 +38,7 @@ module FormtasticBootstrap
 
         def add_on_content(content)
           return nil unless content
-          template.content_tag(:span, content, :class => 'add-on')
+          template.content_tag(:span, content, :class => 'input-group-addon')
         end
 
         def form_group_wrapping(&block)
@@ -51,9 +56,9 @@ module FormtasticBootstrap
         end
 
         def add_on_wrapper_classes(options)
-          [:prepend, :append, :prepend_content, :append_content].map do |key|
-            "input-#{key.to_s.gsub('_content', '')}" if options[key]
-          end
+          [:prepend, :append, :prepend_content, :append_content].find do |key|
+            options.has_key?(key)
+          end ? ['input-group'] : []
         end
 
       end

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

@@ -6,11 +6,16 @@ module FormtasticBootstrap
 
       def to_html
         checkbox_wrapping do
+          hidden_field_html <<
           "".html_safe <<
           [label_with_nested_checkbox, hint_html].join("\n").html_safe
         end
       end
 
+      def hidden_field_html
+        template.hidden_field_tag(input_html_options[:name], unchecked_value, :id => nil, :disabled => input_html_options[:disabled] )
+      end
+
       def label_with_nested_checkbox
         builder.label(
           method,

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

@@ -5,7 +5,6 @@ module FormtasticBootstrap
       include Base::Choices
 
       # TODO Make sure help blocks work correctly.
-      # TODO Support .inline
 
       def to_html
         form_group_wrapping do
@@ -30,9 +29,11 @@ module FormtasticBootstrap
       end
 
       def checkbox_wrapping(&block)
+        class_name = "checkbox"
+        class_name += " checkbox-inline" if options[:inline]
         template.content_tag(:div,
           template.capture(&block).html_safe,
-          :class => "checkbox"
+          :class => class_name
         )
       end
 

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

@@ -5,7 +5,7 @@ module FormtasticBootstrap
 
       def to_html
         bootstrap_wrapping do
-          builder.country_select(method, priority_countries, input_options, input_html_options)
+          builder.country_select(method, priority_countries, input_options, form_control_input_html_options)
         end
       end
 

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

@@ -1,8 +1,14 @@
 module FormtasticBootstrap
   module Inputs
     class DateSelectInput < Formtastic::Inputs::DateSelectInput
+      FRAGMENT_CLASSES = {
+        :year   => "col-xs-4",
+        :month  => "col-xs-5",
+        :day    => "col-xs-3"
+      }
+
       include Base
       include Base::Timeish
     end
   end
-end
+end

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

@@ -5,7 +5,6 @@ module FormtasticBootstrap
       include Base::Choices
 
       # TODO Make sure help blocks work correctly.
-      # TODO Support .inline
 
       def to_html
         form_group_wrapping do
@@ -35,9 +34,11 @@ module FormtasticBootstrap
       end
 
       def radio_wrapping(&block)
+        class_name = "radio"
+        class_name += " radio-inline" if options[:inline]
         template.content_tag(:div,
           template.capture(&block).html_safe,
-          :class => "radio"
+          :class => class_name
         )
       end
 

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

@@ -1,6 +1,12 @@
 module FormtasticBootstrap
   module Inputs
     class TimeSelectInput < Formtastic::Inputs::TimeSelectInput
+      FRAGMENT_CLASSES = {
+        :hour    => "col-xs-4",
+        :minute  => "col-xs-4",
+        :secound => "col-xs-4"
+      }
+
       include Base
       include Base::Timeish
     end

data/lib/formtastic-bootstrap/version.rb

@@ -1,3 +1,3 @@
 module FormtasticBootstrap
-  VERSION = "3.0.0.rc.2"
+  VERSION = "3.0.0"
 end

data/vendor/assets/stylesheets/formtastic-bootstrap.css

@@ -5,35 +5,3 @@
 .alert.alert-error > ul.error-list {
   margin-bottom: 0px;
 }
-
-
-/*
-** Timeish fixes.
-*/
-
-.datetime_select .form-control,
-.date_select .form-control,
-.time_select .form-control,
-.datetime .form-control,
-.date .form-control,
-.time .form-control
- {
-  border: none;
-  -webkit-box-shadow: none;
-  box-shadow: none;
-	padding: 0px 0px;
-}
-
-.datetime_select .form-control select,
-.date_select .form-control select,
-.time_select .form-control select,
-.datetime .form-control select,
-.date .form-control select,
-.time .form-control select 
-{
-	/* This works for me in FireFox but does not work in
-	   Safari or Chrome (31.)  If I set a background-color
-	   it will suddenly work in both of those browsers.
-	*/
-	height: 34px; 
-}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formtastic-bootstrap
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Matthew Bellantoni
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-28 00:00:00.000000000 Z
+date: 2014-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: formtastic
@@ -224,12 +224,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Formtastic form builder to generate Twitter Bootstrap-friendly markup.