vk_music 4.0.1 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a54709405afad78ce1cfc55e5487ecb55d8a7930e3ef511997175eb01995c9a
-  data.tar.gz: dc49da61941078903e7b3da469631ba7d4eb266260ceed882a1b811e11d3ddaf
+  metadata.gz: c96600db101ef3b36aae086473d7954009ee3cd2df78e3c0fb00e17274c9375f
+  data.tar.gz: 957c1b36785ffdd1f45d772d4a1fa963bf4c9f874947f5f241445801101241a6
 SHA512:
-  metadata.gz: dc27e9b56575d82481157b0cbde9d4ad742fd002f117601c8b8461422cb956bd18654f477499459480c1b298f768452ff01586017a0121865b8cc446feb1c444
-  data.tar.gz: 21a10dc20607098e432f9da31172c74d83f59b2e2cb41879d9aaaa25f3907c3bffbbc2440195f121178a5d349aed7f7f69cf7ccf1f8913d8cf82920f32012e94
+  metadata.gz: 07add466eea5a3c516d5b0e9ed968ced90ad5b09077aec19bc4c69f29eeb9894cad9ce174910f323b139daf47bda7b7185664a8e683933210717b75ab0da90c0
+  data.tar.gz: ba17cb06417c52cbcd45c7204ae36d6a83b76ab6173a2215c0062a7873ccd997eae145a96e397d305258568bbfece837c9186afa7f0789e18b5e0f5543cb10df

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vk_music (4.0.1)
+    vk_music (4.1.2)
       execjs (~> 2.7)
       json (~> 2.3)
       logger (~> 1.4)
@@ -16,9 +16,10 @@ GEM
     ast (2.4.1)
     byebug (11.1.3)
     coderay (1.1.3)
-    crack (0.4.4)
+    crack (0.4.5)
+      rexml
     diff-lcs (1.4.4)
-    docile (1.3.2)
+    docile (1.3.4)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.7.6)
@@ -26,9 +27,9 @@ GEM
     hashdiff (1.0.1)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    json (2.3.1)
-    logger (1.4.2)
-    mechanize (2.7.6)
+    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)
@@ -36,72 +37,75 @@ GEM
       net-http-persistent (>= 2.5.2)
       nokogiri (~> 1.6)
       ntlm-http (~> 0.1, >= 0.1.1)
+      webrick (~> 1.7)
       webrobots (>= 0.0.9, < 0.2)
     method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2020.1104)
-    mini_portile2 (2.4.0)
     net-http-digest_auth (1.4.1)
     net-http-persistent (2.9.4)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
+    nokogiri (1.11.1-x86_64-linux)
+      racc (~> 1.4)
     ntlm-http (0.1.1)
-    parallel (1.19.2)
-    parser (2.7.2.0)
+    parallel (1.20.1)
+    parser (3.0.0.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)
     rainbow (3.0.0)
-    rake (13.0.1)
-    regexp_parser (1.8.2)
+    rake (13.0.3)
+    regexp_parser (2.0.3)
     rexml (3.2.4)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
       rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.0)
+    rspec-core (3.10.1)
       rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.0)
+    rspec-mocks (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.0)
-    rubocop (1.2.0)
+    rspec-support (3.10.1)
+    rubocop (1.7.0)
       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.4.0)
       parser (>= 2.7.1.5)
-    ruby-progressbar (1.10.1)
-    simplecov (0.19.1)
+    ruby-progressbar (1.11.0)
+    simplecov (0.21.1)
       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.11.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.7.0)
     webrobots (0.1.2)
-    yard (0.9.25)
+    yard (0.9.26)
 
 PLATFORMS
   ruby
-  x64-mingw32
 
 DEPENDENCIES
   byebug
@@ -117,4 +121,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   2.1.4
+   2.2.4

data/README.md

@@ -81,6 +81,14 @@ You can load up to 10 audios attached to some post. Those audios will be returne
 audios = client.post(url: "link")
 ```
 
+### Artist audios
+
+You can get up to 50 top audios of particular artist:
+
+```ruby
+audios = client.artist(url: "link")
+```
+
 ### Getting audio URL
 
 To get audio URL you should go through following chain:

data/lib/vk_music/audio.rb

@@ -90,13 +90,14 @@ module VkMusic
     # @param [Audio, Array(owner_id, audio_id, secret1, secret2), String]
     # @return [Boolean] id-based comparison
     def id_matches?(data)
-      data_id = case data
-      when Array then data.join('_')
-      when Audio then data.full_id
-      when String then data.strip
+      data_owner_id, data_id = case data
+      when Audio then [data.owner_id, data.id]
+      when Array then data.first(2).reverse.map(&:to_i)
+      when String then data.split('_').first(2).map(&:to_i)
+      else return false
       end
 
-      full_id == data_id
+      owner_id == data_owner_id && id == data_id
     end
 
     # @return [String] pretty-printed audio name

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:
@@ -131,7 +125,7 @@ module VkMusic
       Utility::WallLoader.call(agent, id, owner_id, post_id)
     end
 
-    # Get audios attached to post. Specify either +url+ or +(owner_id,post_id)+.
+    # Get audios attached to post. Specify either +url+ or +(owner_id,post_id)+
     # @param url [String]
     # @param owner_id [Integer]
     # @param post_id [Integer]
@@ -144,6 +138,18 @@ module VkMusic
       Utility::PostLoader.call(agent, id, owner_id, post_id)
     end
 
+    # Artist top audios. Specify either +url+ or +name+ of the artist
+    # @param url [String]
+    # @param name [String]
+    # @return [Array<Audio>] array of audios attached to post
+    def artist(url: nil, name: nil)
+      name = Utility::ArtistUrlParser.call(url) if url
+
+      return [] if name.nil? || name.empty?
+
+      Utility::ArtistLoader.call(agent, id, name)
+    end
+
     # Get audios with download URLs by their IDs and secrets
     # @param args [Array<Audio, (owner_id, audio_id, secret_1, secret_2),
     #   "#{owner_id}_#{id}_#{secret_1}_#{secret_2}">]

data/lib/vk_music/request/artist.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module VkMusic
+  module Request
+    # Artist audios page request
+    class Artist < Base
+      # Initialize new request
+      # @param name [String]
+      # @param client_id [Integer]
+      def initialize(name, client_id)
+        @client_id = client_id
+        super("#{VK_ROOT}/artist/#{name}/top_audios", {}, 'GET', {})
+      end
+
+      def_delegators :@parser, :audios
+
+      private
+
+      def after_call
+        @parser = WebParser::Artist.new(@response, client_id: @client_id)
+      end
+    end
+  end
+end

data/lib/vk_music/utility/artist_loader.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module VkMusic
+  module Utility
+    # Load artist top audios
+    module ArtistLoader
+      # @param agent [Mechanize]
+      # @param client_id [Integer]
+      # @param name [String]
+      # @return [Array<Audio>]
+      def self.call(agent, client_id, name)
+        page = Request::Artist.new(name, client_id).call(agent)
+        page.audios
+      end
+    end
+  end
+end

data/lib/vk_music/utility/artist_url_parser.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module VkMusic
+  module Utility
+    # Artist URL parser
+    module ArtistUrlParser
+      # Regex for artist URL
+      ARTIST_POSTFIX = %r{.*artist/([\w.\-~]+)}.freeze
+      public_constant :ARTIST_POSTFIX
+
+      # Get artist name based on provided URL
+
+      # @param url [String]
+      # @return [String?]
+      def self.call(url)
+        url.match(ARTIST_POSTFIX)&.captures&.first
+      rescue StandardError
+        nil
+      end
+    end
+  end
+end

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: url_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

@@ -1,16 +1,21 @@
 # frozen_string_literal: true
 
 require_relative 'playlist_url_parser'
+require_relative 'artist_url_parser'
 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
 
+      # Artist URL postfix
+      ARTIST_POSTFIX = ArtistUrlParser::ARTIST_POSTFIX
+      public_constant :ARTIST_POSTFIX
+
       # End of post URL
       POST_POSTFIX = PostUrlParser::POST_POSTFIX
       public_constant :POST_POSTFIX
@@ -32,6 +37,7 @@ module VkMusic
       def self.call(data)
         case data
         when PLAYLIST_POSTFIX then :playlist
+        when ARTIST_POSTFIX then :artist
         when POST_POSTFIX then :post
         when WALL_POSTFIX then :wall
         when AUDIOS_POSTFIX, PROFILE_URL then :audios

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.1.2'
   public_constant :VERSION
 end

data/lib/vk_music/web_parser/artist.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module VkMusic
+  module WebParser
+    # Artist top audios web page
+    class Artist < Base
+      # @return [Array<Audio>]
+      def audios
+        audio_section = node.at_css('.AudioSection.AudioSection__artist_audios')
+        return [] if audio_section.nil?
+
+        Utility::AudioItemsParser.call(audio_section, @client_id)
+      end
+    end
+  end
+end

data/lib/vk_music/web_parser/profile.rb

@@ -12,9 +12,13 @@ module VkMusic
       POST_ANCHOR_NAME_REGEX = /post(-?\d+)_(\d+)/.freeze
       private_constant :POST_ANCHOR_NAME_REGEX
 
+      # CSS selector for link in basis
+      BASIS_LINK_SELECTOR = '.basisProfile a,.basisGroup a,.BasisProfile a,.BasisGroup a'
+      private_constant :BASIS_LINK_SELECTOR
+
       # Profile id
       def id
-        link = node.link_with(href: ID_CONTAINING_HREF, css: '.basisProfile a,.basisGroup a')
+        link = node.link_with(href: ID_CONTAINING_HREF, css: BASIS_LINK_SELECTOR)
         return unless link
 
         Integer(link.href.match(ID_CONTAINING_HREF).captures.first, 10)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vk_music
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.1.2
 platform: ruby
 authors:
 - Fizvlad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-29 00:00:00.000000000 Z
+date: 2021-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -103,7 +103,8 @@ files:
 - lib/vk_music/client.rb
 - lib/vk_music/playlist.rb
 - lib/vk_music/request.rb
-- lib/vk_music/request/audios.rb
+- lib/vk_music/request/artist.rb
+- lib/vk_music/request/audios_reload.rb
 - lib/vk_music/request/base.rb
 - lib/vk_music/request/login.rb
 - lib/vk_music/request/my_page.rb
@@ -114,6 +115,8 @@ files:
 - lib/vk_music/request/search.rb
 - lib/vk_music/request/wall_section.rb
 - lib/vk_music/utility.rb
+- lib/vk_music/utility/artist_loader.rb
+- lib/vk_music/utility/artist_url_parser.rb
 - lib/vk_music/utility/audio_data_parser.rb
 - lib/vk_music/utility/audio_items_parser.rb
 - lib/vk_music/utility/audio_node_parser.rb
@@ -135,7 +138,8 @@ files:
 - lib/vk_music/utility/wall_loader.rb
 - lib/vk_music/version.rb
 - lib/vk_music/web_parser.rb
-- lib/vk_music/web_parser/audios.rb
+- lib/vk_music/web_parser/artist.rb
+- lib/vk_music/web_parser/audios_reload.rb
 - lib/vk_music/web_parser/base.rb
 - lib/vk_music/web_parser/login.rb
 - lib/vk_music/web_parser/my_page.rb
@@ -168,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.4
 signing_key: 
 specification_version: 4
 summary: A library to work with audios on popular Russian social network