twitter_bootstrap_form_for 1.0.2 → 1.0.3

data/CHANGELOG.markdown

@@ -1,14 +1,20 @@
 Twitter Bootstrap Form For Changes
 ==================================
 
+## 1.0.3 (2011-11-11) ##
+  - ruby 1.8 compatibility for hidden fields (closes [\#20])
+  - produce correct labels for radio buttons (closes [\#16])
+  - add support for HTML options to #inputs (closes [\#18])
+  - explicitly license as MIT (closes [\#17])
+
 ## 1.0.2 (2011-10-31) ##
   - dependencies reduced to just `railties` and `actionpack`
-  - 1.8.7 compatibility fixes
-  - added compatibility with non-ActiveModel objects
+  - 1.8.7 compatibility fixes (closes [\#14])
+  - added compatibility with non-ActiveModel objects (closes [\#7])
   - demonstrated use of radio buttons in the README
 
 ## 1.0.1 (2011-10-06) ##
-  - hidden_field tags are no longer accidentally marked-up (issue #5)
+  - hidden_field tags are no longer accidentally marked-up (closes [\#5])
 
 ## 1.0.0 (2011-10-04) ##
   - added a changelog
@@ -17,8 +23,17 @@ Twitter Bootstrap Form For Changes
 ## 1.0.0.rc2 (2011-10-04) ##
   - removed dependency on Haml
   - checkbox text is now part of the label
-  - prevent `field_with_errors` divs from wrapping inputs and labels (issue
-      #1)
+  - prevent `field_with_errors` divs from wrapping inputs and labels (closes
+    [\#1])
 
 ## 1.0.0.rc1 (2011-09-30) ##
   - initial public release
+
+[\#20]: https://github.com/stouset/twitter_bootstrap_form_for/issues/20
+[\#18]: https://github.com/stouset/twitter_bootstrap_form_for/issues/18
+[\#17]: https://github.com/stouset/twitter_bootstrap_form_for/issues/17
+[\#16]: https://github.com/stouset/twitter_bootstrap_form_for/issues/16
+[\#14]: https://github.com/stouset/twitter_bootstrap_form_for/issues/14
+[\#7]:  https://github.com/stouset/twitter_bootstrap_form_for/issues/7
+[\#5]:  https://github.com/stouset/twitter_bootstrap_form_for/issues/5
+[\#1]:  https://github.com/stouset/twitter_bootstrap_form_for/issues/1

data/LICENSE.markdown

@@ -0,0 +1,22 @@
+The MIT License
+===============
+
+Copyright (C) 2011 by Stephen Touset
+
+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.markdown

@@ -21,7 +21,7 @@ Just Rails. But you were going to use that anyway, weren't you?
 = twitter_bootstrap_form_for @user do |user|
 
   / wraps a section in a fieldset with the provided legend text
-  = user.inputs 'Sign up' do
+  = user.inputs 'Sign up', :class => 'sign_up' do
 
     / generates a standard email field
     = user.email_field :email, :placeholder => 'me@example.com'

data/lib/twitter_bootstrap_form_for/form_builder.rb

@@ -2,8 +2,6 @@ require 'twitter_bootstrap_form_for'
 require 'action_view/helpers'
 
 class TwitterBootstrapFormFor::FormBuilder < ActionView::Helpers::FormBuilder
-  # TODO: support inline inputs
-
   include TwitterBootstrapFormFor::FormHelpers
 
   attr_reader :template
@@ -14,7 +12,7 @@ class TwitterBootstrapFormFor::FormBuilder < ActionView::Helpers::FormBuilder
     :select,
     *ActionView::Helpers::FormBuilder.instance_methods.grep(%r{
       _(area|field|select)$ # all area, field, and select methods
-    }mx)
+    }mx).map(&:to_sym)
   ]
 
   INPUTS.delete(:hidden_field)
@@ -28,12 +26,12 @@ class TwitterBootstrapFormFor::FormBuilder < ActionView::Helpers::FormBuilder
   # Wraps the contents of the block passed in a fieldset with optional
   # +legend+ text.
   #
-  def inputs(legend = nil, &block)
+  def inputs(legend = nil, options = {}, &block)
     # stash the old field_error_proc, then override it temporarily
     original_field_error_proc = template.field_error_proc
     template.field_error_proc = lambda {|html_tag, instance| html_tag }
 
-    template.content_tag(:fieldset) do
+    template.content_tag(:fieldset, options) do
       template.concat template.content_tag(:legend, legend) unless legend.nil?
       block.call
     end
@@ -92,11 +90,12 @@ class TwitterBootstrapFormFor::FormBuilder < ActionView::Helpers::FormBuilder
 
   TOGGLES.each do |toggle|
     define_method toggle do |attribute, *args, &block|
-      label   = args.first.nil? ? '' : args.shift
-      target  = self.object_name.to_s + '_' + attribute.to_s
+      label       = args.first.nil? ? '' : args.shift
+      target      = self.object_name.to_s + '_' + attribute.to_s
+      label_attrs = toggle == :check_box ? { :for => target } : {}
 
       template.content_tag(:li) do
-        template.concat template.content_tag(:label, :for => target) {
+        template.concat template.content_tag(:label, label_attrs) {
           template.concat super(attribute, *args)
           template.concat ' ' # give the input and span some room
           template.concat template.content_tag(:span, label)
@@ -105,6 +104,8 @@ class TwitterBootstrapFormFor::FormBuilder < ActionView::Helpers::FormBuilder
     end
   end
 
+  protected
+
   #
   # Wraps the contents of +block+ inside a +tag+ with an appropriate class and
   # id for the object's +attribute+. HTML options can be overridden by passing
@@ -154,8 +155,8 @@ class TwitterBootstrapFormFor::FormBuilder < ActionView::Helpers::FormBuilder
   # This merges any +classes+ passed in.
   #
   def _wrapper_classes(attribute, *classes)
-    classes.tap do |classes|
-      classes.push 'error' if self.errors_on?(attribute)
+    classes.tap do |klasses|
+      klasses.push 'error' if self.errors_on?(attribute)
     end.join(' ')
   end
 

data/lib/twitter_bootstrap_form_for/version.rb

@@ -1,3 +1,3 @@
 module TwitterBootstrapFormFor
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

metadata

@@ -1,62 +1,47 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: twitter_bootstrap_form_for
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 1.0.3
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 2
-  version: 1.0.2
 platform: ruby
-authors: 
+authors:
 - Stephen Touset
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-31 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: railties
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70157112743780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        version: "3"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: actionpack
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70157112743780
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: &70157112743200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        version: "3"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *70157112743200
 description: A custom Rails FormBuilder that assumes the use of Twitter Bootstrap
-email: 
+email:
 - stephen@touset.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - CHANGELOG.markdown
+- LICENSE.markdown
 - README.markdown
 - examples/screenshot.png
 - lib/twitter_bootstrap_form_for.rb
@@ -65,39 +50,28 @@ files:
 - lib/twitter_bootstrap_form_for/railtie.rb
 - lib/twitter_bootstrap_form_for/version.rb
 - twitter_bootstrap_form_for.gemspec
-has_rdoc: true
 homepage: http://github.com/stouset/twitter_bootstrap_form_for
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Rails form builder optimized for Twitter Bootstrap
 test_files: []
-