Restore oauth2/access_token logic (since that's not provided by FaradayMiddleware as I expected), replace default_uri_parser with Addressable::URI

Author: toastercup

cortex-client.gemspec

@@ -18,8 +18,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', '~> 3.5'
   s.add_development_dependency 'mocha', '~> 1.2'
 
+  s.add_dependency 'oauth2', '~> 1.1.0'
   s.add_dependency 'faraday', '~> 0.9'
   s.add_dependency 'faraday_middleware', '~> 0.10'
-  s.add_dependency 'cortex-exceptions', '~> 0.0.4'
+  s.add_dependency 'addressable', '~> 2.5'
   s.add_dependency 'hashie', '~> 3.4'
+  s.add_dependency 'cortex-exceptions', '~> 0.0.4'
 end

lib/cortex/client.rb

@@ -1,3 +1,5 @@
+require 'oauth2'
+
 require 'cortex/connection'
 require 'cortex/request'
 require 'cortex/resource'
@@ -25,10 +27,20 @@ def initialize(hasharg)
         @key = hasharg[:key]
         @secret = hasharg[:secret]
         @scopes ||= hasharg[:scopes]
+        @access_token = get_cc_token
       end
       @posts = Cortex::Posts.new(self)
       @users = Cortex::Users.new(self)
       @webpages = Cortex::Webpages.new(self)
     end
+
+    def get_cc_token
+      begin
+        client = OAuth2::Client.new(@key, @secret, site: @base_url)
+        client.client_credentials.get_token({scope: @scopes})
+      rescue Faraday::ConnectionFailed
+        raise Cortex::Exceptions::ConnectionFailed.new(base_url: @base_url)
+      end
+    end
   end
 end

lib/cortex/connection.rb

@@ -1,5 +1,7 @@
 require 'faraday'
 require 'faraday_middleware'
+require 'addressable/uri'
+
 require 'cortex/faraday_middleware/response_failures'
 
 module Cortex
@@ -16,20 +18,21 @@ def connection
         @access_token = get_cc_token
       end
 
+      Faraday::Utils.default_uri_parser = Addressable::URI
       Faraday.new options do |conn|
         # Hello, temporal coupling. Order matters here.
 
-        # Request middleware first:
+        ## Request middleware first:
         conn.use ::FaradayMiddleware::OAuth2, access_token.is_a?(OAuth2::AccessToken) ? access_token.token : access_token
 
-        # Response middleware second:
+        ## Response middleware second:
         conn.use ::FaradayMiddleware::Mashify
         conn.use Cortex::FaradayMiddleware::ResponseFailures
 
         conn.request :json
         conn.response :json, :content_type => /\bjson$/
 
-        # Adapter always last:
+        ## Adapter always last:
         conn.adapter Faraday.default_adapter
       end
     end

lib/cortex/faraday_middleware/response_failures.rb

@@ -1,4 +1,5 @@
 require 'faraday'
+
 require 'cortex/exceptions'
 
 module Cortex