directlink 0.0.8.6 → 0.0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a1ae138f21693bf2fd25cdeaf7bc4752bb13ea3
-  data.tar.gz: 324e4a5f70a2d41a44b49c8990b3f86d75097b94
+  metadata.gz: c8c2014f90201877c2ba3e77b957bcc868ff0fd0
+  data.tar.gz: f022f3940ca791a122dedd4f04f3f993d70c1b92
 SHA512:
-  metadata.gz: 46fb0e0f41a0b08f0f9b649492b39e279ce18b98cad89a07eb85bed2a1e1785e84180e65de7b0186e699ed942920af55e895dcc8892c6f04aca0da8e1b19ae6c
-  data.tar.gz: 9b27ff12af472d897c029dbe45416c7bedfdefd86afd0af88ec6cca65864c10a98603282cafc526796cda43dedae7657c107441ad3c4878dcf62645536719a75
+  metadata.gz: 71db986e82556414634ad85effdc9661c8816da3a448b86e0ffcb35acfe99118f83c03ed6d4ace3984555681f19acebc6253d4bea45ad9d16b179a689085d0b9
+  data.tar.gz: 336fa591f2a3371bed2a075ad89e0a9f9fb9555010910d3ac624cbe36dfe2c72b812494f1197023962b567ea44094cf49f0c8b77047db5611d267424055d361d

data/.bashrc

@@ -1,4 +1,5 @@
 source api_tokens_for_travis.sh
-echo 'to test: ruby -I../nethttputils/lib -I./lib test.rb'
-echo 'to test: ruby -I../nethttputils/lib -I./lib ./bin/directlink --debug ...'
-echo 'or: bundle exec ./bin/directlink --debug ...'
+echo 'to test: ruby -I./lib test.rb'
+echo 'or: ruby -I../nethttputils/lib -I./lib ./bin/directlink --debug ...'
+echo 'or: bundle exec ruby -I./lib ./bin/directlink --debug ...'
+echo 'or: byebug -I./lib ./bin/directlink ...'

data/bin/directlink

@@ -53,6 +53,7 @@ abort "usage: directlink [--debug] [--json] [--github] [--ignore-meta] <link1> <
       }" if [nil, "-h", "--help", "-v", "--version"].include? ARGV.first
 
 begin
+  # Struct instances have #each and Array() ruins them so we use .is_a?(Array)
   if json
     require "json"
     t = ARGV.map do |link|

data/directlink.gemspec

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

@@ -369,7 +369,7 @@ def DirectLink link, timeout = nil, giveup: false, ignore_meta: 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 do |sublink|
+      return f[Kramdown::Document.new(u).root].flat_map do |sublink|
         DirectLink URI.join(link, sublink).to_s, timeout, giveup: giveup
       end
     end
@@ -402,7 +402,10 @@ def DirectLink link, timeout = nil, giveup: false, ignore_meta: false
     end
     html = Nokogiri::HTML NetHTTPUtils.request_data link, header: {"User-Agent" => "Mozilla"}
     if t = html.at_css("meta[@property='og:image']")
-      return DirectLink URI.join(link, t[:content]), nil, giveup: true
+      begin
+        return DirectLink URI.join(link, t[:content]), nil, giveup: true
+      rescue URI::InvalidURIError
+      end
     end unless ignore_meta
     h = {}  # TODO: maybe move it outside because of possible img[:src] recursion?...
     l = lambda do |node, s = []|

data/test.rb

@@ -681,10 +681,12 @@ describe DirectLink do
         ["https://www.deviantart.com/nadyasonika/art/Asuka-Langley-Beach-Time-590134861", FastImage::UnknownImageType, true],
         ["https://www.deviantart.com/nadyasonika/art/Asuka-Langley-Beach-Time-590134861", "https://images-wixmp-ed30a86b8c4ca887773594c2.wixmp.com/f/943f66cb-78ad-40f2-a086-44420b98b431/d9rcmz1-5cbc5670-0193-485b-ac14-755ddb9562f4.jpg/v1/fill/w_1024,h_732,q_75,strp/asuka_langley_beach_time_by_nadyasonika_d9rcmz1-fullview.jpg?token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1cm46YXBwOjdlMGQxODg5ODIyNjQzNzNhNWYwZDQxNWVhMGQyNmUwIiwiaXNzIjoidXJuOmFwcDo3ZTBkMTg4OTgyMjY0MzczYTVmMGQ0MTVlYTBkMjZlMCIsIm9iaiI6W1t7ImhlaWdodCI6Ijw9NzMyIiwicGF0aCI6IlwvZlwvOTQzZjY2Y2ItNzhhZC00MGYyLWEwODYtNDQ0MjBiOThiNDMxXC9kOXJjbXoxLTVjYmM1NjcwLTAxOTMtNDg1Yi1hYzE0LTc1NWRkYjk1NjJmNC5qcGciLCJ3aWR0aCI6Ijw9MTAyNCJ9XV0sImF1ZCI6WyJ1cm46c2VydmljZTppbWFnZS5vcGVyYXRpb25zIl19.M-a_heYtVPwnR4eC9KIPk2mIYeNzEaTg4b4jqr_GwyI"],
         ["https://calgary.skyrisecities.com/news/2019/11/blue-morning-light", "https://cdn.skyrisecities.com/sites/default/files/images/articles/2019/11/39834/39834-132071.jpg"], # og:image without scheme
+        ["https://www.reddit.com/r/darksouls3/comments/e59djh/hand_it_over_that_thing_your_wallpaper/", DirectLink::ErrorBadLink, true],
+        ["https://www.reddit.com/r/darksouls3/comments/e59djh/hand_it_over_that_thing_your_wallpaper/", 6],
       ].each_with_index do |(input, expectation, giveup), i|
         it "##{i + 1} (#{URI(input).host}) (giveup=#{!!giveup})" do  # to match with minitest `-n` run flag
-          ti = ENV.delete "IMGUR_CLIENT_ID"
-          tr = ENV.delete "REDDIT_SECRETS"
+          ti = ENV.delete "IMGUR_CLIENT_ID" if %w{ imgur com } == URI(input).host.split(?.).last(2)
+          tr = ENV.delete "REDDIT_SECRETS" if %w{ reddit com } == URI(input).host.split(?.).last(2)
           begin
             case expectation
             when Class
@@ -703,8 +705,8 @@ describe DirectLink do
               }
             end
           ensure
-            ENV["IMGUR_CLIENT_ID"] = ti
-            ENV["REDDIT_SECRETS"] = tr
+            ENV["IMGUR_CLIENT_ID"] = ti if ti
+            ENV["REDDIT_SECRETS"] = tr if tr
           end
         end
       end
@@ -817,7 +819,7 @@ describe DirectLink do
     end
     it "ignores <meta> tag" do
       string, status = Open3.capture2e "RUBYOPT='-rbundler/setup' ./bin/directlink --json --ignore-meta https://www.kp.ru/daily/26342.7/3222103/"
-      assert_equal [0, 21, "https://s11.stc.all.kpcdn.net/share/i/12/8024261/wx1080.jpg"], [status.exitstatus, JSON.load(string).size, JSON.load(string).first.fetch("url")]
+      assert_equal [0, 21, "https://s11.stc.all.kpcdn.net/share/i/12/8024261/inx960x640.jpg"], [status.exitstatus, JSON.load(string).size, JSON.load(string).first.fetch("url")]
     end
 
   end

metadata

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