Merge branch 'develop'

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

@@ -15,14 +15,14 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_development_dependency 'rake', '~> 12.0'
-  s.add_development_dependency 'rspec', '~> 3.5'
+  s.add_development_dependency 'rspec', '~> 3.6'
   s.add_development_dependency 'mocha', '~> 1.2'
   s.add_development_dependency 'webmock', '~> 2.3'
 
-  s.add_dependency 'oauth2', '~> 1.1'
-  s.add_dependency 'faraday', '~> 0.9'
-  s.add_dependency 'faraday_middleware', '~> 0.10'
+  s.add_dependency 'oauth2', '~> 1.4'
+  s.add_dependency 'faraday', '~> 0.12'
+  s.add_dependency 'faraday_middleware', '~> 0.11'
   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/client.rb

@@ -3,14 +3,15 @@
 require 'cortex/connection'
 require 'cortex/request'
 require 'cortex/resource'
+require 'cortex/content_items'
 require 'cortex/posts'
 require 'cortex/users'
 require 'cortex/webpages'
 require 'cortex/result'
 
 module Cortex
   class Client
-    attr_reader :posts, :users, :webpages
+    attr_reader :posts, :users, :webpages, :content_items
     attr_accessor :access_token, :base_url, :auth_method
     @key = ''
     @secret = ''
@@ -32,6 +33,7 @@ def initialize(hasharg)
       @posts = Cortex::Posts.new(self)
       @users = Cortex::Users.new(self)
       @webpages = Cortex::Webpages.new(self)
+      @content_items = Cortex::ContentItems.new(self)
     end
 
     def get_cc_token

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:

lib/cortex/content_items.rb

@@ -0,0 +1,27 @@
+module Cortex
+  class ContentItems  < Cortex::Resource
+    def query(params = {})
+      client.get('/content_items', params)
+    end
+
+    def feed(params = {})
+      client.get('/content_items/feed', params)
+    end
+
+    def get(id)
+      client.get("/content_items/#{id}")
+    end
+
+    def get_published(id)
+      client.get("/content_items/feed/#{id}")
+    end
+
+    def save(content_item)
+      client.save('/content_items', content_item)
+    end
+
+    def delete(id)
+      client.delete("/content_items/#{id}")
+    end
+  end
+end

lib/cortex/version.rb

@@ -1,3 +1,3 @@
 module Cortex
-  VERSION = '0.10.2'
+  VERSION = '0.11.0'
 end