directlink 0.0.4.13 → 0.0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14f2adc0cf8da9dfce19145a8f06ed28c8393555
-  data.tar.gz: c952263512c3d1c467c287fa7e30245b9a88e844
+  metadata.gz: e712b540373ddcb6f3c581a5bf050b97e3cd6df4
+  data.tar.gz: b41a9f3507c1349cb65da813b9b066765a4fcc49
 SHA512:
-  metadata.gz: 1e1ebcd757a4baed3ce59de52ba1c23a9c8546f849991e75b513971546b4a41ec08869e95907aaece5dc98f8308c2ed8b2941d71e778257e21d590cdecd83a62
-  data.tar.gz: bdff382c7ea916ec43b3f7d8a03804b11d33d43963a218c706de43011e2e1f5923aa2a88bb2d0f7f919c1945518564d5e6d87a7840468a78604e991813d59164
+  metadata.gz: e03fbb4b2763fb132d712f65f442e92c78c41b5626b37e76cf3dfc17713a220764cdbda65dbac13fa92095171c8149d603863654aa1e29831ea56417b9728a3f
+  data.tar.gz: 0af11c87c73bf0edd5ec0b56daff76a10f8446586ccb923fdf18e970b1ea153438868a1a070f5a25e203a441a24a5641e91cd4c52c50247662eb469764cd01ce

data/.travis.yml

@@ -30,8 +30,8 @@ matrix:
   # the 'The command "bundle install --jobs=3 --retry=3" failed and exited with 1 during .'
   # I guess Travis is deprecating old Rubies and so will I
   - rvm: 2.0
-    os: linux
+    os: osx
   - rvm: 2.1
-    os: linux
+    os: osx
   - rvm: 2.2
-    os: linux
+    os: osx

data/directlink.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name         = "directlink"
-  spec.version      = "0.0.4.13"
+  spec.version      = "0.0.5.0"
   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

@@ -40,7 +40,7 @@ module DirectLink
     # this can handle links without schema because it's used for parsing community HTML pages
     case src
     # Google Plus post image
-    when /\A(https:\/\/lh3\.googleusercontent\.com\/-[a-zA-Z0-9_-]{11}\/[WX][a-zA-Z0-9_-]{9}I\/AAAAAAA[a-zA-Z0-9_-]{4}\/[a-zA-Z0-9_-]{33}(?:[gwAQ]?CJoC|CL0B(?:GAs)?)\/)w[1-5]\d\d(?:-d)?-h[1-9]\d\d-n(?:-k-no)?\/[^\/]+\z/
+    when /\A(https:\/\/lh3\.googleusercontent\.com\/-[a-zA-Z0-9_-]{11}\/[WX][a-zA-Z0-9_-]{9}I\/AAAAAAA[a-zA-Z0-9_-]{4}\/[a-zA-Z0-9_-]{33}(?:[gwAQ]?CJoC|CL0B(?:GAs)?)\/)w[1-7]\d\d(?:-d)?-h[1-9]\d\d\d?-n(?:-k-no|-rw|)\/[^\/]+\z/
       "#{$1}s#{width}/"
     when /\A(\/\/lh3\.googleusercontent\.com\/proxy\/[a-zA-Z0-9_-]{66,523}=)(?:w(?:[45]\d\d)-h\d\d\d-[np]|s530-p|s110-p-k)\z/
       "https:#{$1}s#{width}/"
@@ -64,6 +64,9 @@ module DirectLink
          /\A(https:\/\/lh[356]\.googleusercontent\.com\/-[a-zA-Z0-9]{11}\/AAAAAAAAAAI\/AAAAAAAAAAA\/[a-zA-Z0-9]{11}\/)s64-c-k\/photo\.jpg\z/,
          /\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/
+      "#{$1}#{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}/"
@@ -113,7 +116,7 @@ module DirectLink
         # one day single-video item should hit this but somehow it didn't yet
         raise ErrorAssert.new "unknown data format #{data.inspect} for #{link}"
       end
-    when /\Ahttps?:\/\/(?:(?:i|m|www)\.)?imgur\.com\/([a-zA-Z0-9]{7,8})(?:\.(?:gifv|jpg|png))?\z/,
+    when /\Ahttps?:\/\/(?:(?:i|m|www)\.)?imgur\.com\/([a-zA-Z0-9]{7,8})(?:\.(?:gifv|jpg(?:\?fb)?|png))?\z/,
          /\Ahttps?:\/\/(?:(?:i|m|www)\.)?imgur\.com\/([a-zA-Z0-9]{5})\.mp4\z/,
          /\Ahttps?:\/\/imgur\.com\/([a-zA-Z0-9]{5}(?:[a-zA-Z0-9]{2})?)\z/,
          /\Ahttps?:\/\/imgur\.com\/([a-zA-Z0-9]{7})(?:\?\S+)?\z/,
@@ -229,10 +232,10 @@ module DirectLink
     if data["media"]["reddit_video"]
       return [true, data["media"]["reddit_video"]["fallback_url"]]
     else
-      raise ErrorAssert.new "our knowledge about Reddit API seems to be outdated" unless data["media"].keys.sort == %w{ oembed type } && %w{ youtube.com gfycat.com }.include?(data["media"]["type"])
+      raise ErrorAssert.new "our knowledge about Reddit API seems to be outdated" unless data["media"].keys.sort == %w{ oembed type } && %w{ youtube.com gfycat.com imgur.com }.include?(data["media"]["type"])
       return [true, data["media"]["oembed"]["thumbnail_url"]]
     end if data["media"]
-    return reddit data["url"] if data["crosspost_parent"]   # TODO: test that it does it
+    return [true, data["url"]] if data["crosspost_parent"]
     return [true, data["url"]] unless data["is_self"]
     raise ErrorAssert.new "our knowledge about Reddit API seems to be outdated" if data["url"] != "https://www.reddit.com" + data["permalink"]
     return [false, data["selftext"]]
@@ -258,6 +261,9 @@ def DirectLink link, max_redirect_resolving_retry_delay = nil, giveup = false
 
   google_without_schema_crutch = lambda do
     if %w{ lh3 googleusercontent com } == URI(link).host.split(?.).last(3) ||
+       %w{ lh4 googleusercontent com } == URI(link).host.split(?.).last(3) ||
+       %w{ lh5 googleusercontent com } == URI(link).host.split(?.).last(3) ||
+       %w{ lh6 googleusercontent com } == URI(link).host.split(?.).last(3) ||
        %w{ bp blogspot com } == URI(link).host.split(?.).last(3)
       u = DirectLink.google link
       f = FastImage.new(u, raise_on_failure: true, http_header: {"User-Agent" => "Mozilla"})
@@ -279,14 +285,7 @@ def DirectLink link, max_redirect_resolving_retry_delay = nil, giveup = false
     }, **(max_redirect_resolving_retry_delay ? {timeout: max_redirect_resolving_retry_delay, max_start_http_retry_delay: max_redirect_resolving_retry_delay, max_read_retry_delay: max_redirect_resolving_retry_delay} : {})
   rescue Net::ReadTimeout
   else
-    link = case head.instance_variable_get(:@last_response).code
-    when "200" ; link
-    when "302"
-      URI( head.instance_variable_get(:@last_response).to_hash.fetch("location").tap do |a|
-        raise DirectLink::ErrorAssert.new "unexpected size of locations after redirect" unless a.size == 1
-      end.first )
-    else ; raise NetHTTPUtils::Error.new "", (head.instance_variable_get(:@last_response).code || fail).to_i
-    end
+    link = head.instance_variable_get(:@last_response).uri.to_s
   end
 
   # why do we resolve redirects before trying the known adapters?
@@ -314,10 +313,11 @@ def DirectLink link, max_redirect_resolving_retry_delay = nil, giveup = false
     f = FastImage.new(u, raise_on_failure: true) # , http_header: {"User-Agent" => "Mozilla"}
     return struct.new u, w, h, f.type
   rescue DirectLink::ErrorMissingEnvVar
-  end if %w{ www flickr com } == URI(link).host.split(?.).last(3)
+  end if %w{ www flickr com } == URI(link).host.split(?.) ||
+         %w{     flic kr    } == URI(link).host.split(?.)
 
   if %w{         wikipedia org } == URI(link).host.split(?.).last(2) ||
-     %w{ commons wikimedia org } == URI(link).host.split(?.).last(3)
+     %w{ commons wikimedia org } == URI(link).host.split(?.)
     u = DirectLink.wiki link
     f = FastImage.new(u, raise_on_failure: true) # , http_header: {"User-Agent" => "Mozilla"}
     w, h = f.size
@@ -338,6 +338,7 @@ def DirectLink link, max_redirect_resolving_retry_delay = nil, giveup = false
     end
     return struct.new *u.values_at(*%w{ fallback_url width height }), "video" if u.is_a? Hash
     return DirectLink u
+    fail if link == u
   rescue DirectLink::ErrorMissingEnvVar
   end if %w{ reddit com } == URI(link).host.split(?.).last(2) ||
          %w{ redd it    } == URI(link).host.split(?.)

data/test.rb

@@ -20,6 +20,7 @@ describe DirectLink do
     describe "google" do
 
       describe "does not fail" do
+        # TODO: also check the #google is being called
 
       "
            1 //1.bp.blogspot.com/-rYk_u-qROQc/WngolJ8M0LI/AAAAAAAAD-w/woivnaIVzasBPG5C2T1t-VrWKRd_U6lMgCLcBGAs/w530-h278-p/i-469.jpg
@@ -152,6 +153,7 @@ describe DirectLink do
         https://lh3.googleusercontent.com/-rm-m1meCOMY/W92GhExMG-I/AAAAAAADsTw/bIAm5-1CIOYEpyPJLnxT8VmI_YNW2W5dACJoC/s0/2659806_800n.jpg
         https://lh3.googleusercontent.com/-z1nwsq4NOT4/XETT5qhXP-I/AAAAAAAAC0s/03kJ22drB1EdqZ97gUXCPHkLZbbqrDbOACJoC/w530-h942-n/gplus1629127930.jpg
         https://lh3.googleusercontent.com/-NiGph3ObOPg/XE3DgnavXlI/AAAAAAABvgE/pcPPCe88rsU1r941wwP76TVf_o89i74kwCJoC/w530-h353-n/DSCF0753.JPG
+        https://lh3.googleusercontent.com/-QfChCi9Lj6A/XEciVlXmDhI/AAAAAAACuZw/iYzoMIxr7SsGzEFbk1LrqIdCdWVu8zCHACJoC/w795-h1193-n-rw/z7765765765757575.jpg
       }.each_with_index do |link, i|
         it "gpluscomm_105636351696833883213_86400 ##{i + 1}" do
           assert DirectLink.google link
@@ -205,13 +207,25 @@ describe DirectLink do
           assert DirectLink.google link
         end
       end
+      %w{
+        https://lh4.googleusercontent.com/KwxMEMlyjNKXqSqszuiCgPMi7_oE5fVv1Sw373HXBYlguP8AnIPAqefTS6DbBuurVGYRSxGrtDyKei1hae9Djf6rjiwjJd0aauA5Bg-z=s615
+        https://lh5.googleusercontent.com/fRmAL_04p7oomNHCiV4tH4-agHSDBtLaWi_Tb6bgE5ZSHVu5OjQF3iRn06nNwP3ywZwdFP92zWM-o8yw0cn6m0tDTBARuO6F9e0wYu_1=s685
+        https://lh5.googleusercontent.com/FcYUQBKLXWtFLEvbQduvu7FHUm2f7U_MVdMBVnNbpwfzKHIU-xABkudxw-m21SlM0jFYRHedh7Is5Dg6qlgIQF1iSndlWjiKCTTsUo1w=s1080
+        https://lh5.googleusercontent.com/gcDb3dxbch9jUKPzKGawJiwtHcNS9wp6o2sc0aJj9wOWQA-u8kXmKIrZ-TkLxajee6qLaT2p6OK2N7klTJ9CxU66OnpBhYJMg0q9QEdq5Q=s2160
+      }.each_with_index do |link, i|
+        it "google keep ##{i + 1}" do
+          assert DirectLink.google link
+        end
+      end
 
       end
+
       # TODO: expand this for every branch in lib
       %w{
         https_long_blogspot https://2.bp.blogspot.com/-rb2PXLGZy0s/W2nQe3mXOSI/AAAAAAAARhQ/P8gV-bMtYbY2xxpTJNcYVxu3XDTUaugxQCLcBGAs/s640/beach-bora-bora-clouds-753626.jpg https://2.bp.blogspot.com/-rb2PXLGZy0s/W2nQe3mXOSI/AAAAAAAARhQ/P8gV-bMtYbY2xxpTJNcYVxu3XDTUaugxQCLcBGAs/s0/
         http_short_blogspot http://4.bp.blogspot.com/-poH-QXn7YGg/U-3ZTDkeF_I/AAAAAAAAISE/ms2gNIb-v-g/w72-h72-p-k-no-nu/Top-24-Inspired-181.jpg https://4.bp.blogspot.com/-poH-QXn7YGg/U-3ZTDkeF_I/AAAAAAAAISE/ms2gNIb-v-g/s0/
         just_gplus https://lh3.googleusercontent.com/-NiGph3ObOPg/XE3DgnavXlI/AAAAAAABvgE/pcPPCe88rsU1r941wwP76TVf_o89i74kwCJoC/w530-h353-n/DSCF0753.JPG https://lh3.googleusercontent.com/-NiGph3ObOPg/XE3DgnavXlI/AAAAAAABvgE/pcPPCe88rsU1r941wwP76TVf_o89i74kwCJoC/s0/
+        google_keep https://lh5.googleusercontent.com/fRmAL_04p7oomNHCiV4tH4-agHSDBtLaWi_Tb6bgE5ZSHVu5OjQF3iRn06nNwP3ywZwdFP92zWM-o8yw0cn6m0tDTBARuO6F9e0wYu_1=s685 https://lh5.googleusercontent.com/fRmAL_04p7oomNHCiV4tH4-agHSDBtLaWi_Tb6bgE5ZSHVu5OjQF3iRn06nNwP3ywZwdFP92zWM-o8yw0cn6m0tDTBARuO6F9e0wYu_1=s0
       }.each_slice 3 do |name, link, o|
         it "replaces s0 and schema correctly #{name}" do
           assert_equal o, DirectLink.google(link)
@@ -298,7 +312,7 @@ describe DirectLink do
         ["http://imgur.com/gallery/qP2RQtL", "https://i.imgur.com/qP2RQtL.png"], # single image gallery?
         ["http://imgur.com/gallery/nKAwE/new", 28, "https://i.imgur.com/VQhR8hB.jpg", "https://i.imgur.com/axlzNRL.jpg"],
         ["http://m.imgur.com/rarOohr", "https://i.imgur.com/rarOohr.jpg"],
-        ["http://imgur.com/r/wallpaper/j39dKMi", "https://i.imgur.com/j39dKMi.jpg"],
+        ["http://imgur.com/r/wallpaper/j39dKMi", "https://i.imgur.com/j39dKMi.jpg?1"],
         ["http://imgur.com/gallery/jm0OKQM", DirectLink::ErrorNotFound],  # this id does not belong to gallery but to an image, that is probably irrelevant
         ["http://imgur.com/gallery/oZXfZ", DirectLink::ErrorNotFound],    # this id does not belong to gallery but to an album, that is probably irrelevant
         ["http://imgur.com/gallery/dCQprEq/new", "https://i.imgur.com/dCQprEq.jpg", 5760, 3840, "image/jpeg"],
@@ -313,6 +327,7 @@ describe DirectLink do
         ["http://imgur.com/a/AdJUK", 3, "https://i.imgur.com/Yunpxnx.jpg", "https://i.imgur.com/2epn2nT.jpg", "https://i.imgur.com/3afw2aF.jpg"],
         ["https://imgur.com/9yaMdJq", "https://i.imgur.com/9yaMdJq.mp4", 720, 404, "video/mp4"],
         ["http://imgur.com/gallery/dCQprEq/new", "https://i.imgur.com/dCQprEq.jpg", 5760, 3840, "image/jpeg"],
+        ["https://i.imgur.com/fFUTSJu.jpg?fb", "https://i.imgur.com/fFUTSJu.jpg", 1469, 2200, "image/jpeg"],    # from reddit.com/93mtba
       ].each_with_index do |t, i|
         url, n, first, last, type = t
         it "##{i + 1}" do
@@ -377,6 +392,7 @@ describe DirectLink do
         ["https://www.reddit.com/r/travel/988889", [true, "https://i.redd.it/3h5xls6ehrg11.jpg"]],
         ["http://redd.it/988889", [true, "https://i.redd.it/3h5xls6ehrg11.jpg"]],
         ["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
       ] ],
     ].each do |method, tests|
       describe method do
@@ -402,6 +418,7 @@ describe DirectLink do
         //1.bp.blogspot.com/-rYk_u-qROQc/WngolJ8M0LI/AAAAAAAAD-w/woivnaIVzasBPG5C2T1t-VrWKRd_U6lMgCLcBGAs/w530-h278-p/i-469.jpg
         https://2.bp.blogspot.com/-rb2PXLGZy0s/W2nQe3mXOSI/AAAAAAAARhQ/P8gV-bMtYbY2xxpTJNcYVxu3XDTUaugxQCLcBGAs/s640/beach-bora-bora-clouds-753626.jpg
         http://4.bp.blogspot.com/-poH-QXn7YGg/U-3ZTDkeF_I/AAAAAAAAISE/ms2gNIb-v-g/w72-h72-p-k-no-nu/Top-24-Inspired-181.jpg
+        https://lh5.googleusercontent.com/FcYUQBKLXWtFLEvbQduvu7FHUm2f7U_MVdMBVnNbpwfzKHIU-xABkudxw-m21SlM0jFYRHedh7Is5Dg6qlgIQF1iSndlWjiKCTTsUo1w=s1080
       },
       imgur: %w{
         https://imgur.com/3eThW
@@ -414,7 +431,7 @@ describe DirectLink do
         https://500px.com/photo/112134597/milky-way-by-tom-hall
       },
       flickr: %w{
-        https://www.flickr.com/photos/tomas-/17220613278/
+        https://www.flickr.com/photos/59880970@N07/15773941043/in/dateposted-public/
         https://flic.kr/p/vPvCWJ
       },
       wiki: %w{
@@ -423,7 +440,6 @@ describe DirectLink do
       },
       reddit: %w{
         https://www.reddit.com/r/cacography/comments/32tq0i/c/
-        https://i.redd.it/si758zk7r5xz.jpg
         http://redd.it/32tq0i
         https://reddit.com/123456
         https://www.reddit.com/r/travel/988889
@@ -431,12 +447,12 @@ describe DirectLink do
     }.each do |method, tests|
       describe "DirectLink() calls #{method}" do
         tests.each_with_index do |input, i|
-          it "##{i + 1}" do
-            called = false
-            m = DirectLink.method method
-            DirectLink.stub method, ->link{ called = true } do
-              DirectLink.method(method).call input
-              assert called, "DirectLink.#{method} was not called"
+          it "##{i + 1} (this may prematurely fail on redirect resolving, so links should be valid)" do
+            DirectLink.stub method, ->link{ throw :_ } do
+              catch :_ do
+                DirectLink input
+                fail "DirectLink.#{method} was not called"
+              end
             end
           end
         end
@@ -612,7 +628,7 @@ describe DirectLink do
     describe "other domains tests" do
       [
         ["http://www.aeronautica.difesa.it/organizzazione/REPARTI/divolo/PublishingImages/6%C2%B0%20Stormo/2013-decollo%20al%20tramonto%20REX%201280.jpg", ["http://www.aeronautica.difesa.it/organizzazione/REPARTI/divolo/PublishingImages/6%C2%B0%20Stormo/2013-decollo%20al%20tramonto%20REX%201280.jpg", 1280, 853, :jpeg], nil, 1],
-        ["http://minus.com/lkP3hgRJd9npi", SocketError, /nodename nor servname provided, or not known|No address associated with hostname/, 0],
+        # ["http://minus.com/lkP3hgRJd9npi", SocketError, /nodename nor servname provided, or not known|No address associated with hostname/, 0],
         ["http://www.cutehalloweencostumeideas.org/wp-content/uploads/2017/10/Niagara-Falls_04.jpg", SocketError, /nodename nor servname provided, or not known|Name or service not known/, 0],
       ].each_with_index do |(input, expectation, message_string_or_regex, max_redirect_resolving_retry_delay), i|
         it "##{i + 1}" do
@@ -730,7 +746,7 @@ describe DirectLink do
     [
       ["<= #{valid_imgur_image_url1}
         => https://i.imgur.com/QpOBvRY.png
-           png 460x460
+           image/png 460x460
         <= #{valid_imgur_image_url2}
         => https://i.imgur.com/QpOBvRY.png
            image/png 460x460
@@ -742,7 +758,7 @@ describe DirectLink do
             "url": "https://i.imgur.com/QpOBvRY.png",
             "width": 460,
             "height": 460,
-            "type": "png"
+            "type": "image/png"
           },
           [
             {
@@ -769,7 +785,7 @@ describe DirectLink do
 
     it "reddit_bot gem logger does not flood STDOUT" do
       string, status = Open3.capture2e "RUBYOPT='-rbundler/setup' ./bin/directlink http://redd.it/997he7"
-      assert_equal "<= http://redd.it/997he7\n=> https://i.imgur.com/QpOBvRY.png\n   png 460x460\n", string
+      assert_equal "<= http://redd.it/997he7\n=> https://i.imgur.com/QpOBvRY.png\n   image/png 460x460\n", string
     end
 
   end

metadata

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