Merge pull request #6 from planningcenter/jm/faraday_middleware_warning

Fix Faraday middleware warning, bump to v1.2.2
planningcenter · Aug 17, 2017 · bdc45d1 · bdc45d1
2 parents 487486d + e6dc2e6
commit bdc45d1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.2.2 (August 17, 2017)
+
+* Chore: fix Faraday middleware warning
+
 # 1.2.1 (November 18, 2016)
 
 * Chore: bump Faraday dependency versions and loosen specificity

diff --git a/lib/pco/api/endpoint.rb b/lib/pco/api/endpoint.rb
@@ -116,7 +116,6 @@ def _build_endpoint(path)
 
       def _build_connection
         Faraday.new(url: url) do |faraday|
-          faraday.adapter :excon
           faraday.response :json, content_type: /\bjson$/
           if @basic_auth_token && @basic_auth_secret
             faraday.basic_auth @basic_auth_token, @basic_auth_secret
@@ -125,6 +124,7 @@ def _build_connection
           else
             fail Errors::AuthRequiredError, "You must specify either HTTP basic auth credentials or an OAuth2 access token."
           end
+          faraday.adapter :excon
         end
       end
     end

diff --git a/lib/pco/api/version.rb b/lib/pco/api/version.rb
@@ -1,5 +1,5 @@
 module PCO
   module API
-    VERSION = '1.2.1'
+    VERSION = '1.2.2'
   end
 end