taps 0.3.20 → 0.3.21

data/VERSION.yml

@@ -2,4 +2,4 @@
 :build:
 :major: 0
 :minor: 3
-:patch: 20
+:patch: 21

data/lib/taps/server.rb

@@ -1,14 +1,9 @@
-require 'hoptoad_notifier'
 require 'sinatra/base'
 require 'taps/config'
 require 'taps/utils'
 require 'taps/db_session'
 require 'taps/data_stream'
 
-HoptoadNotifier.configure do |config|
-  config.api_key = ENV["HOPTOAD_API_KEY"]
-end
-
 module Taps
 class Server < Sinatra::Base
   use Rack::Auth::Basic do |login, password|
@@ -18,8 +13,17 @@ class Server < Sinatra::Base
   use Rack::Deflater unless ENV['NO_DEFLATE']
 
   error do
-    HoptoadNotifier.notify(e)
     e = request.env['sinatra.error']
+    begin
+      require 'hoptoad_notifier'
+      HoptoadNotifier.configure do |config|
+        config.api_key = ENV["HOPTOAD_API_KEY"]
+      end
+      HoptoadNotifier.notify(e)
+    rescue LoadError
+      puts "An error occurred but Hoptoad was not notified. To use Hoptoad, please"
+      puts "install the 'hoptoad_notifier' gem and set ENV[\"HOPTOAD_API_KEY\"]"
+    end
     if e.kind_of?(Taps::BaseError)
       content_type "application/json"
       halt 412, { 'error_class' => e.class.to_s, 'error_message' => e.message, 'error_backtrace' => e.backtrace.join("\n") }.to_json
@@ -30,8 +34,8 @@ class Server < Sinatra::Base
 
   before do
     major, minor, patch = request.env['HTTP_TAPS_VERSION'].split('.') rescue []
-    unless "#{major}.#{minor}" == Taps.compatible_version && patch.to_i >= 14
-      halt 417, "Taps >= v#{Taps.compatible_version}.14 is required for this server"
+    unless "#{major}.#{minor}" == Taps.compatible_version && patch.to_i >= 20
+      halt 417, "Taps >= v#{Taps.compatible_version}.20 is required for this server"
     end
   end
 

metadata

@@ -2,7 +2,7 @@
 name: taps
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.20
+  version: 0.3.21
 platform: ruby
 authors: 
 - Ricardo Chimal, Jr.
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-23 00:00:00 -04:00
+date: 2011-03-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency