yam 2.4.1 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afca8efcf863289c0df39f0710d81ab21ff81bd9
-  data.tar.gz: aa9ef9c5ae93304e48801c2a03678c4be6847d64
+  metadata.gz: 185c4117b99902a304878291837a72d7f215e7ba
+  data.tar.gz: bd832d78c1f3c74402af1392b9487046affbb463
 SHA512:
-  metadata.gz: 462bd56573c5028601d93e2ecc2da476a6b2cce953f208526be32d8ab11028a9e1dfeab33d91db55d668ab590af4f30c0e8d2689bc6618b64d59cf23d1940a26
-  data.tar.gz: e080b5b6381efafbd4a5d138943e239384f7ae727f09c39f89573a6fe0c64d1b3cd78f1cf74bb89690c460d29b35325cc01cb12272127d8edad16d128646aa57
+  metadata.gz: 0e97d0e9cbc6e59bd368c85802f8ed71120000f73b0478314a2381f8440dc7024a4fa78f301dfbe623287ae7697be88073df2a332dd395db89694b263ff4d215
+  data.tar.gz: 337f30113bedd0713cd7a9d47f79110760bffcda3e4569c0d2df756c066fe7a58cb7e02f4f247f43f6b947f663ed973e9f5c1fc9a0164d3b4cd647f8f899bf05

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
+  - 2.3.0
   - 2.0.0
-  - 1.9.3
   - 1.9.2
 
 branches:

data/Gemfile

@@ -23,7 +23,7 @@ group :test do
   gem 'rspec', '>= 2.11'
   gem 'simplecov', :require => false
   gem 'coveralls', :require => false
-  gem 'webmock', '>= 1.10.1'
+  gem 'webmock', '>= 1.22.0'
 end
 
 gemspec

data/certs/public.pem

@@ -1,21 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MREwDwYDVQQDDAh0aWFi
-YXNuazEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYDY29t
-MB4XDTE0MTExMDIzNDYxNloXDTE1MTExMDIzNDYxNlowPzERMA8GA1UEAwwIdGlh
-YmFzbmsxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkWA2Nv
-bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL0rWUkIWOqkowk7uTqx
-ODLUzGbjvzOcUXIsvffq3JysAzaQv0inAsF82yS6OAYiEtYfGgutYnqgMLMo6hdz
-x/bnLjutMhzFRY3KYk99A+U12xxSh3BScoM1TvV+aCO1zgbiju/Mn69DYKISITn/
-REcTF6MV3LL89N2/1wJdPkkTju4O4pH94gNcRmmwHEfWTsIQoZB7b+JSvbnuP4DT
-dsC6ccV3WmzERBVEwVdkzCToXE0x1oBqPvmx+xg/KhtfCB+mEYtFpcxOPOn66QDe
-WHG/LyutQnv3x9eDC7iEvgngPGPaNj5O9/xsUAdN47Zreaiww7URqpqYHmFhjNcr
-0YECAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFHY+
-v/ds/CDzG0sCkSJULm6yb1QwMB0GA1UdEQQWMBSBEnRpYWJhc25rQGdtYWlsLmNv
-bTAdBgNVHRIEFjAUgRJ0aWFiYXNua0BnbWFpbC5jb20wDQYJKoZIhvcNAQEFBQAD
-ggEBAJO0IJVl6m61//5VBct3c+nAw5O297Vgz/FscdMMYkfTSbPzLVBxnliNToXm
-BdR/GLbgoncfTaaYiNTJwtitfPAjY51vy47Lb8L+ilMOV5DyNKmbB312QETw2sSc
-OV6wF8QELWxYRJRyGknim8ldIAeHdLhs/35dnaqfmDY3grZPiqSCXDU13uiYu8z5
-miqw6vp9DpLxpNZCXqqafBeBvKAq0cFR+5Mf/7zeKdD8ymvWhEcxthAg8IG8vJTI
-EalsTcGelSol6q0PIaRG2gu/bDlxtAuZOD1i/BaIgoe4GXIZ4CHkZ9gKl4DtoVUo
-jjKmSHcQ0zdwTZ3XxGdQu48WypU=
+MIIDgDCCAmigAwIBAgIBATANBgkqhkiG9w0BAQUFADBDMREwDwYDVQQDDAhrbXV0
+eWFiYTEZMBcGCgmSJomT8ixkARkWCW1pY3Jvc29mdDETMBEGCgmSJomT8ixkARkW
+A2NvbTAeFw0xNjAxMjMwMTE2MDVaFw0xNzAxMjIwMTE2MDVaMEMxETAPBgNVBAMM
+CGttdXR5YWJhMRkwFwYKCZImiZPyLGQBGRYJbWljcm9zb2Z0MRMwEQYKCZImiZPy
+LGQBGRYDY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw9iZuvdL
+hzj0njBvw3U5UPCC5GpIXaxvMR/JfM/+rcIVBL7pmSkTJWYh35O2w5Nn3q6Wovk9
+9CJMj7bpFDzXDObLarTG6JBZ82x9QIrtDkCWe4VV1TydYgsBQGe5MtKZsPe6Jcqx
+cqxUgpMLh9npNVgGxRY/yqeXEQ9JVxmR2vmkOEa13RkRijLHFCfVTw1w68QAbQps
+b9YfXWUIJ7H+u0pFkgRSFqHbh0h044dm86NCV90Y9Spl8RBk3pj+pPKJ0nWnqpNb
+pLzCJ5lwZQaJyj1N7VXYNGRd8Q9eOYuA2kObLSJv4Ut8PpWnLHDynj2VOru1cNLD
+iZvHf5IwiTO4VQIDAQABo38wfTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNV
+HQ4EFgQUSzCjf7Wys22V4mwbz+gzKtO4hrswIQYDVR0RBBowGIEWa211dHlhYmFA
+bWljcm9zb2Z0LmNvbTAhBgNVHRIEGjAYgRZrbXV0eWFiYUBtaWNyb3NvZnQuY29t
+MA0GCSqGSIb3DQEBBQUAA4IBAQC/76KmRxfnk8+bDvbTt23SRxLABj1cjkqoG7+e
+TkF5PVnWcPCUGrSAHkqZItH5Rm2A3ITvOKns04MbIdQfsaOniEEU063P2NbD1pHz
+/R6R0cy79S781+akWDLxzYJkkc66/OcID1esKvRmkAwYJ6WQmPlRNmYCTLf19cmx
+rioWlMxz7cJc3XMhdgFEn45S7/F+TyQdMt1LWoIK8J68dcuaGfW+hIq3edhVaASr
+oaChqbGI6vlVXiNp6dEuMEUdFbxb+KbKc2GWfuNz+OerJIKH6eCcxcau2VA/Mzq2
+XdGvB/v+GhpfWXG3egw7j9j4WrtfLVxGyCVxniOZA8/UGaBD
 -----END CERTIFICATE-----

data/lib/yammer/api/user.rb

@@ -147,10 +147,12 @@ module Yammer
       # @raise  [Yammer::Error::Unauthorized] Error raised when supplied user credentials are not valid.
       # @return [Yammer::ApiResponse]
       # @param  id [Integer] the ID of the user whose followers you want to get
+      # @param  opts [Hash] A customizable set of opts.
+      # @option opts [Integer] :page
       # @example Fetch users from the authenticated user's network following user whose ID is provided
       #   Yammer.users_following(1)
-      def users_following(id)
-        get("/api/v1/users/following/#{id}")
+      def users_following(id, opts={})
+        get("/api/v1/users/following/#{id}", opts)
       end
 
       # @rate_limited Yes
@@ -158,10 +160,12 @@ module Yammer
       # @raise  [Yammer::Error::Unauthorized] Error raised when supplied user credentials are not valid.
       # @return [Yammer::ApiResponse]
       # @param  id [Integer] the ID of the user for whom you want to get the users being followed
+      # @param  opts [Hash] A customizable set of opts.
+      # @option opts [Integer] :page
       # @example Fetch users from the authenticated user's network followed by the user whose ID is provided
       #   Yammer.users_followed(1)
-      def users_followed_by(id)
-        get("/api/v1/users/followed_by/#{id}")
+      def users_followed_by(id, opts={})
+        get("/api/v1/users/followed_by/#{id}", opts)
       end
 
       # @rate_limited Yes

data/lib/yammer/oauth2_client.rb

@@ -33,7 +33,7 @@ module Yammer
     # Generates the Yammer URL that the user will be redirected to in order to
     # authorize your application
     #
-    # @see https://developer.yammer.com/api/oauth2.html#client-side
+    # @see https://developer.yammer.com/v1.0/docs/oauth-2#client-side-flow
     #
     # @opts [Hash] additional parameters to be include in URL eg. scope, state, etc
     #
@@ -51,7 +51,7 @@ module Yammer
     # Generates the Yammer URL that the user will be redirected to in order to
     # authorize your application
     #
-    # @see https://developer.yammer.com/api/oauth2.html#server-side
+    # @see https://developer.yammer.com/v1.0/docs/oauth-2#server-side-flow
     #
     # @opts [Hash] additional parameters to be include in URL eg. scope, state, etc
     #
@@ -70,7 +70,7 @@ module Yammer
     # Makes a request to Yammer server that will swap your authorization code for an access
     # token
     #
-    # @see https://developer.yammer.com/api/oauth2.html#server-side
+    # @see https://developer.yammer.com/v1.0/docs/oauth-2#server-side-flow
     #
     # @opts [Hash] may include redirect uri and other query parameters
     #

data/lib/yammer/version.rb

@@ -1,13 +1,13 @@
 # Copyright (c) Microsoft Corporation
 # All rights reserved.
-# Licensed under the Apache License, Version 2.0 (the "License"); 
+# Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 
+# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
 #
-# THIS CODE IS PROVIDED *AS IS* BASIS, WITHOUT WARRANTIES OR 
-# CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING 
+# THIS CODE IS PROVIDED *AS IS* BASIS, WITHOUT WARRANTIES OR
+# CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING
 # WITHOUT LIMITATION ANY IMPLIED WARRANTIES OR CONDITIONS OF TITLE,
-# FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABLITY OR NON-INFRINGEMENT. 
+# FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABLITY OR NON-INFRINGEMENT.
 
 # See the Apache Version 2.0 License for specific language governing
 # permissions and limitations under the License.
@@ -15,8 +15,8 @@
 module Yammer
   class Version
     MAJOR = 2 unless defined? Yammer::MAJOR
-    MINOR = 4 unless defined? Yammer::MINOR
-    PATCH = 1 unless defined? Yammer::PATCH
+    MINOR = 5 unless defined? Yammer::MINOR
+    PATCH = 0 unless defined? Yammer::PATCH
     PRE = nil unless defined? Yammer::PRE
 
     class << self

data/spec/api/activity_spec.rb

@@ -53,7 +53,7 @@ describe Yammer::Api::Activity do
           email: 'example@yammer-inc.com'
         }]
       }
-      subject.should_receive(:post).with('/api/v1/activity', params)
+      expect(subject).to receive(:post).with('/api/v1/activity', params)
       @client.create_activity(params)
     end
   end

data/spec/api/autocomplete_spec.rb

@@ -34,8 +34,8 @@ describe Yammer::Api::Autocomplete do
 
   describe '#autocomplete' do
     it 'should fetch autocomplete data' do
-      subject.should_receive(:get).with('/api/v1/autocomplete/ranked', { :prefix => 'alc' })
+      expect(subject).to receive(:get).with('/api/v1/autocomplete/ranked', { :prefix => 'alc' })
       subject.autocomplete({ :prefix => 'alc' })
     end
   end
-end
+end

data/spec/api/group_membership_spec.rb

@@ -34,15 +34,15 @@ describe Yammer::Api::GroupMembership do
 
   describe '#get_group_membership' do
     it 'should fetch a group membership' do
-      subject.should_receive(:get).with('/api/v1/group_memberships/1')
+      expect(subject).to receive(:get).with('/api/v1/group_memberships/1')
       subject.get_group_membership(1)
     end
   end
 
   describe '#create_group_membership' do
     it 'should create a group membership' do
-      subject.should_receive(:post).with('/api/v1/group_memberships', { :group_id => 2 })
+      expect(subject).to receive(:post).with('/api/v1/group_memberships', { :group_id => 2 })
       subject.create_group_membership(2)
     end
   end
-end
+end

data/spec/api/group_spec.rb

@@ -34,28 +34,28 @@ describe Yammer::Api::Group do
 
   describe '#all_groups' do
     it 'should fetch all groups in network' do
-      subject.should_receive(:get).with('/api/v1/groups', {})
+      expect(subject).to receive(:get).with('/api/v1/groups', {})
       subject.all_groups
     end
   end
 
   describe '#groups_for_user' do
     it 'should fetch all groups for user' do
-      subject.should_receive(:get).with('/api/v1/groups/for_user/2')
+      expect(subject).to receive(:get).with('/api/v1/groups/for_user/2')
       subject.groups_for_user(2)
     end
   end
 
   describe '#get_group' do
     it 'should fetch a thread' do
-      subject.should_receive(:get).with('/api/v1/groups/1')
+      expect(subject).to receive(:get).with('/api/v1/groups/1')
       subject.get_group(1)
     end
   end
 
   describe '#create_group' do
     it 'should fetch a thread' do
-      subject.should_receive(:post).with('/api/v1/groups', {
+      expect(subject).to receive(:post).with('/api/v1/groups', {
         :name => 'my group',
         :description => 'A test group',
         :private => false
@@ -66,11 +66,11 @@ describe Yammer::Api::Group do
 
   describe '#update_group' do
     it 'should fetch a thread' do
-      subject.should_receive(:post).with('/api/v1/groups/2', {
+      expect(subject).to receive(:post).with('/api/v1/groups/2', {
         :name => 'another group',
         :description => 'A modified group description',
       })
       subject.update_group(2, :name => 'another group', :description => 'A modified group description')
     end
   end
-end
+end

data/spec/api/invitation_spec.rb

@@ -31,28 +31,28 @@ describe Yammer::Api::Search do
 
     context 'with single email as string' do
       it 'should invite users' do
-        subject.should_receive(:post).with('/api/v1/invitations', { :email => 'alice@yammer.com' })
+        expect(subject).to receive(:post).with('/api/v1/invitations', { :email => 'alice@yammer.com' })
         subject.invite('alice@yammer.com ')
       end
     end
 
     context 'with single email as array' do
       it 'should invite users' do
-        subject.should_receive(:post).with('/api/v1/invitations', { :email => 'bob@yammer.com' })
+        expect(subject).to receive(:post).with('/api/v1/invitations', { :email => 'bob@yammer.com' })
         subject.invite(%w{bob@yammer.com})
       end
     end
 
     context 'with multiple emails as string' do
       it 'should invite users' do
-        subject.should_receive(:post).with('/api/v1/invitations', { :email => 'bob@yammer.com,alice@yammer.com' })
+        expect(subject).to receive(:post).with('/api/v1/invitations', { :email => 'bob@yammer.com,alice@yammer.com' })
         subject.invite(' bob@yammer.com,alice@yammer.com ')
       end
     end
 
     context 'with multiple emails as array' do
       it 'should invite users' do
-        subject.should_receive(:post).with('/api/v1/invitations', { :email => 'bob@yammer.com,alice@yammer.com' })
+        expect(subject).to receive(:post).with('/api/v1/invitations', { :email => 'bob@yammer.com,alice@yammer.com' })
         subject.invite(%w{ bob@yammer.com alice@yammer.com })
       end
     end

data/spec/api/like_spec.rb

@@ -29,17 +29,17 @@ describe Yammer::Api::Topic do
 
   describe '#likes' do
     it 'should check if user likes open graph object' do
-      subject.should_receive(:get).with('/api/v1/likes/open_graph_object/1')
+      expect(subject).to receive(:get).with('/api/v1/likes/open_graph_object/1')
       subject.likes_open_graph_object?(1)
     end
 
     it 'should like open graph object' do
-      subject.should_receive(:post).with('/api/v1/likes', :id => 1, :type => 'OpenGraphObject')
+      expect(subject).to receive(:post).with('/api/v1/likes', :id => 1, :type => 'OpenGraphObject')
       subject.like('OpenGraphObject', 1)
     end
 
     it 'should unlike open graph object' do
-      subject.should_receive(:delete).with('/api/v1/likes/1')
+      expect(subject).to receive(:delete).with('/api/v1/likes/1')
       subject.unlike(1)
     end
   end

data/spec/api/message_spec.rb

@@ -36,14 +36,14 @@ describe Yammer::Api::Message do
     context 'with options' do
       it 'should get_messages' do
         params = { :page => 1 }
-        subject.should_receive(:get).with('/api/v1/messages', params)
+        expect(subject).to receive(:get).with('/api/v1/messages', params)
         subject.all_messages(params)
       end
     end
 
     context 'without options' do
       it 'should return all messages viewable by a user' do
-        subject.should_receive(:get).with('/api/v1/messages', {})
+        expect(subject).to receive(:get).with('/api/v1/messages', {})
         subject.all_messages 
       end
     end
@@ -52,98 +52,98 @@ describe Yammer::Api::Message do
   describe '#create_message' do
     it 'should create_message' do
       message = 'Greetings, we come in peace'
-      subject.should_receive(:post).with('/api/v1/messages', :body => message)
+      expect(subject).to receive(:post).with('/api/v1/messages', :body => message)
       subject.create_message(message)
     end
   end
 
   describe '#message' do
     it 'should fetch a message' do
-      subject.should_receive(:get).with('/api/v1/messages/3')
+      expect(subject).to receive(:get).with('/api/v1/messages/3')
       subject.get_message(3)
     end
   end
 
   describe '#delete_message' do
     it 'should delete a message' do
-      subject.should_receive(:delete).with('/api/v1/messages/4')
+      expect(subject).to receive(:delete).with('/api/v1/messages/4')
       subject.delete_message(4)
     end
   end
 
   describe '#messages_sent' do
     it 'should fetch messages sent by a user' do
-      subject.should_receive(:get).with('/api/v1/messages/sent', {})
+      expect(subject).to receive(:get).with('/api/v1/messages/sent', {})
       subject.messages_sent
     end
   end
 
   describe '#messages_received' do
     it 'should fetch messages received by a user' do
-      subject.should_receive(:get).with('/api/v1/messages/received', {})
+      expect(subject).to receive(:get).with('/api/v1/messages/received', {})
       subject.messages_received
     end
   end
 
   describe '#private_messages' do
     it 'should fetch private messages' do
-      subject.should_receive(:get).with('/api/v1/messages/private', {})
+      expect(subject).to receive(:get).with('/api/v1/messages/private', {})
       subject.private_messages
     end
   end
 
   describe '#followed_messages' do
     it 'should fetch messages followed by a user' do
-      subject.should_receive(:get).with('/api/v1/messages/following', {})
+      expect(subject).to receive(:get).with('/api/v1/messages/following', {})
       subject.followed_messages
     end
   end
 
   describe '#messages_from_user' do
     it 'should fetch messages created by a user' do
-      subject.should_receive(:get).with('/api/v1/messages/from_user/14', {})
+      expect(subject).to receive(:get).with('/api/v1/messages/from_user/14', {})
       subject.messages_from_user(14)
     end
   end
 
   describe '#messages_about_topic' do
     it 'should fetch messages about a topic' do
-      subject.should_receive(:get).with('/api/v1/messages/about_topic/19', {})
+      expect(subject).to receive(:get).with('/api/v1/messages/about_topic/19', {})
       subject.messages_about_topic(19)
     end
   end
 
   describe '#messages_in_group' do
     it 'should fetch messages in group' do
-      subject.should_receive(:get).with('/api/v1/messages/in_group/26', {})
+      expect(subject).to receive(:get).with('/api/v1/messages/in_group/26', {})
       subject.messages_in_group(26)
     end
   end
 
   describe '#messages_liked_by' do
     it 'should fetch messages liked by user' do
-      subject.should_receive(:get).with('/api/v1/messages/liked_by/58', {})
+      expect(subject).to receive(:get).with('/api/v1/messages/liked_by/58', {})
       subject.messages_liked_by(58)
     end
   end
 
   describe '#like_message' do
     it 'should like the message as a the specified user' do
-      subject.should_receive(:post).with('/api/v1/messages/liked_by/current.json?message_id=97', {})
+      expect(subject).to receive(:post).with('/api/v1/messages/liked_by/current.json?message_id=97', {})
       subject.like_message(97)
     end
   end
 
   describe '#unlike_message' do
     it 'should unlike the message as a the specified user' do
-      subject.should_receive(:delete).with('/api/v1/messages/liked_by/current.json?message_id=97', {})
+      expect(subject).to receive(:delete).with('/api/v1/messages/liked_by/current.json?message_id=97', {})
       subject.unlike_message(97)
     end
   end
 
   describe '#messages_in_thread' do
     it 'should fetch messages in thread' do
-      subject.should_receive(:get).with('/api/v1/messages/in_thread/97', {})
+      expect(subject).to receive(:get).with('/api/v1/messages/in_thread/97', {})
       subject.messages_in_thread(97)
     end
   end

data/spec/api/network_spec.rb

@@ -34,7 +34,7 @@ describe Yammer::Api::Network do
 
   describe '#networks_current' do
     it 'should fetch network data' do
-      subject.should_receive(:get).with('/api/v1/networks/current', { :include_suspended => true })
+      expect(subject).to receive(:get).with('/api/v1/networks/current', { :include_suspended => true })
       subject.current_networks({ :include_suspended => true })
     end
   end

data/spec/api/notification_spec.rb

@@ -34,7 +34,7 @@ describe Yammer::Api::Notification do
 
   describe '#notifications' do
     it "should fetch authenticated user's notifications" do
-      subject.should_receive(:get).with('/api/v1/streams/notifications')
+      expect(subject).to receive(:get).with('/api/v1/streams/notifications')
       subject.notifications
     end
   end

data/spec/api/open_graph_object_spec.rb

@@ -39,7 +39,7 @@ describe Yammer::Api::Search do
         :site_name => 'Microsoft',
         :image     => 'https://example.com/global/images/test.jpg'
       }
-      subject.should_receive(:post).with('/api/v1/open_graph_objects', {
+      expect(subject).to receive(:post).with('/api/v1/open_graph_objects', {
         :url=>"http://www.example.com",
         :properties => {
           :site_name => "Microsoft",
@@ -50,17 +50,17 @@ describe Yammer::Api::Search do
     end
 
     it 'should follow open graph object' do
-      subject.should_receive(:post).with('/api/v1/subscriptions', :target_id => 7, :target_type => 'OpenGraphObject')
+      expect(subject).to receive(:post).with('/api/v1/subscriptions', :target_id => 7, :target_type => 'OpenGraphObject')
       subject.follow_open_graph_object(7)
     end
 
     it 'should follow opnen graph object' do
-      subject.should_receive(:get).with('/api/v1/subscriptions/to_open_graph_object/5')
+      expect(subject).to receive(:get).with('/api/v1/subscriptions/to_open_graph_object/5')
       subject.is_following_open_graph_object?(5)
     end
 
     it 'should fetch open graph objects in user activity stream' do
-      subject.should_receive(:get).with('/api/v1/streams/activities', :owner_type => 'open_graph_object', :owner_id => 4)
+      expect(subject).to receive(:get).with('/api/v1/streams/activities', :owner_type => 'open_graph_object', :owner_id => 4)
       subject.get_activity_stream_open_graph_objects(4)
     end
   end

data/spec/api/pending_attachment_spec.rb

@@ -34,14 +34,14 @@ describe Yammer::Api::PendingAttachment do
 
   describe '#get_pending_attachment' do
     it 'should fetch a pending attachment' do
-      subject.should_receive(:get).with('/api/v1/pending_attachments/2')
+      expect(subject).to receive(:get).with('/api/v1/pending_attachments/2')
       subject.get_pending_attachment(2)
     end
   end
 
   describe '#delete_pending_attachment' do
     it 'should delete a pending attachment' do
-      subject.should_receive(:delete).with('/api/v1/pending_attachments/1')
+      expect(subject).to receive(:delete).with('/api/v1/pending_attachments/1')
       subject.delete_pending_attachment(1)
     end
   end
@@ -49,7 +49,7 @@ describe Yammer::Api::PendingAttachment do
   describe '#create_pending_attachment' do
     it 'should create a pending attachment' do
       attachment = upload('attachment.txt')
-      subject.should_receive(:post).with('/api/v1/pending_attachments', :attachment => attachment)
+      expect(subject).to receive(:post).with('/api/v1/pending_attachments', :attachment => attachment)
       subject.create_pending_attachment(attachment)
     end
   end

data/spec/api/search_spec.rb

@@ -34,7 +34,7 @@ describe Yammer::Api::Search do
 
   describe '#search' do
     it 'should search for stuff' do
-      subject.should_receive(:get).with('/api/v1/search', { :search => 'tdd dojo' })
+      expect(subject).to receive(:get).with('/api/v1/search', { :search => 'tdd dojo' })
       subject.search(:search => 'tdd dojo')
     end
   end

data/spec/api/subscription_spec.rb

@@ -34,7 +34,7 @@ describe Yammer::Api::Search do
 
   describe '#subscription' do
     it 'should create new subscription' do
-      subject.should_receive(:post).with('/api/v1/subscriptions', :target_type =>'OpenGraphObject', :target_id => 1)
+      expect(subject).to receive(:post).with('/api/v1/subscriptions', :target_type =>'OpenGraphObject', :target_id => 1)
       subject.create_subscription('OpenGraphObject', 1)
     end
   end

data/spec/api/thread_spec.rb

@@ -34,7 +34,7 @@ describe Yammer::Api::Thread do
 
   describe '#get_thread' do
     it 'should fetch a thread' do
-      subject.should_receive(:get).with('/api/v1/threads/1', {})
+      expect(subject).to receive(:get).with('/api/v1/threads/1', {})
       subject.get_thread(1)
     end
   end

data/spec/api/topic_spec.rb

@@ -34,7 +34,7 @@ describe Yammer::Api::Topic do
 
   describe '#topics' do
     it 'should fetch topic' do
-      subject.should_receive(:get).with('/api/v1/topics/1',{ :is_followed_by => 2 })
+      expect(subject).to receive(:get).with('/api/v1/topics/1',{ :is_followed_by => 2 })
       subject.get_topic(1, :is_followed_by => 2)
     end
   end

data/spec/api/user_spec.rb

@@ -35,7 +35,7 @@ describe Yammer::Api::User do
 
   describe 'all_users' do
     it 'makes an http request' do
-      @client.should_receive(:get).with('/api/v1/users', { :page => 1, :letter => 'm' })
+      expect(@client).to receive(:get).with('/api/v1/users', { :page => 1, :letter => 'm' })
       @client.all_users({:page => 1, :letter => 'm'})
     end
   end
@@ -43,14 +43,14 @@ describe Yammer::Api::User do
   describe 'create_user' do
     it 'makes an http request' do
       params = {:first_name => 'john', :last_name => 'doe', :email => 'jdoe@yammer-inc.com'}
-      @client.should_receive(:post).with('/api/v1/users', params)
+      expect(@client).to receive(:post).with('/api/v1/users', params)
       @client.create_user(params)
     end
   end
 
   describe 'get_user' do
     it 'makes an http request' do
-      @client.should_receive(:get).with('/api/v1/users/1')
+      expect(@client).to receive(:get).with('/api/v1/users/1')
       @client.get_user(1)
     end
   end
@@ -58,14 +58,14 @@ describe Yammer::Api::User do
   describe 'update_user' do
     it 'makes an http request' do
       params = {:first_name => 'jane', :last_name => 'smith'}
-      @client.should_receive(:put).with('/api/v1/users/1', params)
+      expect(@client).to receive(:put).with('/api/v1/users/1', params)
       @client.update_user(1, params)
     end
 
     context 'with id as a string' do
       it 'updates user' do
         params = {:first_name => 'jane', :last_name => 'smith'}
-        @client.should_receive(:put).with('/api/v1/users/current', params)
+        expect(@client).to receive(:put).with('/api/v1/users/current', params)
         subject.update_user('current', params)
       end
     end
@@ -73,47 +73,47 @@ describe Yammer::Api::User do
 
   describe 'delete_user' do
     it 'makes an http request' do
-      @client.should_receive(:delete).with('/api/v1/users/1')
+      expect(@client).to receive(:delete).with('/api/v1/users/1')
       @client.delete_user(1)
     end
   end
 
   describe 'get_user_by_email' do
     it 'makes an http request' do
-      @client.should_receive(:get).with('/api/v1/users/by_email', :email => 'bob@yammer-inc.com')
+      expect(@client).to receive(:get).with('/api/v1/users/by_email', :email => 'bob@yammer-inc.com')
       @client.get_user_by_email('bob@yammer-inc.com')
     end
   end
 
   describe 'current_user' do
     it 'makes an http request' do
-      @client.should_receive(:get).with('/api/v1/users/current')
+      expect(@client).to receive(:get).with('/api/v1/users/current')
       @client.current_user
     end
   end
 
   describe 'users_following' do
     it 'makes an http request' do
-      @client.should_receive(:get).with('/api/v1/users/following/3')
-      @client.users_following(3)
+      expect(@client).to receive(:get).with('/api/v1/users/following/3', {:page => 2})
+      @client.users_following(3, page: 2)
     end
   end
 
   describe 'users_followed_by' do
     it 'makes an http request' do
-      @client.should_receive(:get).with('/api/v1/users/followed_by/4')
-      @client.users_followed_by(4)
+      expect(@client).to receive(:get).with('/api/v1/users/followed_by/4', {:page => 2})
+      @client.users_followed_by(4, page: 2)
     end
   end
 
   describe 'users_in_group' do
     it 'makes an http request without' do
-      @client.should_receive(:get).with('/api/v1/users/in_group/5', {})
+      expect(@client).to receive(:get).with('/api/v1/users/in_group/5', {})
       @client.users_in_group(5)
     end
- 
+
     it 'makes an http request with optional parameters' do
-      @client.should_receive(:get).with('/api/v1/users/in_group/5', {:page => 2})
+      expect(@client).to receive(:get).with('/api/v1/users/in_group/5', {:page => 2})
       @client.users_in_group(5, {:page => 2})
     end
   end

data/spec/client_spec.rb

@@ -131,7 +131,7 @@ describe Yammer::Client do
   describe "#request" do
     context "when method is not supported" do
       it "raises an error" do
-        expect {subject.send(:request, :patch, '/')}.to raise_error
+        expect {subject.send(:request, :patch, '/')}.to raise_error(RuntimeError)
       end
     end
 
@@ -361,4 +361,4 @@ describe Yammer::Client do
       end
     end
   end
-end
+end

data/spec/resources/base_spec.rb

@@ -150,12 +150,12 @@ describe Yammer::Resources::Base do
 
         it 'should update model' do
           api_handler = double("ApiHandler")
-          api_handler.should_receive(:update_dummy_model).with(42, hash_including(
+          expect(api_handler).to receive(:update_dummy_model).with(42, hash_including(
             :first_name =>'john',
             :last_name => 'smith')
           ).and_return(double('Response', :success? => true, :created? => true, :body => {:id => 2}))
 
-          subject.stub(:api_handler).and_return(api_handler)
+          expect(subject).to receive(:api_handler).and_return(api_handler)
           subject.first_name = 'john'
           subject.last_name = 'smith'
           subject.save
@@ -167,11 +167,11 @@ describe Yammer::Resources::Base do
 
         it 'should do nothing' do
           api_handler = double("ApiHandler")
-          api_handler.should_receive(:create_dummy_model).with(
+          expect(api_handler).to receive(:create_dummy_model).with(
             hash_including(:first_name =>'jim', :last_name => 'peters')
           ).and_return(double('Response', :success? => true, :created? => true, :body => {:id => '2'}))
 
-          subject.stub(:api_handler).and_return(api_handler)
+          expect(subject).to receive(:api_handler).and_return(api_handler)
           subject.save
         end
       end
@@ -181,16 +181,16 @@ describe Yammer::Resources::Base do
 
         it 'should create model' do
           api_handler = double("ApiHandler")
-          api_handler.should_receive(:create_dummy_model).with({
+          expect(api_handler).to receive(:create_dummy_model).with({
             :first_name =>'john',
             :last_name => 'peters'
           }).and_return(double('Response', :success? => true, :created? => true, :body => {:id => 2}))
 
-          subject.stub(:api_handler).and_return(api_handler)
+          expect(subject).to receive(:api_handler).and_return(api_handler)
           subject.first_name = 'john'
           subject.save
         end
       end
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -20,15 +20,10 @@
 require 'simplecov'
 require 'coveralls'
 
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-    SimpleCov::Formatter::HTMLFormatter,
-      Coveralls::SimpleCov::Formatter
-]
 SimpleCov.start
 
 require 'yammer'
 require 'rspec'
-require 'rspec/autorun'
 require 'webmock/rspec'
 
 WebMock.disable_net_connect!(:allow => 'coveralls.io')
@@ -70,4 +65,4 @@ end
 
 def upload(file)
   File.new("#{mock_path}/#{file}")
-end
+end

data/yam.gemspec

@@ -43,17 +43,17 @@ Gem::Specification.new do |s|
   s.cert_chain       = ['certs/public.pem']
   s.signing_key      = File.expand_path("~/.gem/certs/private_key.pem") if $0 =~ /gem\z/
 
-  s.add_dependency 'oj', '~> 2.0'
-  s.add_dependency 'multi_json', '~> 1.10'
-  s.add_dependency 'rest-client', '~> 1.6'
-  s.add_dependency 'addressable', '~> 2.3'
+  s.add_dependency 'oj', '~> 2.14'
+  s.add_dependency 'multi_json', '~> 1.8'
+  s.add_dependency 'rest-client', '~> 1.8'
+  s.add_dependency 'addressable', '~> 2.4'
   s.add_dependency 'oauth2-client', '~> 2.0'
 
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'simplecov', '~> 0.8'
-  s.add_development_dependency 'webmock', '~> 1.9'
-  s.add_development_dependency 'yard', '>= 0.8'
+  s.add_development_dependency 'rake', '~> 0'
+  s.add_development_dependency 'rspec', '~> 0'
+  s.add_development_dependency 'simplecov', '~> 0.11.1'
+  s.add_development_dependency 'webmock', '~> 1.17', '>= 1.17.0'
+  s.add_development_dependency 'yard', '~> 0.8', '>= 0.8.7'
 
   s.post_install_message = %q{ Thanks for installing! For API help go to http://developer.yammer.com }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yam
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.5.0
 platform: ruby
 authors:
 - Kevin Mutyaba
@@ -10,27 +10,27 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MREwDwYDVQQDDAh0aWFi
-  YXNuazEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYDY29t
-  MB4XDTE0MTExMDIzNDYxNloXDTE1MTExMDIzNDYxNlowPzERMA8GA1UEAwwIdGlh
-  YmFzbmsxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkWA2Nv
-  bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL0rWUkIWOqkowk7uTqx
-  ODLUzGbjvzOcUXIsvffq3JysAzaQv0inAsF82yS6OAYiEtYfGgutYnqgMLMo6hdz
-  x/bnLjutMhzFRY3KYk99A+U12xxSh3BScoM1TvV+aCO1zgbiju/Mn69DYKISITn/
-  REcTF6MV3LL89N2/1wJdPkkTju4O4pH94gNcRmmwHEfWTsIQoZB7b+JSvbnuP4DT
-  dsC6ccV3WmzERBVEwVdkzCToXE0x1oBqPvmx+xg/KhtfCB+mEYtFpcxOPOn66QDe
-  WHG/LyutQnv3x9eDC7iEvgngPGPaNj5O9/xsUAdN47Zreaiww7URqpqYHmFhjNcr
-  0YECAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFHY+
-  v/ds/CDzG0sCkSJULm6yb1QwMB0GA1UdEQQWMBSBEnRpYWJhc25rQGdtYWlsLmNv
-  bTAdBgNVHRIEFjAUgRJ0aWFiYXNua0BnbWFpbC5jb20wDQYJKoZIhvcNAQEFBQAD
-  ggEBAJO0IJVl6m61//5VBct3c+nAw5O297Vgz/FscdMMYkfTSbPzLVBxnliNToXm
-  BdR/GLbgoncfTaaYiNTJwtitfPAjY51vy47Lb8L+ilMOV5DyNKmbB312QETw2sSc
-  OV6wF8QELWxYRJRyGknim8ldIAeHdLhs/35dnaqfmDY3grZPiqSCXDU13uiYu8z5
-  miqw6vp9DpLxpNZCXqqafBeBvKAq0cFR+5Mf/7zeKdD8ymvWhEcxthAg8IG8vJTI
-  EalsTcGelSol6q0PIaRG2gu/bDlxtAuZOD1i/BaIgoe4GXIZ4CHkZ9gKl4DtoVUo
-  jjKmSHcQ0zdwTZ3XxGdQu48WypU=
+  MIIDgDCCAmigAwIBAgIBATANBgkqhkiG9w0BAQUFADBDMREwDwYDVQQDDAhrbXV0
+  eWFiYTEZMBcGCgmSJomT8ixkARkWCW1pY3Jvc29mdDETMBEGCgmSJomT8ixkARkW
+  A2NvbTAeFw0xNjAxMjMwMTE2MDVaFw0xNzAxMjIwMTE2MDVaMEMxETAPBgNVBAMM
+  CGttdXR5YWJhMRkwFwYKCZImiZPyLGQBGRYJbWljcm9zb2Z0MRMwEQYKCZImiZPy
+  LGQBGRYDY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw9iZuvdL
+  hzj0njBvw3U5UPCC5GpIXaxvMR/JfM/+rcIVBL7pmSkTJWYh35O2w5Nn3q6Wovk9
+  9CJMj7bpFDzXDObLarTG6JBZ82x9QIrtDkCWe4VV1TydYgsBQGe5MtKZsPe6Jcqx
+  cqxUgpMLh9npNVgGxRY/yqeXEQ9JVxmR2vmkOEa13RkRijLHFCfVTw1w68QAbQps
+  b9YfXWUIJ7H+u0pFkgRSFqHbh0h044dm86NCV90Y9Spl8RBk3pj+pPKJ0nWnqpNb
+  pLzCJ5lwZQaJyj1N7VXYNGRd8Q9eOYuA2kObLSJv4Ut8PpWnLHDynj2VOru1cNLD
+  iZvHf5IwiTO4VQIDAQABo38wfTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNV
+  HQ4EFgQUSzCjf7Wys22V4mwbz+gzKtO4hrswIQYDVR0RBBowGIEWa211dHlhYmFA
+  bWljcm9zb2Z0LmNvbTAhBgNVHRIEGjAYgRZrbXV0eWFiYUBtaWNyb3NvZnQuY29t
+  MA0GCSqGSIb3DQEBBQUAA4IBAQC/76KmRxfnk8+bDvbTt23SRxLABj1cjkqoG7+e
+  TkF5PVnWcPCUGrSAHkqZItH5Rm2A3ITvOKns04MbIdQfsaOniEEU063P2NbD1pHz
+  /R6R0cy79S781+akWDLxzYJkkc66/OcID1esKvRmkAwYJ6WQmPlRNmYCTLf19cmx
+  rioWlMxz7cJc3XMhdgFEn45S7/F+TyQdMt1LWoIK8J68dcuaGfW+hIq3edhVaASr
+  oaChqbGI6vlVXiNp6dEuMEUdFbxb+KbKc2GWfuNz+OerJIKH6eCcxcau2VA/Mzq2
+  XdGvB/v+GhpfWXG3egw7j9j4WrtfLVxGyCVxniOZA8/UGaBD
   -----END CERTIFICATE-----
-date: 2014-12-12 00:00:00.000000000 Z
+date: 2016-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -38,56 +38,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: oauth2-client
   requirement: !ruby/object:Gem::Requirement
@@ -106,28 +106,28 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -136,42 +136,54 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.11.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.11.1
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.17'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.17'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.17.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.7
 description: A Ruby wrapper for accessing Yammer's REST API
 email: kmutyaba@yammer-inc.com
 executables: []