handle cached legacy heads

Author: gurgeous

lib/sinew/response.rb

@@ -6,6 +6,10 @@ module Sinew
   class Response
     attr_accessor :request, :uri, :body, :code, :headers
 
+    #
+    # factory methods
+    #
+
     def self.from_network(request, party_response)
       Response.new.tap do |response|
         response.request = request
@@ -34,6 +38,9 @@ def self.from_cache(request, body, head)
 
         # overwrite with cached response headers
         if head
+          if head !~ /^{/
+            return from_legacy_head(response, head)
+          end
           head = JSON.parse(head, symbolize_names: true)
           response.uri = URI.parse(head[:uri])
           response.code = head[:code]
@@ -52,6 +59,26 @@ def self.from_timeout(request)
       end
     end
 
+    def self.from_legacy_head(response, head)
+      response.tap do |response|
+        case head
+        when /\ACURLER_ERROR/
+          # error
+          response.code = 999
+        when /\AHTTP/
+          # redirect
+          location = head.scan(/Location: ([^\r\n]+)/).flatten.last
+          response.uri += location
+        else
+          $stderr.puts "unknown cached /head for #{response.uri}"
+        end
+      end
+    end
+
+    #
+    # accessors
+    #
+
     def error?
       code >= 400
     end

lib/sinew/version.rb

@@ -1,4 +1,4 @@
 module Sinew
   # Gem version
-  VERSION = '2.0.0'.freeze
+  VERSION = '2.0.1'.freeze
 end

test/legacy/eu.httpbin.org/head/redirect,3

@@ -0,0 +1,51 @@
+HTTP/1.1 302 FOUND
+Connection: keep-alive
+Server: gunicorn/19.7.1
+Date: Wed, 02 May 2018 20:55:20 GMT
+Content-Type: text/html; charset=utf-8
+Content-Length: 247
+Location: /relative-redirect/2
+Access-Control-Allow-Origin: *
+Access-Control-Allow-Credentials: true
+X-Powered-By: Flask
+X-Processed-Time: 0
+Via: 1.1 vegur
+
+HTTP/1.1 302 FOUND
+Connection: keep-alive
+Server: gunicorn/19.7.1
+Date: Wed, 02 May 2018 20:55:20 GMT
+Content-Type: text/html; charset=utf-8
+Content-Length: 0
+Location: /relative-redirect/1
+Access-Control-Allow-Origin: *
+Access-Control-Allow-Credentials: true
+X-Powered-By: Flask
+X-Processed-Time: 0
+Via: 1.1 vegur
+
+HTTP/1.1 302 FOUND
+Connection: keep-alive
+Server: gunicorn/19.7.1
+Date: Wed, 02 May 2018 20:55:20 GMT
+Content-Type: text/html; charset=utf-8
+Content-Length: 0
+Location: /get
+Access-Control-Allow-Origin: *
+Access-Control-Allow-Credentials: true
+X-Powered-By: Flask
+X-Processed-Time: 0
+Via: 1.1 vegur
+
+HTTP/1.1 200 OK
+Connection: keep-alive
+Server: gunicorn/19.7.1
+Date: Wed, 02 May 2018 20:55:20 GMT
+Content-Type: application/json
+Access-Control-Allow-Origin: *
+Access-Control-Allow-Credentials: true
+X-Powered-By: Flask
+X-Processed-Time: 0
+Content-Length: 220
+Via: 1.1 vegur
+

test/legacy/eu.httpbin.org/head/status,500

@@ -0,0 +1 @@
+CURLER_ERROR	curl error (22)

test/legacy/eu.httpbin.org/redirect,3

@@ -0,0 +1,11 @@
+{
+  "args": {}, 
+  "headers": {
+    "Accept": "*/*", 
+    "Connection": "close", 
+    "Host": "eu.httpbin.org", 
+    "User-Agent": "sinew/1.0.4"
+  }, 
+  "origin": "104.36.46.249", 
+  "url": "http://eu.httpbin.org/get"
+}

test/legacy/eu.httpbin.org/status,500

@@ -0,0 +1 @@
+

test/legacy/legacy.sinew

@@ -0,0 +1,2 @@
+get 'http://eu.httpbin.org/status/500'
+get 'http://eu.httpbin.org/redirect/3'

test/test_legacy.rb

@@ -0,0 +1,21 @@
+require_relative 'test_helper'
+
+class TestLegacy < MiniTest::Test
+  def setup
+    super
+
+    # These are legacy cache files, pulled from an older version of sinew. We
+    # use them to test our legacy head parsing.
+    src = 'legacy/eu.httpbin.org'
+    dst = "#{TMP}/eu.httpbin.org"
+    FileUtils.cp_r(File.expand_path(src, __dir__), dst)
+  end
+
+  def test_legacy
+    sinew.dsl.get('http://eu.httpbin.org/status/500')
+    assert_equal "\n", sinew.dsl.raw
+
+    sinew.dsl.get('http://eu.httpbin.org/redirect/3')
+    assert_equal 'http://eu.httpbin.org/get', sinew.dsl.url
+  end
+end