http 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca4f83715e058d0fd9d76333e0acc15ef369ad0c
-  data.tar.gz: c040a30b4733d5438368e83c21bfc7d83ebc20f9
+  metadata.gz: a1b547d3276525790693e859ac473904b061f64b
+  data.tar.gz: e00cd095b96cd623c7e57a76c0203cf0c6f36854
 SHA512:
-  metadata.gz: f10c3683cb13697bb8be4aa893041cfca2f823d5df98e3259a2cac238ab69721e4d3ddc5e68bd524301f3be6cfbc5c7cf266a36baf356396685fac4f253a56ff
-  data.tar.gz: 67ca53156ac393947f01e3e4e4620856f57751c5a85a64645d621779627a0dcf752e43995ae0ff1d3ee1a19975fa63de0d0573a939912e7971f3609915e17d2c
+  metadata.gz: 01c71cc5f4123f61b30ba0152def5c55e694846813d0a007f0db30c42e83671a078459e048e84eeef80df5c5d3e930bd8afe6d20dd3822227c145fe03efa004e
+  data.tar.gz: 2ba200f4d59a4ff5b1f6ad1ea5412b100ed8599a926b4657c970e046439679a0506341372c7ba92eb6a3d18b0f38c9c90bef99e2de7bf071fdd749b6a3a6b086

data/CHANGES.md

@@ -1,3 +1,9 @@
+## 0.8.1 (2015-04-02)
+
+* Add missing `require "resolv"`. See #202. (@ixti)
+* Add block-form `#persistent` calls. See #200, #201. (@ixti)
+
+
 ## 0.8.0 (2015-04-01)
 
 * Properly handle WaitWritable for SSL. See #199. (@zanker)

data/lib/http/chainable.rb

@@ -72,11 +72,41 @@ module HTTP
       branch(options).request verb, uri
     end
 
-    # Flag as persistent
-    # @param [String] host
-    # @raise [Request::Error] if Host is invalid
+    # @overload persistent(host)
+    #   Flags as persistent
+    #   @param [String] host
+    #   @raise [Request::Error] if Host is invalid
+    #   @return [HTTP::Client] Persistent client
+    # @overload persistent(host, &block)
+    #   Executes given block with persistent client and automatically closes
+    #   connection at the end of execution.
+    #
+    #   @example
+    #
+    #       def keys(users)
+    #         HTTP.persistent("https://github.com") do |http|
+    #           users.map { |u| http.get("/#{u}.keys").to_s }
+    #         end
+    #       end
+    #
+    #       # same as
+    #
+    #       def keys(users)
+    #         http = HTTP.persistent "https://github.com"
+    #         users.map { |u| http.get("/#{u}.keys").to_s }
+    #       ensure
+    #         http.close if http
+    #       end
+    #
+    #
+    #   @yieldparam [HTTP::Client] client Persistent client
+    #   @return [Object] result of last expression in the block
     def persistent(host)
-      branch default_options.with_persistent host
+      p_client = branch default_options.with_persistent host
+      return p_client unless block_given?
+      yield p_client
+    ensure
+      p_client.close
     end
 
     # Make a request through an HTTP proxy

data/lib/http/client.rb

@@ -1,3 +1,5 @@
+require "forwardable"
+
 require "cgi"
 require "uri"
 
@@ -10,6 +12,7 @@ require "http/uri"
 module HTTP
   # Clients make requests and receive responses
   class Client
+    extend Forwardable
     include Chainable
 
     CONNECTION         = "Connection".freeze
@@ -58,6 +61,11 @@ module HTTP
       end
     end
 
+    # @!method persistent?
+    #   @see Options#persistent?
+    #   @return [Boolean] whenever client is persistent
+    def_delegator :default_options, :persistent?
+
     def make_request(req, options)
       verify_connection!(req.uri)
 
@@ -79,12 +87,10 @@ module HTTP
       @state = :clean
 
       res
-
-    # 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
-      close if default_options.persistent?
-
+      # 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
+      close if persistent?
       raise
     end
 

data/lib/http/timeout/per_operation.rb

@@ -1,7 +1,9 @@
+require "resolv"
+
 module HTTP
   module Timeout
     class PerOperation < Null
-      HostResolver = Resolv::Hosts.new.tap(&:lazy_initialize)
+      HostResolver = ::Resolv::Hosts.new.tap(&:lazy_initialize)
 
       CONNECT_TIMEOUT = 0.25
       WRITE_TIMEOUT = 0.25

data/lib/http/version.rb

@@ -1,3 +1,3 @@
 module HTTP
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

data/spec/lib/http_spec.rb

@@ -163,4 +163,27 @@ RSpec.describe HTTP do
       expect(client.default_options[:cache]).to eq cache
     end
   end
+
+  describe ".persistent" do
+    let(:host) { "https://api.github.com" }
+
+    context "with host only given" do
+      subject { HTTP.persistent host }
+      it { is_expected.to be_an HTTP::Client }
+      it { is_expected.to be_persistent }
+    end
+
+    context "with host and block given" do
+      it "returns last evaluation of last expression" do
+        expect(HTTP.persistent(host) { :http }).to be :http
+      end
+
+      it "auto-closes connection" do
+        HTTP.persistent host do |client|
+          expect(client).to receive(:close).and_call_original
+          client.get("/repos/httprb/http.rb")
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Tony Arcieri
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
@@ -180,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: HTTP should be easy