directlink 0.0.2.0 → 0.0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e3122bab4547d8bdb684ff41906edddb54030ea
-  data.tar.gz: 1a14b888b2ce1ee4e5c0f1493cbdfedaca5a49da
+  metadata.gz: 4ad94a6b55149c5f3f0a26a021131eff17311d65
+  data.tar.gz: d564d355ef4c3447274cd535ca569c3454262411
 SHA512:
-  metadata.gz: e2d49ca7a20bfe00eb33128328156f25e8e8703cb2e2ecfad3af876e3e52d8eaa12a64781482acce3767dcc1d114c40462b6f2465b851a4f0f257e971ccbaec3
-  data.tar.gz: 662c63eaf3d635e9a1b4f642b0787f29045a19ca52c309a383e20aa912804de64a4acd47b36f4cf259647293cfd0a49ec5996195da1ce28d2138a0a5c937c441
+  metadata.gz: d310ca90312eca7a4bbfbabe7773887f8cf6649c69fa31dd10bc154137aebd7eedb49413a4b4018783c8fbe8505f293cc696bbeb5dbd0025ae77f4a835d9fad9
+  data.tar.gz: 6e5b998c2c7d8006cd9762c4c80a3ce4f6e84887a537ad6712790a11f05b0e808f8e86b20a8f092d1ba8868d8fed390ec9d5be8493e93ecece1229a090ff2008

data/README.md

@@ -85,7 +85,6 @@ When an image hosting with known API is recognized, the API will be used and you
 ```
 $ export IMGUR_CLIENT_ID=0f99cd781...
 $ export FLICKR_API_KEY=dc2bfd348b...
-$ export _500PX_CONSUMER_KEY=ESkHT...
 ```
 
 ### As a library
@@ -139,5 +138,4 @@ SocketError: Failed to open TCP connection to minus.com:80 (getaddrinfo: nodenam
 * `module DirectLink` public methods return different sets of properties -- `DirectLink()` unites them
 * the `DirectLink::ErrorAssert` should never happen and you might report it if it does
 * style: `@@` and lambdas are used to keep things private
-* resolution of 500px.com photo is that you get via Pro membership, not that URL really provides
 * this gem is a 2 or 3 libraries merged so don't expect tests to be full and consistent

data/bin/directlink

@@ -42,7 +42,7 @@ if github
 else
   require "directlink"
 end
-NetHTTPUtils.logger.level = Logger::FATAL
+NetHTTPUtils.logger.level = debug ? Logger::INFO : Logger::FATAL
 # TODO --timeout=
 DirectLink.silent = !debug
 abort "usage: directlink [--debug] [--json] [--github] <link1> <link2> <link3> ...\n#{

data/directlink.gemspec

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

@@ -80,27 +80,27 @@ module DirectLink
   require "json"
   require "nethttputils"
 
-  def self.imgur link
+  # TODO make the timeout handling respect the way the Directlink method works with timeouts
+  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/
-      timeout = 1
+      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"]}" }
       rescue NetHTTPUtils::Error => e
-        case e.code
-        when 500
-          logger.error "retrying in #{timeout} seconds because of Imgur HTTP ERROR 500"
-          sleep timeout
-          timeout *= 2
+        if 500 == e.code && t < timeout
+          logger.error "retrying in #{t} seconds because of Imgur HTTP ERROR 500"
+          sleep t
+          t *= 2
           retry
-        when 404 ; raise ErrorNotFound.new link.inspect
-        else ; raise ErrorAssert.new "unexpected http error for #{link}"
         end
+        raise ErrorNotFound.new link.inspect if 404 == e.code
+        raise ErrorAssert.new "unexpected http error for #{link}"
       end
       data = JSON.load(json)["data"]
       if data["error"]
@@ -122,10 +122,17 @@ 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 e.code == 400 && t < timeout
+          logger.error "retrying in #{t} seconds because of Imgur HTTP ERROR 400"
+          sleep t
+          t *= 2
+          retry
+        end
         raise ErrorAssert.new "unexpected http error for #{link}"
       end
       [ JSON.load(json)["data"] ]
@@ -143,6 +150,7 @@ module DirectLink
 
   def self._500px link
     raise ErrorBadLink.new link unless %r{\Ahttps://500px\.com/photo/(?<id>[^/]+)/[^/]+\z} =~ link
+    raise ErrorNotFound.new link    # 500px.com has deprecated their API
     raise ErrorMissingEnvVar.new "define _500PX_CONSUMER_KEY env var !!! WARNING: the 500px.com deprecates their API in summer of 2018 !!!" unless ENV["_500PX_CONSUMER_KEY"]
     JSON.load( NetHTTPUtils.request_data "https://api.500px.com/v1/photos/#{id}", form: {
       image_size: 2048,

data/test.rb

@@ -139,10 +139,11 @@ describe DirectLink do
         end
       end
 
-      it "ErrorNotFound" do
-        assert_raises DirectLink::ErrorNotFound do
+      it "ErrorNotFound when album is empty" do
+        e = assert_raises DirectLink::ErrorNotFound do
           DirectLink.imgur "https://imgur.com/a/wPi63mj"
         end
+        assert_nil e.cause if Exception.instance_methods.include? :cause  # Ruby 2.1
       end
 
       valid_imgur_image_url = "https://i.imgur.com/BLCesav.jpg"
@@ -150,21 +151,34 @@ describe DirectLink do
         assert_equal [["https://i.imgur.com/BLCesav.jpg", 1000, 1500, "image/jpeg"]],
                      DirectLink.imgur(valid_imgur_image_url)
       end
-      it 404 do
-        assert_raises DirectLink::ErrorNotFound do
-          NetHTTPUtils.stub :request_data, ->*{ raise NetHTTPUtils::Error.new "", 404 } do
-            DirectLink.imgur valid_imgur_image_url
-          end
-        end
-      end
       it 400 do
         e = assert_raises DirectLink::ErrorAssert do
           NetHTTPUtils.stub :request_data, ->*{ raise NetHTTPUtils::Error.new "", 400 } do
-            DirectLink.imgur valid_imgur_image_url
+            DirectLink.imgur valid_imgur_image_url, 4   # do not remove `4` or test may hang
           end
         end
         assert_equal 400, e.cause.code if Exception.instance_methods.include? :cause  # Ruby 2.1
       end
+      it "does not 400 after a successfull retry" do
+        f = false
+        m = NetHTTPUtils.method :request_data
+        NetHTTPUtils.stub :request_data, lambda{ |*args|
+          f ^= true
+          raise NetHTTPUtils::Error.new "", 400 if f
+          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
+        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
+          end
+        end
+        assert_equal 404, e.cause.code if Exception.instance_methods.include? :cause  # Ruby 2.1
+      end
 
       [ # TODO: move these end line comments to test names; and do the same in other tests
         ["https://imgur.com/a/Aoh6l", "https://i.imgur.com/BLCesav.jpg", 1000, 1500, "image/jpeg"],
@@ -228,7 +242,7 @@ describe DirectLink do
 
     [
       [ :_500px, [
-        ["https://500px.com/photo/112134597/milky-way-by-tom-hall", [4928, 2888, "https://drscdn.500px.org/photo/112134597/m%3D2048_k%3D1_a%3D1/v2?client_application_id=48351&webp=true&sig=6b9f6ac5aed6d051aa66911555657ef57262e7d998f406e40f50e6f61515808f", "jpeg"]],
+        ["https://500px.com/photo/112134597/milky-way-by-tom-hall", DirectLink::ErrorNotFound],
       ] ],
       [ :flickr, [
         ["https://www.flickr.com/photos/tomas-/17220613278/", DirectLink::ErrorNotFound],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: directlink
 version: !ruby/object:Gem::Version
-  version: 0.0.2.0
+  version: 0.0.2.1
 platform: ruby
 authors:
 - Victor Maslov aka Nakilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-11 00:00:00.000000000 Z
+date: 2018-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nethttputils