middleman-bootstrap-navbar 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6cc10d2d6d36697f3c8cc98f25cebf6d108a235
-  data.tar.gz: 8739a03d6aa19792f58c5273abded7a0b596b9ab
+  metadata.gz: aeec9fcceeb262b91949e635a1216241e3530cb2
+  data.tar.gz: 2fbb33bfd63bfcb8d31fefcf85f20978972ce145
 SHA512:
-  metadata.gz: 5404bce3d0fbbe7aaf47c19b6bdcac8c061218b5ea0e6c14a5d4f569bdefcfd80fd439d65d1fde7ac35ba44aabba2f277bd5ceaf5e5a170e50000cfc4a5a8ce1
-  data.tar.gz: 4625390a7f4bfda5ddb6955cb1247c91eb37f20f00a2f6bd0f203b02bc88340e24e42ec4b24142be793cf090cf7475e4eedd9ab034a8de1785abd4f7fb533764
+  metadata.gz: 2df6d5384fef5d9aebb5f22a4ac104c008d8f790e7eb9439e71246ef0910d265b92acd19193a92645532b2750cccc6d63fca03dbc429830ab7b52d588bb7000d
+  data.tar.gz: 40301735855e89eb8daa4a189bc6c4ac825fb68081371033d4c0eb4befda5dd1a9fd7adec39900fc6e6c474a6a18806789f2432e4e6e0b538139a83d503c7b8b

data/README.md

@@ -21,6 +21,10 @@ Or install it yourself as:
 
     $ gem install middleman-bootstrap-navbar
 
+## Requirements
+
+Bootstrap >= 2.0 should be available in your app, at least the CSS. Include at least the dropdown and responsive JS files if you want those features.
+
 ## Usage
 
 Activate in `config.rb` in your Middleman app:
@@ -51,7 +55,11 @@ Then generate your navbar:
       = menu_item "Log In", log_in_path
  ```
 
-Check out the [Twitter Bootstrap Docs](http://twitter.github.io/bootstrap/components.html#navbar) for more info.
+Check out the [Twitter Bootstrap Docs](http://twitter.github.io/bootstrap/components.html#navbar) for more info. All components mentioned there should be supported, so you don't need to write any HTML by hand. If there is something missing or wrong HTML is generated, please [open an issue](https://github.com/krautcomputing/middleman-bootstrap-navbar/issues).
+
+To see all supported options, please have a look at the [source file](https://github.com/krautcomputing/middleman-bootstrap-navbar/blob/master/lib/middleman-bootstrap-navbar/helpers.rb), it should be quite readable.
+
+Otherwise: just trust your instincts. Want a nav bar that's fixed to the bottom? Try `nav_bar fixed: :bottom`. Want a nav bar that is static? Try `nav_bar static: :top` or `nav_bar static: :bottom`.
 
 ## Inspiration
 

data/lib/middleman-bootstrap-navbar.rb

@@ -1,16 +1,18 @@
-require 'middleman-core/extensions' unless defined?(Middleman::Extensions)
 require 'middleman-bootstrap-navbar/version'
-require 'middleman-bootstrap-navbar/helpers'
+
+require 'bootstrap_navbar'
+BootstrapNavbar.current_url_method = 'current_page.url'
 
 module Middleman
   module BootstrapNavbar
     class << self
       def registered(app)
-        app.helpers Helpers
+        app.helpers ::BootstrapNavbar::Helpers
       end
       alias :included :registered
     end
   end
 end
 
+require 'middleman-core/extensions' unless defined?(Middleman::Extensions)
 Middleman::Extensions.register :bootstrap_navbar, Middleman::BootstrapNavbar

data/lib/middleman-bootstrap-navbar/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module BootstrapNavbar
-    VERSION = '0.0.3'
+    VERSION = '0.0.4'
   end
 end

data/middleman-bootstrap-navbar.gemspec

@@ -11,8 +11,8 @@ Gem::Specification.new do |gem|
   gem.platform      = Gem::Platform::RUBY
   gem.authors       = ['Manuel Meurer']
   gem.email         = 'manuel.meurer@gmail.com'
-  gem.summary       = 'Middleman extension to easily generate a Twitter Bootstrap navbar'
-  gem.description   = 'Middleman extension to easily generate a Twitter Bootstrap navbar'
+  gem.summary       = 'Middleman extension to easily generate a Twitter Bootstrap style navbar'
+  gem.description   = 'Middleman extension to easily generate a Twitter Bootstrap style navbar'
   gem.homepage      = 'https://github.com/krautcomputing/middleman-bootstrap-navbar'
   gem.license       = 'MIT'
 
@@ -23,8 +23,8 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'rake', '>= 10.0.0'
   gem.add_development_dependency 'rspec', '~> 2.13'
-  gem.add_development_dependency 'rspec-html-matchers', '~> 0.4.1'
   gem.add_development_dependency 'guard-rspec', '~> 3.0'
 
+  gem.add_runtime_dependency 'bootstrap_navbar', '~> 0.0.5'
   gem.add_runtime_dependency 'middleman-core', '>= 3.0'
 end

data/spec/spec_helper.rb

@@ -7,18 +7,3 @@ RSpec.configure do |config|
   config.filter_run :focus
   config.order = 'random'
 end
-
-unless defined?(Padrino::Helpers)
-  require 'vendored-middleman-deps/padrino-core-0.11.2/lib/padrino-core/support_lite'
-  require 'vendored-middleman-deps/padrino-helpers-0.11.2/lib/padrino-helpers'
-end
-
-module Middleman
-  module BootstrapNavbar
-    module Helpers
-      include Padrino::Helpers::TagHelpers
-      include Padrino::Helpers::AssetTagHelpers
-      include Padrino::Helpers::OutputHelpers
-    end
-  end
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-bootstrap-navbar
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Manuel Meurer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2013-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -39,33 +39,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.13'
 - !ruby/object:Gem::Dependency
-  name: rspec-html-matchers
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: bootstrap_navbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
+        version: 0.0.5
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: middleman-core
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +80,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
-description: Middleman extension to easily generate a Twitter Bootstrap navbar
+description: Middleman extension to easily generate a Twitter Bootstrap style navbar
 email: manuel.meurer@gmail.com
 executables: []
 extensions: []
@@ -94,10 +94,8 @@ files:
 - README.md
 - Rakefile
 - lib/middleman-bootstrap-navbar.rb
-- lib/middleman-bootstrap-navbar/helpers.rb
 - lib/middleman-bootstrap-navbar/version.rb
 - middleman-bootstrap-navbar.gemspec
-- spec/helpers_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/krautcomputing/middleman-bootstrap-navbar
 licenses:
@@ -122,8 +120,7 @@ rubyforge_project:
 rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
-summary: Middleman extension to easily generate a Twitter Bootstrap navbar
+summary: Middleman extension to easily generate a Twitter Bootstrap style navbar
 test_files:
-- spec/helpers_spec.rb
 - spec/spec_helper.rb
 has_rdoc: 

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

@@ -1,101 +0,0 @@
-module Middleman
-  module BootstrapNavbar
-    module Helpers
-      def nav_bar(options = {}, &block)
-        nav_bar_div options do
-          navbar_inner_div do
-            container_div options[:brand], options[:brand_link], options[:responsive], options[:fluid], &block
-          end
-        end
-      end
-
-      def menu_group(options = {}, &block)
-        classes = %w(nav)
-        classes << "pull-#{options[:pull]}" if options.has_key?(:pull)
-        content_tag :ul, nil, class: classes.join(' '), &block
-      end
-
-      def menu_item(name, path = '#', options = {})
-        content_tag :li, class: path.sub(%r(/\z), '') == current_page.url.sub(%r(/\z), '') ? 'active' : nil do
-          link_to name, path, options
-        end
-      end
-
-      def drop_down(name, &block)
-        content_tag :li, class: 'dropdown' do
-          name_and_caret = "#{name} #{content_tag :b, nil, class: 'caret'}".html_safe
-          link_to(name_and_caret, '#', class: 'dropdown-toggle', data: { toggle: 'dropdown' }) <<
-            content_tag(:ul, nil, class: 'dropdown-menu', &block)
-        end
-      end
-
-      def drop_down_divider
-        content_tag :li, nil, class: 'divider'
-      end
-
-      def drop_down_header(text)
-        content_tag :li, text, class: 'nav-header'
-      end
-
-      def menu_divider
-        content_tag :li, nil, class: 'divider-vertical'
-      end
-
-      def menu_text(text = nil, options = {}, &block)
-        classes = %w(navbar-text)
-        pull = options.delete(:pull)
-        classes << "pull-#{pull}" if pull
-        options[:class] = classes.join(' ')
-        content_tag :p, text, options, &block
-      end
-
-      def brand_link(name, url = nil)
-        link_to name, (url || '/'), class: 'brand'
-      end
-
-      private
-
-      def nav_bar_div(options, &block)
-        position = case
-        when options.has_key?(:static)
-          "static-#{options[:static]}"
-        when options.has_key?(:fixed)
-          "fixed-#{options[:fixed]}"
-        end
-
-        css_class = %w(navbar).tap do |css_class|
-          css_class << "navbar-#{position}" if position
-          css_class << 'navbar-inverse' if options[:inverse]
-        end.join(' ')
-
-        content_tag :div, class: css_class, &block
-      end
-
-      def navbar_inner_div(&block)
-        content_tag :div, class: 'navbar-inner', &block
-      end
-
-      def container_div(brand, brand_link, responsive, fluid, &block)
-        content_tag :div, class: fluid ? 'container-fluid' : 'container' do
-          [].tap do |parts|
-            parts << responsive_button if responsive
-            parts << brand_link(brand, brand_link) if brand || brand_link
-            parts << if responsive
-              content_tag :div, nil, class: 'nav-collapse collapse', &block
-            else
-              capture(&block)
-            end
-          end.join("\n").html_safe
-        end
-      end
-
-      def responsive_button
-        content_tag :a, class: 'btn btn-navbar', data: { toggle: 'collapse', target: '.nav-collapse' } do
-          (0..2).map do
-            content_tag :span, nil, class: 'icon-bar'
-          end.join("\n").html_safe
-        end
-      end
-    end
-  end
-end

data/spec/helpers_spec.rb

@@ -1,180 +0,0 @@
-require 'spec_helper'
-
-describe Middleman::BootstrapNavbar::Helpers do
-  subject do
-    Class.new do
-      extend Middleman::BootstrapNavbar::Helpers
-    end
-  end
-
-  describe '#nav_bar' do
-    context 'div.navbar' do
-      context '"static" parameter' do
-        it 'generates the correct HTML' do
-          subject.nav_bar(static: 'top').should have_tag(:div, with: { class: 'navbar navbar-static-top' })
-          subject.nav_bar(static: 'bottom').should have_tag(:div, with: { class: 'navbar navbar-static-bottom' })
-        end
-      end
-
-      context '"fixed" parameter' do
-        it 'generates the correct HTML' do
-          subject.nav_bar(fixed: 'top').should have_tag(:div, with: { class: 'navbar navbar-fixed-top' })
-          subject.nav_bar(fixed: 'bottom').should have_tag(:div, with: { class: 'navbar navbar-fixed-bottom' })
-        end
-      end
-
-      context '"inverse" parameter' do
-        it 'generates the correct HTML' do
-          subject.nav_bar(inverse: true).should have_tag(:div, with: { class: 'navbar navbar-inverse' })
-        end
-      end
-
-      context 'no parameters' do
-        it 'generates the correct HTML' do
-          subject.nav_bar.should have_tag(:div, with: { class: 'navbar' })
-          subject.nav_bar { 'foo' }.should have_tag(:div, with: { class: 'navbar' }, content: 'foo')
-        end
-      end
-    end
-
-    context 'div.navbar-inner' do
-      it 'generates the correct HTML' do
-        subject.nav_bar.should have_tag(:div, with: { class: 'navbar-inner' })
-      end
-    end
-
-    context 'div.container' do
-      it 'generates the correct HTML' do
-        subject.nav_bar.should have_tag(:div, with: { class: 'container' })
-      end
-    end
-
-    describe 'brand and brank_link parameters' do
-      it 'generates the correct HTML' do
-        subject.nav_bar(brand: 'foo').should have_tag(:a, with: { href: '/', class: 'brand' }, content: 'foo')
-        subject.nav_bar(brand: 'foo', brand_link: 'http://google.com').should have_tag(:a, with: { href: 'http://google.com', class: 'brand' }, content: 'foo')
-        subject.nav_bar(brand_link: 'http://google.com').should have_tag(:a, with: { href: 'http://google.com', class: 'brand' })
-      end
-    end
-
-    describe '"responsive" parameter' do
-      it 'generates the correct HTML' do
-        subject.nav_bar(responsive: true).should have_tag(:a, with: { class: 'btn btn-navbar', :'data-toggle' => 'collapse', :'data-target' => '.nav-collapse' }) do
-          3.times do
-            with_tag :span, with: { class: 'icon-bar' }
-          end
-        end
-      end
-    end
-
-    describe '"fluid" parameter' do
-      it 'generates the correct HTML' do
-        subject.nav_bar(fluid: true).should have_tag(:div, with: { class: 'container-fluid' })
-      end
-    end
-  end
-
-  describe '#menu_group' do
-    describe '"pull" parameter' do
-      it 'generates the correct HTML' do
-        subject.menu_group(pull: 'right').should have_tag(:ul, with: { class: 'nav pull-right' })
-      end
-    end
-
-    context 'no parameters' do
-      it 'generates the correct HTML' do
-        subject.menu_group.should have_tag(:ul, with: { class: 'nav' })
-        subject.menu_group { 'foo' }.should have_tag(:ul, with: { class: 'nav' }, content: 'foo')
-      end
-    end
-  end
-
-  describe '#menu_item' do
-    let(:current_page) { double('current_page') }
-
-    before do
-      subject.stub(:current_page).and_return(current_page)
-    end
-
-    context 'with current URL' do
-      it 'generates the correct HTML' do
-        current_page.stub(:url).and_return('/')
-        subject.menu_item('foo', '/').should have_tag(:li, with: { class: 'active' }) do
-          with_tag :a, with: { href: '/' }, content: 'foo'
-        end
-
-        current_page.stub(:url).and_return('/foo')
-        subject.menu_item('foo', '/foo').should have_tag(:li, with: { class: 'active' }) do
-          with_tag :a, with: { href: '/foo' }, content: 'foo'
-        end
-      end
-    end
-
-    context 'without current URL' do
-      it 'generates the correct HTML' do
-        current_page.stub(:url).and_return('/foo')
-        subject.menu_item('foo').should have_tag(:li, without: { class: 'active' }) do
-          with_tag :a, with: { href: '#' }, content: 'foo'
-        end
-        subject.menu_item('foo', '/').should have_tag(:li, without: { class: 'active' }) do
-          with_tag :a, with: { href: '/' }, content: 'foo'
-        end
-        subject.menu_item('foo', '/bar').should have_tag(:li, without: { class: 'active' }) do
-          with_tag :a, with: { href: '/bar' }, content: 'foo'
-        end
-
-        current_page.stub(:url).and_return('/')
-        subject.menu_item('foo', '/foo').should have_tag(:li, without: { class: 'active' }) do
-          with_tag :a, with: { href: '/foo' }, content: 'foo'
-        end
-      end
-    end
-  end
-
-  describe '#drop_down' do
-    it 'generates the correct HTML' do
-      subject.drop_down('foo').should have_tag(:li, with: { class: 'dropdown' }) do
-        with_tag :a, with: { href: '#', class: 'dropdown-toggle', :'data-toggle' => 'dropdown' } do
-          with_text /foo/
-          with_tag :b, with: { class: 'caret' }
-        end
-        with_tag :ul, with: { class: 'dropdown-menu' }
-      end
-
-      subject.drop_down('foo') { 'bar' }.should have_tag(:li, with: { class: 'dropdown' }) do
-        with_tag :a, with: { href: '#', class: 'dropdown-toggle', :'data-toggle' => 'dropdown' } do
-          with_text /foo/
-          with_tag :b, with: { class: 'caret' }
-        end
-        with_tag :ul, with: { class: 'dropdown-menu' }, content: 'bar'
-      end
-    end
-  end
-
-  describe '#drop_down_divider' do
-    it 'generates the correct HTML' do
-      subject.drop_down_divider.should have_tag(:li, with: { class: 'divider' }, content: '')
-    end
-  end
-
-  describe '#drop_down_header' do
-    it 'generates the correct HTML' do
-      subject.drop_down_header('foo').should have_tag(:li, with: { class: 'nav-header' }, content: 'foo')
-    end
-  end
-
-  describe '#menu_divider' do
-    it 'generates the correct HTML' do
-      subject.menu_divider.should have_tag(:li, with: { class: 'divider-vertical' }, content: '')
-    end
-  end
-
-  describe '#menu_text' do
-    it 'generates the correct HTML' do
-      subject.menu_text('foo').should have_tag(:p, with: { class: 'navbar-text' }, content: 'foo')
-      subject.menu_text { 'foo' }.should have_tag(:p, with: { class: 'navbar-text' }, content: 'foo')
-      subject.menu_text('foo', pull: 'right').should have_tag(:p, with: { class: 'navbar-text pull-right' }, content: 'foo')
-      subject.menu_text(nil, pull: 'left') { 'foo' }.should have_tag(:p, with: { class: 'navbar-text pull-left' }, content: 'foo')
-    end
-  end
-end