net-http2 0.9.2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebde069e39e0e49475a138be06a9727b75d13f84
-  data.tar.gz: d037c98b2682a951bf7c3b6dd50e07d864d9ddff
+  metadata.gz: 53d47a5179357c9eebc6e0c23e6eb0ba724d4ccc
+  data.tar.gz: d82ec20911a804eef2183564580fbde8d03483e0
 SHA512:
-  metadata.gz: 5f9d0e50b1657cb4771c4fb21fc2864c80a7e424817e33eb38840418a48901b22d9ed91f24555396cf092dd596c918872fe648eaa61d7d3318c0daff20d55a65
-  data.tar.gz: ab354b9ad23b47e34b08cf9d47e5822e9fcebde205663bbac3fb2a1da0f768ad34743d3d69aed4e132ca3f6b087f3796a50a11d06c12e97b50697689d9fdd981
+  metadata.gz: 784a337baecb984bffb5b1594c40a46a4aab7bce5cc570d651953a49af0687658ccfeef4026cbbfa2e7b7bdf709e7990f8ffa13563de00fcde180ae9bbb6d7c0
+  data.tar.gz: 784009bbae1c958ad17fb0efbb227c7291f4ec59d270e8c5aea4fbe902e39a141ebacb15abf52dd7a9dc1ef14b0308b034669cf8466bc881f7ecc81f87256c63

data/.travis.yml

@@ -3,6 +3,7 @@ rvm:
   - 2.1
   - 2.2
   - 2.3.0
+  - 2.3.1
 
 branches:
   only:

data/README.md

@@ -1,5 +1,6 @@
 [![Build Status](https://travis-ci.org/ostinelli/net-http2.svg?branch=master)](https://travis-ci.org/ostinelli/net-http2)
 [![Code Climate](https://codeclimate.com/github/ostinelli/net-http2/badges/gpa.svg)](https://codeclimate.com/github/ostinelli/net-http2)
+[![Gem Version](https://badge.fury.io/rb/net-http2.svg)](https://badge.fury.io/rb/net-http2)
 
 # NetHttp2
 
@@ -26,7 +27,7 @@ To perform a sync call:
 require 'net-http2'
 
 # create a client
-client = NetHttp2::Client.new("http://106.186.112.116")
+client = NetHttp2::Client.new("http://nghttp2.org")
 
 # send request
 response = client.call(:get, '/')
@@ -46,7 +47,7 @@ To perform an async call:
 require 'net-http2'
 
 # create a client
-client = NetHttp2::Client.new("http://106.186.112.116")
+client = NetHttp2::Client.new("http://nghttp2.org")
 
 # prepare request
 request = client.prepare_request(:get, '/')
@@ -58,7 +59,8 @@ request.on(:close) { puts "request completed!" }
 client.call_async(request)
 
 # We need to wait for the callbacks to be triggered, so here's a quick and dirty fix for this example.
-# In real life, if you are using async requests so you probably have a running loop that keeps your program alive.
+# In real life, if you are using async requests you probably have a running loop that keeps
+# your program alive.
 sleep 5
 
 # close the connection
@@ -73,12 +75,12 @@ client.close
 
  * **new(url, options={})** → **`NetHttp2::Client`**
 
- Returns a new client. `url` is a `string` such as https://localhost:443.
+ Returns a new client. `url` is a `string` such as `http://nghttp2.org`.
  The only current option is `:ssl_context`, in case the url has an https scheme and you want your SSL client to use a custom context.
 
  To create a new client:
  ```ruby
- NetHttp2::Client.new("http://106.186.112.116")
+ NetHttp2::Client.new("http://nghttp2.org")
  ```
 
  To create a new client with a custom SSL context:
@@ -88,7 +90,7 @@ client.close
  ctx.key     = OpenSSL::PKey::RSA.new(certificate, "cert_password")
  ctx.cert    = OpenSSL::X509::Certificate.new(certificate)
 
- NetHttp2::Client.new("http://106.186.112.116", ssl_context: ctx)
+ NetHttp2::Client.new("https://nghttp2.org", ssl_context: ctx)
  ```
 
  * **uri** → **`URI`**
@@ -107,7 +109,7 @@ These behave similarly to HTTP/1 calls.
  ```ruby
  response_1 = client.call(:get, '/path1')
  response_2 = client.call(:get, '/path2', headers: { 'x-custom' => 'custom' })
- response_3 = client.call(:post '/path3', body: "the request body", timeout: 1)
+ response_3 = client.call(:post, '/path3', body: "the request body", timeout: 1)
  ```
 
 
@@ -122,10 +124,10 @@ The real benefit of HTTP/2 is being able to receive body and header streams. Ins
  request = client.prepare_request(:get, '/path', headers: { 'x-custom-header' => 'custom' })
  ```
 
- * **on(event, &block)** 
+ * **on(event, &block)**
 
  Allows to set a callback for the request. Available events are:
- 
+
   * `:headers`: triggered when headers are received (called once).
   * `:body_chunk`: triggered when body chunks are received (may be called multiple times).
   * `:close`: triggered when the request has been completed (called once).
@@ -148,23 +150,23 @@ The real benefit of HTTP/2 is being able to receive body and header streams. Ins
 #### Methods
 
  * **method** → **`symbol`**
- 
+
  The request's method.
 
  * **uri** → **`URI`**
- 
+
  The request's URI.
 
  * **path** → **`string`**
- 
+
  The request's path.
 
  * **body** → **`string`**
- 
+
  The request's body.
 
  * **timeout** → **`integer`**
- 
+
  The request's timeout.
 
 

data/lib/net-http2/client.rb

@@ -16,9 +16,7 @@ module NetHttp2
 
       @is_ssl = (@uri.scheme == 'https')
 
-      @pipe_r, @pipe_w = Socket.pair(:UNIX, :STREAM, 0)
-      @socket_thread   = nil
-      @mutex           = Mutex.new
+      init_vars
     end
 
     def call(method, path, options={})
@@ -42,15 +40,19 @@ module NetHttp2
 
     def close
       exit_thread(@socket_thread)
-
-      @h2            = nil
-      @pipe_r        = nil
-      @pipe_w        = nil
-      @socket_thread = nil
+      init_vars
     end
 
     private
 
+    def init_vars
+      @h2              = nil
+      @socket          = nil
+      @socket_thread   = nil
+      @first_data_sent = false
+      @mutex           = Mutex.new
+    end
+
     def new_stream
       NetHttp2::Stream.new(uri: @uri, h2_stream: h2.new_stream)
     end
@@ -60,38 +62,38 @@ module NetHttp2
 
         return if @socket_thread
 
-        socket = new_socket
+        @socket = new_socket
 
         @socket_thread = Thread.new do
 
           begin
-            thread_loop(socket)
+            socket_loop
+          rescue EOFError
+            # socket closed
           ensure
-            socket.close unless socket.closed?
+            @socket.close unless @socket.closed?
+            @socket        = nil
             @socket_thread = nil
           end
         end.tap { |t| t.abort_on_exception = true }
       end
     end
 
-    def thread_loop(socket)
+    def socket_loop
 
-      send_before_receiving(socket)
+      ensure_sent_before_receiving
 
       loop do
 
-        next if read_if_pending(socket)
-
-        ready = IO.select([socket, @pipe_r])
-
-        if ready[0].include?(socket)
-          data_received = socket.readpartial(1024)
+        begin
+          data_received = @socket.read_nonblock(1024)
           h2 << data_received
-        end
-
-        if ready[0].include?(@pipe_r)
-          data_to_send = @pipe_r.readpartial(1024)
-          socket.write(data_to_send)
+        rescue IO::WaitReadable
+          IO.select([@socket])
+          retry
+        rescue IO::WaitWritable
+          IO.select(nil, [@socket])
+          retry
         end
       end
     end
@@ -112,24 +114,9 @@ module NetHttp2
       end
     end
 
-    def send_before_receiving(socket)
-      data_to_send = @pipe_r.read_nonblock(1024)
-      socket.write(data_to_send)
-    rescue IO::WaitReadable
-      IO.select([@pipe_r])
-      retry
-    end
-
-    def read_if_pending(socket)
-      if ssl?
-        available = socket.pending
-
-        if available > 0
-          data_received = socket.sysread(available)
-          h2 << data_received
-
-          true
-        end
+    def ensure_sent_before_receiving
+      while !@first_data_sent
+        sleep 0.1
       end
     end
 
@@ -137,8 +124,10 @@ module NetHttp2
       @h2 ||= HTTP2::Client.new.tap do |h2|
         h2.on(:frame) do |bytes|
           @mutex.synchronize do
-            @pipe_w.write(bytes)
-            @pipe_w.flush
+            @socket.write(bytes)
+            @socket.flush
+
+            @first_data_sent = true
           end
         end
       end

data/lib/net-http2/stream.rb

@@ -62,7 +62,6 @@ module NetHttp2
     def listen_for_close
       @h2_stream.on(:close) do |data|
         @completed = true
-
         @request.emit(:close, data) if async?
       end
     end

data/lib/net-http2/version.rb

@@ -1,3 +1,3 @@
 module NetHttp2
-  VERSION = "0.9.2"
+  VERSION = "0.10.0"
 end

data/net-http2.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "http-2", "~> 0.8.1"
+  spec.add_dependency "http-2", "~> 0.8.2"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: net-http2
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.0
 platform: ruby
 authors:
 - Roberto Ostinelli
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-01 00:00:00.000000000 Z
+date: 2016-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-2
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement