metainspector 5.2.3 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4aa5c9bf09b480058faab117ba35ad33f8f3f30d
-  data.tar.gz: 4e960580f5823e775ac993f35158b2ca13e80037
+  metadata.gz: cba788277633b21dbd2df7a3487291335b6ae678
+  data.tar.gz: ceb4dbfa58b7372c0e13ac0e702ee8a5764df521
 SHA512:
-  metadata.gz: 22cab972b2f995f9fd548e6091480e0eac85f8394fe7bf7b9646e6d6f83937d743cb1eac2801a2d17759c18be272a07324159e939c5ebd1e6d98fdbca130299f
-  data.tar.gz: d08f347686fe5cc9a586615bc42404658c1ffe0ebbf7e25754591e66a0da1a89bc8b31edf6d2a9974a8cb0e0029609373effd30708d53d3228b5c70c96300c0a
+  metadata.gz: 59e2fa6c8bc92047c0bfe60645d6e04ccec51f87c60e964683a9c4c8b0ed35821d7a4d2252c780cdd763e81d11b8776d94c2ed8e3dc5701f35259cd4723ff9d1
+  data.tar.gz: 8c1220df275bd25570872b6732b541f8f5ab0f5abacdad184234b5f5f2eec665a128b90746003f9642f878dce0a20dd5dc3bf65a2b2c1d07a3843fde46948fa4

data/lib/meta_inspector/request.rb

@@ -3,6 +3,7 @@ require 'faraday_middleware'
 require 'faraday-cookie_jar'
 require 'faraday-http-cache'
 require 'faraday/encoding'
+require 'timeout'
 
 module MetaInspector
 
@@ -47,34 +48,49 @@ module MetaInspector
     private
 
     def fetch
-      @faraday_options.merge!(:url => url)
+      Timeout::timeout(fatal_timeout) do
+        @faraday_options.merge!(:url => url)
 
-      session = Faraday.new(@faraday_options) do |faraday|
-        faraday.request :retry, max: @retries
+        session = Faraday.new(@faraday_options) do |faraday|
+          faraday.request :retry, max: @retries
 
-        if @allow_redirections
-          faraday.use FaradayMiddleware::FollowRedirects, limit: 10
-          faraday.use :cookie_jar
+          if @allow_redirections
+            faraday.use FaradayMiddleware::FollowRedirects, limit: 10
+            faraday.use :cookie_jar
+          end
+
+          if @faraday_http_cache.is_a?(Hash)
+            @faraday_http_cache[:serializer] ||= Marshal
+            faraday.use Faraday::HttpCache, @faraday_http_cache
+          end
+
+          faraday.headers.merge!(@headers || {})
+          faraday.response :encoding
+          faraday.adapter :net_http
         end
 
-        if @faraday_http_cache.is_a?(Hash)
-          @faraday_http_cache[:serializer] ||= Marshal
-          faraday.use Faraday::HttpCache, @faraday_http_cache
+        response = session.get do |req|
+          req.options.timeout      = @connection_timeout
+          req.options.open_timeout = @read_timeout
         end
 
-        faraday.headers.merge!(@headers || {})
-        faraday.response :encoding
-        faraday.adapter :net_http
-      end
+        @url.url = response.env.url.to_s
 
-      response = session.get do |req|
-        req.options.timeout      = @connection_timeout
-        req.options.open_timeout = @read_timeout
+        response
       end
+    rescue Timeout::Error => e
+      raise MetaInspector::TimeoutError.new(e)
+    end
 
-      @url.url = response.env.url.to_s
-
-      response
+    # Timeouts when connecting / reading a request are handled by Faraday, but in the
+    # case of URLs that respond with streaming, Faraday will never return. In that case,
+    # we'll resort to our own timeout
+    #
+    # https://github.com/jaimeiniesta/metainspector/issues/188
+    # https://github.com/lostisland/faraday/issues/602
+    #
+    def fatal_timeout
+      (@connection_timeout || 0) + (@read_timeout || 0) + 1
     end
   end
 end

data/lib/meta_inspector/version.rb

@@ -1,3 +1,3 @@
 module MetaInspector
-  VERSION = '5.2.3'
+  VERSION = '5.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metainspector
 version: !ruby/object:Gem::Version
-  version: 5.2.3
+  version: 5.3.0
 platform: ruby
 authors:
 - Jaime Iniesta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-27 00:00:00.000000000 Z
+date: 2016-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri