httpray 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46b15f44920b575fdc88fd97c64ddb14d670539a
-  data.tar.gz: 84676027d29c606d4fba8b9e28c32408899621f8
+  metadata.gz: 9797174918b5b0dc9fc4ed93712eb645aea8b623
+  data.tar.gz: e45eb180606696eed1a43c08de52aac61ce6f4bd
 SHA512:
-  metadata.gz: 9b9b2ec5dea26db03552cefbc7b8449f88534f63ff13d2b734656fbb1403cb5819264326d7b7c117a2d993148bb8517bd370eb2c652ce5b653954e176ef8e438
-  data.tar.gz: 84d44dfb708a8c4c3c05b46dc74ec0cca0bab673c64c17d021b41c66f0da8de07356dd4a85fa623f635a00c3c63bd80778d8f558bd137384903266f0b8222055
+  metadata.gz: 82e916c0ef86af848840745586b7d2083776cf060559a98e3b4acb883f40417d74e43ec72a12d6e2eccf71f13ded205cbc03f5607f9c5e598f6049398a002f29
+  data.tar.gz: 0d41608e36c89f91999c1e5f252173e0aaeb555f6c0bc5a4805b0cf2b170d2ff28233f4e25b0cb642e2ea449d213677c02719956de35b917a8c40191d04c275f

data/lib/httpray/version.rb

@@ -1,3 +1,3 @@
 module HTTPray
-  VERSION = "1.0.4".freeze
+  VERSION = "1.1.0".freeze
 end

data/lib/httpray.rb

@@ -12,57 +12,96 @@ module HTTPray
     "Accept" => "*/*"
   }.freeze
 
-  def self.request2!(method, uri, headers = {}, body = nil, timeout = 1, ssl_context = nil)
-    uri = URI.parse(uri) unless URI === uri
-    address = Socket.getaddrinfo(uri.host, nil, Socket::AF_INET).first[3]
-    socket_address = Socket.pack_sockaddr_in(uri.port, address)
-
-    socket = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
-    socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
-
-    expire_time = Time.now + timeout
-    begin
-      raise Timeout if Time.now > expire_time
-      socket.connect_nonblock(socket_address)
-    rescue IO::WaitReadable, IO::WaitWritable
-      select_timeout = expire_time - Time.now
-      select_timeout = 0 if select_timeout < 0
-      IO.select([socket], [socket], [socket], select_timeout)
-      retry
+  class Connection
+    def initialize(host, port, timeout = 1, ssl_context = nil)
+      @host = host
+      @port = port
+      @timeout = timeout
+      @ssl_context = ssl_context
+      @socket = connect
     end
 
-    original_socket = socket
-    if uri.scheme == "https"
-      ssl_context ||= OpenSSL::SSL::SSLContext.new
-      socket = OpenSSL::SSL::SSLSocket.new(socket, ssl_context)
-      socket.hostname = uri.host
-      socket.sync_close = true
+    # public
+
+    def socket
+      @socket
+    end
+
+    def request!(method, uri, headers = {}, body = nil)
+      begin
+        IO.select([@socket], [@socket], [@socket], @timeout) if @socket
+      rescue; end
+      @socket = connect unless @socket && !@socket.closed?
+      socket = @socket
+      uri = URI.parse(uri) unless URI === uri
+
+      headers = DEFAULT_HEADERS.merge(headers).merge("Host" => uri.host)
+      headers["Content-Length"] = body.bytesize if body
+
+      socket.write_nonblock "#{method} #{uri.request_uri} HTTP/1.0\r\n"
+      headers.each do |header, value|
+        socket.write_nonblock "#{header}: #{value}\r\n"
+      end
+      socket.write_nonblock "\r\n"
+      socket.write_nonblock body if body
+      socket
+    end
+
+    def request(*args)
+      socket = request!(*args)
+      yield(socket) if block_given?
+    end
+
+    # private
+
+    def connect2
+      address = Socket.getaddrinfo(@host, nil, Socket::AF_INET).first[3]
+      socket_address = Socket.pack_sockaddr_in(@port, address)
+
+      socket = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
+      socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+
+      expire_time = Time.now + @timeout
       begin
         raise Timeout if Time.now > expire_time
-        socket.connect_nonblock
+        socket.connect_nonblock(socket_address)
       rescue IO::WaitReadable, IO::WaitWritable
         select_timeout = expire_time - Time.now
         select_timeout = 0 if select_timeout < 0
-        IO.select([socket.io], [socket.io], [socket.io], select_timeout)
+        IO.select([socket], [socket], [socket], select_timeout)
         retry
       end
-    end
 
-    headers = DEFAULT_HEADERS.merge(headers).merge("Host" => uri.host)
-    headers["Content-Length"] = body.bytesize if body
+      original_socket = socket
+      if @ssl_context
+        socket = OpenSSL::SSL::SSLSocket.new(socket, @ssl_context)
+        socket.hostname = @host
+        socket.sync_close = true
+        begin
+          raise Timeout if Time.now > expire_time
+          socket.connect_nonblock
+        rescue IO::WaitReadable, IO::WaitWritable
+          select_timeout = expire_time - Time.now
+          select_timeout = 0 if select_timeout < 0
+          IO.select([socket.io], [socket.io], [socket.io], select_timeout)
+          retry
+        end
+      end
+      return socket, original_socket
+    end
 
-    socket.write_nonblock "#{method} #{uri.request_uri} HTTP/1.0\r\n"
-    headers.each do |header, value|
-      socket.write_nonblock "#{header}: #{value}\r\n"
+    def connect
+      socket, _ = connect2
+      socket
     end
-    socket.write_nonblock "\r\n"
-    socket.write_nonblock body if body
-    return socket, original_socket
   end
 
-  def self.request!(*args)
-    socket, _ = request2!(*args)
-    socket
+  def self.request!(method, uri, headers = {}, body = nil, timeout = 1, ssl_context = nil)
+    uri = URI.parse(uri) unless URI === uri
+    ssl_context = nil
+    ssl_context = OpenSSL::SSL::SSLContext.new if uri.scheme == "https"
+    ark = Connection.new(uri.host, uri.port, timeout, ssl_context)
+    ark.request!(method, uri, headers, body)
   end
 
   def self.request(*args)

data/test/httpray_test.rb

@@ -1,7 +1,9 @@
 require 'minitest/autorun'
 require 'lib/httpray'
+require 'benchmark'
+require 'net/http'
 
-class HTTPrayTest < MiniTest::Unit::TestCase
+class HTTPrayTest < MiniTest::Test
   def test_request_timesout_with_short_timeout
     assert_raises HTTPray::Timeout do
       HTTPray.request("GET", "httppppp://httpbin.org/status/200", {}, nil, 0)
@@ -42,9 +44,10 @@ class HTTPrayTest < MiniTest::Unit::TestCase
       end
   end
   def test_original_socket_closed_with_ssl
-    socket, original_socket = HTTPray.request2!(
-      "GET",
-      "https://httpbin.org/delay/10")
+    uri = URI.parse("https://httpbin.org/get")
+    ark = HTTPray::Connection.new(uri.host, uri.port, 1, OpenSSL::SSL::SSLContext.new)
+    ark.socket.close
+    socket, original_socket = ark.connect2
     refute_same socket, original_socket
     refute socket.closed?
     refute original_socket.closed?
@@ -53,9 +56,10 @@ class HTTPrayTest < MiniTest::Unit::TestCase
     assert original_socket.closed?
   end
   def test_original_socket_closed_without_ssl
-    socket, original_socket = HTTPray.request2!(
-      "GET",
-      "http://httpbin.org/delay/10")
+    uri = URI.parse("http://httpbin.org/get")
+    ark = HTTPray::Connection.new(uri.host, uri.port, 1, nil)
+    ark.socket.close
+    socket, original_socket = ark.connect2
     assert_same socket, original_socket
     refute socket.closed?
     refute original_socket.closed?
@@ -63,4 +67,36 @@ class HTTPrayTest < MiniTest::Unit::TestCase
     assert socket.closed?
     assert original_socket.closed?
   end
+  def test_faster_than_net_http
+    uri = URI.parse("http://httpbin.org/delay/1")
+    net_http_time = Benchmark.realtime do
+      2.times { Net::HTTP.get(uri) }
+    end
+    httpray_time = Benchmark.realtime do
+      2.times { HTTPray.request("GET", uri) }
+    end
+    assert httpray_time < net_http_time
+  end
+  def test_persistent_connection_faster_than_ephemeral
+    uri = URI.parse("http://httpbin.org/delay/1")
+    persistent_time = Benchmark.realtime do
+      ark = HTTPray::Connection.new(uri.host, uri.port)
+      3.times { ark.request("GET", uri) }
+    end
+    ephemeral_time = Benchmark.realtime do
+      3.times { HTTPray.request("GET", uri) }
+    end
+    assert persistent_time < ephemeral_time
+  end
+  def test_reconnects_on_request_if_necessary
+    uri = URI.parse("http://httpbin.org/get")
+    ark = HTTPray::Connection.new(uri.host, uri.port, 1, nil)
+    original_socket = ark.socket
+    ark.request("GET", uri)
+    assert_same original_socket, ark.socket
+    ark.socket.close
+    assert original_socket.closed?
+    ark.request("GET", uri)
+    refute_same original_socket, ark.socket
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: httpray
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - G Gordon Worley III
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-14 00:00:00.000000000 Z
+date: 2017-07-17 00:00:00.000000000 Z
 dependencies: []
 description: Fire-and-forget HTTP requests for Ruby
 email: