directlink 0.0.10.0 → 0.0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 22f79345a6e337da21259e7f0a6502b72077862b76cd58c08a199f6fef4ca750
-  data.tar.gz: 765af8ad0ea6e047799c33bad9217664ab6cc525ad9b8072ee1f8c3a2f16dc23
+SHA1:
+  metadata.gz: 30657b1850442ca6f1267344dc356cdd3e0e55e8
+  data.tar.gz: b8dc86a2fb80cadb1583207934840fc28fdb6177
 SHA512:
-  metadata.gz: ed636fbce9c660540e19fcd1ce5888f144a3844ea6de0a73bbe71c7e662abaaea05033697c9d89b601849bca8b4efceb589e64e8f8e639b5fa81c48b2dd293e4
-  data.tar.gz: 40d2677c4273a5a28bdaa40466a8546737a26725eeb26b10504939cc44ce5811e5bdaa2778e139605f8047c5fe49c0f0c9c025bd04b2e481595e8a92d3819499
+  metadata.gz: d11e9b0f07127be8b711495f1496e527bd979c015a0376512e916c5f92fda19fcfd617d67584c768c1c223ebd41cb57c28bbf258b39659cdd12d5db4653f4120
+  data.tar.gz: 8d6beddd649ec2f1316009abe70c9224de3a34d8234443a040d492066b792b79d9f3fe3771b9906949982f1f5d12ff00a4dbebd9468bda2db63941e74e34f663

data/directlink.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name         = "directlink"
-  spec.version      = "0.0.10.0"
+  spec.version      = "0.0.11.0"
   spec.summary      = "obtains from any kind of hyperlink a link to an image, its format and resolution"
 
   spec.author       = "Victor Maslov aka Nakilon"
@@ -12,9 +12,9 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">=2.3"  # because <<~ heredocs in tests
 
   spec.add_dependency "fastimage", "~>2.2.0"
-  spec.add_dependency "nokogiri"
+  spec.add_dependency "nokogiri", "<1.11"   # 1.11 requires ruby 2.5
   spec.add_dependency "nethttputils", "~>0.4.1.0"
-  spec.add_dependency "reddit_bot", "~>1.8.0"
+  spec.add_dependency "reddit_bot", "~>1.9.0"
   spec.add_dependency "kramdown"
   spec.add_dependency "addressable"
   spec.add_development_dependency "minitest-around"

data/lib/directlink.rb

@@ -40,13 +40,15 @@ module DirectLink
     SocketError,
     Net::OpenTimeout,
     Errno::ECONNRESET,
+    Errno::ECONNREFUSED,
+    Errno::ETIMEDOUT,   # from FastImage
     NetHTTPUtils::Error,
     NetHTTPUtils::EOFError_from_rbuf_fill,
     FastImage::UnknownImageType,
     FastImage::ImageFetchFailure,
     DirectLink::ErrorNotFound,
     DirectLink::ErrorBadLink,
-  ]  # the only exceptions gem user should expect and handle
+  ]  # all known exceptions that can be raised while using Directlink but not as its fault
 
 
   def self.google src, width = 0
@@ -78,8 +80,11 @@ module DirectLink
          /\A(https:\/\/lh[356]\.googleusercontent\.com\/-[a-zA-Z0-9]{11}\/AAAAAAAAAAI\/AAAAAAAAAAA\/[a-zA-Z0-9_]{34}\/)s(?:46|64)-c(?:-k(?:-no)?)?-mo\/photo\.jpg\z/
       "#{$1}s#{width}/"
     # Google Keep
-    when /\A(https:\/\/lh\d\.googleusercontent\.com\/[a-zA-Z0-9_-]{104,106}=s)\d\d\d\d?\Z/
+    when /\A(https:\/\/lh\d\.googleusercontent\.com\/[a-zA-Z0-9_-]{104,106}=s)\d\d\d\d?\z/
       "#{$1}#{width}"
+    # opensea
+    when /\A(https:\/\/lh3\.googleusercontent\.com\/[a-zA-Z0-9]{78}-nGx_jf_XGqqiVANe_Jr8u2g=)w1400-k\z/
+      "#{$1}s#{width}"
     # mp4
     when /\A(https:\/\/lh3\.googleusercontent\.com\/-[a-zA-Z]{11}\/W[a-zA-Z0-9]{9}I\/AAAAAAAAODw\/[a-zA-Z0-9]{32}QCJoC\/)w530-h883-n-k-no\/[^\/]+\.mp4\z/
       "#{$1}s#{width}/"
@@ -91,6 +96,7 @@ module DirectLink
     end
   end
 
+
   require "json"
 
   # TODO make the timeout handling respect the way the Directlink method works with timeouts
@@ -244,9 +250,9 @@ module DirectLink
     end
     if data["media_metadata"]
       return [true, data["media_metadata"].values.map do |media|
-        next if media == {"status"=>"failed"}
-        raise ErrorAssert.new "our knowledge about Reddit API seems to be outdated" unless media["status"] == "valid"
-        [media["m"], *media["s"].values_at("x", "y"), CGI.unescapeHTML(media["s"]["u"])]
+        next if media == {"status"=>"failed"} || media == {"status"=>"unprocessed"}
+        raise ErrorAssert.new "our knowledge about Reddit API seems to be outdated (media == #{media.inspect})" unless media["status"] == "valid"
+        [media["m"], *media["s"].values_at("x", "y"), CGI.unescapeHTML(media["s"][media["m"]=="image/gif" ? "gif" : "u"])]
       end.compact]
     end
     return [true, "#{"https://www.reddit.com" if /\A\/r\/[0-9a-zA-Z_]+\/comments\/[0-9a-z]{5,6}\// =~ data["url"]}#{data["url"]}"] if data["crosspost_parent"]
@@ -268,7 +274,7 @@ module DirectLink
         t
       end ]
     when %r{\Ahttps://vk\.com/wall(?<id>-?\d+_\d+)\z},
-         %r{\Ahttps://vk\.com/[a-z\.]+\?w=wall(?<id>\d+_\d+)\z}
+         %r{\Ahttps://vk\.com/[a-z\.]+\?w=wall(?<id>-?\d+_\d+)\z}
       [$1, :wall, :posts, lambda do |t|
         t.first.fetch("attachments").select do |item|
           case item.keys
@@ -293,7 +299,7 @@ module DirectLink
       photos.fetch("sizes").map do |size|
         size.values_at("width", "height", "url").tap do |whu|
           w, h, u = whu
-          whu[0, 2] = FastImage.new(u, raise_on_failure: true).size if [w, h].include? 0
+          whu[0, 2] = FastImage.new(u, raise_on_failure: true).size if [w, h].include? 0 # wtf?
         end
       end.max_by{ |w, h, u| w * h }
     end
@@ -347,7 +353,7 @@ def DirectLink link, timeout = nil, proxy = nil, giveup: false, ignore_meta: fal
       max_start_http_retry_delay: timeout,
       max_read_retry_delay: timeout,
     } : {})
-  rescue Net::ReadTimeout
+  rescue Net::ReadTimeout, Errno::ETIMEDOUT
   rescue NetHTTPUtils::Error => e
     raise unless 418 == e.code
   else

data/unit.test.rb

@@ -4,12 +4,6 @@ require "minitest/mock"
 require "webmock/minitest"
 require_relative "webmock_patch"
 
-ENV["IMGUR_CLIENT_ID"] = "001788999ccdddf"
-ENV["FLICKR_API_KEY"] = "00123333456678889bbbbcccddddddff"
-ENV["REDDIT_SECRETS"] = "reddit_token.yaml"
-ENV["VK_ACCESS_TOKEN"] = "0011222222233334455566667777778888888888999999aaaaaaabbbbcddddddddddddddeeeeeeeffffff"
-ENV["VK_CLIENT_SECRET"] = "0011223445555555555566777777888999999999999aaaaaaabccddddddddeeefffffff"
-
 require_relative "lib/directlink"
 DirectLink.silent = true  # TODO: remove?
 DirectLink.timeout = 30   # TODO: tests about this attribute
@@ -190,6 +184,7 @@ describe DirectLink do
         https://lh3.googleusercontent.com/-tV86KJvppss/XE2Nb2Z2aAI/AAAAAAAAGu4/94E_abcDE6AaJ59n43wmmd9rFa--OUuSQCJoC/w530-h338-n/IMG_6845%252C.png
         https://lh3.googleusercontent.com/-cr-2ZSQGMPg/XFWLfetwr7I/AAAAAAAAQQQ/TbwDabcDE6wb4IDDO0SwfArFSZyDG0i0wCJoC/w530-h360-n/DSC07294.JPG
         https://lh3.googleusercontent.com/-7ey25Wg_cQ4/X-Xy8LJPjMI/AAAAAAAAALE/raXQabcDE6EzEDfAg3TcsOU_xc9z4szcwCLcBGAsYHQ/w1200-h630-p-k-no-nu/1608905381407960-0.png
+        https://lh3.googleusercontent.com/C84udoMpvJmi95AqshlF9acaR11TCsUgO9rGB9gG1w5Wp3WpB7U52ntft4jBHAyDg2guo6zqI4KZim-nGx_jf_XGqqiVANe_Jr8u2g=w1400-k
       }.each_with_index do |link, i|
         it "largeimages ##{i + 1}" do
           assert DirectLink.google link
@@ -567,6 +562,43 @@ describe DirectLink do
           nil,
           "https://v.redd.it/abcde6fb6w721",
         ],
+        ["https://www.reddit.com/r/MapPorn/comments/abd123/________aaaabdeeeeeefggghhhiilmmnnoorrrssttuvyyz/",
+          [true, [
+            ["image/gif", 500, 375, "https://i.redd.it/00146fghhjkox.gif"],
+            ["image/jpg", 1000, 600, "https://preview.redd.it/1369aacghkswy.jpg?width=1000&format=pjpg&auto=webp&s=0122334444557777778889aaabbbbcdddddeeeef"],
+          ]],
+          false, "abd123",
+          nil,
+          nil,
+          "https://www.reddit.com/gallery/abd123",
+          {
+            "00146fghhjkox"=>{
+              "status"=>"valid",
+              "e"=>"AnimatedImage",
+              "m"=>"image/gif",
+              "p"=>[],
+              "s"=>{
+                "y"=>375,
+                "gif"=>"https://i.redd.it/00146fghhjkox.gif",
+                "mp4"=>"",
+                "x"=>500
+              },
+              "id"=>"00146fghhjkox"
+            },
+            "1369aacghkswy"=>{
+              "status"=>"valid",
+              "e"=>"Image",
+              "m"=>"image/jpg",
+              "p"=>[],
+              "s"=>{
+                "y"=>600,
+                "x"=>1000,
+                "u"=>"https://preview.redd.it/1369aacghkswy.jpg?width=1000&format=pjpg&auto=webp&s=0122334444557777778889aaabbbbcdddddeeeef"
+              },
+              "id"=>"1369aacghkswy"
+            }
+          },
+        ]
       ].each_with_index do |(input, expectation, is_self, id, media, crosspost_parent, url, media_metadata), i|
         it "kinds of links" do
           unless is_self.nil?
@@ -636,6 +668,10 @@ describe DirectLink do
           [104, 130, "https://sun9-53.userapi.com/impf/c123456/v123456596/c7714/oImGe4o1ZJI.jpg?size=104x130&quality=96&sign=6ad356e84dcd6bbf2069d9b869a7bdb1&c_uniq_tag=8KN44nSlDjD-FMDiRhHqk6udwiqZfn5n1qqPNFwu_nI&type=album"],
           [1728, 2160, "https://sun9-53.userapi.com/impf/c123456/v123456596/c7714/oImGe4o1ZJI.jpg?size=1728x2160&quality=96&proxy=1&sign=c7961913ff3efd5064f2ed6c394288f2&c_uniq_tag=CA61KgCRsRXbHm4VJEYYskjpjpSiTHI7UPV4FsCPRmI&type=album"],
         ] ],
+        ["https://vk.com/wasserman.anatoliy?w=wall-123457771_353", [864, 1080, "https://userapi.com/impg/13456AABBCDDKKOQSTUWXZbcfghhhjlpqquwyz/z0UtQg2M1s4.jpg"], "wall", [
+          [104, 130, "https://sun9-38.userapi.com/impg/13456AABBCDDKKOQSTUWXZbcfghhhjlpqquwyz/z0UtQg2M1s4.jpg?size=104x130&quality=96&sign=a6012bb508e208c7b2b22c42872215e4&c_uniq_tag=qX06fI2p7bmyvnta_Pt2omQ-l5RBLcrG1DBsLWx1jJA&type=album"],
+          [864, 1080, "https://sun9-38.userapi.com/impg/13456AABBCDDKKOQSTUWXZbcfghhhjlpqquwyz/z0UtQg2M1s4.jpg?size=864x1080&quality=96&sign=8f02c4c6794efd653ed79609bf0850c8&c_uniq_tag=6WP6TY0RTDiG_8NK1lkYUOge22jtjkzGLLwc6IDxjjg&type=album"],
+        ] ],
       ].each_with_index do |(input, expectation, mtd, stub), i|
         it "kinds of links" do
           stub = {sizes: stub.map{ |w,h,u| {width: w, height: h, url: u} }}
@@ -794,6 +830,7 @@ describe DirectLink do
       assert (3 <= tries)
       assert (tries <= 4)
     end
+
     it "Reddit correctly parses out id when no token provided" do
       stub_request(:head, "https://www.reddit.com/r/gifs/comments/9ftc8f/")
       m = NetHTTPUtils.method :request_data
@@ -936,6 +973,16 @@ describe DirectLink do
           end
         end
       end
+      it "HEAD Errno::ETIMEDOUT and GET FastImage::ImageFetchFailure are handled by DirectLink::NORMAL_EXCEPTIONS" do
+        assert_includes DirectLink::NORMAL_EXCEPTIONS, FastImage::ImageFetchFailure
+        assert_raises FastImage::ImageFetchFailure do
+          NetHTTPUtils.stub :request_data, ->_,mtd,*{ fail unless mtd == :HEAD; raise Errno::ETIMEDOUT } do
+            FastImage.stub :new, ->*{ raise FastImage::ImageFetchFailure } do
+              DirectLink "http://www.mesacc.edu/~hello12345/hello/images/photos/aerial/a1234.jpg"
+            end
+          end
+        end
+      end
       [ # TODO this URLs may be reused from tests that check that this method calls internal method
         [:google, "//lh3.googleusercontent.com/proxy/578BDGJKLLNPTZceiikqtww_Wi2UTaQH0AC_h2kuURiu0AbwyI2ywOk2XgdAjL7ceg=w530-h354-n"],
         [:imgur, "http://imgur.com/ABCDEFG"],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: directlink
 version: !ruby/object:Gem::Version
-  version: 0.0.10.0
+  version: 0.0.11.0
 platform: ruby
 authors:
 - Victor Maslov aka Nakilon
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-02 00:00:00.000000000 Z
+date: 2021-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastimage
@@ -28,16 +28,16 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: nethttputils
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
+description: 
 email: nakilon@gmail.com
 executables:
 - directlink
@@ -139,7 +139,7 @@ licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/nakilon/directlink
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -156,8 +156,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - 'you may want to create apps and provide API tokens:'
 - IMGUR_CLIENT_ID, FLICKR_API_KEY, REDDIT_SECRETS
-rubygems_version: 3.2.0
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.5.2.3
+signing_key: 
 specification_version: 4
 summary: obtains from any kind of hyperlink a link to an image, its format and resolution
 test_files: