bootstrap-form 1.0.0 → 3.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7ffd8809005417c3cbef505e3283572f37dd566
-  data.tar.gz: f3e582b3e5c67de249325d16b6e47608113a6cab
+  metadata.gz: 550f8154589e3409ab3f1ea4e527ea00715702f3
+  data.tar.gz: 9f58ff608b6d2e3a82704f79169794a4377158ab
 SHA512:
-  metadata.gz: be9ceec1e7f83257db098b2a2379cab03bf2a0204c5e740a3658f9291de4bf0d6c0d65e1ea98c773cf2bc2bb52fbd37dac1334258e1180a941de1b399c41d0f1
-  data.tar.gz: 50adcf7462bf78b2828be3859680c7d312920cdda8978f5ee3de59a3b4d1124e04c50d6c11c2b6cbf737896abc8d8bf39e0602bb2b697b12b6f80a97856e27d7
+  metadata.gz: ac6e895c213b1b503e852accf572e6ac30436390c4759ae9e5c1872dbf18fe97724fbf4dd5057ec4be9f802c2d302f36a71503b15727170405361840cc08e56c
+  data.tar.gz: 7d208337c7fb92dd6a9bc0327293e0a13b5ab767a8d61a913e44cd5601a88a427c252a25a3169b140e33b56f451ee7e01d9a5df2ac4c2cee83545c6a1509d19a

data/.travis.yml

@@ -1,3 +1,6 @@
 rvm:
-  - 1.8.7
-  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+gemfile:
+  - Gemfile.rails.3.2
+  - Gemfile.rails.4.0

data/Gemfile.rails.3.2

@@ -0,0 +1,7 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in bootstrap-form.gemspec
+gemspec
+
+gem 'railties', '~> 3.2'
+gem 'actionpack', '~> 3.2'

data/Gemfile.rails.4.0

@@ -0,0 +1,7 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in bootstrap-form.gemspec
+gemspec
+
+gem 'railties', '4.0.0'
+gem 'actionpack', '4.0.0'

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2013 David Padilla
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,10 +1,14 @@
 # Bootstrap Form
 
-Form Helpers to make your form inputs [look like this](http://twitter.github.com/bootstrap/#forms).
+[![Build Status](https://travis-ci.org/dabit/bootstrap-form.png?branch=master)](https://travis-ci.org/dabit/bootstrap-form)
+
+Form Helpers to make your form inputs [look like this](http://twitter.github.io/bootstrap/base-css.html#forms).
 
 Helps you to create beautiful mocks really quickly.
 
-Works with Bootstrap 2.3.0 and Rails 3.2+ (including Rails 4)
+Works with Bootstrap 3 and Rails 3.2+ (including Rails 4)
+
+For older versions of Bootstrap use version 1.0.x of this gem.
 
 ## Usage
 
@@ -32,11 +36,9 @@ You write this:
 
 You get something like this:
 
-    <div class="control-group">
+    <div class="form-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>
+      <input class="form-control" id="account_name" name="account_name" size="30" type="text">
     </div>
 
 Pretty straight forward.
@@ -52,11 +54,9 @@ option:
 
 Then, you get something like this:
 
-    <div class="control-group">
+    <div class="form-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>
+      <input class="form-control" id="account_name" name="account_name" size="30" type="text">
     </div>
 
 ## Current Helpers List

data/bootsrap-form.gemspec

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

data/lib/bootstrap-form/form_helper.rb

@@ -5,40 +5,47 @@ module  ActionView
       BOOTSTRAP_OPTIONS = [:label, :hint].freeze
 
       def bootstrap_text_field(object_name, method, options={})
+        options[:class] = (options[:class] ? options[:class] + " form-control" : "form-control")
         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={})
+        options[:class] = (options[:class] ? options[:class] + " form-control" : "form-control")
         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={})
+        options[:class] = (options[:class] ? options[:class] + " form-control" : "form-control")
         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 = {})
+        html_options[:class] = (html_options[:class] ? html_options[:class] + " form-control" : "form-control")
         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)
+      def bootstrap_select(object_name, method, choices, options={}, html_options={})
+        html_options[:class] = (html_options[:class] ? html_options[:class] + " form-control" : "form-control")
         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={})
+        options[:class] = (options[:class] ? options[:class] + " form-control" : "form-control")
         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={})
+        options[:class] = (options[:class] ? options[:class] + " form-control" : "form-control")
         bootstrap_control_group_wrap(object_name, method, text_area(object_name, method, extract_input_options(options)), options)
       end
 
       def bootstrap_control_group_wrap(object_name, method, content, options={})
-        error_messages = options[:object].errors[method]
-        control_group_tag   = error_messages.blank? ? 'control-group' : 'control-group error'
-        inline_help    = inline_help_tag(error_messages.presence || options[:hint])
+        error_messages    = options[:object].errors[method]
+        control_group_tag = error_messages.blank? ? 'form-group' : 'form-group has-error'
+        inline_help       = inline_help_tag(error_messages.presence || options[:hint])
 
         content_tag(:div, label(object_name, method, options[:label], :class => 'control-label') +
-            content_tag(:div, content + inline_help, :class => 'controls'),
+            content + inline_help,
             :class => control_group_tag)
       end
 
@@ -46,7 +53,7 @@ module  ActionView
         messages = Array.wrap(messages)
         return '' if messages.empty?
         message_span = ActiveSupport::SafeBuffer.new(" #{messages.to_sentence}")
-        content_tag(:span, message_span, :class => 'help-inline')
+        content_tag(:span, message_span, :class => 'help-block')
       end
 
       private

data/lib/bootstrap-form/version.rb

@@ -1,5 +1,5 @@
 module Bootstrap
   module Form
-    VERSION = "1.0.0"
+    VERSION = "3.0.0.rc2"
   end
 end

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

@@ -9,7 +9,7 @@ class FormHelperTest < ActionView::TestCase
     stub(object).errors { errors }
     stub(object).name   { 'Object Name' }
 
-    expected_code = %{<div class="control-group"><label class="control-label" for="post_name">Name</label><div class="controls">content</div></div>}
+    expected_code = %{<div class="form-group"><label class="control-label" for="post_name">Name</label>content</div>}
     assert_equal expected_code, bootstrap_control_group_wrap(:post, :name, content, options)
   end
 
@@ -21,7 +21,7 @@ class FormHelperTest < ActionView::TestCase
     stub(object).errors { errors }
     stub(object).name   { 'Object Name' }
 
-    expected_code = %{<div class="control-group"><label class="control-label" for="post_name">Custom</label><div class="controls">content</div></div>}
+    expected_code = %{<div class="form-group"><label class="control-label" for="post_name">Custom</label>content</div>}
     assert_equal expected_code, bootstrap_control_group_wrap(:post, :name, content, options)
   end
 
@@ -33,7 +33,7 @@ class FormHelperTest < ActionView::TestCase
     stub(object).errors { errors }
     stub(object).name   { 'Object Name' }
 
-    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>}
+    expected_code = %{<div class="form-group has-error"><label class="control-label" for="post_name">Name</label>content<span class="help-block"> can't be blank</span></div>}
     assert_equal expected_code, bootstrap_control_group_wrap(:post, :name, content, options)
   end
 
@@ -45,7 +45,7 @@ class FormHelperTest < ActionView::TestCase
     stub(object).errors { errors }
     stub(object).name   { 'Object Name' }
 
-    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>}
+    expected_code = %{<div class="form-group has-error"><label class="control-label" for="post_name">Name</label>content<span class="help-block"> has already been taken, is reserved, and must be odd</span></div>}
     assert_equal expected_code, bootstrap_control_group_wrap(:post, :name, content, options)
   end
 
@@ -57,7 +57,7 @@ class FormHelperTest < ActionView::TestCase
     stub(object).errors { errors }
     stub(object).name   { 'Object Name' }
 
-    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>}
+    expected_code = %{<div class="form-group"><label class="control-label" for="post_name">Name</label>content<span class="help-block"> format matters</span></div>}
     assert_equal expected_code, bootstrap_control_group_wrap(:post, :name, content, options)
   end
 
@@ -69,7 +69,7 @@ class FormHelperTest < ActionView::TestCase
     stub(object).errors { errors }
     stub(object).name   { 'Object Name' }
 
-    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>}
+    expected_code = %{<div class="form-group has-error"><label class="control-label" for="post_name">Name</label>content<span class="help-block"> can't be blank</span></div>}
     assert_equal expected_code, bootstrap_control_group_wrap(:post, :name, content, options)
   end
 

data/test/test_helper.rb

@@ -24,7 +24,3 @@ end
 BootstrapForm::Application.config.secret_key_base = 'bootstrap'
 
 ActionController::Base.send :include, BootstrapForm::Application.routes.url_helpers
-
-class MiniTest::Unit::TestCase
-  include RR::Adapters::TestUnit
-end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-form
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 3.0.0.rc2
 platform: ruby
 authors:
 - David Padilla
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-23 00:00:00.000000000 Z
+date: 2013-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '>'
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '>'
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '>'
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '>'
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.7.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.7.5
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
@@ -76,6 +76,9 @@ files:
 - .gitignore
 - .travis.yml
 - Gemfile
+- Gemfile.rails.3.2
+- Gemfile.rails.4.0
+- LICENSE
 - README.md
 - Rakefile
 - bootsrap-form.gemspec
@@ -98,12 +101,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: bootstrap-form
-rubygems_version: 2.0.0.rc.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Twitter Bootstrap Form helpers