vk_music 4.1.4 → 4.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da1ad67eac04f82ada772151b2321b7eb598321f788d66d12b84e8d2f0475919
-  data.tar.gz: 6b8fd6e4ce0eacfdbcd94396dfe9fc56db2cff502188904dd2f991eabb33acc4
+  metadata.gz: 328e99f052dc0b5088bfe6951340eddbd1d490e314eb87960d4c09567c321c38
+  data.tar.gz: ee672cf125bce6abfd6269a2a2589c546db832334e7a748539834a82f7ad4d91
 SHA512:
-  metadata.gz: 434e1461c9827ffaaeff46ef0f68d63495723947da530014a1da69d242c8601580c50325bfd6d245290e2420bb597196cc20198c1d9e03b754079ef316a46bfe
-  data.tar.gz: 87b875c18246bfffe3ab2d54f22bde6a56c3156d4abb5173dad174fe9d91d46513a66a754833cee40fea9df85f852f66ef8fc527fba8368a6ce6667026db28af
+  metadata.gz: c96731edad98d27948189374693b6852a46e035a8b4c6fbb76cfcc9b3c6db24d8859f5dd36dea5a071e79ddd9ff9e38a43737694e1499e7ad99a205f754c6fa6
+  data.tar.gz: 1c0d2f09244dbbfa36a741bc384aea0f235c407e5ca718197617c138b47844b69f26e7734fa6fd2e837026f636418750333ff4cbb9652056bb05956f1ddd7179

data/.gitignore

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vk_music (4.1.4)
+    vk_music (4.1.5)
       execjs (~> 2.7)
       json (~> 2.3)
       logger (~> 1.4)
@@ -26,9 +26,9 @@ GEM
     hashdiff (1.0.1)
     http-cookie (1.0.4)
       domain_name (~> 0.5)
-    json (2.5.1)
-    logger (1.4.3)
-    mechanize (2.8.2)
+    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)
@@ -39,20 +39,18 @@ GEM
       rubyntlm (~> 0.6, >= 0.6.3)
       webrick (~> 1.7)
       webrobots (~> 0.1.2)
-    mime-types (3.3.1)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0901)
-    mini_portile2 (2.6.1)
+    mime-types-data (3.2021.1115)
     net-http-digest_auth (1.4.1)
     net-http-persistent (2.9.4)
-    nokogiri (1.12.4)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.12.5-x86_64-linux)
       racc (~> 1.4)
     parallel (1.21.0)
     parser (3.0.2.0)
       ast (~> 2.4.1)
     public_suffix (4.0.6)
-    racc (1.5.2)
+    racc (1.6.0)
     rainbow (3.0.0)
     rake (13.0.6)
     regexp_parser (2.1.1)

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/version.rb

@@ -2,6 +2,6 @@
 
 module VkMusic
   # Library version.
-  VERSION = '4.1.4'
+  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.4
+  version: 4.1.5
 platform: ruby
 authors:
 - Fizvlad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-18 00:00:00.000000000 Z
+date: 2022-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -124,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