http 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c22451fa65c5d83ca271a7ac53671dd039f66f6a
-  data.tar.gz: ceea0aa11f428af8569bd18de9b188bce8cf65c1
+  metadata.gz: 54c45e83923cbc3784598961bd095891ecb59017
+  data.tar.gz: 4953e6ce3427e7db773c247930ecbf995d7723ef
 SHA512:
-  metadata.gz: 624d636385c6eac2b23ac9c1d11b631b676120344db7904381a85b02f4d19e977d6adfc9d3b42a862ea0567052a3ecac19df8818479ff4922a955847c672f0dd
-  data.tar.gz: 5721fc63432acfc6969bc6c6267d2c54565001b09d60e610113a89ebdf84890ef51a2a5ed3e8bdf2bf9a2c6db699fc364b23a666e3e438555edca5b1ad783445
+  metadata.gz: 7e848c550021771ef39648f5ceeeb0dc246df75be6558ccd2d5a4b04597d9f1c574c236ccdb6b944dd2c3b5433f6480bc51b0cd638e9b64eed82847ea11b84d1
+  data.tar.gz: 41f0d37cfa7f2c01ead717b15d3798a1a655cd1e5b2b4c69c06e1c97ada4dbe22fb90fab8efe952bce13c18c95e5af7900208442351294ad0aa959284561ff1a

data/.rubocop.yml

@@ -19,6 +19,10 @@ Metrics/MethodLength:
   CountComments: false
   Max: 22 # TODO: Lower to 15
 
+Metrics/ModuleLength:
+  CountComments: false
+  Max: 120
+
 Metrics/ParameterLists:
   Max: 3
   CountKeywordArgs: true

data/README.md

@@ -253,7 +253,6 @@ There's a little more to it, but that's the core idea!
 * [Full parallel HTTP fetcher example](https://github.com/httprb/http.rb/wiki/Parallel-requests-with-Celluloid%3A%3AIO)
 * See also: [Celluloid::IO](https://github.com/celluloid/celluloid-io)
 
-
 ### Caching
 
 http.rb provides caching of HTTP request (per
@@ -278,13 +277,24 @@ storage URL supported by rack-cache is supported by http.rb's cache.
 
 ### Timeouts
 
-You can configure http.rb to fail if request (connect / read / write) takes too
-long:
+By default, HTTP does not timeout on a request. You can enable per operation (each read/write/connect call) or global (sum of all read/write/connect calls).
+
+Per operation timeouts are what `Net::HTTP` and the majority of HTTP clients do:
+
+``` ruby
+HTTP.timeout(:per_operation, :write => 2, :connect => 5, :read => 10).get "http://example.com"
+```
+
+Global timeouts let you set an upper bound of how long a request can take, without having to rely on `Timeout.timeout`:
 
 ``` ruby
-HTTP.timeout(:connect => 5, :read => 10).get "http://example.com"
+HTTP.timeout(:global, :write => 1, :connect => 1, :read => 1).get "http://example.com"
 ```
 
+Uses a timeout of 3 seconds, for the entire `get` call.
+
+*Warning!* You cannot use Celluloid::IO with timeouts currently.
+
 
 ## Supported Ruby Versions
 

data/lib/http/connection.rb

@@ -105,6 +105,7 @@ module HTTP
       close unless keep_alive?
 
       @parser.reset
+      @socket.reset_counter if @socket.respond_to?(:reset_counter)
       reset_timer
 
       @pending_response = false

data/lib/http/headers.rb

@@ -117,10 +117,9 @@ module HTTP
     #
     # @return [Enumerator] if no block given
     # @return [Headers] self-reference
-    def each(&blk)
-      return @pile.each unless blk
-
-      @pile.each(&blk)
+    def each
+      return to_enum(__method__) unless block_given?
+      @pile.each { |arr| yield(arr) }
       self
     end
 

data/lib/http/options.rb

@@ -104,7 +104,9 @@ module HTTP
     end
 
     def merge(other)
-      h1, h2 = to_hash, other.to_hash
+      h1 = to_hash
+      h2 = other.to_hash
+
       merged = h1.merge(h2) do |k, v1, v2|
         case k
         when :headers

data/lib/http/request.rb

@@ -73,7 +73,9 @@ module HTTP
       fail(UnsupportedMethodError, "unknown method: #{verb}") unless METHODS.include?(@verb)
       fail(UnsupportedSchemeError, "unknown scheme: #{scheme}") unless SCHEMES.include?(@scheme)
 
-      @proxy, @body, @version = proxy, body, version
+      @proxy   = proxy
+      @body    = body
+      @version = version
 
       @headers = HTTP::Headers.coerce(headers || {})
 

data/lib/http/response.rb

@@ -30,7 +30,9 @@ module HTTP
     attr_reader :uri
 
     def initialize(status, version, headers, body, uri = nil) # rubocop:disable ParameterLists
-      @version, @body, @uri = version, body, uri
+      @version = version
+      @body    = body
+      @uri     = uri
       @status  = HTTP::Response::Status.new status
       @headers = HTTP::Headers.coerce(headers || {})
     end

data/lib/http/timeout/global.rb

@@ -6,8 +6,11 @@ module HTTP
       def initialize(*args)
         super
 
-        @time_left = connect_timeout + read_timeout + write_timeout
-        @total_timeout = time_left
+        reset_counter
+      end
+
+      def reset_counter
+        @time_left = @total_timeout = connect_timeout + read_timeout + write_timeout
       end
 
       def connect(socket_class, host, port)

data/lib/http/version.rb

@@ -1,3 +1,3 @@
 module HTTP
-  VERSION = "0.8.5"
+  VERSION = "0.8.6"
 end

data/spec/support/http_handling_shared.rb

@@ -85,6 +85,17 @@ RSpec.shared_context "HTTP handling" do
         expect { client.get("#{server.endpoint}/sleep").body.to_s }.
           to raise_error(HTTP::TimeoutError, /Timed out/)
       end
+
+      context "it resets state when reusing connections" do
+        let(:options) { {:persistent => server.endpoint} }
+
+        let(:read_timeout) { 3 }
+
+        it "does not timeout" do
+          client.get("#{server.endpoint}/sleep").body.to_s
+          client.get("#{server.endpoint}/sleep").body.to_s
+        end
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - Tony Arcieri
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-06 00:00:00.000000000 Z
+date: 2015-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
@@ -181,9 +181,45 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: HTTP should be easy
-test_files: []
+test_files:
+- spec/lib/http/cache/headers_spec.rb
+- spec/lib/http/cache_spec.rb
+- spec/lib/http/client_spec.rb
+- spec/lib/http/content_type_spec.rb
+- spec/lib/http/headers/mixin_spec.rb
+- spec/lib/http/headers_spec.rb
+- spec/lib/http/options/body_spec.rb
+- spec/lib/http/options/form_spec.rb
+- spec/lib/http/options/headers_spec.rb
+- spec/lib/http/options/json_spec.rb
+- spec/lib/http/options/merge_spec.rb
+- spec/lib/http/options/new_spec.rb
+- spec/lib/http/options/proxy_spec.rb
+- spec/lib/http/options_spec.rb
+- spec/lib/http/redirector_spec.rb
+- spec/lib/http/request/caching_spec.rb
+- spec/lib/http/request/writer_spec.rb
+- spec/lib/http/request_spec.rb
+- spec/lib/http/response/body_spec.rb
+- spec/lib/http/response/caching_spec.rb
+- spec/lib/http/response/io_body_spec.rb
+- spec/lib/http/response/status_spec.rb
+- spec/lib/http/response/string_body_spec.rb
+- spec/lib/http/response_spec.rb
+- spec/lib/http_spec.rb
+- spec/spec_helper.rb
+- spec/support/black_hole.rb
+- spec/support/capture_warning.rb
+- spec/support/connection_reuse_shared.rb
+- spec/support/dummy_server.rb
+- spec/support/dummy_server/servlet.rb
+- spec/support/http_handling_shared.rb
+- spec/support/proxy_server.rb
+- spec/support/servers/config.rb
+- spec/support/servers/runner.rb
+- spec/support/ssl_helper.rb
 has_rdoc: