rails_bootstrap_navbar 0.1.5.beta → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 08a294d3504e41c43dd27f4c183bf58243cd57f4
+  data.tar.gz: e82098543b1fb6913381ecd4b37b8492985f0774
+SHA512:
+  metadata.gz: 0f129dd18542a02ec490426e1e5ad535c984d5b510f842974478d0fd5409beb7c633ecf3c5ce089908df71e8d1c3bdd3b6ecf2e29bbcf9e2ff1e4642a138269c
+  data.tar.gz: 79bc00ac03b4848f3844c71ffcf4051e234f735ed5295dadcb85e3a0f8cd32feb64403bee035c549f0c4d8ca9a11d19716f95d0dd8fd42ad747712e4892878ad

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.2.0
+
+* Use gem 'bootstrap_navbar' for HTML rendering
+
 ## v0.1.0
 
 * Initial release
@@ -26,4 +30,4 @@ These allow you to add dividers and headers into your dropdowns. Surprisingly en
 ## v0.1.5.beta
 
 * Minor fix - make menu_item link default to "#"
-* Readme updates
+* Readme updates

data/README.md

@@ -90,6 +90,23 @@ To render:
 	  </div>
 	</div>
 
+### Static navbar
+
+If you want a full-width navbar that scrolls away with the page, pass in the option like this:
+
+````
+<%= nav_bar :static => :top  %>
+````
+
+To render:
+
+	<div class="navbar navbar-static-top">
+	  <div class="navbar-inner">
+	    <div class="container">
+	    </div>
+	  </div>
+	</div>
+
 
 ### Brand name
 
@@ -187,6 +204,7 @@ For multi-level list options, where it makes logical sense to group menu items,
 	<%= drop_down "Products" do %>
 		<%= menu_item "Latest", latest_products_path %>
 		<%= menu_item "Top Sellers", popular_products_path %>
+		<%= drop_down_divider %>
 		<%= menu_item "Discount Items", discounted_products_path %>
 	<% end %>
 

data/lib/rails_bootstrap_navbar.rb

@@ -1,3 +1,2 @@
-require "rails_bootstrap_navbar/version"
-require "rails_bootstrap_navbar/view_helpers"
-require 'rails_bootstrap_navbar/railtie' if defined?(Rails)
+require 'rails_bootstrap_navbar/version'
+require 'rails_bootstrap_navbar/railtie' if defined?(Rails)

data/lib/rails_bootstrap_navbar/railtie.rb

@@ -1,8 +1,21 @@
-require 'rails_bootstrap_navbar/view_helpers'
+require 'bootstrap_navbar'
+
+BootstrapNavbar.current_url_method = if Rails.version >= '3.2'
+  'request.original_url'
+else
+  '[request.protocol, request.host_with_port, request.fullpath].join'
+end
+
+module BootstrapNavbar::Helpers
+  def prepare_html(html)
+    html.html_safe
+  end
+end
+
 module RailsBootstrapNavbar
   class Railtie < Rails::Railtie
-    initializer "rails_bootstrap_navbar.view_helpers" do
-      ActionView::Base.send :include, ViewHelpers
+    initializer 'rails_bootstrap_navbar.view_helpers' do
+      ActionView::Base.send :include, BootstrapNavbar::Helpers
     end
   end
-end
+end

data/lib/rails_bootstrap_navbar/version.rb

@@ -1,3 +1,3 @@
 module RailsBootstrapNavbar
-  VERSION = "0.1.5.beta"
+  VERSION = "0.2.0"
 end

data/rails_bootstrap_navbar.gemspec

@@ -15,8 +15,10 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = RailsBootstrapNavbar::VERSION
 
-  gem.add_development_dependency "rspec"
-  gem.add_development_dependency "rake"
+  gem.add_development_dependency 'rake', '>= 10.0.0'
+  gem.add_development_dependency 'rspec', '~> 2.13'
+  gem.add_development_dependency 'guard-rspec', '~> 3.0'
 
-  gem.add_runtime_dependency "rails", ">=3.0.0"
+  gem.add_runtime_dependency 'bootstrap_navbar', '~> 0.0.10'
+  gem.add_runtime_dependency 'rails', '>= 3.0.0'
 end

data/spec/spec_helper.rb

@@ -1 +1,8 @@
-require 'rails_bootstrap_navbar'
+require 'rails_bootstrap_navbar'
+
+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'
+end

metadata

@@ -1,49 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: rails_bootstrap_navbar
 version: !ruby/object:Gem::Version
-  version: 0.1.5.beta
-  prerelease: 6
+  version: 0.2.0
 platform: ruby
 authors:
 - Jules Copeland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-24 00:00:00.000000000Z
+date: 2013-07-21 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 10.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 10.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70328358193000 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *70328358193000
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.13'
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70328358192040 !ruby/object:Gem::Requirement
-    none: false
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70328358192040
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: bootstrap_navbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.10
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.10
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70328358191520 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70328358191520
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 description: A helper method for easy generation of Twitter Bootstrap Navigation menus
   in Rails
 email:
@@ -63,34 +99,31 @@ files:
 - lib/rails_bootstrap_navbar.rb
 - lib/rails_bootstrap_navbar/railtie.rb
 - lib/rails_bootstrap_navbar/version.rb
-- lib/rails_bootstrap_navbar/view_helpers.rb
 - rails_bootstrap_navbar.gemspec
-- spec/lib/rails_bootstrap_navbar/view_helpers_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Generate Bootstrap Navbars in Rails views
 test_files:
-- spec/lib/rails_bootstrap_navbar/view_helpers_spec.rb
 - spec/spec_helper.rb
+has_rdoc: 

data/lib/rails_bootstrap_navbar/view_helpers.rb

@@ -1,144 +0,0 @@
-require "rails_bootstrap_navbar/version"
-
-module RailsBootstrapNavbar
-	module ViewHelpers
-
-	  def nav_bar(options={}, &block)
-			nav_bar_div(options[:fixed]) do
-				navbar_inner_div do
-					container_div(options[:brand], options[:brand_link], options[:responsive], options[:fluid]) do
-						yield if block_given?
-					end
-				end
-			end
-	  end
-
-	  def menu_group(options={}, &block)
-			pull_class = " pull-#{options[:pull].to_s}" if options[:pull].present?
-			content_tag(:ul, :class => "nav#{pull_class}", &block)
-	  end
-
-	  def menu_item(name, path="#", *args)
-			options = args.extract_options!
-			content_tag :li, :class => is_active?(path) do
-				link_to name, path, options
-			end
-	  end
-
-	  def drop_down(name)
-			content_tag :li, :class => "dropdown" do
-				drop_down_link(name) + drop_down_list {yield}
-			end
-	  end
-
-	  def drop_down_divider
-			content_tag :li, "", :class => "divider"
-	  end
-
-	  def drop_down_header(text)
-			content_tag :li, text, :class => "nav-header"
-	  end
-
-	  def menu_divider
-			content_tag :li, "", :class => "divider-vertical"
-	  end
-
-	  def menu_text(text=nil, options={}, &block)
-			pull = options.delete(:pull)
-			pull_class = pull.present? ? "pull-#{pull.to_s}" : nil
-			options.append_merge!(:class, pull_class)
-			options.append_merge!(:class, "navbar-text")
-			content_tag :p, options do
-				text || yield
-			end
-	  end
-
-	  private
-
-	  def nav_bar_div(fixed, &block)
-			content_tag :div, :class => nav_bar_css_class(fixed) do
-				yield
-			end
-	  end
-
-	  def navbar_inner_div(&block)
-			content_tag :div, :class => "navbar-inner" do
-				yield
-			end
-	  end
-
-	  def container_div(brand, brand_link, responsive, fluid, &block)
-			content_tag :div, :class => "container#{"-fluid" if fluid}" do
-				container_div_with_block(brand, brand_link, responsive, &block)
-			end
-	  end
-
-	  def container_div_with_block(brand, brand_link, responsive, &block)
-			output = []
-			if responsive == true
-				output << responsive_button
-				output << brand_link(brand, brand_link)
-				output << responsive_div {capture(&block)}
-			else
-				output << brand_link(brand, brand_link)
-				output << capture(&block)
-			end
-			output.join("\n").html_safe
-	  end
-
-	  def nav_bar_css_class(fixed_pos)
-			css_class = ["navbar"]
-			css_class << "navbar-fixed-#{fixed_pos.to_s}" if fixed_pos.present?
-			css_class.join(" ")
-	  end
-
-	  def brand_link(name, url)
-			return "" if name.blank?
-			url ||= root_url
-			link_to(name, url, :class => "brand")
-	  end
-
-	  def responsive_button
-			%{<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-	        <span class="icon-bar"></span>
-	        <span class="icon-bar"></span>
-	        <span class="icon-bar"></span>
-	      </a>}
-	  end
-
-	  def responsive_div(&block)
-			content_tag(:div, :class => "nav-collapse", &block)
-	  end
-
-	  def is_active?(path)
-			"active" if current_page?(path)
-	  end
-
-	  def name_and_caret(name)
-			"#{name} #{content_tag(:b, :class => "caret"){}}".html_safe
-	  end
-
-	  def drop_down_link(name)
-			link_to(name_and_caret(name), "#", :class => "dropdown-toggle", "data-toggle" => "dropdown")
-	  end
-
-	  def drop_down_list(&block)
-			content_tag :ul, :class => "dropdown-menu", &block
-	  end
-	end
-end
-
-class Hash
-	# appends a string to a hash key's value after a space character (Good for merging CSS classes in options hashes)
-	def append_merge!(key, value)
-		# just return self if value is blank
-		return self if value.blank?
-
-		current_value = self[key]
-		# just merge if it doesn't already have that key
-		self[key] = value and return if current_value.blank?
-		# raise error if we're trying to merge into something that isn't a string
-		raise ArgumentError, "Can only merge strings" unless current_value.is_a?(String)
-		self[key] = [current_value, value].compact.join(" ")
-	end
-end

data/spec/lib/rails_bootstrap_navbar/view_helpers_spec.rb

@@ -1,302 +0,0 @@
-# encoding: utf-8
-require 'spec_helper'
-require 'action_view'
-require 'active_support'
-
-include RailsBootstrapNavbar::ViewHelpers
-include ActionView::Helpers
-include ActionView::Context
-
-describe RailsBootstrapNavbar::ViewHelpers, :type => :helper do
-	before do
-		self.stub!("current_page?").and_return(false)
-		self.stub!("root_url").and_return("/")
-	end
-  describe "nav_bar" do
-    it "should return a basic bootstrap navbar" do
-			nav_bar.gsub(/\s/,'').downcase.should eql(BASIC_NAVBAR.gsub(/\s/,'').downcase)
-    end
-
-    it "should set the fixed position to top" do
-      nav_bar(:fixed => :top).gsub(/\s/,'').downcase.should eql(FIXED_TOP_NAVBAR.gsub(/\s/,'').downcase)
-    end
-
-    it "should set the fixed position to bottom" do
-      nav_bar(:fixed => :bottom).gsub(/\s/,'').downcase.should eql(FIXED_BOTTOM_NAVBAR.gsub(/\s/,'').downcase)
-    end
-
-    it "should add the brand name and link it to the home page" do
-      nav_bar(:brand => "Ninety Ten").gsub(/\s/,'').downcase.should eql(NAVBAR_WITH_BRAND.gsub(/\s/,'').downcase)
-    end
-
-    it "should be able to set the brand link url" do
-      nav_bar(:brand => "Ninety Ten", :brand_link => "http://www.ninetyten.com").gsub(/\s/,'').downcase.should eql(
-				NAVBAR_WITH_BRAND_AND_LINK.gsub(/\s/,'').downcase)
-    end
-
-    it "should set the container to fluid" do
-      nav_bar(:fluid => :true).gsub(/\s/,'').downcase.should eql(BASIC_NAVBAR_FLUID.gsub(/\s/,'').downcase)
-    end
-
-    it "should add the buttons etc for a responsive layout with no block passed" do
-      nav_bar(:responsive => true).gsub(/\s/,'').downcase.should eql(RESPONSIVE_NAVBAR.gsub(/\s/,'').downcase)
-    end
-
-    it "should add the buttons etc for a responsive layout with block passed" do
-      nav_bar(:responsive => true) do
-				"<p>Passing a block</p>".html_safe
-			end.gsub(/\s/,'').downcase.should eql(RESPONSIVE_NAVBAR_WITH_BLOCK.gsub(/\s/,'').downcase)
-    end
-
-    it "should render contained items" do
-      nav_bar do
-				menu_group do
-					menu_item("Home", "/") + menu_item("Products", "/products")
-				end
-      end.gsub(/\s/,'').downcase.should eql(PLAIN_NAVBAR_WITH_ITEM.gsub(/\s/,'').downcase)
-    end
-
-    it "should still render the brand name even with other options turned on" do
-			nav_bar(:brand => "Something") do
-				menu_group do
-					menu_item "Home", "/"
-				end
-      end.gsub(/\s/,'').downcase.should eql(BRANDED_NAVBAR_WITH_ITEM.gsub(/\s/,'').downcase)
-    end
-  end
-
-  describe "menu_group" do
-    it "should return a ul with the class 'nav'" do
-      menu_group do
-				menu_item("Home", "/") + menu_item("Products", "/products")
-      end.should eql '<ul class="nav"><li><a href="/">Home</a></li><li><a href="/products">Products</a></li></ul>'
-    end
-
-    it "should return a ul with class .pull-left when passed the {:pull => :left} option" do
-			menu_group(:pull => :left) do
-				menu_item("Home", "/")
-      end.should eql('<ul class="nav pull-left"><li><a href="/">Home</a></li></ul>')
-    end
-  end
-
-  describe "menu_item" do
-    it "should return a link within an li tag" do
-			self.stub!("current_page?").and_return(false)
-      menu_item("Home", "/").should eql('<li><a href="/">Home</a></li>')
-    end
-    it "should return the link with class 'active' if on current page" do
-      self.stub!("current_page?").and_return(true)
-      menu_item("Home", "/").should eql('<li class="active"><a href="/">Home</a></li>')
-    end
-    it "should pass any other options through to the link_to method" do
-			self.stub!("current_page?").and_return(true)
-				menu_item("Log out", "/users/sign_out", :class => "home_link", :method => :delete).should eql(
-					'<li class="active"><a href="/users/sign_out" class="home_link" data-method="delete" rel="nofollow">Log out</a></li>')
-    end
-  end
-
-  describe "drop_down" do
-    it "should do render the proper drop down code" do
-      drop_down "Products" do
-				menu_item "Latest", "/"
-      end.gsub(/\s/,'').downcase.should eql(DROPDOWN_MENU.gsub(/\s/,'').downcase)
-    end
-  end
-
-  describe "menu_divider" do
-		it "should render <li class='divider-vertical'></li>" do
-		  menu_divider.should eql '<li class="divider-vertical"></li>'
-		end
-  end
-
-  describe "menu_text" do
-    it "should render text within p tags with class 'navbar-text" do
-      menu_text("Strapline!").should eql("<p class=\"navbar-text\">Strapline!</p>")
-    end
-
-    it "should be able to be pulled right or left" do
-      menu_text("I'm being pulled right", :pull => :right).should eql(
-				"<p class=\"pull-right navbar-text\">I'm being pulled right</p>")
-    end
-
-    it "should be able to cope with arbitrary options being passed to the p tag" do
-      menu_text("I'm classy!", :class => "classy", :id => "classy_text").should eql(
-				"<p class=\"classy navbar-text\" id=\"classy_text\">I'm classy!</p>")
-    end
-
-    it "should be able to cope with a block too" do
-      menu_text do
-				"I've been rendered programmatically!"
-      end.should eql("<p class=\"navbar-text\">I've been rendered programmatically!</p>")
-    end
-  end
-
-  describe "rendering forms ok" do
-		it "should not escape anything unexpectedly" do
-	    nav_bar do
-				form_tag "/", :method => 'get' do |f|
-					f.text_field :search, "stub"
-				end
-	    end.gsub(/\s/,'').downcase.should eql(PLAIN_NAVBAR_WITH_FORM.gsub(/\s/,'').downcase)
-	  end
-  end
-
-end
-
-# HTML output
-
-BASIC_NAVBAR = <<-HTML
-<div class="navbar">
-  <div class="navbar-inner">
-    <div class="container">
-    </div>
-  </div>
-</div>
-HTML
-
-FIXED_TOP_NAVBAR = <<-HTML
-<div class="navbar navbar-fixed-top">
-  <div class="navbar-inner">
-    <div class="container">
-    </div>
-  </div>
-</div>
-HTML
-
-FIXED_BOTTOM_NAVBAR = <<-HTML
-<div class="navbar navbar-fixed-bottom">
-  <div class="navbar-inner">
-    <div class="container">
-    </div>
-  </div>
-</div>
-HTML
-
-BASIC_NAVBAR_FLUID= <<-HTML
-<div class="navbar">
-  <div class="navbar-inner">
-    <div class="container-fluid">
-    </div>
-  </div>
-</div>
-HTML
-
-NAVBAR_WITH_BRAND = <<-HTML
-<div class="navbar">
-  <div class="navbar-inner">
-    <div class="container">
-			<a href="/" class="brand">
-			  Ninety Ten
-			</a>
-    </div>
-  </div>
-</div>
-HTML
-
-NAVBAR_WITH_BRAND_AND_LINK = <<-HTML
-<div class="navbar">
-  <div class="navbar-inner">
-    <div class="container">
-			<a href="http://www.ninetyten.com" class="brand">
-			  Ninety Ten
-			</a>
-    </div>
-  </div>
-</div>
-HTML
-
-RESPONSIVE_NAVBAR = <<-HTML
-<div class="navbar">
-  <div class="navbar-inner">
-    <div class="container">
-      <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </a>
-      <div class="nav-collapse">
-      </div>
-    </div>
-  </div>
-</div>
-HTML
-
-RESPONSIVE_NAVBAR_WITH_BLOCK = <<-HTML
-<div class="navbar">
-  <div class="navbar-inner">
-    <div class="container">
-      <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </a>
-      <div class="nav-collapse">
-				<p>Passing a block</p>
-      </div>
-    </div>
-  </div>
-</div>
-HTML
-
-PLAIN_NAVBAR_WITH_ITEM = <<-HTML
-<div class="navbar">
-	<div class="navbar-inner">
-		<div class="container">
-			<ul class="nav">
-				<li>
-					<a href="/">Home</a>
-				</li>
-				<li>
-					<a href="/products">Products</a>
-				</li>
-			</ul>
-		</div>
-	</div>
-</div>
-HTML
-
-BRANDED_NAVBAR_WITH_ITEM = <<-HTML
-<div class="navbar">
-	<div class="navbar-inner">
-		<div class="container">
-			<a href="/" class="brand">
-			  Something
-			</a>
-			<ul class="nav">
-				<li>
-					<a href="/">Home</a>
-				</li>
-			</ul>
-		</div>
-	</div>
-</div>
-HTML
-
-DROPDOWN_MENU = <<-HTML
-<li class="dropdown">
-  <a href="#"
-        class="dropdown-toggle"
-        data-toggle="dropdown">
-        Products
-        <b class="caret"></b>
-  </a>
-  <ul class="dropdown-menu">
-    <li><a href="/">Latest</a></li>
-  </ul>
-</li>
-HTML
-
-PLAIN_NAVBAR_WITH_FORM = <<-HTML
-<div class="navbar">
-	<div class="navbar-inner">
-		<div class="container">
-			<form accept-charset="utf-8" action="/" method="get">
-				<div style="margin:0;padding:0;display:inline">
-					<input name="utf8" type="hidden" value="&#x2713;"/>
-				</div>
-				<input id="search_stub" name="search[stub]" size="30" type="text"/>
-			</form>
-		</div>
-	</div>
-</div>
-HTML