Merge branch 'develop' into content-items

Author: toastercup

.gitignore

@@ -3,3 +3,4 @@
 .ruby-version
 Gemfile.lock
 *.gem
+.ruby-version

CHANGELOG.md

@@ -3,6 +3,7 @@ Version History
     * All Version bumps are required to update this file as well!
 ----
 
+* 0.10.3 - Stop warnings from FaradayMiddleware and Hashie::Mash
 * 0.10.2 - Add all_posts function to posts class to retrieve all articles.
 * 0.10.0:
   * Utilize `Addressable::URI` as Faraday's default URI parser so that resourceful URI fragments are escaped and parsed properly

cortex-client.gemspec

@@ -19,10 +19,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'mocha', '~> 1.2'
   s.add_development_dependency 'webmock', '~> 2.3'
 
-  s.add_dependency 'oauth2', '~> 1.1'
+  s.add_dependency 'oauth2', '~> 1.3'
   s.add_dependency 'faraday', '~> 0.9'
   s.add_dependency 'faraday_middleware', '~> 0.10'
   s.add_dependency 'addressable', '~> 2.5'
-  s.add_dependency 'hashie', '~> 3.4'
+  s.add_dependency 'hashie', '~> 3.5'
   s.add_dependency 'cortex-exceptions', '~> 0.0.4'
 end

lib/cortex/connection.rb

@@ -23,7 +23,7 @@ def connection
       Faraday.new options do |conn|
         ## Request middleware first:
         conn.use Cortex::FaradayMiddleware::NormalizeURIPath
-        conn.request :oauth2, access_token.is_a?(OAuth2::AccessToken) ? access_token.token : access_token
+        conn.request :oauth2, access_token.is_a?(OAuth2::AccessToken) ? access_token.token : access_token, token_type: 'param'
         conn.request :json
 
         ## Response middleware second: