fuji 0.1.1 → 0.1.4

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    fuji (0.1.0)
+    fuji (0.1.4)
       compass
       sass
 
 GEM
   remote: https://rubygems.org/
   specs:
-    chunky_png (1.2.7)
+    chunky_png (1.2.8)
     compass (0.12.2)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)

data/README.md

@@ -29,8 +29,6 @@ The render method accepts a hash of options with the following defaults:
   logo_text: "heroku",
   logo_subtext: nil,                      # e.g 'dashboard' or 'add-ons'
   logo_url: "https://www.heroku.com",
-  login_path: nil,                        # if present, display login/logout links
-  logout_path: nil,
   gravatar_fallback_url: "http://assets.heroku.com.s3.amazonaws.com/addons.heroku.com/gravatar_default.png"
 }
 ```
@@ -38,7 +36,7 @@ The render method accepts a hash of options with the following defaults:
 Here's how it's done in addons:
 
 ```haml
-= Fuji::Header.render(user: current_user, logo_subtext: "addons", login_path: login_path, logout_path: logout_path)
+= Fuji::Header.render(user: current_user, logo_subtext: "addons")
 ```
 
 Style it up by importing the fuji partial into your sass/scss stylesheet:

data/lib/fuji.rb

@@ -3,17 +3,6 @@ require 'digest/md5'
 require 'uri'
 require "compass"
 
-# module Foo
-#
-#   module Header
-#     def render
-#       puts "rendered!"
-#     end
-#   end
-#   extend Header
-#
-# end
-
 module Fuji
 
   def self.render
@@ -27,6 +16,7 @@ module Fuji
   end
 
   class Header
+
     def self.render(options={})
 
       # Options
@@ -35,43 +25,35 @@ module Fuji
       options[:logo_subtext] ||= nil
       options[:logo_url] ||= "https://www.heroku.com"
       options[:user] ||= nil
-      options[:login_path] ||= nil
-      options[:logout_path] ||= nil
       options[:links] ||= nil
 
-      links = []
-
-      # unless options[:user]
-      #   links << {id: :how, name: 'How it Works', url: 'https://heroku.com/how'}
-      #   links << {id: :pricing, name: 'Pricing', url: 'https://www.heroku.com/pricing'}
-      # end
-
-      links << {id: :apps, name: 'Apps', url: 'https://dashboard.heroku.com'}
-      links << {id: :addons, name: 'Add-ons', url: 'https://addons.heroku.com'}
-      links << {id: :documentation, name: 'Documentation', url: 'https://devcenter.heroku.com'}
-      links << {id: :support, name: 'Support', url: 'https://help.heroku.com'}
-
-      if options[:user] && options[:logout_path]
-        links << {id: :logout, name: 'Log out', url: options[:logout_path]}
-      end
-
-      # Gravatar
-      if options[:user] && options[:user].email
-        gravatar_url = [
-          "https://secure.gravatar.com/avatar/",
-          Digest::MD5.hexdigest(options[:user].email),
-          "?default=",
-          URI.escape(options[:gravatar_fallback_url])
-        ].join("")
-        links << {
-          id: :gravatar,
-          name: Fuji::Helper.image_tag(gravatar_url),
-          url: 'https://dashboard.heroku.com/account'
-        }
-      end
-
-      if options[:login_path] && options[:user].nil?
-        links << {id: :login, name: 'Log in', url: options[:login_path]}
+      # Allow links to be overridden entirely
+      links = options[:links]
+
+      if links.nil?
+        links = [
+          {id: :apps, name: 'Apps', url: 'https://dashboard.heroku.com'},
+          {id: :addons, name: 'Add-ons', url: 'https://addons.heroku.com'},
+          {id: :documentation, name: 'Documentation', url: 'https://devcenter.heroku.com'},
+          {id: :support, name: 'Support', url: 'https://help.heroku.com'},
+          {id: :blog, name: 'Blog', url: 'https://blog.heroku.com'},
+          {id: :account, name: 'Account', url: "https://dashboard.heroku.com/account"}
+        ]
+
+        # Gravatar
+        if options[:user] && options[:user].email
+          gravatar_url = [
+            "https://secure.gravatar.com/avatar/",
+            Digest::MD5.hexdigest(options[:user].email),
+            "?default=",
+            URI.escape(options[:gravatar_fallback_url])
+          ].join("")
+          links << {
+            id: :gravatar,
+            name: Fuji::Helper.image_tag(gravatar_url),
+            url: 'https://dashboard.heroku.com/account'
+          }
+        end
       end
 
       # Join links together
@@ -132,6 +114,4 @@ module Fuji
 
   end
 
-end
-
-# ActionView::Base.send :include, Fuji::ViewHelpers if defined?(ActionView)
+end

data/lib/fuji/version.rb

@@ -1,3 +1,3 @@
 module Fuji
-  VERSION = "0.1.1"
+  VERSION = "0.1.4"
 end

data/spec/fuji_spec.rb

@@ -2,12 +2,12 @@ require 'spec_helper'
 require 'digest/md5'
 
 describe Fuji::Header do
-  
-  describe "fuji" do
+
+  describe "#render" do
     before do
       @user = OpenStruct.new(email: "bob@heroku.com")
     end
-    
+
     it "outputs an HTML string" do
       Fuji::Header.render.should match /div id='fuji'/
     end
@@ -15,77 +15,76 @@ describe Fuji::Header do
     it "renders the user's avatar" do
       h = Fuji::Header.render(user: @user)
       hash = Digest::MD5.hexdigest(@user.email)
-
       h.should match /#{hash}/
     end
-    
+
   end
-  
+
   describe "Fuji::Helper.current_site_matches?" do
-        
+
     describe "inside a rails app" do
       before do
         @request = OpenStruct.new(protocol: "https://", host_with_port: "dhh.com", fullpath: "/foo")
       end
-      
+
       it "detects search string" do
         Fuji::Helper.current_site_matches?('dhh.com/foo', @request).should == true
       end
-      
+
       it "doesn't detect search string" do
         Fuji::Helper.current_site_matches?('some other shit', @request).should == false
       end
-            
+
     end
-    
+
     describe "inside a sinatra app" do
 
       before do
         @request = OpenStruct.new(url: "https://mizerany.com")
       end
-      
+
       it "detects search string" do
         Fuji::Helper.current_site_matches?('mizerany', @request).should == true
       end
-      
+
       it "doesn't detect search string" do
         Fuji::Helper.current_site_matches?('some other blake', @request).should == false
       end
-      
+
     end
-    
+
     describe "in any kind of ruby app" do
-      
+
       before do
         @request = OpenStruct.new(url: "https://the-rest.com")
       end
-      
+
       it "allows a symbol as a search string" do
         Fuji::Helper.current_site_matches?(:rest, @request).should == true
       end
-      
+
       it "matches against domain name when given a full URL" do
         Fuji::Helper.current_site_matches?("http://the-rest.com/extra/mojo", @request).should == true
       end
-      
+
       it "returns false if request object is nil" do
         Fuji::Helper.current_site_matches?('foo').should == false
       end
-      
+
     end
-        
+
   end
-  
+
   describe "extract_domain" do
-    
+
     it "pulls the domain out of a URL string" do
       Fuji::Helper.extract_domain("https://dweeb-fest.example.com/sho/biz").should == "dweeb-fest.example.com"
     end
-    
+
     it "returns the original string if it doesn't contain a domain" do
       Fuji::Helper.extract_domain("turkey jerky").should == "turkey jerky"
     end
-    
+
   end
-  
+
 end

data/stylesheets/_fuji.sass

@@ -82,7 +82,7 @@ $fuji-line-size: 40%
         display: block
         padding: 3px 8px
         text-decoration: none
-        &:hover, &.active, &.login
+        &:hover, &.active, &.login, &.account
           +transition(all 0)
           color: $fuji-link-color-active
           background-color: $fuji-link-background-color-active

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fuji
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-29 00:00:00.000000000 Z
+date: 2013-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -108,12 +108,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1746864864222920062
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1746864864222920062
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25