RubyGems - directlink - Versions diffs - 0.0.4.3 → 0.0.4.4 - Mend

directlink 0.0.4.3 → 0.0.4.4

Files changed (7) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57cb3f9cecd52d2a4ac93edb8dd372398b0a54fa
-  data.tar.gz: 4dc3b43d8f661432207c6481eac1d3246377a003
+  metadata.gz: 7e252357f3a65696511a206fa8fdf8bebd65cc97
+  data.tar.gz: f4fddedf24809bed96c56a3e063b92d8feeb2cb9
 SHA512:
-  metadata.gz: f1199f9b98636f09e58676764e1c943ef792fe24271f1d127bbbb8d7b8355544924d13cf19be91ff06ed468e885dbd98def0c5189ce351d28daacda35a9c12e1
-  data.tar.gz: 0c5e5720f11a60aa8548f8598b36d2395e1fd08a2bea654c2fe288916e85399d3897e8843aa2a90fb91e02e813b38859754362cb97373307e09b6bb92d139086
+  metadata.gz: c955776c59833e37194229370d7d26b17d1e6d48674b1cde952cc262eb9705e8681f8eb68d700b7de41abe31bb976a1fb297a18712a157dc0aec364b9d668377
+  data.tar.gz: cf7513d360fdfb6bad2108906398526ed18ee588dbd0a99e1961f5c8d593bd6061049376fad8936e0c835df0f4f6c1decc92952aa4040c4851a78dbb6bdc3d20

data/.bashrc CHANGED Viewed

@@ -1,2 +1,3 @@
 source api_tokens_for_travis.sh
-echo ruby test.rb
+echo 'to test: ruby test.rb'
+echo 'to test: bundle exec ./bin/directlink --debug ...'

data/README.md CHANGED Viewed

@@ -23,6 +23,13 @@ $ directlink //4.bp.blogspot.com/-5kP8ndL0kuM/Wpt82UCqvmI/AAAAAAAAEjI/ZbbZWs0-kg
 => https://4.bp.blogspot.com/-5kP8ndL0kuM/Wpt82UCqvmI/AAAAAAAAEjI/ZbbZWs0-kgwRXEJ9JEGioR0bm6U8MOkvQCKgBGAs/s0/IMG_20171223_093922.jpg
    jpeg 4160x3120
 ```
+Given the link to a page it tries to find the main image on it.
+```
+$ directlink https://plus.google.com/107956229381790410785/posts/Gu9apRHri41
+<= https://plus.google.com/107956229381790410785/posts/Gu9apRHri41
+=> https://lh3.googleusercontent.com/-mRDjiHoDA30/W0mndQaRXeI/AAAAAAAAfyA/NhZGMAoQsbAb8cUFDzNWh-NXQ9O-YQhuQCJoC/s0/001
+   jpeg 2000x1328
+```
 Retrieves all images from Imgur album or gallery, orders them by resolution from high to low:
 ```
 $ directlink https://imgur.com/a/oacI3gl
@@ -91,7 +98,7 @@ $ export REDDIT_SECRETS=secrets.yaml
 #### the "don't give up mode"
-If the passed link is not the image link or a photo page of a known image hosting, the tool is still able to find the main images that the linked webpage contains (here it found three images in the markdown file):
+If the passed link is not the image link or a photo page of a known image hosting, the tool is still able to find the main images that the linked webpage contains. Like in the second example of this README or here -- it found three images in the markdown file:
 ```
 $ directlink https://github.com/Nakilon/dhash-vips
 <= https://github.com/Nakilon/dhash-vips
@@ -155,10 +162,17 @@ DirectLink "http://minus.com/", 0
 SocketError: Failed to open TCP connection to minus.com:80 (getaddrinfo: nodename nor servname provided, or not known) to http://minus.com/
 ```
+#### Ruby 2.0
+The `addressable` dependency (for proper URI parsing) has a dependency that by default wants Ruby 2.1 or higher. You may fix it safely by adding this line to your `Gemfile`:
+```
+gem "jwt", "<2"
+```
 ## Notes:
 * `module DirectLink` public methods return different sets of properties -- `DirectLink()` unites them
-* the `ErrorAssert` and `ErrorMissingEnvVar` should never be raised and you might report it if it does
+* the `ErrorAssert`, `ErrorMissingEnvVar` and `URI::InvalidURIError` should never be raised and you might report it
 * style: `@@` and lambdas are used to keep things private
 * this gem is a historically 2 or 3 libraries merged -- this is why tests may look awkward
 * 500px.com has discontinued API in June 2018 -- the tool now uses undocumented methods
@@ -166,3 +180,4 @@ SocketError: Failed to open TCP connection to minus.com:80 (getaddrinfo: nodenam
 TODO: maybe make all these web service specific methods private and discourage to use them since they all return very different things and sometimes don't raise exceptions while the `DirectLink()` does
 TODO: what should `--json` print if exception was thrown?
+TODO: looped prompt mode

data/directlink.gemspec CHANGED Viewed

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name         = "directlink"
-  spec.version      = "0.0.4.3"
+  spec.version      = "0.0.4.4"
   spec.summary      = "converts any kind of image hyperlink to direct link, type of image and its resolution"
   spec.author       = "Victor Maslov aka Nakilon"
@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "fastimage", "~>2.1.3"
   spec.add_dependency "nokogiri"
-  spec.add_dependency "reddit_bot", "~>1.6.7"
+  spec.add_dependency "reddit_bot", "~>1.6.8"
   spec.add_dependency "kramdown"
   spec.add_dependency "addressable"
   spec.add_development_dependency "minitest"

data/lib/directlink.rb CHANGED Viewed

@@ -46,25 +46,29 @@ module DirectLink
          /\A(https:\/\/lh3\.googleusercontent\.com\/-[a-zA-Z0-9_-]{11}\/W[a-zA-Z0-9_-]{9}I\/AAAAAAAA[a-zA-Z0-9_]{3}\/[a-zA-Z0-9_-]{32}[gwAQ]CJoC\/)w4\d\d-h318-n(\/[^\/]+)\z/,
          /\A(https:\/\/lh3\.googleusercontent\.com\/-[a-zA-Z0-9_]{11}\/W[a-zA-Z0-9]{9}I\/AAAAAAAA[a-zA-Z0-9]{3}\/[a-zA-Z0-9_-]{32}[gw]CJoC\/)w48\d-h8\d\d-n(\/[^\/]+)\z/,
          /\A(https:\/\/lh3\.googleusercontent\.com\/-[a-zA-Z0-9_-]{11}\/W[a-zA-Z0-9_-]{9}I\/AAAAAAA[a-zA-Z0-9_-]{4}\/[a-zA-Z0-9_-]{33}(?:CJoC|CL0B(?:GAs)?)\/)w530(?:-d)?-h[1-9]\d\d-n(\/[^\/]+)\z/,
-         /\A(https:\/\/lh3\.googleusercontent\.com\/-[a-zA-Z0-9]{11}\/W[a-zA-Z0-9]{9}I\/AAAAAAAA[a-zA-Z]{3}\/[a-zA-Z0-9-]{32}QCJoC\/)w530-h175-n(\/[^\/]+)\z/,
-         /\A(https:\/\/lh3\.googleusercontent\.com\/-[a-zA-Z-]{11}\/W[a-zA-Z-]{9}I\/AAAAAAAA[a-zA-Z]{3}\/[a-zA-Z0-9_-]{32}ACJoC\/)w179-h318-n(\/[^\/]+)\z/,
-         /\A(https:\/\/lh3\.googleusercontent\.com\/-[a-zA-Z0-9-]{11}\/W[a-zA-Z0-9]{9}I\/AAAAAAAAA[A-Z]{2}\/[a-zA-Z0-9]{32}QCJoC\/)w208-h318-n(\/[^\/]+)\z/
+         /\A(https:\/\/lh3\.googleusercontent\.com\/-[a-zA-Z-]{11}\/W[a-zA-Z-]{9}I\/AAAAAAAA[a-zA-Z]{3}\/[a-zA-Z0-9_-]{32}ACJoC\/)w179-h318-n(\/[^\/]+)\z/
       "#{$1}s#{width}#{$2}"
-    when /\A(\/\/lh3\.googleusercontent\.com\/proxy\/[a-zA-Z0-9_-]{66,523}=)(?:w(?:464|504|530)-h\d\d\d-[np]|s530-p|s110-p-k)\z/
+    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}"
     when /\A(\/\/lh3\.googleusercontent\.com\/cOh2Nsv7EGo0QbuoKxoKZVZO_NcBzufuvPtzirMJfPmAzCzMtnEncfA7zGIDTJfkc1YZFX2MhgKnjA=)w530-h398-p\z/
       "https:#{$1}s#{width}"
-    when /\A(\/\/lh3\.googleusercontent\.com\/-[a-zA-Z0-9-]{11}\/W[a-zA-Z0-9_-]{9}I\/AAAAAAA[AC][a-zA-Z0-9]{3}\/[a-zA-Z0-9_-]{32}[gwAQ]CJoC\/)w530-h3\d\d-p(\/[^\/]+)\z/,
+    when /\A(\/\/lh3\.googleusercontent\.com\/-[a-zA-Z0-9-]{11}\/[VW][a-zA-Z0-9_-]{9}I\/AAAAAAA[AC][a-zA-Z0-9]{3}\/[a-zA-Z0-9_-]{32}[gwAQ]CJoC\/)w530-h3\d\d-p(\/[^\/]+)\z/,
+         /\A(\/\/lh3\.googleusercontent\.com\/-[a-zA-Z0-9]{11}\/W[a-zA-Z0-9]{9}I\/AAAAAAAA[a-zA-Z0-9]{3}\/[a-zA-Z0-9_]{32}ACJoC\/)w530-h298-p(\/[^\/]+)\z/,
          /\A(\/\/[124]\.bp\.blogspot\.com\/-[a-zA-Z0-9_-]{11}\/W[npw][a-zA-Z0-9_-]{8}I\/AAAAAAAA[KDE][a-zA-Z0-9_-]{2}\/[a-zA-Z0-9_-]{33}C(?:Lc|Kg)BGAs\/)w530-h[23]\d\d-p(\/[^\/]+)\z/,
-         /\A(\/\/[2]\.bp\.blogspot\.com\/-[a-zA-Z-]{11}\/W[a-zA-Z0-9]{8}_I\/AAAAAAAAHDs\/[a-zA-Z0-9-]{33}CEwYBhgL\/)w530-h353-p(\/[^\/]+)\z/
+         /\A(\/\/[2]\.bp\.blogspot\.com\/-[a-zA-Z-]{11}\/W[a-zA-Z0-9]{8}_I\/AAAAAAAAHDs\/[a-zA-Z0-9-]{33}CEwYBhgL\/)w530-h353-p(\/[^\/]+)\z/,
+         /\A(\/\/4\.bp\.blogspot\.com\/-[a-zA-Z0-9-]{11}\/W[a-zA-Z0-9]{9}I\/AAAAAAAAHHg\/[a-zA-Z0-9-]{33}CLcBGAs\/)w530-h353-p(\/[^\/]+)\z/
       "https:#{$1}s#{width}#{$2}"
     when /\A(https:\/\/lh3\.googleusercontent\.com\/-dUQsDY2vWuE\/AAAAAAAAAAI\/AAAAAAAAAAQ\/wVFZagieszU\/)w530-h176-n(\/photo\.jpg)\z/,
-         /\A(https:\/\/lh3\.googleusercontent\.com\/-t_ab__91ChA\/VeLaObkUlgI\/AAAAAAAAL4s\/VjO6KK_lkRw\/)w530-h351-n(\/[^\/]+)\z/
+         /\A(https:\/\/lh3\.googleusercontent\.com\/-t_ab__91ChA\/VeLaObkUlgI\/AAAAAAAAL4s\/VjO6KK_lkRw\/)w530-h351-n(\/[^\/]+)\z/,
+         /\A(https:\/\/lh3\.googleusercontent\.com\/-s655sojwyvw\/VcNB4YMCz-I\/AAAAAAAALqo\/kW98MOcJJ0g\/)w530-h398-n\/06\.08\.15%2B-%2B1\z/,
+         /\A(https:\/\/lh3\.googleusercontent\.com\/-u3FhiUTmLCY\/Vk7dMQnxR2I\/AAAAAAAAMc0\/I76_52swA4s\/)w530-h322-n\/Harekosh_A%252520Concert_YkRqQg\.jpg\z/,
+         /\A(https:\/\/lh3\.googleusercontent\.com\/-t_ab__91ChA\/VeLaObkUlgI\/AAAAAAAAL4s\/VjO6KK_lkRw\/)w530-d-h351-n\/30\.08\.15%2B-%2B1\z/
       "#{$1}s#{width}#{$2}"
     # high res (s0) Google Plus post image
     when /\Ahttps:\/\/lh3\.googleusercontent\.com\/-[a-zA-Z0-9_-]{11}\/W[a-zA-Z0-9_-]{9}I\/AAAAAAA[ABC][a-zA-Z0-9]{3}\/[a-zA-Z0-9_-]{33}CJoC\/s0\/[^\/]+\z/,
          /\Ahttps:\/\/lh3\.googleusercontent\.com\/-[a-zA-Z0-9]{11}\/W[a-zA-Z0-9]{9}I\/AAAAAAAA[a-zA-Z_]{3}\/[a-zA-Z0-9]{32}gCJoC\/s0\/[^\/]+\z/,
-         /\Ahttps:\/\/lh3\.googleusercontent\.com\/-[a-zA-Z0-9]{11}\/[a-zA-Z0-9]{10}I\/AAAAAAA[a-zA-Z]{4}\/[a-zA-Z0-9]{32}wCJoC\/s0\/[^\/]+\z/
+         /\Ahttps:\/\/lh3\.googleusercontent\.com\/-[a-zA-Z0-9]{11}\/[a-zA-Z0-9]{10}I\/AAAAAAA[a-zA-Z0-9]{4}\/[a-zA-Z0-9_-]{32}wCJoC\/s0\/[^\/]+\z/,
+         /\Ahttps:\/\/lh3\.googleusercontent\.com\/-[a-zA-Z0-9]{11}\/[a-zA-Z0-9]{10}I\/AAAAAAA[A-Z]{4}\/[a-zA-Z0-9-]{32}gCJoC\/s0\/[^\/]+\z/
       src
     # Google Plus userpic
     when /\A(https:\/\/lh3\.googleusercontent\.com\/-[a-zA-Z0-9-]{11}\/AAAAAAAAAAI\/AAAAAAAA[a-zA-Z0-9]{3}\/[a-zA-Z0-9_-]{11}\/)s\d\d-p(?:-k)?-rw-no(\/photo\.jpg)\z/
@@ -90,24 +94,25 @@ module DirectLink
   def self.imgur link, timeout = 1000
     raise ErrorMissingEnvVar.new "define IMGUR_CLIENT_ID env var" unless ENV["IMGUR_CLIENT_ID"]
-    case link
-    when /\Ahttps?:\/\/(?:(?:i|m|www)\.)?imgur\.com\/(a|gallery)\/([a-zA-Z0-9]{5}(?:[a-zA-Z0-9]{2})?)\z/,
-         /\Ahttps?:\/\/imgur\.com\/(gallery)\/([a-zA-Z0-9]{5}(?:[a-zA-Z0-9]{2})?)\/new\z/
+    request_data = lambda do |url|
       t = 1
-      json = begin
-        NetHTTPUtils.request_data "https://api.imgur.com/3/#{
-          $1 == "gallery" ? "gallery" : "album"
-        }/#{$2}/0.json", header: { Authorization: "Client-ID #{ENV["IMGUR_CLIENT_ID"]}" }
+      begin
+        NetHTTPUtils.request_data url, header: { Authorization: "Client-ID #{ENV["IMGUR_CLIENT_ID"]}" }
       rescue NetHTTPUtils::Error => e
-        if 500 == e.code && t < timeout
-          logger.error "retrying in #{t} seconds because of Imgur HTTP ERROR 500"
+        raise ErrorNotFound.new url.inspect if 404 == e.code
+        if t < timeout && [400, 500, 503].include?(e.code)
+          logger.error "retrying in #{t} seconds because of Imgur HTTP ERROR #{e.code}"
           sleep t
           t *= 2
           retry
         end
-        raise ErrorNotFound.new link.inspect if 404 == e.code
-        raise ErrorAssert.new "unexpected http error for #{link}"
+        raise ErrorAssert.new "unexpected http error for #{url}"
       end
+    end
+    case link
+    when /\Ahttps?:\/\/(?:(?:i|m|www)\.)?imgur\.com\/(a|gallery)\/([a-zA-Z0-9]{5}(?:[a-zA-Z0-9]{2})?)\z/,
+         /\Ahttps?:\/\/imgur\.com\/(gallery)\/([a-zA-Z0-9]{5}(?:[a-zA-Z0-9]{2})?)\/new\z/
+      json = request_data["https://api.imgur.com/3/#{$1 == "gallery" ? "gallery" : "album"}/#{$2}/0.json"]
       data = JSON.load(json)["data"]
       if data["error"]
         raise ErrorAssert.new "unexpected error #{data.inspect} for #{link}"
@@ -128,19 +133,7 @@ module DirectLink
          /\Ahttps?:\/\/imgur\.com\/([a-zA-Z0-9]{5}(?:[a-zA-Z0-9]{2})?)\z/,
          /\Ahttps?:\/\/imgur\.com\/([a-zA-Z0-9]{7})(?:\?\S+)?\z/,
          /\Ahttps?:\/\/imgur\.com\/r\/[0-9_a-z]+\/([a-zA-Z0-9]{7})\z/
-      t = 1
-      json = begin
-        NetHTTPUtils.request_data "https://api.imgur.com/3/image/#{$1}/0.json", header: { Authorization: "Client-ID #{ENV["IMGUR_CLIENT_ID"]}" }
-      rescue NetHTTPUtils::Error => e
-        raise ErrorNotFound.new link.inspect if e.code == 404
-        if t < timeout && [400, 500].include?(e.code)
-          logger.error "retrying in #{t} seconds because of Imgur HTTP ERROR #{e.code}"
-          sleep t
-          t *= 2
-          retry
-        end
-        raise ErrorAssert.new "unexpected http error for #{link}"
-      end
+      json = request_data["https://api.imgur.com/3/image/#{$1}/0.json"]
       [ JSON.load(json)["data"] ]
     else
       raise ErrorBadLink.new link
@@ -202,29 +195,48 @@ module DirectLink
   class << self
     attr_accessor :reddit_bot
   end
-  def self.reddit link
+  def self.reddit link, timeout = 1000
     unless id = URI(link).path[/\A(?:\/r\/[0-9a-zA-Z_]+)?(?:\/comments)?\/([0-9a-z]{5,6})(?:\/|\z)/, 1]
       raise DirectLink::ErrorBadLink.new link unless URI(link).host &&
                                                      URI(link).host.split(?.) == %w{ i redd it } &&
                                                      URI(link).path[/\A\/[a-z0-9]{12,13}\.(gif|jpg)\z/]
       return [true, link]
     end
-    if ENV["REDDIT_SECRETS"]
+    retry_on_json_parseerror = lambda do |&b|
+      t = 1
+      begin
+        b.call
+      rescue JSON::ParserError => e
+        raise ErrorBadLink.new link if t > timeout
+        logger.error "#{e.message[0, 500].gsub(/\s+/, " ")}, retrying in #{t} seconds"
+        sleep t
+        t *= 2
+        retry
+      end
+    end
+    json = if ENV["REDDIT_SECRETS"]
       require "reddit_bot"
       RedditBot.logger.level = Logger::FATAL
       require "yaml"
-      reddit_bot ||= RedditBot::Bot.new YAML.load_file ENV["REDDIT_SECRETS"]
-      json = reddit_bot.json(:get, "/by_id/t3_#{id}")
+      self.reddit_bot ||= RedditBot::Bot.new YAML.load_file ENV["REDDIT_SECRETS"]
+      retry_on_json_parseerror.call{ self.reddit_bot.json :get, "/by_id/t3_#{id}" }
     else
       raise ErrorMissingEnvVar.new "defining REDDIT_SECRETS env var is highly recommended" rescue nil
-      json = JSON.load NetHTTPUtils.request_data "#{link}.json", header: {"User-Agent" => "Mozilla"}
+      json = retry_on_json_parseerror.call{ JSON.load NetHTTPUtils.request_data "https://www.reddit.com/#{id}.json", header: {"User-Agent" => "Mozilla"} }
       raise ErrorAssert.new "our knowledge about Reddit API seems to be outdated" unless json.size == 2
-      json = json.find{ |_| _["data"]["children"].first["kind"] == "t3" }
+      json.find{ |_| _["data"]["children"].first["kind"] == "t3" }
     end
     data = json["data"]["children"].first["data"]
-    url = data["url"]
-    return [true, url] unless data["is_self"]
-    raise ErrorAssert.new "our knowledge about Reddit API seems to be outdated" if url != "https://www.reddit.com" + data["permalink"]
+    if data["media"]["reddit_video"]
+      t = data["preview"]["images"]
+      raise ErrorAssert.new "our knowledge about Reddit API seems to be outdated" unless t.size == 1
+      return [true, t.first["source"]["url"]]
+    else
+      raise ErrorAssert.new "our knowledge about Reddit API seems to be outdated" unless data["media"].keys.sort == %w{ oembed type } && data["media"]["type"] == "youtube.com"
+      return [true, data["media"]["oembed"]["thumbnail_url"]]
+    end if data["media"]
+    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"]]
   end
@@ -312,16 +324,17 @@ def DirectLink link, max_redirect_resolving_retry_delay = nil, giveup = false
   begin
     s, u = DirectLink.reddit(link)
-    if s
-      return DirectLink u, max_redirect_resolving_retry_delay, giveup
+    unless s
+      raise DirectLink::ErrorBadLink.new link if giveup   # TODO: print original url in such cases if there was a recursion
+      f = ->_{ _.type == :a ? _.attr["href"] : _.children.flat_map(&f) }
+      require "kramdown"
+      return f[Kramdown::Document.new(u).root].map{ |_| DirectLink _, max_redirect_resolving_retry_delay, giveup }
     end
-    raise DirectLink::ErrorBadLink.new link if giveup   # TODO: print original url in such cases if there was a recursion
-    f = ->_{ _.type == :a ? _.attr["href"] : _.children.flat_map(&f) }
-    require "kramdown"
-    return f[Kramdown::Document.new(u).root].map{ |_| DirectLink _, max_redirect_resolving_retry_delay, giveup }
+    return struct.new *u.values_at(*%w{ fallback_url width height }), "video" if u.is_a? Hash
+    link = u
   rescue DirectLink::ErrorMissingEnvVar
   end if %w{ reddit com } == URI(link).host.split(?.).last(2) ||
-         %w{ redd it    } == URI(link).host.split(?.).last(2)
+         %w{ redd it    } == URI(link).host.split(?.)
   begin

data/test.rb CHANGED Viewed

@@ -113,6 +113,18 @@ describe DirectLink do
           assert DirectLink.google link
         end
       end
+      %w{
+        https://lh3.googleusercontent.com/-s655sojwyvw/VcNB4YMCz-I/AAAAAAAALqo/kW98MOcJJ0g/w530-h398-n/06.08.15%2B-%2B1
+        //4.bp.blogspot.com/-TuMlpg-Q1YY/W3PXkW1lkaI/AAAAAAAAHHg/Bh9IsuLV01kbctIu6lcRJHKkY-ej8oD5gCLcBGAs/w530-h353-p/_MG_2688-Edit.jpg
+        //lh3.googleusercontent.com/proxy/SEfB6tFuim6X0HdZfEBSxrXtumUdf4Q4y05rUW4wc_clWWVrowuWAGZghx71xwPUmf_8si2VQwnRivsM7PfD2gp3kA=w480-h360-n
+        https://lh3.googleusercontent.com/-u3FhiUTmLCY/Vk7dMQnxR2I/AAAAAAAAMc0/I76_52swA4s/w530-h322-n/Harekosh_A%252520Concert_YkRqQg.jpg
+        https://lh3.googleusercontent.com/-t_ab__91ChA/VeLaObkUlgI/AAAAAAAAL4s/VjO6KK_lkRw/w530-d-h351-n/30.08.15%2B-%2B1
+        //lh3.googleusercontent.com/-u2NzdIQfVyQ/Wy83AzoFT8I/AAAAAAAAh6M/fdpxOUkj5mUIfpvYol_R5dyupnF2nDIEACJoC/w530-h298-p/_DSC9134.jpg
+      }.each_with_index do |link, i|  # July contenstants
+        it "another (July) Google Plus community post image ##{i + 1}" do
+          assert DirectLink.google link
+        end
+      end
       %w{
         https://lh3.googleusercontent.com/-f37xWyiyP8U/WvmxOxCd-0I/AAAAAAAACpw/3A2tRj02oY40MzJqZBJyWGImoSer0lwMgCJoC/s0/140809%2B029.jpg
         https://lh3.googleusercontent.com/-1s_eiQB4x2k/WvXQEx59z2I/AAAAAAAAcI0/DvKYzWw3g6UNelqAQdOwrdtYdSEqKgkxwCJoC/s0/001
@@ -131,6 +143,8 @@ describe DirectLink do
         https://lh3.googleusercontent.com/-aUVoiLNsmAg/WzcsUU2xfNI/AAAAAAAAODw/DOBual6E1rkVLHh3SKZSzbpNQzdEoZPOQCJoC/w530-h883-n-k-no/gplus-1797734754.mp4
         //lh3.googleusercontent.com/proxy/hOIoIpMEmoVDSP40VRzM92Zw2AeLvEEhxfyKHCOxiNVPyiGvZik5rMvl3jYISLgDJla6mhZuk8pFEYJhX5BU2wy_dw=w530-h822-p
         https://lh3.googleusercontent.com/-GP3BA3zGR5A/W0IwuVXlfmI/AAAAAAADROs/SH8rRlBDYTsHZiHpM45S3zpEipu5hJ2PwCJoC/s0/%25D1%2582%25D0%25B0%25D0%25B4%25D0%25B6%25D0%25B8%25D0%25BA%25D1%2581%25D0%25BA%25D0%25BE%25D0%25B5%2B%25D1%2580%25D0%25B0%25D0%25B7%25D0%25BD%25D0%25BE%25D1%2582%25D1%2580%25D0%25B0%25D0%25B2%25D1%258C%25D0%25B5.png
+        https://lh3.googleusercontent.com/-DLODAbD9W7E/W27ob5XGCOI/AAAAAAADV8g/J_6RYR6UkKsc2RJOWRx6Q-NBVx5RbMoxwCJoC/s0/1236080.jpg
+        https://lh3.googleusercontent.com/-cJajRreI87w/W4gW5uF4Q7I/AAAAAAADZKI/mw1YayYE-MY2-1OCCmjvgM3kbCK0lmIggCJoC/s0/2504855.jpg
       }.each_with_index do |link, i|
         it "gpluscomm_105636351696833883213_86400 ##{i + 1}" do
           assert DirectLink.google link
@@ -187,21 +201,27 @@ describe DirectLink do
         assert_nil e.cause if Exception.instance_methods.include? :cause  # Ruby 2.1
       end
-      valid_imgur_image_url = "https://i.imgur.com/BLCesav.jpg"
+      valid_imgur_image_url_direct = "https://i.imgur.com/BLCesav.jpg"
       it 200 do
         assert_equal [["https://i.imgur.com/BLCesav.jpg", 1000, 1500, "image/jpeg"]],
-                     DirectLink.imgur(valid_imgur_image_url)
-      end
-      [400, 500].each do |error_code|
-        it "retries two times on error #{error_code}" do
-          tries = 0
-          e = assert_raises DirectLink::ErrorAssert do
-            NetHTTPUtils.stub :request_data, ->*{ tries += 1; raise NetHTTPUtils::Error.new "", error_code } do
-              DirectLink.imgur valid_imgur_image_url, 4   # do not remove `4` or test may hang
+                     DirectLink.imgur(valid_imgur_image_url_direct)
+      end
+      valid_imgur_image_url_album = "https://imgur.com/a/wPi63mj"
+      [400, 500, 503].each do |error_code|
+        [
+          [valid_imgur_image_url_direct, :direct],
+          [valid_imgur_image_url_album, :album],
+        ].each do |url, kind|
+          it "retries limited amout of times on error #{error_code} (#{kind})" do
+            tries = 0
+            e = assert_raises DirectLink::ErrorAssert do
+              NetHTTPUtils.stub :request_data, ->*{ tries += 1; raise NetHTTPUtils::Error.new "", error_code } do
+                DirectLink.imgur url, 4   # do not remove `4` or test will hang
+              end
             end
+            assert_equal error_code, e.cause.code if Exception.instance_methods.include? :cause  # Ruby 2.1
+            assert_equal 3, tries
           end
-          assert_equal error_code, e.cause.code if Exception.instance_methods.include? :cause  # Ruby 2.1
-          assert_equal 3, tries
         end
       end
       it "does not throw 400 after a successfull retry" do
@@ -213,13 +233,13 @@ describe DirectLink do
           m.call *args
         } do
           assert_equal [["https://i.imgur.com/BLCesav.jpg", 1000, 1500, "image/jpeg"]],
-            DirectLink.imgur(valid_imgur_image_url, 4)   # do not remove `4` or test may hang
+            DirectLink.imgur(valid_imgur_image_url_direct, 4)   # do not remove `4` or test may hang
         end
       end
       it 404 do
         e = assert_raises DirectLink::ErrorNotFound do
           NetHTTPUtils.stub :request_data, ->*{ raise NetHTTPUtils::Error.new "", 404 } do
-            DirectLink.imgur valid_imgur_image_url
+            DirectLink.imgur valid_imgur_image_url_direct
           end
         end
         assert_equal 404, e.cause.code if Exception.instance_methods.include? :cause  # Ruby 2.1
@@ -314,7 +334,7 @@ describe DirectLink do
         ["http://redd.it/32tq0i", [true, "http://i.imgur.com/vy6Ms4Z.jpg"]],                    # TODO maybe check that it calls #imgur recursively
         ["https://i.redd.it/c8rk0kjywhy01.jpg", [true, "https://i.redd.it/c8rk0kjywhy01.jpg"]],
         ["https://i.redd.it/si758zk7r5xz.jpg", [true, "https://i.redd.it/si758zk7r5xz.jpg"]],   # it is 404 but `.reddit` does not care -- it just returns the url
-        ["https://reddit.com/123456", [true, "http://www.youtube.com/watch?v=b9upM4RbIeU&amp;feature=g-vrec"]],
+        ["https://reddit.com/123456", [true, "https://i.ytimg.com/vi/b9upM4RbIeU/hqdefault.jpg"]],
         ["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"]],
       ] ],
@@ -381,6 +401,46 @@ describe DirectLink do
       end
     end
+    # TODO: make a Reddit describe
+    it "retries limited amout of times on error JSON::ParserError" do
+      link = "https://www.reddit.com/r/gifs/comments/9ftc8f/low_pass_wake_vortices/?st=JM2JIKII&amp;sh=c00fea4f"
+      tries = 0
+      m = NetHTTPUtils.method :request_data
+      e = assert_raises DirectLink::ErrorBadLink do
+        NetHTTPUtils.stub :request_data, lambda{ |*args|
+          if args.first == "https://www.reddit.com/9ftc8f.json"
+            tries += 1
+            raise JSON::ParserError
+          end
+          m.call *args
+        } do
+          t = ENV.delete "REDDIT_SECRETS"
+          begin
+            DirectLink.reddit link, 3   # do not remove `4` or test will hang
+          ensure
+            ENV["REDDIT_SECRETS"] = t
+          end
+        end
+      end
+      assert_instance_of JSON::ParserError, e.cause if Exception.instance_methods.include? :cause  # Ruby 2.1
+      assert_equal 3, tries
+    end
+    it "Reddit correctly parses out id when no token provided" do
+      t = ENV.delete "REDDIT_SECRETS"
+      begin
+        assert_equal "https://i.redditmedia.com/-WnE-3o4RhKx6ImGD69vJYAo7UjMn5b4ClHHISJ0_Kk.png?s=fc3e2f2f9973c45daa759a45a75557bf",
+                     DirectLink("https://www.reddit.com/r/gifs/comments/9ftc8f/low_pass_wake_vortices/?st=JM2JIKII&amp;sh=c00fea4f").url
+      ensure
+        ENV["REDDIT_SECRETS"] = t
+      end
+    end
+    it "it is really impossible to get dimensions from the shitty Reddit media hosting" do
+      # TODO: why does it call the same Net::HTTP::Get twice?
+      assert_raises FastImage::UnknownImageType do
+        DirectLink "https://v.redd.it/2tyovczka8m11/DASH_4_8_M"
+      end
+    end
     describe "throws ErrorBadLink if method does not match the link" do
       %i{ google imgur flickr _500px wiki reddit }.each do |method|
         ["", "test", "http://example.com/"].each_with_index do |url, i|
@@ -393,10 +453,54 @@ describe DirectLink do
       end
     end
+    # TODO: test each webservice-specific method
+    # TODO: check not in OpenSSL but higher -- in Net::HTTP
+        it "does not cause the SystemStackError" do
+          OpenSSL::Buffering.module_eval do
+            old = instance_method :write
+            depths = []
+            define_method :write do |arg|
+              depths.push caller.size
+              raise "probable infinite recursion" if [1]*10 == depths.each_cons(2).map{ |i,j| j-i } if depths.size > 10
+              old.bind(self).(arg)
+            end
+          end
+          DirectLink "https://i.redd.it/gdo0cnmeagx01.jpg"
+        end
   end
   describe "DirectLink()" do
+    it "does not raise JSON::ParserError -- Reddit sucks and may respond with wrong content type" do
+      DirectLink.reddit "https://www.reddit.com/123456"   # just to initialize DirectLink.reddit_bot
+                                                          # I don't remember for what though
+                                                          # oh, maybe to avoid rasing in initializer
+                                                          # but why not?
+      limit = 0
+      loop do
+        limit += 1
+        tries = 0
+        m = JSON.method :load
+        JSON.stub :load, ->*args{
+          if limit == tries += 1
+            raise JSON::ParserError
+          else
+            m.call *args
+          end
+        } do
+          t = ENV.delete "REDDIT_SECRETS"
+          begin
+            p DirectLink.reddit "https://www.reddit.com/123456"
+          ensure
+            ENV["REDDIT_SECRETS"] = t
+          end
+        end
+        break if 1 == tries
+      end
+      assert_equal 2, limit, "`JSON.load` was called only once?!"
+    end
     # thanks to gem addressable
     it "does not throw URI::InvalidURIError if there are brackets" do
       assert_equal 404, (
@@ -480,8 +584,6 @@ describe DirectLink do
         ["https://github.com/Nakilon/dhash-vips", 3],
         ["http://imgur.com/HQHBBBD",              FastImage::UnknownImageType, true],
         ["http://imgur.com/HQHBBBD",              "https://i.imgur.com/HQHBBBD.jpg?fb"],  # .at_css("meta[@property='og:image']")
-        ["http://redd.it/123456",                 FastImage::UnknownImageType, true],
-        ["http://redd.it/123456",                 1],
         ["http://redd.it/997he7",                 DirectLink::ErrorBadLink, true],
         ["http://redd.it/997he7",                 1],   # currently only links are parsed
       ].each_with_index do |(input, expectation, giveup), i|

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: directlink
 version: !ruby/object:Gem::Version
-  version: 0.0.4.3
+  version: 0.0.4.4
 platform: ruby
 authors:
 - Victor Maslov aka Nakilon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-08-23 00:00:00.000000000 Z
+date: 2018-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastimage
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.7
+        version: 1.6.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.7
+        version: 1.6.8
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement