formtastic-bootstrap 2.1.0 → 2.1.1

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

@@ -0,0 +1,29 @@
+# TODO See if this can be refactored to make use of some of the Choices code.
+module FormtasticBootstrap
+  module Inputs
+    class BooleanInput < Formtastic::Inputs::BooleanInput
+      include Base
+
+      def to_html
+        control_group_wrapping do
+          (options[:label_outside] ? control_label_html : "".html_safe) <<
+          hidden_field_html <<
+          controls_wrapping do
+            label_with_nested_checkbox
+          end
+        end
+      end
+
+      def label_with_nested_checkbox
+        builder.label(
+          method,
+          options[:label_outside] ? check_box_html : label_text_with_embedded_checkbox,
+          label_html_options.tap do |options|
+            options[:class] << "checkbox"
+          end
+        )
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+module FormtasticBootstrap
+  module Inputs
+    class CheckBoxesInput < Formtastic::Inputs::CheckBoxesInput
+      include Base
+      include Base::Choices
+
+      # TODO Make sure help blocks work correctly.
+      # TODO Support .inline
+
+      def to_html
+        control_group_wrapping do
+          control_label_html <<
+          hidden_field_for_all <<
+          controls_wrapping do
+            collection.map { |choice|
+              choice_html(choice)
+            }.join("\n").html_safe
+          end
+        end
+      end
+
+      def choice_wrapping_html_options(choice)
+        super(choice).tap do |options|
+          options[:class] = ((options[:class].split) << "checkbox").join(" ")
+        end
+      end
+
+      def choice_html(choice)
+        template.content_tag(:label,
+          hidden_fields? ?
+            check_box_with_hidden_input(choice) :
+            check_box_without_hidden_input(choice) <<
+          choice_label(choice),
+          label_html_options.merge(choice_label_html_options(choice))
+        )
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+module FormtasticBootstrap
+  module Inputs
+    class CountryInput < Formtastic::Inputs::CountryInput
+      include Base
+
+      def to_html
+        bootstrap_wrapping do
+          builder.country_select(method, priority_countries, input_options, input_html_options)
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+module FormtasticBootstrap
+  module Inputs
+    class DateInput < FormtasticBootstrap::Inputs::DateSelectInput
+      def to_html
+        ::ActiveSupport::Deprecation.warn("DateInput (:as => :date) has been renamed to DateSelectInput (:as => :date_select) and will be removed or changed in the next version of Formtastic, please update your forms.", caller(2))
+        super
+      end
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+module FormtasticBootstrap
+  module Inputs
+    class DatePickerInput < Formtastic::Inputs::DatePickerInput
+      include Base
+      include Base::Stringish
+      include Base::DatetimePickerish
+    end
+  end
+end

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

@@ -0,0 +1,8 @@
+module FormtasticBootstrap
+  module Inputs
+    class DateSelectInput < Formtastic::Inputs::DateSelectInput
+      include Base
+      include Base::Timeish
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+module FormtasticBootstrap
+  module Inputs
+    class DatetimeInput < FormtasticBootstrap::Inputs::DatetimeSelectInput
+      def to_html
+        ::ActiveSupport::Deprecation.warn("DatetimeInput (:as => :datetime) has been renamed to DatetimeSelectInput (:as => :datetime_select) and will be removed or changed in the next version of Formtastic, please update your forms.", caller(2))
+        super
+      end
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+module FormtasticBootstrap
+  module Inputs
+    class DatetimePickerInput < Formtastic::Inputs::DatetimePickerInput
+      include Base
+      include Base::Stringish
+      include Base::DatetimePickerish
+    end
+  end
+end

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

@@ -0,0 +1,8 @@
+module FormtasticBootstrap
+  module Inputs
+    class DatetimeSelectInput < Formtastic::Inputs::DatetimeSelectInput
+      include Base
+      include Base::Timeish
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module FormtasticBootstrap
+  module Inputs
+    class EmailInput < Formtastic::Inputs::EmailInput
+      include Base
+      include Base::Stringish
+
+      def to_html
+        bootstrap_wrapping do
+          builder.email_field(method, input_html_options)
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+module FormtasticBootstrap
+  module Inputs
+    class FileInput < Formtastic::Inputs::FileInput
+      include Base
+
+      def to_html
+        bootstrap_wrapping do
+          builder.file_field(method, input_html_options)
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,12 @@
+module FormtasticBootstrap
+  module Inputs
+    class HiddenInput < Formtastic::Inputs::HiddenInput
+      include Base
+      def to_html
+        bootstrap_wrapping do
+          builder.hidden_field(method, input_html_options)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module FormtasticBootstrap
+  module Inputs
+    class NumberInput < Formtastic::Inputs::NumberInput
+      include Base
+      include Base::Numeric
+
+      def to_html
+        bootstrap_wrapping do
+          builder.number_field(method, input_html_options)
+        end
+      end
+      
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module FormtasticBootstrap
+  module Inputs
+    class PasswordInput < Formtastic::Inputs::PasswordInput
+      include Base
+      include Base::Stringish
+
+      def to_html
+        bootstrap_wrapping do
+          builder.password_field(method, input_html_options)
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module FormtasticBootstrap
+  module Inputs
+    class PhoneInput < Formtastic::Inputs::PhoneInput
+      include Base
+      include Base::Stringish
+
+      def to_html
+        bootstrap_wrapping do
+          builder.phone_field(method, input_html_options)
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,46 @@
+module FormtasticBootstrap
+  module Inputs
+    class RadioInput < Formtastic::Inputs::RadioInput
+      include Base
+      include Base::Choices
+
+      # TODO Make sure help blocks work correctly.
+      # TODO Support .inline
+
+      def to_html
+        control_group_wrapping do
+          control_label_html <<
+          controls_wrapping do
+            collection.map { |choice|
+              choice_html(choice)
+            }.join("\n").html_safe
+          end
+        end
+      end
+
+      def wrapper_html_options
+        # Formtastic marks these as 'radio' but Bootstrap does something
+        # with that, so change it to 'radio_buttons'.
+        super.tap do |options|
+          options[:class] = options[:class].gsub("radio", "radio_buttons")
+        end
+      end
+
+      # This came from check_boxes.  Do needed refactoring.
+      def choice_wrapping_html_options(choice)
+        super(choice).tap do |options|
+          options[:class] = ((options[:class].split) << "radio").join(" ")
+        end
+      end
+
+      def choice_html(choice)        
+        template.content_tag(:label,
+          builder.radio_button(input_name, choice_value(choice), input_html_options.merge(choice_html_options(choice)).merge(:required => false)) << 
+          choice_label(choice),
+          label_html_options.merge(choice_label_html_options(choice))
+        )
+      end
+      
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module FormtasticBootstrap
+  module Inputs
+    class RangeInput < Formtastic::Inputs::RangeInput
+      include Base
+      include Base::Stringish
+
+      def to_html
+        bootstrap_wrapping do
+          builder.range_field(method, input_html_options)
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module FormtasticBootstrap
+  module Inputs
+    class SearchInput < Formtastic::Inputs::SearchInput
+      include Base
+      include Base::Stringish
+
+      def to_html
+        bootstrap_wrapping do
+          builder.search_field(method, input_html_options)
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module FormtasticBootstrap
+  module Inputs
+    class SelectInput < Formtastic::Inputs::SelectInput
+      include Base
+      include Base::Collections
+      include Base::GroupedCollections
+
+      def to_html
+        bootstrap_wrapping do
+          options[:group_by] ? grouped_select_html : select_html
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,8 @@
+module FormtasticBootstrap
+  module Inputs
+    class StringInput < Formtastic::Inputs::StringInput
+      include Base
+      include Base::Stringish
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+module FormtasticBootstrap
+  module Inputs
+    class TextInput < Formtastic::Inputs::TextInput
+      include Base 
+
+      def to_html
+        bootstrap_wrapping do
+          builder.text_area(method, input_html_options)
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+module FormtasticBootstrap
+  module Inputs
+    class TimeInput < FormtasticBootstrap::Inputs::TimeSelectInput
+      def to_html
+        ::ActiveSupport::Deprecation.warn("TimeInput (:as => :time) has been renamed to TimeSelectInput (:as => :time_select) and will be removed or changed in the next version of Formtastic, please update your forms.", caller(2))
+        super
+      end
+    end
+  end
+end

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

@@ -0,0 +1,8 @@
+module FormtasticBootstrap
+  module Inputs
+    class TimeSelectInput < Formtastic::Inputs::TimeSelectInput
+      include Base
+      include Base::Timeish
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+module FormtasticBootstrap
+  module Inputs
+    class TimeZoneInput < Formtastic::Inputs::TimeZoneInput
+      include Base
+
+      def to_html
+        bootstrap_wrapping do
+          builder.time_zone_select(method, priority_zones, input_options, input_html_options)
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+module FormtasticBootstrap
+  module Inputs
+    class UrlInput < Formtastic::Inputs::UrlInput
+      include Base
+      include Base::Stringish
+
+      def to_html
+        bootstrap_wrapping do
+          builder.url_field(method, input_html_options)
+        end
+      end
+    end
+  end
+end

data/lib/formtastic-bootstrap/version.rb

@@ -0,0 +1,3 @@
+module FormtasticBootstrap
+  VERSION = "2.1.1"
+end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: formtastic-bootstrap
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
   prerelease: 
 platform: ruby
 authors:
 - Matthew Bellantoni
+- Aaron Stone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
+date: 2013-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: formtastic
@@ -140,7 +141,9 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Formtastic form builder to generate Twitter Bootstrap-friendly markup.
-email: mjbellantoni@yahoo.com
+email:
+- mjbellantoni@yahoo.com
+- aaron@serendipity.cx
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -151,6 +154,62 @@ files:
 - LICENSE.txt
 - README.md
 - VERSION
+- lib/action_view/helpers/text_field_date_helper.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/actions.rb
+- lib/formtastic-bootstrap/engine.rb
+- lib/formtastic-bootstrap/form_builder.rb
+- lib/formtastic-bootstrap/helpers/action_helper.rb
+- lib/formtastic-bootstrap/helpers/actions_helper.rb
+- lib/formtastic-bootstrap/helpers/errors_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/helpers.rb
+- lib/formtastic-bootstrap/inputs/base/choices.rb
+- lib/formtastic-bootstrap/inputs/base/collections.rb
+- lib/formtastic-bootstrap/inputs/base/datetime_pickerish.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/placeholder.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/base.rb
+- lib/formtastic-bootstrap/inputs/boolean_input.rb
+- lib/formtastic-bootstrap/inputs/check_boxes_input.rb
+- lib/formtastic-bootstrap/inputs/country_input.rb
+- lib/formtastic-bootstrap/inputs/date_input.rb
+- lib/formtastic-bootstrap/inputs/date_picker_input.rb
+- lib/formtastic-bootstrap/inputs/date_select_input.rb
+- lib/formtastic-bootstrap/inputs/datetime_input.rb
+- lib/formtastic-bootstrap/inputs/datetime_picker_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
+- lib/formtastic-bootstrap/inputs/number_input.rb
+- lib/formtastic-bootstrap/inputs/password_input.rb
+- lib/formtastic-bootstrap/inputs/phone_input.rb
+- lib/formtastic-bootstrap/inputs/radio_input.rb
+- lib/formtastic-bootstrap/inputs/range_input.rb
+- lib/formtastic-bootstrap/inputs/search_input.rb
+- lib/formtastic-bootstrap/inputs/select_input.rb
+- 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
+- lib/formtastic-bootstrap/inputs.rb
+- lib/formtastic-bootstrap/version.rb
 - lib/formtastic-bootstrap.rb
 - vendor/assets/stylesheets/formtastic-bootstrap.css
 homepage: http://github.com/mjbellantoni/formtastic-bootstrap