bootstrap_forms 1.0.0 → 1.0.1

data/README.markdown

@@ -33,7 +33,7 @@ Why?
 With Bootstrap, you would need the following code for a form:
 
 ```haml
-/ using haml
+/ using HAML
 = form_for @model do |f|
   .clearfix
     %label MyLabel
@@ -156,6 +156,13 @@ You can add as many options to any form helper tag. If they are interpreted by B
   </tr>
 </table>
 
+Contributing
+------------
+I'm pretty dam active on github. Fork and submit a pull request. Most of my pull requests are merged the same day. Make sure you:
+
+ - Squash into a single commit (unless it makes sense to have multiple commits)
+ - Document your changes
+
 License
 -------
 Copyright (c) 2012 Seth Vargo

data/bootstrap_forms.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "bootstrap_forms"
-  s.version     = "1.0.0"
+  s.version     = "1.0.1"
   s.author      = "Seth Vargo"
   s.email       = "sethvargo@gmail.com"
   s.homepage    = "https://github.com/sethvargo/bootstrap_forms"

data/lib/bootstrap_forms/form_builder.rb

@@ -23,7 +23,7 @@ module BootstrapForms
       fields_for(record_name, record_object, options, &block)
     end
 
-    %w(collection_select select check_box email_field file_field number_field password_field phone_field radio_button range_field search_field telephone_field text_area text_field url_field).each do |method_name|
+    %w(collection_select select email_field file_field number_field password_field phone_field radio_button range_field search_field telephone_field text_area text_field url_field).each do |method_name|
       define_method(method_name) do |name, *args|
         @name = name
         @options = args.extract_options!
@@ -37,6 +37,20 @@ module BootstrapForms
       end
     end
 
+    def check_box(name, *args)
+      @name = name
+      @options = args.extract_options!
+      @args = args
+
+      clearfix_div do
+        input_div do
+          label(@name, :class => [ 'checkbox', required_class ].compact.join(' ')) do
+            extras { super(name, *(@args << @options)) + object.class.human_attribute_name(name) }
+          end
+        end
+      end
+    end
+
     def collection_check_boxes(attribute, records, record_id, record_name, *args)
       @name = attribute
       @options = args.extract_options!
@@ -141,17 +155,32 @@ module BootstrapForms
     end
 
     def label_field(&block)
-      required = object.class.validators_on(@name).any? { |v| v.kind_of? ActiveModel::Validations::PresenceValidator }
-      label(@name, block_given? ? block : @options[:label], :class => 'control-label' + (' required' if required))
+      label(@name, block_given? ? block : @options[:label], :class => [ 'control-label', required_class ].compact.join(' '))
+    end
+
+    def required_class
+      if object.class.validators_on(@name).any? { |v| v.kind_of? ActiveModel::Validations::PresenceValidator }
+        'required'
+      else
+        nil
+      end
     end
 
     %w(help_inline error success warning help_block append prepend).each do |method_name|
       define_method(method_name) do |*args|
         return '' unless value = @options[method_name.to_sym]
-        klass = 'help-inline'
-        klass = 'help-block' if method_name == 'help_block'
-        klass = 'add-on' if method_name == 'append' || method_name == 'prepend'
-        content_tag(:span, value, :class => klass)
+        case method_name
+        when 'help_block'
+          element = :p
+          klass = 'help-block'
+        when 'append', 'prepend'
+          element = :span
+          klass = 'add-on'
+        else
+          element = :span
+          klass = 'help-inline'
+        end
+        content_tag(element, value, :class => klass)
       end
     end
 
@@ -163,4 +192,4 @@ module BootstrapForms
       super.except(:label, :help_inline, :error, :success, :warning, :help_block, :prepend, :append)
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap_forms
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-02 00:00:00.000000000 Z
+date: 2012-02-07 00:00:00.000000000 Z
 dependencies: []
 description: Bootstrap Forms makes Twitter's Bootstrap on Rails easy to use by creating
   helpful form builders that minimize markup in your views.