directlink 0.0.8.1 → 0.0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a692b5ff0cc96ba9acd3383150c2db6df97cf061
-  data.tar.gz: ce9ee5b9edc2aafcf717ab4b3574695914a6ce9d
+  metadata.gz: 691f70bd0cb87dd6ba19a8a70148ce41cb366082
+  data.tar.gz: 84c2af4549db91eda6e08bb8fdd465f6fd451ef1
 SHA512:
-  metadata.gz: 965bf3f132fce53ea31ddefea4dab9c901c66d6ffc33a0f2dfe6635847750323481ad34517ee2a03118d128c3aef77f66062021bf538be32e7586cb3050dbc25
-  data.tar.gz: 37d541655fdb921623fe5acb88eefe35db2d7a3c637dc56231b0fb8159ff9ccc75362c8abbbbcc4a0e26c6949b5ce84b027915765f0b8b20c1b5ca2f9a529f99
+  metadata.gz: 62600e89107b2cb3d53c9da8570173f88c389b8d9dde3503ebcafdd4e884fcae8871471aa53f297523683737df288c0127ed1db262e1d64b71ebcd85569fa3e4
+  data.tar.gz: ea9c2f936023361b9389404d30830e106a629ead049a1bcdf9631fe057d0e6c7dae8c73b328775ecb7649dbe780864a50d32bf6545f40b40702db40adf585bf4

data/directlink.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name         = "directlink"
-  spec.version      = "0.0.8.1"
+  spec.version      = "0.0.8.2"
   spec.summary      = "converts any kind of image hyperlink to direct link, type of image and its resolution"
 
   spec.author       = "Victor Maslov aka Nakilon"

data/lib/directlink.rb

@@ -242,12 +242,27 @@ module DirectLink
   end
 
   def self.vk link
-    raise ErrorBadLink.new link unless %r{\Ahttps://vk\.com/id(?<user_id>\d+)\?z=photo(?<id>\k<user_id>_\d+)(%2Falbum\k<user_id>_0)?\z} =~ link
+    id, mtd, field, f = case link
+    when %r{\Ahttps://vk\.com/id(?<user_id>\d+)\?z=photo(?<id>\k<user_id>_\d+)(%2Falbum\k<user_id>_0)?\z}
+      [$2, :photos, :photos, lambda do |t|
+        raise ErrorAssert.new "our knowledge about VK API seems to be outdated" unless 1 == t.size
+        t.first
+      end ]
+    when %r{\Ahttps://vk\.com/wall(?<id>-\d+_\d+)\z}
+      [$1, :wall, :posts, lambda do |t|
+        t.first.fetch("attachments").tap do |t|
+          raise ErrorAssert.new "our knowledge about VK API seems to be outdated" unless 1 == t.size
+        end.first.tap do |t|
+          raise ErrorAssert.new "our knowledge about VK API seems to be outdated" unless %w{ type photo } == t.keys
+        end.fetch("photo")
+      end ]
+    else
+      raise ErrorBadLink.new link
+    end
     raise ErrorMissingEnvVar.new "define VK_ACCESS_TOKEN and VK_CLIENT_SECRET env vars" unless ENV["VK_ACCESS_TOKEN"] && ENV["VK_CLIENT_SECRET"]
-    json = JSON.load NetHTTPUtils.request_data "https://api.vk.com/method/photos.getById", :POST, form: { photos: id, access_token: ENV["VK_ACCESS_TOKEN"], client_secret: ENV["VK_CLIENT_SECRET"], v: "5.101" }
-    json.fetch("response").tap do |r|
-      raise ErrorAssert.new unless 1 == r.size
-    end.first.fetch("sizes").map do |s|
+    f.call( JSON.load( NetHTTPUtils.request_data "https://api.vk.com/method/#{mtd}.getById",
+      :POST, form: { field => id, :access_token => ENV["VK_ACCESS_TOKEN"], :client_secret => ENV["VK_CLIENT_SECRET"], :v => "5.101" }
+    ).fetch("response") ).fetch("sizes").map do |s|
       s.values_at "width", "height", "url"
     end.max_by{ |w, h, u| w * h }
   end

data/test.rb

@@ -397,6 +397,7 @@ describe DirectLink do
       [ :vk, [
         ["https://vk.com/id57030827?z=photo57030827_456241143", [1920, 1440, "https://sun9-66.userapi.com/c845322/v845322944/167836/bP9z41BybhI.jpg"]],
         ["https://vk.com/id57030827?z=photo57030827_456241143%2Falbum57030827_0", [1920, 1440, "https://sun9-66.userapi.com/c845322/v845322944/167836/bP9z41BybhI.jpg"]],
+        ["https://vk.com/wall-105984091_7806", [960, 1280, "https://sun9-41.userapi.com/c855224/v855224900/a72f1/7OZ8ux9Wcwo.jpg"]],
       ] ],
     ].each do |method, tests|
       describe method do
@@ -451,6 +452,7 @@ describe DirectLink do
       ],
       vk: [
         "https://vk.com/id57030827?z=photo57030827_456241143",
+        "https://vk.com/wall-105984091_7806",
       ],
     }.each do |method, tests|
       describe "DirectLink() calls #{method}" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: directlink
 version: !ruby/object:Gem::Version
-  version: 0.0.8.1
+  version: 0.0.8.2
 platform: ruby
 authors:
 - Victor Maslov aka Nakilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-23 00:00:00.000000000 Z
+date: 2019-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastimage