directlink 0.0.4.12 → 0.0.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bc1a52faf9ff54f576c21584edbc5d42c8405fd
-  data.tar.gz: abc2e62a2db58972cc717989b6d05cf75cda938b
+  metadata.gz: 14f2adc0cf8da9dfce19145a8f06ed28c8393555
+  data.tar.gz: c952263512c3d1c467c287fa7e30245b9a88e844
 SHA512:
-  metadata.gz: '0340192fbfc460f8c649df463fb8a78058ea9cb75696fc9c46cac807dcef7f739f9f60b3b5c91a2ee2e5ff4efeb7132480dfd961ff8481cd863ba4823a23c8d9'
-  data.tar.gz: e3d6520baf1b1c89c9afec9e88553fa3d4eeeb8f8bdd7d9e6ebaeb614b9b5e72030f1ece436374dc561f30888076b5a351a305a7784825e098f2019535c60f4e
+  metadata.gz: 1e1ebcd757a4baed3ce59de52ba1c23a9c8546f849991e75b513971546b4a41ec08869e95907aaece5dc98f8308c2ed8b2941d71e778257e21d590cdecd83a62
+  data.tar.gz: bdff382c7ea916ec43b3f7d8a03804b11d33d43963a218c706de43011e2e1f5923aa2a88bb2d0f7f919c1945518564d5e6d87a7840468a78604e991813d59164

data/.travis.yml

@@ -17,10 +17,21 @@ rvm:
   - jruby-head
 matrix:
   allow_failures:
+
   # NetHTTPUtils does not pass query params or smth
   - rvm: jruby-head
     os: osx
-  # the "Picked up _JAVA_OPTIONS: -Xmx2048m -Xms512m" output at jruby start ruins binstub tests
+
+  # the 'Picked up _JAVA_OPTIONS: -Xmx2048m -Xms512m' output at jruby start ruins binstub tests
   # TODO: -W0 does not help but probably there is another option or I should patch tests for jruby
   - rvm: jruby-head
     os: linux
+
+  # the 'The command "bundle install --jobs=3 --retry=3" failed and exited with 1 during .'
+  # I guess Travis is deprecating old Rubies and so will I
+  - rvm: 2.0
+    os: linux
+  - rvm: 2.1
+    os: linux
+  - rvm: 2.2
+    os: linux

data/directlink.gemspec

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

@@ -195,7 +195,7 @@ module DirectLink
     attr_accessor :reddit_bot
   end
   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]
+    unless id = URI(link).path[/\A(?:\/r\/[0-9a-zA-Z_]+)?(?:\/comments|\/duplicates)?\/([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/]
@@ -337,7 +337,7 @@ def DirectLink link, max_redirect_resolving_retry_delay = nil, giveup = false
       end
     end
     return struct.new *u.values_at(*%w{ fallback_url width height }), "video" if u.is_a? Hash
-    link = u
+    return DirectLink u
   rescue DirectLink::ErrorMissingEnvVar
   end if %w{ reddit com } == URI(link).host.split(?.).last(2) ||
          %w{ redd it    } == URI(link).host.split(?.)
@@ -348,6 +348,7 @@ def DirectLink link, max_redirect_resolving_retry_delay = nil, giveup = false
     raise if giveup
     require "nokogiri"
     head = NetHTTPUtils.request_data link, :head, header: {"User-Agent" => "Mozilla"}
+    # if we use :get here we will download megabytes of files just to giveup on content_type we can't process
     case head.instance_variable_get(:@last_response).content_type
     when "text/html" ; nil
     else ; raise

data/test.rb

@@ -376,6 +376,7 @@ describe DirectLink do
         ["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"]],
+        ["https://www.reddit.com/r/CatsStandingUp/duplicates/abn0ua/cat/", [true, "https://v.redd.it/s9b86afb6w721/DASH_2_4_M?source=fallback"]],
       ] ],
     ].each do |method, tests|
       describe method do
@@ -470,6 +471,7 @@ describe DirectLink do
       assert_equal 3, tries
     end
     it "Reddit correctly parses out id when no token provided" do
+      # this URL isn't supposed to not throw exception -- FastImage does not handle this media type (see the next test)
       t = ENV.delete "REDDIT_SECRETS"
       FastImage.stub :new, lambda{ |link, *|
         assert_equal "https://v.redd.it/2tyovczka8m11/DASH_4_8_M?source=fallback", link

metadata

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