omniauth-vkontakte 1.5.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97a799d1a663fd5b32fbb1b5ed00385314955ff3d8af788d37b8949c99402b95
-  data.tar.gz: dc69884b28a8fce16bb73ec4d06bdf9c63314fba54386ce22d503ce13b097003
+  metadata.gz: c31336de0c0d1630c1b24a9970d46503353a3d31a81be62dc9b0e5d3b910d9e8
+  data.tar.gz: 4d0e103aef7cd9593cf8e37e69c54c35a64a94a0b3f6c999d39d11d5a11cfcfa
 SHA512:
-  metadata.gz: 619795bc0590021e0fde0044ed06bd8500740f133f68180c53525859863f505cf035e130e958723eb07ed838cc4b1132fdd875e6b97296d28d847a3bea2b9628
-  data.tar.gz: e7eab5866e9bf03eb1b071a65b603d6adfcb1e421401712ef02b5537618721446d9380ffa45c527ee332bc9241c8e2faa360880a5e3cfe70a983987e04e3b130
+  metadata.gz: 375f8caec707839dabce173adb21c63c7d9fee36852bf9e6412f1b463d1c0e520bc10810f9f0384799992abe8ffce007399001b22328a98cf8e1fb3ee211aa9f
+  data.tar.gz: 0daa0d710c5a061bdf7019aa6224e0cf718f9473e8f1f2397bfa068efd9208dd296ab726242b4722f2d1d11168c3a0a85096a50fea098807c284e745c983ced2

data/.github/workflows/ruby.yml

@@ -0,0 +1,22 @@
+name: Ruby
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    name: build (${{ matrix.ruby }} / ${{ matrix.os }})
+    strategy:
+      matrix:
+        ruby: [2.5, 2.6, 2.7, 3.0, head, jruby, jruby-head]
+        os: [ubuntu-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@master
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: Install dependencies
+      run: bundle install
+    - name: Run test
+      run: rspec

data/.rubocop.yml

@@ -1,8 +1,16 @@
-Metrics/LineLength:
+AllCops:
+  NewCops: enable
+  TargetRubyVersion: 2.5
+Layout/LineLength:
   Max: 120
 Metrics/MethodLength:
   Enabled: false
 Metrics/BlockLength:
   Enabled: false
-
-
+Metrics/ClassLength:
+  Max: 101
+Lint/DuplicateBranch:
+  Enabled: false
+Naming/FileName:
+  Exclude:
+    - 'lib/omniauth-vkontakte.rb'

data/Gemfile

@@ -1,16 +1,14 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec
 
-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 'rack-test'
   gem 'rspec'
   gem 'simplecov'
   gem 'webmock'

data/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2011-2019 Anton Maminov
+Copyright (c) 2011-2021 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

data/README.md

@@ -1,7 +1,7 @@
 # OmniAuth VKontakte
 
+![Ruby](https://github.com/mamantoha/omniauth-vkontakte/workflows/Ruby/badge.svg)
 [![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]
 [![Maintainability](https://api.codeclimate.com/v1/badges/1ea61cb860f9f6aafb4f/maintainability)](https://codeclimate.com/github/mamantoha/omniauth-vkontakte/maintainability)
 
@@ -27,7 +27,7 @@ Here's a quick example, adding the middleware to a Rails app in `config/initiali
 
 ```ruby
 Rails.application.config.middleware.use OmniAuth::Builder do
-  provider :vkontakte, ENV['API_KEY'], ENV['API_SECRET']
+  provider :vkontakte, ENV['VK_API_ID'], ENV['VK_API_SECRET']
 end
 ```
 
@@ -50,14 +50,12 @@ Here's an example of a possible configuration:
 
 ```ruby
 use OmniAuth::Builder do
-  provider :vkontakte, ENV['API_KEY'], ENV['API_SECRET'],
-    {
-      :scope => 'friends,audio,photos',
-      :display => 'popup',
-      :lang => 'en',
-      :https => 1,
-      :image_size => 'original'
-    }
+  provider :vkontakte, ENV['VKONTAKTE_KEY'], ENV['VKONTAKTE_SECRET'],
+           scope: 'friends,audio,photos',
+           display: 'popup',
+           lang: 'en',
+           https: 1,
+           image_size: 'original'
 end
 ```
 
@@ -105,8 +103,8 @@ The precise information available may depend on the permissions which you reques
 
 Tested with the following Ruby versions:
 
-- Ruby MRI (2.3.0+)
-- JRuby
+- Ruby MRI (2.5.0+)
+- JRuby (9.2.0+)
 
 ## Contributing to omniauth-vkontakte
 
@@ -114,7 +112,7 @@ Tested with the following Ruby versions:
 
 ## License
 
-Copyright: 2011-2019 Anton Maminov (anton.maminov@gmail.com)
+Copyright: 2011-2021 Anton Maminov (anton.maminov@gmail.com)
 
 This library is distributed under the MIT license. Please see the LICENSE file.
 

data/examples/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gem 'omniauth-vkontakte', path: '../'

data/examples/config.ru

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/setup'
 require_relative 'main'
 

data/examples/main.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pp'
 require 'sinatra'
 require 'omniauth'
@@ -5,7 +7,7 @@ require 'omniauth-vkontakte'
 
 configure { set :server, :puma }
 
-SCOPE = 'friends,audio'.freeze
+SCOPE = 'friends,audio'
 
 use Rack::Session::Cookie
 

data/lib/omniauth-vkontakte.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'omniauth/vkontakte/version'
 require 'omniauth'
 

data/lib/omniauth/strategies/vkontakte.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'omniauth/strategies/oauth2'
 
 module OmniAuth
@@ -13,9 +15,9 @@ module OmniAuth
     class Vkontakte < OmniAuth::Strategies::OAuth2
       class NoRawData < StandardError; end
 
-      API_VERSION = '5.8'.freeze
+      API_VERSION = '5.107'
 
-      DEFAULT_SCOPE = ''.freeze
+      DEFAULT_SCOPE = ''
 
       option :name, 'vkontakte'
 
@@ -56,13 +58,6 @@ module OmniAuth
         access_token.options[:mode] = :query
         access_token.options[:param_name] = :access_token
         @raw_info ||= begin
-          params = {
-            fields: info_options,
-            lang: lang_option,
-            https: https_option,
-            v: API_VERSION
-          }
-
           result = access_token.get('/method/users.get', params: params).parsed['response']
 
           raise NoRawData, result unless result.is_a?(Array) && result.first
@@ -95,6 +90,15 @@ module OmniAuth
 
       private
 
+      def params
+        {
+          fields: info_options,
+          lang: lang_option,
+          https: https_option,
+          v: API_VERSION
+        }
+      end
+
       def callback_url
         options.redirect_url || (full_host + script_name + callback_path)
       end

data/lib/omniauth/vkontakte/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module OmniAuth
   module Vkontakte
-    VERSION = '1.5.1'.freeze
+    VERSION = '1.7.0'
   end
 end

data/omniauth-vkontakte.gemspec

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 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.email         = ['anton.maminov@gmail.com']
   gem.summary       = 'Vkontakte OAuth2 Strategy for OmniAuth'
   gem.homepage      = 'https://github.com/mamantoha/omniauth-vkontakte'
   gem.licenses      = ['MIT']
@@ -13,6 +15,6 @@ Gem::Specification.new do |gem|
   gem.name          = 'omniauth-vkontakte'
   gem.require_paths = ['lib']
   gem.version       = OmniAuth::Vkontakte::VERSION
-
-  gem.add_runtime_dependency 'omniauth-oauth2', ['>= 1.5', '<= 1.6']
+  gem.required_ruby_version = '>= 2.5.0'
+  gem.add_runtime_dependency 'omniauth-oauth2', ['>= 1.5', '<= 1.7.1']
 end

data/spec/omniauth/strategies/vkontakte_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe OmniAuth::Strategies::Vkontakte do

data/spec/spec_helper.rb

@@ -1,16 +1,16 @@
+# frozen_string_literal: true
+
 $LOAD_PATH.unshift File.expand_path(__dir__)
 $LOAD_PATH.unshift File.expand_path('../lib', __dir__)
 require 'simplecov'
 SimpleCov.start
 require 'rspec'
-require 'rack/test'
 require 'webmock/rspec'
 require 'omniauth'
 require 'omniauth-vkontakte'
 
 RSpec.configure do |config|
   config.include WebMock::API
-  config.include Rack::Test::Methods
   config.extend  OmniAuth::Test::StrategyMacros, type: :strategy
   config.expect_with :rspec do |c|
     c.syntax = :expect

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-vkontakte
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Anton Maminov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-13 00:00:00.000000000 Z
+date: 2021-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
@@ -19,7 +19,7 @@ dependencies:
         version: '1.5'
     - - "<="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,22 +29,21 @@ dependencies:
         version: '1.5'
     - - "<="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.7.1
 description: 
 email:
-- anton.linux@gmail.com
+- anton.maminov@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
-- Rakefile
 - examples/.env.example
 - examples/Gemfile
 - examples/README.md
@@ -68,14 +67,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Vkontakte OAuth2 Strategy for OmniAuth

data/.travis.yml

@@ -1,11 +0,0 @@
-before_install:
-  - gem update bundler
-  - bundle --version
-  - gem update --system
-  - gem --version
-rvm:
-  - 2.6.0
-  - 2.5.3
-  - 2.4.5
-  - 2.3.8
-  - jruby-head

data/Rakefile

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