httpray 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9797174918b5b0dc9fc4ed93712eb645aea8b623
-  data.tar.gz: e45eb180606696eed1a43c08de52aac61ce6f4bd
+  metadata.gz: 94354672b454e3ffb1f53a0d0704157c4a3208c2
+  data.tar.gz: 755940a03eedb6095bf8b8c7c2a5174b85d3125e
 SHA512:
-  metadata.gz: 82e916c0ef86af848840745586b7d2083776cf060559a98e3b4acb883f40417d74e43ec72a12d6e2eccf71f13ded205cbc03f5607f9c5e598f6049398a002f29
-  data.tar.gz: 0d41608e36c89f91999c1e5f252173e0aaeb555f6c0bc5a4805b0cf2b170d2ff28233f4e25b0cb642e2ea449d213677c02719956de35b917a8c40191d04c275f
+  metadata.gz: 18e91441b0908e96d8f45c2d76fce167c855dd5b4526976b811e7918c2932a52d98eba43e497d2816fb06cfeede05cfdab531e18c9858b2a5459840753967127
+  data.tar.gz: c94caa608c92993d0856aada6f22fafbf9498950d2816b3219a32de4502cf6c4080eaa364210c0133877d20d0e8bd0113fb7c0422bf2624a80fcfc355375f1bf

data/README.md

@@ -5,7 +5,7 @@ Non-blocking HTTP library for Ruby
 
 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.
 
-It differs from other Ruby HTTP libraries that support async because it doesn't use Threads, making HTTPray much less resource intensive to use since it instead directly implements HTTP/HTTPS 1.0 using `Socket` and `IO#select` for timeouts. You can optionally ask to be handed back the socket before it is closed in case you want to listen for a response, but that's not really what you're here for, and it creates a Fiber.
+It differs from other Ruby HTTP libraries that support async because it doesn't use Threads, making HTTPray much less resource intensive to use since it instead directly implements HTTP/HTTPS 1.0 using `Socket` and `IO#select` for timeouts. You can optionally ask to be handed back the socket before it is closed in case you want to listen for a response, but that's not really what you're here for.
 
 Great for use with sending data to HTTP endpoints for which you are willing to accept a UDP-style best-effort approach, but with the added guarantee of TCP that the packets made it to the server. Only the server will know what it did with the data, though!
 
@@ -30,7 +30,7 @@ HTTPray.request(
   "It's me, Margret",
   1) # timeout in seconds
 
-# party with a response
+# party with a response, but costs a Fiber
 HTTPray.request("GET", "https://your.diety/answered_prayers") do |socket|
   socket.gets
 end
@@ -39,11 +39,26 @@ end
 socket = HTTPray.request!("GET", "https://your.diety/answered_prayers")
 puts socket.gets
 socket.close
+
+# use a persistent connection to keep the party rolling
+# will automatically reconnect if connection is lost
+uri = URI.parse("https://your.diety/pray")
+ark = HTTPray::Connection.new(uri.host, uri.port, 1, OpenSSL::SSL::SSLContext.new)
+ark.request("POST", uri, 
+  {"Content-Type" => "application/prayer"},
+  "Why did it have to be snakes?")
+ark.socket.close
+ark.request("POST", uri, 
+  {"Content-Type" => "application/prayer"},
+  "Don't call me junior!")
+
 ```
 
 ## Help
 
-HTTPray has minimal convenience and sanitization features because I didn't need them. All that it does is fill in the Host, User-Agent, Accept, and Content-Length headers for you. The body must be a string, so convert it yourself first. The URI can be a `URI` or a `String` that will go through `URI.parse`. You're welcome. You can also pass an `OpenSSL::SSL::SSLContext` if you want more control over how TLS is used, but if you don't provide one it will be created for you if needed.
+HTTPray has minimal convenience and sanitization features because I didn't need them. All that it does is fill in the Host, User-Agent, Accept, and Content-Length headers for you. The body must be a string, so convert it yourself first. The URI can be a `URI` or a `String` that will go through `URI.parse`. You're welcome.
+
+If you're using `Connection` with TLS you need to provide an `OpenSSL::SSL::SSLContext` when creating the connection. `HTTPray.request!` is more forgiving and if you don't give it one it will create it for you if needed.
 
 Timeout support does not extend to the response since you just get back a `Socket`. You're own your own for how you want to handle that.
 

data/lib/httpray/version.rb

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

data/lib/httpray.rb

@@ -9,15 +9,17 @@ module HTTPray
 
   DEFAULT_HEADERS = {
     "User-Agent" => "HTTPray #{VERSION}",
-    "Accept" => "*/*"
+    "Accept" => "*/*",
+    "Connection" => "keep-alive"
   }.freeze
 
   class Connection
-    def initialize(host, port, timeout = 1, ssl_context = nil)
+    def initialize(host, port, timeout = 1, ssl_context = nil, retry_count = 1)
       @host = host
       @port = port
       @timeout = timeout
       @ssl_context = ssl_context
+      @retry_count = retry_count
       @socket = connect
     end
 
@@ -28,6 +30,7 @@ module HTTPray
     end
 
     def request!(method, uri, headers = {}, body = nil)
+      tries ||= 0
       begin
         IO.select([@socket], [@socket], [@socket], @timeout) if @socket
       rescue; end
@@ -45,6 +48,12 @@ module HTTPray
       socket.write_nonblock "\r\n"
       socket.write_nonblock body if body
       socket
+    rescue
+      @socket.close
+      if tries < @retry_count
+        tries += 1
+        retry
+      end
     end
 
     def request(*args)
@@ -100,8 +109,8 @@ module HTTPray
     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)
+    ark = Connection.new(uri.host, uri.port, timeout, ssl_context, 0)
+    ark.request!(method, uri, {"Connection" => ""}.merge(headers), body)
   end
 
   def self.request(*args)

data/test/httpray_test.rb

@@ -99,4 +99,11 @@ class HTTPrayTest < MiniTest::Test
     ark.request("GET", uri)
     refute_same original_socket, ark.socket
   end
+  def test_retries_on_random_errors
+    uri = URI.parse("http://httpbin.org/deny")
+    ark = HTTPray::Connection.new(uri.host, uri.port, 1, nil)
+    ark.socket.stub(:write_nonblock, lambda { |*args| raise "Broken pipe" }) do
+      ark.request("GET", uri, {"Connection" => ""})
+    end
+  end
 end

metadata

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