bootstrap-sass-extras 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d165bd438c4c33acac0cad0864b928f42d436733
-  data.tar.gz: 4ab9887d47bd243c30ad59a41cc9a9f3c712de2e
+  metadata.gz: f2fd823951114762be02d3bb4b0402cf542e6124
+  data.tar.gz: 6e25e239409425d864a4eb541f793ba0c2889080
 SHA512:
-  metadata.gz: 07750ab08f326dcc9d9518471a7fa22d1ae6d0d554aae885827bb4292614b0ced802005d2dd1a37c314e7a3643992235713efcad39a3276b7357854ddea1d90e
-  data.tar.gz: 66bf8e69ac9d677bf774850c2e1d08e6623138f3f1787581937ed203fbe0b6cb7009b81e48130a46242c001f20e3eee0dbceae69cccbcacdc31a8d096ee50f4c
+  metadata.gz: 9cf7c080d826188a1efaa4126a6d9b1552acc418336d8400da337b45738075973db00470a43fb68797be2148cecb18eb607992bed4ff35ea0c8e4727f45f7501
+  data.tar.gz: be5b543f525861c238c60285dc6322764c1f052917894e78eef8d64edd324013fd2004c5db61da9e985d993bcc051a029164dbdd2fa98cee1725beecd48f2aaa

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
-## Master (unreleased)
+## Release 0.0.6
+
+* Update to bootstrap 3.0
+* Add a `badge(badge_count)` helper by [@pdobb][]
+* Clean up codes by [@pdobb][]
 
 ## Release 0.0.5
 
@@ -26,4 +30,5 @@
 
 
 [@jonwaghorn]: https://github.com/jonwaghorn
+[@pdobb]: https://github.com/pdobb
 [@dabit]: https://github.com/dabit

data/Gemfile

@@ -3,4 +3,7 @@ source "http://rubygems.org"
 # Declare your gem's dependencies in bootstrap-sass-extras.gemspec.
 # Bundler will treat runtime dependencies like base dependencies, and
 # development dependencies will be added by default to the :development group.
-gemspec
+gemspec
+
+gem 'byebug'
+gem 'pry'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bootstrap-sass-extras (0.0.4)
+    bootstrap-sass-extras (0.0.6)
       rails (>= 3.1.0)
 
 GEM
@@ -34,8 +34,14 @@ GEM
     activesupport (3.2.13)
       i18n (= 0.6.1)
       multi_json (~> 1.0)
-    arel (3.0.2)
+    arel (3.0.3)
     builder (3.0.4)
+    byebug (2.5.0)
+      columnize (~> 0.3.6)
+      debugger-linecache (~> 1.2.0)
+    coderay (1.1.0)
+    columnize (0.3.6)
+    debugger-linecache (1.2.0)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     hike (1.2.1)
@@ -45,9 +51,14 @@ GEM
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.25)
+    method_source (0.8.2)
+    mime-types (1.25.1)
     multi_json (1.7.2)
     polyglot (0.3.3)
+    pry (0.9.12.4)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
@@ -84,6 +95,7 @@ GEM
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)
       rspec-mocks (~> 2.12.0)
+    slop (3.4.7)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -95,12 +107,14 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
+    tzinfo (0.3.38)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bootstrap-sass-extras!
+  byebug
+  pry
   rspec-rails
   sqlite3

data/README.md

@@ -5,6 +5,10 @@
   [1]: https://github.com/thomas-mcdonald/bootstrap-sass
   [2]: https://github.com/seyhunak/twitter-bootstrap-rails
 
+## Note
+
+From version 0.0.6, only support bootstrap 3. If you want to use bootstrap 2, please use version 0.0.5.
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -28,46 +32,47 @@ Generate locale
 
 Usage:
 
-
-    rails g bootstrap:install
-
+```ruby
+rails g bootstrap:install
+```
 
 Layout (generates Twitter Bootstrap compatible layout) - (Haml and Slim supported)
 
 
 Usage:
 
-
-    rails g bootstrap:layout [LAYOUT_NAME] [*fixed or fluid]
-
+```ruby
+rails g bootstrap:layout [LAYOUT_NAME] [*fixed or fluid]
+```
 
 Example of a fixed layout:
 
-
-    rails g bootstrap:layout application fixed
-
+```ruby
+rails g bootstrap:layout application fixed
+```
 
 Example of a responsive layout:
 
-
-    rails g bootstrap:layout application fluid
-
+```ruby
+rails g bootstrap:layout application fluid
+```
 
 Themed (generates Twitter Bootstrap compatible scaffold views.) - (Haml and Slim supported)
 
 
 Usage:
 
-
-    rails g bootstrap:themed [RESOURCE_NAME]
-
+```ruby
+rails g bootstrap:themed [RESOURCE_NAME]
+```
 
 Example:
 
-
-    rails g scaffold Post title:string description:text
-    rake db:migrate
-    rails g bootstrap:themed Posts
+```ruby
+rails g scaffold Post title:string description:text
+rake db:migrate
+rails g bootstrap:themed Posts
+```
 
 Notice the plural usage of the resource to generate bootstrap:themed.
 
@@ -77,30 +82,36 @@ Notice the plural usage of the resource to generate bootstrap:themed.
 Add the viewport meta helper `<%= viewport_meta_tag %>` to your layout
 (built-in with layout generator) to render the required meta tag for Bootstrap:
 
-    <meta content="width=device-width,initial-scale=1.0" name="viewport" />
+```html
+<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") %>
+```erb
+<%= viewport_meta_tag(:maximum_scale => "1.0") %>
+```
 
 Renders:
 
-    <meta content="width=device-width,initial-scale=1.0,maximum-scale=1.0" name="viewport" />
+```html
+<meta content="width=device-width,initial-scale=1.0,maximum-scale=1.0" name="viewport" />
+```
 
 ### Flash helper
 Add flash helper `<%= bootstrap_flash %>` to your layout (built-in with layout generator)
 
 ### Modal Helper
 You can create modals easily using the following example. The header, body, and footer all accept content_tag or plain html.
-The href of the button to launch the modal must matche the id of the modal dialog.
-
-```ruby
-<%= content_tag :a, "Modal", :href => "#modal", :class => 'btn', :data => {:toggle => modal'} %>
+The href of the button to launch the modal must match the id of the modal dialog.
 
+```erb
+<%= modal_toggle 'Modal', dialog: '#modal'%>
 <%= modal_dialog :id => "modal",
-         :header => { :show_close => true, :dismiss => 'modal', :title => 'Modal header' },
-                 :body   => 'This is the body',
-                 :footer => content_tag(:button, 'Save', :class => 'btn') %>
+         :header => { :show_close => true, :title => 'Modal header' },
+         :body   => 'This is the body',
+         :footer => content_tag(:button, 'Save', :class => 'btn btn-primary')
+%>
 ```
 
 ### Breadcrumbs Helpers
@@ -108,8 +119,6 @@ The href of the button to launch the modal must matche the id of the modal dialo
 *Notice* If your application is using [breadcrumbs-on-rails](https://github.com/weppos/breadcrumbs_on_rails) you will have a namespace collision with the add_breadcrumb method.
 You do not need to use these breadcrumb gems since this gem provides the same functionality out of the box without the additional dependency.
 
-Add breadcrumbs helper `<%= render_breadcrumbs %>` to your layout.
-
 ```ruby
 class ApplicationController
   add_breadcrumb :index, :root_path
@@ -126,18 +135,63 @@ class ExamplesController < ApplicationController
   def show
     @example = Example.find params[:id]
     add_breadcrumb @example.name, example_path(@example)
-    # add_breadcrumb :show, example_path(@example)
+    add_breadcrumb :show, example_path(@example)
   end
 end
 ```
 
-### Glyp Helper
+Finally, add the `<%= render_breadcrumbs %>` helper to your layout.
+
+You can wrap the breadcrumbs in an HTML element by using the block form like this:
+
+```erb
+<%= render_breadcrumbs do |breadcrumbs| %>
+  <%= content_tag(:div, breadcrumbs, class: "container") %>
+<% end %>
+
+# =>
+# <div class="container">
+#   <ol class="breadcrumb">
+#     <li> ... </li>
+#     <li class="active"> ... </li>
+#   </ol>
+# </div>
+```
+
+There are also a few interface methods available for working with the internal breadcrumbs hashes. The following methods are available in controllers and views.
+
+```ruby
+# Given previously added breadcrumbs:
+
+breadcrumbs?
+# => true
+
+breadcrumb_names
+# => ["example", "show"]
+```
+
+The following method is available to controllers only.
 
 ```ruby
-glyph(:share_alt)
-# => <i class="icon-share-alt"></i>
-glyph(:lock, :white)
-# => <i class="icon-lock icon-white"></i>
+clear_breadcrumbs
+# => nil
+```
+
+### Glyph Helper
+
+```erb
+<%= glyph(:star) %>
+# => <span class="glyphicon glyphicon-star"></span>
+
+<%= glyph(:star, :paperclip) %>
+# => <span class="glyphicon glyphicon-star"></span><span class="glyphicon glyphicon-paperclip"></span>
+```
+
+### Badge Helper
+
+```erb
+<%= badge(2) %>
+# => <span class="badge">2</span>
 ```
 
 ## Contributing

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,23 +1,25 @@
 module BootstrapFlashHelper
-  ALERT_TYPES = [:error, :info, :success, :warning]
+  ALERT_TYPES_MAP = {
+    notice: :success,
+    alert: :danger,
+    error: :danger,
+    info: :info,
+    warning: :warning
+  }
 
   def bootstrap_flash
-    output = ''
-    flash.each do |type, message|
-      next if message.blank?
-      type = :success if type == :notice
-      type = :error   if type == :alert
-      next unless ALERT_TYPES.include?(type)
-      output += flash_container(type, message)
-    end
-
-    raw(output)
+    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/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