heroku-nav 0.2.1 → 0.2.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    heroku-nav (0.1.24)
+    heroku-nav (0.2.1)
 
 GEM
   remote: http://rubygems.org/

data/README.md

@@ -1,10 +1,11 @@
 Heroku Nav
 ==========
 
+[![Build Status](https://travis-ci.org/heroku/heroku-nav.png?branch=master)](https://travis-ci.org/heroku/heroku-nav)
+
 This is a Ruby gem providing a Rack middleware to help Heroku add-on providers
 displaying a customized header for users coming from a single sign-on session.
 
-
 ## Usage ######################################################################
 
 Use it just like any Rack middleware:
@@ -31,9 +32,14 @@ To don't display the header on a given request path you can use the `:except` co
 
     config.middleware.use Heroku::Nav::Provider, :except => /admin/
 
-
 ## Meta #######################################################################
 
-Maintained by Pedro Belo, contributions by Todd Matthews and David Dollar.
+Written by Pedro Belo, with contributions from:
+
+* Todd Matthews
+* David Dollar
+* Caio Chassot
+* Raul Murciano
+* Jonathan Dance
 
-Released under the MIT license. http://github.com/heroku/heroku-nav
+Released under the MIT license. http://github.com/heroku/heroku-nav

data/lib/heroku/nav.rb

@@ -39,13 +39,14 @@ module Heroku
           http.use_ssl = true if uri.scheme == 'https'
           request = Net::HTTP::Get.new(uri.request_uri)
           request['Accept'] = format
-          response = Timeout.timeout(10) do
-            retry_upto(10, :interval => 0.5) do
+          timeout = (ENV['HEROKU_NAV_TIMEOUT'] || 10).to_i
+          response = Timeout.timeout(timeout) do
+            retry_upto(timeout, :interval => 0.5) do
               http.request(request)
             end
           end
           format == 'application/json' ? OkJson.decode(response.body) : response.body
-        rescue Exception => e
+        rescue Timeout::Error, StandardError => e
           $stderr.puts "Failed to fetch the Heroku #{resource}: #{e.class.name} - #{e.message}"
           {}
         end
@@ -69,7 +70,7 @@ module Heroku
 
         def retry_upto(max_retries = 1, opts = {})
           yield
-        rescue *(opts[:rescue] || Exception)
+        rescue Timeout::Error, StandardError
           attempt = attempt ? attempt+1 : 1
           raise if (attempt == max_retries)
           if interval = opts[:interval]

data/spec/api_spec.rb

@@ -19,7 +19,7 @@ describe "Api" do
     Heroku::Nav::Header.resource_url.should == url
   end
 
-  it "doesn't raise" do
+  it "doesn't raise a timeout error" do
     stub_request(:get, url).to_timeout
     stderr = wrap_stderr do
       Heroku::Nav::Header.fetch.should == {}
@@ -27,6 +27,13 @@ describe "Api" do
     stderr.should == "Failed to fetch the Heroku header: Timeout::Error - execution expired\n"
   end
 
+  it "raise signals/interrupts" do
+    stub_request(:get, url).to_raise(::Interrupt)
+    wrap_stderr do
+      lambda { Heroku::Nav::Header.fetch }.should.raise(::Interrupt)
+    end
+  end
+
   it "parses the JSON response, returning the html and css" do
     Heroku::Nav::Header.fetch.should == { 'html' => '<!-- header -->' }
   end

data/spec/base.rb

@@ -1,5 +1,7 @@
 $: << File.dirname(__FILE__) + '/../lib'
 
+ENV['HEROKU_NAV_TIMEOUT'] = '1'
+
 require 'heroku/nav'
 require 'sinatra/base'
 require 'bacon'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku-nav
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -125,9 +125,9 @@ extra_rdoc_files:
 files:
 - lib/heroku/nav.rb
 - lib/okjson.rb
+- spec/nav_spec.rb
 - spec/api_spec.rb
 - spec/base.rb
-- spec/nav_spec.rb
 - README.md
 - Gemfile
 - Gemfile.lock
@@ -157,9 +157,9 @@ signing_key:
 specification_version: 3
 summary: ''
 test_files:
+- spec/nav_spec.rb
 - spec/api_spec.rb
 - spec/base.rb
-- spec/nav_spec.rb
 - Gemfile
 - Gemfile.lock
 - Rakefile