bootstrap-sass-extras 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 550a564e70192941701c65f0c2f260f9214a238e
-  data.tar.gz: 71be55dfd76ad3476b5fead050a3666693905160
+  metadata.gz: d165bd438c4c33acac0cad0864b928f42d436733
+  data.tar.gz: 4ab9887d47bd243c30ad59a41cc9a9f3c712de2e
 SHA512:
-  metadata.gz: 3d87b9a5f91ad2dc39d345fed78f0807df9cde3f4e99da16424cd01dde79ed616bf3b05770e2bf671d30a15403c406eef52dceeb0a1ddac506784b1527a4dc28
-  data.tar.gz: eaf9f7312bc58f539c09b3aa4deab8b3cc96f340d124ce5487c51d1f990b6df960856334db0bb9747d72333f99cb12ebcc913bc8f920c91058e212ece3eb3cce
+  metadata.gz: 07750ab08f326dcc9d9518471a7fa22d1ae6d0d554aae885827bb4292614b0ced802005d2dd1a37c314e7a3643992235713efcad39a3276b7357854ddea1d90e
+  data.tar.gz: 66bf8e69ac9d677bf774850c2e1d08e6623138f3f1787581937ed203fbe0b6cb7009b81e48130a46242c001f20e3eee0dbceae69cccbcacdc31a8d096ee50f4c

data/CHANGELOG.md

@@ -1,6 +1,17 @@
 # Changelog
 
-## Relese 0.0.3
+## Master (unreleased)
+
+## Release 0.0.5
+
+* Adjust bootstrap_flash to match bootstrap alerts by [@jonwaghorn][]
+* Rails Form Helper for Bootstrap META tag  by [@dabit][]
+
+## Release 0.0.4
+
+* Fix BreadCrumbs Helper
+
+## Release 0.0.3
 
 * Add glyph, model and breadcrumbs helpers
 * Update templates
@@ -11,4 +22,8 @@
 
 ## Release 0.0.1
 
-* Initial version
+* Initial version
+
+
+[@jonwaghorn]: https://github.com/jonwaghorn
+[@dabit]: https://github.com/dabit

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bootstrap-sass-extras (0.0.1)
+    bootstrap-sass-extras (0.0.4)
       rails (>= 3.1.0)
 
 GEM
@@ -42,11 +42,10 @@ GEM
     i18n (0.6.1)
     journey (1.0.4)
     json (1.7.7)
-    mail (2.5.3)
-      i18n (>= 0.4.0)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.21)
+    mime-types (1.25)
     multi_json (1.7.2)
     polyglot (0.3.3)
     rack (1.4.5)
@@ -93,7 +92,7 @@ GEM
     sqlite3 (1.3.7)
     thor (0.17.0)
     tilt (1.3.6)
-    treetop (1.4.12)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)

data/README.md

@@ -73,6 +73,20 @@ Notice the plural usage of the resource to generate bootstrap:themed.
 
 ## Using Helpers
 
+### Viewport Meta Helper
+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" />
+
+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" />
+
 ### Flash helper
 Add flash helper `<%= bootstrap_flash %>` to your layout (built-in with layout generator)
 

data/app/helpers/bootstrap_flash_helper.rb

@@ -1,7 +1,13 @@
 module BootstrapFlashHelper
+  ALERT_TYPES = [:error, :info, :success, :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
 

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/lib/bootstrap-sass-extras/engine.rb

@@ -4,6 +4,7 @@ module BootstrapSassExtras
     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, ModalHelper
         ActionController::Base.send :helper, TwitterBreadcrumbsHelper

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

@@ -1,3 +1,3 @@
 module BootstrapSassExtras
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

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

@@ -3,7 +3,7 @@
   <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 %>
 

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

@@ -3,7 +3,7 @@
   %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 %>"
     = csrf_meta_tags
     / Le HTML5 shim, for IE6-8 support of HTML elements

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

@@ -3,7 +3,7 @@ html lang="en"
   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 %>"
     = csrf_meta_tags
 

data/spec/helpers/bootstrap_flash_helper_spec.rb

@@ -4,13 +4,38 @@ describe BootstrapFlashHelper do
   describe "bootstrap_flash" do
 
      it "should return flash message" do
-       stub!(:flash).and_return({:warning => "Update Success!"})
-       bootstrap_flash.should == "<div class=\"alert alert-warning\"><a class=\"close\" data-dismiss=\"alert\">&times;</a>Update Success!</div>"
+       stub!(:flash).and_return({:warning => "Update Warning!"})
+       bootstrap_flash.should == "<div class=\"alert alert-warning\"><a class=\"close\" data-dismiss=\"alert\">&times;</a>Update Warning!</div>"
      end
 
-     it "should return alert-success message when use notice message" do
+     it "should return alert-success message when using notice message" do
        stub!(:flash).and_return({:notice => "Update Success!"})
-       bootstrap_flash.should == "<div class=\"alert alert-notice\"><a class=\"close\" data-dismiss=\"alert\">&times;</a>Update Success!</div>"
+       bootstrap_flash.should == "<div class=\"alert alert-success\"><a class=\"close\" data-dismiss=\"alert\">&times;</a>Update Success!</div>"
+     end
+
+     it "should return alert-error message when using notice error" do
+       stub!(:flash).and_return({:error => "Update Failed!"})
+       bootstrap_flash.should == "<div class=\"alert alert-error\"><a class=\"close\" data-dismiss=\"alert\">&times;</a>Update Failed!</div>"
+     end
+
+     it "should return alert-error message when using alert message" do
+       stub!(:flash).and_return({:alert => "Update Alert!"})
+       bootstrap_flash.should == "<div class=\"alert alert-error\"><a class=\"close\" data-dismiss=\"alert\">&times;</a>Update Alert!</div>"
+     end
+
+     it "should return alert-info message when using info message" do
+       stub!(:flash).and_return({:info => "Update Information!"})
+       bootstrap_flash.should == "<div class=\"alert alert-info\"><a class=\"close\" data-dismiss=\"alert\">&times;</a>Update Information!</div>"
+     end
+
+     it "should return no message when using an undefined message" do
+       stub!(:flash).and_return({:undefined => "Update Undefined!"})
+       bootstrap_flash.should == ""
+     end
+
+     it "should return no message when the message is blank" do
+       stub!(:flash).and_return({:notice => ""})
+       bootstrap_flash.should == ""
      end
 
    end

data/spec/helpers/bootstrap_viewport_meta_helper_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe BootstrapViewportMetaHelper do
+  describe :viewport_meta_tag do
+    context "no arguments" do
+      it "should return the default viewport meta tag" do
+        viewport_meta_tag.should =="<meta content=\"width=device-width,initial-scale=1.0\" name=\"viewport\" />"
+      end
+    end
+
+    context "with arguments" do
+      it "should return the viewport meta tag with the specified options" do
+        viewport_meta_tag(initial_scale: "2.0").should =="<meta content=\"width=device-width,initial-scale=2.0\" name=\"viewport\" />"
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-sass-extras
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - doabit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-04 00:00:00.000000000 Z
+date: 2013-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -68,6 +68,7 @@ files:
 - README.md
 - Rakefile
 - app/helpers/bootstrap_flash_helper.rb
+- app/helpers/bootstrap_viewport_meta_helper.rb
 - app/helpers/glyph_helper.rb
 - app/helpers/modal_helper.rb
 - app/helpers/twitter_breadcrumbs_helper.rb
@@ -139,6 +140,7 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
 - spec/helpers/bootstrap_flash_helper_spec.rb
+- spec/helpers/bootstrap_viewport_meta_helper_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/doabit/bootstrap-sass-extras
 licenses: []
@@ -197,4 +199,6 @@ test_files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
 - spec/helpers/bootstrap_flash_helper_spec.rb
+- spec/helpers/bootstrap_viewport_meta_helper_spec.rb
 - spec/spec_helper.rb
+has_rdoc: