vk_music 1.1.1 → 2.0.0

data/test/test_playlist.rb

@@ -11,47 +11,76 @@ end
 class TestVkMusic < MiniTest::Test
 
   def test_playlist_small
-    pl = CLIENT.get_playlist("https://vk.com/audio?z=audio_playlist-37661843_1/0e420c32c8b69e6637")
+    pl = CLIENT.playlist("https://vk.com/audio?z=audio_playlist-37661843_1/0e420c32c8b69e6637")
     refute_empty(pl, "This playlist must not be empty")
     assert_instance_of(VkMusic::Audio, pl[0], "Playlist members must be of class Audio")
     refute_empty(pl[0].url, "Audio must have download url")
     refute_empty(pl[-1].url, "Audio must have download url")
   end
+
+  def test_playlist_small_with_options
+    pl = CLIENT.playlist(owner_id: -37661843, playlist_id: 1, access_hash: "0e420c32c8b69e6637", with_url: false)
+    refute_empty(pl, "This playlist must not be empty")
+    assert_instance_of(VkMusic::Audio, pl[0], "Playlist members must be of class Audio")
+    assert(pl[0].url_accessable?, "Audio must have all the data needed for getting download URL")
+    assert(pl[-1].url_accessable?, "Audio must have all the data needed for getting download URL")
+  end
   
   def test_playlist_large
-    pl = CLIENT.get_playlist("https://vk.com/audio?z=audio_playlist121570739_7")
+    pl = CLIENT.playlist("https://vk.com/audio?z=audio_playlist121570739_7")
     refute_empty(pl, "This playlist must not be empty")
     refute_empty(pl[0].url, "Audio must have download url")
     refute_empty(pl[-1].url, "Audio must have download url")
   end
   
   def test_playlist_empty
-    pl = CLIENT.get_playlist("https://vk.com/audios437727675?section=playlists&z=audio_playlist437727675_2")
+    pl = CLIENT.playlist("https://vk.com/audios437727675?section=playlists&z=audio_playlist437727675_2")
     assert_empty(pl, "This playlist must be empty")
   end
   
   def test_playlist_dont_exist    
-    assert_raises(VkMusic::PlaylistParseError) do
-      CLIENT.get_playlist("https://m.vk.com/audio?act=audio_playlist437727675_300")
+    assert_raises(VkMusic::ParseError) do
+      CLIENT.playlist("https://m.vk.com/audio?act=audio_playlist437727675_300")
+    end
+    assert_raises(VkMusic::ParseError) do
+      CLIENT.playlist("https://m.vk.com/audio?act=audio_playlist437727675_300", with_url: false)
     end
   end
   
   def test_playlist_no_access    
-    assert_raises(VkMusic::PlaylistParseError) do
-      CLIENT.get_playlist("https://m.vk.com/audio?act=audio_playlist1_1")
+    assert_raises(VkMusic::ParseError) do
+      CLIENT.playlist("https://m.vk.com/audio?act=audio_playlist1_1")
+    end
+    assert_raises(VkMusic::ParseError) do
+      CLIENT.playlist("https://m.vk.com/audio?act=audio_playlist1_1", with_url: false)
     end
   end
   
   def test_playlist_with_upper_limit
-    pl = CLIENT.get_playlist("https://vk.com/audio?z=audio_playlist121570739_7", 113)
+    pl = CLIENT.playlist("https://vk.com/audio?z=audio_playlist121570739_7", up_to: 113)
     assert_equal(113, pl.length, "Size of result must match given limit") # This playlist got more audios
     refute_empty(pl[0].url, "Audio must have download url")
     refute_empty(pl[-1].url, "Audio must have download url")
   end
+
+  def test_playlist_without_url
+    pl = CLIENT.playlist("https://vk.com/audio?z=audio_playlist121570739_7", with_url: false)
+    assert(pl[0].url_accessable?, "Audio must have all the data needed for getting download URL")
+    assert(pl[-1].url_accessable?, "Audio must have all the data needed for getting download URL")
+  end
   
   def test_bad_url
-    assert_raises(VkMusic::PlaylistParseError) do
-      CLIENT.get_playlist("ae")
+    assert_raises(ArgumentError) do
+      CLIENT.playlist("ae")
+    end
+    assert_raises(ArgumentError) do
+      CLIENT.playlist("ae", with_url: false)
+    end
+  end
+
+  def test_bad_arg
+    assert_raises(ArgumentError) do
+      CLIENT.playlist("ae", "bc")
     end
   end
   

data/test/test_post.rb

@@ -11,7 +11,15 @@ end
 class TestVkMusic < MiniTest::Test
 
   def test_single_audio
-    audios = CLIENT.get_audios_from_post("https://vk.com/wall-184089233_6")
+    audios = CLIENT.post("https://vk.com/wall-184089233_6")
+    assert_instance_of(Array, audios, "Result must be of class Array")
+    assert_equal(1, audios.length, "This post got 1 attached audio")
+    assert_instance_of(VkMusic::Audio, audios[0], "Array must consist of class Audio")
+    refute_empty(audios[0].url, "Audio must have download url")
+  end
+
+  def test_single_audio_with_options
+    audios = CLIENT.post(owner_id: -184089233, post_id: 6)
     assert_instance_of(Array, audios, "Result must be of class Array")
     assert_equal(1, audios.length, "This post got 1 attached audio")
     assert_instance_of(VkMusic::Audio, audios[0], "Array must consist of class Audio")
@@ -19,56 +27,50 @@ class TestVkMusic < MiniTest::Test
   end
   
   def test_no_audio
-    audios = CLIENT.get_audios_from_post("https://vk.com/wall-184089233_2")
+    audios = CLIENT.post("https://vk.com/wall-184089233_2")
     assert_empty(audios, "This post got no attached audio")
   end
   
   def test_url_to_reply
-    audios = CLIENT.get_audios_from_post("https://m.vk.com/wall-4790861_10108")
+    audios = CLIENT.post("https://m.vk.com/wall-4790861_10108")
     assert_equal(1, audios.length, "Although this link redirects to comment, audios from post must be parsed")
   end
   
   def test_playlist
-    audios = CLIENT.get_audios_from_post("vk.com/wall-184089233_4")
+    audios = CLIENT.post("vk.com/wall-184089233_4")
     assert_empty(audios, "This post got attached playlist but those audios must not be parsed")
   end
   
   def test_comments_with_audios
-    audios = CLIENT.get_audios_from_post("https://m.vk.com/wall-39786657_189247")
+    audios = CLIENT.post("https://m.vk.com/wall-39786657_189247")
     assert_equal(1, audios.length, "This post got comments with audios but those audios must not be parsed")
   end
 
   def test_repost_with_no_audios
-    audios = CLIENT.get_audios_from_post("https://vk.com/wall-184936953_1")
+    audios = CLIENT.post("https://vk.com/wall-184936953_1")
     assert_empty(audios, "This post got no attached audios")
   end
 
   def test_repost_with_audios
-    audios = CLIENT.get_audios_from_post("https://vk.com/wall-184936953_2")
+    audios = CLIENT.post("https://vk.com/wall-184936953_2")
     assert_equal(1, audios.length, "This repost got 1 attached audio")
     refute_empty(audios[0].url, "Audio must have download url")
   end
   
   def test_repost_with_playlist
-    audios = CLIENT.get_audios_from_post("https://vk.com/wall-184936953_3")
+    audios = CLIENT.post("https://vk.com/wall-184936953_3")
     assert_empty(audios, "This post got no attached audios")
   end
   
   def test_bad_url
-    assert_raises(VkMusic::PostParseError) do
-      CLIENT.get_audios_from_post("ae")
+    assert_raises(ArgumentError) do
+      CLIENT.post("ae")
     end
   end
   
-  def test_nonexistent_post_1
-    assert_raises(VkMusic::PostParseError) do
-      CLIENT.get_audios_from_post("https://m.vk.com/wall-4790861_1052600000")
-    end
-  end
-
-  def test_nonexistent_post_2
-    assert_raises(VkMusic::PostParseError) do
-      CLIENT.get_audios_from_post("https://m.vk.com/wall-4790861_-1")
+  def test_nonexistent_post
+    assert_raises(VkMusic::ParseError) do
+      CLIENT.post("https://m.vk.com/wall-4790861_1052600000")
     end
   end
   

data/test/test_wall.rb

@@ -0,0 +1,56 @@
+require "minitest/autorun"
+require_relative "../lib/vk_music.rb"
+
+begin
+  CLIENT = VkMusic::Client.new(username: ARGV[0], password: ARGV[1])
+rescue VkMusic::LoginError
+  puts "Unable to login! Please check provided credetionals"
+  exit
+end
+
+class TestVkMusic < MiniTest::Test
+
+  def test_url_1
+    arr = CLIENT.wall("https://vk.com/mashup", up_to: 10)
+    assert_instance_of(Array, arr, "Result must be an array")
+    refute_empty(arr, "There must be something on the wall")
+    assert_equal(10, arr.size, "Size must be exactly the given")
+    assert_instance_of(VkMusic::Audio, arr[0], "Playlist members must be of class Audio")
+    refute_empty(arr[0].url, "Audio must have download url")
+    refute_empty(arr[-1].url, "Audio must have download url")
+  end
+
+  def test_url_2
+    arr = CLIENT.wall("https://vk.com/mashup", with_url: false)
+    refute_empty(arr, "There must be something on the wall")
+    assert_instance_of(VkMusic::Audio, arr[0], "Playlist members must be of class Audio")
+    assert(arr[0].url_accessable?, "Audio must have accessable URL")
+    assert(arr[-1].url_accessable?, "Audio must have accessable URL")
+  end
+
+  def test_ids
+    arr = CLIENT.wall(owner_id: -39786657, post_id: 204102, with_url: false)
+    refute_empty(arr, "There must be something on the wall")
+    assert_instance_of(VkMusic::Audio, arr[0], "Playlist members must be of class Audio")
+    assert(arr[0].url_accessable?, "Audio must have accessable URL")
+    assert(arr[-1].url_accessable?, "Audio must have accessable URL")
+  end
+
+  def test_empty_wall
+    arr = CLIENT.wall("https://vk.com/club185224844")
+    assert_empty(arr, "This wall is empty")
+  end
+
+  def test_bad_url
+    assert_raises(VkMusic::ParseError) do
+      CLIENT.wall("abc")
+    end
+  end
+
+  def test_not_accessable_page
+    assert_raises(VkMusic::ParseError) do
+      CLIENT.wall("https://vk.com/club2")
+    end
+  end
+  
+end

data/vk_music.gemspec

@@ -2,7 +2,7 @@ Gem::Specification.new do |s|
   s.name           = "vk_music"
   s.summary        = "Provides interface to work with VK music via HTTP requests"
   s.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."
-  s.version        = "1.1.1"
+  s.version        = "2.0.0"
   s.author         = "Kuznetsov Vladislav"
   s.email          = "fizvlad@mail.ru"
   s.homepage       = "https://github.com/fizvlad/vk-music-rb"
@@ -16,5 +16,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "net-http-persistent", "2.9.4" # Required for mechanize. Future versions cause error.
   s.add_runtime_dependency "execjs",    "~>2.7"
   s.add_runtime_dependency "json",      "~>2.0"
-  s.add_runtime_dependency "rake",      "~>12.3"
+
+  s.add_development_dependency "rake", "~>12.3"
+  s.add_development_dependency "yard", "~>0.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vk_music
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Kuznetsov Vladislav
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-02 00:00:00.000000000 Z
+date: 2019-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -73,13 +73,27 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.3'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.3'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 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.
 email: fizvlad@mail.ru
@@ -98,13 +112,16 @@ files:
 - lib/vk_music/link_decoder.rb
 - lib/vk_music/playlist.rb
 - lib/vk_music/utility.rb
-- test/test_audios_by_id.rb
-- test/test_get_id.rb
+- test/test_attached_audios_amount.rb
+- test/test_audios.rb
+- test/test_find.rb
+- test/test_from_id.rb
+- test/test_last_post_id.rb
 - test/test_login.rb
+- test/test_page_id.rb
 - test/test_playlist.rb
 - test/test_post.rb
-- test/test_search.rb
-- test/test_user_or_group_audios.rb
+- test/test_wall.rb
 - vk_music.gemspec
 homepage: https://github.com/fizvlad/vk-music-rb
 licenses:
@@ -130,10 +147,13 @@ signing_key:
 specification_version: 4
 summary: Provides interface to work with VK music via HTTP requests
 test_files:
-- test/test_audios_by_id.rb
-- test/test_get_id.rb
+- test/test_attached_audios_amount.rb
+- test/test_audios.rb
+- test/test_find.rb
+- test/test_from_id.rb
+- test/test_last_post_id.rb
 - test/test_login.rb
+- test/test_page_id.rb
 - test/test_playlist.rb
 - test/test_post.rb
-- test/test_search.rb
-- test/test_user_or_group_audios.rb
+- test/test_wall.rb

data/test/test_audios_by_id.rb

@@ -1,49 +0,0 @@
-require "minitest/autorun"
-require_relative "../lib/vk_music.rb"
-
-begin
-  CLIENT = VkMusic::Client.new(username: ARGV[0], password: ARGV[1])
-rescue VkMusic::LoginError
-  puts "Unable to login! Please check provided credetionals"
-  exit
-end
-
-class TestVkMusic < MiniTest::Test
-
-  def test_one_id
-    results = CLIENT.get_audios_by_id("2000202604_456242434_32f6f3df29dc8e9c71_82fbafed15ef65709b")
-    refute_empty(results, "There must be some music")
-    assert_instance_of(Array, results, "Resultmust be an Array")
-    assert_instance_of(VkMusic::Audio, results[0], "Results of search must be of class Audio")
-    refute_empty(results[0].url, "Audio must have download url")
-  end
-
-  def test_two_id
-    results = CLIENT.get_audios_by_id("2000202604_456242434_32f6f3df29dc8e9c71_82fbafed15ef65709b",
-                                     ["2000023175", "456242595", "addd832f78d7c61b6d", "b6b14f49280d4d55f0"])
-    assert_equal(2, results.size, "There must be 2 audios")
-    refute_empty(results[1].url, "Audio must have download url")
-  end
-
-  def test_bad_last
-    assert_raises(VkMusic::ReloadAudiosParseError) do
-      CLIENT.get_audios_by_id("2000202604_456242434_32f6f3df29dc8e9c71_82fbafed15ef65709b",
-                             ["42", "1337", "aaaa", "aaaaaa"])
-    end
-  end
-
-  def test_bad_first
-    assert_raises(VkMusic::ReloadAudiosParseError) do
-      CLIENT.get_audios_by_id(["42", "1337", "aaaa", "aaaaaa"],
-                               "2000202604_456242434_32f6f3df29dc8e9c71_82fbafed15ef65709b")
-    end
-  end
-
-  def test_bad_all
-    assert_raises(VkMusic::ReloadAudiosParseError) do
-      CLIENT.get_audios_by_id(["42", "1337", "aaaa", "aaaaaa"],
-                               "123_123_123_123")
-    end
-  end
-  
-end

data/test/test_get_id.rb

@@ -1,113 +0,0 @@
-require "minitest/autorun"
-require_relative "../lib/vk_music.rb"
-
-begin
-  CLIENT = VkMusic::Client.new(username: ARGV[0], password: ARGV[1])
-rescue VkMusic::LoginError
-  puts "Unable to login! Please check provided credetionals"
-  exit
-end
-
-class TestVkMusic < MiniTest::Test
-
-  def test_user_link_with_id
-    id = CLIENT.get_id("https://vk.com/id51842614")
-    assert_equal("51842614", id, "Ids don't match")
-  end
-  
-  def test_user_custom_link
-    id = CLIENT.get_id("https://vk.com/kopatych56")
-    assert_equal("51842614", id, "Ids don't match")
-  end
-  
-  def test_user_custom
-    id = CLIENT.get_id("kopatych56")
-    assert_equal("51842614", id, "Ids don't match")
-  end
-  
-  def test_user_id
-    id = CLIENT.get_id("51842614")
-    assert_equal("51842614", id, "Ids don't match")
-  end  
-  
-  def test_user_id_with_prefix
-    id = CLIENT.get_id("id51842614")
-    assert_equal("51842614", id, "Ids don't match")
-  end
-  
-  def test_user_audios
-    id = CLIENT.get_id("https://vk.com/audios51842614")
-    assert_equal("51842614", id, "Ids don't match")
-  end
-  
-  
-  def test_group_link_with_id
-    id = CLIENT.get_id("https://vk.com/public39786657")
-    assert_equal("-39786657", id, "Ids don't match")
-  end
-  
-  def test_group_custom_link
-    id = CLIENT.get_id("https://vk.com/mashup")
-    assert_equal("-39786657", id, "Ids don't match")
-  end
-  
-  def test_group_custom
-    id = CLIENT.get_id("mashup")
-    assert_equal("-39786657", id, "Ids don't match")
-  end
-  
-  def test_group_id
-    id = CLIENT.get_id("-39786657")
-    assert_equal("-39786657", id, "Ids don't match")
-  end
-  
-  def test_group_id_with_prefix
-    id = CLIENT.get_id("public39786657")
-    assert_equal("-39786657", id, "Ids don't match")
-  end
-  
-  def test_group_audios
-    id = CLIENT.get_id("https://vk.com/audios-39786657")
-    assert_equal("-39786657", id, "Ids don't match")
-  end
-  
-  
-  def test_user_deleted
-    id = CLIENT.get_id("https://vk.com/id245722576")
-    assert_equal("245722576", id, "Ids don't match")
-  end
-  
-  def test_user_no_photos
-    id = CLIENT.get_id("drop_the_treble")
-    assert_equal("437727675", id, "Ids don't match")
-  end
-  
-  def test_user_private
-    id = CLIENT.get_id("poppingeyesocketcherry") # I hope this guy won't change his custom
-    assert_equal("300415", id, "Ids don't match")
-  end
-  
-  def test_group_no_photos
-    id = CLIENT.get_id("vk.com/opentestroom")
-    assert_equal("-184089233", id, "Ids don't match")
-  end
-  
-  def test_bad_url
-    assert_raises(VkMusic::IdParseError) do
-      CLIENT.get_id("https://vk.com/feed")
-    end
-  end
-  
-  def test_bad_custom
-    assert_raises(VkMusic::IdParseError) do
-      CLIENT.get_id("a")
-    end
-  end
-  
-  def test_empty
-    assert_raises(VkMusic::IdParseError) do
-      CLIENT.get_id("")
-    end
-  end
-  
-end