twitter-bootstrap-form-builder 0.0.2 → 0.0.3

data/README.md

@@ -1,8 +1,12 @@
 # TwitterBootstrapFormBuilder
 
-A gem for building **horzontal** (vertial/search/inline coming soon) Twitter Bootstrap forms, automagically handling the
+A gem for building **horizontal** (vertial/search/inline coming soon) Twitter Bootstrap forms, automagically handling the
 control-group markup, field labels and inline-error messages.
 
+## Changes
+
+This fork displays error messages with .to_sentence instead of .join(',')
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -45,7 +49,7 @@ end
 
 ## Usage
 
-Twitter Bootstrap FormBuilder is designed to output all the markup required to build **horzontal** forms,
+Twitter Bootstrap FormBuilder is designed to output all the markup required to build **horizontal** forms,
 with minimal typing.
 
 After installing the Gem, you can use the special `form_for` helper by mixing `TwitterBootstrapFormBuilder::Helper`
@@ -95,6 +99,34 @@ the regular `FormBuilder#text_field`, use `:label => false`:
 <%= f.text_field :email, :label => false %> # <input type="text" id="post_email" />
 ```
 
+Checkboxes are a special case. They can contain two labels in a horizontal form, on to the left and
+one to the right.
+
+The left label uses the `:label` option and works as expected.
+
+The right label is controled by the `:about` option.
+
+Example:
+
+```erb
+<%= f.check_box :hide_email, :about => "Do not display my email in my post" %>
+```
+
+Produces the following HTML:
+
+```html
+<div class="control-group hide_email">
+	<label class="control-label" for="post_hide_email">Hide email</label>
+	<div class="controls">
+		<label class="checkbox" for="post_hide_email">
+			<input name="post[hide_email]" type="hidden" value="0" />
+			<input id="post_hide_email" name="post[hide_email]" type="checkbox" value="1" />
+			Do not display my email in my post
+		</label>
+	</div>
+</div>
+```
+
 ### Errors and validation
 
 The TwitterBootstrapFormBuilder relies on the dynamic_form gem to output inline error messages.

data/lib/twitter-bootstrap-form-builder/form_builder.rb

@@ -1,4 +1,3 @@
-
 require 'dynamic_form'
 
 module MNE
@@ -15,33 +14,32 @@ module MNE
         opts[:class] << "control-group"
         opts[:class] << field if field
 
-        opts[:class] << "error" if @object.errors.messages.has_key? field
+        opts[:class] << "error" if @object.errors.messages.has_key?(field) && @object.errors.messages[field].any?
 
         @template.content_tag(:div, opts) do
           @template.capture &block
         end
       end
 
-      %w(text_field phone_field password_field email_field number_field file_field text_area select check_box).each do |method_name|
+      %w(text_field phone_field password_field email_field number_field file_field text_area select).each do |method_name|
         define_method method_name.to_sym do |field, *args|
 
-          # extract the options for the label tag
-          opts = args.find { |a| a.is_a?(Hash) && a.has_key?(:label) }
-          label_opts = opts ? opts[:label] : []
-                 
+          # find the options hash, and extract the options for the label tag
+          opts       = extract_options(args)
+          label_opts = extract_sub_options(opts, :label)
+
           # If label is false, we're rendering the field without modification
           return super(field, *args) if label_opts === false
-          
+
+          # Add the TB class to the label
+          label_opts << { :class => "control-label" }
+
           # create a help-block if present
-          help_opts = args.find { |a| a.is_a?(Hash) && a.has_key?(:help_block) }
-          help_block = help_opts && help_opts[:help_block] ? @template.content_tag(:p, help_opts[:help_block], :class => "help-block") : ""
-                 
+          help_block = opts[:help_block] ? @template.content_tag(:p, opts[:help_block], :class => "help-block") : ""
+
           # propogate properties of control group up
-          h = args.find { |a| a.is_a?(Hash) && a.has_key?(:control_group) }
-          control_group_opts = (h && h[:control_group]) || {}
-          control_group_opts[:class] =  control_group_opts[:class] ?  control_group_opts[:class] + " #{method_name}" : "#{method_name}"
-          
-          label_opts = Array[label_opts] << { :class => "control-label" }
+          control_group_opts = opts[:control_group] || {}
+          control_group_opts[:class] = control_group_opts[:class] ? control_group_opts[:class] + " #{method_name}" : "#{method_name}"
 
           control_group(field, control_group_opts) do
             label(field, *label_opts) + @template.content_tag(:div, :class => "controls") do
@@ -49,12 +47,56 @@ module MNE
             end
           end.html_safe
         end
+      end
+
+
+      # Special handling for check boxes, which can have two labels
+      def check_box(field, options = {}, checked_value = "1", unchecked_value = "0")
+        label_opts = extract_sub_options(options, :label)
+        about_opts = extract_sub_options(options, :about)
+
+        return super if label_opts == false
+
+        #raise [object.errors.messages, errors_for(field)].inspect
+        # Add the TB class to the thelabel
+        label_opts << { :class => "control-label" } unless label_opts.nil?
+        about_opts << { :class => "checkbox" } if about_opts.any?
+
+        control_group_opts = options[:control_group] || {}
+
+        label_tag = (label_opts ? label(field, *label_opts) : "").html_safe
+        check_box = super(field, options, checked_value, unchecked_value).html_safe
+
+        control_group(field, control_group_opts) do
+          label_tag + @template.content_tag(:div, :class => "controls") do
+            check_box = label(field, *about_opts) { check_box + about_opts[0] } if about_opts
+            check_box + errors_for(field)
+          end
+        end.html_safe
+      end
+
+      protected
+
+      def extract_options(args)
+        args.find { |a| a.is_a?(Hash) && a.has_key?(:label) } || {}
+      end
+
+      def extract_sub_options(opts, key = :label)
+        sub_opts = opts.keys.include?(key) ? opts[key] : []
+        opts.delete(key)
+        return false if sub_opts === false
+        return nil   if sub_opts.nil?
+        Array(sub_opts)
+      end
 
+      def label_opts(opts, key = :label)
+        label_opts = extract_sub_options(opts, key)
+        label_opts << { :class => "control-label" }
       end
 
       def errors_for(field)
-        @template.content_tag(:span, "#{object.class.human_attribute_name(field)} #{object.errors.messages[field].join(",")}",
-                              :class => "help-inline") if object.errors.messages[field].any?
+        @template.content_tag(:span, "#{object.class.human_attribute_name(field)} #{object.errors.messages[field].to_sentence}",
+                              :class => "help-inline") if object.errors.messages.has_key?(field) && object.errors.messages[field].any?
       end
 
     end

data/lib/twitter-bootstrap-form-builder/version.rb

@@ -1,5 +1,5 @@
 module MNE
   module TwitterBootstrapFormBuilder
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Matthew Eagar
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-30 00:00:00 -04:00
+date: 2012-08-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency