bootstrap-sass-extras 0.0.3 → 0.1.0

data/Rakefile

@@ -1 +1,11 @@
-require "bundler/gem_tasks"
+require 'rubygems'
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+desc "Run all examples"
+RSpec::Core::RakeTask.new(:spec) do |t|
+  #t.rspec_path = 'bin/rspec'
+  t.rspec_opts = %w[--color]
+end
+
+task :default => [:spec]

data/app/helpers/badge_helper.rb

@@ -0,0 +1,13 @@
+module BadgeHelper
+  # ==== Examples
+  #
+  # badge(2)
+  #   => <span class="badge">2</span>
+  # badge(nil)
+  #   => nil
+
+  def badge(count)
+    return unless count
+    content_tag(:span, count, class: "badge")
+  end
+end

data/app/helpers/bootstrap_flash_helper.rb

@@ -1,17 +1,25 @@
 module BootstrapFlashHelper
-  def bootstrap_flash
-    output = ''
-    flash.each do |type, message|
-      output += flash_container(type, message)
-    end
+  ALERT_TYPES_MAP = {
+    notice: :success,
+    alert: :danger,
+    error: :danger,
+    info: :info,
+    warning: :warning
+  }.freeze
 
-    raw(output)
+  def bootstrap_flash
+    safe_join(flash.each_with_object([]) do |(type, message), messages|
+                next if message.blank? || !message.respond_to?(:to_str)
+                type = ALERT_TYPES_MAP.fetch(type.to_sym, type)
+                messages << flash_container(type, message)
+              end, "\n").presence
   end
 
   def flash_container(type, message)
-    raw(content_tag(:div, :class => "alert alert-#{type}") do
-      content_tag(:a, raw("&times;"),:class => 'close', :data => {:dismiss => 'alert'}) +
-      message
-    end)
+    content_tag :div, class: "alert alert-#{type} alert-dismissable" do
+      button_tag type: "button", class: "close", data: { dismiss: "alert" } do
+        "&times;".html_safe
+      end.safe_concat(message)
+    end
   end
 end

data/app/helpers/bootstrap_viewport_meta_helper.rb

@@ -0,0 +1,27 @@
+module BootstrapViewportMetaHelper
+  #
+  # Creates the meta tag for Bootstrap with the specified parameters:
+  #
+  #     <%= viewport_meta_tag %>
+  #
+  # Renders:
+  #
+  #     <meta content="width=device-width,initial-scale=1.0" name="viewport" />
+  #
+  # You can change the content value by passing a hash as an argument:
+  #
+  #     <%= viewport_meta_tag(:maximum_scale => "1.0") %>
+  #
+  # Renders:
+  #
+  #     <meta content="width=device-width,initial-scale=1.0,maximum-scale=1.0" name="viewport" />
+  #
+  def viewport_meta_tag(*args)
+    options = {
+      width: "device-width",
+      initial_scale: "1.0" }.merge(args[0] || {})
+
+      content = options.collect {|key,value| "#{key.to_s.dasherize}=#{value}"}.join(",")
+      raw(tag(:meta, name: "viewport", content: content))
+  end
+end

data/app/helpers/glyph_helper.rb

@@ -1,11 +1,14 @@
 module GlyphHelper
   # ==== Examples
-  # glyph(:share_alt)
-  # # => <i class="icon-share-alt"></i>
-  # glyph(:lock, :white)
-  # # => <i class="icon-lock icon-white"></i>
+  #
+  # glyph(:search)
+  #   => <span class="glyphicon glyphicon-search"></span>
+  # glyph(:search, :paperclip)
+  #   => <span class="glyphicon glyphicon-search"></span><span class="glyphicon glyphicon-paperclip"></span>
 
-  def glyph(*names)
-    content_tag :i, nil, :class => names.map{|name| "icon-#{name.to_s.gsub('_','-')}" }
+  def glyph(*glyphicon_names)
+    safe_join(glyphicon_names.map do |name|
+                content_tag :span, nil, class: "glyphicon glyphicon-#{name.to_s.parameterize}"
+              end, "")
   end
-end
+end

data/app/helpers/modal_helper.rb

@@ -2,21 +2,26 @@ module ModalHelper
 
   #modals have a header, a body, a footer for options.
   def modal_dialog(options = {}, &block)
-    content_tag :div, :id => options[:id], :class => "bootstrap-modal modal hide fade" do
-      modal_header(options[:header]) +
-      modal_body(options[:body]) +
-      modal_footer(options[:footer])
+    content_tag :div, :id => options[:id], :class => "modal fade", :role => "dialog" do
+      content_tag :div, class: 'modal-dialog' do
+        content_tag :div, class: 'modal-content' do
+          modal_header(options[:header]) +
+          modal_body(options[:body]) +
+          modal_footer(options[:footer])
+        end
+      end
     end
   end
 
   def modal_header(options = {}, &block)
+    dismiss = options.delete(:dismiss) || 'modal'
     content_tag :div, :class => 'modal-header' do
-      if options[:show_close] 
-        close_button(options[:dismiss]) +
-        content_tag(:h3, options[:title], &block)
+      if options[:show_close]
+        close_button(dismiss) +
+        content_tag(:h4, options[:title], :class => 'modal-title', &block)
       else
-        content_tag(:h3, options[:title], &block)
-      end	
+        content_tag(:h4, options[:title], :class => 'modal-title', &block)
+      end
     end
   end
 
@@ -29,26 +34,25 @@ module ModalHelper
     end
 
   def close_button(dismiss)
-    #It doesn't seem to like content_tag, so we do this instead.	
-    raw("<button class=\"close\" data-dismiss=\"#{dismiss}\">&times;</button>")
+    content_tag :button, "&times;".html_safe, :class => "close", "data-dismiss" => "#{dismiss}", "aria-hidden" => "true"
   end
 
   def modal_toggle(content_or_options = nil, options = {}, &block)
     if block_given?
       options = content_or_options if content_or_options.is_a?(Hash)
-      default_options = { :class => 'btn', "data-toggle" => "modal", "href" => options[:dialog] }.merge(options)
+      default_options = { :class => 'btn', "data-toggle" => "modal", "data-target" => options.delete[:dialog] }.merge(options)
 
       content_tag :a, nil, default_options, true, &block
     else
-      default_options = { :class => 'btn', "data-toggle" => "modal", "href" => options[:dialog] }.merge(options)
+      default_options = { :class => 'btn', "data-toggle" => "modal", "data-target" => options.delete(:dialog) }.merge(options)
       content_tag :a, content_or_options, default_options, true
     end
   end
 
   def modal_cancel_button content, options = {}
-    default_options = { :class => "btn bootstrap-modal-cancel-button" }
+    default_options = { :class => "btn btn-default", :data => { dismiss: "modal" } }
 
-    content_tag_string "a", content, default_options.merge(options)
+    content_tag_string :button, content, default_options.merge(options)
   end
 
 end

data/app/helpers/nav_helper.rb

@@ -0,0 +1,40 @@
+module NavHelper
+  NAV_CLASS = 'nav'.freeze
+  NAV_TABS_CLASS = 'nav-tabs'.freeze
+  NAV_PILLS_CLASS = 'nav-pills'.freeze
+  NAV_CLASSES = [NAV_TABS_CLASS, NAV_PILLS_CLASS]
+
+  def nav(options = {}, type = NAV_TABS_CLASS, &block)
+    options, type = {}, options unless options.is_a?(Hash)
+    options[:class] ||= []
+    options[:class] = [*options[:class]]
+    options[:class].unshift(NAV_CLASS) unless options[:class].include?(NAV_CLASS)
+    options[:class] << type unless NAV_CLASSES.any? { |c| options[:class].include?(c) }
+
+    content_or_options_with_block = options if block_given?
+    content_tag(:ul, content_or_options_with_block, options, &block)
+  end
+  alias_method(:tabs, :nav)
+
+  def pills(*args, &block)
+    nav(*args, NAV_PILLS_CLASS, &block)
+  end
+
+  def nav_to(name = nil, options = nil, html_options = nil, &block)
+    if block_given?
+      url_options, html_options = name, options
+    else
+      url_options = options
+    end
+
+    url_options ||= {}
+
+    active = html_options.try(:delete, :active)
+    active = current_page?(url_options) if active.nil?
+    tab_class = active ? 'active' : nil
+
+    content_tag(:li, role: 'presentation', class: tab_class) do
+      link_to(name, options, html_options, &block)
+    end
+  end
+end

data/app/helpers/twitter_breadcrumbs_helper.rb

@@ -1,5 +1,11 @@
 module TwitterBreadcrumbsHelper
-  def render_breadcrumbs(divider = '/')
-    render :partial => 'twitter-bootstrap/breadcrumbs', :locals => { :divider => divider }
+  def render_breadcrumbs(options = {}, &block)
+    return unless breadcrumbs?
+    content = render(options[:partial] || 'bootstrap_sass_extras/breadcrumbs')
+    if block_given?
+      capture(content, &block)
+    else
+      content
+    end
   end
 end

data/app/helpers/url_helper.rb

@@ -0,0 +1,28 @@
+module UrlHelper
+  BUTTON_CLASSES = ['btn-default', 'btn-primary', 'btn-success', 'btn-info', 'btn-warning',
+    'btn-danger', 'btn-link'].freeze
+
+  def self.included(class_)
+    class_.class_eval do
+      def button_to(*args, &proc)
+        args << nil if args.length < 2
+        args << {} if args.length < 3
+        button_to_with_bootstrap(*args, &proc)
+        super(*args, &proc)
+      end
+    end
+  end
+
+  def button_to_with_bootstrap(name = nil, options = nil, html_options = {}, &block)
+    html_options[:class] ||= []
+    html_options[:class] = [*html_options[:class]]
+
+    # Expand space-separated class strings so that each has its own spot in the class array
+    html_options[:class] = html_options[:class].map { |c| c.split }.flatten
+
+    html_options[:class].unshift('btn') unless html_options[:class].include?('btn')
+    if html_options[:class].select { |cls| UrlHelper::BUTTON_CLASSES.include?(cls) }.empty?
+      html_options[:class] << 'btn-default'
+    end
+  end
+end

data/app/views/bootstrap_sass_extras/_breadcrumbs.html.erb

@@ -0,0 +1,6 @@
+<ol class="breadcrumb">
+  <% @breadcrumbs[0..-2].each do |crumb| %>
+    <li><%= link_to crumb[:name], crumb[:url], crumb[:options] %></li>
+  <% end %>
+  <li class="active"><%= last_breadcrumb_name %></li>
+</ol>

data/bootstrap-sass-extras.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
+
   gem.add_dependency "rails", ">= 3.1.0"
 
   gem.add_development_dependency "rspec-rails"

data/lib/bootstrap-sass-extras/breadcrumbs.rb

@@ -0,0 +1,57 @@
+module BootstrapSassExtras
+  module BreadCrumbs
+    def self.included(base)
+      base.extend(ClassMethods)
+      base.helper_method :breadcrumbs?,
+                         :breadcrumb_names,
+                         :last_breadcrumb_name
+    end
+
+    module ClassMethods
+      def add_breadcrumb(name, url, options = {})
+        class_name = self.name
+        before_action options do |controller|
+          if name.is_a?(Symbol)
+            name = controller.send :translate_breadcrumb, name, class_name
+          end
+          controller.send :add_breadcrumb, name, url
+        end
+      end
+    end
+
+    protected
+
+    def add_breadcrumb(name, url = '', options = {})
+      @breadcrumbs ||= []
+      name = translate_breadcrumb(name, self.class.name) if name.is_a?(Symbol)
+      url = send(url) if url.is_a?(Symbol)
+      @breadcrumbs << { name: name, url: url, options: options }
+    end
+
+    def translate_breadcrumb(name, class_name)
+      scope = [:breadcrumbs]
+      namespace = class_name.underscore.split('/')
+      namespace.last.sub!('_controller', '')
+      scope << namespace
+
+      I18n.t name, scope: scope
+    end
+
+    def clear_breadcrumbs
+      @breadcrumbs = nil
+    end
+
+    def breadcrumbs?
+      Array(@breadcrumbs).any?
+    end
+
+    def breadcrumb_names
+      Array(@breadcrumbs).map { |breadcrumb| breadcrumb[:name] }
+    end
+
+    def last_breadcrumb_name
+      return unless crumb = Array(@breadcrumbs).last
+      crumb[:name]
+    end
+  end
+end

data/lib/bootstrap-sass-extras/engine.rb

@@ -1,11 +1,17 @@
+require File.dirname(__FILE__) + '/breadcrumbs.rb'
 module BootstrapSassExtras
   class Engine < ::Rails::Engine
     initializer 'bootstrap-sass-extras.setup_helpers' do |app|
       app.config.to_prepare do
         ActionController::Base.send :helper, BootstrapFlashHelper
+        ActionController::Base.send :helper, BootstrapViewportMetaHelper
         ActionController::Base.send :helper, GlyphHelper
+        ActionController::Base.send :helper, BadgeHelper
         ActionController::Base.send :helper, ModalHelper
+        ActionController::Base.send :helper, NavHelper
         ActionController::Base.send :helper, TwitterBreadcrumbsHelper
+        ActionController::Base.send :helper, UrlHelper
+        ActionController::Base.send :include, BootstrapSassExtras::BreadCrumbs
       end
     end
   end

data/lib/bootstrap-sass-extras/version.rb

@@ -1,3 +1,3 @@
 module BootstrapSassExtras
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/lib/generators/bootstrap/install/templates/en.bootstrap.yml

@@ -11,6 +11,7 @@ en:
       destroy: "Delete"
       new: "New"
       edit: "Edit"
+      show: "Show"
     titles:
       edit: "Edit"
       save: "Save"

data/lib/generators/bootstrap/layout/layout_generator.rb

@@ -6,15 +6,12 @@ module Bootstrap
       source_root File.expand_path("../templates", __FILE__)
       desc "This generator generates layout file with navigation."
       argument :layout_name, :type => :string, :default => "application"
-      argument :layout_type, :type => :string, :default => "fixed",
-               :banner => "*fixed or fluid"
 
-      attr_reader :app_name, :container_class
+      attr_reader :app_name
 
       def generate_layout
         app = ::Rails.application
         @app_name = app.class.to_s.split("::").first
-        @container_class = layout_type == "fluid" ? "container-fluid" : "container"
         ext = app.config.generators.options[:rails][:template_engine] || :erb
         template "layout.html.#{ext}", "app/views/layouts/#{layout_name}.html.#{ext}"
       end

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

@@ -3,107 +3,89 @@
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <%%= viewport_meta_tag %>
     <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>
+      <script src="//cdnjs.cloudflare.com/ajax/libs/respond.js/1.3.0/respond.js" type="text/javascript"></script>
     <![endif]-->
 
-    <%%= stylesheet_link_tag "application", :media => "all" %>
+    <%%= stylesheet_link_tag "application", media: "all" %>
 
     <!-- For third-generation iPad with high-resolution Retina display: -->
     <!-- Size should be 144 x 144 pixels -->
-    <%%= 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-144x144-precomposed.png', rel: 'apple-touch-icon-precomposed', type: 'image/png', sizes: '144x144' %>
 
     <!-- For iPhone with high-resolution Retina display: -->
     <!-- Size should be 114 x 114 pixels -->
-    <%%= favicon_link_tag 'apple-touch-icon-114x114-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '114x114' %>
+    <%%= favicon_link_tag 'apple-touch-icon-114x114-precomposed.png', rel: 'apple-touch-icon-precomposed', type: 'image/png', sizes: '114x114' %>
 
     <!-- For first- and second-generation iPad: -->
     <!-- Size should be 72 x 72 pixels -->
-    <%%= favicon_link_tag 'apple-touch-icon-72x72-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '72x72' %>
+    <%%= favicon_link_tag 'apple-touch-icon-72x72-precomposed.png', rel: 'apple-touch-icon-precomposed', type: 'image/png', sizes: '72x72' %>
 
     <!-- For non-Retina iPhone, iPod Touch, and Android 2.1+ devices: -->
     <!-- Size should be 57 x 57 pixels -->
-    <%%= favicon_link_tag 'apple-touch-icon-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png' %>
+    <%%= favicon_link_tag 'apple-touch-icon-precomposed.png', rel: 'apple-touch-icon-precomposed', type: 'image/png' %>
 
     <!-- For all other devices -->
     <!-- Size should be 32 x 32 pixels -->
-    <%%= favicon_link_tag 'favicon.ico', :rel => 'shortcut icon' %>
+    <%%= favicon_link_tag 'favicon.ico', rel: 'shortcut icon' %>
+    <%%= javascript_include_tag "application" %>
   </head>
   <body>
 
-    <div class="navbar navbar-<%= layout_type %>-top">
-      <div class="navbar-inner">
-        <div class="<%= container_class %>">
-          <a class="btn btn-navbar" data-target=".nav-collapse" data-toggle="collapse">
+    <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
+      <div class="container">
+        <!-- Brand and toggle get grouped for better mobile display -->
+        <div class="navbar-header">
+          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
+            <span class="sr-only">Toggle navigation</span>
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
-          </a>
-          <a class="brand" href="#"><%= app_name %></a>
-          <div class="<%= container_class %> nav-collapse">
-            <ul class="nav">
-              <li><%%= link_to "Link1", "/path1"  %></li>
-              <li><%%= link_to "Link2", "/path2"  %></li>
-              <li><%%= link_to "Link3", "/path3"  %></li>
-            </ul>
-          </div><!--/.nav-collapse -->
+          </button>
+          <a class="navbar-brand" href="#"><%= app_name%></a>
         </div>
+
+        <!-- Collect the nav links, forms, and other content for toggling -->
+        <div class="navbar-collapse collapse navbar-responsive-collapse">
+          <ul class="nav navbar-nav">
+            <li class="active"><%%= link_to "Link1", '#' %></li>
+            <li><%%= link_to "Link2", '#' %></li>
+            <li><%%= link_to "Link3", '#' %></li>
+          </ul>
+        </div><!-- /.navbar-collapse -->
       </div>
-    </div>
+    </nav>
 
-    <div class="<%= container_class %>">
-      <%- if layout_type == "fluid" -%>
-      <div class="row-fluid">
-        <div class="span3">
+    <div class="container">
+      <div class="row">
+        <div class="col-md-9">
+          <%%= bootstrap_flash %>
+          <%%= yield %>
+        </div>
+        <div class="col-md-3">
           <div class="well sidebar-nav">
+            <h3>Sidebar</h3>
             <ul class="nav nav-list">
               <li class="nav-header">Sidebar</li>
-              <li><%%= link_to "Link1", "/path1"  %></li>
-              <li><%%= link_to "Link2", "/path2"  %></li>
-              <li><%%= link_to "Link3", "/path3"  %></li>
+              <li><%%= link_to "Link1", "#"  %></li>
+              <li><%%= link_to "Link2", "#"  %></li>
+              <li><%%= link_to "Link3", "#"  %></li>
             </ul>
           </div><!--/.well -->
         </div><!--/span-->
-        <div class="span9">
-          <%%= bootstrap_flash %>
-          <%%= yield %>
-        </div>
       </div><!--/row-->
-      <%- else -%>
-        <div class="row">
-          <div class="span9">
-            <%%= bootstrap_flash %>
-            <%%= yield %>
-          </div>
-          <div class="span3">
-            <div class="well sidebar-nav">
-              <h3>Sidebar</h3>
-              <ul class="nav nav-list">
-                <li class="nav-header">Sidebar</li>
-                <li><%%= link_to "Link1", "/path1"  %></li>
-                <li><%%= link_to "Link2", "/path2"  %></li>
-                <li><%%= link_to "Link3", "/path3"  %></li>
-              </ul>
-            </div><!--/.well -->
-          </div><!--/span-->
-        </div><!--/row-->
-      <%- end -%>
 
       <footer>
-        <p>&copy; Company 2013</p>
+        <p>&copy; Company <%= Date.today.year %></p>
       </footer>
 
     </div> <!-- /container -->
 
-    <!-- Javascripts
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <%%= javascript_include_tag "application" %>
-
   </body>
 </html>