Skip to content

Commit 346e868

Browse files
Alex TharpAlex Tharp
authored andcommitted
Merge pull request #17 from cortex-cms/upgrades-april-2016
Update various dependencies
2 parents af12e72 + a25d90c commit 346e868

File tree

6 files changed

+10
-8
lines changed

6 files changed

+10
-8
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: ruby
22
rvm:
3-
- 2.2.3
3+
- 2.3.0
44
notifications:
55
recipients:
66

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@ Version History
33
* All Version bumps are required to update this file as well!!
44
----
55

6+
* 0.6.1 - Update various dependencies
7+
* 0.6.0 - Implemented ETag-based caching flow for all endpoints
68
* 0.5.0 - Update OAuth2 gem to 1.0.0

cortex-client.gemspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@ Gem::Specification.new do |s|
88
s.homepage = 'https://github.com/cortex-cms/cortex-client-ruby'
99
s.authors = ['CB Content Enablement']
1010
s.email = '[email protected]'
11-
s.license = 'Apache 2.0'
11+
s.license = 'Apache-2.0'
1212

1313
s.files = `git ls-files`.split($/).reject { |f| f == '.gitignore' }
1414
s.test_files = s.files.grep(%r{^(test|spec|features)/})
1515
s.require_paths = ['lib']
1616

17-
s.add_development_dependency 'rake', '~> 10.4'
18-
s.add_development_dependency 'rspec', '~> 3.3'
17+
s.add_development_dependency 'rake', '~> 11.1'
18+
s.add_development_dependency 'rspec', '~> 3.4'
1919
s.add_development_dependency 'mocha', '~> 1.1'
2020

2121
s.add_dependency 'faraday', '~> 0.9'
2222
s.add_dependency 'faraday_middleware', '~> 0.10'
2323
s.add_dependency 'faraday-http-cache', '~> 1.3.0'
24-
s.add_dependency 'oauth2', '~> 1.0.0'
24+
s.add_dependency 'oauth2', '~> 1.1.0'
2525
s.add_dependency 'cortex-exceptions', '~> 0.0.4'
2626
s.add_dependency 'hashie', '~> 3.4'
2727
end

lib/cortex/connection.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module Connection
88
def connection
99
options = {
1010
:headers => {
11-
:user_agent => "cortex-client (Ruby) - #{Cortex::VERSION}"
11+
:user_agent => "cortex-client-ruby - #{Cortex::VERSION}"
1212
},
1313
:url => base_url
1414
}

lib/cortex/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module Cortex
2-
VERSION = '0.6.0'
2+
VERSION = '0.6.1'
33
end

lib/cortex/webpages.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module Cortex
22
class Webpages < Cortex::Resource
33
def get_feed(id)
4-
client.get("/webpages/feed", {:url => id})
4+
client.get('/webpages/feed', {:url => id})
55
end
66
end
77
end

0 commit comments

Comments
 (0)