omniauth-instagram-graph 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4011d4a572fe34b44b58ba89b23562a979ce122695e6c6eccd82c3d0417fb46
-  data.tar.gz: 4ca610d7d5888a79e766e334a3aa7a2dc49d13b6606a4e5b68cc1aa22d7fc318
+  metadata.gz: 280cc32134e9fc71e2832265447a2c7c1f9166ef238d111ae04d5a5e81a55c4c
+  data.tar.gz: 2d97ce2c8b383680fc29b3d91b08d98bb40cf13d5229ac855ddaa6b91cfc2da6
 SHA512:
-  metadata.gz: 89e02390e96974525d79f5804bd6b9c035ca4988d360e8bfb04f773fbb70108cc96c5e23b85dfd8a64c862b5d22ac6a5d8109ee058dc1715108276b37f44e2f4
-  data.tar.gz: 4f015b1ef8e9f78a3d5aba5f21feca4ab7233bc1c67e4d5c37a49143aebcd8a5b72ca5e72becfe499cfd735fb94ea6b8f59dedd77d792df06642ebae05e4901d
+  metadata.gz: 6e88a62277b168bdc500f6f0b8a98340eb28165b936cdf5206a4fb37973d0b27c842828c8128215b28f8bac9ffee386c6b1177121b167145d41452fecd39d5d1
+  data.tar.gz: 0b776b9e14f27e9b32687e3b1d6698c752c1c6427c56a0fe776e65006c5bd1466a7635e84d56c7a7eb7250ae6b41f950711db2e49a14e2212e43d9204c15b8a8

data/.rubocop.yml

@@ -0,0 +1,2 @@
+inherit_gem:
+  jetrockets-standard: config/gems.yml

data/Gemfile

@@ -1,7 +1,9 @@
-source "https://rubygems.org"
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in omniauth-instagram-graph.gemspec
 gemspec
 
-gem "rake", "~> 12.0"
-gem "rspec", "~> 3.0"
+gem 'rake', '~> 12.0'
+gem 'rspec', '~> 3.0'

data/Gemfile.lock

@@ -8,10 +8,16 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    ast (2.4.0)
     diff-lcs (1.3)
     faraday (1.0.0)
       multipart-post (>= 1.2, < 3)
-    hashie (3.6.0)
+    hashie (4.1.0)
+    jaro_winkler (1.5.4)
+    jetrockets-standard (1.0.5)
+      rubocop-rails (~> 2.3.2)
+      rubocop-rspec (~> 1.35.0)
+      standard (~> 0.1.9)
     jwt (2.2.1)
     minitest (5.14.0)
     mocha (1.11.2)
@@ -24,13 +30,17 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    omniauth (1.9.0)
-      hashie (>= 3.4.6, < 3.7.0)
+    omniauth (1.9.1)
+      hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
     omniauth-oauth2 (1.6.0)
       oauth2 (~> 1.1)
       omniauth (~> 1.9)
+    parallel (1.19.1)
+    parser (2.7.0.4)
+      ast (~> 2.4.0)
     rack (2.2.2)
+    rainbow (3.0.0)
     rake (12.3.3)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
@@ -45,11 +55,31 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.2)
+    rubocop (0.79.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    rubocop-performance (1.5.2)
+      rubocop (>= 0.71.0)
+    rubocop-rails (2.3.2)
+      rack (>= 1.1)
+      rubocop (>= 0.72.0)
+    rubocop-rspec (1.35.0)
+      rubocop (>= 0.60.0)
+    ruby-progressbar (1.10.1)
+    standard (0.1.10)
+      rubocop (~> 0.79.0)
+      rubocop-performance (~> 1.5.1)
+    unicode-display_width (1.6.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  jetrockets-standard
   minitest
   mocha
   omniauth-instagram-graph!
@@ -57,4 +87,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   2.1.0
+   2.1.2

data/README.md

@@ -74,7 +74,7 @@ Long-Lived Tokens are valid for 60 days. To be able to use token after, you need
 
 
 ``` ruby
-client = Omniauth::InstagramGraph::LongLivedClient.new(ENV['INSTAGRAM_APP_ID'], ENV['INSTAGRAM_APP_SECRET'])
+client = OmniAuth::InstagramGraph::LongLivedClient.new(ENV['INSTAGRAM_APP_ID'], ENV['INSTAGRAM_APP_SECRET'])
 token = client.get_token(access_token: "<CURRENT LONG-LIVED TOKEN>")
 refreshed = token.refresh
 ```
@@ -85,4 +85,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the Omniauth::Instagram::Graph project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/omniauth-instagram-graph/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the OmniAuth::Instagram::Graph project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/omniauth-instagram-graph/blob/master/CODE_OF_CONDUCT.md).

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 
@@ -6,4 +8,4 @@ Rake::TestTask.new do |task|
   task.test_files = FileList['test/*_test.rb']
 end
 
-task default: :test
+task default: :test

data/_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-cayman

data/bin/console

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require "bundler/setup"
-require "omniauth/instagram/graph"
+require 'bundler/setup'
+require 'omniauth/instagram/graph'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +11,5 @@ require "omniauth/instagram/graph"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/lib/omniauth-instagram-graph.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'omniauth/instagram-graph'

data/lib/omniauth/instagram-graph.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require 'omniauth/instagram-graph/version'
-require 'omniauth/strategies/instagram-graph'
+require 'omniauth/strategies/instagram-graph'

data/lib/omniauth/instagram-graph/long_lived_client.rb

@@ -1,23 +1,25 @@
-module Omniauth
+# frozen_string_literal: true
+
+module OmniAuth
   module InstagramGraph
-  	class LongLivedClient < OAuth2::Client
-  		TOKEN_URL = '/access_token'
+    class LongLivedClient < OAuth2::Client
+      TOKEN_URL = '/access_token'
 
-  		def initialize(client_id, client_secret, options = {})
-  			options = {
-  				site: "https://graph.instagram.com",
-				  authorize_url: nil,
-				  token_url: TOKEN_URL,
-				  token_method: :get
-  			}.merge!(options)
+      def initialize(client_id, client_secret, options = {})
+        options = {
+          site: 'https://graph.instagram.com',
+          authorize_url: nil,
+          token_url: TOKEN_URL,
+          token_method: :get,
+        }.merge!(options)
 
-  			super(client_id, client_secret, options)
-  		end
+        super(client_id, client_secret, options)
+      end
 
-  		def get_token(params = {})
-  			params = { grant_type: 'ig_exchange_token', client_secret: secret }.merge!(params)
-  			super(params, {}, LongLivedToken)
-  		end
-  	end
+      def get_token(params = {})
+        params = {grant_type: 'ig_exchange_token', client_secret: secret}.merge!(params)
+        super(params, {}, LongLivedToken)
+      end
+    end
   end
 end

data/lib/omniauth/instagram-graph/long_lived_token.rb

@@ -1,20 +1,21 @@
-module Omniauth
-  module InstagramGraph
-  	class LongLivedToken < OAuth2::AccessToken
-  		TOKEN_REFRESH_PATH = '/refresh_access_token'
+# frozen_string_literal: true
 
+module OmniAuth
+  module InstagramGraph
+    class LongLivedToken < OAuth2::AccessToken
+      TOKEN_REFRESH_PATH = '/refresh_access_token'
 
-	    def refresh(params = {})
-	    	options = {
-	    		token_url: TOKEN_REFRESH_PATH
-	    	}
-	    	refresh_client = Omniauth::InstagramGraph::LongLivedClient.new(client.id, client.secret, options)
+      def refresh!(params = {})
+        options = {
+          token_url: TOKEN_REFRESH_PATH,
+        }
+        refresh_client = OmniAuth::InstagramGraph::LongLivedClient.new(client.id, client.secret, options)
 
-	      params[:grant_type] = 'ig_refresh_token'
-	      params[:access_token] = token
+        params[:grant_type] = 'ig_refresh_token'
+        params[:access_token] = token
 
-	      refresh_client.get_token(params)
-	    end
-  	end
+        refresh_client.get_token(params)
+      end
+    end
   end
-end
+end

data/lib/omniauth/instagram-graph/version.rb

@@ -1,5 +1,7 @@
-module Omniauth
+# frozen_string_literal: true
+
+module OmniAuth
   module InstagramGraph
-    VERSION = "1.0.0"
+    VERSION = '1.0.1'
   end
 end

data/lib/omniauth/strategies/instagram-graph.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'omniauth/strategies/oauth2'
 require 'omniauth/instagram-graph/long_lived_token'
 require 'omniauth/instagram-graph/long_lived_client'
@@ -17,8 +19,8 @@ module OmniAuth
 
       option :client_options, {
         site: 'https://api.instagram.com',
-        authorize_url: "https://api.instagram.com/oauth/authorize",
-        token_url: 'oauth/access_token'
+        authorize_url: 'https://api.instagram.com/oauth/authorize',
+        token_url: 'oauth/access_token',
       }
 
       option :exchange_access_token_to_long_lived, true
@@ -46,9 +48,9 @@ module OmniAuth
 
       def info_options
         params = {}
-        params.merge!({fields: (options[:info_fields] || 'account_type,id,media_count,username')})
+        params[:fields] = (options[:info_fields] || 'account_type,id,media_count,username')
 
-        { params: params }
+        {params: params}
       end
 
       def callback_url
@@ -69,34 +71,22 @@ module OmniAuth
         end
       end
 
-      def callback_phase # rubocop:disable AbcSize, CyclomaticComplexity, MethodLength, PerceivedComplexity
-        error = request.params["error_reason"] || request.params["error"]
-        if error
-          fail!(error, CallbackError.new(request.params["error"], request.params["error_description"] || request.params["error_reason"], request.params["error_uri"]))
-        elsif !options.provider_ignores_state && (request.params["state"].to_s.empty? || request.params["state"] != session.delete("omniauth.state"))
-          fail!(:csrf_detected, CallbackError.new(:csrf_detected, "CSRF detected"))
-        else
-          self.access_token = build_access_token
-
-          if options.exchange_access_token_to_long_lived
-            self.access_token = long_lived_client.get_token(access_token: access_token.token)
-          end
+      protected
+
+      def build_access_token
+        access_token = super
 
-          super
+        if options.exchange_access_token_to_long_lived
+          access_token = long_lived_client.get_token(access_token: access_token.token)
         end
-      rescue ::OAuth2::Error, CallbackError => e
-        fail!(:invalid_credentials, e)
-      rescue ::Timeout::Error, ::Errno::ETIMEDOUT => e
-        fail!(:timeout, e)
-      rescue ::SocketError => e
-        fail!(:failed_to_connect, e)
-      end
 
+        access_token
+      end
 
       private
 
       def long_lived_client
-        Omniauth::InstagramGraph::LongLivedClient.new(client.id, client.secret)
+        OmniAuth::InstagramGraph::LongLivedClient.new(client.id, client.secret)
       end
 
       def prune!(hash)
@@ -107,4 +97,4 @@ module OmniAuth
       end
     end
   end
-end
+end

data/omniauth-instagram-graph.gemspec

@@ -1,22 +1,24 @@
+# frozen_string_literal: true
+
 require_relative 'lib/omniauth/instagram-graph/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "omniauth-instagram-graph"
-  spec.version       = Omniauth::InstagramGraph::VERSION
-  spec.authors       = ["Igor Alexandrov"]
-  spec.email         = ["igor.alexandrov@gmail.com"]
-
-  spec.summary       = "instagram Graph OAuth2 Strategy for OmniAuth"
-  spec.homepage      = "http://github.com/jetrockets/omniauth-instagram-graph"
-  spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "http://github.com/jetrockets/omniauth-instagram-graph"
-
-  spec.files         = `git ls-files`.split("\n")
-  spec.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  spec.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  spec.name = 'omniauth-instagram-graph'
+  spec.version = OmniAuth::InstagramGraph::VERSION
+  spec.authors = ['Igor Alexandrov']
+  spec.email = ['igor.alexandrov@gmail.com']
+
+  spec.summary = 'instagram Graph OAuth2 Strategy for OmniAuth'
+  spec.homepage = 'http://github.com/jetrockets/omniauth-instagram-graph'
+  spec.license = 'MIT'
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.3.0')
+
+  spec.metadata['homepage_uri'] = spec.homepage
+  spec.metadata['source_code_uri'] = 'http://github.com/jetrockets/omniauth-instagram-graph'
+
+  spec.files = `git ls-files`.split("\n")
+  spec.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  spec.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'omniauth', '~> 1.9'
@@ -25,4 +27,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest'
   spec.add_development_dependency 'mocha'
   spec.add_development_dependency 'rake'
+
+  spec.add_development_dependency 'jetrockets-standard'
 end

data/test/helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'minitest/autorun'
@@ -8,7 +9,7 @@ OmniAuth.config.test_mode = true
 
 module BlockTestHelper
   def test(name, &blk)
-    method_name = "test_#{name.gsub(/\s+/, '_')}"
+    method_name = "test_#{name.gsub(/\s+/, "_")}"
     raise "Method already defined: #{method_name}" if instance_methods.include?(method_name.to_sym)
     define_method method_name, &blk
   end
@@ -17,12 +18,12 @@ end
 module CustomAssertions
   def assert_has_key(key, hash, msg = nil)
     msg = message(msg) { "Expected #{hash.inspect} to have key #{key.inspect}" }
-    assert hash.has_key?(key), msg
+    assert hash.key?(key), msg
   end
 
   def refute_has_key(key, hash, msg = nil)
     msg = message(msg) { "Expected #{hash.inspect} not to have key #{key.inspect}" }
-    refute hash.has_key?(key), msg
+    refute hash.key?(key), msg
   end
 end
 
@@ -53,4 +54,4 @@ class StrategyTestCase < TestCase
       end
     end
   end
-end
+end

data/test/strategy_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'helper'
 require 'omniauth-instagram-graph'
 require 'openssl'
@@ -20,4 +22,4 @@ class ClientTest < StrategyTestCase
     assert_equal 'oauth/access_token', strategy.client.options[:token_url]
     assert_equal 'https://api.instagram.com/oauth/access_token', strategy.client.token_url
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-instagram-graph
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Igor Alexandrov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-21 00:00:00.000000000 Z
+date: 2020-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: jetrockets-standard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - igor.alexandrov@gmail.com
@@ -90,6 +104,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -97,6 +112,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- _config.yml
 - bin/console
 - bin/setup
 - lib/omniauth-instagram-graph.rb
@@ -129,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: instagram Graph OAuth2 Strategy for OmniAuth