directlink 0.0.4.4 → 0.0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e252357f3a65696511a206fa8fdf8bebd65cc97
-  data.tar.gz: f4fddedf24809bed96c56a3e063b92d8feeb2cb9
+  metadata.gz: 812459ea321dc15a16ea19cea2176c5b37fa868b
+  data.tar.gz: b1328fb09fb38b8471eaaee2eb951ba77f87f026
 SHA512:
-  metadata.gz: c955776c59833e37194229370d7d26b17d1e6d48674b1cde952cc262eb9705e8681f8eb68d700b7de41abe31bb976a1fb297a18712a157dc0aec364b9d668377
-  data.tar.gz: cf7513d360fdfb6bad2108906398526ed18ee588dbd0a99e1961f5c8d593bd6061049376fad8936e0c835df0f4f6c1decc92952aa4040c4851a78dbb6bdc3d20
+  metadata.gz: 4e82be782453a80cf10d38334e532edde1feb72c9b24fb9ff24c3c7baa7d12a3b30de655af9be7f1527b63d5fea9aae2fbc2e08ec80c28f0e846d6a40454e019
+  data.tar.gz: fa87ea7807b41ca3689455afb2dac674ee659352adf5a5fa57c519eb47d46d7d4f388ba8d9478d69bfee3d3998c3c762e3159ad1105656b7a2e27734f7f86924

data/bin/directlink

@@ -70,6 +70,7 @@ begin
   end
 rescue SocketError,
        Net::OpenTimeout,
+       Errno::ECONNRESET,
        NetHTTPUtils::Error,
        FastImage::UnknownImageType,
        FastImage::ImageFetchFailure,

data/directlink.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name         = "directlink"
-  spec.version      = "0.0.4.4"
+  spec.version      = "0.0.4.5"
   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.8"
+  spec.add_dependency "reddit_bot", "~>1.6.9"
   spec.add_dependency "kramdown"
   spec.add_dependency "addressable"
   spec.add_development_dependency "minitest"

data/lib/directlink.rb

@@ -19,7 +19,7 @@ module DirectLink
   end
   logging_error = Class.new RuntimeError do
     def initialize msg
-      Module.nesting.first.logger.error msg
+      Module.nesting.first.logger.error "#{self.class}: #{msg}"
       super msg
     end
   end
@@ -216,7 +216,7 @@ module DirectLink
     end
     json = if ENV["REDDIT_SECRETS"]
       require "reddit_bot"
-      RedditBot.logger.level = Logger::FATAL
+      RedditBot.logger.level = Logger::ERROR
       require "yaml"
       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}" }
@@ -228,13 +228,12 @@ module DirectLink
     end
     data = json["data"]["children"].first["data"]
     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"]]
+      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 } && data["media"]["type"] == "youtube.com"
       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"]] 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"]]
@@ -273,7 +272,9 @@ def DirectLink link, max_redirect_resolving_retry_delay = nil, giveup = false
   #   > NetHTTPUtils.logger.level = Logger::DEBUG
   #   > NetHTTPUtils.request_data "http://www.aeronautica.difesa.it/organizzazione/REPARTI/divolo/PublishingImages/6%C2%B0%20Stormo/2013-decollo%20al%20tramonto%20REX%201280.jpg",
   #                               max_read_retry_delay: 5, timeout: 5
-  r = NetHTTPUtils.get_response link, 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"}, **(max_redirect_resolving_retry_delay ? {
+  r = NetHTTPUtils.get_response link, 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"
+  }, **(max_redirect_resolving_retry_delay ? {
     max_timeout_retry_delay: max_redirect_resolving_retry_delay,
     max_sslerror_retry_delay: max_redirect_resolving_retry_delay,
     max_read_retry_delay: max_redirect_resolving_retry_delay,
@@ -328,7 +329,9 @@ def DirectLink link, max_redirect_resolving_retry_delay = nil, giveup = false
       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 f[Kramdown::Document.new(u).root].map do |sublink|
+        DirectLink URI.join(link, sublink), max_redirect_resolving_retry_delay, giveup
+      end
     end
     return struct.new *u.values_at(*%w{ fallback_url width height }), "video" if u.is_a? Hash
     link = u
@@ -343,17 +346,15 @@ def DirectLink link, max_redirect_resolving_retry_delay = nil, giveup = false
     raise if giveup
     require "nokogiri"
     html = Nokogiri::HTML NetHTTPUtils::request_data link, header: {"User-Agent" => "Mozilla"}
-    h = {}
+    h = {}  # TODO: maybe move it outside because of possible img[:src] recursion?...
     l = lambda do |node, s = []|
       node.element_children.flat_map do |child|
-        if "img" == child.node_name
-          begin
-            [[s, (h[child[:src]] = h[child[:src]] || DirectLink(child[:src], nil, true))]]
-          rescue => e
-            []
-          end
-        else
-          l[child, s + [child.node_name]]
+        next l[child, s + [child.node_name]] unless "img" == child.node_name
+        begin
+          [[s, (h[child[:src]] = h[child[:src]] || DirectLink(URI.join(link, child[:src]), nil, true))]]  # ... or wait, do we giveup?
+        rescue => e
+          DirectLink.logger.error e
+          []
         end
       end
     end
@@ -363,6 +364,7 @@ def DirectLink link, max_redirect_resolving_retry_delay = nil, giveup = false
       return DirectLink t[:content], nil, true
     end.max_by{ |_, v| v.map{ |i| i.width * i.height }.inject(:+) / v.size }.last
   else
+    # TODO: maybe move this to right before `rescue` line
     w, h = f.size
     struct.new link, w, h, f.type
   end

data/test.rb

@@ -412,8 +412,11 @@ describe DirectLink do
             tries += 1
             raise JSON::ParserError
           end
+          # this gem call should never return success -- it should experience JSON::ParserError
+          #   so I'm not much sure why do we need this line
           m.call *args
         } do
+          # why?
           t = ENV.delete "REDDIT_SECRETS"
           begin
             DirectLink.reddit link, 3   # do not remove `4` or test will hang
@@ -427,11 +430,17 @@ describe DirectLink do
     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&sh=c00fea4f").url
-      ensure
-        ENV["REDDIT_SECRETS"] = t
+      FastImage.stub :new, lambda{ |link, *|
+        assert_equal "https://v.redd.it/2tyovczka8m11/DASH_4_8_M", link
+        throw :_
+      } do
+        begin
+          catch :_ do
+            DirectLink "https://www.reddit.com/r/gifs/comments/9ftc8f/low_pass_wake_vortices/?st=JM2JIKII&sh=c00fea4f"
+          end
+        ensure
+          ENV["REDDIT_SECRETS"] = t
+        end
       end
     end
     it "it is really impossible to get dimensions from the shitty Reddit media hosting" do
@@ -519,10 +528,15 @@ describe DirectLink do
     end
 
     describe "does not shadow the internal exception" do
-      it "raises SocketError from the redirect resolving stage" do
-        assert_raises SocketError do
-          NetHTTPUtils.stub :get_response, ->*{ raise SocketError.new } do
-            DirectLink "http://example.com/404"
+      [
+        SocketError,
+        Errno::ECONNRESET,
+      ].each do |exception|
+        it "raises #{exception} from the redirect resolving stage" do
+          assert_raises exception do
+            NetHTTPUtils.stub :get_response, ->*{ raise exception.new } do
+              DirectLink "http://example.com/404"
+            end
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: directlink
 version: !ruby/object:Gem::Version
-  version: 0.0.4.4
+  version: 0.0.4.5
 platform: ruby
 authors:
 - Victor Maslov aka Nakilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-15 00:00:00.000000000 Z
+date: 2018-11-05 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.8
+        version: 1.6.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.8
+        version: 1.6.9
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement