rails_bootstrap_navbar 0.1.3.beta → 0.1.4.beta

data/CHANGELOG.md

@@ -13,4 +13,12 @@ These allow you to add dividers and headers into your dropdowns. Surprisingly en
 
 ## v0.1.2.beta
 
-* Allow options for menu_items to pass through to link_to, so that you can set IDs, classes, method, data-tags etc.
+* Allow options for menu_items to pass through to link_to, so that you can set IDs, classes, method, data-tags etc.
+
+## v0.1.3.beta
+
+* Made the menu_text feature work properly (it was missing a css class). Also added the ability to pull it left or right.
+
+## v0.1.4.beta
+
+* Added ability to change the link for the brand text

data/README.md

@@ -75,13 +75,7 @@ Which will render:
 
 ### Fixed navbar
 
-If you want the navbar to stick to the top or the bottom of the screen, pass in the option like this:
-
-````
-<%= nav_bar :fixed => :top  %>
-````
-
-Or
+If you want the navbar to stick to the top of the screen, pass in the option like this:
 
 ````
 <%= nav_bar :fixed => :top  %>
@@ -97,24 +91,12 @@ To render:
 	</div>
 
 
-Or
-
-
-	<div class="navbar navbar-fixed-bottom">
-	  <div class="navbar-inner">
-	    <div class="container">
-	    </div>
-	  </div>
-	</div>
-
-
-
 ### Brand name
 
-Add the name of your site on the left hand edge of the navbar. At the moment, it will only link to root_url
+Add the name of your site on the left hand edge of the navbar. By default, it will link to root_url. Passing a brand_link option will set the url to whatever you want.
 
 ````
-<%= nav_bar :brand => "We're sooo web 2.0alizr"  %>
+<%= nav_bar :brand => "We're sooo web 2.0alizr", :brand_link => account_dashboard_path  %>
 ````
 
 Which will render:
@@ -122,7 +104,7 @@ Which will render:
 	<div class="navbar">
 	  <div class="navbar-inner">
 	    <div class="container">
-			<a class="brand" href="/">
+			<a class="brand" href="/accounts/dashboard">
 			  We're sooo web 2.0alizr
 			</a>
 	    </div>

data/lib/rails_bootstrap_navbar/version.rb

@@ -1,3 +1,3 @@
 module RailsBootstrapNavbar
-  VERSION = "0.1.3.beta"
+  VERSION = "0.1.4.beta"
 end

data/lib/rails_bootstrap_navbar/view_helpers.rb

@@ -6,7 +6,7 @@ module RailsBootstrapNavbar
 	  def nav_bar(options={}, &block)
 			nav_bar_div(options[:fixed]) do
 				navbar_inner_div do
-					container_div(options[:brand], options[:responsive], options[:fluid]) do
+					container_div(options[:brand], options[:brand_link], options[:responsive], options[:fluid]) do
 						yield if block_given?
 					end
 				end
@@ -67,20 +67,20 @@ module RailsBootstrapNavbar
 			end
 	  end
 
-	  def container_div(brand, responsive, fluid, &block)
+	  def container_div(brand, brand_link, responsive, fluid, &block)
 			content_tag :div, :class => "container#{"-fluid" if fluid}" do
-				container_div_with_block(brand, responsive, &block)
+				container_div_with_block(brand, brand_link, responsive, &block)
 			end
 	  end
 
-	  def container_div_with_block(brand, responsive, &block)
+	  def container_div_with_block(brand, brand_link, responsive, &block)
 			output = []
 			if responsive == true
 				output << responsive_button
-				output << brand_link(brand)
+				output << brand_link(brand, brand_link)
 				output << responsive_div {capture(&block)}
 			else
-				output << brand_link(brand)
+				output << brand_link(brand, brand_link)
 				output << capture(&block)
 			end
 			output.join("\n").html_safe
@@ -92,9 +92,10 @@ module RailsBootstrapNavbar
 			css_class.join(" ")
 	  end
 
-	  def brand_link(name)
+	  def brand_link(name, url)
 			return "" if name.blank?
-			link_to(name, "/", :class => "brand")
+			url ||= root_url
+			link_to(name, url, :class => "brand")
 	  end
 
 	  def responsive_button

data/spec/lib/rails_bootstrap_navbar/view_helpers_spec.rb

@@ -8,7 +8,10 @@ include ActionView::Helpers
 include ActionView::Context
 
 describe RailsBootstrapNavbar::ViewHelpers, :type => :helper do
-	before { self.stub!("current_page?").and_return(false) }
+	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)
@@ -26,6 +29,11 @@ describe RailsBootstrapNavbar::ViewHelpers, :type => :helper 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
@@ -185,6 +193,18 @@ NAVBAR_WITH_BRAND = <<-HTML
 </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">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_bootstrap_navbar
 version: !ruby/object:Gem::Version
-  version: 0.1.3.beta
+  version: 0.1.4.beta
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-23 00:00:00.000000000Z
+date: 2012-03-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70330903263900 !ruby/object:Gem::Requirement
+  requirement: &70221055337840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70330903263900
+  version_requirements: *70221055337840
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70330903259980 !ruby/object:Gem::Requirement
+  requirement: &70221055336680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70330903259980
+  version_requirements: *70221055336680
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70330903258340 !ruby/object:Gem::Requirement
+  requirement: &70221055335960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70330903258340
+  version_requirements: *70221055335960
 description: A helper method for easy generation of Twitter Bootstrap Navigation menus
   in Rails
 email: