Merge branch 'develop'

Author: toastercup

.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.2.3
+  - 2.3.0
 notifications:
   recipients:
     - [email protected]

CHANGELOG.md

@@ -0,0 +1,9 @@
+Version History
+====
+    * All Version bumps are required to update this file as well!!
+----
+
+* 0.7.0 - Implement ability to specify OAuth scopes
+* 0.6.1 - Update various dependencies
+* 0.6.0 - Implement ETag-based caching flow for all endpoints
+* 0.5.0 - Update OAuth2 gem to 1.0.0

README.md

@@ -22,7 +22,7 @@ Alternatively, cortex-client will handle OAuth2 authentication for you:
 ```ruby
 require 'cortex-client'
 
-client = Cortex::Client.new(key: 'my-app-id', secret: 'secrey-key-ssh', base_url: 'base_url')
+client = Cortex::Client.new(key: 'my-app-id', secret: 'secrey-key-ssh', base_url: 'base_url', scopes: 'view:posts view:media')
 
  client.posts.query().each do |post|
   puts post
@@ -51,5 +51,4 @@ Cortex::Client will return a Cortex::Result object. The following methods are av
 - *Webpages* - feed
 
 ### TODO
-- Handle pagination
-- /media
+- Support *Media* endpoint

cortex-client.gemspec

@@ -8,19 +8,20 @@ Gem::Specification.new do |s|
   s.homepage      = 'https://github.com/cortex-cms/cortex-client-ruby'
   s.authors       = ['CB Content Enablement']
   s.email         = '[email protected]'
-  s.license       = 'Apache 2.0'
+  s.license       = 'Apache-2.0'
 
   s.files         = `git ls-files`.split($/).reject { |f| f == '.gitignore' }
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ['lib']
 
-  s.add_development_dependency 'rake', '~> 10.4'
-  s.add_development_dependency 'rspec', '~> 3.3'
+  s.add_development_dependency 'rake', '~> 11.1'
+  s.add_development_dependency 'rspec', '~> 3.4'
   s.add_development_dependency 'mocha', '~> 1.1'
 
   s.add_dependency 'faraday', '~> 0.9'
   s.add_dependency 'faraday_middleware', '~> 0.10'
-  s.add_dependency 'oauth2', '~> 0.9'
+  s.add_dependency 'faraday-http-cache', '~> 1.3.0'
+  s.add_dependency 'oauth2', '~> 1.1.0'
   s.add_dependency 'cortex-exceptions', '~> 0.0.4'
   s.add_dependency 'hashie', '~> 3.4'
 end

lib/cortex/client.rb

@@ -14,6 +14,7 @@ class Client
     attr_accessor :access_token, :base_url, :auth_method
     @key = ''
     @secret = ''
+    @scopes = ''
 
     include Cortex::Connection
     include Cortex::Request
@@ -25,6 +26,7 @@ def initialize(hasharg)
       else
         @key = hasharg[:key]
         @secret = hasharg[:secret]
+        @scopes ||= hasharg[:scopes]
         @access_token = get_cc_token
       end
       @posts = Cortex::Posts.new(self)
@@ -35,7 +37,7 @@ def initialize(hasharg)
     def get_cc_token
       begin
         client = OAuth2::Client.new(@key, @secret, site: @base_url)
-        client.client_credentials.get_token
+        client.client_credentials.get_token({scope: @scopes})
       rescue Faraday::ConnectionFailed
         raise Cortex::Exceptions::ConnectionFailed.new(base_url: @base_url)
       end

lib/cortex/connection.rb

@@ -1,13 +1,14 @@
 require 'faraday'
 require 'faraday_middleware'
 require 'cortex/faraday_middleware'
+require 'faraday-http-cache'
 
 module Cortex
   module Connection
     def connection
       options = {
         :headers => {
-          :user_agent => "cortex-client (Ruby) - #{Cortex::VERSION}"
+            :user_agent => "cortex-client-ruby - #{Cortex::VERSION}"
         },
         :url => base_url
       }
@@ -18,6 +19,8 @@ def connection
 
       Faraday.new options do |conn|
         conn.use Cortex::FaradayMiddleware
+
+        conn.use Faraday::HttpCache, store: Rails.cache, logger: Rails.logger if defined? Rails
         conn.request :oauth2, access_token.is_a?(OAuth2::AccessToken) ? access_token.token : access_token
         conn.request :json
         conn.response :json, :content_type => /\bjson$/

lib/cortex/version.rb

@@ -1,3 +1,3 @@
 module Cortex
-  VERSION = '0.4.6'
+  VERSION = '0.7.0'
 end

lib/cortex/webpages.rb

@@ -1,7 +1,7 @@
 module Cortex
   class Webpages < Cortex::Resource
     def get_feed(id)
-      client.get("/webpages/feed", {:url => id})
+      client.get('/webpages/feed', {:url => id})
     end
   end
 end

spec/client_spec.rb

@@ -4,8 +4,9 @@
 
   let(:access_token) { '123' }
   let(:base_url) { 'http://localhost:3000' }
+  let(:scopes) { 'view:posts view:media' }
   let(:client) do
-    Cortex::Client.new(access_token: access_token, base_url: base_url)
+    Cortex::Client.new(access_token: access_token, base_url: base_url, scopes: scopes)
   end
 
   it 'should preserve settings' do