vkontakte_client 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b2ce4c1ffcbc6e0b93a3db237a10af3a7c3258632b5389be761e1464542bb62
-  data.tar.gz: 4de7110a34a4584f15382f42011705f656b556bbff7b2d479da537d80b617031
+  metadata.gz: 365e64b86f80c85db718b455f7c211cfe2638a13246a129053017eca0493602a
+  data.tar.gz: eba8db9f623c92d138f9c06fab19d80e3383900638853fda2f9062ca34fc52f5
 SHA512:
-  metadata.gz: 2d9209f70432c4b4f635f38850c70c11b1c302b0a573935e7bb09ea602faedcc63f9e5da7b82730239395ed5e9d80db44dd7f2e61d9ef05f049158083e1ffc0e
-  data.tar.gz: b1cf4cf5806276b724a36cff6161e050a4c4c1fd7c12f809ff1ebbf3fd04893d21bdd02d70e5d9c758450be4247f5ceadeacf5719c460c248e152604c6a3eb41
+  metadata.gz: 2ede0fd21608c56d6cb994537274541138eb1e3006da0476baa7ed106b76fe3ea8195b1d5eb67fa6d63816aef92055e8ad51f8c74f5fefbfff44e0e8440f530a
+  data.tar.gz: bab79e14426ea0634ee6644533c239344dfd43b1eac3eb95b34ed7b6d633a9794a67354c77757d4b1f62cf8f3c1d37aa2d201c3c87def558e43522f441e98ae4

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.2
   NewCops: enable
 
 Metrics/AbcSize:

data/Gemfile

@@ -3,3 +3,7 @@
 source 'https://rubygems.org'
 
 gemspec
+
+group :development do
+  gem 'rubocop', '~> 1.57', '>= 1.57.0'
+end

data/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2010-2022 Anton Maminov
+Copyright (c) 2010-2023 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

@@ -97,6 +97,6 @@ api.friends_get(fields: 'online', order: 'name', name_case: 'dat')
 
 ## License
 
-Copyright: 2010-2022 Anton Maminov (anton.maminov@gmail.com)
+Copyright: 2010-2023 Anton Maminov (anton.maminov@gmail.com)
 
 This library is distributed under the MIT license. Please see the LICENSE file.

data/examples/accept_all_requests.rb

@@ -26,10 +26,10 @@ if $PROGRAM_NAME == __FILE__
     user_ids.each do |user_id|
       print "Accept user with id `#{user_id}`"
       begin
-        vk_api.friends_add(user_id: user_id)
+        vk_api.friends_add(user_id:)
         puts ' - OK'
       rescue Vkontakte::API::Error => e
-        vk_api.account_banUser(user_id: user_id) if e.error_code == 177
+        vk_api.account_banUser(user_id:) if e.error_code == 177
         puts ' - Skip'
       end
     end

data/examples/friends_of_friends.rb

@@ -3,9 +3,7 @@
 require 'bundler'
 Bundler.setup :default
 
-require 'pp'
 require 'vkontakte_client'
-require 'pry'
 
 puts Vkontakte::VERSION
 

data/examples/long_poll.rb

@@ -10,7 +10,6 @@ Bundler.setup :default
 
 require 'vkontakte_client'
 
-require 'pp'
 require 'date'
 require 'net/http'
 require 'uri'

data/examples/remove_out_requests.rb

@@ -21,7 +21,7 @@ if $PROGRAM_NAME == __FILE__
   offset = 0
 
   loop do
-    fr = vk.api.friends_getRequests(count: count, offset: offset * count, out: 1)['items']
+    fr = vk.api.friends_getRequests(count:, offset: offset * count, out: 1)['items']
     break if fr.empty?
 
     out_requests << fr

data/lib/vkontakte/api.rb

@@ -61,14 +61,14 @@ module Vkontakte
             uri.port,
             @proxy.addr,
             @proxy.port,
-            use_ssl: use_ssl,
+            use_ssl:,
             read_timeout: timeout,
             open_timeout: timeout
           ) do |http|
             http.request(request)
           end
         elsif @proxy.socks?
-          Net::HTTP.SOCKSProxy(@proxy.addr, @proxy.port).start(uri.hostname, uri.port, use_ssl: use_ssl) do |http|
+          Net::HTTP.SOCKSProxy(@proxy.addr, @proxy.port).start(uri.hostname, uri.port, use_ssl:) do |http|
             http.request(request)
           end
         end
@@ -76,7 +76,7 @@ module Vkontakte
         Net::HTTP.start(
           uri.hostname,
           uri.port,
-          use_ssl: use_ssl,
+          use_ssl:,
           read_timeout: timeout,
           open_timeout: timeout
         ) do |http|

data/lib/vkontakte/client.rb

@@ -35,22 +35,13 @@ module Vkontakte
 
       query = {
         client_id: @client_id,
-        redirect_uri: redirect_uri,
-        display: display,
+        redirect_uri:,
+        display:,
         scope: permissions,
-        response_type: response_type,
+        response_type:,
         v: api_version
       }
 
-      agent = Mechanize.new do |a|
-        a.user_agent_alias = 'Linux Firefox'
-        a.follow_meta_refresh
-        a.log = Logger.new($stdout) if @log
-
-        a.agent.set_socks(@proxy.addr, @proxy.port) if @proxy&.socks?
-        a.agent.set_proxy(@proxy.addr, @proxy.port) if @proxy&.http?
-      end
-
       # Opening Authorization Dialog
       #
       query_string = query.map { |k, v| "#{k}=#{v}" }.join('&')
@@ -76,17 +67,19 @@ module Vkontakte
 
     private
 
-    def get_token(page)
-      auth_regexp = /access_token=(?<access_token>.*)&expires_in=(?<expires_in>\d+)&user_id=(?<user_id>\d*)\z/
-
-      return false unless page.uri.path == '/auth_redirect'
-
-      query_params = URI.decode_www_form(page.uri.query).to_h
-      authorize_url = CGI.unescape(query_params['authorize_url'])
+    def agent
+      @agent ||= Mechanize.new do |a|
+        a.user_agent = 'Opera/9.80 (Android; Opera Mini/7.5.33942/191.308; U; en) Presto/2.12.423 Version/12.16'
+        a.follow_meta_refresh
+        a.log = Logger.new($stdout) if @log
 
-      auth_params = authorize_url.match(auth_regexp)
+        a.agent.set_socks(@proxy.addr, @proxy.port) if @proxy&.socks?
+        a.agent.set_proxy(@proxy.addr, @proxy.port) if @proxy&.http?
+      end
+    end
 
-      return false unless auth_params
+    def initialize_vkontakte_api(auth_params)
+      return @api if authorized?
 
       @access_token = auth_params[:access_token]
       @user_id      = auth_params[:user_id]
@@ -98,6 +91,21 @@ module Vkontakte
         api_version: @api_version,
         timeout: @timeout
       )
+    end
+
+    def get_token(page)
+      auth_regexp = /access_token=(?<access_token>.*)&expires_in=(?<expires_in>\d+)&user_id=(?<user_id>\d*)\z/
+
+      return false unless page.uri.path == '/auth_redirect'
+
+      query_params = URI.decode_www_form(page.uri.query).to_h
+      authorize_url = CGI.unescape(query_params['authorize_url'])
+
+      auth_params = authorize_url.match(auth_regexp)
+
+      return false unless auth_params
+
+      initialize_vkontakte_api(auth_params)
 
       @authorize = true
 

data/lib/vkontakte/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Vkontakte
-  VERSION = '2.1.0'
+  VERSION = '2.2.0'
 end

data/vkontakte_client.gemspec

@@ -13,14 +13,11 @@ Gem::Specification.new do |gem|
 
   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          = 'vkontakte_client'
   gem.require_paths = ['lib']
   gem.version       = Vkontakte::VERSION
-  gem.required_ruby_version = '>= 2.7.0'
+  gem.required_ruby_version = '>= 3.2.0'
   gem.add_runtime_dependency 'mechanize', '~> 2.8', '>= 2.8.0'
   gem.add_runtime_dependency 'socksify', '~> 1.7', '>= 1.7.0'
-  gem.add_development_dependency 'pry', '~> 0.14', '>= 0.14.0'
-  gem.add_development_dependency 'rubocop', '~> 1.18', '>= 1.18.0'
   gem.metadata['rubygems_mfa_required'] = 'true'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vkontakte_client
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Anton Maminov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-10 00:00:00.000000000 Z
+date: 2023-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -50,46 +50,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.0
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.14'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.14.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.14'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.14.0
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.18'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.18.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.18'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.18.0
 description: VKontakte API Client for Ruby
 email:
 - anton.maminov@gmail.com
@@ -137,14 +97,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.14
 signing_key:
 specification_version: 4
 summary: Unofficial VKontakte API Client for Ruby