yam 2.1.2 → 2.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. checksums.yaml.gz.sig +0 -0
  3. data.tar.gz.sig +0 -0
  4. data/CHANGELOG.md +4 -0
  5. data/lib/yammer/oauth2_client.rb +2 -2
  6. data/lib/yammer/version.rb +2 -2
  7. data/yam.gemspec +1 -1
  8. metadata +3 -3
  9. metadata.gz.sig +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f47bffff97620251c3605b228c70f428056959fc
4
- data.tar.gz: 23d701b97781aa74840b904d33b4d973b8f374b9
3
+ metadata.gz: 7a8e86aac55bc10f4b6a051ce670170837cbd326
4
+ data.tar.gz: d4237220164fe41b9e4083f89fd7fdf705703a9f
5
5
  SHA512:
6
- metadata.gz: a653837a0baebb878fec3a7ae97790922d35399f35fcc15cae1e932a97957bda62fa01dbcefbfe231136f7a4c77902958983f9641a1ffebb69c382614e3990a7
7
- data.tar.gz: 628d2fe473b79b3dd71cd4bbb2372dacea33fa8c9326ea2e94aa7fc589a295047becc3789cdcece6c9f57c98344101582ac9bdcf28cb2037c805960725b5a423
6
+ metadata.gz: e15c1470fc0516e3e50fba16c137f4ebaf674bb8c93f3570754818074dc00d3fb57e372cf811d8fba3f3086f083d18afb7fde8e8939e201b8898c108766d10a7
7
+ data.tar.gz: df7a2dac8028741a3f8103da2d59008bf754f1786936482a68e3cf971b5cbb2ecbbc98ce39ccc491319d9b25d8ec65a5b723ba6aa68ead0d2ed7945bcb613a44
checksums.yaml.gz.sig CHANGED
Binary file
data.tar.gz.sig CHANGED
Binary file
data/CHANGELOG.md CHANGED
@@ -1,3 +1,7 @@
1
+ 2.1.0
2
+ ====================================
3
+ - Updated version of OAuth2 Client to 2.0.0 to resolve conflicts with intridea's oauth gem
4
+
1
5
  2.1.0
2
6
  ====================================
3
7
  - Bundled Yammer OAuth2 Client into gem
data/lib/yammer/oauth2_client.rb CHANGED
@@ -12,10 +12,10 @@
12
12
  # See the Apache Version 2.0 License for specific language governing
13
13
  # permissions and limitations under the License.
14
14
 
15
- require 'oauth2'
15
+ require 'oauth2-client'
16
16
 
17
17
  module Yammer
18
- class OAuth2Client < OAuth2::Client
18
+ class OAuth2Client < OAuth2Client::Client
19
19
 
20
20
  SITE_URL = 'https://www.yammer.com'
21
21
  TOKEN_PATH = '/oauth2/token'
data/lib/yammer/version.rb CHANGED
@@ -15,8 +15,8 @@
15
15
  module Yammer
16
16
  class Version
17
17
  MAJOR = 2 unless defined? Yammer::MAJOR
18
- MINOR = 1 unless defined? Yammer::MINOR
19
- PATCH = 2 unless defined? Yammer::PATCH
18
+ MINOR = 2 unless defined? Yammer::MINOR
19
+ PATCH = 0 unless defined? Yammer::PATCH
20
20
  PRE = nil unless defined? Yammer::PRE
21
21
 
22
22
  class << self
data/yam.gemspec CHANGED
@@ -47,7 +47,7 @@ Gem::Specification.new do |s|
47
47
  s.add_dependency 'multi_json', '~> 1.8'
48
48
  s.add_dependency 'rest-client', '~> 1.6'
49
49
  s.add_dependency 'addressable', '~> 2.3'
50
- s.add_dependency 'oauth2-client', '~> 1.1'
50
+ s.add_dependency 'oauth2-client', '~> 2.0'
51
51
 
52
52
  s.add_development_dependency 'rake'
53
53
  s.add_development_dependency 'rspec'
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: yam
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.2
4
+ version: 2.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Kevin Mutyaba
@@ -93,14 +93,14 @@ dependencies:
93
93
  requirements:
94
94
  - - ~>
95
95
  - !ruby/object:Gem::Version
96
- version: '1.1'
96
+ version: '2.0'
97
97
  type: :runtime
98
98
  prerelease: false
99
99
  version_requirements: !ruby/object:Gem::Requirement
100
100
  requirements:
101
101
  - - ~>
102
102
  - !ruby/object:Gem::Version
103
- version: '1.1'
103
+ version: '2.0'
104
104
  - !ruby/object:Gem::Dependency
105
105
  name: rake
106
106
  requirement: !ruby/object:Gem::Requirement
metadata.gz.sig CHANGED
Binary file