bootstrap_forms 2.0.2 → 2.0.3

data/.gitignore

@@ -5,4 +5,5 @@ pkg/*
 .DS_Store
 .rspec
 .rvmrc
+.project
 spec/dummy/log

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

data/lib/bootstrap_forms.rb

@@ -6,4 +6,6 @@ module BootstrapForms
 
   autoload :FormBuilder
   autoload :Helpers
+  mattr_accessor(:default_form_builder)
+  self.default_form_builder = BootstrapForms::FormBuilder
 end

data/lib/bootstrap_forms/form_builder.rb

@@ -19,7 +19,7 @@ module BootstrapForms
       end
     end
 
-    %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).each do |method_name|
+    %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!
@@ -27,7 +27,7 @@ module BootstrapForms
 
         control_group_div do
           label_field + input_div do
-            extras { super(name, *(@args << @field_options)) }
+            extras { super(name, *(@args << @field_options.merge(required_attribute))) }
           end
         end
       end
@@ -40,10 +40,11 @@ module BootstrapForms
 
       control_group_div do
         input_div do
+          @field_options.merge!(required_attribute)
           if @field_options[:label] == false || @field_options[:label] == ''
             extras { super(name, *(@args << @field_options)) }
           else
-            label(@name, :class => [ 'checkbox', required_class ].compact.join(' ')) do
+            label(@name, :class => 'checkbox') do
               extras { super(name, *(@args << @field_options)) + (@field_options[:label].blank? ? human_attribute_name : @field_options[:label])}
             end
           end
@@ -53,14 +54,14 @@ module BootstrapForms
 
     def radio_buttons(name, values = {}, opts = {})
       @name = name
-      @field_options = opts
+      @field_options = 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
-              label("#{@name}_#{value}", :class => [ 'radio', required_class ].compact.join(' ')) do
+              label("#{@name}_#{value}", :class => 'radio') do
                 extras { radio_button(name, value, @field_options) + text }
               end
             end
@@ -77,11 +78,12 @@ module BootstrapForms
       control_group_div do
         label_field + extras do
           content_tag(:div, :class => 'controls') do
+            options = @field_options.merge(required_attribute)
             records.collect do |record|
-              element_id = "#{object_name}_#{attribute}_#{record.send(record_id)}"
-              checkbox = check_box_tag("#{object_name}[#{attribute}][]", record.send(record_id), [object.send(attribute)].flatten.include?(record.send(record_id)), @field_options.merge({:id => element_id}))
+              options[:id] = "#{object_name}_#{attribute}_#{record.send(record_id)}"
+              checkbox = check_box_tag("#{object_name}[#{attribute}][]", record.send(record_id), [object.send(attribute)].flatten.include?(record.send(record_id)), options)
 
-              content_tag(:label, :class => ['checkbox', ('inline' if @field_options[:inline])].compact.join(' ')) do
+              content_tag(:label, :class => ['checkbox', ('inline' if @field_options[:inline])].compact) do
                 checkbox + content_tag(:span, record.send(record_name))
               end
             end.join('').html_safe
@@ -98,11 +100,12 @@ module BootstrapForms
       control_group_div do
         label_field + extras do
           content_tag(:div, :class => 'controls') do
+            options = @field_options.merge(required_attribute)
             records.collect do |record|
-              element_id = "#{object_name}_#{attribute}_#{record.send(record_id)}"
-              radiobutton = radio_button_tag("#{object_name}[#{attribute}]", record.send(record_id), object.send(attribute) == record.send(record_id), @field_options.merge({:id => element_id}))
+              options[:id] = "#{object_name}_#{attribute}_#{record.send(record_id)}"
+              radiobutton = radio_button_tag("#{object_name}[#{attribute}]", record.send(record_id), object.send(attribute) == record.send(record_id), options)
 
-              content_tag(:label, :class => ['radio', ('inline' if @field_options[:inline])].compact.join(' ')) do
+              content_tag(:label, :class => ['radio', ('inline' if @field_options[:inline])].compact) do
                 radiobutton + content_tag(:span, record.send(record_name))
               end
             end.join('').html_safe
@@ -119,10 +122,11 @@ module BootstrapForms
       control_group_div do
         label_field + input_div do
           extras do
-            options = { :class => 'uneditable-input' }
-            options[:id] = @field_options[:id] if @field_options[:id]
-            content_tag(:span, options) do
-              @field_options[:value] || object.send(@name.to_sym) rescue nil
+            value = @field_options.delete(:value)
+            @field_options[:class] = [@field_options[:class], 'uneditable-input'].compact
+
+            content_tag(:span, @field_options) do 
+              value || object.send(@name.to_sym) rescue nil
             end
           end
         end
@@ -134,7 +138,7 @@ module BootstrapForms
       @field_options = args.extract_options!
       @args = args
 
-      @field_options[:class] = 'btn btn-primary'
+      @field_options[:class] ||= 'btn btn-primary'
       super(name, *(args << @field_options))
     end
 
@@ -143,13 +147,14 @@ module BootstrapForms
       @field_options = args.extract_options!
       @args = args
 
-      @field_options[:class] = 'btn btn-primary'
+      @field_options[:class] ||= 'btn btn-primary'
       super(name, *(args << @field_options))
     end
 
     def cancel(*args)
       @field_options = args.extract_options!
-      link_to(I18n.t('bootstrap_forms.buttons.cancel'), (@field_options[:back] || :back), :class => 'btn cancel')
+      @field_options[:class] ||= 'btn cancel'
+      link_to(I18n.t('bootstrap_forms.buttons.cancel'), (@field_options[:back] || :back), :class => @field_options[:class])
     end
 
     def actions(&block)

data/lib/bootstrap_forms/helpers/form_helper.rb

@@ -2,7 +2,7 @@ module BootstrapForms
   module Helpers
     module FormHelper
       def bootstrap_form_for(record, options = {}, &block)
-        options[:builder] = BootstrapForms::FormBuilder
+        options[: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 +13,7 @@ module BootstrapForms
       end
 
       def bootstrap_fields_for(record, options = {}, &block)
-        options[:builder] = BootstrapForms::FormBuilder
+        options[:builder] = options[:builder] || BootstrapForms.default_form_builder
         fields_for(record, nil, options, &block)
       end
     end

data/lib/bootstrap_forms/helpers/wrappers.rb

@@ -14,9 +14,8 @@ module BootstrapForms
         klasses << 'error' if @field_options[:error]
         klasses << 'success' if @field_options[:success]
         klasses << 'warning' if @field_options[:warning]
-        klass = klasses.join(' ')
 
-        content_tag(:div, :class => klass, &block)
+        content_tag(:div, :class => klasses, &block)
       end
 
       def error_string
@@ -52,19 +51,18 @@ module BootstrapForms
           return ''.html_safe
         else
           if respond_to?(:object)
-             label(@name, block_given? ? block : @field_options[:label], :class => ['control-label', required_class].compact.join(' '))
+             label(@name, block_given? ? block : @field_options[:label], :class => 'control-label')
            else
-             label_tag(@name, block_given? ? block : @field_options[:label], :class => ['control-label', required_class].compact.join(' '))
+             label_tag(@name, block_given? ? block : @field_options[:label], :class => 'control-label')
            end
         end
       end
 
-      def required_class
-        return 'required' if @field_options[:required]
-        if respond_to?(:object) and object.respond_to?(:errors)
-          return 'required' if object.class.validators_on(@name).any? { |v| v.kind_of? ActiveModel::Validations::PresenceValidator }
+      def required_attribute
+        if respond_to?(:object) and object.respond_to?(:errors) and object.class.respond_to?('validators_on')
+          return { :required => true } if object.class.validators_on(@name).any? { |v| v.kind_of? ActiveModel::Validations::PresenceValidator }
         end
-        nil
+        {}
       end
 
       %w(help_inline error success warning help_block append prepend).each do |method_name|

data/spec/dummy/app/helpers/my_custom_form_builder.rb

@@ -0,0 +1,5 @@
+class MyCustomFormBuilder < ActionView::Helpers::FormBuilder
+	def error_messages
+		'' # return empty string
+	end
+end

data/spec/dummy/app/models/project.rb

@@ -1,4 +1,5 @@
 class Project < ActiveRecord::Base
   has_many :tasks
   accepts_nested_attributes_for :tasks
+  validates :owner, :presence => true
 end

data/spec/dummy/config/application.rb

@@ -2,6 +2,8 @@ require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'
 
+require 'bundler'
+Bundler.setup
 Bundler.require
 require "bootstrap_forms"
 

data/spec/dummy/db/migrate/20120828002121_add_project_owner.rb

@@ -0,0 +1,9 @@
+class AddProjectOwner < ActiveRecord::Migration
+  def up
+    add_column :projects, :owner, :string
+  end
+
+  def down
+    remove_column :projects, :owner
+  end
+end

data/spec/dummy/db/schema.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -10,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20110710143903) do
+ActiveRecord::Schema.define(:version => 20120828002121) do
 
   create_table "milestones", :force => true do |t|
     t.integer "task_id"
@@ -19,6 +20,7 @@ ActiveRecord::Schema.define(:version => 20110710143903) do
 
   create_table "projects", :force => true do |t|
     t.string "name"
+    t.string "owner"
   end
 
   create_table "tasks", :force => true do |t|

data/spec/lib/bootstrap_forms/bootstrap_form_for_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe "bootstrap_form_for" do
+	describe "default_form_builder" do
+		it "should be accessible" do
+			BootstrapForms.should respond_to(:default_form_builder)
+		end
+
+		it "should be the BootstrapForms form_builder by default" do
+			BootstrapForms.default_form_builder.should == BootstrapForms::FormBuilder
+		end
+
+		context "when set to something else" do
+			before do
+				BootstrapForms.default_form_builder = MyCustomFormBuilder
+			end
+
+			it "should be that other thing" do
+				BootstrapForms.default_form_builder.should == MyCustomFormBuilder
+			end
+
+			describe "projects/new.html.erb", :type => :view do
+				before do
+					assign :project, Project.new
+					render :file => "projects/new.html.erb", :layout => "layouts/application.html.erb"
+				end
+
+				it "should render with the other form builder" do
+					# in other words, it shouldn't be wrapped with the bootstrap stuff
+					rendered.should_not match /<div class=\"control-group\"><label class=\"control-label\" for=\"item_name\">Name<\/label><div class=\"controls\">.*<\/div><\/div>/
+				end
+			end
+		end
+	end
+end

data/spec/lib/bootstrap_forms/form_builder_spec.rb

@@ -73,6 +73,12 @@ describe "BootstrapForms::FormBuilder" do
       end
     end
 
+    context "an attribute with a PresenceValidator" do
+      it "adds the required attribute" do 
+        @builder.text_field("owner").should match /<input .*required="required"/
+      end
+    end
+
     context 'submit' do
       it 'checks persistence of object' do
         @builder.submit.should match('Create Project')
@@ -96,3 +102,19 @@ describe "BootstrapForms::FormBuilder" do
     it_behaves_like 'a bootstrap form'
   end
 end
+
+describe 'BootstrapForms::Helpers::FormTagHelper' do
+  describe '#bootstrap_text_field_tag' do
+    context 'with no method "validators_on"' do
+      before(:each) do
+        @non_active_record_object = {:attributes => [:id, :name]}
+        @template = ActionView::Base.new
+        @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
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -19,6 +19,7 @@ RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
+  config.include RSpec::Rails::ViewExampleGroup, :type => :view
 end
 
-Rails.backtrace_cleaner.remove_silencers!
+Rails.backtrace_cleaner.remove_silencers!

data/spec/support/shared_context.rb

@@ -139,9 +139,10 @@ shared_examples "a bootstrap form" do
         @builder.text_field(:name, :append => '@', :prepend => '#').should == "<div class=\"control-group\"><label class=\"control-label\" for=\"item_name\">Name</label><div class=\"controls\"><div class=\"input-prepend input-append\"><span class=\"add-on\">\#</span><input id=\"item_name\" name=\"item[name]\" size=\"30\" type=\"text\" /><span class=\"add-on\">@</span></div></div></div>"
       end
     end
-     context "label option" do
-      %w(select email_field file_field number_field password_field search_field text_area text_field url_field).each do |method_name|
 
+    context "label option" do
+      %w(select email_field file_field number_field password_field search_field text_area text_field url_field).each do |method_name|
+        
         it "should not add a label when ''" do
           @builder.send(method_name.to_sym, 'name', :label => '').should_not match /<\/label>/
         end
@@ -163,22 +164,35 @@ shared_examples "a bootstrap form" do
     end
 
     context "submit" do
-      it "adds btn primary class" do
+      it "adds btn primary class if no class is defined" do
         @builder.submit.should match /class=\"btn btn-primary\"/
       end
+
+      it "allows for custom classes" do
+        @builder.submit(:class => 'btn btn-large btn-success').should match /class=\"btn btn-large btn-success\"/
+      end
     end
 
     context "button" do
-      it "adds btn primary class" do
+      it "adds btn primary class if no class is defined" do
         @builder.button.should match /class=\"btn btn-primary\"/
       end
+
+      it "allows for custom classes" do
+        @builder.button(:class => 'btn btn-large btn-success').should match /class=\"btn btn-large btn-success\"/
+      end
     end
 
     context "cancel" do
-      it "creates link with correct class" do
+      it "creates a link with cancel btn class if no class is defined" do
         @builder.should_receive(:link_to).with(I18n.t('bootstrap_forms.buttons.cancel'), :back, :class => 'btn cancel').and_return("")
         @builder.cancel
       end
+
+      it "creates a link with custom classes when defined" do
+        @builder.should_receive(:link_to).with(I18n.t('bootstrap_forms.buttons.cancel'), :back, :class => 'btn btn-large my-cancel').and_return("")
+        @builder.cancel(:class => 'btn btn-large my-cancel')
+      end
     end
   end # actions
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap_forms
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-16 00:00:00.000000000 Z
+date: 2012-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
@@ -139,6 +139,7 @@ files:
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/projects_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/helpers/my_custom_form_builder.rb
 - spec/dummy/app/helpers/projects_helper.rb
 - spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/.gitkeep
@@ -165,6 +166,7 @@ files:
 - spec/dummy/config/routes.rb
 - spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/20110710143903_initial_tables.rb
+- spec/dummy/db/migrate/20120828002121_add_project_owner.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/public/404.html
@@ -175,6 +177,7 @@ files:
 - spec/dummy/test/functional/projects_controller_test.rb
 - spec/dummy/test/unit/helpers/projects_helper_test.rb
 - spec/dummy/tmp/cache/.gitkeep
+- spec/lib/bootstrap_forms/bootstrap_form_for_spec.rb
 - spec/lib/bootstrap_forms/form_builder_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_context.rb
@@ -192,7 +195,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3940498627574462359
+      hash: -2577927973588577500
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -201,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3940498627574462359
+      hash: -2577927973588577500
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -215,6 +218,7 @@ test_files:
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/projects_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/helpers/my_custom_form_builder.rb
 - spec/dummy/app/helpers/projects_helper.rb
 - spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/.gitkeep
@@ -241,6 +245,7 @@ test_files:
 - spec/dummy/config/routes.rb
 - spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/20110710143903_initial_tables.rb
+- spec/dummy/db/migrate/20120828002121_add_project_owner.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/public/404.html
@@ -251,6 +256,7 @@ test_files:
 - spec/dummy/test/functional/projects_controller_test.rb
 - spec/dummy/test/unit/helpers/projects_helper_test.rb
 - spec/dummy/tmp/cache/.gitkeep
+- spec/lib/bootstrap_forms/bootstrap_form_for_spec.rb
 - spec/lib/bootstrap_forms/form_builder_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_context.rb