vk_music 2.1.5 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c686eab537cc09b5b535b48ab5ec5bec07f7de32b40ef24da79581dfc4a9db1
-  data.tar.gz: 5bfa7741c641c5cc7207df7e4b9a6733287c255e6d83437bcd34077a34c241ac
+  metadata.gz: 6a40ac2ba500bdf24f6ccb6e645216bd4716458d5c795c8a65acc82887dd37a0
+  data.tar.gz: 0ad38527b6a893916a904d3eca60f55aac5d534255cdcff1a0ff0f60ba0794e7
 SHA512:
-  metadata.gz: c6bb22c0d5e613e04021f525e40addbe27d3f81892a3dc9799be64b6b08efd59ca5241eb2824ff88ba620ddf1fca9ee555b8e748eba73a47f73cac1cee750b00
-  data.tar.gz: 27250ddbe84cd15da149bbc259acc54c4d20a441dca6b1286cded0d08d4623de27da1f13a60a2d3b7d2cb045bfcd019a5e8abd6cda950e970a211bf69d17ee05
+  metadata.gz: 408afa4efb6f4ca2b4deb6f7670775bd8569cebab42d6d825f7cd4f60a3503ebc53b415b5046ad69254ca4d4ffb526858428a23f4fde4ba2cdb81eee05c245db
+  data.tar.gz: 64ee9349066a69fbef74d3b84cf03bea651bc30504eef7a009e243e5889bcf28be7281bbbfb8b20b491c2d748c2961531461c98a8c7966d0b0e3e8957b1eea97

data/.gitignore

@@ -0,0 +1,8 @@
+/.bundle/
+/.yardoc
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/

data/.travis.yml

@@ -0,0 +1,7 @@
+---
+sudo: false
+language: ruby
+cache: bundler
+rvm:
+  - 2.6.5
+before_install: gem install bundler -v 2.0.2

data/Gemfile

@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+
+# Specify your gem's dependencies in vk_music.gemspec
+gemspec
+
+gem "logger", "~> 1.4"
+
+gem "mechanize", "~> 2.7"

data/Gemfile.lock

@@ -0,0 +1,60 @@
+PATH
+  remote: .
+  specs:
+    vk_music (2.2.0)
+      execjs (~> 2.7)
+      json (~> 2.0)
+      logger (~> 1.4)
+      mechanize (~> 2.7)
+      net-http-persistent (= 2.9.4)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    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.2.0)
+    logger (1.4.1)
+    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)
+    mime-types (3.3)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2019.1009)
+    mini_portile2 (2.4.0)
+    minitest (5.12.2)
+    net-http-digest_auth (1.4.1)
+    net-http-persistent (2.9.4)
+    nokogiri (1.10.4-x64-mingw32)
+      mini_portile2 (~> 2.4.0)
+    ntlm-http (0.1.1)
+    rake (10.5.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.6)
+    webrobots (0.1.2)
+    yard (0.9.20)
+
+PLATFORMS
+  x64-mingw32
+
+DEPENDENCIES
+  bundler (~> 2.0)
+  logger (~> 1.4)
+  mechanize (~> 2.7)
+  minitest (~> 5.0)
+  rake (~> 10.0)
+  vk_music!
+  yard (~> 0.9)
+
+BUNDLED WITH
+   2.0.2

data/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2019 Fizvlad
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -1,75 +1,81 @@
-# vk_music
-
-*vk_music* gem is a library to work with audios on popular Russian social network [vk.com](https://www.vk.com "vk.com"). VK disabled their public API for audios, so it is now necessary to use parsers instead.
-
-
-## Dependencies
-
-* [mechanize](https://github.com/sparklemotion/mechanize "mechanize") (interaction with website)
-* [execjs](https://github.com/rails/execjs "execjs") (JS interpreter)
-
-
-## Installation
-
-Simpliest way to install gem:
-```
-gem install vk_music
-```
-
-Alternatively, you can build gem from sources with following command:
-```
-gem build vk_music.gemspec
-```
-
-... and install it:
-```
-gem install vk_music-*.gem
-```
-
-
-## Usage
-
-You can take a look on documentation [here](https://www.rubydoc.info/gems/vk_music/).
-
-### Logging in
-Firstly, it is required to create new *VkMusic::Client* and provide login credentials:
-```ruby
-client = VkMusic::Client.new(username: "+71234567890", password: "password")
-```
-
-### Searching for audios
-You can search audios by name with following method:
-```ruby
-audios = client.find("Acid Spit - Mega Drive")
-puts audios[0]     # Basic information about audio
-puts audios[0].url # URL to access audio. Notice that it is only accessible from your IP
-```
-
-### Parsing playlists
-You can load all the audios from playlist using following method:
-```ruby
-playlist = client.playlist("https://vk.com/audio?z=audio_playlist-37661843_1/0e420c32c8b69e6637")
-```
-It is only possible to load up to 100 audios from playlist per request, so you can reduce amount of requests by setting up how many audios from playlist you actually need.
-For example, following method will perform only one HTML request:
-```ruby
-playlist = client.playlist("https://vk.com/audio?z=audio_playlist121570739_7", up_to: 100)
-urls = playlist.map(&:url) # URLs for every audio
-```
-
-### User or group audios
-You can load first 100 audios from user or group page. Those audios will be returned as playlist. To do it simply pass user or group id:
-```ruby
-user_playlist = client.audios(owner_id: 8024985)
-group_playlist = client.audios(owner_id: -4790861) # Group and public id starts with '-'
-```
-You can set how many audios you actually need as well:
-```ruby
-user_playlist = client.audios(owner_id: 8024985, up_to: 10)
-```
-
-### Audios from post
-You can load up to 10 audios attached to some post. Those audios will be returned as array:
-```ruby
-audios = client.post("https://vk.com/wall-4790861_5453")
-```
+# VkMusic
+
+*vk_music* gem is a library to work with audios on popular Russian social network [vk.com](https://www.vk.com "vk.com"). VK disabled their public API for audios, so it is now necessary to use parsers instead.
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'vk_music'
+```
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install vk_music
+
+## Usage
+
+You can take a look on documentation [here](https://www.rubydoc.info/gems/vk_music/).
+
+### Logging in
+Firstly, it is required to create new *VkMusic::Client* and provide login credentials:
+```ruby
+client = VkMusic::Client.new(username: "+71234567890", password: "password")
+```
+
+### Searching for audios
+You can search audios by name with following method:
+```ruby
+audios = client.find("Acid Spit - Mega Drive")
+puts audios[0]     # Basic information about audio
+puts audios[0].url # URL to access audio. Notice that it is only accessible from your IP
+```
+
+### Parsing playlists
+You can load all the audios from playlist using following method:
+```ruby
+playlist = client.playlist("https://vk.com/audio?z=audio_playlist-37661843_1/0e420c32c8b69e6637")
+```
+It is only possible to load up to 100 audios from playlist per request, so you can reduce amount of requests by setting up how many audios from playlist you actually need.
+For example, following method will perform only one HTML request:
+```ruby
+playlist = client.playlist("https://vk.com/audio?z=audio_playlist121570739_7", up_to: 100)
+urls = playlist.map(&:url) # URLs for every audio
+```
+
+### User or group audios
+You can load first 100 audios from user or group page. Those audios will be returned as playlist. To do it simply pass user or group id:
+```ruby
+user_playlist = client.audios(owner_id: 8024985)
+group_playlist = client.audios(owner_id: -4790861) # Group and public id starts with '-'
+```
+You can set how many audios you actually need as well:
+```ruby
+user_playlist = client.audios(owner_id: 8024985, up_to: 10)
+```
+
+### Audios from post
+You can load up to 10 audios attached to some post. Those audios will be returned as array:
+```ruby
+audios = client.post("https://vk.com/wall-4790861_5453")
+```
+
+
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/fizvlad/vk-music-rb/issues.
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/Rakefile

@@ -1,41 +1,25 @@
-desc "Create documentation"
-task :doc do
-  puts `yardoc`
-end
-
-desc "Build gem file"
-task :build do
-  puts `gem build vk_music.gemspec`
-end
-
-desc "Uninstall gem"
-task :uninstall do
-  puts `gem uninstall vk_music`
-end
-
-desc "Build and install gem"
-task :install_local => :build do
-  puts `gem install ./vk_music-*.gem`
-end
-
-desc "Run tests"
-task :test do
-  puts "Running tests require login credetionals (NOTICE: they won't be hidden in anyway)"
-  
-  print "Login:    "
-  username = STDIN.gets.chomp
-  
-  print "Password: "
-  password = STDIN.gets.chomp
-  puts
-  
-  print "Path to SSL certificate (leave empty if there is no troubles with SSL): "
-  ssl_cert_path = STDIN.gets.chomp
-  puts
-  ENV["SSL_CERT_FILE"] = ssl_cert_path unless ssl_cert_path.empty?
-  
-  Dir[ "test/test*.rb" ].each do |file|
-    puts "\n\nRunning #{file}:"
-    ruby "-w #{file} '#{username}' '#{password}'"
-  end
-end
+require "bundler/gem_tasks"
+require "rake/testtask"
+
+task :test do
+  puts "Running tests require login credetionals (NOTICE: they won't be hidden in anyway)"
+  
+  print "Login:    "
+  username = STDIN.gets.chomp
+  
+  print "Password: "
+  password = STDIN.gets.chomp
+  puts
+  
+  print "Path to SSL certificate (leave empty if there is no troubles with SSL): "
+  ssl_cert_path = STDIN.gets.chomp
+  puts
+  ENV["SSL_CERT_FILE"] = ssl_cert_path unless ssl_cert_path.empty?
+  
+  Dir[ "test/test_*.rb" ].each do |file|
+    puts "\n\nRunning #{file}:"
+    ruby "-w #{file} '#{username}' '#{password}'"
+  end
+end
+
+task :default => :test

data/bin/console

@@ -1,6 +1,14 @@
 #!/usr/bin/env ruby
 
-require_relative "../lib/vk_music.rb"
-require "irb"
+require "bundler/setup"
+require "vk_music"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
 
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
 IRB.start(__FILE__)

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/lib/vk_music.rb

@@ -1,7 +1,18 @@
-require_relative "vk_music/constants.rb"
-require_relative "vk_music/exceptions.rb"
-require_relative "vk_music/utility.rb"
-require_relative "vk_music/link_decoder.rb"
-require_relative "vk_music/audio.rb"
-require_relative "vk_music/playlist.rb"
-require_relative "vk_music/client.rb"
+require "cgi"
+require "logger"
+require "mechanize"
+require "execjs"
+require "json"
+
+require "vk_music/version"
+require "vk_music/constants"
+require "vk_music/exceptions"
+require "vk_music/utility"
+require "vk_music/link_decoder"
+require "vk_music/audio"
+require "vk_music/playlist"
+require "vk_music/client"
+
+##
+# Main module.
+module VkMusic; end

data/lib/vk_music/audio.rb

@@ -1,5 +1,3 @@
-require "cgi"
-
 ##
 # @!macro [new] options_hash_param
 #   @param options [Hash] hash with options.
@@ -59,6 +57,13 @@ module VkMusic
     # @return [Integer, nil] user ID which should be use for decoding.
     attr_reader :client_id
 
+    ##
+    # @return [String, nil] full ID of audio or +nil+ if some of components are missing.
+    def full_id
+      return nil unless @owner_id && @id && @secret_1 && @secret_2
+      "#{@owner_id}_#{@id}_#{@secret_1}_#{@secret_2}"
+    end
+
     ##
     # @return [Boolean] whether decoded URL is already cached.
     def url_cached?
@@ -86,7 +91,15 @@ module VkMusic
     ##
     # @return [String] extended information about audio.
     def pp
-      "#{to_s} (Able to get decoded URL: #{url_available? ? "yes" : "no"}, able to get URL from VK: #{url_accessable? ? "yes" : "no"})"
+      "#{to_s} (#{
+        if url_available?
+          "Able to get decoded URL right away"
+        elsif url_accessable?
+          "Able to retrieve URL with request"
+        else
+          "URL not accessable"
+        end
+      })"
     end
 
     ##
@@ -146,8 +159,8 @@ module VkMusic
       @owner_id    = Utility.unless_nil_to Integer, options[:owner_id]
       @secret_1    = Utility.unless_nil_to String, options[:secret_1]
       @secret_2    = Utility.unless_nil_to String, options[:secret_2]
-      @artist      = options[:artist].to_s
-      @title       = options[:title].to_s
+      @artist      = options[:artist].to_s.strip
+      @title       = options[:title].to_s.strip
       @duration    = options[:duration].to_i
       @url_encoded = Utility.unless_nil_to String, options[:url_encoded]
       @url         = Utility.unless_nil_to String, options[:url]
@@ -162,20 +175,30 @@ module VkMusic
     #
     # @return [Audio]
     def self.from_node(node, client_id)
-      url_encoded = node.at_css("input").attribute("value").to_s
-      url_encoded = nil if url_encoded == Constants::URL::VK[:audio_unavailable] || url_encoded.empty?
-      id_array = node.attribute("data-id").to_s.split("_")
-      
-      new({
-        :id => id_array[1].to_i,
-        :owner_id => id_array[0].to_i,
-        :artist => node.at_css(".ai_artist").text.strip,
-        :title => node.at_css(".ai_title").text.strip,
-        :duration => node.at_css(".ai_dur").attribute("data-dur").to_s.to_i,
-        :url_encoded => url_encoded,
-        :url => nil,
-        :client_id => client_id
-      })
+      input = node.at_css("input")
+      if input
+        url_encoded = input.attribute("value").to_s
+        url_encoded = nil if url_encoded == Constants::URL::VK[:audio_unavailable] || url_encoded.empty?
+        id_array = node.attribute("data-id").to_s.split("_")
+        
+        new({
+          :id => id_array[1].to_i,
+          :owner_id => id_array[0].to_i,
+          :artist => node.at_css(".ai_artist").text.strip,
+          :title => node.at_css(".ai_title").text.strip,
+          :duration => node.at_css(".ai_dur").attribute("data-dur").to_s.to_i,
+          :url_encoded => url_encoded,
+          :url => nil,
+          :client_id => client_id
+        })
+      else
+        # Probably audios from some post
+        new({
+          :artist => node.at_css(".medias_audio_artist").text.strip,
+          :title => Utility.plain_text(node.at_css(".medias_audio_title")).strip,
+          :duration => Utility.parse_duration(node.at_css(".medias_audio_dur").text)
+        })
+      end
     end
     
     ##