httpray 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40bd4048bb72f0169b178246b13b20f86504eba4
-  data.tar.gz: 28642af4d6aeb959c948d24e6fb122e17cccb197
+  metadata.gz: 46b15f44920b575fdc88fd97c64ddb14d670539a
+  data.tar.gz: 84676027d29c606d4fba8b9e28c32408899621f8
 SHA512:
-  metadata.gz: 5ea297d70ed2aaf3acf4dda9ad65248a0158a49340d509394c3ce7631497486ad930a035ad43a9b0686e26a6edae6886a20b36fa0828cbfdf7c37682bbb3bc3f
-  data.tar.gz: bb5d0f9279feeb73b69d2a13eb54ad0516ef7ff8bef36437a701761176cd66dec66c286daac11184e795bb747a0534e001a13335446f7dab6a1495cfd2b2d522
+  metadata.gz: 9b9b2ec5dea26db03552cefbc7b8449f88534f63ff13d2b734656fbb1403cb5819264326d7b7c117a2d993148bb8517bd370eb2c652ce5b653954e176ef8e438
+  data.tar.gz: 84d44dfb708a8c4c3c05b46dc74ec0cca0bab673c64c17d021b41c66f0da8de07356dd4a85fa623f635a00c3c63bd80778d8f558bd137384903266f0b8222055

data/README.md

@@ -1,7 +1,7 @@
 # httpray
 Non-blocking HTTP library for Ruby
 
-[![Gem Version](https://badge.fury.io/rb/HTTPray.svg)](https://badge.fury.io/rb/HTTPray)
+[![Gem Version](https://badge.fury.io/rb/httpray.svg)](https://badge.fury.io/rb/httpray)
 
 Started out the same as the [fire-and-forget](https://github.com/mattetti/fire-and-forget) gem but with a more exposed interface, TLS support, and a better name. Added ideas from [tcp_timeout](https://github.com/lann/tcp-timeout-ruby) and accidentally ended up creating a light-weight, non-blocking HTTP client.
 
@@ -20,7 +20,7 @@ gem "httpray"
 ```ruby
 require 'httpray'
 
-# def HTTParty.request!(method, uri, headers = {}, body = "", timeout = 1, ssl_context = nil)
+# def HTTParty.request!(method, uri, headers = {}, body = nil, timeout = 1, ssl_context = nil)
 
 # send an HTTP request and don't listen for the response
 HTTPray.request(

data/lib/httpray/version.rb

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

data/lib/httpray.rb

@@ -12,7 +12,7 @@ module HTTPray
     "Accept" => "*/*"
   }.freeze
 
-  def self.request2!(method, uri, headers = {}, body = "", timeout = 1, ssl_context = nil)
+  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)
@@ -20,18 +20,15 @@ module HTTPray
     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 Errno::EINPROGRESS
-      if IO.select(nil, [socket], [socket], timeout)
-        begin
-          socket.connect_nonblock(socket_address)
-        rescue Errno::EISCONN
-          # connected
-        end
-      else
-        raise Timeout
-      end
+    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
     end
 
     original_socket = socket
@@ -40,25 +37,26 @@ module HTTPray
       socket = OpenSSL::SSL::SSLSocket.new(socket, ssl_context)
       socket.hostname = uri.host
       socket.sync_close = true
-      socket.connect
+      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
 
-    headers = DEFAULT_HEADERS.merge(headers).merge(
-      "Host" => uri.host,
-      "Content-Length" => body.bytesize)
-
-    if IO.select(nil, [socket], [socket], 1)
-      socket.puts "#{method} #{uri.request_uri} HTTP/1.0\r\n"
-      headers.each do |header, value|
-        socket.puts "#{header}: #{value}\r\n"
-      end
-      socket.puts "\r\n"
-      socket.puts body
+    headers = DEFAULT_HEADERS.merge(headers).merge("Host" => uri.host)
+    headers["Content-Length"] = body.bytesize if body
 
-      yield(socket) if block_given?
-    else
-      raise Timeout
+    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
     return socket, original_socket
   end
 

data/test/httpray_test.rb

@@ -2,6 +2,11 @@ require 'minitest/autorun'
 require 'lib/httpray'
 
 class HTTPrayTest < MiniTest::Unit::TestCase
+  def test_request_timesout_with_short_timeout
+    assert_raises HTTPray::Timeout do
+      HTTPray.request("GET", "httppppp://httpbin.org/status/200", {}, nil, 0)
+    end
+  end
   def test_request_timesout_with_bad_address
     assert_raises HTTPray::Timeout do
       HTTPray.request("GET", "httppppp://httpbin.org/status/200")
@@ -16,6 +21,11 @@ class HTTPrayTest < MiniTest::Unit::TestCase
       assert_equal "HTTP/1.1 200 OK\r\n", socket.gets
     end
   end
+  def test_secure_request_timesout_with_short_timeout
+    assert_raises HTTPray::Timeout do
+      HTTPray.request("GET", "https://httpbin.org/status/200", {}, nil, 0)
+    end
+  end
   def test_secure_request_sends
     HTTPray.request("GET", "https://httpbin.org/get")
     assert true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httpray
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - G Gordon Worley III