speedo-formstrap 1.2.3 → 1.2.4

data/Gemfile

@@ -1,7 +1,7 @@
 source "http://rubygems.org"
 
-gem 'formtastic', '~> 2.1.0.beta1'
-gem 'rails', '>= 3.1.0'
+gem 'formtastic'
+gem 'rails', '~> 3.1.0'
 
 group :development, :test do
   gem "rspec"

data/Gemfile.lock

@@ -1,39 +1,40 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.1)
-      actionpack (= 3.2.1)
-      mail (~> 2.4.0)
-    actionpack (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
+    actionmailer (3.1.3)
+      actionpack (= 3.1.3)
+      mail (~> 2.3.0)
+    actionpack (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.1)
-      rack (~> 1.4.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.5)
       rack-cache (~> 1.1)
+      rack-mount (~> 0.8.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.2)
-    activemodel (3.2.1)
-      activesupport (= 3.2.1)
+      sprockets (~> 2.0.3)
+    activemodel (3.1.3)
+      activesupport (= 3.1.3)
       builder (~> 3.0.0)
-    activerecord (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-      arel (~> 3.0.0)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-    activesupport (3.2.1)
       i18n (~> 0.6)
+    activerecord (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+    activesupport (3.1.3)
       multi_json (~> 1.0)
-    arel (3.0.0)
+    arel (2.2.1)
     builder (3.0.0)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    formtastic (2.1.0.beta1)
-      actionpack (~> 3.0)
+    formtastic (2.0.2)
+      rails (~> 3.0)
     git (1.2.5)
     hike (1.2.1)
     i18n (0.6.0)
@@ -41,9 +42,8 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    journey (1.0.1)
-    json (1.6.5)
-    mail (2.4.1)
+    json (1.6.3)
+    mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
@@ -51,24 +51,26 @@ GEM
     multi_json (1.0.4)
     nokogiri (1.5.0)
     polyglot (0.3.3)
-    rack (1.4.1)
+    rack (1.3.5)
     rack-cache (1.1)
       rack (>= 0.4)
+    rack-mount (0.8.3)
+      rack (>= 1.0.0)
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.2.1)
-      actionmailer (= 3.2.1)
-      actionpack (= 3.2.1)
-      activerecord (= 3.2.1)
-      activeresource (= 3.2.1)
-      activesupport (= 3.2.1)
+    rails (3.1.3)
+      actionmailer (= 3.1.3)
+      actionpack (= 3.1.3)
+      activerecord (= 3.1.3)
+      activeresource (= 3.1.3)
+      activesupport (= 3.1.3)
       bundler (~> 1.0)
-      railties (= 3.2.1)
-    railties (3.2.1)
-      actionpack (= 3.2.1)
-      activesupport (= 3.2.1)
+      railties (= 3.1.3)
+    railties (3.1.3)
+      actionpack (= 3.1.3)
+      activesupport (= 3.1.3)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -93,7 +95,7 @@ GEM
     rspec_tag_matchers (1.0.0)
       nokogiri (>= 1.4.0)
       rspec-rails (>= 1.2.6)
-    sprockets (2.1.2)
+    sprockets (2.0.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
@@ -109,9 +111,9 @@ PLATFORMS
 
 DEPENDENCIES
   bundler
-  formtastic (~> 2.1.0.beta1)
+  formtastic
   jeweler
-  rails (>= 3.1.0)
+  rails (~> 3.1.0)
   rcov
   rspec
   rspec_tag_matchers

data/README.md

@@ -14,11 +14,11 @@ Formtastic Bootstrap has only been tested with Ruby 1.9.2, Rails 3.1, Formtastic
 
 Install the gem with 
 
-    gem install speedo-formstrap
+    gem install formtastic-bootstrap
 
 Or add it to your Gemfile:
 
-    gem 'speedo-formstrap'
+    gem 'formtastic-bootstrap'
 
 And install it with <tt>bundle install</tt>.
 
@@ -29,7 +29,10 @@ Add the following line to your Formtastic initialization file:
     # config/initializers/formtastic.rb
     Formtastic::Helpers::FormHelper.builder = FormtasticBootstrap::FormBuilder
 
-Make sure the CSS `.hidden {display:none;}` is in your project.
+Add the following line to the top of your <tt>application.css</tt> file:
+
+    # app/assets/stylesheets/application.css
+    *= require formtastic-bootstrap
 
 Make sure you've already downloaded and installed Formtastic!
 
@@ -124,18 +127,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.
-
-## Usage
-
-#### Prepended Text
-To create a Prepended Text field, use the ```:prepend``` option.  This works on any text field input type, like ```:url```, ```:search```, and of course ```:string```
-
-    <%= semantic_form_for @user do |f| %>
-      <%= f.inputs do %>
-        <%= f.input :handle, :prepend => '@' %>
-      <% end %>
-    <% end %>
+* Twitter Bootstrap's Date Range, Prepend Text, Prepend Checkbox and Appended Checkbox controls have not yet been implemented.
 
 ## Contributing
  
@@ -170,6 +162,7 @@ If you're filing a bug, thank you!  Secondly, in the report please include:
    * :time_zone
  * Fancy Bootstrap Fields
    * Date Range
+   * Prepend Text
    * Prepend Checkbox
    * Appended Checkbox
 * :datetime, :date, :time

data/Rakefile

@@ -15,11 +15,11 @@ require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "speedo-formstrap"
-  gem.homepage = "http://github.com/thugsb/speedo-formstrap"
+  gem.homepage = "http://github.com/thugsb/formtastic-bootstrap"
   gem.license = "MIT"
   gem.summary = %Q{Formtastic form builder to generate Twitter Bootstrap-friendly markup.}
   gem.description = gem.summary
-  gem.email = "stu@t.apio.ca"
+  gem.email = "mjbellantoni@yahoo.com"
   gem.authors = ["Matthew Bellantoni", "Stu Basden"]
   # dependencies defined in Gemfile
 end
@@ -43,7 +43,7 @@ Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "speedo-formstrap #{version}"
+  rdoc.title = "formtastic-bootstrap #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/VERSION

@@ -1 +1 @@
-1.2.3
+1.2.4

data/formtastic-bootstrap.gemspec

@@ -0,0 +1,133 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "formtastic-bootstrap"
+  s.version = "1.2.4"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Matthew Bellantoni"]
+  s.date = "2012-07-09"
+  s.description = "Formtastic form builder to generate Twitter Bootstrap-friendly markup."
+  s.email = "mjbellantoni@yahoo.com"
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.md"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "formtastic-bootstrap.gemspec",
+    "lib/action_view/helpers/text_field_date_helper.rb",
+    "lib/formtastic-bootstrap.rb",
+    "lib/formtastic-bootstrap/engine.rb",
+    "lib/formtastic-bootstrap/form_builder.rb",
+    "lib/formtastic-bootstrap/helpers.rb",
+    "lib/formtastic-bootstrap/helpers/buttons_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/inputs.rb",
+    "lib/formtastic-bootstrap/inputs/base.rb",
+    "lib/formtastic-bootstrap/inputs/base/choices.rb",
+    "lib/formtastic-bootstrap/inputs/base/errors.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/stringish.rb",
+    "lib/formtastic-bootstrap/inputs/base/timeish.rb",
+    "lib/formtastic-bootstrap/inputs/base/wrapping.rb",
+    "lib/formtastic-bootstrap/inputs/boolean_input.rb",
+    "lib/formtastic-bootstrap/inputs/check_boxes_input.rb",
+    "lib/formtastic-bootstrap/inputs/date_input.rb",
+    "lib/formtastic-bootstrap/inputs/datetime_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_zone_input.rb",
+    "lib/formtastic-bootstrap/inputs/url_input.rb",
+    "spec/builder/errors_spec.rb",
+    "spec/builder/semantic_fields_for_spec.rb",
+    "spec/helpers/buttons_helper_spec.rb",
+    "spec/helpers/input_helper_spec.rb",
+    "spec/helpers/inputs_helper_spec.rb",
+    "spec/inputs/boolean_input_spec.rb",
+    "spec/inputs/check_boxes_input_spec.rb",
+    "spec/inputs/date_input_spec.rb",
+    "spec/inputs/datetime_input_spec.rb",
+    "spec/inputs/email_input_spec.rb",
+    "spec/inputs/file_input_spec.rb",
+    "spec/inputs/hidden_input_spec.rb",
+    "spec/inputs/number_input_spec.rb",
+    "spec/inputs/password_input_spec.rb",
+    "spec/inputs/phone_input_spec.rb",
+    "spec/inputs/radio_input_spec.rb",
+    "spec/inputs/range_input_spec.rb",
+    "spec/inputs/search_input_spec.rb",
+    "spec/inputs/select_input_spec.rb",
+    "spec/inputs/string_input_spec.rb",
+    "spec/inputs/text_input_spec.rb",
+    "spec/inputs/time_input_spec.rb",
+    "spec/inputs/time_zone_input_spec.rb",
+    "spec/inputs/url_input_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/support/custom_macros.rb",
+    "spec/support/depracation.rb",
+    "spec/support/formtastic_spec_helper.rb",
+    "vendor/assets/stylesheets/formtastic-bootstrap.css"
+  ]
+  s.homepage = "http://github.com/mjbellantoni/formtastic-bootstrap"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.10"
+  s.summary = "Formtastic form builder to generate Twitter Bootstrap-friendly markup."
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<formtastic>, [">= 0"])
+      s.add_runtime_dependency(%q<rails>, ["~> 3.1.0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<rspec_tag_matchers>, [">= 0"])
+    else
+      s.add_dependency(%q<formtastic>, [">= 0"])
+      s.add_dependency(%q<rails>, ["~> 3.1.0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<rspec_tag_matchers>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<formtastic>, [">= 0"])
+    s.add_dependency(%q<rails>, ["~> 3.1.0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<rspec_tag_matchers>, [">= 0"])
+  end
+end
+

data/lib/{speedo-formstrap → formtastic-bootstrap}/engine.rb

@@ -1,4 +1,4 @@
-module SpeedoFormstrap
+module FormtasticBootstrap
   class Engine < ::Rails::Engine
   end
 end

data/lib/{speedo-formstrap → formtastic-bootstrap}/form_builder.rb

@@ -1,5 +1,5 @@
-module SpeedoFormstrap
-
+module FormtasticBootstrap
+  
   class FormBuilder < Formtastic::FormBuilder
 
     configure :default_inline_error_class, 'help-inline'
@@ -11,30 +11,28 @@ module SpeedoFormstrap
       # 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
       raise
     end
 
-    include SpeedoFormstrap::Helpers::InputHelper
-    include SpeedoFormstrap::Helpers::InputsHelper
-    include SpeedoFormstrap::Helpers::ButtonsHelper
-    include SpeedoFormstrap::Helpers::ActionHelper
-    include SpeedoFormstrap::Helpers::ActionsHelper
+    include FormtasticBootstrap::Helpers::InputHelper
+    include FormtasticBootstrap::Helpers::InputsHelper
+    include FormtasticBootstrap::Helpers::ButtonsHelper
 
   end
 
-end
+end

data/lib/{speedo-formstrap → formtastic-bootstrap}/helpers/buttons_helper.rb

@@ -1,15 +1,14 @@
-module SpeedoFormstrap
+module FormtasticBootstrap
   module Helpers
     module ButtonsHelper
 
       include Formtastic::Helpers::ButtonsHelper
 
       def buttons(*args, &block)
-        ::ActiveSupport::Deprecation.warn("f.buttons is deprecated in favour of f.actions and will be removed from Formtastic after 2.1. Please see ActionsHelper and InputAction or ButtonAction for more information")
 
         html_options = args.extract_options!
-        html_options[:class] ||= "form-actions"
-
+        html_options[:class] ||= "actions"
+  
         if html_options.has_key?(:name)
           ActiveSupport::Deprecation.warn('The :name option is not supported')
         end
@@ -17,7 +16,7 @@ module SpeedoFormstrap
         if block_given?
           template.content_tag(:div, html_options) do
             yield
-          end
+          end          
         else
           args = [:commit] if args.empty?
           contents = args.map { |button_name| send(:"#{button_name}_button") }
@@ -29,28 +28,25 @@ module SpeedoFormstrap
       end
 
       def commit_button(*args)
-        ::ActiveSupport::Deprecation.warn("f.commit_button is deprecated in favour of f.action(:submit) and will be removed from Formtastic after 2.1. Please see ActionsHelper and InputAction or ButtonAction for more information")
-
         options = args.extract_options!
         text = options.delete(:label) || args.shift
-
+      
         text = (localized_string(commit_button_i18n_key, text, :action, :model => commit_button_object_name) ||
                 Formtastic::I18n.t(commit_button_i18n_key, :model => commit_button_object_name)) unless text.is_a?(::String)
-
+      
         button_html = options.delete(:button_html) || {}
-        button_html[:id] ||= "#{@object_name}_submit"
         button_html.merge!(:class => [button_html[:class], "btn commit", commit_button_i18n_key].compact.join(' '))
-
+      
         # TODO We don't have a wrapper. Add deprecation message.
         # wrapper_html = options.delete(:wrapper_html) || {}
         # wrapper_html[:class] = (commit_button_wrapper_html_class << wrapper_html[:class]).flatten.compact.join(' ')
-
+      
         accesskey = (options.delete(:accesskey) || default_commit_button_accesskey) unless button_html.has_key?(:accesskey)
         button_html = button_html.merge(:accesskey => accesskey) if accesskey
-
+        
         Formtastic::Util.html_safe(submit(text, button_html))
       end
 
     end
   end
-end
+end