padrino_bootstrap_forms 0.0.1 → 0.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b34692a2c6f71d099f09129543f70dabf3a82b5d
+  data.tar.gz: 68dd540269edf65eba6482fd1488da974b51b3f7
+SHA512:
+  metadata.gz: cd868d61e6e50ecdd5020b37cf7baec0c1c8550b5adb417acbd4814232a9956b705c8f14b10c3a676f1d40a43f54eb3b5bc0bd261cf2f98d967b37b0fe0e1ef3
+  data.tar.gz: acd0d96e401dfda7d247f731c9351bd0d099f5fe5b73f256557fa51fcce13d78d338db0fe9ef702d3e3c8870240f5cc66a8e50fb4518322a556a36e47a12a4df

data/.travis.yml

@@ -2,4 +2,9 @@ language: ruby
 rvm:
   - 1.8.7
   - 1.9.2
-  - 1.9.3
+  - 1.9.3
+
+# Fragile tests :(
+matrix:
+  allow_failures:
+    - rvm: 1.8.7

data/Changes

@@ -0,0 +1,8 @@
+v0.0.2  2013-07-14
+--------------------
+Bug Fixes:
+* Fix conflict between Wrappers.error and Padrino's error helper (thanks Ivan Zhidkov)
+* Various failures when using Slim (thanks Ivan Zhidkov)
+* Various failures when using ERB (thanks Ken Erickson & Luke Antins)
+* :help_inline and :help_block now use <span> and not <p>
+* FormTagHelpers methods add an id attribute to the fields they create

data/README.markdown

@@ -18,6 +18,7 @@ Differences Between This & The Rails Version
   * `country_select` 
   * `time_zone_select`
   * `range_field`
+  * Various other additions made to `bootstrap_forms` after `v3`
 
 Bootstrap 2.0 Compliant!
 ------------------------
@@ -161,6 +162,11 @@ You can add as many options to any form helper tag. If they are interpreted by B
     <td>Styles the field as success (green)</td>
     <td>= f.text_field :name, :success => 'This checked out OK'</td>
   </tr>
+  <tr>
+    <th>info</th>
+    <td>Styles the field as info (blue)</td>
+    <td>= f.text_field :name, :info => 'Hey, it's OK'</td>
+  </tr>
   <tr>
     <th>warning</th>
     <td>Styles the field as warning (yellow)</td>

data/lib/bootstrap_forms/form_builder.rb

@@ -4,32 +4,38 @@ module BootstrapForms
 
     delegate :content_tag, :check_box_tag, :radio_button_tag, :link_to, :capture_html, :to => :template
 
-    %w(select email_field file_field number_field password_field search_field telephone_field text_area text_field url_field).each do |method_name|
+    def initialize(*args)
+      @field_options = {}
+      super(*args)
+    end
+
+    %w(select email_field file_field number_field password_field phone_field search_field telephone_field text_area text_field url_field).each do |method_name|
       define_method(method_name) do |name, *args|
         @name = name
         @field_options = args.extract_options!
 
         control_group_div do
-          label_field + input_div do
-            extras { super(name, objectify_options(@field_options)) }
+          label_field << input_div do
+            super(name, objectify_options(@field_options))
           end
         end
       end
     end
 
-    alias :phone_field :telephone_field
-
     def check_box(name, *args)
       @name = name
       @field_options = args.extract_options!
 
       control_group_div do
-        input_div do
+        input_div(false) do
           if @field_options[:label] == false || @field_options[:label] == ''
-            extras { super(name, objectify_options(@field_options)) }
+            super(name, objectify_options(@field_options)) << messages
           else
-            html = extras { super(name, objectify_options(@field_options)) + (@field_options[:label].blank? ? @name.to_s.humanize : @field_options[:label]) }
-            label(@name, :caption => html, :class => 'checkbox')
+            html = super(name, objectify_options(@field_options)) << (@field_options[:label].blank? ? @name.to_s.humanize : @field_options[:label])
+            html << messages
+            options = { :caption => html, :class => 'checkbox' }
+            options[:for] = @field_options[:id] if @field_options.include?(:id)
+            label(@name, options)
           end
         end
       end
@@ -39,19 +45,19 @@ module BootstrapForms
       @name = name
       @field_options = opts
 
+      buttons = values.map do |text, value|
+        # Padrino does not stringify false values
+        html = radio_button(name, objectify_options(@field_options).merge(:value => "#{value}"))
+        html << text
+
+        options = { :caption => html, :class => 'radio', :for => nil }
+        label("#{name}_#{value}", options)
+      end.join('')
+
       control_group_div do
-        label_field + input_div do
-          values.map do |text, value|
-            # Padrino does not stringify false values
-            options = objectify_options(@field_options).merge(:value => "#{value}")
-            if @field_options[:label] == '' || @field_options[:label] == false
-              extras { radio_button(name, options) + text }
-            else
-              html = extras { radio_button(name, options) + text }
-              label("#{name}_#{value}", :caption => html, :class => 'radio')
-            end
-          end.join('')
-        end
+        # Prevent "for" attribute for a non existant id
+        @field_options[:id] = nil
+        label_field << input_div { buttons }
       end
     end
 
@@ -59,68 +65,53 @@ module BootstrapForms
       @name = attribute
       @field_options = args.extract_options!
 
+      boxes = records.map do |record|
+        value = record.send(record_id)
+        element_id = "#{object_model_name}_#{attribute}_#{value}"
+
+        options = objectify_options(@field_options).merge(:value => value, :id => element_id)
+        options[:checked] = "checked" if [object.send(attribute)].flatten.include?(value)
+
+        checkbox = check_box_tag("#{object_model_name}[#{attribute}][]", options)
+        checkbox << record.send(record_name)
+        content_tag(:label, checkbox, :class => ['checkbox', ('inline' if @field_options[:inline])].compact.join(' '))
+      end.join('')
+
       control_group_div do
-        label_field + extras do
-          content_tag(:div, :class => 'controls') do
-            records.collect do |record|
-              value = record.send(record_id)
-              element_id = "#{object_model_name}_#{attribute}_#{value}"
-
-              options = objectify_options(@field_options).merge(:id => element_id, :value => value)
-              options[:checked] = "checked" if [object.send(attribute)].flatten.include?(value)
-
-              checkbox = check_box_tag("#{object_model_name}[#{attribute}][]", options)
-              content_tag(:label, :class => ['checkbox', ('inline' if @field_options[:inline])].compact.join(' ')) do
-                checkbox + content_tag(:span, record.send(record_name))
-              end
-            end.join('')
-          end
-        end
+        # Prevent "for" attribute for a non existant id
+        @field_options[:id] = nil
+        label_field << input_div { boxes }
       end
     end
 
     def collection_radio_buttons(attribute, records, record_id, record_name, *args)
       @name = attribute
       @field_options = args.extract_options!
-      @args = args
+
+      buttons = records.map do |record|
+        value = record.send(record_id)
+        element_id = "#{object_model_name}_#{attribute}_#{value}"
+        options = objectify_options(@field_options).merge(:value => value, :id => element_id)
+        radio = radio_button(attribute, options)
+        radio << record.send(record_name)
+        content_tag(:label, radio, :class => ['radio', ('inline' if @field_options[:inline])].compact.join(' '))
+      end.join('')
 
       control_group_div do
-        label_field + extras do
-          content_tag(:div, :class => 'controls') do
-            records.collect do |record|
-              value = record.send(record_id)
-              element_id = "#{object_model_name}_#{attribute}_#{value}"
-
-              options = objectify_options(@field_options).merge(:id => element_id, :value => value)
-              options[:checked] = "checked" if value == object.send(attribute)
-
-              radiobutton = radio_button_tag("#{object_model_name}[#{attribute}]", options)
-              content_tag(:label, :class => ['radio', ('inline' if @field_options[:inline])].compact.join(' ')) do
-                radiobutton + content_tag(:span, record.send(record_name))
-              end
-            end.join('')
-          end
-        end
+        # Prevent "for" attribute for a non existant id
+        @field_options[:id] = nil
+        label_field << input_div { buttons }
       end
     end
 
     def uneditable_input(name, *args)
       @name = name
       @field_options = args.extract_options!
-      @args = args
+      @field_options[:id] ||= field_id(@name)
+      @field_options[:label] ||= "#{field_human_name(@name)}: " # conform to Padrino's default
+      @field_options[:value] ||= object.send(@name.to_sym)
 
-      control_group_div do
-        label_field + input_div do
-          extras do
-            value = @field_options.delete(:value)
-            @field_options[:class] = [@field_options[:class], 'uneditable-input'].compact.join ' '
-
-            content_tag(:span, objectify_options(@field_options)) do
-              template.escape_html(value || object.send(@name.to_sym))
-            end
-          end
-        end
-      end
+      template.uneditable_input_tag(@name, @field_options)
     end
 
     def button(*args)
@@ -136,7 +127,8 @@ module BootstrapForms
     end
 
     def actions(&block)
-      template.bootstrap_actions(&block)
+      content = block_given? ? capture_html(&block) : [submit, cancel].join(' ')
+      content_tag(:div, content, :class => 'form-actions')
     end
   end
 end

data/lib/bootstrap_forms/helpers/form_helper.rb

@@ -1,13 +1,13 @@
 module BootstrapForms
   module Helpers
-    module FormHelper      
+    module FormHelper
       def bootstrap_form_for(record, path, options = {}, &block)
         options[:builder] = BootstrapForms::FormBuilder
         form_for(record, path, options) do |f|
           capture(f, &block)
         end
       end
-    
+
       def bootstrap_fields_for(record, instance_or_collection = nil, &block)
         fields_for(record, instance_or_collection, &block)
       end

data/lib/bootstrap_forms/helpers/form_tag_helper.rb

@@ -8,10 +8,12 @@ module BootstrapForms
         define_method("bootstrap_#{method_name}") do |name, *args|
           @name = name
           @field_options = args.extract_options!
+          # TODO: use whatever method Padrino's builder uses...
+          @field_options[:id] ||= name
 
           control_group_div do
             label_field + input_div do
-              extras { send(method_name.to_sym, name, objectify_options(@field_options)) }
+              send(method_name.to_sym, name, objectify_options(@field_options))
             end
           end
         end
@@ -24,16 +26,18 @@ module BootstrapForms
         @field_options = args.extract_options!
         @args = args
 
+        # Padrino will always generate a label's for attribute, this results in invalid HTML.
+        # label_field will use :id as the for attribute if present.
+        @field_options[:id] = nil unless @field_options[:id]
+
         control_group_div do
-          label_field + input_div do
-            extras do
-              value = @field_options.delete(:value)
-              @field_options[:class] = [@field_options[:class], 'uneditable-input'].compact.join ' '
+          label_field << input_div do
+            # Due to how Padrino implements ERB this block (and others) will be called many (4?) times.
+            # To avoid string accumulation under :class -and to keep option passing somewhat straightforward- we just dup()
+            options = @field_options.dup
+            options[:class] = [options[:class], 'uneditable-input'].compact.join " "
 
-              content_tag(:span, objectify_options(@field_options)) do
-                escape_html(value)
-              end
-            end
+            content_tag(:span,  escape_html(options[:value]), objectify_options(options.except(:value)))
           end
         end
       end
@@ -58,19 +62,21 @@ module BootstrapForms
       def bootstrap_cancel_tag(*args)
         options = args.extract_options!
         options[:class] ||= 'btn cancel'
-        options[:back]  ||= 'javascript:history.go(-1)'
+        options[:back] ||= 'javascript:history.go(-1)'
 
         name = args.shift || 'Cancel'
         link_to(name, options[:back], options.except(:back))
       end
 
       def bootstrap_actions(&block)
-        content_tag(:div, :class => 'form-actions') do
-          if block_given?
-            capture_html(&block)
-          else
-            [bootstrap_submit_tag, bootstrap_cancel_tag].join(' ')
-          end
+        # This somethat redundant arrangement is necessary (according to the test cases) to make this call work with  Slim, ERB, and HAML. 
+        # Though oddly enough this Slim block test still fails yet works in production. Not sure why this is but, nevertheless
+        # we keep this in place.
+        if block_given?
+          content_tag(:div, :class => 'form-actions', &block)
+        else
+          content = [bootstrap_submit_tag, bootstrap_cancel_tag].join(' ')
+          content_tag(:div, content, :class => 'form-actions')
         end
       end
     end

data/lib/bootstrap_forms/helpers/wrappers.rb

@@ -13,12 +13,13 @@ module BootstrapForms
         end
 
         klasses = ['control-group']
-        klasses << 'error' if @field_options[:error]
+        klasses << 'error'   if @field_options[:error]
+        klasses << 'info'    if @field_options[:info]
         klasses << 'success' if @field_options[:success]
         klasses << 'warning' if @field_options[:warning]
         klass = klasses.join(' ')
 
-        content_tag(:div, :class => klass, &block)
+        content_tag(:div, block[], :class => klass)
       end
 
       def error_string
@@ -26,24 +27,25 @@ module BootstrapForms
           errors = object.errors[@name]
           if errors.any?
             errors.map { |e|
-              "#{@options[:label] || @name.to_s.humanize} #{e}"
+              "#{@field_options[:label] || @name.to_s.humanize} #{e}"
             }.join(', ')
           end
         end
       end
 
-      def input_div(&block)
-        content_tag(:div, :class => 'controls') do
-          if @field_options[:append] || @field_options[:prepend]
-            klasses = []
-            klasses << 'input-prepend' if @field_options[:prepend]
-            klasses << 'input-append' if @field_options[:append]
-            klass = klasses.join(' ')
-            content_tag(:div, :class => klass, &block)
-          else
-            capture_html(&block) if block_given?
-          end
+      def input_div(include_messages = true, &block) 
+        if @field_options[:append] || @field_options[:prepend]
+          klasses = []
+          klasses << 'input-prepend' if @field_options[:prepend]
+          klasses << 'input-append' if @field_options[:append]
+          klass = klasses.join(' ')
+          content = content_tag(:div, addon { block[] }, :class => klass)
+        else
+          content = block[]
         end
+
+        content << messages if include_messages
+        content_tag(:div, content, :class => 'controls')
       end
 
       def label_field(&block)
@@ -51,40 +53,45 @@ module BootstrapForms
           return ''
         else
           options = { :class => 'control-label' }
+          # Allow for setting for to nil i.e., no for attribute. Padrino will always generate one
+          options[:for] = @field_options[:id] if @field_options.include?(:id)
           options[:caption] = @field_options[:label] if @field_options[:label]
 
           if respond_to?(:object)
             label(@name, options, &block)
-           else
+          else
             label_tag(@name, options, &block)
            end
         end
       end
 
-      %w(help_inline error success warning help_block append prepend).each do |method_name|
+      %w(help_block help_inline bootstrap_error success warning info append prepend).each do |method_name|
         define_method(method_name) do |*args|
+          # Hack to avoid clashing with Padrino's error method 
+          method_name = "error" if method_name == "bootstrap_error"
           return '' unless value = @field_options[method_name.to_sym]
           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)
+          content_tag(:span, value, :class => klass)
         end
       end
 
-      def extras(&block)
-        [prepend, (capture_html(&block) if block_given?), append, help_inline, error, success, warning, help_block].join('')
+      def messages
+        [help_inline, bootstrap_error, success, warning, info, help_block].join('')
+      end
+
+      def addon(&block)
+        [prepend, block[], append].join('')
       end
 
       def objectify_options(options)
-        options.except(:label, :help_inline, :error, :success, :warning, :help_block, :prepend, :append)
+        options.except(:label, :help_block, :help_inline, :error, :success, :warning, :info, :prepend, :append)
       end
     end
   end

data/padrino_bootstrap_forms.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name        = "padrino_bootstrap_forms"
-  s.version     = "0.0.1"
+  s.version     = "0.0.2"
   s.authors     = ["Seth Vargo", "Skye Shaw"]
-  s.email	= "sshaw@lucas.cis.temple.edu"
+  s.email	= "skye.shaw@gmail.com"
   s.homepage    = "https://github.com/sshaw/padrino_bootstrap_forms"
   s.summary     = "Padrino Bootstrap Forms makes Twitter's Bootstrap on Padrino easy!"
   s.description = <<-DESC
-	Padrino Bootstrap Forms is a port of Seth Vargo's Bootstrap Forms for Rails. 
+        Padrino Bootstrap Forms is a port of Seth Vargo's Bootstrap Forms for Rails.
         It makes Twitter's Bootstrap on Padrino easy to use by creating helpful form builders that minimize markup in your views.
   DESC
   s.files         = `git ls-files`.split("\n")
@@ -14,9 +14,11 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "padrino-helpers", "~> 0.10.6"
+  s.add_dependency "padrino", "~> 0.10.6"
   s.add_dependency "activesupport", "~> 3.0"
   s.add_development_dependency "rake"
+  s.add_development_dependency "slim", "~> 1.3.6"
+  s.add_development_dependency "haml", "~> 3.1"
   s.add_development_dependency "rack-test", "~> 0.6.1"
-  s.add_development_dependency "rspec", "~> 2.9.0"
+  s.add_development_dependency "rspec", "~> 2.9"
 end