instagram-continued 1.3.0 → 1.3.1

data/lib/instagram/request.rb

@@ -1,47 +1,45 @@
-require 'openssl'
-require 'base64'
+require "openssl"
+require "base64"
 
 module Instagram
   # Defines HTTP request methods
   module Request
     # Perform an HTTP GET request
-    def get(path, options={}, signature=false, raw=false, unformatted=false, no_response_wrapper=no_response_wrapper(), signed=sign_requests)
+    def get(path, options = {}, signature = false, raw = false, unformatted = false, no_response_wrapper = no_response_wrapper, signed = sign_requests)
       request(:get, path, options, signature, raw, unformatted, no_response_wrapper, signed)
     end
 
     # Perform an HTTP POST request
-    def post(path, options={}, signature=false, raw=false, unformatted=false, no_response_wrapper=no_response_wrapper(), signed=sign_requests)
+    def post(path, options = {}, signature = false, raw = false, unformatted = false, no_response_wrapper = no_response_wrapper, signed = sign_requests)
       request(:post, path, options, signature, raw, unformatted, no_response_wrapper, signed)
     end
 
     # Perform an HTTP PUT request
-    def put(path, options={},  signature=false, raw=false, unformatted=false, no_response_wrapper=no_response_wrapper(), signed=sign_requests)
+    def put(path, options = {}, signature = false, raw = false, unformatted = false, no_response_wrapper = no_response_wrapper, signed = sign_requests)
       request(:put, path, options, signature, raw, unformatted, no_response_wrapper, signed)
     end
 
     # Perform an HTTP DELETE request
-    def delete(path, options={}, signature=false, raw=false, unformatted=false, no_response_wrapper=no_response_wrapper(), signed=sign_requests)
+    def delete(path, options = {}, signature = false, raw = false, unformatted = false, no_response_wrapper = no_response_wrapper, signed = sign_requests)
       request(:delete, path, options, signature, raw, unformatted, no_response_wrapper, signed)
     end
 
     private
 
     # Perform an HTTP request
-    def request(method, path, options, signature=false, raw=false, unformatted=false, no_response_wrapper=false, signed=sign_requests)
+    def request(method, path, options, signature = false, raw = false, unformatted = false, no_response_wrapper = false, signed = sign_requests)
       response = connection(raw).send(method) do |request|
         path = formatted_path(path) unless unformatted
-        
+
         if signed == true
-          if client_id != nil
-            sig_options = options.merge({:client_id => client_id})
-          end
-          if access_token != nil
-            sig_options = options.merge({:access_token => access_token})
+          sig_options = options.merge(client_id: client_id) unless client_id.nil?
+          unless access_token.nil?
+            sig_options = options.merge(access_token: access_token)
           end
-          sig = generate_sig("/"+path, sig_options, client_secret)
+          sig = generate_sig("/" + path, sig_options, client_secret)
           options[:sig] = sig
         end
-        
+
         case method
         when :get, :delete
           request.url(URI.encode(path), options)
@@ -49,34 +47,33 @@ module Instagram
           request.path = URI.encode(path)
           request.body = options unless options.empty?
         end
-        if signature && client_ips != nil
+        if signature && !client_ips.nil?
           request.headers["X-Insta-Forwarded-For"] = get_insta_fowarded_for(client_ips, client_secret)
         end
       end
       return response if raw
       return response.body if no_response_wrapper
-      return Response.create( response.body, {:limit => response.headers['x-ratelimit-limit'].to_i,
-                                              :remaining => response.headers['x-ratelimit-remaining'].to_i} )
+      Response.create(response.body, limit: response.headers["x-ratelimit-limit"].to_i,
+                                     remaining: response.headers["x-ratelimit-remaining"].to_i)
     end
 
     def formatted_path(path)
-      [path, format].compact.join('.')
+      [path, format].compact.join(".")
     end
 
     def get_insta_fowarded_for(ips, secret)
-        digest = OpenSSL::Digest.new('sha256')
-        signature = OpenSSL::HMAC.hexdigest(digest, secret, ips)
-        return [ips, signature].join('|')
+      digest = OpenSSL::Digest.new("sha256")
+      signature = OpenSSL::HMAC.hexdigest(digest, secret, ips)
+      [ips, signature].join("|")
     end
 
     def generate_sig(endpoint, params, secret)
       sig = endpoint
       params.sort.map do |key, val|
-        sig += '|%s=%s' % [key, val]
+        sig += "|%s=%s" % [key, val]
       end
-      digest = OpenSSL::Digest::Digest.new('sha256')
-      return OpenSSL::HMAC.hexdigest(digest, secret, sig)
+      digest = OpenSSL::Digest::Digest.new("sha256")
+      OpenSSL::HMAC.hexdigest(digest, secret, sig)
     end
-
   end
 end

data/lib/instagram/response.rb

@@ -1,11 +1,15 @@
 module Instagram
   module Response
-    def self.create( response_hash, ratelimit_hash )
+    def self.create(response_hash, ratelimit_hash)
       response_hash = {} unless response_hash
-      data = response_hash.data.dup rescue response_hash
-      data.extend( self )
+      data = begin
+               response_hash.data.dup
+             rescue
+               response_hash
+             end
+      data.extend(self)
       data.instance_exec do
-        %w{pagination meta}.each do |k|
+        %w(pagination meta).each do |k|
           response_hash.public_send(k).tap do |v|
             instance_variable_set("@#{k}", v) if v
           end

data/lib/instagram/version.rb

@@ -1,3 +1,3 @@
 module Instagram
-  VERSION = '1.3.0'.freeze unless defined?(::Instagram::VERSION)
+  VERSION = '1.3.1'.freeze unless defined?(::Instagram::VERSION)
 end

data/spec/faraday/response_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require File.expand_path("../../spec_helper", __FILE__)
 
 describe Faraday::Response do
   before do
@@ -11,76 +11,74 @@ describe Faraday::Response do
     404 => Instagram::NotFound,
     429 => Instagram::TooManyRequests,
     500 => Instagram::InternalServerError,
-    503 => Instagram::ServiceUnavailable
+    503 => Instagram::ServiceUnavailable,
   }.each do |status, exception|
     context "when HTTP status is #{status}" do
-
       before do
-        stub_get('users/self/feed.json').
-          to_return(:status => status)
+        stub_get("users/self/feed.json")
+          .to_return(status: status)
       end
 
       it "should raise #{exception.name} error" do
         expect do
-          @client.user_media_feed()
+          @client.user_media_feed
         end.to raise_error(exception)
       end
-
     end
   end
 
   context "when a 400 is raised" do
     before do
-      stub_get('users/self/feed.json').
-        to_return(:body => '{"meta":{"error_message": "Bad words are bad."}}', :status => 400)
+      stub_get("users/self/feed.json")
+        .to_return(body: '{"meta":{"error_message": "Bad words are bad."}}', status: 400)
     end
 
     it "should return the body error message" do
       expect do
-        @client.user_media_feed()
+        @client.user_media_feed
       end.to raise_error(Instagram::BadRequest, /Bad words are bad\./)
     end
   end
 
   context "when a 400 is raised with no meta but an error_message" do
     before do
-      stub_get('users/self/feed.json').
-        to_return(:body => '{"error_type": "OAuthException", "error_message": "No matching code found."}', :status => 400)
+      stub_get("users/self/feed.json")
+        .to_return(body: '{"error_type": "OAuthException", "error_message": "No matching code found."}', status: 400)
     end
 
     it "should return the body error type and message" do
       expect do
-        @client.user_media_feed()
+        @client.user_media_feed
       end.to raise_error(Instagram::BadRequest, /OAuthException: No matching code found\./)
     end
   end
 
-  context 'when a 502 is raised with an HTML response' do
+  context "when a 502 is raised with an HTML response" do
     before do
-      stub_get('users/self/feed.json').to_return(
-        :body => '<html><body><h1>502 Bad Gateway</h1> The server returned an invalid or incomplete response. </body></html>',
-        :status => 502
+      stub_get("users/self/feed.json").to_return(
+        body: "<html><body><h1>502 Bad Gateway</h1> The server returned an invalid or incomplete response. </body></html>",
+        status: 502
       )
     end
 
-    it 'should raise an Instagram::BadGateway' do
+    it "should raise an Instagram::BadGateway" do
       expect do
-        @client.user_media_feed()
+        @client.user_media_feed
       end.to raise_error(Instagram::BadGateway)
     end
   end
 
-  context 'when a 504 is raised with an HTML response' do
+  context "when a 504 is raised with an HTML response" do
     before do
-      stub_get('users/self/feed.json').to_return(
-        :body => '<html> <head><title>504 Gateway Time-out</title></head> <body bgcolor="white"> <center><h1>504 Gateway Time-out</h1></center> <hr><center>nginx</center> </body> </html>',
-        :status => 504
+      stub_get("users/self/feed.json").to_return(
+        body: '<html> <head><title>504 Gateway Time-out</title></head> <body bgcolor="white"> <center><h1>504 Gateway Time-out</h1></center> <hr><center>nginx</center> </body> </html>',
+        status: 504
       )
     end
 
-    it 'should raise an Instagram::GatewayTimeout' do
+    it "should raise an Instagram::GatewayTimeout" do
       expect do
-        @client.user_media_feed()
+        @client.user_media_feed
       end.to raise_error(Instagram::GatewayTimeout)
     end
   end

data/spec/instagram/api_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper', __FILE__)
+require File.expand_path("../../spec_helper", __FILE__)
 
 describe Instagram::API do
   before do
@@ -6,7 +6,6 @@ describe Instagram::API do
   end
 
   context "with module configuration" do
-
     before do
       Instagram.configure do |config|
         @keys.each do |key|
@@ -27,38 +26,36 @@ describe Instagram::API do
     end
 
     context "with class configuration" do
-
       before do
         @configuration = {
-          :access_token => 'AT',
-          :adapter => :typhoeus,
-          :client_id => 'CID',
-          :client_secret => 'CS',
-          :client_ips => '1.2.3.4',
-          :connection_options => { :ssl => { :verify => true } },
-          :redirect_uri => 'http://http://localhost:4567/oauth/callback',
-          :endpoint => 'http://tumblr.com/',
-          :format => :xml,
-          :proxy => 'http://shayne:sekret@proxy.example.com:8080',
-          :scope => 'comments relationships',
-          :user_agent => 'Custom User Agent',
-          :no_response_wrapper => true,
-          :loud_logger => true,
-          :sign_requests => false,
+          access_token: "AT",
+          adapter: :typhoeus,
+          client_id: "CID",
+          client_secret: "CS",
+          client_ips: "1.2.3.4",
+          connection_options: { ssl: { verify: true } },
+          redirect_uri: "http://http://localhost:4567/oauth/callback",
+          endpoint: "http://tumblr.com/",
+          format: :xml,
+          proxy: "http://shayne:sekret@proxy.example.com:8080",
+          scope: "comments relationships",
+          user_agent: "Custom User Agent",
+          no_response_wrapper: true,
+          loud_logger: true,
+          sign_requests: false,
         }
       end
 
       context "during initialization"
 
-        it "should override module configuration" do
-          api = Instagram::API.new(@configuration)
-          @keys.each do |key|
-            expect(api.send(key)).to eq(@configuration[key])
-          end
+      it "should override module configuration" do
+        api = Instagram::API.new(@configuration)
+        @keys.each do |key|
+          expect(api.send(key)).to eq(@configuration[key])
         end
+      end
 
       context "after initilization" do
-
         let(:api) { Instagram::API.new }
 
         before do
@@ -75,7 +72,7 @@ describe Instagram::API do
 
         describe "#connection" do
           it "should use the connection_options" do
-            expect(Faraday::Connection).to receive(:new).with(include(:ssl => { :verify => true }))
+            expect(Faraday::Connection).to receive(:new).with(include(ssl: { verify: true }))
             api.send(:connection)
           end
         end
@@ -83,11 +80,11 @@ describe Instagram::API do
     end
   end
 
-  describe '#config' do
+  describe "#config" do
     subject { Instagram::API.new }
 
     let(:config) do
-      c = {}; @keys.each {|key| c[key] = key }; c
+      c = {}; @keys.each { |key| c[key] = key }; c
     end
 
     it "returns a hash representing the configuration" do
@@ -99,18 +96,17 @@ describe Instagram::API do
   end
 
   describe ".authorize_url" do
-
     it "should generate an authorize URL with necessary params" do
-      params = { :client_id => "CID", :client_secret => "CS" }
+      params = { client_id: "CID", client_secret: "CS" }
 
       client = Instagram::Client.new(params)
 
-      redirect_uri = 'http://localhost:4567/oauth/callback'
-      url = client.authorize_url(:redirect_uri => redirect_uri)
+      redirect_uri = "http://localhost:4567/oauth/callback"
+      url = client.authorize_url(redirect_uri: redirect_uri)
 
       options = {
-        :redirect_uri => redirect_uri,
-        :response_type => "code"
+        redirect_uri: redirect_uri,
+        response_type: "code",
       }
       params2 = client.send(:authorization_params).merge(options)
 
@@ -120,140 +116,140 @@ describe Instagram::API do
     end
 
     it "should not include client secret in URL params" do
-      params = { :client_id => "CID", :client_secret => "CS" }
+      params = { client_id: "CID", client_secret: "CS" }
       client = Instagram::Client.new(params)
-      redirect_uri = 'http://localhost:4567/oauth/callback'
-      url = client.authorize_url(:redirect_uri => redirect_uri)
+      redirect_uri = "http://localhost:4567/oauth/callback"
+      url = client.authorize_url(redirect_uri: redirect_uri)
       expect(url).not_to include("client_secret")
     end
 
     describe "scope param" do
       it "should include the scope if there is one set" do
-        params = { :scope => "comments likes" }
+        params = { scope: "comments likes" }
         client = Instagram::Client.new(params)
-        redirect_uri = 'http://localhost:4567/oauth/callback'
-        url = client.authorize_url(:redirect_uri => redirect_uri)
+        redirect_uri = "http://localhost:4567/oauth/callback"
+        url = client.authorize_url(redirect_uri: redirect_uri)
         expect(url).to include("scope")
       end
 
       it "should not include the scope if the scope is blank" do
-        params = { :scope => "" }
+        params = { scope: "" }
         client = Instagram::Client.new(params)
-        redirect_uri = 'http://localhost:4567/oauth/callback'
-        url = client.authorize_url(:redirect_uri => redirect_uri)
+        redirect_uri = "http://localhost:4567/oauth/callback"
+        url = client.authorize_url(redirect_uri: redirect_uri)
         expect(url).not_to include("scope")
       end
     end
 
     describe "redirect_uri" do
       it "should fall back to configuration redirect_uri if not passed as option" do
-        redirect_uri = 'http://localhost:4567/oauth/callback'
-        params = { :redirect_uri => redirect_uri }
+        redirect_uri = "http://localhost:4567/oauth/callback"
+        params = { redirect_uri: redirect_uri }
         client = Instagram::Client.new(params)
-        url = client.authorize_url()
-        expect(url).to match(/redirect_uri=#{URI.escape(redirect_uri, Regexp.union('/',':'))}/)
+        url = client.authorize_url
+        expect(url).to match(/redirect_uri=#{URI.escape(redirect_uri, Regexp.union('/', ':'))}/)
       end
 
       it "should override configuration redirect_uri if passed as option" do
-        redirect_uri_config = 'http://localhost:4567/oauth/callback_config'
-        params = { :redirect_uri => redirect_uri_config }
+        redirect_uri_config = "http://localhost:4567/oauth/callback_config"
+        params = { redirect_uri: redirect_uri_config }
         client = Instagram::Client.new(params)
-        redirect_uri_option = 'http://localhost:4567/oauth/callback_option'
-        options = { :redirect_uri => redirect_uri_option }
+        redirect_uri_option = "http://localhost:4567/oauth/callback_option"
+        options = { redirect_uri: redirect_uri_option }
         url = client.authorize_url(options)
-        expect(url).to match(/redirect_uri=#{URI.escape(redirect_uri_option, Regexp.union('/',':'))}/)
+        expect(url).to match(/redirect_uri=#{URI.escape(redirect_uri_option, Regexp.union('/', ':'))}/)
       end
     end
   end
 
   describe ".get_access_token" do
-
     describe "common functionality" do
       before do
-        @client = Instagram::Client.new(:client_id => "CID", :client_secret => "CS")
+        @client = Instagram::Client.new(client_id: "CID", client_secret: "CS")
         @url = @client.send(:connection).build_url("/oauth/access_token/").to_s
-        stub_request(:post, @url).
-          with(:body => {:client_id => "CID", :client_secret => "CS", :redirect_uri => "http://localhost:4567/oauth/callback", :grant_type => "authorization_code", :code => "C"}).
-          to_return(:status => 200, :body => fixture("access_token.json"), :headers => {})
+        stub_request(:post, @url)
+          .with(body: { client_id: "CID", client_secret: "CS", redirect_uri: "http://localhost:4567/oauth/callback", grant_type: "authorization_code", code: "C" })
+          .to_return(status: 200, body: fixture("access_token.json"), headers: {})
       end
 
       it "should get the correct resource" do
-        @client.get_access_token(code="C", :redirect_uri => "http://localhost:4567/oauth/callback")
-        expect(a_request(:post, @url).
-          with(:body => {:client_id => "CID", :client_secret => "CS", :redirect_uri => "http://localhost:4567/oauth/callback", :grant_type => "authorization_code", :code => "C"})).
-          to have_been_made
+        @client.get_access_token(code = "C", redirect_uri: "http://localhost:4567/oauth/callback")
+        expect(a_request(:post, @url)
+          .with(body: { client_id: "CID", client_secret: "CS", redirect_uri: "http://localhost:4567/oauth/callback", grant_type: "authorization_code", code: "C" }))
+          .to have_been_made
       end
 
       it "should return a hash with an access_token and user data" do
-        response = @client.get_access_token(code="C", :redirect_uri => "http://localhost:4567/oauth/callback")
+        response = @client.get_access_token(code = "C", redirect_uri: "http://localhost:4567/oauth/callback")
         expect(response.access_token).to eq("at")
         expect(response.user.username).to eq("mikeyk")
       end
     end
 
     describe "redirect_uri param" do
-
       before do
         @redirect_uri_config = "http://localhost:4567/oauth/callback_config"
-        @client = Instagram::Client.new(:client_id => "CID", :client_secret => "CS", :redirect_uri => @redirect_uri_config)
+        @client = Instagram::Client.new(client_id: "CID", client_secret: "CS", redirect_uri: @redirect_uri_config)
         @url = @client.send(:connection).build_url("/oauth/access_token/").to_s
         stub_request(:post, @url)
       end
 
       it "should fall back to configuration redirect_uri if not passed as option" do
-        @client.get_access_token(code="C")
-        expect(a_request(:post, @url).
-          with(:body => hash_including({:redirect_uri => @redirect_uri_config}))).
-          to have_been_made
+        @client.get_access_token(code = "C")
+        expect(a_request(:post, @url)
+          .with(body: hash_including(redirect_uri: @redirect_uri_config)))
+          .to have_been_made
       end
 
       it "should override configuration redirect_uri if passed as option" do
         redirect_uri_option = "http://localhost:4567/oauth/callback_option"
-        @client.get_access_token(code="C", :redirect_uri => redirect_uri_option)
-        expect(a_request(:post, @url).
-          with(:body => hash_including({:redirect_uri => redirect_uri_option}))).
-          to have_been_made
+        @client.get_access_token(code = "C", redirect_uri: redirect_uri_option)
+        expect(a_request(:post, @url)
+          .with(body: hash_including(redirect_uri: redirect_uri_option)))
+          .to have_been_made
       end
     end
 
     describe "loud_logger param" do
-
       before do
-        @client = Instagram::Client.new(:loud_logger => true)
+        @client = Instagram::Client.new(loud_logger: true)
       end
 
       context "outputs to STDOUT with faraday logs when enabled" do
         before do
-          stub_get('users/self/feed.json').
-          to_return(:body => fixture("user_media_feed.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+          stub_get("users/self/feed.json")
+            .to_return(body: fixture("user_media_feed.json"), headers: { content_type: "application/json; charset=utf-8" })
         end
 
         it "should return the body error message" do
           output = capture_output do
-            @client.user_media_feed()
+            @client.user_media_feed
           end
 
-          expect(output).to include 'INFO -- : Started GET request to: https://api.instagram.com/v1/users/self/feed.json'
-          expect(output).to include 'DEBUG -- : Response Headers:'
+          expect(output).to include "INFO -- : Started GET request to: https://api.instagram.com/v1/users/self/feed.json"
+          expect(output).to include "DEBUG -- : Response Headers:"
           expect(output).to include "User-Agent : Instagram Ruby Gem #{Instagram::VERSION}"
-          expect(output).to include 'http://distillery.s3.amazonaws.com/media/2011/01/31/0f8e832c3dc6420bb6ddf0bd09f032f6_6.jpg'
+          expect(output).to include "http://distillery.s3.amazonaws.com/media/2011/01/31/0f8e832c3dc6420bb6ddf0bd09f032f6_6.jpg"
         end
       end
 
       context "shows STDOUT output when errors occur" do
-
         before do
-          stub_get('users/self/feed.json').
-          to_return(:body => '{"meta":{"error_message": "Bad words are bad."}}', :status => 400)
+          stub_get("users/self/feed.json")
+            .to_return(body: '{"meta":{"error_message": "Bad words are bad."}}', status: 400)
         end
 
         it "should return the body error message" do
           output = capture_output do
-            @client.user_media_feed() rescue nil
+            begin
+              @client.user_media_feed
+            rescue
+              nil
+            end
           end
 
-          expect(output).to include 'INFO -- : Started GET request to: https://api.instagram.com/v1/users/self/feed.json'
-          expect(output).to include 'DEBUG -- : Response Headers:'
+          expect(output).to include "INFO -- : Started GET request to: https://api.instagram.com/v1/users/self/feed.json"
+          expect(output).to include "DEBUG -- : Response Headers:"
           expect(output).to include "User-Agent : Instagram Ruby Gem #{Instagram::VERSION}"
           expect(output).to include '{"meta":{"error_message": "Bad words are bad."}}'
         end
@@ -261,23 +257,23 @@ describe Instagram::API do
 
       context "will redact API keys if INSTAGRAM_GEM_REDACT=true" do
         before do
-          stub_get('users/self/feed.json').
-          to_return(:body => fixture("user_media_feed.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+          stub_get("users/self/feed.json")
+            .to_return(body: fixture("user_media_feed.json"), headers: { content_type: "application/json; charset=utf-8" })
         end
 
         it "should redact API keys" do
-          allow(ENV).to receive(:[]).with('http_proxy').and_return(nil)
-          allow(ENV).to receive(:[]).with('INSTAGRAM_GEM_REDACT').and_return('true')
+          allow(ENV).to receive(:[]).with("http_proxy").and_return(nil)
+          allow(ENV).to receive(:[]).with("INSTAGRAM_GEM_REDACT").and_return("true")
 
           output = capture_output do
-            @client.user_media_feed()
+            @client.user_media_feed
           end
 
-          expect(output).to include 'INFO -- : Started GET request to: https://api.instagram.com/v1/users/self/feed.json'
-          expect(output).to include 'DEBUG -- : Response Headers:'
+          expect(output).to include "INFO -- : Started GET request to: https://api.instagram.com/v1/users/self/feed.json"
+          expect(output).to include "DEBUG -- : Response Headers:"
           expect(output).to include "User-Agent : Instagram Ruby Gem #{Instagram::VERSION}"
-          expect(output).to include 'http://distillery.s3.amazonaws.com/media/2011/01/31/0f8e832c3dc6420bb6ddf0bd09f032f6_6.jpg'
-          expect(output).to include 'access_token=[ACCESS-TOKEN]'
+          expect(output).to include "http://distillery.s3.amazonaws.com/media/2011/01/31/0f8e832c3dc6420bb6ddf0bd09f032f6_6.jpg"
+          expect(output).to include "access_token=[ACCESS-TOKEN]"
         end
       end
     end