instagram-continued 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb7dca52b65e36a84dde86803975799a9cd538ca
-  data.tar.gz: c1c55884f48329f67ef88467ec06c31b0690d317
+  metadata.gz: 2cffa2f9ed95f70c0a1cc4d47a530460810384ec
+  data.tar.gz: b0f80fe802d90b61b8ead906dc227f3cc23b70da
 SHA512:
-  metadata.gz: a1e5a32aad698a95721cfda44a1cfdb840b9e10b4cc5b605e72d976dbf39585d7a13e0cf746b16cf491250bbea0c0eed11fc519b8009c4ed4db7212b42ce403e
-  data.tar.gz: b8670e10c46527e476ec3be6efa14bc515c039aeadba835c8373f9565ee117b8b620f272fc9e94bff8c9adf15bbb3ad86c4fc936673689513a6f8b15bfd16ca5
+  metadata.gz: e384994413ba6a1c0cca8d7d536254e5f582c73003c0692d4a949d32171c19b7c84a50ad75ab9bc7db4c13e6a25836135a2997275e00962fe8dbd3c44178af1e
+  data.tar.gz: 97a873844d5d5f2f1c107ecea2399c8c1586b8e0276d3541fb89a302fb9a830a8c00d799d78677a7e0150ab18fd7c3da5573498937232b9da36459912d5084aa

data/.rubocop.yml

@@ -0,0 +1,11 @@
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+Style/StringLiteralsInInterpolation:
+  EnforcedStyle: double_quotes
+Metrics/LineLength:
+  Max: 100
+Style/TrailingCommaInLiteral:
+  EnforcedStyleForMultiline: comma
+  SupportedStyles:
+    - comma
+    - no_comma

data/.travis.yml

@@ -2,6 +2,7 @@ language: ruby
 rvm:
 - 2.3.1
 - 2.3.0
+- 2.4.0
 - 2.2
 - 2.1
 - 2.0

data/README.md

@@ -1,6 +1,6 @@
 # Instagram-Continued
 
-[![Gem Version](https://badge.fury.io/rb/instagram-continued.svg)](https://badge.fury.io/rb/instagram-continued) [![Build Status](https://travis-ci.org/icco/instagram-ruby-gem.svg?branch=master)](https://travis-ci.org/icco/instagram-ruby-gem)
+[![Gem Version](https://badge.fury.io/rb/instagram-continued.svg)](https://badge.fury.io/rb/instagram-continued) [![Build Status](https://travis-ci.org/icco/instagram-continued.svg?branch=master)](https://travis-ci.org/icco/instagram-continued)
 
 [![Dependency Status](https://gemnasium.com/badges/github.com/icco/instagram-continued.svg)](https://gemnasium.com/github.com/icco/instagram-continued)
 

data/Rakefile

@@ -1,26 +1,27 @@
-require 'bundler'
+require "bundler"
 Bundler::GemHelper.install_tasks
 
-require 'rspec/core/rake_task'
+require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec
+task test: :spec
 
 namespace :doc do
   begin
-    require 'yard'
+    require "yard"
   rescue LoadError
     # ignore
   else
     YARD::Rake::YardocTask.new do |task|
-      task.files   = ['HISTORY.mkd', 'LICENSE.mkd', 'lib/**/*.rb']
+      task.files   = ["HISTORY.mkd", "LICENSE.mkd", "lib/**/*.rb"]
       task.options = [
-        '--protected',
-        '--output-dir', 'doc/yard',
-        '--tag', 'format:Supported formats',
-        '--tag', 'authenticated:Requires Authentication',
-        '--tag', 'rate_limited:Rate Limited',
-        '--markup', 'markdown',
+        "--protected",
+        "--output-dir", "doc/yard",
+        "--tag", "format:Supported formats",
+        "--tag", "authenticated:Requires Authentication",
+        "--tag", "rate_limited:Rate Limited",
+        "--markup", "markdown"
       ]
     end
   end

data/instagram-continued.gemspec

@@ -6,16 +6,17 @@ Gem::Specification.new do |s|
   s.add_development_dependency("rspec", "~> 3.4")
   s.add_development_dependency("webmock", "~> 1.22")
   s.add_development_dependency("bluecloth", "~> 2.2")
+  s.add_development_dependency("rubocop")
 
   s.add_runtime_dependency("faraday", "~> 0.11")
   s.add_runtime_dependency("faraday_middleware")
-  s.add_runtime_dependency("multi_json", "~> 1.12")
-  s.add_runtime_dependency("hashie",  "~> 3.4")
+  s.add_runtime_dependency("multi_json")
+  s.add_runtime_dependency("hashie")
 
   s.authors = ["Shayne Sweeney", "Nat Welch"]
-  s.description = %q{A Ruby wrapper for the Instagram REST and Search APIs}
+  s.description = "A Ruby wrapper for the Instagram REST and Search APIs"
   s.email = ["shayne@instagr.am", "nat@natwelch.com"]
-  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.files = `git ls-files`.split("\n")
   s.homepage = "https://github.com/icco/instagram-continued"
   s.name = "instagram-continued"
@@ -24,7 +25,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 1.3.6")
   s.required_ruby_version = Gem::Requirement.new(">= 2.0.0")
   s.rubyforge_project = s.name
-  s.summary = %q{Ruby wrapper for the Instagram API}
+  s.summary = "Ruby wrapper for the Instagram API"
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.version = Instagram::VERSION.dup
 end

data/lib/faraday/loud_logger.rb

@@ -1,61 +1,61 @@
-require 'faraday'
+require "faraday"
 
 # @private
 module FaradayMiddleware
   # @private
   class LoudLogger < Faraday::Middleware
-      extend Forwardable
-      def_delegators :@logger, :debug, :info, :warn, :error, :fatal
+    extend Forwardable
+    def_delegators :@logger, :debug, :info, :warn, :error, :fatal
 
-      def initialize(app, options = {})
-        @app = app
-        @logger = options.fetch(:logger) {
-          require 'logger'
-          ::Logger.new($stdout)
-        }
+    def initialize(app, options = {})
+      @app = app
+      @logger = options.fetch(:logger) do
+        require "logger"
+        ::Logger.new($stdout)
       end
+    end
 
-      def call(env)
-        start_time = Time.now
-        info  { request_info(env) }
-        debug { request_debug(env) }
-        @app.call(env).on_complete do
-          end_time = Time.now
-          response_time = end_time - start_time
-          info  { response_info(env, response_time) }
-          debug { response_debug(env) }
-        end
+    def call(env)
+      start_time = Time.now
+      info  { request_info(env) }
+      debug { request_debug(env) }
+      @app.call(env).on_complete do
+        end_time = Time.now
+        response_time = end_time - start_time
+        info  { response_info(env, response_time) }
+        debug { response_debug(env) }
       end
+    end
 
-      private
+    private
 
-      def filter(output)
-        if ENV['INSTAGRAM_GEM_REDACT']
-          output = output.to_s.gsub(/client_id=[a-zA-Z0-9]*/,'client_id=[CLIENT-ID]')
-          output = output.to_s.gsub(/access_token=[a-zA-Z0-9]*/,'access_token=[ACCESS-TOKEN]')
-        else
-          output
-        end
+    def filter(output)
+      if ENV["INSTAGRAM_GEM_REDACT"]
+        output = output.to_s.gsub(/client_id=[a-zA-Z0-9]*/, "client_id=[CLIENT-ID]")
+        output = output.to_s.gsub(/access_token=[a-zA-Z0-9]*/, "access_token=[ACCESS-TOKEN]")
+      else
+        output
       end
+    end
 
-      def request_info(env)
-        "Started %s request to: %s" % [ env[:method].to_s.upcase, filter(env[:url]) ]
-      end
+    def request_info(env)
+      "Started %s request to: %s" % [env[:method].to_s.upcase, filter(env[:url])]
+    end
 
-      def response_info(env, response_time)
-        "Response from %s; Status: %d; Time: %.1fms" % [ filter(env[:url]), env[:status], (response_time * 1_000.0) ]
-      end
+    def response_info(env, response_time)
+      "Response from %s; Status: %d; Time: %.1fms" % [filter(env[:url]), env[:status], (response_time * 1_000.0)]
+    end
 
-      def request_debug(env)
-        debug_message("Request", env[:request_headers], env[:body])
-      end
+    def request_debug(env)
+      debug_message("Request", env[:request_headers], env[:body])
+    end
 
-      def response_debug(env)
-        debug_message("Response", env[:response_headers], env[:body])
-      end
+    def response_debug(env)
+      debug_message("Response", env[:response_headers], env[:body])
+    end
 
-      def debug_message(name, headers, body)
-        <<-MESSAGE.gsub(/^ +([^ ])/m, '\\1')
+    def debug_message(name, headers, body)
+      <<-MESSAGE.gsub(/^ +([^ ])/m, '\\1')
         #{name} Headers:
         ----------------
         #{format_headers(headers)}
@@ -64,12 +64,11 @@ module FaradayMiddleware
         -------------
         #{filter(body)}
         MESSAGE
-      end
-
-      def format_headers(headers)
-        length = headers.map {|k,v| k.to_s.size }.max
-        headers.map { |name, value| "#{name.to_s.ljust(length)} : #{filter(value)}" }.join("\n")
-      end
+    end
 
+    def format_headers(headers)
+      length = headers.map { |k, _v| k.to_s.size }.max
+      headers.map { |name, value| "#{name.to_s.ljust(length)} : #{filter(value)}" }.join("\n")
+    end
   end
-end
+end

data/lib/faraday/oauth2.rb

@@ -1,39 +1,37 @@
-require 'faraday'
+require "faraday"
 
 # @private
 module FaradayMiddleware
   # @private
   class InstagramOAuth2 < Faraday::Middleware
     def call(env)
+      if (env[:method] == :get) || (env[:method] == :delete)
+        query = if env[:url].query.nil?
+                  {}
+                else
+                  Faraday::Utils.parse_query(env[:url].query)
+                end
 
-      if env[:method] == :get or env[:method] == :delete
-        if env[:url].query.nil?
-          query = {}
-        else
-          query = Faraday::Utils.parse_query(env[:url].query)
-        end
-
-        if @access_token and not query["client_secret"]
-          env[:url].query = Faraday::Utils.build_query(query.merge(:access_token => @access_token))
-          env[:request_headers] = env[:request_headers].merge('Authorization' => "Token token=\"#{@access_token}\"")
+        if @access_token && !(query["client_secret"])
+          env[:url].query = Faraday::Utils.build_query(query.merge(access_token: @access_token))
+          env[:request_headers] = env[:request_headers].merge("Authorization" => "Token token=\"#{@access_token}\"")
         elsif @client_id
-          env[:url].query = Faraday::Utils.build_query(query.merge(:client_id => @client_id))
+          env[:url].query = Faraday::Utils.build_query(query.merge(client_id: @client_id))
         end
       else
-        if @access_token and not env[:body] && env[:body][:client_secret]
+        if @access_token && !(env[:body] && env[:body][:client_secret])
           env[:body] = {} if env[:body].nil?
-          env[:body] = env[:body].merge(:access_token => @access_token)
-          env[:request_headers] = env[:request_headers].merge('Authorization' => "Token token=\"#{@access_token}\"")
+          env[:body] = env[:body].merge(access_token: @access_token)
+          env[:request_headers] = env[:request_headers].merge("Authorization" => "Token token=\"#{@access_token}\"")
         elsif @client_id
-          env[:body] = env[:body].merge(:client_id => @client_id)
+          env[:body] = env[:body].merge(client_id: @client_id)
         end
       end
 
-
       @app.call env
     end
 
-    def initialize(app, client_id, access_token=nil)
+    def initialize(app, client_id, access_token = nil)
       @app = app
       @client_id = client_id
       @access_token = access_token

data/lib/faraday/raise_http_exception.rb

@@ -1,4 +1,4 @@
-require 'faraday'
+require "faraday"
 
 # @private
 module FaradayMiddleware
@@ -35,27 +35,27 @@ module FaradayMiddleware
     private
 
     def error_message_400(response)
-      "#{response[:method].to_s.upcase} #{response[:url].to_s}: #{response[:status]}#{error_body(response[:body])}"
+      "#{response[:method].to_s.upcase} #{response[:url]}: #{response[:status]}#{error_body(response[:body])}"
     end
 
     def error_body(body)
       # body gets passed as a string, not sure if it is passed as something else from other spots?
-      if not body.nil? and not body.empty? and body.kind_of?(String)
+      if !body.nil? && !body.empty? && body.is_a?(String)
         # removed multi_json thanks to wesnolte's commit
         body = ::JSON.parse(body)
       end
 
       if body.nil?
         nil
-      elsif body['meta'] and body['meta']['error_message'] and not body['meta']['error_message'].empty?
-        ": #{body['meta']['error_message']}"
-      elsif body['error_message'] and not body['error_message'].empty?
-        ": #{body['error_type']}: #{body['error_message']}"
+      elsif body["meta"] && body["meta"]["error_message"] && !body["meta"]["error_message"].empty?
+        ": #{body["meta"]["error_message"]}"
+      elsif body["error_message"] && !body["error_message"].empty?
+        ": #{body["error_type"]}: #{body["error_message"]}"
       end
     end
 
-    def error_message_500(response, body=nil)
-      "#{response[:method].to_s.upcase} #{response[:url].to_s}: #{[response[:status].to_s + ':', body].compact.join(' ')}"
+    def error_message_500(response, body = nil)
+      "#{response[:method].to_s.upcase} #{response[:url]}: #{[response[:status].to_s + ":", body].compact.join(" ")}"
     end
   end
 end

data/lib/instagram.rb

@@ -1,8 +1,8 @@
-require File.expand_path('../instagram/error', __FILE__)
-require File.expand_path('../instagram/configuration', __FILE__)
-require File.expand_path('../instagram/api', __FILE__)
-require File.expand_path('../instagram/client', __FILE__)
-require File.expand_path('../instagram/response', __FILE__)
+require File.expand_path("../instagram/error", __FILE__)
+require File.expand_path("../instagram/configuration", __FILE__)
+require File.expand_path("../instagram/api", __FILE__)
+require File.expand_path("../instagram/client", __FILE__)
+require File.expand_path("../instagram/response", __FILE__)
 
 module Instagram
   extend Configuration
@@ -10,7 +10,7 @@ module Instagram
   # Alias for Instagram::Client.new
   #
   # @return [Instagram::Client]
-  def self.client(options={})
+  def self.client(options = {})
     Instagram::Client.new(options)
   end
 
@@ -21,7 +21,7 @@ module Instagram
   end
 
   # Delegate to Instagram::Client
-  def self.respond_to?(method, include_all=false)
-    return client.respond_to?(method, include_all) || super
+  def self.respond_to?(method, include_all = false)
+    client.respond_to?(method, include_all) || super
   end
 end

data/lib/instagram/api.rb

@@ -1,6 +1,6 @@
-require File.expand_path('../connection', __FILE__)
-require File.expand_path('../request', __FILE__)
-require File.expand_path('../oauth', __FILE__)
+require File.expand_path("../connection", __FILE__)
+require File.expand_path("../request", __FILE__)
+require File.expand_path("../oauth", __FILE__)
 
 module Instagram
   # @private
@@ -9,7 +9,7 @@ module Instagram
     attr_accessor *Configuration::VALID_OPTIONS_KEYS
 
     # Creates a new API
-    def initialize(options={})
+    def initialize(options = {})
       options = Instagram.options.merge(options)
       Configuration::VALID_OPTIONS_KEYS.each do |key|
         send("#{key}=", options[key])

data/lib/instagram/client.rb

@@ -4,7 +4,7 @@ module Instagram
   # @note All methods have been separated into modules and follow the same grouping used in http://instagram.com/developer/
   # @see http://instagram.com/developer/
   class Client < API
-    Dir[File.expand_path('../client/*.rb', __FILE__)].each{|f| require f}
+    Dir[File.expand_path("../client/*.rb", __FILE__)].each { |f| require f }
 
     include Instagram::Client::Utils
 

data/lib/instagram/client/comments.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/comments/#get_media_comments
-      def media_comments(id, *args)
+      def media_comments(id, *_args)
         response = get("media/#{id}/comments")
         response
       end
@@ -34,8 +34,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/comments/#post_media_comments
-      def create_media_comment(id, text, options={})
-        response = post("media/#{id}/comments", options.merge(:text => text), signature=true)
+      def create_media_comment(id, text, options = {})
+        response = post("media/#{id}/comments", options.merge(text: text), signature = true)
         response
       end
 
@@ -53,8 +53,8 @@ module Instagram
       #   In order to remove a comment, you must be the owner of the comment, the media item, or both.
       # @rate_limited true
       # @see http://instagram.com/developer/endpoints/comments/#delete_media_comments
-      def delete_media_comment(media_id, comment_id, options={})
-        response = delete("media/#{media_id}/comments/#{comment_id}", options, signature=true)
+      def delete_media_comment(media_id, comment_id, options = {})
+        response = delete("media/#{media_id}/comments/#{comment_id}", options, signature = true)
         response
       end
     end

data/lib/instagram/client/embedding.rb

@@ -1,16 +1,16 @@
 module Instagram
   class Client
-  	# Defines methods related to embedding
+    # Defines methods related to embedding
     module Embedding
-    	# Returns information about the media associated with the given short link
+      # Returns information about the media associated with the given short link
       #
-	    # @overload oembed(url=nil, options={})
-	    # 	@param url [String] An instagram short link
-	    #   @param options [Hash] A customizable set of options
-	    #   @option options [Integer] :maxheight Maximum height of returned media
-	    #   @option options [Integer] :maxwidth Maximum width of returned media
-	    #   @option options [Integer] :callback A JSON callback to be invoked
-	    #   @return [Hashie::Mash] Information about the media associated with given short link
+      # @overload oembed(url=nil, options={})
+      # 	@param url [String] An instagram short link
+      #   @param options [Hash] A customizable set of options
+      #   @option options [Integer] :maxheight Maximum height of returned media
+      #   @option options [Integer] :maxwidth Maximum width of returned media
+      #   @option options [Integer] :callback A JSON callback to be invoked
+      #   @return [Hashie::Mash] Information about the media associated with given short link
       # 	@example Return information about the media associated with http://instagr.am/p/BUG/
       #   	Instagram.oembed(http://instagr.am/p/BUG/)
       #