rails_bootstrap_navbar 0.1.2.beta → 0.1.3.beta

data/lib/rails_bootstrap_navbar/version.rb

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

data/lib/rails_bootstrap_navbar/view_helpers.rb

@@ -43,8 +43,12 @@ module RailsBootstrapNavbar
 			content_tag :li, "", :class => "divider-vertical"
 	  end
 
-	  def menu_text(text=nil, &block)
-			content_tag :p do
+	  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
@@ -121,4 +125,19 @@ module RailsBootstrapNavbar
 			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

@@ -102,14 +102,24 @@ describe RailsBootstrapNavbar::ViewHelpers, :type => :helper do
   end
 
   describe "menu_text" do
-    it "should render text within p tags" do
-      menu_text("Strapline!").should eql("<p>Strapline!</p>")
+    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>I've been rendered programmatically!</p>")
+      end.should eql("<p class=\"navbar-text\">I've been rendered programmatically!</p>")
     end
   end
 

metadata

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