instagram-continued 1.3.0 → 1.3.1

data/spec/instagram/client/comments_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 ".media_comments" do
-
         before do
-          stub_get("media/777/comments.#{format}").
-            with(:query => {:access_token => @client.access_token}).
-            to_return(:body => fixture("media_comments.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+          stub_get("media/777/comments.#{format}")
+            .with(query: { access_token: @client.access_token })
+            .to_return(body: fixture("media_comments.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
         end
 
         it "should get the correct resource" do
           @client.media_comments(777)
-          expect(a_get("media/777/comments.#{format}").
-            with(:query => {:access_token => @client.access_token})).
-            to have_been_made
+          expect(a_get("media/777/comments.#{format}")
+            .with(query: { access_token: @client.access_token }))
+            .to have_been_made
         end
 
         it "should return an array of user search results" do
@@ -31,18 +29,17 @@ describe Instagram::Client do
       end
 
       describe ".create_media_comment" do
-
         before do
-          stub_post("media/777/comments.#{format}").
-            with(:body => {:text => "hi there", :access_token => @client.access_token}).
-            to_return(:body => fixture("media_comment.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+          stub_post("media/777/comments.#{format}")
+            .with(body: { text: "hi there", access_token: @client.access_token })
+            .to_return(body: fixture("media_comment.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
         end
 
         it "should get the correct resource" do
           @client.create_media_comment(777, "hi there")
-          expect(a_post("media/777/comments.#{format}").
-            with(:body => {:text => "hi there", :access_token => @client.access_token})).
-            to have_been_made
+          expect(a_post("media/777/comments.#{format}")
+            .with(body: { text: "hi there", access_token: @client.access_token }))
+            .to have_been_made
         end
 
         it "should return the new comment when successful" do
@@ -52,20 +49,19 @@ describe Instagram::Client do
       end
 
       describe ".delete_media_comment" do
-
         before do
-          stub_delete("media/777/comments/1234.#{format}").
-            with(:query => {:access_token => @client.access_token}).
-            to_return(:body => fixture("media_comment_deleted.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+          stub_delete("media/777/comments/1234.#{format}")
+            .with(query: { access_token: @client.access_token })
+            .to_return(body: fixture("media_comment_deleted.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
         end
 
         it "should get the correct resource" do
           @client.delete_media_comment(777, 1234)
-          expect(a_delete("media/777/comments/1234.#{format}").
-            with(:query => {:access_token => @client.access_token})).
-            to have_been_made
+          expect(a_delete("media/777/comments/1234.#{format}")
+            .with(query: { access_token: @client.access_token }))
+            .to have_been_made
         end
       end
     end
   end
-end
+end

data/spec/instagram/client/embedding_spec.rb

@@ -1,24 +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 ".oembed" do
         before do
-          stub_get("oembed").
-            with(:query => {:access_token => @client.access_token, :url => "http://instagram.com/p/abcdef"}).
-            to_return(:body => fixture("oembed.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+          stub_get("oembed")
+            .with(query: { access_token: @client.access_token, url: "http://instagram.com/p/abcdef" })
+            .to_return(body: fixture("oembed.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
         end
 
         it "should get the correct resource" do
           @client.oembed("http://instagram.com/p/abcdef")
-          expect(a_get("oembed?url=http://instagram.com/p/abcdef").
-            with(:query => {:access_token => @client.access_token})).
-            to have_been_made
+          expect(a_get("oembed?url=http://instagram.com/p/abcdef")
+            .with(query: { access_token: @client.access_token }))
+            .to have_been_made
         end
 
         it "should return the oembed information for an instagram media url" do

data/spec/instagram/client/geography_spec.rb

@@ -1,32 +1,29 @@
-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 ".geography_recent_media" do
-
         context "with geography ID passed" do
-
           before do
-            stub_get("geographies/12345/media/recent.#{format}").
-              with(:query => {:access_token => @client.access_token}).
-              to_return(:body => fixture("geography_recent_media.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+            stub_get("geographies/12345/media/recent.#{format}")
+              .with(query: { access_token: @client.access_token })
+              .to_return(body: fixture("geography_recent_media.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
           end
 
           it "should get the correct resource" do
-            @client.geography_recent_media(12345)
-            expect(a_get("geographies/12345/media/recent.#{format}").
-              with(:query => {:access_token => @client.access_token})).
-              to have_been_made
+            @client.geography_recent_media(12_345)
+            expect(a_get("geographies/12345/media/recent.#{format}")
+              .with(query: { access_token: @client.access_token }))
+              .to have_been_made
           end
 
           it "should return a list of recent media items within the specifed geography" do
-            recent_media = @client.geography_recent_media(12345)
+            recent_media = @client.geography_recent_media(12_345)
             expect(recent_media).to be_a Array
             expect(recent_media.first.user.username).to eq("amandavan")
           end

data/spec/instagram/client/likes_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', :client_ips => '1.2.3.4', :access_token => 'AT')
+        @client = Instagram::Client.new(format: format, client_id: "CID", client_secret: "CS", client_ips: "1.2.3.4", access_token: "AT")
       end
 
       describe ".media_likes" do
-
         before do
-          stub_get("media/777/likes.#{format}").
-            with(:query => {:access_token => @client.access_token}).
-            to_return(:body => fixture("media_likes.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+          stub_get("media/777/likes.#{format}")
+            .with(query: { access_token: @client.access_token })
+            .to_return(body: fixture("media_likes.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
         end
 
         it "should get the correct resource" do
           @client.media_likes(777)
-          expect(a_get("media/777/likes.#{format}").
-            with(:query => {:access_token => @client.access_token})).
-            to have_been_made
+          expect(a_get("media/777/likes.#{format}")
+            .with(query: { access_token: @client.access_token }))
+            .to have_been_made
         end
 
         it "should return an array of user search results" do
@@ -31,36 +29,34 @@ describe Instagram::Client do
       end
 
       describe ".like_media" do
-
         before do
-          stub_post("media/777/likes.#{format}").
-            with(:body => {:access_token => @client.access_token}).
-            to_return(:body => fixture("media_liked.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+          stub_post("media/777/likes.#{format}")
+            .with(body: { access_token: @client.access_token })
+            .to_return(body: fixture("media_liked.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
         end
 
         it "should get the correct resource" do
           @client.like_media(777)
-          expect(a_post("media/777/likes.#{format}").
-            with(:body => {:access_token => @client.access_token})).
-            to have_been_made
+          expect(a_post("media/777/likes.#{format}")
+            .with(body: { access_token: @client.access_token }))
+            .to have_been_made
         end
       end
 
       describe ".unlike_media" do
-
         before do
-          stub_delete("media/777/likes.#{format}").
-            with(:query => {:access_token => @client.access_token}).
-            to_return(:body => fixture("media_unliked.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+          stub_delete("media/777/likes.#{format}")
+            .with(query: { access_token: @client.access_token })
+            .to_return(body: fixture("media_unliked.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
         end
 
         it "should get the correct resource" do
           @client.unlike_media(777)
-          expect(a_delete("media/777/likes.#{format}").
-            with(:query => {:access_token => @client.access_token})).
-            to have_been_made
+          expect(a_delete("media/777/likes.#{format}")
+            .with(query: { access_token: @client.access_token }))
+            .to have_been_made
         end
       end
     end
   end
-end
+end

data/spec/instagram/client/locations_spec.rb

@@ -1,70 +1,67 @@
-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 ".location" do
-
         before do
-          stub_get("locations/514276.#{format}").
-            with(:query => {:access_token => @client.access_token}).
-            to_return(:body => fixture("location.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+          stub_get("locations/514276.#{format}")
+            .with(query: { access_token: @client.access_token })
+            .to_return(body: fixture("location.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
         end
 
         it "should get the correct resource" do
-          @client.location(514276)
-          expect(a_get("locations/514276.#{format}").
-            with(:query => {:access_token => @client.access_token})).
-            to have_been_made
+          @client.location(514_276)
+          expect(a_get("locations/514276.#{format}")
+            .with(query: { access_token: @client.access_token }))
+            .to have_been_made
         end
 
         it "should return extended information of a given location" do
-          location = @client.location(514276)
+          location = @client.location(514_276)
           expect(location.name).to eq("Instagram")
         end
       end
 
       describe ".location_recent_media" do
-
         before do
-          stub_get("locations/514276/media/recent.#{format}").
-            with(:query => {:access_token => @client.access_token}).
-            to_return(:body => fixture("location_recent_media.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+          stub_get("locations/514276/media/recent.#{format}")
+            .with(query: { access_token: @client.access_token })
+            .to_return(body: fixture("location_recent_media.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
         end
 
         it "should get the correct resource" do
-          @client.location_recent_media(514276)
-          expect(a_get("locations/514276/media/recent.#{format}").
-            with(:query => {:access_token => @client.access_token})).
-            to have_been_made
+          @client.location_recent_media(514_276)
+          expect(a_get("locations/514276/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.location_recent_media(514276)
+          media = @client.location_recent_media(514_276)
           expect(media).to be_a Array
           expect(media.first.user.username).to eq("josh")
         end
       end
 
       describe ".location_search_lat_lng" do
-
         before do
-          stub_get("locations/search.#{format}").
-            with(:query => {:access_token => @client.access_token}).
-            with(:query => {:lat => "37.7808851", :lng => "-122.3948632"}).
-            to_return(:body => fixture("location_search.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+          stub_get("locations/search.#{format}")
+            .with(query: { access_token: @client.access_token })
+            .with(query: { lat: "37.7808851", lng: "-122.3948632" })
+            .to_return(body: fixture("location_search.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
         end
 
         it "should get the correct resource by lat/lng" do
           @client.location_search("37.7808851", "-122.3948632")
-          expect(a_get("locations/search.#{format}").
-            with(:query => {:access_token => @client.access_token}).
-            with(:query => {:lat => "37.7808851", :lng => "-122.3948632"})).
-            to have_been_made
+          expect(a_get("locations/search.#{format}")
+            .with(query: { access_token: @client.access_token })
+            .with(query: { lat: "37.7808851", lng: "-122.3948632" }))
+            .to have_been_made
         end
 
         it "should return an array of user search results" do
@@ -75,20 +72,19 @@ describe Instagram::Client do
       end
 
       describe ".location_search_lat_lng_distance" do
-
         before do
-          stub_get("locations/search.#{format}").
-            with(:query => {:access_token => @client.access_token}).
-            with(:query => {:lat => "37.7808851", :lng => "-122.3948632", :distance => "5000"}).
-            to_return(:body => fixture("location_search.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+          stub_get("locations/search.#{format}")
+            .with(query: { access_token: @client.access_token })
+            .with(query: { lat: "37.7808851", lng: "-122.3948632", distance: "5000" })
+            .to_return(body: fixture("location_search.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
         end
 
         it "should get the correct resource by lat/lng/distance" do
           @client.location_search("37.7808851", "-122.3948632", "5000")
-          expect(a_get("locations/search.#{format}").
-            with(:query => {:access_token => @client.access_token}).
-            with(:query => {:lat => "37.7808851", :lng => "-122.3948632", :distance => "5000"})).
-            to have_been_made
+          expect(a_get("locations/search.#{format}")
+            .with(query: { access_token: @client.access_token })
+            .with(query: { lat: "37.7808851", lng: "-122.3948632", distance: "5000" }))
+            .to have_been_made
         end
 
         it "should return an array of user search results" do
@@ -99,20 +95,19 @@ describe Instagram::Client do
       end
 
       describe ".location_search_facebook_places_id" do
-
         before do
-          stub_get("locations/search.#{format}").
-            with(:query => {:access_token => @client.access_token}).
-            with(:query => {:facebook_places_id => "3fd66200f964a520c5f11ee3"}).
-            to_return(:body => fixture("location_search_facebook.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+          stub_get("locations/search.#{format}")
+            .with(query: { access_token: @client.access_token })
+            .with(query: { facebook_places_id: "3fd66200f964a520c5f11ee3" })
+            .to_return(body: fixture("location_search_facebook.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
         end
 
         it "should get the correct resource by facebook_places_id" do
           @client.location_search("3fd66200f964a520c5f11ee3")
-          expect(a_get("locations/search.#{format}").
-            with(:query => {:access_token => @client.access_token}).
-            with(:query => {:facebook_places_id => "3fd66200f964a520c5f11ee3"})).
-            to have_been_made
+          expect(a_get("locations/search.#{format}")
+            .with(query: { access_token: @client.access_token })
+            .with(query: { facebook_places_id: "3fd66200f964a520c5f11ee3" }))
+            .to have_been_made
         end
 
         it "should return an array of user search results" do
@@ -121,7 +116,6 @@ describe Instagram::Client do
           expect(locations.first.name).to eq("Schiller's Liquor Bar")
         end
       end
-
     end
   end
 end

data/spec/instagram/client/media_spec.rb

@@ -1,67 +1,64 @@
-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 ".media_item" do
-
         before do
-          stub_get("media/18600493.#{format}").
-            with(:query => {:access_token => @client.access_token}).
-            to_return(:body => fixture("media.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+          stub_get("media/18600493.#{format}")
+            .with(query: { access_token: @client.access_token })
+            .to_return(body: fixture("media.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
         end
 
         it "should get the correct resource" do
-          @client.media_item(18600493)
-          expect(a_get("media/18600493.#{format}").
-            with(:query => {:access_token => @client.access_token})).
-            to have_been_made
+          @client.media_item(18_600_493)
+          expect(a_get("media/18600493.#{format}")
+            .with(query: { access_token: @client.access_token }))
+            .to have_been_made
         end
 
         it "should return extended information of a given media item" do
-          media = @client.media_item(18600493)
+          media = @client.media_item(18_600_493)
           expect(media.user.username).to eq("mikeyk")
         end
       end
 
       describe ".media_shortcode" do
-
         before do
-          stub_get('media/shortcode/BG9It').
-            with(:query => {:access_token => @client.access_token}).
-            to_return(:body => fixture("media_shortcode.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+          stub_get("media/shortcode/BG9It")
+            .with(query: { access_token: @client.access_token })
+            .to_return(body: fixture("media_shortcode.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
         end
 
         it "should get the correct resource" do
-          @client.media_shortcode('BG9It')
-          expect(a_get('media/shortcode/BG9It').
-            with(:query => {:access_token => @client.access_token})).
-            to have_been_made
+          @client.media_shortcode("BG9It")
+          expect(a_get("media/shortcode/BG9It")
+            .with(query: { access_token: @client.access_token }))
+            .to have_been_made
         end
 
         it "should return extended information of a given media item" do
-          media = @client.media_shortcode('BG9It')
-          expect(media.user.username).to eq('mikeyk')
+          media = @client.media_shortcode("BG9It")
+          expect(media.user.username).to eq("mikeyk")
         end
       end
 
       describe ".media_popular" do
-
         before do
-          stub_get("media/popular.#{format}").
-            with(:query => {:access_token => @client.access_token}).
-            to_return(:body => fixture("media_popular.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+          stub_get("media/popular.#{format}")
+            .with(query: { access_token: @client.access_token })
+            .to_return(body: fixture("media_popular.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
         end
 
         it "should get the correct resource" do
           @client.media_popular
-          expect(a_get("media/popular.#{format}").
-            with(:query => {:access_token => @client.access_token})).
-            to have_been_made
+          expect(a_get("media/popular.#{format}")
+            .with(query: { access_token: @client.access_token }))
+            .to have_been_made
         end
 
         it "should return popular media items" do
@@ -72,20 +69,19 @@ describe Instagram::Client do
       end
 
       describe ".media_search" do
-
         before do
-          stub_get("media/search.#{format}").
-            with(:query => {:access_token => @client.access_token}).
-            with(:query => {:lat => "37.7808851", :lng => "-122.3948632"}).
-            to_return(:body => fixture("media_search.#{format}"), :headers => {:content_type => "application/#{format}; charset=utf-8"})
+          stub_get("media/search.#{format}")
+            .with(query: { access_token: @client.access_token })
+            .with(query: { lat: "37.7808851", lng: "-122.3948632" })
+            .to_return(body: fixture("media_search.#{format}"), headers: { content_type: "application/#{format}; charset=utf-8" })
         end
 
         it "should get the correct resource" do
           @client.media_search("37.7808851", "-122.3948632")
-          expect(a_get("media/search.#{format}").
-            with(:query => {:access_token => @client.access_token}).
-            with(:query => {:lat => "37.7808851", :lng => "-122.3948632"})).
-            to have_been_made
+          expect(a_get("media/search.#{format}")
+            .with(query: { access_token: @client.access_token })
+            .with(query: { lat: "37.7808851", lng: "-122.3948632" }))
+            .to have_been_made
         end
 
         it "should return an array of user search results" do