bootstrap-navbar 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0486f20fd1cce816f2193140268cecc4d586e043
-  data.tar.gz: 2b581e4521985b728f3b72ae5341d219459529d9
+  metadata.gz: d4fc1d1d81a16651072e930c183d430d1eb262e7
+  data.tar.gz: 7257a1c996bc8c11274f73893dcfbad43e4c0b24
 SHA512:
-  metadata.gz: 53f00d99073df7999fd2e7f4e2ce02029730d964d5e647a6c0968d93e7cf068bc362b2a6421c3a61a0ec2519c08bd7b0ce5d5058565019777331eb7e8fb6ebfc
-  data.tar.gz: 8c6a54de102d5777e22e692fbbdcbc102358c329797cdb2f012297d43e5a2110b3a38a11dd2dc05865a21a1371a108bee3dce66a0bb615383c6e77b4db34acfd
+  metadata.gz: 8d84f575dcaf1bc3a9929bffd6a82951b0737aaf91b71ee23ee664d4f46431d00e1bc52f1eb5bf0f995602c9fd591f764ceaa8a4d4846125dd0652d4696d8828
+  data.tar.gz: f36eead4d4ed5cd0d320eaf0c73f501ad126035682c502de6a55c548a2504a3503a89bcf3d811db8e1b39a7d8cf9502c534c64822eff77415475b96f4165a456

data/bootstrap-navbar.gemspec

@@ -28,5 +28,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'padrino-helpers', '~> 0.11.2'
   # Listen >= 2.0.0 only works with Ruby >= 1.9.3
   gem.add_development_dependency 'listen', '< 2.0.0' if RUBY_VERSION < '1.9.3'
+  gem.add_development_dependency 'bootstrap-sass', '3.0.2.0'
   gem.add_runtime_dependency 'gem_config', '~> 0.2.4'
 end

data/lib/bootstrap-navbar.rb

@@ -3,10 +3,10 @@ require 'gem_config'
 module BootstrapNavbar
   include GemConfig::Base
 
-  BOOTSTRAP_VERSIONS = %w(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.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, values: BOOTSTRAP_VERSIONS
+    has :bootstrap_version, classes: [String, NilClass], values: BOOTSTRAP_VERSIONS.unshift(nil)
     has :current_url_method, classes: String
   end
 end
@@ -15,4 +15,3 @@ require_relative 'bootstrap-navbar/version'
 require_relative 'bootstrap-navbar/helpers'
 require_relative 'bootstrap-navbar/helpers/bootstrap2'
 require_relative 'bootstrap-navbar/helpers/bootstrap3'
-require_relative 'bootstrap-navbar/railtie' if defined?(Rails)

data/lib/bootstrap-navbar/helpers.rb

@@ -1,6 +1,14 @@
 module BootstrapNavbar::Helpers
   def self.included(base)
-    raise 'Bootstrap version is not configured.' if BootstrapNavbar.configuration.bootstrap_version.nil?
+    if BootstrapNavbar.configuration.bootstrap_version.nil?
+      if Gem.loaded_specs.keys.include?('bootstrap-sass')
+        bootstrap_sass_version = Gem.loaded_specs['bootstrap-sass'].version
+        bootstrap_version = bootstrap_sass_version.segments.take(3).join('.')
+        BootstrapNavbar.configuration.bootstrap_version = bootstrap_version
+      else
+        raise 'Bootstrap version is not configured.'
+      end
+    end
     helper_version = BootstrapNavbar.configuration.bootstrap_version[0]
     base.send :include, const_get("Bootstrap#{helper_version}")
   end

data/lib/bootstrap-navbar/version.rb

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

data/spec/bootstrap-navbar/helpers_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+describe BootstrapNavbar::Helpers do
+  describe 'including' do
+    context 'when Bootstrap version is set' do
+      before do
+        BootstrapNavbar.configuration.bootstrap_version = '3.0.2'
+      end
+
+      it "doesn't raise an exception" do
+        expect do
+          Class.new do
+            include BootstrapNavbar::Helpers
+          end
+        end.to_not raise_exception
+      end
+    end
+
+    context 'when Bootstrap version is not set' do
+      before do
+        BootstrapNavbar.configuration.bootstrap_version = nil
+      end
+
+      context 'when bootstrap-sass gem is not loaded' do
+        before do
+          # Remove bootstrap-sass from loaded specs
+          loaded_specs = Gem.loaded_specs.dup
+          loaded_specs.delete('bootstrap-sass')
+          Gem.stub(:loaded_specs).and_return(loaded_specs)
+        end
+
+        it 'raises an exception' do
+          expect(Gem.loaded_specs.keys).to_not include('bootstrap-sass')
+          expect do
+            Class.new do
+              include BootstrapNavbar::Helpers
+            end
+          end.to raise_exception('Bootstrap version is not configured.')
+        end
+      end
+
+      context 'when bootstrap-sass gem is loaded' do
+        it 'sniffs the Bootstrap version from bootstrap-sass' do
+          expect(Gem.loaded_specs.keys).to include('bootstrap-sass')
+          expect do
+            Class.new do
+              include BootstrapNavbar::Helpers
+            end
+          end.to_not raise_exception
+          expect(BootstrapNavbar.configuration.bootstrap_version).to eq('3.0.2')
+        end
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,11 +1,12 @@
 require 'bootstrap-navbar'
 require 'rspec-html-matchers'
-require_relative 'helpers'
+
+Dir[File.expand_path('../support/**/*.rb', __FILE__)].each { |f| require f }
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
   config.order = 'random'
-  config.include Helpers
+  config.include ::Helpers
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-navbar
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Manuel Meurer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-27 00:00:00.000000000 Z
+date: 2013-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -80,6 +80,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.11.2
+- !ruby/object:Gem::Dependency
+  name: bootstrap-sass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.2.0
 - !ruby/object:Gem::Dependency
   name: gem_config
   requirement: !ruby/object:Gem::Requirement
@@ -111,12 +125,12 @@ files:
 - lib/bootstrap-navbar/helpers.rb
 - lib/bootstrap-navbar/helpers/bootstrap2.rb
 - lib/bootstrap-navbar/helpers/bootstrap3.rb
-- lib/bootstrap-navbar/railtie.rb
 - lib/bootstrap-navbar/version.rb
 - spec/bootstrap-navbar/helpers/bootstrap2_spec.rb
 - spec/bootstrap-navbar/helpers/bootstrap3_spec.rb
-- spec/helpers.rb
+- spec/bootstrap-navbar/helpers_spec.rb
 - spec/spec_helper.rb
+- spec/support/helpers.rb
 homepage: https://github.com/krautcomputing/bootstrap-navbar
 licenses:
 - MIT
@@ -144,6 +158,7 @@ summary: Helpers to generate a Twitter Bootstrap style navbar
 test_files:
 - spec/bootstrap-navbar/helpers/bootstrap2_spec.rb
 - spec/bootstrap-navbar/helpers/bootstrap3_spec.rb
-- spec/helpers.rb
+- spec/bootstrap-navbar/helpers_spec.rb
 - spec/spec_helper.rb
+- spec/support/helpers.rb
 has_rdoc: 

data/lib/bootstrap-navbar/railtie.rb

@@ -1,16 +0,0 @@
-require 'bootstrap-navbar'
-
-module BootstrapNavbar
-  class Railtie < Rails::Railtie
-    config.after_initialize do
-      # If Bootstrap version isn't set yet and the gem bootstrap-sass is loaded, sniff the Bootstrap version from it
-      if BootstrapNavbar.configuration.bootstrap_version.nil? && Gem.loaded_specs.keys.include?('bootstrap-sass')
-        bootstrap_sass_version = Gem.loaded_specs['bootstrap-sass'].version
-        bootstrap_version = bootstrap_sass_version.segments.take(3).join('.')
-        BootstrapNavbar.configure do |config|
-          config.bootstrap_version = bootstrap_version
-        end
-      end
-    end
-  end
-end