instagram-continued 1.3.0 → 1.3.1

data/lib/instagram/client/likes.rb

@@ -15,7 +15,7 @@ module Instagram
       #   If getting this data of a protected user, you must be authenticated (and be allowed to see that user).
       # @rate_limited true
       # @see http://instagram.com/developer/endpoints/likes/#get_media_likes
-      def media_likes(id, *args)
+      def media_likes(id, *_args)
         response = get("media/#{id}/likes")
         response
       end
@@ -33,8 +33,8 @@ module Instagram
       #   If getting this data of a protected user, you must be authenticated (and be allowed to see that user).
       # @rate_limited true
       # @see http://instagram.com/developer/endpoints/likes/#post_likes
-      def like_media(id, options={})
-        response = post("media/#{id}/likes", options, signature=true)
+      def like_media(id, options = {})
+        response = post("media/#{id}/likes", options, signature = true)
         response
       end
 
@@ -49,8 +49,8 @@ module Instagram
       # @authenticated true
       # @rate_limited true
       # @see http://instagram.com/developer/endpoints/likes/#delete_likes
-      def unlike_media(id, options={})
-        response = delete("media/#{id}/likes", options, signature=true)
+      def unlike_media(id, options = {})
+        response = delete("media/#{id}/likes", options, signature = true)
         response
       end
     end

data/lib/instagram/client/locations.rb

@@ -13,7 +13,7 @@ module Instagram
       # @authenticated false
       # @rate_limited true
       # @see http://instagram.com/developer/endpoints/locations/#get_locations
-      def location(id, *args)
+      def location(id, *_args)
         response = get("locations/#{id}")
         response
       end
@@ -60,13 +60,13 @@ module Instagram
         case args.size
         when 1
           facebook_places_id = args.first
-          response = get('locations/search', options.merge(:facebook_places_id => facebook_places_id))
+          response = get("locations/search", options.merge(facebook_places_id: facebook_places_id))
         when 2
           lat, lng = args
-          response = get('locations/search', options.merge(:lat => lat, :lng => lng))
+          response = get("locations/search", options.merge(lat: lat, lng: lng))
         when 3
           lat, lng, distance = args
-          response = get('locations/search', options.merge(:lat => lat, :lng => lng, :distance => distance))
+          response = get("locations/search", options.merge(lat: lat, lng: lng, distance: distance))
         end
         response
       end

data/lib/instagram/client/media.rb

@@ -16,7 +16,7 @@ module Instagram
       # @rate_limited true
       # @see http://instagram.com/developer/endpoints/media/#get_media
       def media_item(*args)
-        id = args.first || 'self'
+        id = args.first || "self"
         response = get("media/#{id}")
         response
       end
@@ -73,8 +73,8 @@ module Instagram
       # @format :json
       # @authenticated false
       # @rate_limited true
-      def media_search(lat, lng, options={})
-        response = get('media/search', options.merge(:lat => lat, :lng => lng))
+      def media_search(lat, lng, options = {})
+        response = get("media/search", options.merge(lat: lat, lng: lng))
         response
       end
     end

data/lib/instagram/client/subscriptions.rb

@@ -1,5 +1,5 @@
-require 'openssl'
-require 'multi_json'
+require "openssl"
+require "multi_json"
 
 module Instagram
   class Client
@@ -17,8 +17,8 @@ module Instagram
       #   Requires client_secret to be set on the client or passed in options
       # @rate_limited true
       # @see https://api.instagram.com/developer/realtime/
-      def subscriptions(options={})
-        response = get("subscriptions", options.merge(:client_secret => client_secret))
+      def subscriptions(options = {})
+        response = get("subscriptions", options.merge(client_secret: client_secret))
         response
       end
 
@@ -58,12 +58,12 @@ module Instagram
         object = args.shift
         callback_url = args.shift
         aspect = args.shift
-        options.tap {|o|
+        options.tap do |o|
           o[:object] = object unless object.nil?
           o[:callback_url] = callback_url unless callback_url.nil?
           o[:aspect] = aspect || o[:aspect] || "media"
-        }
-        response = post("subscriptions", options.merge(:client_secret => client_secret), signature=true)
+        end
+        response = post("subscriptions", options.merge(client_secret: client_secret), signature = true)
         response
       end
 
@@ -91,8 +91,8 @@ module Instagram
       def delete_subscription(*args)
         options = args.last.is_a?(Hash) ? args.pop : {}
         subscription_id = args.first
-        options.merge!(:id => subscription_id) if subscription_id
-        response = delete("subscriptions", options.merge(:client_secret => client_secret), signature=true)
+        options[:id] = subscription_id if subscription_id
+        response = delete("subscriptions", options.merge(client_secret: client_secret), signature = true)
         response
       end
 
@@ -111,14 +111,14 @@ module Instagram
       # @return the challenge string to be sent back to Instagram, or false if the request is invalid.
       def meet_challenge(params, verify_token = nil, &verification_block)
         if params["hub.mode"] == "subscribe" &&
-            # you can make sure this is legitimate through two ways
-            # if your store the token across the calls, you can pass in the token value
-            # and we'll make sure it matches
-            ((verify_token && params["hub.verify_token"] == verify_token) ||
-            # alternately, if you sent a specially-constructed value (such as a hash of various secret values)
-            # you can pass in a block, which we'll call with the verify_token sent by Instagram
-            # if it's legit, return anything that evaluates to true; otherwise, return nil or false
-            (verification_block && yield(params["hub.verify_token"])))
+           # you can make sure this is legitimate through two ways
+           # if your store the token across the calls, you can pass in the token value
+           # and we'll make sure it matches
+           ((verify_token && params["hub.verify_token"] == verify_token) ||
+           # alternately, if you sent a specially-constructed value (such as a hash of various secret values)
+           # you can pass in a block, which we'll call with the verify_token sent by Instagram
+           # if it's legit, return anything that evaluates to true; otherwise, return nil or false
+           (verification_block && yield(params["hub.verify_token"])))
           params["hub.challenge"]
         else
           false
@@ -143,8 +143,8 @@ module Instagram
           raise ArgumentError, "client_secret must be set during configure"
         end
 
-        if request_signature = headers['X-Hub-Signature'] || headers['HTTP_X_HUB_SIGNATURE']
-          calculated_signature = OpenSSL::HMAC.hexdigest('sha1', client_secret, body)
+        if request_signature = headers["X-Hub-Signature"] || headers["HTTP_X_HUB_SIGNATURE"]
+          calculated_signature = OpenSSL::HMAC.hexdigest("sha1", client_secret, body)
           calculated_signature == request_signature
         end
       end
@@ -174,14 +174,14 @@ module Instagram
       #   Requires client_secret to be set on the client or passed in options
       # @rate_limited true
       # @see https://api.instagram.com/developer/realtime/
-      def process_subscription(json, options={}, &block)
+      def process_subscription(json, options = {})
         raise ArgumentError, "callbacks block expected" unless block_given?
 
-        if options.has_key?(:signature)
-          if !client_secret
+        if options.key?(:signature)
+          unless client_secret
             raise ArgumentError, "client_secret must be set during configure"
           end
-          digest = OpenSSL::Digest.new('sha1')
+          digest = OpenSSL::Digest.new("sha1")
           verify_signature = OpenSSL::HMAC.hexdigest(digest, client_secret, json)
 
           if options[:signature] != verify_signature
@@ -190,15 +190,15 @@ module Instagram
         end
 
         payload = MultiJson.decode(json)
-        @changes = Hash.new { |h,k| h[k] = [] }
+        @changes = Hash.new { |h, k| h[k] = [] }
         for change in payload
-          @changes[change['object']] << change
+          @changes[change["object"]] << change
         end
-        block.call(self)
+        yield(self)
       end
 
       [:user, :tag, :location, :geography].each do |object|
-        class_eval <<-RUBY_EVAL, __FILE__, __LINE__ +1
+        class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
           def on_#{object}_changed(&block)
             for change in @changes['#{object}']
               yield change.delete('object_id'), change

data/lib/instagram/client/tags.rb

@@ -13,7 +13,7 @@ module Instagram
       # @authenticated false
       # @rate_limited true
       # @see http://instagram.com/developer/endpoints/tags/#get_tags
-      def tag(tag, *args)
+      def tag(tag, *_args)
         response = get("tags/#{tag}")
         response
       end
@@ -50,8 +50,8 @@ module Instagram
       # @see http://instagram.com/developer/endpoints/tags/#get_tags_search
       # @example Return tags that start with "cat"
       #   Instagram.tag_search("cat")
-      def tag_search(query, options={})
-        response = get('tags/search', options.merge(:q => query))
+      def tag_search(query, options = {})
+        response = get("tags/search", options.merge(q: query))
         response
       end
     end

data/lib/instagram/client/users.rb

@@ -17,7 +17,7 @@ module Instagram
       # @see http://instagram.com/developer/endpoints/users/#get_users
       def user(*args)
         options = args.last.is_a?(Hash) ? args.pop : {}
-        id = args.first || 'self'
+        id = args.first || "self"
         response = get("users/#{id}", options)
         response
       end
@@ -34,8 +34,8 @@ module Instagram
       # @see http://instagram.com/developer/endpoints/users/#get_users_search
       # @example Return users that match "Shayne Sweeney"
       #   Instagram.user_search("Shayne Sweeney")
-      def user_search(query, options={})
-        response = get('users/search', options.merge(:q => query))
+      def user_search(query, options = {})
+        response = get("users/search", options.merge(q: query))
         response
       end
 
@@ -111,7 +111,7 @@ module Instagram
     # @format :json
     # @authenticated true
     # @rate_limited true
-    def user_requested_by()
+    def user_requested_by
       response = get("users/self/requested-by")
       response
     end
@@ -132,7 +132,7 @@ module Instagram
     # @see http://instagram.com/developer/endpoints/users/#get_users_feed
     def user_media_feed(*args)
       options = args.first.is_a?(Hash) ? args.pop : {}
-      response = get('users/self/feed', options)
+      response = get("users/self/feed", options)
       response
     end
 
@@ -177,7 +177,7 @@ module Instagram
     # @format :json
     # @authenticated true
     # @rate_limited true
-    def user_liked_media(options={})
+    def user_liked_media(options = {})
       response = get("users/self/media/liked", options)
       response
     end
@@ -194,7 +194,7 @@ module Instagram
     # @format :json
     # @authenticated true
     # @rate_limited true
-    def user_relationship(id, options={})
+    def user_relationship(id, options = {})
       response = get("users/#{id}/relationship", options)
       response
     end
@@ -211,9 +211,9 @@ module Instagram
     # @format :json
     # @authenticated true
     # @rate_limited true
-    def follow_user(id, options={})
+    def follow_user(id, options = {})
       options["action"] = "follow"
-      response = post("users/#{id}/relationship", options, signature=true)
+      response = post("users/#{id}/relationship", options, signature = true)
       response
     end
 
@@ -229,9 +229,9 @@ module Instagram
     # @format :json
     # @authenticated true
     # @rate_limited true
-    def unfollow_user(id, options={})
+    def unfollow_user(id, options = {})
       options["action"] = "unfollow"
-      response = post("users/#{id}/relationship", options, signature=true)
+      response = post("users/#{id}/relationship", options, signature = true)
       response
     end
 
@@ -247,9 +247,9 @@ module Instagram
     # @format :json
     # @authenticated true
     # @rate_limited true
-    def block_user(id, options={})
+    def block_user(id, options = {})
       options["action"] = "block"
-      response = post("users/#{id}/relationship", options, signature=true)
+      response = post("users/#{id}/relationship", options, signature = true)
       response
     end
 
@@ -265,9 +265,9 @@ module Instagram
     # @format :json
     # @authenticated true
     # @rate_limited true
-    def unblock_user(id, options={})
+    def unblock_user(id, options = {})
       options["action"] = "unblock"
-      response = post("users/#{id}/relationship", options, signature=true)
+      response = post("users/#{id}/relationship", options, signature = true)
       response
     end
 
@@ -283,9 +283,9 @@ module Instagram
     # @format :json
     # @authenticated true
     # @rate_limited true
-    def approve_user(id, options={})
+    def approve_user(id, options = {})
       options["action"] = "approve"
-      response = post("users/#{id}/relationship", options, signature=true)
+      response = post("users/#{id}/relationship", options, signature = true)
       response
     end
 
@@ -301,9 +301,9 @@ module Instagram
     # @format :json
     # @authenticated true
     # @rate_limited true
-    def deny_user(id, options={})
+    def deny_user(id, options = {})
       options["action"] = "deny"
-      response = post("users/#{id}/relationship", options, signature=true)
+      response = post("users/#{id}/relationship", options, signature = true)
       response
     end
   end

data/lib/instagram/client/utils.rb

@@ -2,26 +2,26 @@ module Instagram
   class Client
     # @private
     module Utils
-      # Returns the raw full response including all headers. Can be used to access the values for 'X-Ratelimit-Limit' and 'X-Ratelimit-Remaining' 
+      # Returns the raw full response including all headers. Can be used to access the values for 'X-Ratelimit-Limit' and 'X-Ratelimit-Remaining'
       # ==== Examples
-      #   
+      #
       #   client = Instagram.client(:access_token => session[:access_token])
       #   response = client.utils_raw_response
       #   remaining = response.headers[:x_ratelimit_remaining]
       #   limit = response.headers[:x_ratelimit_limit]
       #
       def utils_raw_response
-        response = get('users/self/feed',nil, false, true)
+        response = get("users/self/feed", nil, false, true)
         response
       end
-    
+
       private
 
       # Returns the configured user name or the user name of the authenticated user
       #
       # @return [String]
       def get_username
-        @user_name ||= self.user.username
+        @user_name ||= user.username
       end
     end
   end

data/lib/instagram/configuration.rb

@@ -1,5 +1,5 @@
-require 'faraday'
-require File.expand_path('../version', __FILE__)
+require "faraday"
+require File.expand_path("../version", __FILE__)
 
 module Instagram
   # Defines constants and methods related to configuration
@@ -41,12 +41,12 @@ module Instagram
     DEFAULT_CLIENT_IPS = nil
 
     # By default, don't set any connection options
-    DEFAULT_CONNECTION_OPTIONS = {}
+    DEFAULT_CONNECTION_OPTIONS = {}.freeze
 
     # The endpoint that will be used to connect if none is set
     #
     # @note There is no reason to use any other endpoint at this time
-    DEFAULT_ENDPOINT = 'https://api.instagram.com/v1/'.freeze
+    DEFAULT_ENDPOINT = "https://api.instagram.com/v1/".freeze
 
     # The response format appended to the path and sent in the 'Accept' header if none is set
     #
@@ -72,7 +72,8 @@ module Instagram
     #
     # @note Not all methods support the XML format.
     VALID_FORMATS = [
-      :json].freeze
+      :json,
+    ].freeze
 
     # By default, don't turn on loud logging
     DEFAULT_LOUD_LOGGER = nil
@@ -114,7 +115,7 @@ module Instagram
       self.format             = DEFAULT_FORMAT
       self.proxy              = DEFAULT_PROXY
       self.user_agent         = DEFAULT_USER_AGENT
-      self.no_response_wrapper= DEFAULT_NO_RESPONSE_WRAPPER
+      self.no_response_wrapper = DEFAULT_NO_RESPONSE_WRAPPER
       self.loud_logger        = DEFAULT_LOUD_LOGGER
       self.sign_requests      = DEFAULT_SIGN_REQUESTS
     end

data/lib/instagram/connection.rb

@@ -1,16 +1,16 @@
-require 'faraday_middleware'
-Dir[File.expand_path('../../faraday/*.rb', __FILE__)].each{|f| require f}
+require "faraday_middleware"
+Dir[File.expand_path("../../faraday/*.rb", __FILE__)].each { |f| require f }
 
 module Instagram
   # @private
   module Connection
     private
 
-    def connection(raw=false)
+    def connection(raw = false)
       options = {
-        :headers => {'Accept' => "application/#{format}; charset=utf-8", 'User-Agent' => user_agent},
-        :proxy => proxy,
-        :url => endpoint,
+        headers: { "Accept" => "application/#{format}; charset=utf-8", "User-Agent" => user_agent },
+        proxy: proxy,
+        url: endpoint,
       }.merge(connection_options)
 
       Faraday::Connection.new(options) do |connection|
@@ -19,7 +19,7 @@ module Instagram
         connection.use FaradayMiddleware::Mashify unless raw
         unless raw
           case format.to_s.downcase
-          when 'json' then connection.use Faraday::Response::ParseJson
+          when "json" then connection.use Faraday::Response::ParseJson
           end
         end
         connection.use FaradayMiddleware::RaiseHttpException

data/lib/instagram/oauth.rb

@@ -2,34 +2,34 @@ module Instagram
   # Defines HTTP request methods
   module OAuth
     # Return URL for OAuth authorization
-    def authorize_url(options={})
+    def authorize_url(options = {})
       options[:response_type] ||= "code"
       options[:scope] ||= scope if !scope.nil? && !scope.empty?
-      options[:redirect_uri] ||= self.redirect_uri
+      options[:redirect_uri] ||= redirect_uri
       params = authorization_params.merge(options)
       connection.build_url("/oauth/authorize/", params).to_s
     end
 
     # Return an access token from authorization
-    def get_access_token(code, options={})
+    def get_access_token(code, options = {})
       options[:grant_type] ||= "authorization_code"
-      options[:redirect_uri] ||= self.redirect_uri
+      options[:redirect_uri] ||= redirect_uri
       params = access_token_params.merge(options)
-      post("/oauth/access_token/", params.merge(:code => code), signature=false, raw=false, unformatted=true, no_response_wrapper=true)
+      post("/oauth/access_token/", params.merge(code: code), signature = false, raw = false, unformatted = true, no_response_wrapper = true)
     end
 
     private
 
     def authorization_params
       {
-        :client_id => client_id
+        client_id: client_id,
       }
     end
 
     def access_token_params
       {
-        :client_id => client_id,
-        :client_secret => client_secret
+        client_id: client_id,
+        client_secret: client_secret,
       }
     end
   end