twitter-bootstrap-rails 3.2.0 → 3.2.1.rc1

data/app/helpers/bootstrap_flash_helper.rb

@@ -16,7 +16,7 @@ module BootstrapFlashHelper
       Array(message).each do |msg|
         text = content_tag(:div,
                            content_tag(:button, raw("×"), :class => "close", "data-dismiss" => "alert") +
-                           msg, :class => "alert fade in alert-#{type} #{options[:class]}")
+                           msg.html_safe, :class => "alert fade in alert-#{type} #{options[:class]}")
         flash_messages << text if msg
       end
     end

data/app/helpers/form_errors_helper.rb

@@ -1,22 +1,22 @@
 module FormErrorsHelper
-
-  attr_reader :template
-  attr_reader :object
+  include ActionView::Helpers::FormTagHelper
 
   def error_span(attribute, options = {})
-    options[:class] ||= 'help-inline'
+    options[:span_class] ||= 'help-block'
+    options[:error_class] ||= 'has-error'
 
-    template.content_tag(
-      :span, self.errors_for(attribute),
-      :class => options[:class]
-    ) if self.errors_on?(attribute)
+    if errors_on?(attribute)
+      @template.content_tag( :div, :class => options[:error_class] )  do
+        content_tag( :span, errors_for(attribute), :class => options[:span_class] )
+      end
+    end
   end
 
   def errors_on?(attribute)
-    self.object.errors[attribute].present? if self.object.respond_to?(:errors)
+    object.errors[attribute].present? if object.respond_to?(:errors)
   end
 
   def errors_for(attribute)
-    self.object.errors[attribute].try(:join, ', ')
+    object.errors[attribute].try(:join, ', ') || object.errors[attribute].try(:to_s)
   end
-end
+end

data/app/helpers/glyph_helper.rb

@@ -8,7 +8,8 @@ module GlyphHelper
   # # => <i class="icon-thumbs-up pull-left"></i>
   # glyph(:lock, {tag: :span})
   # # => <span class="icon-lock"></span>
-  def glyph(*names, options)
+  def glyph(*names)
+    options = (names.last.kind_of?(Hash)) ? names.pop : {}
     names.map! { |name| name.to_s.gsub('_','-') }
     names.map! do |name|
       name =~ /pull-(?:left|right)/ ? name : "glyphicon glyphicon-#{name}"

data/app/helpers/modal_helper.rb

@@ -10,9 +10,9 @@ module ModalHelper
     content_tag :div, :id => options[:id], :class => "bootstrap-modal modal fade" do
       content_tag :div, :class => "modal-dialog #{opts['size']}" do
         content_tag :div, :class => "modal-content" do
-          modal_header(opts, &block) +
-          modal_body(opts, &block) +
-          modal_footer(opts, &block) 
+          modal_header(options[:header], &block) +
+          modal_body(options[:body], &block) +
+          modal_footer(options[:footer], &block)
         end
       end
     end

data/lib/generators/bootstrap/install/templates/bootstrap_and_overrides.less

@@ -1,8 +1,11 @@
 @import "twitter/bootstrap/bootstrap";
 
-// Set the correct sprite paths
-@iconSpritePath: image-url("twitter/bootstrap/glyphicons-halflings.png");
-@iconWhiteSpritePath: image-url("twitter/bootstrap/glyphicons-halflings-white.png");
+// Set correct font paths
+@glyphiconsEotPath: font-url("glyphicons-halflings-regular.eot");
+@glyphiconsEotPath_iefix: font-url("glyphicons-halflings-regular.eot?#iefix");
+@glyphiconsWoffPath: font-url("glyphicons-halflings-regular.woff");
+@glyphiconsTtfPath: font-url("glyphicons-halflings-regular.ttf");
+@glyphiconsSvgPath: font-url("glyphicons-halflings-regular.svg#glyphicons_halflingsregular");
 
 // Set the Font Awesome (Font Awesome is default. You can disable by commenting below lines)
 @fontAwesomeEotPath: font-url("fontawesome-webfont.eot");

data/lib/generators/bootstrap/layout/templates/layout.html.erb

@@ -7,11 +7,6 @@
     <title><%%= content_for?(:title) ? yield(:title) : "<%= app_name %>" %></title>
     <%%= csrf_meta_tags %>
 
-    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
-    <!--[if lt IE 9]>
-      <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.6.1/html5shiv.js" type="text/javascript"></script>
-    <![endif]-->
-
     <%%= stylesheet_link_tag "application", :media => "all" %>
 
     <!-- For third-generation iPad with high-resolution Retina display: -->
@@ -35,6 +30,11 @@
     <%%= favicon_link_tag 'favicon.ico', :rel => 'shortcut icon' %>
 
     <%%= javascript_include_tag "application" %>
+
+    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
+    <!--[if lt IE 9]>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js" type="text/javascript"></script>
+    <![endif]-->
   </head>
   <body>
 

data/lib/generators/bootstrap/layout/templates/layout.html.haml

@@ -6,9 +6,6 @@
     %meta(name="viewport" content="width=device-width, initial-scale=1.0")
     %title= content_for?(:title) ? yield(:title) : "<%= app_name %>"
     = csrf_meta_tags
-    / Le HTML5 shim, for IE6-8 support of HTML elements
-    /[if lt IE 9]
-      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.6.1/html5shiv.js"
     = stylesheet_link_tag "application", :media => "all"
     = favicon_link_tag 'apple-touch-icon-144x144-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '144x144'
     = favicon_link_tag 'apple-touch-icon-114x114-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '114x114'
@@ -16,6 +13,9 @@
     = favicon_link_tag 'apple-touch-icon-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png'
     = favicon_link_tag 'favicon.ico', :rel => 'shortcut icon'
     = javascript_include_tag "application"
+    / Le HTML5 shim, for IE6-8 support of HTML elements
+    /[if lt IE 9]
+      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js"
 
 
   %body

data/lib/generators/bootstrap/layout/templates/layout.html.slim

@@ -6,10 +6,6 @@ html lang="en"
     meta name="viewport" content="width=device-width, initial-scale=1.0"
     title= content_for?(:title) ? yield(:title) : "<%= app_name %>"
     = csrf_meta_tags
-
-    /! Le HTML5 shim, for IE6-8 support of HTML elements
-    /[if lt IE 9]
-      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.6.1/html5shiv.js"
     = stylesheet_link_tag "application", :media => "all"
     = favicon_link_tag 'apple-touch-icon-144x144-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '144x144'
     = favicon_link_tag 'apple-touch-icon-114x114-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '114x114'
@@ -17,7 +13,9 @@ html lang="en"
     = favicon_link_tag 'apple-touch-icon-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png'
     = favicon_link_tag 'favicon.ico', :rel => 'shortcut icon'
     = javascript_include_tag "application"
-
+    /! Le HTML5 shim, for IE6-8 support of HTML elements
+    /[if lt IE 9]
+      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js"
 
 
   body

data/lib/generators/bootstrap/themed/templates/_form.html.erb

@@ -1,6 +1,6 @@
 <%%= form_for @<%= resource_name %>, :html => { :class => "form-horizontal <%= resource_name %>" } do |f| %>
 
-    <%% if @<%= resource_name %>.errors.any? %>
+  <%% if @<%= resource_name %>.errors.any? %>
     <div id="error_expl" class="panel panel-danger">
       <div class="panel-heading">
         <h3 class="panel-title"><%%= pluralize(@<%= resource_name %>.errors.count, "error") %> prohibited this <%= resource_name %> from being saved:</h3>
@@ -16,18 +16,21 @@
   <%% end %>
 
 <%- columns.each do |column| -%>
-  <div class="control-group">
-    <%%= f.label :<%= column.name %>, :class => 'control-label' %>
-    <div class="controls">
+  <div class="form-group">
+    <%%= f.label :<%= column.name %>, :class => 'control-label col-lg-2' %>
+    <div class="col-lg-10">
       <%%= f.<%= column.field_type %> :<%= column.name %>, :class => 'form-control' %>
     </div>
-    <%%= error_span(@<%= resource_name %>[:<%= column.name %>]) %>
+    <%%=f.error_span(:<%= column.name %>) %>
   </div>
   <%- end -%>
 
-
-  <%%= f.submit nil, :class => 'btn btn-primary' %>
-  <%%= link_to t('.cancel', :default => t("helpers.links.cancel")),
-            <%= controller_routing_path %>_path, :class => 'btn btn-default' %>
+  <div class="form-group">
+    <div class="col-lg-offset-2 col-lg-10">
+      <%%= f.submit nil, :class => 'btn btn-primary' %>
+      <%%= link_to t('.cancel', :default => t("helpers.links.cancel")),
+                <%= controller_routing_path %>_path, :class => 'btn btn-default' %>
+    </div>
+  </div>
 
 <%% end %>

data/lib/generators/bootstrap/themed/templates/_form.html.haml

@@ -1,10 +1,12 @@
 = form_for @<%= resource_name %>, html: { class: "form form-horizontal <%= resource_name %>" } do |f|
   <%- columns.each do |column| -%>
   .form-group
-    = f.label :<%= column.name %>, class: 'control-label'
-    .controls
+    = f.label :<%= column.name %>, class: 'control-label col-lg-2'
+    .col-lg-10
       = f.<%= column.field_type %> :<%= column.name %>, class: 'form-control', required: true
-    = error_span(@<%= resource_name %>[:<%= column.name %>])
+    = f.error_span(:<%= column.name %>)
   <%- end -%>
-  = f.submit nil,class: 'btn btn-primary'
-  = link_to t('.cancel', :default => t("helpers.links.cancel")), <%= controller_routing_path %>_path, :class => 'btn btn-default'
+  .form-group
+    .col-lg-offset-2.col-lg-10
+      = f.submit nil,class: 'btn btn-primary'
+      = link_to t('.cancel', :default => t("helpers.links.cancel")), <%= controller_routing_path %>_path, :class => 'btn btn-default'

data/lib/generators/bootstrap/themed/templates/_form.html.slim

@@ -1,11 +1,13 @@
 = form_for @<%= resource_name %>, html: { class: "form form-horizontal <%= resource_name %>" } do |f|
   <%- columns.each do |column| -%>
   .form-group
-    = f.label :<%= column.name %>, :class => 'control-label'
-    .controls
+    = f.label :<%= column.name %>, :class => 'control-label col-lg-2'
+    .col-lg-10
       = f.<%= column.field_type %> :<%= column.name %>, :class => 'form-control'
-    = error_span(@<%= resource_name %>[:<%= column.name %>])
+    = f.error_span(:<%= column.name %>)
   <%- end -%>
-  = f.submit nil, :class => 'btn btn-primary'
-  '
-  = link_to t('.cancel', :default => t("helpers.links.cancel")), <%= controller_routing_path %>_path, :class => 'btn'
+  .form-group
+    .col-lg-offset-2.col-lg-10
+      = f.submit nil, :class => 'btn btn-primary'
+      '
+      = link_to t('.cancel', :default => t("helpers.links.cancel")), <%= controller_routing_path %>_path, :class => 'btn'

data/lib/generators/bootstrap/themed/templates/edit.html.slim

@@ -1,4 +1,4 @@
 - model_class = <%= resource_name.classify %>
-div class="page-header"
+.page-header
   h1=t '.title', :default => [:'helpers.titles.edit', 'Edit %{model}'], :model => model_class.model_name.human.titleize
 = render :partial => "form"

data/lib/generators/bootstrap/themed/templates/index.html.slim

@@ -1,7 +1,7 @@
 - model_class = <%= resource_name.classify %>
-div class="page-header"
+.page-header
   h1=t '.title', :default => model_class.model_name.human.pluralize.titleize
-table class="table table-striped"
+table.table.table-striped
   thead
     tr
       th= model_class.human_attribute_name(:id)
@@ -24,4 +24,3 @@ table class="table table-striped"
           = link_to t('.destroy', :default => t("helpers.links.destroy")), <%= singular_controller_routing_path %>_path(<%= resource_name %>), :method => :delete, :data => { :confirm => t('.confirm', :default => t("helpers.links.confirm", :default => 'Are you sure?')) }, :class => 'btn btn-xs btn-danger'
 
 = link_to t('.new', :default => t("helpers.links.new")), new_<%= singular_controller_routing_path %>_path, :class => 'btn btn-primary'
-

data/lib/generators/bootstrap/themed/templates/new.html.slim

@@ -1,4 +1,4 @@
 - model_class = <%= resource_name.classify %>
-div class="page-header"
+.page-header
   h1=t '.title', :default => [:'helpers.titles.new', 'New %{model}'], :model => model_class.model_name.human.titleize
 = render :partial => "form"

data/lib/generators/bootstrap/themed/templates/show.html.slim

@@ -1,5 +1,5 @@
 - model_class = <%= resource_name.classify %>
-div class="page-header"
+.page-header
   h1=t '.title', :default => model_class.model_name.human.titleize
 
 <%- columns.each do |column| -%>

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

@@ -1,10 +1,11 @@
 require 'rails'
 
-require File.dirname(__FILE__) + '/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 File.dirname(__FILE__) + '/../../../../app/helpers/bootstrap_flash_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
@@ -21,14 +22,17 @@ 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, BootstrapFlashHelper
-            ActionController::Base.send :helper, FormErrorsHelper
-            ActionController::Base.send :helper, ModalHelper
-            ActionController::Base.send :helper, NavbarHelper
-            ActionController::Base.send :helper, BadgeLabelHelper
-            #ActionController::Base.send :helper_method, :render_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 = "3.2.0"
+      VERSION = "3.2.1.rc1"
     end
   end
 end

data/spec/lib/breadcrumbs_spec.rb

@@ -64,11 +64,11 @@ describe Twitter::Bootstrap::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 }
-      idx.should be, -> { name }
+      expect(idx).to be, -> { name }
     end
 
     idx = @controller.breadcrumbs.index { |b| b[:name] == "show" && b[:url] == '' }
-    idx.should be
+    expect(idx).to be
   end
 
 end

data/spec/lib/twitter_bootstrap_rails/badge_label_helper_spec.rb

@@ -10,15 +10,21 @@ include BadgeLabelHelper
 
 describe BadgeLabelHelper, :type => :helper do
   it "should return a basic bootstrap badge" do
-    expect(badge('test').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
-    expect(badge('waning', :warning).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/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