vk_music 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a54709405afad78ce1cfc55e5487ecb55d8a7930e3ef511997175eb01995c9a
-  data.tar.gz: dc49da61941078903e7b3da469631ba7d4eb266260ceed882a1b811e11d3ddaf
+  metadata.gz: 982d3964597ca683823d8dfd1aff172ef5f117b740e9020aabf5019cb43beea5
+  data.tar.gz: 6bd53fb80d6105287e0db7e2b6af63c224d5ce366b4e227cbb0d310d49c167ec
 SHA512:
-  metadata.gz: dc27e9b56575d82481157b0cbde9d4ad742fd002f117601c8b8461422cb956bd18654f477499459480c1b298f768452ff01586017a0121865b8cc446feb1c444
-  data.tar.gz: 21a10dc20607098e432f9da31172c74d83f59b2e2cb41879d9aaaa25f3907c3bffbbc2440195f121178a5d349aed7f7f69cf7ccf1f8913d8cf82920f32012e94
+  metadata.gz: d15ced8f7a23fdce6ee9304264092b11fceeb93d78f213ff1be8b2e47566c334011b1f8065d88e7125c81df5b4939ca21ee9f986e72f2a13c183edd35c861304
+  data.tar.gz: 39294ec31d752dc92147916a69f2460110fad028ff7115210bbfae19b786707c7dbc9e7cee5f19a3254b668605785cde10c3fde40cc93d1bd80825415da0a4aa

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vk_music (4.0.1)
+    vk_music (4.0.2)
       execjs (~> 2.7)
       json (~> 2.3)
       logger (~> 1.4)
@@ -26,7 +26,7 @@ GEM
     hashdiff (1.0.1)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    json (2.3.1)
+    json (2.4.1)
     logger (1.4.2)
     mechanize (2.7.6)
       domain_name (~> 0.5, >= 0.5.1)
@@ -47,7 +47,7 @@ GEM
     nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
     ntlm-http (0.1.1)
-    parallel (1.19.2)
+    parallel (1.20.1)
     parser (2.7.2.0)
       ast (~> 2.4.1)
     pry (0.13.1)
@@ -56,7 +56,7 @@ GEM
     public_suffix (4.0.6)
     rainbow (3.0.0)
     rake (13.0.1)
-    regexp_parser (1.8.2)
+    regexp_parser (2.0.0)
     rexml (3.2.4)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
@@ -71,28 +71,30 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.0)
-    rubocop (1.2.0)
+    rubocop (1.6.1)
       parallel (~> 1.10)
       parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.0.1)
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.1.1)
+    rubocop-ast (1.3.0)
       parser (>= 2.7.1.5)
     ruby-progressbar (1.10.1)
-    simplecov (0.19.1)
+    simplecov (0.20.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.2)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.7)
     unicode-display_width (1.7.0)
     vcr (6.0.0)
-    webmock (3.9.5)
+    webmock (3.10.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -101,7 +103,6 @@ GEM
 
 PLATFORMS
   ruby
-  x64-mingw32
 
 DEPENDENCIES
   byebug

data/lib/vk_music/client.rb

@@ -51,12 +51,6 @@ module VkMusic
       false
     end
 
-    # Unmask old VK music link
-    # @param limk [String]
-    def unmask_link(link)
-      VkMusic::LinkDecoder.unmask_link(link, @id)
-    end
-
     # Search for audio or playlist
     #
     # Possible values of +type+ option:

data/lib/vk_music/utility/audio_data_parser.rb

@@ -3,17 +3,17 @@
 module VkMusic
   module Utility
     # Parse {Audio} from +Array+ of audio data
-    class AudioDataParser
+    module AudioDataParser
       class << self
         # @param data [Array]
         # @param client_id [Integer]
         # @return [Audio]
         def call(data, client_id)
           url_encoded = get_url_encoded(data)
-          secrets = get_secrets(data)
+          _add_hash, _edit_hash, action_hash, _delete_hash, _teplace_hash, url_hash = get_secrets(data)
 
           Audio.new(id: data[0], owner_id: data[1],
-                    secret1: secrets[2], secret2: secrets[5],
+                    secret1: action_hash, secret2: url_hash,
                     artist: CGI.unescapeHTML(data[4]), title: CGI.unescapeHTML(data[3]),
                     duration: data[5],
                     url_encoded: url_encoded, url: nil, client_id: client_id)

data/lib/vk_music/utility/audio_items_parser.rb

@@ -3,12 +3,12 @@
 module VkMusic
   module Utility
     # Parse {Audio} from +Nokogiri::XML::Node+
-    class AudioItemsParser
+    module AudioItemsParser
       # @param node [Nokogiri::XML::Node]
       # @param client_id [Integer]
       # @return [Array<Audio>]
       def self.call(node, client_id)
-        node.css('.audio_item.ai_has_btn').map do |elem|
+        node.css('.audio_item.ai_has_btn,.audio_item.audio_item_disabled').map do |elem|
           data = JSON.parse(elem.attribute('data-audio').value)
           Utility::AudioDataParser.call(data, client_id)
         end

data/lib/vk_music/utility/audio_node_parser.rb

@@ -3,7 +3,7 @@
 module VkMusic
   module Utility
     # Parse {Audio} from +Nokogiri::XML::Node+
-    class AudioNodeParser
+    module AudioNodeParser
       class << self
         # @param node [Nokogiri::XML::Node]
         # @param client_id [Integer]

data/lib/vk_music/utility/audios_from_ids_loader.rb

@@ -3,7 +3,7 @@
 module VkMusic
   module Utility
     # Load audios from ids
-    class AudiosFromIdsLoader
+    module AudiosFromIdsLoader
       # @param agent [Mechanize]
       # @param ids [Array<String>]
       # @return [Array<Audio>]

data/lib/vk_music/utility/audios_ids_getter.rb

@@ -3,7 +3,7 @@
 module VkMusic
   module Utility
     # Load ids from array of data
-    class AudiosIdsGetter
+    module AudiosIdsGetter
       # @param args [Array<Audio, (owner_id, audio_id, secret_1, secret_2),
       #   "#{owner_id}_#{id}_#{secret_1}_#{secret_2}">]
       # @return [Array<String>] array of uniq full ids

data/lib/vk_music/utility/audios_loader.rb

@@ -3,7 +3,7 @@
 module VkMusic
   module Utility
     # Load user or group audios
-    class AudiosLoader
+    module AudiosLoader
       class << self
         # @param agent [Mechanize]
         # @param client_id [Integer]

data/lib/vk_music/utility/data_type_guesser.rb

@@ -6,7 +6,7 @@ require_relative 'post_url_parser'
 module VkMusic
   module Utility
     # Guess type of method to use based on string data
-    class DataTypeGuesser
+    module DataTypeGuesser
       # End of playlist URL
       PLAYLIST_POSTFIX = PlaylistUrlParser::VK_PLAYLIST_URL_POSTFIX
       public_constant :PLAYLIST_POSTFIX

data/lib/vk_music/utility/duration_parser.rb

@@ -3,7 +3,7 @@
 module VkMusic
   module Utility
     # Turn human readable track length to its size in seconds
-    class DurationParser
+    module DurationParser
       # @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)

data/lib/vk_music/utility/last_profile_post_loader.rb

@@ -5,7 +5,7 @@ require_relative 'profile_id_resolver'
 module VkMusic
   module Utility
     # Get user or group id from url
-    class LastProfilePostLoader
+    module LastProfilePostLoader
       # vk.com url regex
       VK_PATH = ProfileIdResolver::VK_PATH
       private_constant :VK_PATH

data/lib/vk_music/utility/link_decoder.rb

@@ -3,7 +3,7 @@
 module VkMusic
   module Utility
     # Link decoding utilities
-    class LinkDecoder
+    module LinkDecoder
       # JS code which creates function to unmask audio URL.
       JS_CODE = <<~HEREDOC
         function vk_unmask_link(link, vk_id) {
@@ -96,9 +96,10 @@ module VkMusic
       # @param client_id [Integer] ID of user which got this link. ID is required for decoding.
       # @return [String?] audio download URL, which can be used only from current IP.
       def self.call(link, client_id)
+        VkMusic.log.debug('LinkDecoder') { "Unmasking link `#{link}` with client id #{client_id}" }
         @@js_context.call('vk_unmask_link', link, client_id)
-      rescue StandardError
-        VkMusic.log.warn('LinkDecoder') { "Failed to decode link: #{link}" }
+      rescue StandardError => e
+        VkMusic.log.warn('LinkDecoder') { "Failed to decode link `#{link}`: #{e.full_message}" }
         nil
       end
     end

data/lib/vk_music/utility/node_text_children_reader.rb

@@ -3,11 +3,11 @@
 module VkMusic
   module Utility
     # Read inner of text-childrens of +Nokogiri::XML::Node+ node
-    class NodeTextChildrenReader
+    module NodeTextChildrenReader
       # @param node [Nokogiri::XML::Node]
       # @return [String]
       def self.call(node)
-        node.children.select(&:text?).map(&:text).join('').strip
+        node.children.select(&:text?).map(&:text).join.strip
       end
     end
   end

data/lib/vk_music/utility/playlist_loader.rb

@@ -3,7 +3,7 @@
 module VkMusic
   module Utility
     # Load playlist audios
-    class PlaylistLoader
+    module PlaylistLoader
       # @param agent [Mechanize]
       # @param client_id [Integer]
       # @param owner_id [Integer]

data/lib/vk_music/utility/playlist_node_parser.rb

@@ -3,7 +3,7 @@
 module VkMusic
   module Utility
     # Read inner of text-childrens of +Nokogiri::XML::Node+ node
-    class PlaylistNodeParser
+    module PlaylistNodeParser
       # @param node [Nokogiri::XML::Node]
       # @return [Playlist]
       def self.call(node)

data/lib/vk_music/utility/playlist_section_loader.rb

@@ -3,7 +3,7 @@
 module VkMusic
   module Utility
     # Load sections into playlist
-    class PlaylistSectionLoader
+    module PlaylistSectionLoader
       # @param agent [Mechanize]
       # @param client_id [Integer]
       # @param owner_id [Integer]

data/lib/vk_music/utility/playlist_url_parser.rb

@@ -3,7 +3,7 @@
 module VkMusic
   module Utility
     # Read inner of text-childrens of +Nokogiri::XML::Node+ node
-    class PlaylistUrlParser
+    module PlaylistUrlParser
       # Regular expression to parse playlist link. Oh my, it is so big
       VK_PLAYLIST_URL_POSTFIX = %r{
         .*                                                              # Garbage

data/lib/vk_music/utility/post_loader.rb

@@ -3,7 +3,7 @@
 module VkMusic
   module Utility
     # Load wall audios
-    class PostLoader
+    module PostLoader
       # @param agent [Mechanize]
       # @param client_id [Integer]
       # @param owner_id [Integer]

data/lib/vk_music/utility/post_url_parser.rb

@@ -3,7 +3,7 @@
 module VkMusic
   module Utility
     # Load wall audios
-    class PostUrlParser
+    module PostUrlParser
       # Regex for post URL
       POST_POSTFIX = /.*wall(-?\d+)_(\d+)/.freeze
       public_constant :POST_POSTFIX

data/lib/vk_music/utility/profile_id_resolver.rb

@@ -3,7 +3,7 @@
 module VkMusic
   module Utility
     # Get user or group id from url
-    class ProfileIdResolver
+    module ProfileIdResolver
       # vk.com url regex
       VK_PATH = %r{(?:https?://)?(?:vk\.com/)?([^/?&]+)}.freeze
       public_constant :VK_PATH

data/lib/vk_music/utility/wall_loader.rb

@@ -3,7 +3,7 @@
 module VkMusic
   module Utility
     # Load wall audios
-    class WallLoader
+    module WallLoader
       # @param agent [Mechanize]
       # @param client_id [Integer]
       # @param owner_id [Integer]

data/lib/vk_music/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vk_music
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Fizvlad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-29 00:00:00.000000000 Z
+date: 2020-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs