formtastic-bootstrap 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64b433e690559fd1f31b9ca9eb8d9ff10a1d5818
-  data.tar.gz: b1d6b9565b53ac962973ddff1de78ace485db272
+  metadata.gz: 9a4c8ccd643acebbf6e74e39dd50f116ec11aecf
+  data.tar.gz: ffdc3de2dcf7c48ffa0254f054331e873c96562c
 SHA512:
-  metadata.gz: bf8be1a24e398d57860c8929a483d9c9da7770aacb46a704645a54e8f08a7fffd43d6b10d19f8b6610d8a75d1194eed6b0b4465764dfef43ff0c11d924f64148
-  data.tar.gz: 4dbdce5ad3cafad6d69d9dadcd0ac37bda0861cea640df4ea1e876d7c91019de2dc936e5c32a15dbbabb7f1a9302382bb0a270c6327543abc08811a08b80a9bc
+  metadata.gz: 1263c8854ccb91e32f3f561d901f28382f52f4cf539e862cb051b3b329470d202951cb64a1b4102a432628cd8d0ad548fee93d5bca151aac9431ef99452e6eb4
+  data.tar.gz: 6a3d94a0a0afd6c74f8c259e78c736da4c4ccecf691333e47e5501fdac374107b71883c57d8e03637013aa8eea579e6e05b436f34867a98b3029088199b8ccaf

data/VERSION

@@ -1 +1 @@
-3.0.0
+3.1.0

data/lib/formtastic-bootstrap.rb

@@ -1,19 +1,20 @@
 require "formtastic"
 require "formtastic-bootstrap/engine" if defined?(::Rails) # For tests
 require "formtastic-bootstrap/helpers"
+require "formtastic-bootstrap/inputs"
+require "formtastic-bootstrap/actions"
 require "formtastic-bootstrap/form_builder"
 require "action_view/helpers/text_field_date_helper"
 
 module FormtasticBootstrap
-
   extend ActiveSupport::Autoload
 
   # autoload :FormBuilder
   # autoload :Helpers
   # autoload :HtmlAttributes
   # autoload :I18n
-  autoload :Inputs,  "formtastic-bootstrap/inputs"
-  autoload :Actions, "formtastic-bootstrap/actions"
+  # autoload :Inputs,  "formtastic-bootstrap/inputs"
+  # autoload :Actions, "formtastic-bootstrap/actions"
   # autoload :LocalizedString
   # autoload :Localizer
   # autoload :Util

data/lib/formtastic-bootstrap/form_builder.rb

@@ -7,6 +7,13 @@ module FormtasticBootstrap
     configure :default_inline_hint_class,  'help-inline'
     configure :default_block_hint_class,   'help-block'
 
+    self.input_namespaces = [::Object, ::FormtasticBootstrap::Inputs, ::Formtastic::Inputs]
+    self.action_namespaces = [::Object, ::FormtasticBootstrap::Actions, ::Formtastic::Actions]
+
+    # TODO: remove both class finders after formtastic 4 (where it will be default)
+    self.input_class_finder = ::Formtastic::InputClassFinder
+    self.action_class_finder = ::Formtastic::ActionClassFinder
+
     def self.default_error_class
       # self.default_inline_error_class
       raise
@@ -29,12 +36,9 @@ module FormtasticBootstrap
       raise
     end
 
-    include FormtasticBootstrap::Helpers::InputHelper # Revisit
     include FormtasticBootstrap::Helpers::InputsHelper
     include FormtasticBootstrap::Helpers::ErrorsHelper
-    include FormtasticBootstrap::Helpers::ActionHelper
     include FormtasticBootstrap::Helpers::ActionsHelper
-    # include Formtastic::Helpers::ErrorsHelper
 
   end
 

data/lib/formtastic-bootstrap/helpers.rb

@@ -1,13 +1,11 @@
 module FormtasticBootstrap
   module Helpers
 
-    autoload :ActionHelper,  'formtastic-bootstrap/helpers/action_helper'
     autoload :ActionsHelper, 'formtastic-bootstrap/helpers/actions_helper'
     autoload :ErrorsHelper, 'formtastic-bootstrap/helpers/errors_helper'
     autoload :FieldsetWrapper, 'formtastic-bootstrap/helpers/fieldset_wrapper'
     # autoload :FileColumnDetection, 'formtastic/helpers/file_column_detection'
     # 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 :SemanticFormHelper, 'formtastic/helpers/semantic_form_helper'

data/lib/formtastic-bootstrap/inputs.rb

@@ -1,10 +1,12 @@
 module FormtasticBootstrap
   module Inputs
+    extend ActiveSupport::Autoload
 
     autoload :Base,                "formtastic-bootstrap/inputs/base"
     # autoload :Basic
     autoload :BooleanInput,        "formtastic-bootstrap/inputs/boolean_input"
     autoload :CheckBoxesInput,     "formtastic-bootstrap/inputs/check_boxes_input"
+    autoload :ColorInput,        "formtastic-bootstrap/inputs/color_input"
     autoload :CountryInput,        "formtastic-bootstrap/inputs/country_input"
     autoload :DateInput,           "formtastic-bootstrap/inputs/date_input"
     autoload :DatePickerInput,     "formtastic-bootstrap/inputs/date_picker_input"

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

@@ -6,6 +6,7 @@ require "formtastic-bootstrap/inputs/base/labelling"
 module FormtasticBootstrap
   module Inputs
     module Base
+      extend ActiveSupport::Autoload
 
       autoload :DatetimePickerish,  "formtastic-bootstrap/inputs/base/datetime_pickerish"
       # autoload :Associations
@@ -14,7 +15,6 @@ module FormtasticBootstrap
       # autoload :Database
       # autoload :Errors
       # autoload :Fileish
-      autoload :GroupedCollections, "formtastic-bootstrap/inputs/base/grouped_collections"
       # autoload :Hints
       # autoload :Html
       # autoload :Labelling

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

@@ -16,7 +16,13 @@ module FormtasticBootstrap
 
         # def control_label_html
         def label_html
-          render_label? ? builder.label(input_name, label_text, label_html_options) : "".html_safe
+          if render_label?
+            template.content_tag(:span, :class => 'form-label') do
+              builder.label(input_name, label_text, label_html_options)
+            end
+          else
+            "".html_safe
+          end
         end
 
       end

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

@@ -5,7 +5,7 @@ module FormtasticBootstrap
       include Base
 
       def to_html
-        checkbox_wrapping do
+        bootstrap_wrapping do
           hidden_field_html <<
           "".html_safe <<
           [label_with_nested_checkbox, hint_html].join("\n").html_safe
@@ -39,4 +39,4 @@ module FormtasticBootstrap
 
     end
   end
-end
+end

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

@@ -7,8 +7,7 @@ module FormtasticBootstrap
       # TODO Make sure help blocks work correctly.
 
       def to_html
-        form_group_wrapping do
-          label_html <<
+        bootstrap_wrapping do
           hidden_field_for_all << # Might need to remove this guy.
           collection.map { |choice|
             choice_html(choice)

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

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

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

@@ -7,8 +7,7 @@ module FormtasticBootstrap
       # TODO Make sure help blocks work correctly.
 
       def to_html
-        form_group_wrapping do
-          label_html <<
+        bootstrap_wrapping do
           collection.map { |choice|
             choice_html(choice)
           }.join("\n").html_safe

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

@@ -1,9 +1,9 @@
 module FormtasticBootstrap
   module Inputs
     class SelectInput < Formtastic::Inputs::SelectInput
+
       include Base
       include Base::Collections
-      include Base::GroupedCollections
 
       def select_html
         builder.select(input_name, collection, input_options, form_control_input_html_options)

data/lib/formtastic-bootstrap/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formtastic-bootstrap
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Matthew Bellantoni
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-24 00:00:00.000000000 Z
+date: 2015-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: formtastic
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -81,62 +81,76 @@ 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: '0'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rspec_tag_matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: ammeter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 description: Formtastic form builder to generate Twitter Bootstrap-friendly markup.
 email:
 - mjbellantoni@yahoo.com
@@ -159,18 +173,15 @@ files:
 - 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
@@ -182,6 +193,7 @@ files:
 - 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/color_input.rb
 - lib/formtastic-bootstrap/inputs/country_input.rb
 - lib/formtastic-bootstrap/inputs/date_input.rb
 - lib/formtastic-bootstrap/inputs/date_picker_input.rb
@@ -229,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Formtastic form builder to generate Twitter Bootstrap-friendly markup.

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

@@ -1,12 +0,0 @@
-module FormtasticBootstrap
-  module Helpers
-    module ActionHelper
-
-      # :as => :button # => FormtasticBootstrap::Actions::ButtonAction
-      def standard_action_class_name(as)
-        "FormtasticBootstrap::Actions::#{as.to_s.camelize}Action"
-      end
-
-    end
-  end
-end

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

@@ -1,12 +0,0 @@
-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

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

@@ -1,9 +0,0 @@
-module FormtasticBootstrap
-  module Inputs
-    module Base
-      module GroupedCollections
-        include Formtastic::Inputs::Base::GroupedCollections
-      end
-    end
-  end
-end