vk_music 4.0.3 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 067f26c1a3f2e46794a61c4a62fae7dd40f190e70e91b7331c4891f83cf3bd9f
-  data.tar.gz: 2942d5b5999a65a8fd29b8eebc2e632b44c944d204984d0d85df4a3fdf74c437
+  metadata.gz: 175777250336a247babea9660fef9e8b2dd070afb304bf4943f5a5f5706d4961
+  data.tar.gz: fb2421372d37fefc25dadb6823f06c4c7cb4b55cf961830dc3738435a0a758af
 SHA512:
-  metadata.gz: 512889a498b3d0aa5c3413e24596b660d312acddb450052f8d1d44315c1e84d89749fbdb9d225b2e21555eb83efbca6d77922c0227a287154dee78991786250f
-  data.tar.gz: e3bf4628feccd1120a9afaedfebe3a5d9d9b9f6965b13dd3bcec58526bbcf2fdcd943577e33b2b398227f7c48fd60577ecf81686b42283540e0ef6308df26132
+  metadata.gz: a3aa8fe59c41de35155c0111cf2ff54cd3bcbc101490a2ae614ac54920773f3bed658a197f2bce829f95634475c0698272f3efbf806c5f0c422b08a33d5ef607
+  data.tar.gz: a3e462914a5123ed99aa9eb23f0e13b011b9dd7593a4046c139d0d399ff33a9051efb09def9d6940545ab293c6e7e1e6a798d78b4976b7359b7f3f7aafae5b10

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vk_music (4.0.3)
+    vk_music (4.1.0)
       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)
@@ -41,37 +42,39 @@ GEM
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2020.1104)
-    mini_portile2 (2.4.0)
+    mini_portile2 (2.5.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.0)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
     ntlm-http (0.1.1)
     parallel (1.20.1)
-    parser (2.7.2.0)
+    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 (2.0.0)
+    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.6.1)
+    rspec-support (3.10.1)
+    rubocop (1.7.0)
       parallel (~> 1.10)
       parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
@@ -80,10 +83,10 @@ GEM
       rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.3.0)
+    rubocop-ast (1.4.0)
       parser (>= 2.7.1.5)
-    ruby-progressbar (1.10.1)
-    simplecov (0.20.0)
+    ruby-progressbar (1.11.0)
+    simplecov (0.21.1)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
@@ -94,12 +97,12 @@ GEM
     unf_ext (0.0.7.7)
     unicode-display_width (1.7.0)
     vcr (6.0.0)
-    webmock (3.10.0)
+    webmock (3.11.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     webrobots (0.1.2)
-    yard (0.9.25)
+    yard (0.9.26)
 
 PLATFORMS
   ruby

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

@@ -125,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]
@@ -138,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/data_type_guesser.rb

@@ -11,6 +11,10 @@ module VkMusic
       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 +36,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/version.rb

@@ -2,6 +2,6 @@
 
 module VkMusic
   # Library version.
-  VERSION = '4.0.3'
+  VERSION = '4.1.0'
   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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vk_music
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.1.0
 platform: ruby
 authors:
 - Fizvlad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-03 00:00:00.000000000 Z
+date: 2021-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -103,6 +103,7 @@ files:
 - lib/vk_music/client.rb
 - lib/vk_music/playlist.rb
 - lib/vk_music/request.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
@@ -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,6 +138,7 @@ files:
 - lib/vk_music/utility/wall_loader.rb
 - lib/vk_music/version.rb
 - lib/vk_music/web_parser.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