bootstrap-navbar 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4fc1d1d81a16651072e930c183d430d1eb262e7
-  data.tar.gz: 7257a1c996bc8c11274f73893dcfbad43e4c0b24
+  metadata.gz: cfcaa232c9de0ba3888c8f87b6dc1c15b14edbb7
+  data.tar.gz: 7c4a7698d6211e01f89e42f93a144c19dd3532a0
 SHA512:
-  metadata.gz: 8d84f575dcaf1bc3a9929bffd6a82951b0737aaf91b71ee23ee664d4f46431d00e1bc52f1eb5bf0f995602c9fd591f764ceaa8a4d4846125dd0652d4696d8828
-  data.tar.gz: f36eead4d4ed5cd0d320eaf0c73f501ad126035682c502de6a55c548a2504a3503a89bcf3d811db8e1b39a7d8cf9502c534c64822eff77415475b96f4165a456
+  metadata.gz: 43ab97ee7b8af682f3f754c99f06beb5e8da86a17188d07939a1e63a5c582541c8bc32ee67c79004d4a54781e1edc6d4ae1532cc8e60e3a02dded4e0939d8e0c
+  data.tar.gz: 963c39652f38113cae133e98f66f14e7756c003eb97c59bfe1d568a16b07f22f1fc94cd083713c09e8a413cff1c292f3817077ad8d3e3a75202e01723ea5a687

data/.travis.yml

@@ -3,4 +3,5 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
-  - jruby-19mode
+  - 2.1.0
+  - jruby

data/README.md

@@ -1,9 +1,9 @@
 # BootstrapNavbar
 
 [![Gem Version](https://badge.fury.io/rb/bootstrap-navbar.png)](http://badge.fury.io/rb/bootstrap-navbar)
-[![Build Status](https://secure.travis-ci.org/krautcomputing/bootstrap-navbar.png)](http://travis-ci.org/krautcomputing/bootstrap-navbar)
-[![Dependency Status](https://gemnasium.com/krautcomputing/bootstrap-navbar.png)](https://gemnasium.com/krautcomputing/bootstrap-navbar)
-[![Code Climate](https://codeclimate.com/github/krautcomputing/bootstrap-navbar.png)](https://codeclimate.com/github/krautcomputing/bootstrap-navbar)
+[![Build Status](https://secure.travis-ci.org/bootstrap-ruby/bootstrap-navbar.png)](http://travis-ci.org/bootstrap-ruby/bootstrap-navbar)
+[![Dependency Status](https://gemnasium.com/bootstrap-ruby/bootstrap-navbar.png)](https://gemnasium.com/bootstrap-ruby/bootstrap-navbar)
+[![Code Climate](https://codeclimate.com/github/bootstrap-ruby/bootstrap-navbar.png)](https://codeclimate.com/github/bootstrap-ruby/bootstrap-navbar)
 
 Helpers to generate a Twitter Bootstrap style navbar
 
@@ -12,7 +12,7 @@ Helpers to generate a Twitter Bootstrap style navbar
 This gem only provides a helper module with methods to generate HTML. It can be used by other gems to make these helpers available to a framework's rendering engine, e.g.:
 
 * For Rails: https://github.com/julescopeland/Rails-Bootstrap-Navbar
-* For [Middleman](http://middlemanapp.com/): https://github.com/krautcomputing/middleman-bootstrap-navbar
+* For [Middleman](http://middlemanapp.com/): https://github.com/bootstrap-ruby/middleman-bootstrap-navbar
 
 In short: __Unless you know what you're doing, do not use this gem directly in your app!__
 
@@ -69,9 +69,9 @@ ActionView::Base.send :include, BootstrapNavbar::Helpers
 
 Since the navbar format changed quite a bit between Bootstrap 2.x and 3.x, generating them using this gem is quite different as well. Check out the Wiki pages for detailed instructions:
 
-[Usage with Bootstrap 2.x](https://github.com/krautcomputing/bootstrap-navbar/wiki/Usage-with-Bootstrap-2.x)
+[Usage with Bootstrap 2.x](https://github.com/bootstrap-ruby/bootstrap-navbar/wiki/Usage-with-Bootstrap-2.x)
 
-[Usage with Bootstrap 3.x](https://github.com/krautcomputing/bootstrap-navbar/wiki/Usage-with-Bootstrap-3.x)
+[Usage with Bootstrap 3.x](https://github.com/bootstrap-ruby/bootstrap-navbar/wiki/Usage-with-Bootstrap-3.x)
 
 ## Contributing
 

data/bootstrap-navbar.gemspec

@@ -10,10 +10,10 @@ Gem::Specification.new do |gem|
   gem.version       = BootstrapNavbar::VERSION
   gem.platform      = Gem::Platform::RUBY
   gem.authors       = ['Manuel Meurer']
-  gem.email         = 'manuel.meurer@gmail.com'
+  gem.email         = 'manuel@krautcomputing.com'
   gem.summary       = 'Helpers to generate a Twitter Bootstrap style navbar'
   gem.description   = 'Helpers to generate a Twitter Bootstrap style navbar'
-  gem.homepage      = 'https://github.com/krautcomputing/bootstrap-navbar'
+  gem.homepage      = 'https://github.com/bootstrap-ruby/bootstrap-navbar'
   gem.license       = 'MIT'
 
   gem.files         = `git ls-files`.split($/)

data/lib/bootstrap-navbar.rb

@@ -3,7 +3,7 @@ require 'gem_config'
 module BootstrapNavbar
   include GemConfig::Base
 
-  BOOTSTRAP_VERSIONS = %w(3.0.3 3.0.2 3.0.1 3.0.0 2.3.2 2.3.1 2.3.0 2.2.2 2.2.1 2.2.0 2.1.1 2.1.0 2.0.4 2.0.3 2.0.2 2.0.1 2.0.0)
+  BOOTSTRAP_VERSIONS = %w(3.1.0 3.0.3 3.0.2 3.0.1 3.0.0 2.3.2 2.3.1 2.3.0 2.2.2 2.2.1 2.2.0 2.1.1 2.1.0 2.0.4 2.0.3 2.0.2 2.0.1 2.0.0)
 
   with_configuration do
     has :bootstrap_version, classes: [String, NilClass], values: BOOTSTRAP_VERSIONS.unshift(nil)

data/lib/bootstrap-navbar/helpers/bootstrap3.rb

@@ -1,12 +1,11 @@
 module BootstrapNavbar::Helpers::Bootstrap3
   def navbar(options = {}, &block)
-    container = options.has_key?(:container) ? options[:container] : true
     navbar_content =
       header(options.delete(:brand), options.delete(:brand_link)) <<
       collapsable(&block)
     wrapper options do
-      if container
-        container(navbar_content)
+      unless options[:container] == false
+        container(options[:container], navbar_content)
       else
         navbar_content
       end
@@ -115,9 +114,12 @@ HTML
 
   private
 
-  def container(content)
+  def container(type, content)
+    css_class = 'container'
+    css_class << "-#{type}" if type.is_a?(String)
+    attributes = attributes_for_tag(class: css_class)
     prepare_html <<-HTML.chomp!
-<div class="container">
+<div#{attributes}>
   #{content}
 </div>
 HTML

data/lib/bootstrap-navbar/version.rb

@@ -1,3 +1,3 @@
 module BootstrapNavbar
-  VERSION = '1.0.2'
+  VERSION = '1.1.0'
 end

data/spec/bootstrap-navbar/helpers/bootstrap3_spec.rb

@@ -66,6 +66,11 @@ describe BootstrapNavbar::Helpers::Bootstrap3 do
             without_tag :div, with: { class: 'container' }
           end
         end
+        with_version '3.1.0' do
+          expect(renderer.navbar(container: 'fluid')).to have_tag(:nav, with: { class: 'navbar navbar-default' }) do
+            with_tag :div, with: { class: 'container-fluid' }
+          end
+        end
       end
     end
 

data/spec/support/helpers.rb

@@ -16,20 +16,13 @@ module Helpers
     with_versions '3'...'4', &block
   end
 
-  def with_versions(versions, &block)
-    versions = case versions
-    when String
-      raise "#{versions} is not a valid version!" unless BootstrapNavbar::BOOTSTRAP_VERSIONS.include?(versions)
-      [versions]
-    when Range
-      BootstrapNavbar::BOOTSTRAP_VERSIONS.select do |version|
-        versions.cover?(version)
-      end
-    else
-      raise "Please pass a string or a range to this method, not a #{versions.class}."
-    end
+  def with_version(version, &block)
+    with_versions version..version, &block
+  end
 
-    versions.each do |version|
+  def with_versions(versions, &block)
+    BootstrapNavbar::BOOTSTRAP_VERSIONS.each do |version|
+      next unless versions.cover?(version)
       puts "Testing version #{version}..."
       BootstrapNavbar.configuration.bootstrap_version = version
       block.call

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-navbar
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Manuel Meurer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-08 00:00:00.000000000 Z
+date: 2014-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.4
 description: Helpers to generate a Twitter Bootstrap style navbar
-email: manuel.meurer@gmail.com
+email: manuel@krautcomputing.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -131,7 +131,7 @@ files:
 - spec/bootstrap-navbar/helpers_spec.rb
 - spec/spec_helper.rb
 - spec/support/helpers.rb
-homepage: https://github.com/krautcomputing/bootstrap-navbar
+homepage: https://github.com/bootstrap-ruby/bootstrap-navbar
 licenses:
 - MIT
 metadata: {}
@@ -151,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Helpers to generate a Twitter Bootstrap style navbar