directlink 0.0.7.0 → 0.0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82fb69a1c4a926a14a776f62c647ca40cb4ffcbb
-  data.tar.gz: 904eafe032fcd4947770212b0e97788102b41811
+  metadata.gz: 1ed510f04f8bd32fadeb16a4ea27d1133dc8946e
+  data.tar.gz: bf1afde92343fc551abbf6b10902745842dfe496
 SHA512:
-  metadata.gz: 4d9e95ecb4fec1fd2e7b633b1e7c817a187ab3078af80e2721d2f6e15f7c8da031963c35891dbc36dd1eb9d1681b999abe8421f520e8a0bbe8968dc6a8b23b7d
-  data.tar.gz: 244fcccee54d13bd4e2c7d219c67b92174441fe034fee6098c158947d1d278bc58fdcc6c3a53b3831dad419eb70f88fbe6ace14688535d4c23a86be028f0d905
+  metadata.gz: a2612ddaf05fe8ea4158806d00be6209455772c004d33373bacbe00ffc1cc538aee9c4dade3d84f24c7052e0ec3ed38db0b48192c939c346c590d9d47428bcda
+  data.tar.gz: 647f789a878dd956827ab402ebd0a8147e81c8951e8389eddc1be57c158e33a9cbdaea4d08da604249907d0a094c0966cdf34dafb0376fbcc53414efc170cd8b

data/api_tokens_for_travis.sh

@@ -1,3 +1,8 @@
 export IMGUR_CLIENT_ID=0f99cd781c9d0d8
 export FLICKR_API_KEY=dc2bfd348b01bdc5b09d36876dc38f3d
 export REDDIT_SECRETS=reddit_token_for_travis.yaml
+
+touch vk.secret
+source vk.secret
+# export VK_ACCESS_TOKEN=...                  # can't put this here because there is no way known to me to limit the scope of the eternal access token
+# export VK_CLIENT_SECRET=... # (service key) # can't put this here because there is no way known to me to limit the scope of the eternal access token

data/directlink.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name         = "directlink"
-  spec.version      = "0.0.7.0"
+  spec.version      = "0.0.8.0"
   spec.summary      = "converts any kind of image hyperlink to direct link, type of image and its resolution"
 
   spec.author       = "Victor Maslov aka Nakilon"
@@ -25,5 +25,5 @@ Gem::Specification.new do |spec|
   spec.files        = `git ls-files -z`.split(?\0) - spec.test_files
 
   spec.requirements << "you may need to create apps and provide their API tokens:"
-  spec.requirements << "IMGUR_CLIENT_ID, FLICKR_API_KEY"
+  spec.requirements << "IMGUR_CLIENT_ID, FLICKR_API_KEY, REDDIT_SECRETS"
 end

data/lib/directlink.rb

@@ -241,6 +241,17 @@ module DirectLink
     return [false, data["selftext"]]
   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+)\z} =~ link
+    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|
+      s.values_at "width", "height", "url"
+    end.max_by{ |w, h, u| w * h }
+  end
+
   class_variable_set :@@directlink, Struct.new(:url, :width, :height, :type)
 end
 
@@ -291,6 +302,8 @@ def DirectLink link, max_redirect_resolving_retry_delay = nil, giveup: false, ig
       max_read_retry_delay: max_redirect_resolving_retry_delay
     } : {})
   rescue Net::ReadTimeout
+  rescue NetHTTPUtils::Error => e
+    raise unless 418 == e.code
   else
     link = head.instance_variable_get(:@last_response).uri.to_s
   end
@@ -350,6 +363,12 @@ def DirectLink link, max_redirect_resolving_retry_delay = nil, giveup: false, ig
   end if %w{ reddit com } == URI(link).host.split(?.).last(2) ||
          %w{   redd it  } == URI(link).host.split(?.)
 
+  begin
+    w, h, u = DirectLink.vk(link)
+    return struct.new u, w, h
+  rescue DirectLink::ErrorMissingEnvVar
+  end if %w{ vk com } == URI(link).host.split(?.)
+
   begin
     f = FastImage.new(link, raise_on_failure: true, timeout: 5, http_header: {"User-Agent" => "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/66.0.3359.139 Safari/537.36"})
   rescue FastImage::UnknownImageType

data/test.rb

@@ -394,6 +394,9 @@ describe DirectLink do
         ["https://www.reddit.com/r/CatsStandingUp/duplicates/abn0ua/cat/", [true, "https://v.redd.it/s9b86afb6w721/DASH_2_4_M?source=fallback"]],
         ["https://www.reddit.com/r/hangers/comments/97you5/tara_radovic/", [true, "https://i.imgur.com/rbLqgOu.jpg"]],   # "crossport" from Imgur
       ] ],
+      [ :vk, [
+        ["https://vk.com/id57030827?z=photo57030827_456241143", [1920, 1440, "https://sun9-66.userapi.com/c845322/v845322944/167836/bP9z41BybhI.jpg"]],
+      ] ],
     ].each do |method, tests|
       describe method do
         tests.each_with_index do |(input, expectation), i|
@@ -445,6 +448,9 @@ describe DirectLink do
         # ["https://www.reddit.com/r/travel/988889", "https://www.reddit.com/r/travel/comments/988889/playa_miramar_in_guaymas_sonora/"],
         "https://www.reddit.com/r/KsyushaEgorova/comments/beuqs2/a_little_shy/", # NSFW causes redirect to /over_18? if the special cookie not provided
       ],
+      vk: [
+        "https://vk.com/id57030827?z=photo57030827_456241143",
+      ],
     }.each do |method, tests|
       describe "DirectLink() calls #{method}" do
         tests.each_with_index do |(input, expected), i|
@@ -514,7 +520,7 @@ describe DirectLink do
     end
 
     describe "throws ErrorBadLink if method does not match the link" do
-      %i{ google imgur flickr _500px wiki reddit }.each do |method|
+      %i{ google imgur flickr _500px wiki reddit vk }.each do |method|
         ["", "test", "http://example.com/"].each_with_index do |url, i|
           it "#{method} ##{i + 1}" do
             assert_raises DirectLink::ErrorBadLink do
@@ -617,6 +623,7 @@ describe DirectLink do
         [:_500px, "https://500px.com/photo/112134597/milky-way-by-tom-hall"],
         [:wiki, "http://commons.wikimedia.org/wiki/File:Eduard_Bohlen_anagoria.jpg"],
         [:reddit, "https://www.reddit.com/123456"],
+        [:vk, "https://vk.com/"],
       ].each do |method, link|
         it "can otherwise raise DirectLink::ErrorBadLink #{method}" do
           e = assert_raises(DirectLink::ErrorBadLink, link) do
@@ -739,7 +746,7 @@ describe DirectLink do
         # TODO: a test that it appends the `exception.cause`
       ].each_with_index do |(expected_exit_code, link, expected_output, unset), i| # TODO: unset is not used anymore or I have to go sleep?
         it "##{i + 1}" do
-          string, status = Open3.capture2e "export #{File.read("api_tokens_for_travis.sh").gsub(/\n?export/, ?\s).strip}#{unset} && RUBYOPT='-rbundler/setup #{$-I.map{ |i| "-I #{i}" }.join " "}' ./bin/directlink #{link}"
+          string, status = Open3.capture2e "export #{(File.read("api_tokens_for_travis.sh") + File.read("vk.secret")).scan(/(?<=^export )\S+=\S+/).join(" ")}#{unset} && RUBYOPT='-rbundler/setup #{$-I.map{ |i| "-I #{i}" }.join " "}' ./bin/directlink #{link}"
           assert_equal [expected_exit_code, "#{expected_output}\n"], [status.exitstatus, string], "for #{link}"
         end
       end
@@ -782,7 +789,7 @@ describe DirectLink do
         '.gsub(/^ {8}/, ""), "json"],
     ].each do |expected_output, param|
       it "#{param || "default"} output format" do
-        string, status = Open3.capture2e "export #{File.read("api_tokens_for_travis.sh").gsub(/\n?export/, ?\s).strip} && RUBYOPT='-rbundler/setup' ./bin/directlink#{" --#{param}" if param} #{valid_imgur_image_url1} #{valid_imgur_image_url2}"
+        string, status = Open3.capture2e "export #{(File.read("api_tokens_for_travis.sh") + File.read("vk.secret")).scan(/(?<=^export )\S+=\S+/).join(" ")} && RUBYOPT='-rbundler/setup' ./bin/directlink#{" --#{param}" if param} #{valid_imgur_image_url1} #{valid_imgur_image_url2}"
         assert_equal [0, expected_output], [status.exitstatus, string]
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: directlink
 version: !ruby/object:Gem::Version
-  version: 0.0.7.0
+  version: 0.0.8.0
 platform: ruby
 authors:
 - Victor Maslov aka Nakilon
@@ -163,9 +163,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - 'you may need to create apps and provide their API tokens:'
-- IMGUR_CLIENT_ID, FLICKR_API_KEY
+- IMGUR_CLIENT_ID, FLICKR_API_KEY, REDDIT_SECRETS
 rubyforge_project: 
-rubygems_version: 2.6.14.4
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: converts any kind of image hyperlink to direct link, type of image and its