instagram-continued 1.3.0 → 1.3.1

data/spec/instagram/client/subscriptions_spec.rb

@@ -1,26 +1,24 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path("../../../spec_helper", __FILE__)
 
 describe Instagram::Client do
   Instagram::Configuration::VALID_FORMATS.each do |format|
     context ".new(:format => '#{format}')" do
-
       before do
-        @client = Instagram::Client.new(:format => format, :client_id => 'CID', :client_secret => 'CS', :access_token => 'AT')
+        @client = Instagram::Client.new(format: format, client_id: "CID", client_secret: "CS", access_token: "AT")
       end
 
       describe ".subscriptions" do
-
         before do
-          stub_get("subscriptions.#{format}").
-            with(:query => {:client_id => @client.client_id, :client_secret => @client.client_secret}).
-            to_return(:body => fixture("subscriptions.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+          stub_get("subscriptions.#{format}")
+            .with(query: { client_id: @client.client_id, client_secret: @client.client_secret })
+            .to_return(body: fixture("subscriptions.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
         end
 
         it "should get the correct resource" do
           @client.subscriptions
-          expect(a_get("subscriptions.#{format}").
-            with(:query => {:client_id => @client.client_id, :client_secret => @client.client_secret})).
-            to have_been_made
+          expect(a_get("subscriptions.#{format}")
+            .with(query: { client_id: @client.client_id, client_secret: @client.client_secret }))
+            .to have_been_made
         end
 
         it "should return an array of subscriptions" do
@@ -31,67 +29,61 @@ describe Instagram::Client do
       end
 
       describe ".create_subscription" do
-
         before do
-          stub_post("subscriptions.#{format}").
-            with(:body => {:object => "user", :callback_url => "http://example.com/instagram/callback", :aspect => "media", :client_id => @client.client_id, :client_secret => @client.client_secret}).
-            to_return(:body => fixture("subscription.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+          stub_post("subscriptions.#{format}")
+            .with(body: { object: "user", callback_url: "http://example.com/instagram/callback", aspect: "media", client_id: @client.client_id, client_secret: @client.client_secret })
+            .to_return(body: fixture("subscription.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
         end
 
         it "should get the correct resource" do
-          @client.create_subscription("user", :callback_url => "http://example.com/instagram/callback")
-          expect(a_post("subscriptions.#{format}").
-            with(:body => {:object => "user", :callback_url => "http://example.com/instagram/callback", :aspect => "media", :client_id => @client.client_id, :client_secret => @client.client_secret})).
-            to have_been_made
+          @client.create_subscription("user", callback_url: "http://example.com/instagram/callback")
+          expect(a_post("subscriptions.#{format}")
+            .with(body: { object: "user", callback_url: "http://example.com/instagram/callback", aspect: "media", client_id: @client.client_id, client_secret: @client.client_secret }))
+            .to have_been_made
         end
 
         it "should return the new subscription when successful" do
-          subscription = @client.create_subscription("user", :callback_url => "http://example.com/instagram/callback")
+          subscription = @client.create_subscription("user", callback_url: "http://example.com/instagram/callback")
           expect(subscription.object).to eq("user")
         end
       end
 
       describe ".delete_media_comment" do
-
         before do
-          stub_delete("subscriptions.#{format}").
-            with(:query => {:object => "user", :client_id => @client.client_id, :client_secret => @client.client_secret}).
-            to_return(:body => fixture("subscription_deleted.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+          stub_delete("subscriptions.#{format}")
+            .with(query: { object: "user", client_id: @client.client_id, client_secret: @client.client_secret })
+            .to_return(body: fixture("subscription_deleted.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
         end
 
         it "should get the correct resource" do
-          @client.delete_subscription(:object => "user")
-          expect(a_delete("subscriptions.#{format}").
-            with(:query => {:object => "user", :client_id => @client.client_id, :client_secret => @client.client_secret})).
-            to have_been_made
+          @client.delete_subscription(object: "user")
+          expect(a_delete("subscriptions.#{format}")
+            .with(query: { object: "user", client_id: @client.client_id, client_secret: @client.client_secret }))
+            .to have_been_made
         end
       end
 
       describe ".validate_update" do
-
         subject { @client.validate_update(body, headers) }
 
         context "when calculated signature matches request signature" do
-
-          let(:body) { {foo: "bar"}.to_json }
-          let(:request_signature) { OpenSSL::HMAC.hexdigest('sha1', @client.client_secret, body) }
-          let(:headers) { {"X-Hub-Signature" => request_signature} }
+          let(:body) { { foo: "bar" }.to_json }
+          let(:request_signature) { OpenSSL::HMAC.hexdigest("sha1", @client.client_secret, body) }
+          let(:headers) { { "X-Hub-Signature" => request_signature } }
 
           it { expect(subject).to be_truthy }
         end
 
         context "when calculated signature does not match request signature" do
-
-          let(:body) { {foo: "bar"}.to_json }
+          let(:body) { { foo: "bar" }.to_json }
           let(:request_signature) { "going to fail" }
-          let(:headers) { {"X-Hub-Signature" => request_signature} }
+          let(:headers) { { "X-Hub-Signature" => request_signature } }
 
           it { expect(subject).to be_falsey }
         end
       end
 
       describe ".process_subscriptions" do
-
         context "without a callbacks block" do
           it "should raise an ArgumentError" do
             expect do
@@ -101,14 +93,13 @@ describe Instagram::Client do
         end
 
         context "with a callbacks block and valid JSON" do
-
           before do
             @json = fixture("subscription_payload.json").read
           end
 
           it "should issue a callback to on_user_changed" do
             @client.process_subscription(@json) do |handler|
-              handler.on_user_changed do |user_id, payload|
+              handler.on_user_changed do |user_id, _payload|
                 expect(user_id).to eq("1234")
               end
             end
@@ -116,7 +107,7 @@ describe Instagram::Client do
 
           it "should issue a callback to on_tag_changed" do
             @client.process_subscription(@json) do |handler|
-              handler.on_tag_changed do |tag_name, payload|
+              handler.on_tag_changed do |tag_name, _payload|
                 expect(tag_name).to eq("nofilter")
               end
             end
@@ -124,12 +115,11 @@ describe Instagram::Client do
 
           it "should issue both callbacks in one block" do
             @client.process_subscription(@json) do |handler|
-
-              handler.on_user_changed do |user_id, payload|
+              handler.on_user_changed do |user_id, _payload|
                 expect(user_id).to eq("1234")
               end
 
-              handler.on_tag_changed do |tag_name, payload|
+              handler.on_tag_changed do |tag_name, _payload|
                 expect(tag_name).to eq("nofilter")
               end
             end
@@ -138,14 +128,13 @@ describe Instagram::Client do
       end
 
       context "with a valid signature" do
-
         before do
           @json = fixture("subscription_payload.json").read
         end
 
         it "should not raise an Instagram::InvalidSignature error" do
           expect do
-            @client.process_subscription(@json, :signature => "f1dbe2b6184ac2131209c87bba8e0382d089a8a2") do |handler|
+            @client.process_subscription(@json, signature: "f1dbe2b6184ac2131209c87bba8e0382d089a8a2") do |handler|
               # hi
             end
           end.not_to raise_error
@@ -153,7 +142,6 @@ describe Instagram::Client do
       end
 
       context "with an invalid signature" do
-
         before do
           @json = fixture("subscription_payload.json").read
         end
@@ -162,7 +150,7 @@ describe Instagram::Client do
           invalid_signatures = ["31337H4X0R", nil]
           invalid_signatures.each do |signature|
             expect do
-              @client.process_subscription(@json, :signature => signature ) do |handler|
+              @client.process_subscription(@json, signature: signature) do |handler|
                 # hi
               end
             end.to raise_error(Instagram::InvalidSignature)

data/spec/instagram/client/tags_spec.rb

@@ -1,75 +1,71 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path("../../../spec_helper", __FILE__)
 
 describe Instagram::Client do
   Instagram::Configuration::VALID_FORMATS.each do |format|
     context ".new(:format => '#{format}')" do
       before do
-        @client = Instagram::Client.new(:format => format, :client_id => 'CID', :client_secret => 'CS', :access_token => 'AT')
+        @client = Instagram::Client.new(format: format, client_id: "CID", client_secret: "CS", access_token: "AT")
       end
 
       describe ".tag" do
-
         before do
-          stub_get("tags/cat.#{format}").
-            with(:query => {:access_token => @client.access_token}).
-            to_return(:body => fixture("tag.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+          stub_get("tags/cat.#{format}")
+            .with(query: { access_token: @client.access_token })
+            .to_return(body: fixture("tag.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
         end
 
         it "should get the correct resource" do
-          @client.tag('cat')
-          expect(a_get("tags/cat.#{format}").
-            with(:query => {:access_token => @client.access_token})).
-            to have_been_made
+          @client.tag("cat")
+          expect(a_get("tags/cat.#{format}")
+            .with(query: { access_token: @client.access_token }))
+            .to have_been_made
         end
 
         it "should return extended information of a given media item" do
-          tag = @client.tag('cat')
-          expect(tag.name).to eq('cat')
+          tag = @client.tag("cat")
+          expect(tag.name).to eq("cat")
         end
       end
 
       describe ".tag_recent_media" do
-
         before do
-          stub_get("tags/cat/media/recent.#{format}").
-            with(:query => {:access_token => @client.access_token}).
-            to_return(:body => fixture("tag_recent_media.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+          stub_get("tags/cat/media/recent.#{format}")
+            .with(query: { access_token: @client.access_token })
+            .to_return(body: fixture("tag_recent_media.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
         end
 
         it "should get the correct resource" do
-          @client.tag_recent_media('cat')
-          expect(a_get("tags/cat/media/recent.#{format}").
-            with(:query => {:access_token => @client.access_token})).
-            to have_been_made
+          @client.tag_recent_media("cat")
+          expect(a_get("tags/cat/media/recent.#{format}")
+            .with(query: { access_token: @client.access_token }))
+            .to have_been_made
         end
 
         it "should return a list of media taken at a given location" do
-          media = @client.tag_recent_media('cat')
+          media = @client.tag_recent_media("cat")
           expect(media).to be_a Array
           expect(media.first.user.username).to eq("amandavan")
         end
-
       end
 
       describe ".tag_search" do
-
         before do
-          stub_get("tags/search.#{format}").
-            with(:query => {:access_token => @client.access_token}).
-            with(:query => {:q => 'cat'}).
-            to_return(:body => fixture("tag_search.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+          stub_get("tags/search.#{format}")
+            .with(query: { access_token: @client.access_token })
+            .with(query: { q: "cat" })
+            .to_return(body: fixture("tag_search.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
         end
 
         it "should get the correct resource" do
-          @client.tag_search('cat')
-          expect(a_get("tags/search.#{format}").
-            with(:query => {:access_token => @client.access_token}).
-            with(:query => {:q => 'cat'})).
-            to have_been_made
+          @client.tag_search("cat")
+          expect(a_get("tags/search.#{format}")
+            .with(query: { access_token: @client.access_token })
+            .with(query: { q: "cat" }))
+            .to have_been_made
         end
 
         it "should return an array of user search results" do
-          tags = @client.tag_search('cat')
+          tags = @client.tag_search("cat")
           expect(tags).to be_a Array
           expect(tags.first.name).to eq("cats")
         end

data/spec/instagram/client/users_spec.rb

@@ -1,68 +1,63 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path("../../../spec_helper", __FILE__)
 
 describe Instagram::Client do
   Instagram::Configuration::VALID_FORMATS.each do |format|
     context ".new(:format => '#{format}')" do
       before do
-        @client = Instagram::Client.new(:format => format, :client_id => 'CID', :client_secret => 'CS', :access_token => 'AT')
+        @client = Instagram::Client.new(format: format, client_id: "CID", client_secret: "CS", access_token: "AT")
       end
 
       describe ".user" do
-
         context "with user ID passed" do
-
           before do
-            stub_get("users/4.#{format}").
-              with(:query => {:access_token => @client.access_token}).
-              to_return(:body => fixture("mikeyk.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+            stub_get("users/4.#{format}")
+              .with(query: { access_token: @client.access_token })
+              .to_return(body: fixture("mikeyk.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
           end
 
           it "should get the correct resource" do
             @client.user(4)
-            expect(a_get("users/4.#{format}").
-              with(:query => {:access_token => @client.access_token})).
-              to have_been_made
+            expect(a_get("users/4.#{format}")
+              .with(query: { access_token: @client.access_token }))
+              .to have_been_made
           end
 
           it "should return extended information of a given user" do
             user = @client.user(4)
             expect(user.full_name).to eq("Mike Krieger")
           end
-
         end
 
         context "without user ID passed" do
-
           before do
-            stub_get("users/self.#{format}").
-              with(:query => {:access_token => @client.access_token}).
-              to_return(:body => fixture("shayne.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+            stub_get("users/self.#{format}")
+              .with(query: { access_token: @client.access_token })
+              .to_return(body: fixture("shayne.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
           end
 
           it "should get the correct resource" do
-            @client.user()
-            expect(a_get("users/self.#{format}").
-              with(:query => {:access_token => @client.access_token})).
-              to have_been_made
+            @client.user
+            expect(a_get("users/self.#{format}")
+              .with(query: { access_token: @client.access_token }))
+              .to have_been_made
           end
         end
       end
 
       describe ".user_search" do
-
         before do
-          stub_get("users/search.#{format}").
-            with(:query => {:access_token => @client.access_token}).
-            with(:query => {:q => "Shayne Sweeney"}).
-            to_return(:body => fixture("user_search.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+          stub_get("users/search.#{format}")
+            .with(query: { access_token: @client.access_token })
+            .with(query: { q: "Shayne Sweeney" })
+            .to_return(body: fixture("user_search.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
         end
 
         it "should get the correct resource" do
           @client.user_search("Shayne Sweeney")
-          expect(a_get("users/search.#{format}").
-            with(:query => {:access_token => @client.access_token}).
-            with(:query => {:q => "Shayne Sweeney"})).
-            to have_been_made
+          expect(a_get("users/search.#{format}")
+            .with(query: { access_token: @client.access_token })
+            .with(query: { q: "Shayne Sweeney" }))
+            .to have_been_made
         end
 
         it "should return an array of user search results" do
@@ -73,20 +68,18 @@ describe Instagram::Client do
       end
 
       describe ".user_follows" do
-
         context "with user ID passed" do
-
           before do
-            stub_get("users/4/follows.#{format}").
-              with(:query => {:access_token => @client.access_token}).
-              to_return(:body => fixture("follows.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+            stub_get("users/4/follows.#{format}")
+              .with(query: { access_token: @client.access_token })
+              .to_return(body: fixture("follows.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
           end
 
           it "should get the correct resource" do
             @client.user_follows(4)
-            expect(a_get("users/4/follows.#{format}").
-              with(:query => {:access_token => @client.access_token})).
-              to have_been_made
+            expect(a_get("users/4/follows.#{format}")
+              .with(query: { access_token: @client.access_token }))
+              .to have_been_made
           end
 
           it "should return a list of users whom a given user follows" do
@@ -97,37 +90,34 @@ describe Instagram::Client do
         end
 
         context "without user ID passed" do
-
           before do
-            stub_get("users/self/follows.#{format}").
-              with(:query => {:access_token => @client.access_token}).
-              to_return(:body => fixture("follows.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+            stub_get("users/self/follows.#{format}")
+              .with(query: { access_token: @client.access_token })
+              .to_return(body: fixture("follows.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
           end
 
           it "should get the correct resource" do
             @client.user_follows
-            expect(a_get("users/self/follows.#{format}").
-              with(:query => {:access_token => @client.access_token})).
-              to have_been_made
+            expect(a_get("users/self/follows.#{format}")
+              .with(query: { access_token: @client.access_token }))
+              .to have_been_made
           end
         end
       end
 
       describe ".user_followed_by" do
-
         context "with user ID passed" do
-
           before do
-            stub_get("users/4/followed-by.#{format}").
-              with(:query => {:access_token => @client.access_token}).
-              to_return(:body => fixture("followed_by.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+            stub_get("users/4/followed-by.#{format}")
+              .with(query: { access_token: @client.access_token })
+              .to_return(body: fixture("followed_by.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
           end
 
           it "should get the correct resource" do
             @client.user_followed_by(4)
-            expect(a_get("users/4/followed-by.#{format}").
-              with(:query => {:access_token => @client.access_token})).
-              to have_been_made
+            expect(a_get("users/4/followed-by.#{format}")
+              .with(query: { access_token: @client.access_token }))
+              .to have_been_made
           end
 
           it "should return a list of users whom a given user is followed by" do
@@ -138,63 +128,60 @@ describe Instagram::Client do
         end
 
         context "without user ID passed" do
-
           before do
-            stub_get("users/self/followed-by.#{format}").
-              with(:query => {:access_token => @client.access_token}).
-              to_return(:body => fixture("followed_by.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+            stub_get("users/self/followed-by.#{format}")
+              .with(query: { access_token: @client.access_token })
+              .to_return(body: fixture("followed_by.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
           end
 
           it "should get the correct resource" do
             @client.user_followed_by
-            expect(a_get("users/self/followed-by.#{format}").
-              with(:query => {:access_token => @client.access_token})).
-              to have_been_made
+            expect(a_get("users/self/followed-by.#{format}")
+              .with(query: { access_token: @client.access_token }))
+              .to have_been_made
           end
         end
       end
 
       describe ".user_media_feed" do
-
         before do
-          stub_get("users/self/feed.#{format}").
-            with(:query => {:access_token => @client.access_token}).
-            to_return(:body => fixture("user_media_feed.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+          stub_get("users/self/feed.#{format}")
+            .with(query: { access_token: @client.access_token })
+            .to_return(body: fixture("user_media_feed.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
         end
 
         it "should get the correct resource" do
           @client.user_media_feed
-          expect(a_get("users/self/feed.#{format}").
-            with(:query => {:access_token => @client.access_token})).
-            to have_been_made
+          expect(a_get("users/self/feed.#{format}")
+            .with(query: { access_token: @client.access_token }))
+            .to have_been_made
         end
 
         context Instagram::Response do
-          let(:user_media_feed_response){ @client.user_media_feed }
-          subject{ user_media_feed_response }
+          let(:user_media_feed_response) { @client.user_media_feed }
+          subject { user_media_feed_response }
 
-          it{ is_expected.to be_an_instance_of(Array) }
-          it{ is_expected.to be_a_kind_of(Instagram::Response) }
-          it{ is_expected.to respond_to(:pagination) }
-          it{ is_expected.to respond_to(:meta) }
+          it { is_expected.to be_a_kind_of(Instagram::Response) }
+          it { is_expected.to respond_to(:pagination) }
+          it { is_expected.to respond_to(:meta) }
 
-          context '.pagination' do
-            subject{ user_media_feed_response.pagination }
+          context ".pagination" do
+            subject { user_media_feed_response.pagination }
 
-            it{ is_expected.to be_an_instance_of(Hashie::Mash) }
+            it { is_expected.to be_an_instance_of(Hashie::Mash) }
 
-            describe '#next_max_id' do
+            describe "#next_max_id" do
               subject { super().next_max_id }
-              it { is_expected.to eq('22063131') }
+              it { is_expected.to eq("22063131") }
             end
           end
 
-          context '.meta' do
-            subject{ user_media_feed_response.meta }
+          context ".meta" do
+            subject { user_media_feed_response.meta }
 
-            it{ is_expected.to be_an_instance_of(Hashie::Mash) }
+            it { is_expected.to be_an_instance_of(Hashie::Mash) }
 
-            describe '#code' do
+            describe "#code" do
               subject { super().code }
               it { is_expected.to eq(200) }
             end
@@ -203,36 +190,33 @@ describe Instagram::Client do
       end
 
       describe ".user_liked_media" do
-        
         before do
-          stub_get("users/self/media/liked.#{format}").
-            with(:query => {:access_token => @client.access_token}).
-            to_return(:body => fixture("liked_media.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+          stub_get("users/self/media/liked.#{format}")
+            .with(query: { access_token: @client.access_token })
+            .to_return(body: fixture("liked_media.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
         end
 
         it "should get the correct resource" do
           @client.user_liked_media
-          expect(a_get("users/self/media/liked.#{format}").
-            with(:query => {:access_token => @client.access_token})).
-            to have_been_made
+          expect(a_get("users/self/media/liked.#{format}")
+            .with(query: { access_token: @client.access_token }))
+            .to have_been_made
         end
       end
-      
-      describe ".user_recent_media" do
 
+      describe ".user_recent_media" do
         context "with user ID passed" do
-
           before do
-            stub_get("users/4/media/recent.#{format}").
-              with(:query => {:access_token => @client.access_token}).
-              to_return(:body => fixture("recent_media.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+            stub_get("users/4/media/recent.#{format}")
+              .with(query: { access_token: @client.access_token })
+              .to_return(body: fixture("recent_media.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
           end
 
           it "should get the correct resource" do
             @client.user_recent_media(4)
-            expect(a_get("users/4/media/recent.#{format}").
-              with(:query => {:access_token => @client.access_token})).
-              to have_been_made
+            expect(a_get("users/4/media/recent.#{format}")
+              .with(query: { access_token: @client.access_token }))
+              .to have_been_made
           end
 
           it "should return a list of recent media items for the given user" do
@@ -243,35 +227,33 @@ describe Instagram::Client do
         end
 
         context "without user ID passed" do
-
           before do
-            stub_get("users/self/media/recent.#{format}").
-              with(:query => {:access_token => @client.access_token}).
-              to_return(:body => fixture("recent_media.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+            stub_get("users/self/media/recent.#{format}")
+              .with(query: { access_token: @client.access_token })
+              .to_return(body: fixture("recent_media.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
           end
 
           it "should get the correct resource" do
             @client.user_recent_media
-            expect(a_get("users/self/media/recent.#{format}").
-              with(:query => {:access_token => @client.access_token})).
-              to have_been_made
+            expect(a_get("users/self/media/recent.#{format}")
+              .with(query: { access_token: @client.access_token }))
+              .to have_been_made
           end
         end
       end
 
       describe ".user_requested_by" do
-
         before do
-          stub_get("users/self/requested-by.#{format}").
-            with(:query => {:access_token => @client.access_token}).
-            to_return(:body => fixture("requested_by.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+          stub_get("users/self/requested-by.#{format}")
+            .with(query: { access_token: @client.access_token })
+            .to_return(body: fixture("requested_by.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
         end
 
         it "should get the correct resource" do
           @client.user_requested_by
-          expect(a_get("users/self/requested-by.#{format}").
-            with(:query => {:access_token => @client.access_token})).
-            to have_been_made
+          expect(a_get("users/self/requested-by.#{format}")
+            .with(query: { access_token: @client.access_token }))
+            .to have_been_made
         end
 
         it "should return a list of users awaiting approval" do
@@ -280,148 +262,141 @@ describe Instagram::Client do
           expect(users.first.username).to eq("shayne")
         end
       end
-      
+
       describe ".user_relationship" do
-        
         before do
-          stub_get("users/4/relationship.#{format}").
-            with(:query => {:access_token => @client.access_token}).
-            to_return(:body => fixture("relationship.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+          stub_get("users/4/relationship.#{format}")
+            .with(query: { access_token: @client.access_token })
+            .to_return(body: fixture("relationship.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
         end
-        
+
         it "should get the correct resource" do
           @client.user_relationship(4)
-          expect(a_get("users/4/relationship.#{format}").
-            with(:query => {:access_token => @client.access_token})).
-            to have_been_made
+          expect(a_get("users/4/relationship.#{format}")
+            .with(query: { access_token: @client.access_token }))
+            .to have_been_made
         end
-        
+
         it "should return a relationship status response" do
           status = @client.user_relationship(4)
           expect(status.incoming_status).to eq("requested_by")
         end
       end
-      
+
       describe ".follow_user" do
-        
         before do
-          stub_post("users/4/relationship.#{format}").
-            with(:body => {:action => "follow", :access_token => @client.access_token}).
-            to_return(:body => fixture("follow_user.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+          stub_post("users/4/relationship.#{format}")
+            .with(body: { action: "follow", access_token: @client.access_token })
+            .to_return(body: fixture("follow_user.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
         end
-        
+
         it "should get the correct resource" do
           @client.follow_user(4)
-          expect(a_post("users/4/relationship.#{format}").
-            with(:body => {:action => "follow", :access_token => @client.access_token})).
-            to have_been_made
+          expect(a_post("users/4/relationship.#{format}")
+            .with(body: { action: "follow", access_token: @client.access_token }))
+            .to have_been_made
         end
-        
+
         it "should return a relationship status response" do
           status = @client.follow_user(4)
           expect(status.outgoing_status).to eq("requested")
         end
       end
-      
+
       describe ".unfollow_user" do
-        
         before do
-          stub_post("users/4/relationship.#{format}").
-            with(:body => {:action => "unfollow", :access_token => @client.access_token}).
-            to_return(:body => fixture("unfollow_user.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+          stub_post("users/4/relationship.#{format}")
+            .with(body: { action: "unfollow", access_token: @client.access_token })
+            .to_return(body: fixture("unfollow_user.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
         end
-        
+
         it "should get the correct resource" do
           @client.unfollow_user(4)
-          expect(a_post("users/4/relationship.#{format}").
-            with(:body => {:action => "unfollow", :access_token => @client.access_token})).
-            to have_been_made
+          expect(a_post("users/4/relationship.#{format}")
+            .with(body: { action: "unfollow", access_token: @client.access_token }))
+            .to have_been_made
         end
-        
+
         it "should return a relationship status response" do
           status = @client.unfollow_user(4)
           expect(status.outgoing_status).to eq("none")
         end
       end
-      
+
       describe ".block_user" do
-        
         before do
-          stub_post("users/4/relationship.#{format}").
-            with(:body => {:action => "block", :access_token => @client.access_token}).
-            to_return(:body => fixture("block_user.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+          stub_post("users/4/relationship.#{format}")
+            .with(body: { action: "block", access_token: @client.access_token })
+            .to_return(body: fixture("block_user.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
         end
-        
+
         it "should get the correct resource" do
           @client.block_user(4)
-          expect(a_post("users/4/relationship.#{format}").
-            with(:body => {:action => "block", :access_token => @client.access_token})).
-            to have_been_made
+          expect(a_post("users/4/relationship.#{format}")
+            .with(body: { action: "block", access_token: @client.access_token }))
+            .to have_been_made
         end
-        
+
         it "should return a relationship status response" do
           status = @client.block_user(4)
           expect(status.outgoing_status).to eq("none")
         end
       end
-      
+
       describe ".unblock_user" do
-        
         before do
-          stub_post("users/4/relationship.#{format}").
-            with(:body => {:action => "unblock", :access_token => @client.access_token}).
-            to_return(:body => fixture("unblock_user.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+          stub_post("users/4/relationship.#{format}")
+            .with(body: { action: "unblock", access_token: @client.access_token })
+            .to_return(body: fixture("unblock_user.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
         end
-        
+
         it "should get the correct resource" do
           @client.unblock_user(4)
-          expect(a_post("users/4/relationship.#{format}").
-            with(:body => {:action => "unblock", :access_token => @client.access_token})).
-            to have_been_made
+          expect(a_post("users/4/relationship.#{format}")
+            .with(body: { action: "unblock", access_token: @client.access_token }))
+            .to have_been_made
         end
-        
+
         it "should return a relationship status response" do
           status = @client.unblock_user(4)
           expect(status.outgoing_status).to eq("none")
         end
       end
-      
+
       describe ".approve_user" do
-        
         before do
-          stub_post("users/4/relationship.#{format}").
-            with(:body => {:action => "approve", :access_token => @client.access_token}).
-            to_return(:body => fixture("approve_user.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+          stub_post("users/4/relationship.#{format}")
+            .with(body: { action: "approve", access_token: @client.access_token })
+            .to_return(body: fixture("approve_user.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
         end
-        
+
         it "should get the correct resource" do
           @client.approve_user(4)
-          expect(a_post("users/4/relationship.#{format}").
-            with(:body => {:action => "approve", :access_token => @client.access_token})).
-            to have_been_made
+          expect(a_post("users/4/relationship.#{format}")
+            .with(body: { action: "approve", access_token: @client.access_token }))
+            .to have_been_made
         end
-        
+
         it "should return a relationship status response" do
           status = @client.approve_user(4)
           expect(status.outgoing_status).to eq("follows")
         end
       end
-      
+
       describe ".deny_user" do
-        
         before do
-          stub_post("users/4/relationship.#{format}").
-            with(:body => {:action => "deny", :access_token => @client.access_token}).
-            to_return(:body => fixture("deny_user.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+          stub_post("users/4/relationship.#{format}")
+            .with(body: { action: "deny", access_token: @client.access_token })
+            .to_return(body: fixture("deny_user.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
         end
-        
+
         it "should get the correct resource" do
           @client.deny_user(4)
-          expect(a_post("users/4/relationship.#{format}").
-            with(:body => {:action => "deny", :access_token => @client.access_token})).
-            to have_been_made
+          expect(a_post("users/4/relationship.#{format}")
+            .with(body: { action: "deny", access_token: @client.access_token }))
+            .to have_been_made
         end
-        
+
         it "should return a relationship status response" do
           status = @client.deny_user(4)
           expect(status.outgoing_status).to eq("none")