add NameError to exceptions that adapters rescue when loading dependent libs

This commit is contained in:
rick 2010-02-06 19:58:12 -08:00
parent 366e2750e4
commit 67052df2d2
6 changed files with 8 additions and 6 deletions

View File

@ -3,7 +3,7 @@ module Faraday
class Patron < Middleware
begin
require 'patron'
rescue LoadError => e
rescue LoadError, NameError => e
self.load_error = e
end

View File

@ -9,7 +9,7 @@ module Faraday
begin
require 'typhoeus'
rescue LoadError => e
rescue LoadError, NameError => e
self.load_error = e
end

View File

@ -3,9 +3,10 @@ module Faraday
begin
if !defined?(ActiveSupport::JSON)
require 'active_support'
ActiveSupport::JSON
end
rescue LoadError => e
rescue LoadError, NameError => e
self.load_error = e
end

View File

@ -3,7 +3,7 @@ module Faraday
begin
require 'yajl'
rescue LoadError => e
rescue LoadError, NameError => e
self.load_error = e
end

View File

@ -3,6 +3,7 @@ module Faraday
begin
if !defined?(ActiveSupport::JSON)
require 'active_support'
ActiveSupport::JSON
end
def self.register_on_complete(env)
@ -10,7 +11,7 @@ module Faraday
finished_env[:body] = ActiveSupport::JSON.decode(finished_env[:body])
end
end
rescue LoadError => e
rescue LoadError, NameError => e
self.load_error = e
end

View File

@ -8,7 +8,7 @@ module Faraday
finished_env[:body] = Yajl::Parser.parse(finished_env[:body])
end
end
rescue LoadError => e
rescue LoadError, NameError => e
self.load_error = e
end