vk_music 4.1.2 → 4.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c96600db101ef3b36aae086473d7954009ee3cd2df78e3c0fb00e17274c9375f
-  data.tar.gz: 957c1b36785ffdd1f45d772d4a1fa963bf4c9f874947f5f241445801101241a6
+  metadata.gz: 328e99f052dc0b5088bfe6951340eddbd1d490e314eb87960d4c09567c321c38
+  data.tar.gz: ee672cf125bce6abfd6269a2a2589c546db832334e7a748539834a82f7ad4d91
 SHA512:
-  metadata.gz: 07add466eea5a3c516d5b0e9ed968ced90ad5b09077aec19bc4c69f29eeb9894cad9ce174910f323b139daf47bda7b7185664a8e683933210717b75ab0da90c0
-  data.tar.gz: ba17cb06417c52cbcd45c7204ae36d6a83b76ab6173a2215c0062a7873ccd997eae145a96e397d305258568bbfece837c9186afa7f0789e18b5e0f5543cb10df
+  metadata.gz: c96731edad98d27948189374693b6852a46e035a8b4c6fbb76cfcc9b3c6db24d8859f5dd36dea5a071e79ddd9ff9e38a43737694e1499e7ad99a205f754c6fa6
+  data.tar.gz: 1c0d2f09244dbbfa36a741bc384aea0f235c407e5ca718197617c138b47844b69f26e7734fa6fd2e837026f636418750333ff4cbb9652056bb05956f1ddd7179

data/.gitignore

@@ -1,3 +1,4 @@
+/.cookies
 /.env
 /.byebug_history
 /.bundle/

data/.rubocop.yml

@@ -54,3 +54,11 @@ Style/DisableCopsWithinSourceCodeDirective:
   Enabled: false
 Layout/MultilineHashKeyLineBreaks:
   Enabled: false
+Layout/SingleLineBlockChain:
+  Exclude:
+    - 'spec/**/*_spec.rb'
+Style/TopLevelMethodDefinition:
+  Exclude:
+    - 'spec/login_helper.rb'
+Lint/NumberConversion:
+  Enabled: false

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.7.2

data/Gemfile

@@ -6,33 +6,34 @@ source 'https://rubygems.org'
 gemspec
 
 group :test, :development do
-  # Debugging console
-  gem 'pry'
-
   # Another debugging console
-  gem 'byebug'
+  gem 'byebug', '~> 11.1'
 
   # The thing, forcing you to write good code
-  gem 'rubocop', require: false
+  gem 'rubocop', '~> 1.21', require: false
+  # Guidelines for writing RSpec tests
+  gem 'rubocop-rspec', '~> 2.4', require: false
+  # Guidelines for Rake tasks
+  gem 'rubocop-rake', '~> 0.6', require: false
 
   # Rake tasks
-  gem 'rake', require: false
+  gem 'rake', '~> 13.0', require: false
 
   # Testing
-  gem 'rspec', require: false
+  gem 'rspec', '~> 3.10', require: false
 
   # Docs
-  gem 'yard', require: false
+  gem 'yard', '~> 0.9', require: false
 
   # .env support
-  gem 'dotenv'
+  gem 'dotenv', '~> 2.7'
 
   # Save web requests for fast and reliable testing
-  gem 'vcr'
+  gem 'vcr', '~> 6.0'
 
   # Stub web requests
-  gem 'webmock'
+  gem 'webmock', '~> 3.14'
 
   # Test coverage
-  gem 'simplecov', require: false, group: :test
+  gem 'simplecov', '~> 0.21', require: false, group: :test
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vk_music (4.1.2)
+    vk_music (4.1.5)
       execjs (~> 2.7)
       json (~> 2.3)
       logger (~> 1.4)
@@ -11,55 +11,50 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.1)
+    ast (2.4.2)
     byebug (11.1.3)
-    coderay (1.1.3)
     crack (0.4.5)
       rexml
     diff-lcs (1.4.4)
-    docile (1.3.4)
+    docile (1.4.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.7.6)
-    execjs (2.7.0)
+    execjs (2.8.1)
     hashdiff (1.0.1)
-    http-cookie (1.0.3)
+    http-cookie (1.0.4)
       domain_name (~> 0.5)
-    json (2.5.1)
-    logger (1.4.3)
-    mechanize (2.7.7)
-      domain_name (~> 0.5, >= 0.5.1)
-      http-cookie (~> 1.0)
-      mime-types (>= 1.17.2)
-      net-http-digest_auth (~> 1.1, >= 1.1.1)
-      net-http-persistent (>= 2.5.2)
-      nokogiri (~> 1.6)
-      ntlm-http (~> 0.1, >= 0.1.1)
+    json (2.6.1)
+    logger (1.4.4)
+    mechanize (2.8.3)
+      addressable (~> 2.8)
+      domain_name (~> 0.5, >= 0.5.20190701)
+      http-cookie (~> 1.0, >= 1.0.3)
+      mime-types (~> 3.0)
+      net-http-digest_auth (~> 1.4, >= 1.4.1)
+      net-http-persistent (>= 2.5.2, < 5.0.dev)
+      nokogiri (~> 1.11, >= 1.11.2)
+      rubyntlm (~> 0.6, >= 0.6.3)
       webrick (~> 1.7)
-      webrobots (>= 0.0.9, < 0.2)
-    method_source (1.0.0)
-    mime-types (3.3.1)
+      webrobots (~> 0.1.2)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.1104)
+    mime-types-data (3.2021.1115)
     net-http-digest_auth (1.4.1)
     net-http-persistent (2.9.4)
-    nokogiri (1.11.1-x86_64-linux)
+    nokogiri (1.12.5-x86_64-linux)
       racc (~> 1.4)
-    ntlm-http (0.1.1)
-    parallel (1.20.1)
-    parser (3.0.0.0)
+    parallel (1.21.0)
+    parser (3.0.2.0)
       ast (~> 2.4.1)
-    pry (0.13.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
     public_suffix (4.0.6)
-    racc (1.5.2)
+    racc (1.6.0)
     rainbow (3.0.0)
-    rake (13.0.3)
-    regexp_parser (2.0.3)
-    rexml (3.2.4)
+    rake (13.0.6)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -69,35 +64,41 @@ GEM
     rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.1)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.1)
-    rubocop (1.7.0)
+    rspec-support (3.10.2)
+    rubocop (1.21.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rubocop-ast (>= 1.9.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.4.0)
-      parser (>= 2.7.1.5)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.11.0)
+      parser (>= 3.0.1.1)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.4.0)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
     ruby-progressbar (1.11.0)
-    simplecov (0.21.1)
+    rubyntlm (0.6.3)
+    simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.2)
+    simplecov_json_formatter (0.1.3)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.7)
-    unicode-display_width (1.7.0)
+    unf_ext (0.0.8)
+    unicode-display_width (2.1.0)
     vcr (6.0.0)
-    webmock (3.11.0)
-      addressable (>= 2.3.6)
+    webmock (3.14.0)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     webrick (1.7.0)
@@ -108,17 +109,18 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  byebug
-  dotenv
-  pry
-  rake
-  rspec
-  rubocop
-  simplecov
-  vcr
+  byebug (~> 11.1)
+  dotenv (~> 2.7)
+  rake (~> 13.0)
+  rspec (~> 3.10)
+  rubocop (~> 1.21)
+  rubocop-rake (~> 0.6)
+  rubocop-rspec (~> 2.4)
+  simplecov (~> 0.21)
+  vcr (~> 6.0)
   vk_music!
-  webmock
-  yard
+  webmock (~> 3.14)
+  yard (~> 0.9)
 
 BUNDLED WITH
    2.2.4

data/Rakefile

@@ -16,3 +16,19 @@ YARD::Rake::YardocTask.new do |t|
 end
 
 task default: %i[rubocop spec yard]
+
+namespace :clean do
+  desc 'Remove generated cassettes'
+  task :cassetes do
+    require 'fileutils'
+
+    FileUtils.rm_r Dir.glob('spec/cassetes/*/')
+  end
+
+  desc 'Remove generated cookies'
+  task :cookies do
+    require 'fileutils'
+
+    FileUtils.rm('spec/.cookies')
+  end
+end

data/bin/console

@@ -3,16 +3,17 @@
 
 require 'bundler/setup'
 require 'vk_music'
-require 'pry'
+require 'irb'
 require 'dotenv'
 Dotenv.load
 
 # 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.
 
-if ENV['VK_LOGIN'] && ENV['VK_PASSWORD']
-  client = VkMusic::Client.new(login: ENV['VK_LOGIN'], password: ENV['VK_PASSWORD'])
-  puts "You now can access client##{client.id}"
-end
+# Path to file where development cookies will be stored
+AGENT_COOKIES_PATH = '.cookies'
 
-Pry.start(client || Object.new)
+agent = VkMusic::Utility::Authorizer.call(AGENT_COOKIES_PATH)
+@client = VkMusic::Client.new(agent: agent)
+
+IRB.start

data/lib/vk_music/utility/authorizer.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module VkMusic
+  module Utility
+    # Creates authorized client based of cookies file or ENV variables
+    module Authorizer
+      class << self
+        # @param cookie_path [string]
+        # @return [Mechanize] logged in Mechanize client
+        def call(cookie_path)
+          agent = Mechanize.new
+          if File.exist?(cookie_path)
+            load_cookie_jar(agent.cookie_jar, cookie_path)
+          else
+            login_agent(agent)
+          end
+          agent.cookie_jar.save(cookie_path, session: true)
+          agent
+        end
+
+        private
+
+        # @return [Client] logged in client.
+        def logged_in_client
+          VkMusic::Client.new(agent: logged_in_agent)
+        end
+
+        # @param jar [HTTP::CookieJar]
+        # @param path [string]
+        def load_cookie_jar(jar, path)
+          VkMusic::Utility::CookieReader.call(jar, path)
+        rescue StandardError => e
+          VkMusic.log.error('authorizer') { "Failed to parse saved cookies: #{e}:\m#{e.full_message}" }
+        end
+
+        # Logs in provided agent
+        def login_agent(agent)
+          login = VkMusic::Request::Login.new
+          login.call(agent)
+          login.send_form(ENV['VK_LOGIN'], ENV['VK_PASSWORD'], agent)
+        end
+      end
+    end
+  end
+end

data/lib/vk_music/utility/cookie_reader.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module VkMusic
+  module Utility
+    # Reads preserved cookies from file and writes them into a cookie jar
+    module CookieReader
+      class << self
+        # @param jar [HTTP::CookieJar]
+        # @param path [string]
+        def call(jar, path)
+          data = File.read(path)
+          data.start_with?('{') ? load_cookie_jar_json(jar, data) : load_cookie_jar_mechanize(jar)
+        end
+
+        private
+
+        # Loads cookies from JSON data
+        def load_cookie_jar_json(jar, data)
+          VkMusic.log.info('cookie_reader') { 'Loading JSON cookies' }
+          JSON.parse(data).each_pair do |k, v|
+            jar.add(URI('https://m.vk.com'), HTTP::Cookie.new(k, v))
+          end
+        end
+
+        # Loads cookies from Mechanize file
+        def load_cookie_jar_mechanize(jar)
+          VkMusic.log.info('cookie_reader') { 'Loading Mechanize cookies' }
+          jar.load(AGENT_COOKIES_PATH)
+        end
+      end
+    end
+  end
+end

data/lib/vk_music/utility/duration_parser.rb

@@ -7,10 +7,12 @@ module VkMusic
       # @param str [String] string in format "HH:MM:SS" or something alike (+/d++ Regex selector is used)
       # @return [Integer] amount of seconds
       def self.call(str)
-        str.scan(/\d+/)
-           .map(&:to_i)
-           .reverse
-           .each_with_index.reduce(0) { |acc, (count, position)| acc + count * 60**position }
+        str
+          .scan(/\d+/)
+          .map { |i| Integer(i, 10) }
+          .reverse
+          .each_with_index
+          .reduce(0) { |acc, (count, position)| acc + (count * (60**position)) }
       end
     end
   end

data/lib/vk_music/utility/post_loader.rb

@@ -16,7 +16,9 @@ module VkMusic
 
         wall_audios = WallLoader.call(agent, client_id, owner_id, post_id).audios
 
-        urlles_audios.map { |urlles| wall_audios.find { |audio| audio.like?(urlles) } }.compact
+        urlles_audios
+          .map { |urlles| wall_audios.find { |audio| audio.like?(urlles) } }
+          .compact
       end
     end
   end

data/lib/vk_music/version.rb

@@ -2,6 +2,6 @@
 
 module VkMusic
   # Library version.
-  VERSION = '4.1.2'
+  VERSION = '4.1.5'
   public_constant :VERSION
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vk_music
 version: !ruby/object:Gem::Version
-  version: 4.1.2
+  version: 4.1.5
 platform: ruby
 authors:
 - Fizvlad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-08 00:00:00.000000000 Z
+date: 2022-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -92,6 +92,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -123,6 +124,8 @@ files:
 - lib/vk_music/utility/audios_from_ids_loader.rb
 - lib/vk_music/utility/audios_ids_getter.rb
 - lib/vk_music/utility/audios_loader.rb
+- lib/vk_music/utility/authorizer.rb
+- lib/vk_music/utility/cookie_reader.rb
 - lib/vk_music/utility/data_type_guesser.rb
 - lib/vk_music/utility/duration_parser.rb
 - lib/vk_music/utility/last_profile_post_loader.rb
@@ -172,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.4
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A library to work with audios on popular Russian social network