RubyGems - heroku-nav - Versions diffs - 0.1.20 → 0.1.21 - Mend

heroku-nav 0.1.20 → 0.1.21

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

data/.gitignore ADDED

	@@ -0,0 +1 @@
1	+ pkg/

data/Rakefile CHANGED

@@ -21,7 +21,7 @@ begin
     gemspec.add_dependency(%q<rest-client>, [">= 1.0"])
     gemspec.add_dependency(%q<json>, [">= 0"])
-    gemspec.version = '0.1.20'
+    gemspec.version = '0.1.21'
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: gem install jeweler"

data/heroku-nav.gemspec CHANGED

@@ -1,43 +1,46 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name = %q{heroku-nav}
-  s.version = "0.1.20"
+  s.version = "0.1.21"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Dollar", "Pedro Belo", "Todd Matthews"]
-  s.date = %q{2011-01-10}
+  s.date = %q{2011-01-13}
   s.description = %q{}
   s.email = ["david@heroku.com", "pedro@heroku.com", "todd@heroku.com"]
   s.extra_rdoc_files = [
     "README.md"
   ]
   s.files = [
-    "README.md",
-    "Rakefile",
-    "heroku-nav.gemspec",
-    "lib/heroku/nav.rb",
-    "spec/api_spec.rb",
-    "spec/base.rb",
-    "spec/nav_spec.rb"
+    ".gitignore",
+     "README.md",
+     "Rakefile",
+     "heroku-nav.gemspec",
+     "lib/heroku/nav.rb",
+     "spec/api_spec.rb",
+     "spec/base.rb",
+     "spec/nav_spec.rb"
   ]
   s.homepage = %q{http://heroku.com}
+  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.4.2}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{}
   s.test_files = [
     "spec/api_spec.rb",
-    "spec/base.rb",
-    "spec/nav_spec.rb"
+     "spec/base.rb",
+     "spec/nav_spec.rb"
   ]
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<baconmocha>, [">= 0"])
       s.add_development_dependency(%q<sinatra>, [">= 0"])
       s.add_development_dependency(%q<rack-test>, [">= 0"])

data/lib/heroku/nav.rb CHANGED

@@ -38,7 +38,7 @@ module Heroku
             raw = RestClient.get(resource_url, :accept => :json).to_s
             return JSON.parse(raw)
           end
-        rescue => e
+        rescue Exception => e
           STDERR.puts "Failed to fetch the Heroku #{resource}: #{e.class.name} - #{e.message}"
           {}
         end

data/spec/nav_spec.rb CHANGED

@@ -1,68 +1,80 @@
 require File.dirname(__FILE__) + '/base'
 describe Heroku::Nav::Header do
-  before do
-    Heroku::Nav::Header.stubs(:fetch).returns('html' => '<!-- header -->')
-  end
   def app
     make_app { use Heroku::Nav::Header }
   end
-  it "doesn't apply if content-type is not html" do
-    get '/text', :body => '<html><body>hi'
-    last_response.body.should.equal '<html><body>hi'
-  end
-  it "adds the html right after the body" do
+  it "rescues exceptions" do
+    RestClient.stubs(:get).raises(Timeout::Error)
     get '/', :body => '<html><body>hi'
-    last_response.body.should.equal '<html><body><!-- header -->hi'
+    last_response.status.should.equal 200
   end
-  it "adds the html right after the body, even if it has properties" do
-    get '/', :body => '<html><body id="a" class="b">hi'
-    last_response.body.should.equal '<html><body id="a" class="b"><!-- header -->hi'
-  end
+  describe "fetching" do
+    before do
+      Heroku::Nav::Header.stubs(:fetch).returns('html' => '<!-- header -->')
+    end
-  it "adds the html right after the first div if class is container" do
-    get '/', :body => '<html><body><div class="container">hi</div>'
-    last_response.body.should.equal '<html><body><div class="container"><!-- header -->hi</div>'
-  end
+    def app
+      make_app { use Heroku::Nav::Header }
+    end
-  it "adds the css right after the head" do
-    get '/', :body => '<html><head>... <body>'
-    last_response.body.should.equal "<html><head><link href='http://nav.heroku.com/header.css' media='all' rel='stylesheet' type='text/css' />... <body><!-- header -->"
-  end
+    it "doesn't apply if content-type is not html" do
+      get '/text', :body => '<html><body>hi'
+      last_response.body.should.equal '<html><body>hi'
+    end
-  it "doesn't add for non 200 responses" do
-    get '/404', :body => '<html><body>hi'
-    last_response.body.should.not =~ /<!-- header -->/
-  end
+    it "adds the html right after the body" do
+      get '/', :body => '<html><body>hi'
+      last_response.body.should.equal '<html><body><!-- header -->hi'
+    end
-  describe "defining response status" do
-    def app
-      make_app { use Heroku::Nav::Header, :status => [404] }
+    it "adds the html right after the body, even if it has properties" do
+      get '/', :body => '<html><body id="a" class="b">hi'
+      last_response.body.should.equal '<html><body id="a" class="b"><!-- header -->hi'
     end
-    it "respects the :status option" do
-      get '/404', :body => '<html><body>hi'
-      last_response.body.should =~ /<!-- header -->/
+    it "adds the html right after the first div if class is container" do
+      get '/', :body => '<html><body><div class="container">hi</div>'
+      last_response.body.should.equal '<html><body><div class="container"><!-- header -->hi</div>'
     end
-    it "allows overriding the default status" do
-      get '/', :body => '<html><body>hi'
+    it "adds the css right after the head" do
+      get '/', :body => '<html><head>... <body>'
+      last_response.body.should.equal "<html><head><link href='http://nav.heroku.com/header.css' media='all' rel='stylesheet' type='text/css' />... <body><!-- header -->"
+    end
+    it "doesn't add for non 200 responses" do
+      get '/404', :body => '<html><body>hi'
       last_response.body.should.not =~ /<!-- header -->/
     end
-  end
-  describe "excluding paths" do
-    def app
-      make_app { use Heroku::Nav::Header, :except => [/x/, /alt/] }
+    describe "defining response status" do
+      def app
+        make_app { use Heroku::Nav::Header, :status => [404] }
+      end
+      it "respects the :status option" do
+        get '/404', :body => '<html><body>hi'
+        last_response.body.should =~ /<!-- header -->/
+      end
+      it "allows overriding the default status" do
+        get '/', :body => '<html><body>hi'
+        last_response.body.should.not =~ /<!-- header -->/
+      end
     end
-    it "respects the :except option" do
-      get '/alternate', :body => '<html><body>hi'
-      last_response.body.should.not =~ /<!-- header -->/
+    describe "excluding paths" do
+      def app
+        make_app { use Heroku::Nav::Header, :except => [/x/, /alt/] }
+      end
+      it "respects the :except option" do
+        get '/alternate', :body => '<html><body>hi'
+        last_response.body.should.not =~ /<!-- header -->/
+      end
     end
   end
 end

metadata CHANGED

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification
 name: heroku-nav
 version: !ruby/object:Gem::Version
-  hash: 51
-  prerelease:
+  prerelease: false
   segments:
   - 0
   - 1
-  - 20
-  version: 0.1.20
+  - 21
+  version: 0.1.21
 platform: ruby
 authors:
 - David Dollar
@@ -17,18 +16,16 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-01-10 00:00:00 -05:00
+date: 2011-01-13 00:00:00 -08:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: baconmocha
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        hash: 3
         segments:
         - 0
         version: "0"
@@ -38,11 +35,9 @@ dependencies:
   name: sinatra
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        hash: 3
         segments:
         - 0
         version: "0"
@@ -52,11 +47,9 @@ dependencies:
   name: rack-test
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        hash: 3
         segments:
         - 0
         version: "0"
@@ -66,11 +59,9 @@ dependencies:
   name: rest-client
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        hash: 15
         segments:
         - 1
         - 0
@@ -81,11 +72,9 @@ dependencies:
   name: json
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        hash: 3
         segments:
         - 0
         version: "0"
@@ -103,6 +92,7 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
+- .gitignore
 - README.md
 - Rakefile
 - heroku-nav.gemspec
@@ -115,32 +105,28 @@ homepage: http://heroku.com
 licenses: []
 post_install_message:
-rdoc_options: []
+rdoc_options:
+- --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      hash: 3
       segments:
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      hash: 3
       segments:
       - 0
       version: "0"
 requirements: []
 rubyforge_project:
-rubygems_version: 1.4.2
+rubygems_version: 1.3.6
 signing_key:
 specification_version: 3
 summary: ""