vk_music 3.0.1 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c51759b83b9c94ae99db4f957e80f9d7e071d998e171813dd33ccb1883d8d5c
-  data.tar.gz: abd153ed90bc234046c4e38f41870fb66bc38ae390d7755cadce110b54c384bc
+  metadata.gz: fa5586e89dfad05d417c5b0c2466a561091c4a9383857da45fee1ee126f8b6a5
+  data.tar.gz: f4c788d950d1a36e25df46e7edbfe4507dc21078f35956f6503f18832c91b7c0
 SHA512:
-  metadata.gz: f5476442c461a25f5753cc707238ba01ee9d0cd1a180be23d8d5f7d3f46439a61bfc05106c15396745a62f2a5c8da6590c1c03f83cc0f86f5d10e95026a02505
-  data.tar.gz: 8aade904f7fe57f4c073686a9aa15173083b6ed86ec30863723573fab391daacc2a6288cb3c47fdb253d806fa3607a5c3c0ee37c152b8a38df158c2145d6ebd2
+  metadata.gz: 99793ea61b1020faa0290d94adfcbb9734deb1f7770a8f9fb5bd390ed686fe138d32f72ce5a4d2ebb80d120ed98af19179f6481d810aba63163f158d8fe05ab8
+  data.tar.gz: 0274015ac09a8189c09fdb9979c784607a08c67b4f090149e3306b73915cfd68b78c2aa729f117bf392e8bfff42e432dd303843bb7db0afe27a39f8bcd45423c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vk_music (3.0.0)
+    vk_music (3.1.0)
       execjs (~> 2.7)
       json (~> 2.0)
       logger (~> 1.4)
@@ -17,7 +17,7 @@ GEM
     execjs (2.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    json (2.2.0)
+    json (2.3.0)
     logger (1.4.1)
     mechanize (2.7.6)
       domain_name (~> 0.5, >= 0.5.1)
@@ -36,13 +36,15 @@ GEM
     minitest (5.13.0)
     net-http-digest_auth (1.4.1)
     net-http-persistent (2.9.4)
-    nokogiri (1.10.7-x64-mingw32)
+    nokogiri (1.10.8)
+      mini_portile2 (~> 2.4.0)
+    nokogiri (1.10.8-x64-mingw32)
       mini_portile2 (~> 2.4.0)
     ntlm-http (0.1.1)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    rake (10.5.0)
+    rake (13.0.1)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.6)
@@ -50,6 +52,7 @@ GEM
     yard (0.9.20)
 
 PLATFORMS
+  ruby
   x64-mingw32
 
 DEPENDENCIES
@@ -58,7 +61,7 @@ DEPENDENCIES
   mechanize (~> 2.7)
   minitest (~> 5.0)
   pry (~> 0.12.2)
-  rake (~> 10.0)
+  rake (~> 13.0)
   vk_music!
   yard (~> 0.9)
 

data/README.md

@@ -71,6 +71,13 @@ audios = client.post(url: "https://vk.com/wall-4790861_5453")
 urls = audios.map(&:url) # URLs for every audio
 ```
 
+### Recommended audios and etc
+You can load audios from recommended sections, novices and VK charts:
+
+```ruby
+audios = client.block(url: "https://m.vk.com/audio?act=block&block=PUlQVA8GR0R3W0tMF2teRGpJUVQPGVpfdF1YRwMGXUpkXktMF2tYUWRHS0IXDlpKZFpcVA8FFg")
+```
+
 
 ## Development
 

data/bin/console

@@ -7,4 +7,18 @@ require "vk_music"
 # with your gem easier. You can also use a different console, if you like.
 
 require "pry"
+
+print "Login (leave this empty if no login required): "
+username = STDIN.gets.chomp
+
+unless username.empty?
+  print "Password: "
+  password = STDIN.gets.chomp
+  puts
+
+  $client = VkMusic::Client.new(username: username, password: password)
+  puts "You can now access client at $client"
+end
+puts
+
 Pry.start

data/lib/vk_music/client.rb

@@ -196,6 +196,7 @@ module VkMusic
       end
     end
     alias_method :from_id, :get_urls
+
     ##
     # Update download URLs of audios.
     # @param audios [Array<Audio>]
@@ -207,6 +208,25 @@ module VkMusic
       end
     end
 
+    ##
+    # Retrieve audios from recommendations or alike pages.
+    # Specify either +url+ or +block_id+.
+    # @param url [String] URL.
+    # @param block_id [String] ID of block.
+    # @return [Array<Audio>] array of audios attached to post. Most of audios will
+    #   already have download URLs, but there might be audios which can't be resolved.
+    def block(url: nil, block_id: nil)
+      begin
+        block_id = url.match(Constants::Regex::VK_BLOCK_URL).captures.first if url
+      rescue
+        raise Exceptions::ParseError
+      end
+
+      uri = URI(Constants::URL::VK[:audios])
+      uri.query = Utility.hash_to_params({ "act" => "block", "block" => block_id })
+      audios_from_page(uri)
+    end
+
     ##
     # @!endgroup
 

data/lib/vk_music/constants.rb

@@ -22,7 +22,7 @@ module VkMusic
         login_action: "https://login.vk.com",
         wall: "https://m.vk.com/wall",
         audio_unavailable: "https://m.vk.com/mp3/audio_api_unavailable.mp3",
-        profile_audios: "https://m.vk.com/audios",
+        profile_audios: "https://m.vk.com/audios"
       }
     end
 
@@ -59,6 +59,9 @@ module VkMusic
       ##
       # Post URL regular expression #2.
       VK_WALL_URL_POSTFIX = /.*wall(-?\d+)_(\d+)/
+      ##
+      # Audios block ID
+      VK_BLOCK_URL = /(?:section=recoms_block&type=|act=block&block=)([a-zA-Z\d]+)/
     end
 
     ##

data/lib/vk_music/utility.rb

@@ -29,6 +29,8 @@ module VkMusic
           :playlist
         when Constants::Regex::VK_WALL_URL_POSTFIX, Constants::Regex::VK_POST_URL_POSTFIX
           :post
+        when Constants::Regex::VK_BLOCK_URL
+          :block
         when Constants::Regex::VK_URL
           :audios
         else

data/lib/vk_music/version.rb

@@ -1,5 +1,5 @@
 module VkMusic
   ##
   # Library version.
-  VERSION = "3.0.1"
+  VERSION = "3.1.1"
 end

data/vk_music.gemspec

@@ -1,40 +1,40 @@
-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", "~> 10.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
+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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vk_music
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.1
 platform: ruby
 authors:
 - Fizvlad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-12 00:00:00.000000000 Z
+date: 2020-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.0.pre2
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Provides interface to work with VK music via HTTP requests