Fix compatibility with Faraday 1.0

.travis.yml

@@ -15,8 +15,17 @@ rvm:
 gemfile:
   - Gemfile
   - Gemfile-0.9.rb
+  - Gemfile-1.0.rb
 matrix:
   exclude:
+    - rvm: 1.9.3
+      gemfile: Gemfile-1.0.rb
+    - rvm: 2.0
+      gemfile: Gemfile-1.0.rb
+    - rvm: 2.1
+      gemfile: Gemfile-1.0.rb
+    - rvm: 2.2
+      gemfile: Gemfile-1.0.rb
     - rvm: 2.4
       gemfile: Gemfile-0.9.rb
     - rvm: 2.5.0

Gemfile-1.0.rb

@@ -0,0 +1,3 @@
+eval File.read(File.expand_path('../Gemfile', __FILE__))
+
+gem 'faraday', '~> 1.0.0.pre.rc1'

faraday_middleware.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.homepage = 'https://github.com/lostisland/faraday_middleware'
   spec.licenses = ['MIT']
 
-  spec.add_dependency 'faraday', ['>= 0.7.4', '< 1.0']
+  spec.add_dependency 'faraday', '>= 0.7.4'
 
   spec.files = `git ls-files -z lib LICENSE.md README.md`.split("\0")
 end

lib/faraday_middleware/response/follow_redirects.rb

@@ -2,8 +2,15 @@
 require 'set'
 
 module FaradayMiddleware
+  CLIENT_ERROR =
+    begin
+      Faraday::Error::ClientError
+    rescue NameError
+      Faraday::ClientError
+    end
+
   # Public: Exception thrown when the maximum amount of requests is exceeded.
-  class RedirectLimitReached < Faraday::Error::ClientError
+  class RedirectLimitReached < CLIENT_ERROR
     attr_reader :response
 
     def initialize(response)

lib/faraday_middleware/response_middleware.rb

@@ -5,6 +5,13 @@ module FaradayMiddleware
   class ResponseMiddleware < Faraday::Middleware
     CONTENT_TYPE = 'Content-Type'.freeze
 
+    PARSING_ERROR =
+      begin
+        Faraday::ParsingError
+      rescue NameError
+        Faraday::Error::ParsingError
+      end
+
     class << self
       attr_accessor :parser
     end
@@ -38,8 +45,8 @@ def call(environment)
     def process_response(env)
       env[:raw_body] = env[:body] if preserve_raw?(env)
       env[:body] = parse(env[:body])
-    rescue Faraday::Error::ParsingError => err
-      raise Faraday::Error::ParsingError.new(err, env[:response])
+    rescue PARSING_ERROR => err
+      raise PARSING_ERROR.new(err, env[:response])
     end
 
     # Parse the response body.
@@ -51,7 +58,7 @@ def parse(body)
           self.class.parser.call(body, @parser_options)
         rescue StandardError, SyntaxError => err
           raise err if err.is_a? SyntaxError and err.class.name != 'Psych::SyntaxError'
-          raise Faraday::Error::ParsingError, err
+          raise PARSING_ERROR, err
         end
       else
         body

spec/unit/parse_json_spec.rb

@@ -61,14 +61,14 @@
   end
 
   it "chokes on invalid json" do
-    expect{ process('{!') }.to raise_error(Faraday::Error::ParsingError)
+    expect{ process('{!') }.to raise_error(FaradayMiddleware::ResponseMiddleware::PARSING_ERROR)
   end
 
   it "includes the response on the ParsingError instance" do
     begin
       process('{') { |env| env[:response] = Faraday::Response.new }
       fail 'Parsing should have failed.'
-    rescue Faraday::Error::ParsingError => err
+    rescue FaradayMiddleware::ResponseMiddleware::PARSING_ERROR => err
       expect(err.response).to be_a(Faraday::Response)
     end
   end

spec/unit/parse_marshal_spec.rb

@@ -11,6 +11,6 @@
   end
 
   it "chokes on invalid content" do
-    expect{ process('abc') }.to raise_error(Faraday::Error::ParsingError)
+    expect{ process('abc') }.to raise_error(FaradayMiddleware::ResponseMiddleware::PARSING_ERROR)
   end
 end

spec/unit/parse_xml_spec.rb

@@ -65,7 +65,7 @@
 
   it "chokes on invalid xml" do
     ['{!', '"a"', 'true', 'null', '1'].each do |data|
-      expect{ process(data) }.to raise_error(Faraday::Error::ParsingError)
+      expect{ process(data) }.to raise_error(FaradayMiddleware::ResponseMiddleware::PARSING_ERROR)
     end
   end
 

spec/unit/parse_yaml_spec.rb

@@ -48,7 +48,7 @@
   end
 
   it "chokes on invalid yaml" do
-    expect{ process('{!') }.to raise_error(Faraday::Error::ParsingError)
+    expect{ process('{!') }.to raise_error(FaradayMiddleware::ResponseMiddleware::PARSING_ERROR)
   end
 
   context "SafeYAML options" do