vk_music 3.1.7 → 4.1.0

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

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module VkMusic
+  module WebParser
+    # Audios reload JSON parser
+    class AudiosReload < Base
+      # Array with audio data
+      def audios_data
+        @audios_data ||= json['data'].first || []
+      end
+
+      # @return [Array<Audio>]
+      def audios
+        audios_data.map do |el|
+          Utility::AudioDataParser.call(el, @client_id)
+        end
+      end
+    end
+  end
+end

data/lib/vk_music/web_parser/base.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module VkMusic
+  module WebParser
+    # Base class for all web parsers
+    class Base
+      # @param content [String, Nokogiri::XML::Searchable]
+      # @param client_id [Integer?]
+      def initialize(content, client_id: nil)
+        @content = content
+        @client_id = client_id
+      end
+
+      private
+
+      attr_reader :content
+
+      def node
+        @node ||= @content.is_a?(String) ? Nokogiri::HTML.fragment(@content) : @content
+      end
+
+      def json
+        @json ||= JSON.parse(@content.is_a?(String) ? @content : @content.body)
+      end
+    end
+  end
+end

data/lib/vk_music/web_parser/login.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module VkMusic
+  module WebParser
+    # Login page parser
+    class Login < Base
+      # @return [Mechanize::Form]
+      def login_form
+        node.forms.find { |f| f.action.start_with?('https://login.vk.com') }
+      end
+    end
+  end
+end

data/lib/vk_music/web_parser/my_page.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module VkMusic
+  module WebParser
+    # Current user page parser
+    class MyPage < Base
+      # User id
+      def id
+        Integer(node.content.match(/window.vk = {"id":(\d+)/).captures.first, 10)
+      end
+
+      # User name
+      def name
+        link = node.at_css('.ip_user_link .op_owner')
+        link.attribute('data-name').value
+      end
+    end
+  end
+end

data/lib/vk_music/web_parser/playlist.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module VkMusic
+  module WebParser
+    # Playlist mobile web page parser
+    class Playlist < Base
+      # @return [Array<Audio>]
+      def audios
+        Utility::AudioItemsParser.call(node, @client_id)
+      end
+
+      # @return [String]
+      def title
+        node.at_css('.audioPlaylist__title').content.strip
+      end
+
+      # @return [String?]
+      def subtitle
+        result = node.at_css('.audioPlaylist__subtitle').content.strip
+        return if result.nil? || result.empty?
+
+        result
+      end
+
+      # @return [Integer?]
+      def real_size
+        content = node.at_css('.audioPlaylist__footer').content
+        matches = content.gsub(/\s/, '').match(/^(\d+)/)&.captures
+        matches ? Integer(matches.first, 10) : nil
+      end
+    end
+  end
+end

data/lib/vk_music/web_parser/playlist_section.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module VkMusic
+  module WebParser
+    # PlaylistSection JSON parser
+    class PlaylistSection < Base
+      # Parsed JSON
+      def data
+        @data ||= json['data'].first || {}
+      end
+
+      # @return [Array<Audio>]
+      def audios
+        return unless data&.key?('list')
+
+        data['list'].map do |el|
+          Utility::AudioDataParser.call(el, @client_id)
+        end
+      end
+
+      # @return [String]
+      def title
+        return unless data&.key?('title')
+
+        data['title'].to_s
+      end
+
+      # @return [String?]
+      def subtitle
+        return unless data&.key?('rawDescription')
+
+        re = data['rawDescription']
+        return if re.nil? || re.empty?
+
+        re
+      end
+
+      # @return [Integer?]
+      def real_size
+        return unless data&.key?('totalCount')
+
+        data['totalCount']
+      end
+
+      # @return [Boolean]
+      def more?
+        return unless data&.key?('hasMore')
+
+        data['hasMore'].to_s == '1'
+      end
+    end
+  end
+end

data/lib/vk_music/web_parser/post.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module VkMusic
+  module WebParser
+    # Post page web parser
+    class Post < Base
+      # @return [Array<Audio>]
+      def audios
+        node.css('.wi_body > .pi_medias .medias_audio').map do |el|
+          Utility::AudioNodeParser.call(el, @client_id)
+        end
+      end
+    end
+  end
+end

data/lib/vk_music/web_parser/profile.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module VkMusic
+  module WebParser
+    # Profile page parser
+    class Profile < Base
+      # Regex for href which contains id of profile
+      ID_CONTAINING_HREF = /(?:audios|photo|write|owner_id=|friends\?id=)(-?\d+)/.freeze
+      private_constant :ID_CONTAINING_HREF
+
+      # Regex for ID of .wall_item anchor
+      POST_ANCHOR_NAME_REGEX = /post(-?\d+)_(\d+)/.freeze
+      private_constant :POST_ANCHOR_NAME_REGEX
+
+      # Profile id
+      def id
+        link = node.link_with(href: ID_CONTAINING_HREF, css: '.basisProfile a,.basisGroup a')
+        return unless link
+
+        Integer(link.href.match(ID_CONTAINING_HREF).captures.first, 10)
+      end
+
+      # Last post ID
+      def last_post_id
+        ids = node.css('.wall_posts .wall_item').map do |el|
+          str = el.at_css('.post__anchor')&.attr('name')&.match(POST_ANCHOR_NAME_REGEX)&.captures&.last
+          str ? Integer(str, 10) : nil
+        end
+        ids.compact.max
+      end
+    end
+  end
+end

data/lib/vk_music/web_parser/search.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module VkMusic
+  module WebParser
+    # Audio search page parser
+    class Search < Base
+      # Audios found
+      # @return [Array<Audio>]
+      def audios
+        title_index = search_result_blocks.find_index { |node| node.inner_text.include?('Все аудиозаписи') }
+        return [] if title_index.nil?
+
+        block = search_result_blocks[title_index + 1]
+
+        Utility::AudioItemsParser.call(block, @client_id)
+      end
+
+      # Path to page with all results
+      # @return [String?]
+      def audios_all_path
+        title = search_result_blocks.find { |node| node.inner_text.include?('Все аудиозаписи') }
+        return if title.nil?
+
+        title.at_css('a').attribute('href').value
+      end
+
+      # Playlists found
+      # @return [Array<Playlist>]
+      def playlists
+        title_index = search_result_blocks.find_index { |node| node.inner_text.include?('Альбомы') }
+        return [] if title_index.nil?
+
+        block = search_result_blocks[title_index + 1]
+
+        block.css('.audioPlaylists__item').map do |elem|
+          Utility::PlaylistNodeParser.call(elem)
+        end
+      end
+
+      # Path to page with all results
+      # @return [String?]
+      def playlists_all_path
+        title = search_result_blocks.find { |node| node.inner_text.include?('Альбомы') }
+        return if title.nil?
+
+        title.at_css('a').attribute('href').value
+      end
+
+      private
+
+      def search_result_blocks
+        @search_result_blocks ||= node.css('.AudioBlock').children
+      end
+    end
+  end
+end

data/lib/vk_music/web_parser/wall_section.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module VkMusic
+  module WebParser
+    # WallSection JSON parser
+    class WallSection < Base
+      # Parsed JSON
+      def data
+        @data ||= json['data'].first || {}
+      end
+
+      # @return [Array<Audio>]
+      def audios
+        return unless data&.key?('list')
+
+        data['list'].map do |el|
+          Utility::AudioDataParser.call(el, @client_id)
+        end
+      end
+
+      # @return [String]
+      def title
+        return unless data&.key?('title')
+
+        data['title'].to_s
+      end
+
+      # @return [String?]
+      def subtitle
+        return unless data&.key?('rawDescription')
+
+        re = data['rawDescription']
+        return if re.nil? || re.empty?
+
+        re
+      end
+
+      # @return [Integer?]
+      def real_size
+        return unless data&.key?('totalCount')
+
+        data['totalCount']
+      end
+
+      # @return [Boolean]
+      def more?
+        return unless data&.key?('hasMore')
+
+        data['hasMore'].to_s == '1'
+      end
+    end
+  end
+end

data/vk_music.gemspec

@@ -1,40 +1,36 @@
-lib = File.expand_path("lib", __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "vk_music/version"
-
-Gem::Specification.new do |spec|
-  spec.name          = "vk_music"
-  spec.version       = VkMusic::VERSION
-  spec.authors       = ["Fizvlad"]
-  spec.email         = ["fizvlad@mail.ru"]
-
-  spec.summary       = "Provides interface to work with VK music via HTTP requests"
-  spec.description   = "Library to work with audios on popular Russian social network vk.com. VK disabled their public API for audios, so it is now necessary to use parsers instead."
-  spec.homepage      = "https://github.com/fizvlad/vk-music-rb"
-  spec.license       = "MIT"
-
-  spec.required_ruby_version = ">=2.3.1"
-
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/fizvlad/vk-music-rb"
-  spec.metadata["changelog_uri"] = "https://github.com/fizvlad/vk-music-rb/releases"
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "yard", "~>0.9"
-  spec.add_development_dependency "minitest", "~> 5.0"
-
-  spec.add_runtime_dependency "logger", "~>1.4"
-  spec.add_runtime_dependency "mechanize", "~>2.7"
-  spec.add_runtime_dependency "net-http-persistent", "2.9.4" # Required for mechanize. Future versions cause error.
-  spec.add_runtime_dependency "execjs", "~>2.7"
-  spec.add_runtime_dependency "json", "~>2.0"
-end
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'vk_music/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = 'vk_music'
+  spec.version       = VkMusic::VERSION
+  spec.authors       = ['Fizvlad']
+  spec.email         = ['fizvlad@mail.ru']
+
+  spec.summary       = 'A library to work with audios on popular Russian social network'
+  spec.description   = 'A library to work with audios on popular Russian social network'
+  spec.homepage      = 'https://github.com/fizvlad/vk-music-rb'
+  spec.license       = 'MIT'
+
+  spec.required_ruby_version = '>=2.7.1'
+
+  spec.metadata['homepage_uri'] = spec.homepage
+  spec.metadata['source_code_uri'] = 'https://github.com/fizvlad/vk-music-rb'
+  spec.metadata['changelog_uri'] = 'https://github.com/fizvlad/vk-music-rb/releases'
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.require_paths = ['lib']
+
+  spec.add_runtime_dependency('execjs', '~> 2.7')
+  spec.add_runtime_dependency('json', '~> 2.3')
+  spec.add_runtime_dependency('logger', '~> 1.4')
+  spec.add_runtime_dependency('mechanize', '~> 2.7')
+  spec.add_runtime_dependency('net-http-persistent', '2.9.4')
+end

metadata

@@ -1,71 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: vk_music
 version: !ruby/object:Gem::Version
-  version: 3.1.7
+  version: 4.1.0
 platform: ruby
 authors:
 - Fizvlad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-02 00:00:00.000000000 Z
+date: 2021-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: yard
+  name: execjs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
+        version: '2.7'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
+        version: '2.3'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: logger
   requirement: !ruby/object:Gem::Requirement
@@ -108,61 +80,75 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.9.4
-- !ruby/object:Gem::Dependency
-  name: execjs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.7'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-description: Library to work with audios on popular Russian social network vk.com.
-  VK disabled their public API for audios, so it is now necessary to use parsers instead.
+description: A library to work with audios on popular Russian social network
 email:
 - fizvlad@mail.ru
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".env.example"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
-- ".travis.yml"
+- ".rspec"
+- ".rubocop.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
-- bin/setup
 - lib/vk_music.rb
 - lib/vk_music/audio.rb
 - lib/vk_music/client.rb
-- lib/vk_music/constants.rb
-- lib/vk_music/exceptions.rb
-- lib/vk_music/link_decoder.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
+- lib/vk_music/request/my_page.rb
+- lib/vk_music/request/playlist.rb
+- lib/vk_music/request/playlist_section.rb
+- lib/vk_music/request/post.rb
+- lib/vk_music/request/profile.rb
+- lib/vk_music/request/search.rb
+- lib/vk_music/request/wall_section.rb
 - lib/vk_music/utility.rb
-- lib/vk_music/utility/log.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
+- 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/data_type_guesser.rb
+- lib/vk_music/utility/duration_parser.rb
+- lib/vk_music/utility/last_profile_post_loader.rb
+- lib/vk_music/utility/link_decoder.rb
+- lib/vk_music/utility/node_text_children_reader.rb
+- lib/vk_music/utility/playlist_loader.rb
+- lib/vk_music/utility/playlist_node_parser.rb
+- lib/vk_music/utility/playlist_section_loader.rb
+- lib/vk_music/utility/playlist_url_parser.rb
+- lib/vk_music/utility/post_loader.rb
+- lib/vk_music/utility/post_url_parser.rb
+- lib/vk_music/utility/profile_id_resolver.rb
+- 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
+- lib/vk_music/web_parser/my_page.rb
+- lib/vk_music/web_parser/playlist.rb
+- lib/vk_music/web_parser/playlist_section.rb
+- lib/vk_music/web_parser/post.rb
+- lib/vk_music/web_parser/profile.rb
+- lib/vk_music/web_parser/search.rb
+- lib/vk_music/web_parser/wall_section.rb
 - vk_music.gemspec
 homepage: https://github.com/fizvlad/vk-music-rb
 licenses:
@@ -179,15 +165,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.1
+      version: 2.7.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
-summary: Provides interface to work with VK music via HTTP requests
+summary: A library to work with audios on popular Russian social network
 test_files: []