directlink 0.0.4.9 → 0.0.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b1da64e01629ca1e690ebac1732dbe49a576aba
-  data.tar.gz: c4d73e370dff5680406bd4eb193c6b3ecf20f802
+  metadata.gz: 28c72341721f49df103ccc53f2f1dc3a26a9d190
+  data.tar.gz: 8ef4bbacb9644c40f6cca2383794d3cecec71bc1
 SHA512:
-  metadata.gz: aa438d792ddf174fa21eddc8d73f2f4474b9c164fae17de8d73d4e663900276cd6ce212d242b610fb824bf6b40aa74fb7a65ea2048624ea8505a841e7b1f671e
-  data.tar.gz: 6e394ec9f258a6945896a0d1addd6476434abc73346df88f4fd0f79ef5a90721460183885a3b438cfcdf7d7265c86b524a7289360dd4e129e6d4f083844b7f67
+  metadata.gz: 9d0be87dc287cf89fae211b2fb1b213b7be9ece2755b6ac3b9baefcf5f4ec8f75a83834984e81ffdde161b8656554f25a03c9a3240c89cc2ea7a7f7878be8b3e
+  data.tar.gz: a9a23ebe4e04ec82d02645d9000d7f71e7b3a5770707fe1791d3b8d40ddc652782319d724808aa78a5e0d42f3c491ba466075389d7f8ad8bb91c6e6b50a82849

data/directlink.gemspec

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

@@ -46,6 +46,7 @@ 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}\/X[a-zA-Z0-9-]{9}I\/AAAAAAAAC0s\/[a-zA-Z0-9]{33}CJoC\/)w530-h[1-9]\d\d-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(?:[45]\d\d)-h\d\d\d-[np]|s530-p|s110-p-k)\z/
@@ -195,8 +196,8 @@ module DirectLink
 
   require "cgi"
   def self.wiki link
-    raise ErrorBadLink.new link unless %r{\Ahttps?://([a-z]{2}\.wikipedia|commons.wikimedia)\.org/wiki(/[^/]+)*/(?<id>File:.+)} =~ link
-    t = JSON.load json = NetHTTPUtils.request_data( "https://commons.wikimedia.org/w/api.php", form: {
+    raise ErrorBadLink.new link unless %r{\Ahttps?://(?<hostname>([a-z]{2}\.wikipedia|commons.wikimedia)\.org)/wiki(/[^/]+)*/(?<id>File:.+)} =~ link
+    t = JSON.load json = NetHTTPUtils.request_data( "https://#{hostname}/w/api.php", form: {
       format: "json",
       action: "query",
       prop: "imageinfo",
@@ -295,8 +296,6 @@ def DirectLink link, max_redirect_resolving_retry_delay = nil, giveup = false
       "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 ? {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
-  rescue NetHTTPUtils::Error => e
-    raise unless e.code == 401
   else
     link = case head.instance_variable_get(:@last_response).code
     when "200" ; link

data/test.rb

@@ -147,6 +147,7 @@ describe DirectLink do
         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
         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
       }.each_with_index do |link, i|
         it "gpluscomm_105636351696833883213_86400 ##{i + 1}" do
           assert DirectLink.google link

metadata

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