fuji 0.2.1 → 0.2.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fuji (0.2.1)
+    fuji (0.2.2)
       compass
       sass
 

data/lib/fuji.rb

@@ -15,9 +15,9 @@ class Fuji
   DEFAULTS = {
     logo_text: "heroku",
     logo_subtext: "",
-    logo_url: "https://www.heroku.com",
+    logo_url: "https://www.heroku.com/",
   }
-  
+
   class << self
 
     def options= options

data/lib/fuji/header.rb

@@ -1,12 +1,12 @@
 class Fuji
   class Header < Renderer
 
-    ADDONS = Link.new("Add-ons", "https://addons.heroku.com")
-    DOCUMENTATION = Link.new("Documentation", "https://devcenter.heroku.com")
-    HELP = Link.new("Help & Support", "https://help.heroku.com", {css: "help"})
+    ADDONS = Link.new("Add-ons", "https://addons.heroku.com/")
+    DOCUMENTATION = Link.new("Documentation", "https://devcenter.heroku.com/")
+    HELP = Link.new("Help & Support", "https://help.heroku.com/", {css: "help"})
 
     LOGGED_IN = [
-      Link.new("Apps", "https://dashboard.heroku.com"),
+      Link.new("Apps", "https://dashboard.heroku.com/"),
       ADDONS,
       DOCUMENTATION,
       HELP,
@@ -27,14 +27,14 @@ class Fuji
       # Build HTML from link objects
       link_html = links.map{|l| l.html(current_page) }.join("\n")
 
+      home = Link.new("#{Fuji.options[:logo_text]} <span class='fuji-logo-subtext'>#{Fuji.options[:logo_subtext]}</span>", Fuji.options[:logo_url], {css: "fuji-logo", skip_li: true})
+
       # Build HTML wrapper
       out = "
         <div class='fuji #{css_class}'>
           <div class='fuji-container'>
             <h1 class='fuji-brand'>
-              <a class='fuji-logo' href='#{Fuji.options[:logo_url]}'>
-                #{Fuji.options[:logo_text]} <span class='fuji-logo-subtext'>#{Fuji.options[:logo_subtext]}</span>
-              </a>
+              #{home.html}
             </h1>
 
             <ul class='fuji-links'>#{link_html}</ul>

data/lib/fuji/link.rb

@@ -8,13 +8,16 @@ class Fuji
     end
 
     def html current_page = nil
-      local = nil
       url = mapping @url
 
       @options[:css] ||= Fuji::Helper.dehumanize(@label)
       css_class = [@options[:css]]
-      css_class << "active" if current_page && current_page?(url, current_page) 
-      "<li><a href='#{url}' class='#{css_class.join(" ")}'>#{@label}</a></li>"
+      css_class << "active" if current_page && current_page?(url, current_page)
+
+      output = "<a href='#{url}' class='#{css_class.join(" ")}'>#{@label}</a>"
+      output = "<li>#{output}</li>" unless @options[:skip_li]
+
+      output
     end
 
   private

data/lib/fuji/version.rb

@@ -1,3 +1,3 @@
 class Fuji
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/fuji_header_spec.rb

@@ -31,7 +31,7 @@ describe Fuji::Header do
     Fuji.options = {logo_url: link}
 
     html = Fuji::Header.render OpenStruct.new
-    html.should match "a class='fuji-logo' href='#{link}'"
+    html.should match "a href='#{link}' class='fuji-logo'"
   end
 
   it "renders the logo text from options" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fuji
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-24 00:00:00.000000000 Z
+date: 2013-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec