omniauth-vkontakte 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d08c63e3838f47dc19a40aad62d502ad9543a7d7
-  data.tar.gz: 57863077c1ef09944a1fbcb0a27f3c5efc3ab002
+SHA256:
+  metadata.gz: 608b502a6f609351f4bb54f4e7381351f6db9b304431a9c7e714acf770401dac
+  data.tar.gz: b35e05c8261ea79dfe5b7a12ef6f0ed225cc46d9160419337ea5a6ee00df7f7d
 SHA512:
-  metadata.gz: 7af23fb04c89f9ffcdd8c32731612cc14d4a3f864473a8dc22d601be3a1b93f17725900ce073ff788ba7fd3f7e5541e659136c97c154a155edaee3f47365cc26
-  data.tar.gz: 45e3cc0c42fa72dfdd1c2cd93ec123a8b8528c3917dffaf7652c54ab27ece9b55cf7a746debb76443003b753cd3442d2179256a1d56ca1ad40e1d94f87996827
+  metadata.gz: ea8fff4512df0c7f30a4ecb4fb5d9794e85b5f9b2f646699e7061b06981ffb01927fee4d30f9d90b64f70337b3d5cdf98d150b1acbd65c5b90f6d2284fe40d9a
+  data.tar.gz: bfb1bfde6e8c824f36fb41757d7b302305e3e6424ae7354110d741b7f079d0b9deab9acdfafcc9f534652801394d847fa2c69c742f01ab6c26cdfde2d8a826d2

data/.rubocop.yml

@@ -0,0 +1,8 @@
+Metrics/LineLength:
+  Max: 120
+Metrics/MethodLength:
+  Enabled: false
+Metrics/BlockLength:
+  Enabled: false
+
+

data/.travis.yml

@@ -4,7 +4,8 @@ before_install:
   - gem update --system
   - gem --version
 rvm:
-  - 2.4.2
-  - 2.3.5
-  - 2.2.8
+  - 2.6.0
+  - 2.5.3
+  - 2.4.5
+  - 2.3.8
   - jruby-head

data/Gemfile

@@ -2,12 +2,16 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'rake'
 gem 'rack', RUBY_VERSION < '2.2.2' ? '~> 1.6' : '>= 2.0'
+gem 'rake'
+
+group :development do
+  gem 'rubocop', require: false
+end
 
 group :test do
-  gem 'rspec', '~> 3.2'
   gem 'rack-test'
+  gem 'rspec'
   gem 'simplecov'
   gem 'webmock'
 end

data/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2011-2019 Anton Maminov
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -1,8 +1,9 @@
 # OmniAuth VKontakte
 
-[![Build Status][travis_badge]][travis]
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/149c0614deef469faa49e1e8ae384bd3)](https://app.codacy.com/app/mamantoha/omniauth-vkontakte?utm_source=github.com&utm_medium=referral&utm_content=mamantoha/omniauth-vkontakte&utm_campaign=Badge_Grade_Dashboard)
+[![Build Status](https://travis-ci.org/mamantoha/omniauth-vkontakte.svg?branch=master)](https://travis-ci.org/mamantoha/omniauth-vkontakte)
 [![Gem Version][rubygems_badge]][rubygems]
-[![Code Climate][codeclimate_badge]][codeclimate]
+[![Maintainability](https://api.codeclimate.com/v1/badges/1ea61cb860f9f6aafb4f/maintainability)](https://codeclimate.com/github/mamantoha/omniauth-vkontakte/maintainability)
 
 This is the unofficial [OmniAuth](https://github.com/intridea/omniauth) strategy for authenticating to VKontakte via OAuth.
 To use it, you'll need to sign up for an OAuth2 Application ID and Secret
@@ -32,7 +33,6 @@ end
 
 [See the example Sinatra app](https://github.com/mamantoha/omniauth-vkontakte/blob/master/examples/main.rb).
 
-
 ## Configuring
 
 You can configure several options, which you pass in to the `provider` method via a `Hash`:
@@ -101,13 +101,12 @@ Here's an example *Auth Hash* available in `request.env['omniauth.auth']`:
 
 The precise information available may depend on the permissions which you request.
 
-
 ## Supported Rubies
 
 Tested with the following Ruby versions:
 
-- Ruby MRI (1.9.3+)
-- JRuby (1.9 mode)
+- Ruby MRI (2.3.0+)
+- JRuby
 
 ## Contributing to omniauth-vkontakte
 
@@ -115,20 +114,9 @@ Tested with the following Ruby versions:
 
 ## License
 
-Copyright (c) 2011-2017 Anton Maminov
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+Copyright: 2011-2019 Anton Maminov (anton.maminov@gmail.com)
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-[travis_badge]: http://img.shields.io/travis/mamantoha/omniauth-vkontakte.svg?style=flat
-[travis]: https://travis-ci.org/mamantoha/omniauth-vkontakte
+This library is distributed under the MIT license. Please see the LICENSE file.
 
 [rubygems_badge]: http://img.shields.io/gem/v/omniauth-vkontakte.svg?style=flat
 [rubygems]: http://rubygems.org/gems/omniauth-vkontakte
-
-[codeclimate_badge]: http://img.shields.io/codeclimate/github/mamantoha/omniauth-vkontakte.svg?style=flat
-[codeclimate]: https://codeclimate.com/github/mamantoha/omniauth-vkontakte
-

data/Rakefile

@@ -1,9 +1,9 @@
 #!/usr/bin/env rake
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
-desc "Run specs"
+desc 'Run specs'
 RSpec::Core::RakeTask.new
 
 desc 'Default: run specs.'
-task :default => :spec
+task default: :spec

data/examples/Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'sinatra'
+gem 'omniauth-vkontakte', path: '../'
 gem 'puma'
-gem 'omniauth-vkontakte', :path => '../'
+gem 'sinatra'

data/examples/main.rb

@@ -5,18 +5,16 @@ require 'omniauth-vkontakte'
 
 configure { set :server, :puma }
 
-SCOPE = 'friends,audio'
+SCOPE = 'friends,audio'.freeze
 
 use Rack::Session::Cookie
 
 use OmniAuth::Builder do
   provider :vkontakte, ENV['VKONTAKTE_KEY'], ENV['VKONTAKTE_SECRET'],
-    {
-      scope:      SCOPE,
-      display:    'popup',
-      lang:       'en',
-      image_size: 'original'
-    }
+           scope: SCOPE,
+           display: 'popup',
+           lang: 'en',
+           image_size: 'original'
 end
 
 get '/' do

data/lib/omniauth-vkontakte.rb

@@ -1,9 +1,11 @@
-require "omniauth-vkontakte/version"
-require "omniauth"
+require 'omniauth/vkontakte/version'
+require 'omniauth'
 
+# :nodoc:
 module OmniAuth
+  # :nodoc:
   module Strategies
-    autoload :Vkontakte,  'omniauth/strategies/vkontakte'
+    autoload :Vkontakte, 'omniauth/strategies/vkontakte'
   end
 end
 

data/lib/omniauth/strategies/vkontakte.rb

@@ -13,19 +13,18 @@ module OmniAuth
     class Vkontakte < OmniAuth::Strategies::OAuth2
       class NoRawData < StandardError; end
 
-      API_VERSION = '5.8'
+      API_VERSION = '5.8'.freeze
 
-      DEFAULT_SCOPE = ''
+      DEFAULT_SCOPE = ''.freeze
 
       option :name, 'vkontakte'
 
-      option :client_options, {
-        :site          => 'https://api.vk.com/',
-        :token_url     => 'https://oauth.vk.com/access_token',
-        :authorize_url => 'https://oauth.vk.com/authorize',
-      }
+      option :client_options,
+             site: 'https://api.vk.com/',
+             token_url: 'https://oauth.vk.com/access_token',
+             authorize_url: 'https://oauth.vk.com/authorize'
 
-      option :authorize_options, [:scope, :display]
+      option :authorize_options, %i[scope display]
 
       option :redirect_url, nil
 
@@ -34,16 +33,16 @@ module OmniAuth
       # https://github.com/intridea/omniauth/wiki/Auth-Hash-Schema
       info do
         {
-          :name       => "#{raw_info['first_name']} #{raw_info['last_name']}".strip,
-          :nickname   => raw_info['nickname'],
-          :email      => access_token.params["email"],
-          :first_name => raw_info['first_name'],
-          :last_name  => raw_info['last_name'],
-          :image      => image_url,
-          :location   => location,
-          :urls       => {
+          name: "#{raw_info['first_name']} #{raw_info['last_name']}".strip,
+          nickname: raw_info['nickname'],
+          email: access_token.params['email'],
+          first_name: raw_info['first_name'],
+          last_name: raw_info['last_name'],
+          image: image_url,
+          location: location,
+          urls: {
             'Vkontakte' => "http://vk.com/#{raw_info['screen_name']}"
-          },
+          }
         }
       end
 
@@ -58,20 +57,20 @@ module OmniAuth
         access_token.options[:param_name] = :access_token
         @raw_info ||= begin
           params = {
-            :fields   => info_options,
-            :lang     => lang_option,
-            :https    => https_option,
-            :v        => API_VERSION,
+            fields: info_options,
+            lang: lang_option,
+            https: https_option,
+            v: API_VERSION
           }
 
-          result = access_token.get('/method/users.get', :params => params).parsed["response"]
+          result = access_token.get('/method/users.get', params: params).parsed['response']
+
+          raise NoRawData, result unless result.is_a?(Array) && result.first
 
-          raise NoRawData, result unless (result.is_a?(Array) and result.first)
           result.first
         end
       end
 
-
       # You can pass +display+, +revoke+ or +scope+ params to the auth request,
       # if you need to set them dynamically.
       #
@@ -82,12 +81,12 @@ module OmniAuth
         super.tap do |params|
           # just a copypaste from ominauth-facebook
           %w[display state scope revoke].each do |v|
-            if request.params[v]
-              params[v.to_sym] = request.params[v]
+            next unless request.params[v]
+
+            params[v.to_sym] = request.params[v]
 
-              # to support omniauth-oauth2's auto csrf protection
-              session['omniauth.state'] = params[:state] if v == 'state'
-            end
+            # to support omniauth-oauth2's auto csrf protection
+            session['omniauth.state'] = params[:state] if v == 'state'
           end
 
           params[:scope] ||= DEFAULT_SCOPE
@@ -102,9 +101,12 @@ module OmniAuth
 
       def info_options
         # http://vk.com/dev/fields
-        fields = %w[nickname screen_name sex city country online bdate photo_50 photo_100 photo_200 photo_200_orig photo_400_orig]
+        fields = %w[
+          nickname screen_name sex city country online bdate
+          photo_50 photo_100 photo_200 photo_200_orig photo_400_orig
+        ]
         fields.concat(options[:info_fields].split(',')) if options[:info_fields]
-        return fields.join(',')
+        fields.join(',')
       end
 
       def lang_option

data/lib/{omniauth-vkontakte → omniauth/vkontakte}/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Vkontakte
-    VERSION = "1.4.1"
+    VERSION = '1.5.0'.freeze
   end
 end

data/omniauth-vkontakte.gemspec

@@ -1,18 +1,18 @@
-require File.expand_path('../lib/omniauth-vkontakte/version', __FILE__)
+require File.expand_path('lib/omniauth/vkontakte/version', __dir__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Anton Maminov"]
-  gem.email         = ["anton.linux@gmail.com"]
-  gem.description   = %q{Unofficial VKontakte strategy for OmniAuth 1.0}
-  gem.summary       = %q{Unofficial VKontakte strategy for OmniAuth 1.0}
-  gem.homepage      = "https://github.com/mamantoha/omniauth-vkontakte"
+  gem.authors       = ['Anton Maminov']
+  gem.email         = ['anton.linux@gmail.com']
+  gem.summary       = 'Vkontakte OAuth2 Strategy for OmniAuth'
+  gem.homepage      = 'https://github.com/mamantoha/omniauth-vkontakte'
+  gem.licenses      = ['MIT']
 
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.name          = "omniauth-vkontakte"
-  gem.require_paths = ["lib"]
+  gem.name          = 'omniauth-vkontakte'
+  gem.require_paths = ['lib']
   gem.version       = OmniAuth::Vkontakte::VERSION
 
-  gem.add_runtime_dependency 'omniauth-oauth2', '~> 1.2'
+  gem.add_runtime_dependency 'omniauth-oauth2', '~> 1.5'
 end

data/spec/omniauth/strategies/vkontakte_spec.rb

@@ -1,14 +1,16 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 describe OmniAuth::Strategies::Vkontakte do
-  let(:request) { double('Request', :params => {}, :cookies => {}, :env => {}) }
+  let(:request) { double('Request', params: {}, cookies: {}, env: {}) }
 
   before do
     OmniAuth.config.test_mode = true
   end
 
+  it 'should have version' do
+    expect(OmniAuth::Vkontakte::VERSION).to_not be_nil
+  end
+
   subject do
     args = ['api_key', 'api_secret', @options || {}].compact
     obj = OmniAuth::Strategies::Vkontakte.new(*args).tap do |strategy|
@@ -19,7 +21,7 @@ describe OmniAuth::Strategies::Vkontakte do
     @access_token = double('OAuth2::AccessToken')
     allow(obj).to receive(:access_token).and_return(@access_token)
     allow(@access_token).to receive(:get).and_return(double('OAuth2::Response'))
-    allow(@access_token).to receive(:params).and_return({ 'email' => raw_info_hash['email'] })
+    allow(@access_token).to receive(:params).and_return('email' => raw_info_hash['email'])
     obj
   end
 
@@ -78,40 +80,40 @@ describe OmniAuth::Strategies::Vkontakte do
   describe 'image_size option' do
     context 'when user has an image' do
       it 'should return image with size specified' do
-        @options = { :image_size => 'original' }
+        @options = { image_size: 'original' }
         allow(subject).to receive(:raw_info).and_return(
-            raw_info_hash.merge({ 'photo_200_orig' => img_url })
+          raw_info_hash.merge('photo_200_orig' => img_url)
         )
         expect(subject.info[:image]).to eq(img_url)
       end
 
       it 'should return image with size specified' do
-        @options = { :image_size => 'original_x2' }
+        @options = { image_size: 'original_x2' }
         allow(subject).to receive(:raw_info).and_return(
-            raw_info_hash.merge({ 'photo_400_orig' => img_url })
+          raw_info_hash.merge('photo_400_orig' => img_url)
         )
         expect(subject.info[:image]).to eq(img_url)
       end
 
       it 'should return bigger image when bigger size specified' do
-        @options = { :image_size => 'bigger' }
+        @options = { image_size: 'bigger' }
         allow(subject).to receive(:raw_info).and_return(
-            raw_info_hash.merge({ 'photo_100' => img_url })
+          raw_info_hash.merge('photo_100' => img_url)
         )
         expect(subject.info[:image]).to eq(img_url)
       end
 
       it 'should return mini image when mini size specified' do
-        @options = { :image_size => 'mini' }
+        @options = { image_size: 'mini' }
         allow(subject).to receive(:raw_info).and_return(
-            raw_info_hash.merge({ 'photo_50' => img_url })
+          raw_info_hash.merge('photo_50' => img_url)
         )
         expect(subject.info[:image]).to eq(img_url)
       end
 
       it 'should return normal image by default' do
         allow(subject).to receive(:raw_info).and_return(
-            raw_info_hash.merge({ 'photo_50' => img_url })
+          raw_info_hash.merge('photo_50' => img_url)
         )
         expect(subject.info[:image]).to eq(img_url)
       end
@@ -121,8 +123,8 @@ describe OmniAuth::Strategies::Vkontakte do
   describe 'skip_info option' do
     context 'when skip info option is enabled' do
       it 'should not include raw_info in extras hash' do
-        @options = { :skip_info => true }
-        allow(subject).to receive(:raw_info).and_return({:foo => 'bar'})
+        @options = { skip_info: true }
+        allow(subject).to receive(:raw_info).and_return(foo: 'bar')
         expect(subject.extra[:raw_info]).to eq(nil)
       end
     end
@@ -131,12 +133,12 @@ describe OmniAuth::Strategies::Vkontakte do
   describe 'request_phase' do
     context 'with no request params set and redirect_url specified' do
       before do
-        @options = { :redirect_url => 'http://www.example.com/auth/vkontakte/callback' }
+        @options = { redirect_url: 'http://www.example.com/auth/vkontakte/callback' }
         allow(subject).to receive(:env).and_return({})
         allow(subject).to receive(:request).and_return(
-          double('Request', {:params => {}, :scheme => 'https',
-                             :url => 'https://oauth.vk.com/authorize',
-                             :cookies => {}, :env => {}})
+          double('Request', params: {}, scheme: 'https',
+                            url: 'https://oauth.vk.com/authorize',
+                            cookies: {}, env: {})
         )
         allow(subject).to receive(:request_phase).and_return(:whatever)
       end

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
-$:.unshift File.expand_path('..', __FILE__)
-$:.unshift File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path(__dir__)
+$LOAD_PATH.unshift File.expand_path('../lib', __dir__)
 require 'simplecov'
 SimpleCov.start
 require 'rspec'
@@ -11,7 +11,7 @@ require 'omniauth-vkontakte'
 RSpec.configure do |config|
   config.include WebMock::API
   config.include Rack::Test::Methods
-  config.extend  OmniAuth::Test::StrategyMacros, :type => :strategy
+  config.extend  OmniAuth::Test::StrategyMacros, type: :strategy
   config.expect_with :rspec do |c|
     c.syntax = :expect
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-vkontakte
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Anton Maminov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-18 00:00:00.000000000 Z
+date: 2019-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
@@ -16,15 +16,15 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
-description: Unofficial VKontakte strategy for OmniAuth 1.0
+        version: '1.5'
+description: 
 email:
 - anton.linux@gmail.com
 executables: []
@@ -33,8 +33,10 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - examples/.env.example
@@ -43,13 +45,14 @@ files:
 - examples/config.ru
 - examples/main.rb
 - lib/omniauth-vkontakte.rb
-- lib/omniauth-vkontakte/version.rb
 - lib/omniauth/strategies/vkontakte.rb
+- lib/omniauth/vkontakte/version.rb
 - omniauth-vkontakte.gemspec
 - spec/omniauth/strategies/vkontakte_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/mamantoha/omniauth-vkontakte
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -66,11 +69,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
-summary: Unofficial VKontakte strategy for OmniAuth 1.0
-test_files:
-- spec/omniauth/strategies/vkontakte_spec.rb
-- spec/spec_helper.rb
+summary: Vkontakte OAuth2 Strategy for OmniAuth
+test_files: []