bootstrap-form 0.0.8 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b7ffd8809005417c3cbef505e3283572f37dd566
+  data.tar.gz: f3e582b3e5c67de249325d16b6e47608113a6cab
+SHA512:
+  metadata.gz: be9ceec1e7f83257db098b2a2379cab03bf2a0204c5e740a3658f9291de4bf0d6c0d65e1ea98c773cf2bc2bb52fbd37dac1334258e1180a941de1b399c41d0f1
+  data.tar.gz: 50adcf7462bf78b2828be3859680c7d312920cdda8978f5ee3de59a3b4d1124e04c50d6c11c2b6cbf737896abc8d8bf39e0602bb2b697b12b6f80a97856e27d7

data/.travis.yml

@@ -0,0 +1,3 @@
+rvm:
+  - 1.8.7
+  - 1.9.2

data/README.md

@@ -4,6 +4,8 @@ Form Helpers to make your form inputs [look like this](http://twitter.github.com
 
 Helps you to create beautiful mocks really quickly.
 
+Works with Bootstrap 2.3.0 and Rails 3.2+ (including Rails 4)
+
 ## Usage
 
 Add the gem to your Gemfile
@@ -30,10 +32,10 @@ You write this:
 
 You get something like this:
 
-    <div class="clearfix">
-      <label for="account_name">Name</label>
-      <div class="input">
-        <input class="xlarge" id="account_name" name="account_name" size="30" type="text">
+    <div class="control-group">
+      <label class="control-label" for="account_name">Name</label>
+      <div class="controls">
+        <input id="account_name" name="account_name" size="30" type="text">
       </div>
     </div>
 
@@ -50,10 +52,10 @@ option:
 
 Then, you get something like this:
 
-    <div class="clearfix">
-      <label for="account_name">A custom label</label>
-      <div class="input">
-        <input class="xlarge" id="account_name" name="account_name" size="30" type="text">
+    <div class="control-group">
+      <label class="control-label" for="account_name">A custom label</label>
+      <div class="controls">
+        <input id="account_name" name="account_name" size="30" type="text">
       </div>
     </div>
 
@@ -69,7 +71,7 @@ Then, you get something like this:
 
 ## Error handling
 
-All fields will automatically add the classes to show errors with the Twitter
+All fields will automatically add the classes to show errors with Twitter
 bootstrap styles.
 
 ## TODO

data/bootsrap-form.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
 
-  s.add_dependency 'railties', '~> 3.0'
-  s.add_dependency 'actionpack', '~> 3.0'
+  s.add_dependency 'railties', '>= 3.2'
+  s.add_dependency 'actionpack', '>= 3.2'
 
   s.add_development_dependency "minitest"
   s.add_development_dependency "rr"

data/lib/bootstrap-form/form_helper.rb

@@ -5,41 +5,41 @@ module  ActionView
       BOOTSTRAP_OPTIONS = [:label, :hint].freeze
 
       def bootstrap_text_field(object_name, method, options={})
-        bootstrap_clearfix_wrap(object_name, method, text_field(object_name, method, extract_input_options(options)), options)
+        bootstrap_control_group_wrap(object_name, method, text_field(object_name, method, extract_input_options(options)), options)
       end
 
       def bootstrap_email_field(object_name, method, options={})
-        bootstrap_clearfix_wrap(object_name, method, email_field(object_name, method, extract_input_options(options)), options)
+        bootstrap_control_group_wrap(object_name, method, email_field(object_name, method, extract_input_options(options)), options)
       end
 
       def bootstrap_password_field(object_name, method, options={})
-        bootstrap_clearfix_wrap(object_name, method, password_field(object_name, method, extract_input_options(options)), options)
+        bootstrap_control_group_wrap(object_name, method, password_field(object_name, method, extract_input_options(options)), options)
       end
 
       def bootstrap_collection_select(object_name, method, collection, value_method, text_method, options = {}, html_options = {})
-        bootstrap_clearfix_wrap(object_name, method, collection_select(object_name, method, collection, value_method, text_method, extract_input_options(options), html_options), options)
+        bootstrap_control_group_wrap(object_name, method, collection_select(object_name, method, collection, value_method, text_method, extract_input_options(options), html_options), options)
       end
 
       def bootstrap_select(object_name, method, choices, options, html_options)
-        bootstrap_clearfix_wrap(object_name, method, select(object_name, method, choices, extract_input_options(options), html_options), options)
+        bootstrap_control_group_wrap(object_name, method, select(object_name, method, choices, extract_input_options(options), html_options), options)
       end
 
       def bootstrap_file_field(object_name, method, options={})
-        bootstrap_clearfix_wrap(object_name, method, file_field(object_name, method, extract_input_options(options)), options)
+        bootstrap_control_group_wrap(object_name, method, file_field(object_name, method, extract_input_options(options)), options)
       end
 
       def bootstrap_text_area(object_name, method, options={})
-        bootstrap_clearfix_wrap(object_name, method, text_area(object_name, method, extract_input_options(options)), options)
+        bootstrap_control_group_wrap(object_name, method, text_area(object_name, method, extract_input_options(options)), options)
       end
 
-      def bootstrap_clearfix_wrap(object_name, method, content, options={})
+      def bootstrap_control_group_wrap(object_name, method, content, options={})
         error_messages = options[:object].errors[method]
-        clearfix_tag = error_messages.blank? ? 'clearfix' : 'clearfix error'
-        inline_help = inline_help_tag(error_messages.presence || options[:hint])
+        control_group_tag   = error_messages.blank? ? 'control-group' : 'control-group error'
+        inline_help    = inline_help_tag(error_messages.presence || options[:hint])
 
-        content_tag(:div, label(object_name, method, options[:label]) +
-            content_tag(:div, content + inline_help, :class => 'input'),
-            :class => clearfix_tag)
+        content_tag(:div, label(object_name, method, options[:label], :class => 'control-label') +
+            content_tag(:div, content + inline_help, :class => 'controls'),
+            :class => control_group_tag)
       end
 
       def inline_help_tag(messages)

data/lib/bootstrap-form/version.rb

@@ -1,5 +1,5 @@
 module Bootstrap
   module Form
-    VERSION = "0.0.8"
+    VERSION = "1.0.0"
   end
 end

data/test/lib/action_view/helpers/form_helper_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class FormHelperTest < ActionView::TestCase
-  def test_bootstrap_clearfix_wrap
+  def test_bootstrap_control_group_wrap
     object  = mock
     errors  = { :name   => [] }
     options = { :object => object }
@@ -9,11 +9,11 @@ class FormHelperTest < ActionView::TestCase
     stub(object).errors { errors }
     stub(object).name   { 'Object Name' }
 
-    expected_code = %{<div class="clearfix"><label for="post_name">Name</label><div class="input">content</div></div>}
-    assert_equal expected_code, bootstrap_clearfix_wrap(:post, :name, content, options)
+    expected_code = %{<div class="control-group"><label class="control-label" for="post_name">Name</label><div class="controls">content</div></div>}
+    assert_equal expected_code, bootstrap_control_group_wrap(:post, :name, content, options)
   end
 
-  def test_bootstrap_clearfix_wrap_with_label
+  def test_bootstrap_control_group_wrap_with_label
     object  = mock
     errors  = { :name   => [] }
     options = { :object => object, :label => "Custom" }
@@ -21,11 +21,11 @@ class FormHelperTest < ActionView::TestCase
     stub(object).errors { errors }
     stub(object).name   { 'Object Name' }
 
-    expected_code = %{<div class="clearfix"><label for="post_name">Custom</label><div class="input">content</div></div>}
-    assert_equal expected_code, bootstrap_clearfix_wrap(:post, :name, content, options)
+    expected_code = %{<div class="control-group"><label class="control-label" for="post_name">Custom</label><div class="controls">content</div></div>}
+    assert_equal expected_code, bootstrap_control_group_wrap(:post, :name, content, options)
   end
 
-  def test_bootstrap_clearfix_wrap_with_errors
+  def test_bootstrap_control_group_wrap_with_errors
     object  = mock
     errors  = { :name   => ["can't be blank"] }
     options = { :object => object }
@@ -33,11 +33,11 @@ class FormHelperTest < ActionView::TestCase
     stub(object).errors { errors }
     stub(object).name   { 'Object Name' }
 
-    expected_code = %{<div class="clearfix error"><label for="post_name">Name</label><div class="input">content<span class="help-inline"> can't be blank</span></div></div>}
-    assert_equal expected_code, bootstrap_clearfix_wrap(:post, :name, content, options)
+    expected_code = %{<div class="control-group error"><label class="control-label" for="post_name">Name</label><div class="controls">content<span class="help-inline"> can't be blank</span></div></div>}
+    assert_equal expected_code, bootstrap_control_group_wrap(:post, :name, content, options)
   end
 
-  def test_bootstrap_clearfix_wrap_with_many_errors
+  def test_bootstrap_control_group_wrap_with_many_errors
     object  = mock
     errors  = { :name   => ["has already been taken", "is reserved", "must be odd"] }
     options = { :object => object }
@@ -45,11 +45,11 @@ class FormHelperTest < ActionView::TestCase
     stub(object).errors { errors }
     stub(object).name   { 'Object Name' }
 
-    expected_code = %{<div class="clearfix error"><label for="post_name">Name</label><div class="input">content<span class="help-inline"> has already been taken, is reserved, and must be odd</span></div></div>}
-    assert_equal expected_code, bootstrap_clearfix_wrap(:post, :name, content, options)
+    expected_code = %{<div class="control-group error"><label class="control-label" for="post_name">Name</label><div class="controls">content<span class="help-inline"> has already been taken, is reserved, and must be odd</span></div></div>}
+    assert_equal expected_code, bootstrap_control_group_wrap(:post, :name, content, options)
   end
 
-  def test_bootstrap_clearfix_wrap_with_hint
+  def test_bootstrap_control_group_wrap_with_hint
     object  = mock
     errors  = {}
     options = { :object => object, :hint => "format matters" }
@@ -57,11 +57,11 @@ class FormHelperTest < ActionView::TestCase
     stub(object).errors { errors }
     stub(object).name   { 'Object Name' }
 
-    expected_code = %{<div class="clearfix"><label for="post_name">Name</label><div class="input">content<span class="help-inline"> format matters</span></div></div>}
-    assert_equal expected_code, bootstrap_clearfix_wrap(:post, :name, content, options)
+    expected_code = %{<div class="control-group"><label class="control-label" for="post_name">Name</label><div class="controls">content<span class="help-inline"> format matters</span></div></div>}
+    assert_equal expected_code, bootstrap_control_group_wrap(:post, :name, content, options)
   end
 
-  def test_bootstrap_clearfix_wrap_with_hint_and_errors
+  def test_bootstrap_control_group_wrap_with_hint_and_errors
     object  = mock
     errors  = { :name   => ["can't be blank"] }
     options = { :object => object, :hint => "format matters" }
@@ -69,8 +69,8 @@ class FormHelperTest < ActionView::TestCase
     stub(object).errors { errors }
     stub(object).name   { 'Object Name' }
 
-    expected_code = %{<div class="clearfix error"><label for="post_name">Name</label><div class="input">content<span class="help-inline"> can't be blank</span></div></div>}
-    assert_equal expected_code, bootstrap_clearfix_wrap(:post, :name, content, options)
+    expected_code = %{<div class="control-group error"><label class="control-label" for="post_name">Name</label><div class="controls">content<span class="help-inline"> can't be blank</span></div></div>}
+    assert_equal expected_code, bootstrap_control_group_wrap(:post, :name, content, options)
   end
 
   def test_bootstrap_text_field
@@ -78,7 +78,7 @@ class FormHelperTest < ActionView::TestCase
     options = { :object => mock }
 
     mock(self).text_field(:post, :name, options) { text_field }
-    mock(self).bootstrap_clearfix_wrap(:post, :name, text_field, options.dup) { html }
+    mock(self).bootstrap_control_group_wrap(:post, :name, text_field, options.dup) { html }
     assert_equal html, bootstrap_text_field(:post, :name, options)
   end
 
@@ -87,7 +87,7 @@ class FormHelperTest < ActionView::TestCase
     options = { :object => mock }
 
     mock(self).email_field(:post, :email, options) { email_field }
-    mock(self).bootstrap_clearfix_wrap(:post, :email, email_field, options.dup) { html }
+    mock(self).bootstrap_control_group_wrap(:post, :email, email_field, options.dup) { html }
     assert_equal html, bootstrap_email_field(:post, :email, options)
   end
 
@@ -96,7 +96,7 @@ class FormHelperTest < ActionView::TestCase
     options = { :object => mock }
 
     mock(self).password_field(:post, :password, options) { password_field }
-    mock(self).bootstrap_clearfix_wrap(:post, :password, password_field, options.dup) { html }
+    mock(self).bootstrap_control_group_wrap(:post, :password, password_field, options.dup) { html }
     assert_equal html, bootstrap_password_field(:post, :password, options)
   end
 
@@ -105,7 +105,7 @@ class FormHelperTest < ActionView::TestCase
     options = { :object => mock }
 
     mock(self).collection_select(:post, :name, collection, :id, :name, options, {}) { collection_select_html }
-    mock(self).bootstrap_clearfix_wrap(:post, :name, collection_select_html, options.dup) { html }
+    mock(self).bootstrap_control_group_wrap(:post, :name, collection_select_html, options.dup) { html }
 
     assert_equal html, bootstrap_collection_select(:post, :name, collection, :id ,:name, options)
   end
@@ -115,7 +115,7 @@ class FormHelperTest < ActionView::TestCase
     options = { :object => mock }
 
     mock(self).select(:post, :name, choices, options, {}) { select_html }
-    mock(self).bootstrap_clearfix_wrap(:post, :name, select_html, options.dup) { html }
+    mock(self).bootstrap_control_group_wrap(:post, :name, select_html, options.dup) { html }
 
     assert_equal html, bootstrap_select(:post, :name, choices, options, {})
   end
@@ -125,7 +125,7 @@ class FormHelperTest < ActionView::TestCase
     options = { :object => mock }
 
     mock(self).file_field(:post, :attachment, options) { text_field }
-    mock(self).bootstrap_clearfix_wrap(:post, :attachment, text_field, options.dup) { html }
+    mock(self).bootstrap_control_group_wrap(:post, :attachment, text_field, options.dup) { html }
     assert_equal html, bootstrap_file_field(:post, :attachment, options)
   end
 
@@ -134,7 +134,7 @@ class FormHelperTest < ActionView::TestCase
     options = { :object => mock }
 
     mock(self).text_area(:post, :description, options) { text_area }
-    mock(self).bootstrap_clearfix_wrap(:post, :description, text_area, options.dup) { html }
+    mock(self).bootstrap_control_group_wrap(:post, :description, text_area, options.dup) { html }
     assert_equal html, bootstrap_text_area(:post, :description, options)
   end
 
@@ -143,7 +143,7 @@ class FormHelperTest < ActionView::TestCase
     options = { :object => mock, :label => "Custom", :hint => "be careful" }
 
     mock(self).text_area(:post, :description, options.except(:label, :hint)) { text_area }
-    mock(self).bootstrap_clearfix_wrap(:post, :description, text_area, options.dup) { html }
+    mock(self).bootstrap_control_group_wrap(:post, :description, text_area, options.dup) { html }
     assert_equal html, bootstrap_text_area(:post, :description, options)
   end
 

data/test/test_helper.rb

@@ -19,11 +19,12 @@ module BootstrapForm
 end
 
 BootstrapForm::Application.routes.draw do
-  match '/:controller(/:action(/:id))'
+  get '/:controller(/:action(/:id))'
 end
+BootstrapForm::Application.config.secret_key_base = 'bootstrap'
 
 ActionController::Base.send :include, BootstrapForm::Application.routes.url_helpers
 
-class Test::Unit::TestCase
+class MiniTest::Unit::TestCase
   include RR::Adapters::TestUnit
 end

metadata

@@ -1,60 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-form
 version: !ruby/object:Gem::Version
-  version: 0.0.8
-  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors:
 - David Padilla
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-08 00:00:00.000000000 Z
+date: 2013-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70199655132100 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70199655132100
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70199655131600 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70199655131600
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70199655131220 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70199655131220
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70199655130760 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70199655130760
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Twitter Bootstrap Form helpers
 email:
 - david@crowdint.com
@@ -63,6 +74,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
@@ -74,27 +86,26 @@ files:
 - test/test_helper.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: bootstrap-form
-rubygems_version: 1.8.10
+rubygems_version: 2.0.0.rc.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Twitter Bootstrap Form helpers
 test_files:
 - test/lib/action_view/helpers/form_helper_test.rb