bootstrap_forms 2.0.3 → 2.0.4

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     = "2.0.3"
+  s.version     = "2.0.4"
   s.author      = "Seth Vargo"
   s.email       = "sethvargo@gmail.com"
   s.homepage    = "https://github.com/sethvargo/bootstrap_forms"

data/lib/bootstrap_forms/form_builder.rb

@@ -22,7 +22,7 @@ module BootstrapForms
     %w(collection_select select country_select time_zone_select email_field file_field number_field password_field phone_field range_field search_field telephone_field text_area text_field url_field datetime_select date_select time_select).each do |method_name|
       define_method(method_name) do |name, *args|
         @name = name
-        @field_options = args.extract_options!
+        @field_options = field_options(args)
         @args = args
 
         control_group_div do
@@ -35,7 +35,7 @@ module BootstrapForms
 
     def check_box(name, *args)
       @name = name
-      @field_options = args.extract_options!
+      @field_options = field_options(args)
       @args = args
 
       control_group_div do
@@ -54,10 +54,10 @@ module BootstrapForms
 
     def radio_buttons(name, values = {}, opts = {})
       @name = name
-      @field_options = opts.merge(required_attribute)
+      @field_options = @options.slice(:namespace, :index).merge(opts.merge(required_attribute))
       control_group_div do
         label_field + input_div do
-          values.map do |text, value|            
+          values.map do |text, value|
             if @field_options[:label] == '' || @field_options[:label] == false
               extras { radio_button(name, value, @field_options) + text }
             else
@@ -72,7 +72,7 @@ module BootstrapForms
 
     def collection_check_boxes(attribute, records, record_id, record_name, *args)
       @name = attribute
-      @field_options = args.extract_options!
+      @field_options = field_options(args)
       @args = args
 
       control_group_div do
@@ -94,7 +94,7 @@ module BootstrapForms
 
     def collection_radio_buttons(attribute, records, record_id, record_name, *args)
       @name = attribute
-      @field_options = args.extract_options!
+      @field_options = field_options(args)
       @args = args
 
       control_group_div do
@@ -116,7 +116,7 @@ module BootstrapForms
 
     def uneditable_input(name, *args)
       @name = name
-      @field_options = args.extract_options!
+      @field_options = field_options(args)
       @args = args
 
       control_group_div do
@@ -125,7 +125,7 @@ module BootstrapForms
             value = @field_options.delete(:value)
             @field_options[:class] = [@field_options[:class], 'uneditable-input'].compact
 
-            content_tag(:span, @field_options) do 
+            content_tag(:span, @field_options) do
               value || object.send(@name.to_sym) rescue nil
             end
           end
@@ -135,7 +135,7 @@ module BootstrapForms
 
     def button(name = nil, *args)
       @name = name
-      @field_options = args.extract_options!
+      @field_options = field_options(args)
       @args = args
 
       @field_options[:class] ||= 'btn btn-primary'
@@ -144,7 +144,7 @@ module BootstrapForms
 
     def submit(name = nil, *args)
       @name = name
-      @field_options = args.extract_options!
+      @field_options = field_options(args)
       @args = args
 
       @field_options[:class] ||= 'btn btn-primary'
@@ -152,7 +152,7 @@ module BootstrapForms
     end
 
     def cancel(*args)
-      @field_options = args.extract_options!
+      @field_options = field_options(args)
       @field_options[:class] ||= 'btn cancel'
       link_to(I18n.t('bootstrap_forms.buttons.cancel'), (@field_options[:back] || :back), :class => @field_options[:class])
     end
@@ -166,5 +166,14 @@ module BootstrapForms
         end
       end
     end
+
+    private
+    def field_options(args)
+      if @options
+        @options.slice(:namespace, :index).merge(args.extract_options!)
+      else
+        args.extract_options!
+      end
+    end
   end
 end

data/lib/bootstrap_forms/helpers/form_helper.rb

@@ -2,7 +2,8 @@ module BootstrapForms
   module Helpers
     module FormHelper
       def bootstrap_form_for(record, options = {}, &block)
-        options[:builder] = options[:builder] || BootstrapForms.default_form_builder
+        options[:builder] ||= BootstrapForms.default_form_builder
+
         form_for(record, options) do |f|
           if f.object.respond_to?(:errors)
             f.error_messages.html_safe + capture(f, &block).html_safe
@@ -13,7 +14,8 @@ module BootstrapForms
       end
 
       def bootstrap_fields_for(record, options = {}, &block)
-        options[:builder] = options[:builder] || BootstrapForms.default_form_builder
+        options[:builder] ||= BootstrapForms.default_form_builder
+
         fields_for(record, nil, options, &block)
       end
     end

data/lib/bootstrap_forms/helpers/form_tag_helper.rb

@@ -2,16 +2,16 @@ module BootstrapForms
   module Helpers
     module FormTagHelper
       include BootstrapForms::Helpers::Wrappers
-      
+
       def bootstrap_form_tag(url_for_options = {}, options = {}, &block)
         form_tag(url_for_options, options, &block)
       end
-      
+
       %w(check_box_tag email_field_tag file_field_tag image_submit_tag number_field_tag password_field_tag phone_field_tag radio_button_tag range_field_tag search_field_tag select_tag telephone_field_tag text_area_tag text_field_tag url_field_tag).each do |method_name|
         # prefix each method with bootstrap_*
         define_method("bootstrap_#{method_name}") do |name, *args|
           @name = name
-          @field_options = args.extract_options!
+          @field_options = field_options(args)
           @args = args
 
           control_group_div do
@@ -21,17 +21,17 @@ module BootstrapForms
           end
         end
       end
-      
+
       def uneditable_input_tag(name, *args)
         @name = name
-        @field_options = args.extract_options!
+        @field_options = field_options(args)
         @args = args
 
         control_group_div do
           label_field + input_div do
             extras do
               content_tag(:span, :class => 'uneditable-input') do
-                @field_options[:value] 
+                @field_options[:value]
               end
             end
           end
@@ -40,7 +40,7 @@ module BootstrapForms
 
       def bootstrap_button_tag(name = nil, *args)
         @name = name
-        @field_options = args.extract_options!
+        @field_options = field_options(args)
         @args = args
 
         @field_options[:class] = 'btn btn-primary'
@@ -49,7 +49,7 @@ module BootstrapForms
 
       def bootstrap_submit_tag(name = nil, *args)
         @name = name
-        @field_options = args.extract_options!
+        @field_options = field_options(args)
         @args = args
 
         @field_options[:class] = 'btn btn-primary'
@@ -57,7 +57,7 @@ module BootstrapForms
       end
 
       def bootstrap_cancel_tag(*args)
-        @field_options = args.extract_options!
+        @field_options = field_options(args)
         link_to(I18n.t('bootstrap_forms.buttons.cancel'), (@field_options[:back] || :back), :class => 'btn cancel')
       end
 
@@ -66,10 +66,19 @@ module BootstrapForms
           if block_given?
             yield
           else
-            [bootstrap_submit_tag, bootstrap_cancel_tag].join(' ').html_safe
+            [ bootstrap_submit_tag, bootstrap_cancel_tag ].join(' ').html_safe
           end
         end
       end
+
+      private
+      def field_options(args)
+        if @options
+          @options.slice(:namespace, :index).merge(args.extract_options!)
+        else
+          args.extract_options!
+        end
+      end
     end
   end
 end

data/spec/lib/bootstrap_forms/form_builder_spec.rb

@@ -1,81 +1,99 @@
 require 'spec_helper'
 
-describe "BootstrapForms::FormBuilder" do
-  context "given a setup builder" do
+describe 'BootstrapForms::FormBuilder' do
+  context 'given a setup builder' do
     before(:each) do
       @project = Project.new
       @template = ActionView::Base.new
-      @template.output_buffer = ""
+      @template.output_buffer =''
       @builder = BootstrapForms::FormBuilder.new(:item, @project, @template, {}, proc {})
     end
 
-    it_behaves_like 'a bootstrap form'
+    context 'with no options' do
+      it_behaves_like 'a bootstrap form'
+    end
 
-    describe "with no options" do
-      describe "error_messages" do
-        it "returns empty string without errors" do
-          @builder.error_messages.should == ""
-        end
+    context 'with the :namespace option' do
+      before(:each) do
+        @builder.options[:namespace] = 'foo'
+      end
 
-        context "with errors" do
-          before(:each) do
-            @project.errors.add("name")
-            @result = @builder.error_messages
-          end
+      it 'prefixs HTML ids correctly' do
+        @builder.text_field('name').should match /<(input) .*id="foo_item_name"/
+      end
+    end
 
-          it "is wrapped in error div" do
-            @result.should match /^<div class="alert alert-block alert-error validation-errors">.*<\/div>$/
-          end
+    context 'with the :index option' do
+      before(:each) do
+        @builder.options[:index] = 69
+      end
 
-          it "has a list with errors" do
-            @result.should match /<ul><li>Name is invalid<\/li><\/ul>/
-          end
+      it 'uses the correct :index' do
+        @builder.text_field('name').should match /<input .*id="item_69_name"/
+      end
 
-          it "has error title" do
-            @result.should match /<h4 class="alert-heading">#{I18n.t('bootstrap_forms.errors.header', :model => Project.model_name.human)}<\/h4>/
-          end
+      it 'does not add extraneous input data' do
+        @builder.text_field('name').should_not match /<input .*index/
+      end
+    end
 
-          it "has error message on field" do
-            @builder.text_field("name").should == "<div class=\"control-group error\"><label class=\"control-label\" for=\"item_name\">Name</label><div class=\"controls\"><input id=\"item_name\" name=\"item[name]\" size=\"30\" type=\"text\" /><span class=\"help-inline\">Name is invalid</span></div></div>"
-          end
+    context 'with the :namespace and :index options' do
+      before(:each) do
+        @builder.options[:namespace] = 'foo'
+        @builder.options[:index] = 69
+      end
 
-          it "joins passed error message and validation errors with ', '" do
-            @builder.text_field("name", :error => 'This is an error!').should == "<div class=\"control-group error\"><label class=\"control-label\" for=\"item_name\">Name</label><div class=\"controls\"><input id=\"item_name\" name=\"item[name]\" size=\"30\" type=\"text\" /><span class=\"help-inline\">This is an error!, Name is invalid</span></div></div>"
-          end
-        end
+      it 'uses the correct :index' do
+        @builder.text_field('name').should match /<input .*id="foo_item_69_name"/
       end
     end
 
-    context "with errors" do
+    context 'with :html options' do
       before(:each) do
-        @project.errors.add("name")
+        @builder.options[:html] = { :class => 'foo' }
+      end
+
+      it 'does not add the class to the elements' do
+        @builder.text_field('name').should_not match /<input .*class="foo"/
+      end
+    end
+
+    context 'without errors' do
+      it 'returns empty string' do
+        @builder.error_messages.should be_empty
+      end
+    end
+
+    context 'errors' do
+      before(:each) do
+        @project.errors.add('name')
         @result = @builder.error_messages
       end
 
-      it "is wrapped in error div" do
+      it 'are wrapped in error div' do
         @result.should match /^<div class="alert alert-block alert-error validation-errors">.*<\/div>$/
       end
 
-      it "has a list with errors" do
+      it 'have a list with errors' do
         @result.should match /<ul><li>Name is invalid<\/li><\/ul>/
       end
 
-      it "has error title" do
+      it 'have error title' do
         @result.should match /<h4 class="alert-heading">#{I18n.t('bootstrap_forms.errors.header', :model => Project.model_name.human)}<\/h4>/
       end
 
-      it "has error message on field" do
-        @builder.text_field("name").should == "<div class=\"control-group error\"><label class=\"control-label\" for=\"item_name\">Name</label><div class=\"controls\"><input id=\"item_name\" name=\"item[name]\" size=\"30\" type=\"text\" /><span class=\"help-inline\">Name is invalid</span></div></div>"
+      it 'have error message on field' do
+        @builder.text_field('name').should == "<div class=\"control-group error\"><label class=\"control-label\" for=\"item_name\">Name</label><div class=\"controls\"><input id=\"item_name\" name=\"item[name]\" size=\"30\" type=\"text\" /><span class=\"help-inline\">Name is invalid</span></div></div>"
       end
 
       it "joins passed error message and validation errors with ', '" do
-        @builder.text_field("name", :error => 'This is an error!').should == "<div class=\"control-group error\"><label class=\"control-label\" for=\"item_name\">Name</label><div class=\"controls\"><input id=\"item_name\" name=\"item[name]\" size=\"30\" type=\"text\" /><span class=\"help-inline\">This is an error!, Name is invalid</span></div></div>"
+        @builder.text_field('name', :error => 'This is an error!').should == "<div class=\"control-group error\"><label class=\"control-label\" for=\"item_name\">Name</label><div class=\"controls\"><input id=\"item_name\" name=\"item[name]\" size=\"30\" type=\"text\" /><span class=\"help-inline\">This is an error!, Name is invalid</span></div></div>"
       end
     end
 
-    context "an attribute with a PresenceValidator" do
-      it "adds the required attribute" do 
-        @builder.text_field("owner").should match /<input .*required="required"/
+    context 'an attribute with a PresenceValidator' do
+      it 'adds the required attribute' do
+        @builder.text_field('owner').should match /<input .*required="required"/
       end
     end
 
@@ -92,10 +110,10 @@ describe "BootstrapForms::FormBuilder" do
     end
   end
 
-  context "given a setup builder with a symbol" do
+  context 'setup builder with a symbol' do
     before(:each) do
       @template = ActionView::Base.new
-      @template.output_buffer = ""
+      @template.output_buffer = ''
       @builder = BootstrapForms::FormBuilder.new(:item, nil, @template, {}, proc {})
     end
 
@@ -112,6 +130,7 @@ describe 'BootstrapForms::Helpers::FormTagHelper' do
         @template.output_buffer = ""
         @builder = BootstrapForms::FormBuilder.new(:item, @non_active_record_object, @template, {}, proc {})
       end
+
       it 'returns an empty string with no errors' do
         @template.bootstrap_text_field_tag(@builder.object[:name]).should match /<div class="control-group">.*/
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap_forms
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-12 00:00:00.000000000 Z
+date: 2012-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
@@ -195,7 +195,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2577927973588577500
+      hash: -722096709655512624
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -204,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2577927973588577500
+      hash: -722096709655512624
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24