twitter-bootstrap-rails 2.2.8 → 3.2.2

data/lib/twitter/bootstrap/rails/engine.rb

@@ -1,9 +1,11 @@
 require 'rails'
 
-require File.dirname(__FILE__) + '/twitter-bootstrap-breadcrumbs.rb'
-require File.dirname(__FILE__) + '/../../../../app/helpers/flash_block_helper.rb'
-require File.dirname(__FILE__) + '/../../../../app/helpers/modal_helper.rb'
-require File.dirname(__FILE__) + '/../../../../app/helpers/navbar_helper.rb'
+require_relative 'breadcrumbs.rb'
+require_relative '../../../../app/helpers/flash_block_helper.rb'
+require_relative '../../../../app/helpers/modal_helper.rb'
+require_relative '../../../../app/helpers/navbar_helper.rb'
+require_relative '../../../../app/helpers/bootstrap_flash_helper.rb'
+require_relative '../../../../app/helpers/form_errors_helper.rb'
 
 module Twitter
   module Bootstrap
@@ -19,13 +21,18 @@ module Twitter
 
         initializer 'twitter-bootstrap-rails.setup_helpers' do |app|
           app.config.to_prepare do
-            ActionController::Base.send :include, BreadCrumbs
-            ActionController::Base.send :helper, FlashBlockHelper
-            ActionController::Base.send :helper, ModalHelper
-            ActionController::Base.send :helper, NavbarHelper
-            ActionController::Base.send :helper, BadgeLabelHelper
-            #ActionController::Base.send :helper_method, :render_breadcrumbs
+            ActionController::Base.send :include, Breadcrumbs
           end
+          [FlashBlockHelper,
+          BootstrapFlashHelper,
+          ModalHelper,
+          NavbarHelper,
+          BadgeLabelHelper].each do |h|
+            app.config.to_prepare do
+              ActionController::Base.send :helper, h
+            end
+          end
+          ActionView::Helpers::FormBuilder.send :include, FormErrorsHelper
         end
       end
     end

data/lib/twitter/bootstrap/rails/version.rb

@@ -1,7 +1,7 @@
 module Twitter
   module Bootstrap
     module Rails
-      VERSION = "2.2.8"
+      VERSION = "3.2.2"
     end
   end
-end
+end

data/spec/lib/breadcrumbs_spec.rb

@@ -0,0 +1,99 @@
+require 'spec_helper'
+
+describe Twitter::Bootstrap::Breadcrumbs do
+  class TestModel
+    include ActiveModel::Model
+
+    def to_s
+      "test_model"
+    end
+  end
+
+  class BaseTestController < AbstractController::Base
+    include Twitter::Bootstrap::Breadcrumbs
+    include AbstractController::Callbacks
+    include AbstractController::UrlFor
+
+    add_breadcrumb 'base', '/base'
+    add_breadcrumb :base_i18n, '/base_i18n'
+
+    def breadcrumbs
+      @__bs_breadcrumbs
+    end
+  end
+
+  class TestController < BaseTestController
+    add_breadcrumb 'class', '/class'
+    add_breadcrumb :class_i18n, '/class_i18n'
+
+    def show
+      add_breadcrumb 'instance', '/instance'
+      add_breadcrumb :instance_i18n, '/instance_i18n'
+
+      test_model = TestModel.new
+      add_breadcrumb test_model
+
+      add_breadcrumb :symbolized
+      add_breadcrumb :show
+    end
+
+    def symbolized_path
+      '/symbolized'
+    end
+
+    def test_models_path
+      '/test_model'
+    end
+  end
+
+  describe 'Breadcrumbs generation' do
+
+    before do
+      options = { :scope => [:breadcrumbs, 'test'] }
+      [:class_i18n, :instance_i18n, :show, :symbolized].each do |name|
+        I18n.expects(:t).with(name, options).returns(name.to_s)
+      end
+
+      name = :base_i18n
+      options = { :scope => [:breadcrumbs, 'base_test'] }
+      I18n.expects(:t).with(name, options).returns(name)
+
+      @controller = TestController.new
+      @controller.process(:show)
+    end
+
+    it "have breadcrumbs" do
+      [:base, :base_i18n, :class, :class_i18n, :instance, :instance_i18n, :test_model, :symbolized].each do |name|
+        path = "/#{name}"
+        idx = @controller.breadcrumbs.index { |b| b[:name] == name.to_s && b[:url] == path }
+        expect(idx).to be, -> { name }
+      end
+
+      idx = @controller.breadcrumbs.index { |b| b[:name] == "show" && b[:url] == '' }
+      expect(idx).to be
+    end
+  end
+
+  describe 'BreadcrumbsOnRails compatibility' do
+    class SomeController < AbstractController::Base
+    end
+    let(:logger) { double('logger').as_null_object }
+    before { allow(::Rails).to receive(:logger).and_return(logger) }
+
+    context 'when BreadcrumbsOnRails is defined' do
+      before do
+        stub_const('BreadcrumbsOnRails', 1)
+        expect(defined?(::BreadcrumbsOnRails)).to be_truthy
+        expect(logger).to receive(:info).with /BreadcrumbsOnRails detected/
+        SomeController.send(:include, Twitter::Bootstrap::Breadcrumbs)
+      end
+
+      it 'does not define aliases' do
+        expect(SomeController).to respond_to :add_bootstrap_breadcrumb
+        expect(SomeController).not_to respond_to :add_breadcrumb
+      end
+    end
+
+  end
+
+end

data/spec/lib/twitter_bootstrap_rails/badge_label_helper_spec.rb

@@ -10,13 +10,21 @@ include BadgeLabelHelper
 
 describe BadgeLabelHelper, :type => :helper do
   it "should return a basic bootstrap badge" do
-    badge('test').gsub(/\s/, '').downcase.should eql(BASIC_BADGE.gsub(/\s/, '').downcase)
+    expect(badge('New!').gsub(/\s/, '').downcase)
+      .to eql(BASIC_BADGE.gsub(/\s/, '').downcase)
   end
 
   it "should return a bootstrap badge with class" do
-    badge('waning', :warning).gsub(/\s/, '').downcase.should eql(BADGE_WITH_CLASS.gsub(/\s/, '').downcase)
+    expect(badge('2', :warning).gsub(/\s/, '').downcase)
+      .to eql(BADGE_WITH_CLASS.gsub(/\s/, '').downcase)
+  end
+
+  it "should take a Number as its first parameter" do
+  	expect(badge(12).gsub(/\s/, '').downcase)
+  	.to eql(BADGE_WITH_NUMBER_PARAM.gsub(/\s/, '').downcase)
   end
 end
 
-BASIC_BADGE = %{<span class="badge">test</span>}
-BADGE_WITH_CLASS = %{<span class="badge badge-warning">waning</span>}
+BASIC_BADGE = %{<span class="badge">New!</span>}
+BADGE_WITH_CLASS = %{<span class="badge badge-warning">2</span>}
+BADGE_WITH_NUMBER_PARAM = %{<span class="badge">12</span>}

data/spec/lib/twitter_bootstrap_rails/bootstrap_flash_helper_spec.rb

@@ -0,0 +1,128 @@
+# encoding: utf-8
+require 'spec_helper'
+require 'action_view'
+require 'active_support'
+require_relative '../../../app/helpers/bootstrap_flash_helper'
+
+include ActionView::Helpers
+include ActionView::Context
+include BootstrapFlashHelper
+
+describe BootstrapFlashHelper, type: :helper do
+  before do
+    allow(self).to receive(:uri_state) { :inactive }
+    allow(self).to receive(:root_url) { '/' }
+  end
+
+  describe "bootstrap_flash" do
+    it "should not return anything without flashes" do
+      allow(self).to receive(:flash) { {} }
+
+      element = bootstrap_flash
+
+      expect(element).to eql("")
+    end
+
+    it "should work with a notice" do
+      allow(self).to receive(:flash) { {notice: "Hello"} }
+
+      element = bootstrap_flash
+
+      expect(element).to have_tag(:div,
+        text: "×Hello",
+        with: {class: "alert fade in alert-success"}) {
+
+        with_tag(:button,
+          text: "×",
+          with: {
+            class: "close",
+            "data-dismiss" => "alert"
+          }
+        )
+
+      }
+    end
+
+    it "should work with a notice and an extra class" do
+      allow(self).to receive(:flash) { {notice: "Hello"} }
+
+      element = bootstrap_flash(class: "extra-class")
+
+      expect(element).to have_tag(:div,
+        text: "×Hello",
+        with: {class: "alert fade in alert-success extra-class"}) {
+
+        with_tag(:button,
+          text: "×",
+          with: {
+            class: "close",
+            "data-dismiss" => "alert"
+          }
+        )
+
+      }
+    end
+
+    it "should work with a notice and an extra class and an extra attribute" do
+      allow(self).to receive(:flash) { {notice: "Hello"} }
+
+      element = bootstrap_flash(class: "extra-class", "data-no-transition-cache" => true)
+
+      expect(element).to have_tag(:div,
+        text: "×Hello",
+        with: {
+          class: "alert fade in alert-success extra-class",
+          "data-no-transition-cache" => true
+        }) {
+
+        with_tag(:button,
+          text: "×",
+          with: {
+            class: "close",
+            "data-dismiss" => "alert"
+          }
+        )
+
+      }
+    end
+
+    it "should escape javascript if not marked as safe by user" do
+      allow(self).to receive(:flash) { {notice: "<script>alert(1)</script>"} }
+
+      element = bootstrap_flash
+
+      expect(element).to have_tag(:div,
+                                  text: "×<script>alert(1)</script>",
+                                  with: {class: "alert fade in alert-success"}) {
+                           with_tag(:button,
+                                    text: "×",
+                                    with: {
+                                        class: "close",
+                                        "data-dismiss" => "alert"
+                                    }
+                           )
+                         }
+    end
+
+    it "should not escape a link if marked as safe by user" do
+      allow(self).to receive(:flash) { {notice: "<a href='example.com'>awesome link!</a>".html_safe} }
+
+      element = bootstrap_flash
+
+      expect(element).to have_tag(:div,
+                                  text: "×awesome link!",
+                                  with: {class: "alert fade in alert-success"}) { [
+                             with_tag(:button,
+                                      text: "×",
+                                      with: {
+                                          class: "close",
+                                          "data-dismiss" => "alert"
+                                      }
+                             ),
+                             with_tag(:a,
+                                      text: 'awesome link!')
+                         ]
+                         }
+    end
+  end
+end

data/spec/lib/twitter_bootstrap_rails/form_errors_helper_spec.rb

@@ -0,0 +1,148 @@
+# encoding: utf-8
+require 'spec_helper'
+require 'action_view'
+require 'active_support'
+require 'rspec/active_model/mocks'
+
+require_relative '../../../app/helpers/form_errors_helper'
+
+include ActionView::Helpers
+include ActionView::Context
+include FormErrorsHelper
+
+describe FormErrorsHelper, :type => :helper do
+
+  before do
+    @base_errors = ['base error message', 'nasty error']
+    @base_error = 'one base error'
+
+
+    @title_errors = ["can't be blank", 'is too short (minimum is 5 characters)']
+    @title_error = "can't be blank"
+
+    @errors = double('errors')
+    @new_post =  mock_model( 'Post' )
+    allow(@new_post).to receive_messages(:errors => @errors)
+    allow(self).to receive_messages(:post_path => '/post/1')
+    allow(self).to receive_messages(:protect_against_forgery? => false)
+    allow(self).to receive_messages(:polymorphic_path => '')
+
+    @default_class = 'help-block'
+    @default_error_class = 'has-error'
+  end
+
+
+  describe 'error[:base] is a string' do
+
+    before do
+      allow(@errors).to receive(:[]).with(:base).and_return(@base_error)
+    end
+
+    it 'should render base error on :base key' do
+      form_for(@new_post) do |builder|
+        expect(builder.error_span(:base)).to have_tag("div.#{@default_error_class}") do
+          with_tag("span.#{@default_class}", :text => @base_error)
+        end
+      end
+    end
+
+  end
+
+
+  describe 'when there is only one error on base' do
+
+    before do
+      allow(@errors).to receive(:[]).with(:base).and_return(@base_error)
+    end
+
+    it 'should render base error on :base key' do
+      form_for(@new_post) do |builder|
+        expect(builder.error_span(:base)).to have_tag("div.#{@default_error_class}") do
+          with_tag("span.#{@default_class}", :text => @base_error)
+        end
+      end
+    end
+
+  end
+
+  describe 'when there is only one error on title' do
+
+    before do
+      allow(@errors).to receive(:[]).with(:title).and_return(@title_error)
+    end
+
+    it 'should render base errors join with comma' do
+      form_for(@new_post) do |builder|
+        expect(builder.error_span(:title)).to have_tag("div.#{@default_error_class}") do
+          with_tag("span.#{@default_class}", :text => @title_error)
+        end
+      end
+    end
+  end
+
+
+
+  describe 'when there is more than one error on title' do
+
+    before do
+      allow(@errors).to receive(:[]).with(:title).and_return(@title_errors)
+    end
+
+    it 'should render base errors join with comma' do
+      form_for(@new_post) do |builder|
+        expect(builder.error_span(:title)).to have_tag("div.#{@default_error_class}") do
+          with_tag("span.#{@default_class}", :text => @title_errors.join(', '))
+        end
+      end
+    end
+  end
+
+
+  describe 'when there are no errors' do
+    before do
+      allow(@errors).to receive(:[]).with(:title).and_return(nil)
+    end
+
+    it 'should return nil' do
+      form_for(@new_post) do |builder|
+        expect(builder.error_span(:title)).to be_nil
+      end
+    end
+  end
+
+  describe 'when :error_class option is passed' do
+    let(:error_class) { 'has_warning' }
+
+    before do
+      allow(@errors).to receive(:[]).with(:title).and_return(@title_error)
+    end
+
+    it "should render with passed error class " do
+      form_for(@new_post) do |builder|
+        expect(builder.error_span(:title, :error_class => error_class))
+        .to have_tag("div.#{error_class}") do
+          with_tag("span.#{@default_class}", :text => @title_error)
+        end
+      end
+    end
+  end
+
+  describe 'when :error_class option is passed' do
+    let(:span_class) { 'help-inline' }
+
+    before do
+      allow(@errors).to receive(:[]).with(:title).and_return(@title_error)
+    end
+
+    it "should render with passed error class " do
+      form_for(@new_post) do |builder|
+        expect(builder.error_span(:title, :span_class => span_class))
+        .to have_tag("div.#{@default_error_class}") do
+          with_tag("span.#{span_class}", :text => @title_error)
+        end
+      end
+    end
+
+  end
+
+end

data/spec/lib/twitter_bootstrap_rails/glyph_helper_spec.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+require 'spec_helper'
+require 'action_view'
+require 'active_support'
+require_relative '../../../app/helpers/glyph_helper'
+
+include ActionView::Helpers
+include ActionView::Context
+include GlyphHelper
+
+describe GlyphHelper, :type => :helper do
+  it "should return a basic bootstrap glyph" do
+    expect(glyph(:thumbs_up).gsub(/\s/, '').downcase)
+      .to eql(BASIC_GLYPH.gsub(/\s/, '').downcase)
+  end
+
+  it "should return a bootstrap glyph with span" do
+    expect(glyph(:thumbs_up, {:tag => :span}).gsub(/\s/, '').downcase)
+      .to eql(GLYPH_WITH_SPAN.gsub(/\s/, '').downcase)
+  end
+end
+
+BASIC_GLYPH = %{<iclass=\"glyphiconglyphicon-thumbs-up\"></i>}
+GLYPH_WITH_SPAN = %{<spanclass=\"glyphiconglyphicon-thumbs-up\"></span>}

data/spec/lib/twitter_bootstrap_rails/modal_helper_spec.rb

@@ -11,49 +11,49 @@ describe ModalHelper, :type => :helper do
   header_without_close = { :show_close => false, :title => 'Modal header' }
   options              = { :id => "modal",
 												 	 :header => header_with_close,
-                           :body   => 'This is the body',
-                           :footer => content_tag(:button, 'Save', :class => 'btn')
+                           :body   => { content: 'This is the body' },
+                           :footer => { content: content_tag(:button, 'Save', :class => 'btn') }
   }
 
   it 'returns a complete modal' do
-    modal_dialog(options).gsub(/\n/, "").should eql BASIC_MODAL.gsub(/\n/, "")
+    expect(modal_dialog(options).gsub(/\n/, "")).to eql BASIC_MODAL.gsub(/\n/, "")
   end
 
   it 'returns a modal header with a close button if show_close is true' do
-    modal_header(header_with_close).gsub(/\n/, "").should eql MODAL_HEADER_WITH_CLOSE.gsub(/\n/, "")
+    expect(modal_header(header_with_close).gsub(/\n/, "")).to eql MODAL_HEADER_WITH_CLOSE.gsub(/\n/, "")
   end
 
   it 'renders a modal header without a close button' do
-      modal_header(header_without_close).gsub(/\n/, "").should eql MODAL_HEADER_WITHOUT_CLOSE.gsub(/\n/, "")
+    expect(modal_header(header_without_close).gsub(/\n/, "")).to eql MODAL_HEADER_WITHOUT_CLOSE.gsub(/\n/, "")
   end
 
 	it 'renders a close button' do
-		close_button('modal').should eql "<button class=\"close\" data-dismiss=\"modal\">&times;</button>"
+		expect(close_button('modal')).to eql "<button class=\"close\" data-dismiss=\"modal\" aria-hidden=\"true\">&times;</button>"
 	end
 
   it 'renders a modal toggle button' do
-		modal_toggle('Save', :href => "#modal").gsub(/\n/, "").should eql MODAL_TOGGLE.gsub(/\n/, "")
+    expect(modal_toggle('Save', :href => "#modal").gsub(/\n/, "")).to eql MODAL_TOGGLE.gsub(/\n/, "")
   end
 
-	it 'renders a cancel button' do
-		modal_cancel_button("Cancel", :href => "#modal", :data => {:dismiss => 'modal'}).gsub(/\n/, "").should eql MODAL_CANCEL_BUTTON.gsub(/\n/, "")
-	end
-
+  it 'renders a cancel button' do
+    expect(modal_cancel_button("Cancel", :data => {:dismiss => 'modal'}, :href => "#modal").gsub(/\n/, "")).to eql MODAL_CANCEL_BUTTON.gsub(/\n/, "")
+  end
 end
+
 BASIC_MODAL = <<-HTML
-<div class=\"bootstrap-modal modal hide fade\" id="modal"><div class=\"modal-header\"><button class=\"close\" data-dismiss=\"modal\">&times;</button><h3>Modal header</h3></div><div class=\"modal-body\">This is the body</div><div class=\"modal-footer\"><button class=\"btn\">Save</button></div></div>
+<div class=\"bootstrap-modal modal fade\" id=\"modal\"><div class=\"modal-dialog \"><div class=\"modal-content\"><div class=\"modal-header\"><button class=\"close\" data-dismiss=\"modal\" aria-hidden=\"true\">&times;</button><h4 class=\"modal-title\">Modal header</h4></div><div class=\"modal-body\">This is the body</div><div class=\"modal-footer\"><button class="btn">Save</button></div></div></div></div>
 HTML
 
 MODAL_HEADER_WITHOUT_CLOSE = <<-HTML
-<div class="modal-header"><h3>Modal header</h3></div>
+<div class="modal-header"><h4 class=\"modal-title\">Modal header</h4></div>
 HTML
 
 MODAL_HEADER_WITH_CLOSE = <<-HTML
-<div class="modal-header"><button class="close" data-dismiss="modal">&times;</button><h3>Modal header</h3></div>
+<div class="modal-header"><button class="close" data-dismiss="modal" aria-hidden=\"true\">&times;</button><h4 class=\"modal-title\">Modal header</h4></div>
 HTML
 
 MODAL_TOGGLE = <<-HTML
-<a class="btn" data-toggle="modal" href="#modal">Save</a>
+<a class="btn btn-default" data-toggle="modal" href="#modal">Save</a>
 HTML
 
 MODAL_CANCEL_BUTTON = <<-HTML