Support faraday v1.0

sue445 · Jan 21, 2020 · b85f64a · b85f64a
1 parent 9f617af
commit b85f64a
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/lib/pixela/client.rb b/lib/pixela/client.rb
@@ -81,7 +81,7 @@ def connection(request_headers = user_token_headers)
 
     def with_error_handling
       yield
-    rescue Faraday::ClientError => error
+    rescue *faraday_errors => error
       begin
         body = JSON.parse(error.response[:body])
         raise PixelaError, body["message"]
@@ -90,6 +90,14 @@ def with_error_handling
       end
     end
 
+    def faraday_errors
+      if Gem::Version.create(Faraday::VERSION) >= Gem::Version.create("1.0.0")
+        return [Faraday::ClientError, Faraday::ServerError]
+      end
+
+      [Faraday::Error::ClientError]
+    end
+
     def default_headers
       {
         "User-Agent" => "Pixela v#{Pixela::VERSION} (https://github.com/sue445/pixela)",