vk_music 3.1.6 → 3.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6142de69f08e3ca82697048c3062fc42eea675370f64e678433f8587edc4011e
-  data.tar.gz: 8321b28592040daf8af1880c0fb15a1969ba33017cdd9a2919063c43f446ce9e
+  metadata.gz: 49d94fb81d001d5d050d274f14ab6a3931467097adb46aa84601444fba4ac312
+  data.tar.gz: b8b6433c2373a1229bf5e27e31d8bc5c7d4ae01840b0620f99e715707ddc665e
 SHA512:
-  metadata.gz: 21d19b28d4141f33ae545a5216ec6ee192df00de769b9f8cb2f9b856a997662d8bd31560f1846dac7370b142d8182baa0789d3dfa2599afc7d8bf8408f142ea5
-  data.tar.gz: e431fd771443125940ef2bb3fc611b63d3f9c7d3818caf0712af3103331f6d0643c02b3bdf5aacba61852447e10ef854cfeeb9b47a3a63278a9349585094f751
+  metadata.gz: ee9d28c4ef87b6fc12865ec267aeca8ddb24a9275c6c231f42fc68c6390b8fb9bfa8759f3d0f3b6f17e1d8e4ba8880b32976f987c0bde5edb4c1c3856a0a2ab1
+  data.tar.gz: 48451ee22f080a93a0d8fea4fbb468f1c45b97bc089dc87675663d602092ba2fb255826ef3b127129b7d6fe8855751ee6bc3869e0c59ccc8e5e4c413eb9be45d

data/Gemfile.lock

@@ -1,70 +1,70 @@
-PATH
-  remote: .
-  specs:
-    vk_music (3.1.5)
-      execjs (~> 2.7)
-      json (~> 2.0)
-      logger (~> 1.4)
-      mechanize (~> 2.7)
-      net-http-persistent (= 2.9.4)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    coderay (1.1.3)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    execjs (2.7.0)
-    http-cookie (1.0.3)
-      domain_name (~> 0.5)
-    json (2.3.1)
-    logger (1.4.2)
-    mechanize (2.7.6)
-      domain_name (~> 0.5, >= 0.5.1)
-      http-cookie (~> 1.0)
-      mime-types (>= 1.17.2)
-      net-http-digest_auth (~> 1.1, >= 1.1.1)
-      net-http-persistent (>= 2.5.2)
-      nokogiri (~> 1.6)
-      ntlm-http (~> 0.1, >= 0.1.1)
-      webrobots (>= 0.0.9, < 0.2)
-    method_source (0.9.2)
-    mime-types (3.3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.0512)
-    mini_portile2 (2.4.0)
-    minitest (5.14.1)
-    net-http-digest_auth (1.4.1)
-    net-http-persistent (2.9.4)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    nokogiri (1.10.10-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 (13.0.1)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.7)
-    unf_ext (0.0.7.7-x64-mingw32)
-    webrobots (0.1.2)
-    yard (0.9.25)
-
-PLATFORMS
-  ruby
-  x64-mingw32
-
-DEPENDENCIES
-  bundler (~> 2.0)
-  logger (~> 1.4)
-  mechanize (~> 2.7)
-  minitest (~> 5.0)
-  pry (~> 0.12.2)
-  rake (~> 13.0)
-  vk_music!
-  yard (~> 0.9)
-
-BUNDLED WITH
-   2.1.4
+PATH
+  remote: .
+  specs:
+    vk_music (3.1.7)
+      execjs (~> 2.7)
+      json (~> 2.0)
+      logger (~> 1.4)
+      mechanize (~> 2.7)
+      net-http-persistent (= 2.9.4)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    coderay (1.1.3)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
+    execjs (2.7.0)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    json (2.3.1)
+    logger (1.4.2)
+    mechanize (2.7.6)
+      domain_name (~> 0.5, >= 0.5.1)
+      http-cookie (~> 1.0)
+      mime-types (>= 1.17.2)
+      net-http-digest_auth (~> 1.1, >= 1.1.1)
+      net-http-persistent (>= 2.5.2)
+      nokogiri (~> 1.6)
+      ntlm-http (~> 0.1, >= 0.1.1)
+      webrobots (>= 0.0.9, < 0.2)
+    method_source (0.9.2)
+    mime-types (3.3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2020.0512)
+    mini_portile2 (2.4.0)
+    minitest (5.14.1)
+    net-http-digest_auth (1.4.1)
+    net-http-persistent (2.9.4)
+    nokogiri (1.10.10)
+      mini_portile2 (~> 2.4.0)
+    nokogiri (1.10.10-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 (13.0.1)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.7)
+    unf_ext (0.0.7.7-x64-mingw32)
+    webrobots (0.1.2)
+    yard (0.9.25)
+
+PLATFORMS
+  ruby
+  x64-mingw32
+
+DEPENDENCIES
+  bundler (~> 2.0)
+  logger (~> 1.4)
+  mechanize (~> 2.7)
+  minitest (~> 5.0)
+  pry (~> 0.12.2)
+  rake (~> 13.0)
+  vk_music!
+  yard (~> 0.9)
+
+BUNDLED WITH
+   2.1.4

data/lib/vk_music/client.rb

@@ -43,13 +43,12 @@ module VkMusic
     def find(query = "", type: :audio)
       raise ArgumentError if query.empty?
       uri = URI(Constants::URL::VK[:audios])
+      search_page = load_ajax(uri, { "q" => query })
       case type
       when :audio
-        uri.query = Utility.hash_to_params({ "act" => "search", "q" => query })
-        audios_from_page(uri)
+        audios_from_ajax(search_page)
       when :playlist
-        uri.query = Utility.hash_to_params({ "q" => query, "tab" => "global" })
-        urls = playlist_urls_from_page(uri)
+        urls = playlist_urls_from_page(search_page)
         urls.map { |url| playlist(url: url, up_to: 0, use_web: false) }
       else
         raise ArgumentError
@@ -363,6 +362,23 @@ module VkMusic
         raise Exceptions::ParseError, error.message, caller
       end
     end
+    ##
+    # Load response to AJAX post request.
+    # @param url [String, URI]
+    # @return [Nokogiri::XML::Document]
+    def load_ajax(url, query = {})
+      uri = URI(url) if url.class != URI
+      query["_ajax"] = 1
+      headers = { "Content-Type" => "application/x-www-form-urlencoded", "x-requested-with" => "XMLHttpRequest" }
+      VkMusic.debug("Loading #{uri} with query #{query}")
+      begin
+        page = @agent.post(uri, query, headers)
+        str = JSON.parse(page.body.strip)["data"][2]
+        Nokogiri::XML("<body>#{CGI.unescapeElement(str)}</body>")
+      rescue
+        raise Exceptions::RequestError
+      end
+    end
 
     ##
     # Load playlist web page.
@@ -458,6 +474,20 @@ module VkMusic
         raise Exceptions::ParseError
       end
     end
+    ##
+    # Load audios from AJAX data.
+    # @param page [Nokogiri::XML::Document]
+    # @return [Array<Audio>]
+    def audios_from_ajax(page)
+      begin
+        page.css(".audio_item.ai_has_btn").map do |elem|
+          data = JSON.parse(elem.attribute("data-audio"))
+          Audio.from_data(data, @id)
+        end
+      rescue
+        raise Exceptions::ParseError
+      end
+    end
 
     ##
     # Load playlist through web page requests.

data/lib/vk_music/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vk_music
 version: !ruby/object:Gem::Version
-  version: 3.1.6
+  version: 3.1.7
 platform: ruby
 authors:
 - Fizvlad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-07 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Provides interface to work with VK music via HTTP requests