http 0.8.0.pre → 0.8.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a705cb32b18d35b7b100eea0ac6f6687c8e9140e
-  data.tar.gz: fff73981101e4bc7a80faeded4d8bde937dd0fa4
+  metadata.gz: 45b099ff52ab956294dec51a54255554865482cd
+  data.tar.gz: 3bb79e8bc7633787cbb7b8444d0a750d9709663e
 SHA512:
-  metadata.gz: 32e0571165aff841356c98fdea9135c6e746a36527f7f7db566effb2321d58dc287b26efbd9651c961cb675fc0621333a12cd0608e3b9cc5a57b0259f220d13d
-  data.tar.gz: 7b90b9fba3136f9732667dbae22a561b3f338a11f86e70878494d11b657d7cc64e19403ceb1a5898a844c886e384ae31752cf894527404279d3c5d6b79a4cf96
+  metadata.gz: b3422f58b0d5d584c9ba8f88f20d24852a4b7aedd4e0f1e640b76e3b70a31c0c404036790ae3cc09991c34644dda22e031d5e5394c393d245b545d7c80c80219
+  data.tar.gz: 29e37aff0f285a68671ee35498a955c9b00abba6d39ed43877213db84598ac7c802662e1b2d5c6d98bfd9fa2772c2b34732b797511129d95fba96a55a421beb3

data/CHANGES.md

@@ -1,6 +1,7 @@
-## 0.8.0.pre (2015-03-26)
+## 0.8.0.pre2 (2015-03-27)
 
-* Support for persistent HTTP connections
+* Support for persistent HTTP connections (@zanker)
+* Add caching support. See #77 and #177. (@Asmod4n, @pezra)
 * Improve servers used in specs boot up. Issue was initially raised up
   by @olegkovalenko. See #176.
 * Reflect FormData rename changes (FormData -> HTTP::FormData). (@ixti)

data/lib/http/client.rb

@@ -75,14 +75,16 @@ module HTTP
     # On any exception we reset the conn. This is a safety measure, to ensure
     # we don't have conns in a bad state resulting in mixed requests/responses
     rescue
-      if default_options.persistent? && @connection
-        @connection.close
-        @connection = nil
-      end
+      close if default_options.persistent?
 
       raise
     end
 
+    def close
+      @connection.close if @connection
+      @connection = nil
+    end
+
     private
 
     # Verify our request isn't going to be made against another URI
@@ -93,7 +95,7 @@ module HTTP
       # We re-create the connection object because we want to let prior requests
       # lazily load the body as long as possible, and this mimics prior functionality.
       elsif !default_options.persistent? || (@connection && !@connection.keep_alive?)
-        @connection = nil
+        close
       end
     end
 

data/lib/http/connection.rb

@@ -4,7 +4,7 @@ module HTTP
   # A connection to the HTTP server
   class Connection
     attr_reader :socket, :parser, :persistent,
-                :pending_request, :pending_response, :sequence_id
+                :pending_request, :pending_response
 
     # Attempt to read this much data
     BUFFER_SIZE = 16_384
@@ -13,7 +13,6 @@ module HTTP
       @persistent = options.persistent?
 
       @parser = Response::Parser.new
-      @sequence_id = 0
 
       @socket = options[:socket_class].open(req.socket_host, req.socket_port)
 
@@ -22,14 +21,13 @@ module HTTP
 
     # Send a request to the server
     def send_request(req)
-      if pending_request
-        fail StateError, "Tried to send a request while one is pending already. This cannot be called from multiple threads!"
+      if pending_response
+        fail StateError, "Tried to send a request while one is pending already. Make sure you read off the body."
       elsif pending_request
         fail StateError, "Tried to send a request while a response is pending. Make sure you've fully read the body from the request."
       end
 
       @pending_request = true
-      @sequence_id += 1
 
       req.stream socket
 

data/lib/http/response/body.rb

@@ -13,13 +13,10 @@ module HTTP
         @client       = client
         @streaming    = nil
         @contents     = nil
-        @active_seq   = client.sequence_id
       end
 
       # (see HTTP::Client#readpartial)
       def readpartial(*args)
-        check_sequence!
-
         stream!
         @client.readpartial(*args)
       end
@@ -36,7 +33,6 @@ module HTTP
         return @contents if @contents
 
         fail StateError, "body is being streamed" unless @streaming.nil?
-        check_sequence!
 
         begin
           @streaming = false
@@ -53,14 +49,6 @@ module HTTP
       end
       alias_method :to_str, :to_s
 
-      def check_sequence!
-        return unless @active_seq != @client.sequence_id
-
-        fail StateError, "Sequence ID #{@active_seq} does not match #{@client.sequence_id}. You must read the entire request off."
-      end
-
-      private :check_sequence!
-
       # Assert that the body is actively being streamed
       def stream!
         fail StateError, "body has already been consumed" if @streaming == false

data/lib/http/version.rb

@@ -1,3 +1,3 @@
 module HTTP
-  VERSION = "0.8.0.pre"
+  VERSION = "0.8.0.pre2"
 end

data/spec/support/connection_reuse_shared.rb

@@ -23,14 +23,8 @@ RSpec.shared_context "handles shared connections" do
 
       context "when trying to read a stale body" do
         it "errors" do
-          first_res = client.get(server.endpoint)
-          second_res = client.get(server.endpoint)
-
-          # This should work, because it's the last request we made
-          expect(second_res.body.to_s).to eq("<!doctype html>")
-
-          # This should not work because we've not read anything
-          expect { first_res.body.to_s }.to raise_error(HTTP::StateError, /Sequence ID 1 does not match 2/i)
+          client.get("#{server.endpoint}/not-found")
+          expect { client.get(server.endpoint) }.to raise_error(HTTP::StateError, /Tried to send a request/)
         end
       end
 
@@ -46,19 +40,6 @@ RSpec.shared_context "handles shared connections" do
         end
       end
 
-      context "when streaming" do
-        it "errors with a stale response" do
-          first_res = client.get(server.endpoint)
-          second_res = client.get(server.endpoint)
-
-          # This should work, because it's the last request we made
-          expect(second_res.body.to_s).to eq("<!doctype html>")
-
-          # This should not work because we've not read anything
-          expect { first_res.body.each(&:to_s) }.to raise_error(HTTP::StateError, /Sequence ID 1 does not match 2/i)
-        end
-      end
-
       context "with a socket issue" do
         it "transparently reopens" do
           first_socket = client.get("#{server.endpoint}/socket").body.to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http
 version: !ruby/object:Gem::Version
-  version: 0.8.0.pre
+  version: 0.8.0.pre2
 platform: ruby
 authors:
 - Tony Arcieri
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
@@ -161,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: HTTP should be easy