Adapt to Faraday 1.0. Fixes piotrmurach#352 (piotrmurach#365)

leoarnold · web-flow · commit 58f1f8395f23 · 2020-06-09T22:56:49.000+01:00
diff --git a/github_api.gemspec b/github_api.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'addressable', '~> 2.4'
   gem.add_dependency 'hashie',      '~> 3.5', '>= 3.5.2'
-  gem.add_dependency 'faraday',     '~> 0.8'
+  gem.add_dependency 'faraday',     '>= 0.8', '< 2'
   gem.add_dependency 'oauth2',      '~> 1.0'
   gem.add_dependency 'descendants_tracker', '~> 0.0.4'
 
diff --git a/lib/github_api/connection.rb b/lib/github_api/connection.rb
@@ -65,7 +65,7 @@ def stack(options = {})
 
     # Creates http connection
     #
-    # Returns a Fraday::Connection object
+    # Returns a Faraday::Connection object
     def connection(api, options = {})
       connection_options = default_options(options)
       connection_options.merge!(builder: stack(options.merge!(api: api)))
diff --git a/lib/github_api/ext/faraday.rb b/lib/github_api/ext/faraday.rb
@@ -17,6 +17,8 @@ def to_query(encoder = nil)
       end
     end
 
+    module_function
+
     def build_nested_query(value, prefix = nil, encoder = nil)
       case value
       when Array
diff --git a/lib/github_api/response/follow_redirects.rb b/lib/github_api/response/follow_redirects.rb
@@ -8,7 +8,7 @@
 
 module Github
   # Public: Exception thrown when the maximum amount of requests is exceeded.
-  class RedirectLimitReached < Faraday::Error::ClientError
+  class RedirectLimitReached < Faraday::ClientError
     attr_reader :response
 
     def initialize(response)

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ def stack(options = {})`
`65`	`65`
`66`	`66`	`# Creates http connection`
`67`	`67`	`#`
`68`		`- # Returns a Fraday::Connection object`
	`68`	`+ # Returns a Faraday::Connection object`
`69`	`69`	`def connection(api, options = {})`
`70`	`70`	`connection_options = default_options(options)`
`71`	`71`	`connection_options.merge!(builder: stack(options.merge!(api: api)))`