net-http2 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4287aab78b7e305b8468f096cc87d1206881f07b
-  data.tar.gz: dbd232be1b30b8fbe2e8cd8c12ff7442d5ed3a3f
+  metadata.gz: ba9816c229aab7bb320437a77c3c91ed60752609
+  data.tar.gz: 63836c93155c8d717f68542519b145f87e5e6bd1
 SHA512:
-  metadata.gz: 90f467864f059da2242589f1bc50db6a520d69f9334a42d6d4aa5c6f6352789101a629712cd55a40efb6e97b3ae3df442399436e74742774106441728316aa77
-  data.tar.gz: d973d443d3f3b9516f5c3d620f1393a86e87924e2888a643f37c82df4d86deb38264abe56adf03e23c5d25277c399bfd567b01e8e4aef71e90020446f91bb505
+  metadata.gz: bb589fa1c74d8fb02f79161660756667c3420baaa3810007a47506df85c5b996cfa46524d98bf6a11e2099dedc9fd2bba7922fd4ed171201dce5b59472e5012a
+  data.tar.gz: 749b07f13a864be5a935ee7fbeef1bc912e1a4e75170f9c1334de8799aeeb0f318e43a6cc209bcc8733b6687121bee756165a759e17273e47ddc50fbeaee63ba

data/README.md

@@ -20,7 +20,6 @@ gem 'net-http2'
 
 ## Usage
 
-With a blocking call:
 ```ruby
 require 'net-http2'
 
@@ -40,30 +39,6 @@ response.body     # => "A body"
 client.close
 ```
 
-With a non-blocking call:
-```ruby
-require 'net-http2'
-
-# create a client
-client = NetHttp2::Client.new("http://106.186.112.116")
-
-# send request
-client.async_get('/') do |response|
-
-  # read the response
-  response.ok?      # => true
-  response.status   # => '200'
-  response.headers  # => {":status"=>"200"}
-  response.body     # => "A body"
-
-  # close the connection
-  client.close
-end
-
-# quick & dirty fix to wait for the block to be called asynchronously
-sleep 5
-```
-
 
 ## Objects
 
@@ -99,64 +74,24 @@ NetHttp2::Client.new(url)
 ##### Blocking calls
 These behave similarly to HTTP/1 calls.
 
- * **get(path, headers={}, options={})** → **`NetHttp2::Response` or `nil`**
-
- Sends a GET request. Options can only specify a `:timeout` (defaults to 60).
- Returns `nil` in case a timeout occurs.
-
-  For example:
-
-  ```ruby
-  response_1 = client.get('/path1')
-  response_2 = client.get('/path2', { 'x-custom-header' => 'custom' })
-  response_3 = client.get('/path3', { 'x-custom-header' => 'custom' }, timeout: 1)
-  ```
-
- * **post(path, body, headers={}, options={})** → **`NetHttp2::Response` or `nil`**
+ * **call(method, path, options={})** → **`NetHttp2::Response` or `nil`**
 
- Sends a POST request. Options can only specify a `:timeout` (defaults to 60).
- Returns `nil` in case a timeout occurs.
+ Sends a request. Returns `nil` in case a timeout occurs.
 
- * **put(path, body, headers={}, options={})** → **`NetHttp2::Response` or `nil`**
-
- Sends a PUT request. Options can only specify a `:timeout` (defaults to 60).
- Returns `nil` in case a timeout occurs.
-
- * **delete(path, headers={}, options={})** → **`NetHttp2::Response` or `nil`**
-
- Sends a DELETE request. Options can only specify a `:timeout` (defaults to 60).
- Returns `nil` in case a timeout occurs.
-
-##### Non-blocking calls
-> The API of these calls is still subject to change, as on of HTTP/2 benefits is to allow for the streaming of responses' bodies.
-
- * **async_get(path, headers={}, options={})** → block called with **`NetHttp2::Response` or `nil`**
-
- Sends a GET request. Options can only specify a `:timeout` (defaults to 60).
- Returns `nil` in case a timeout occurs.
+ `method` is a symbol that specifies the `:method` header (`:get`, `:post`, `:put`, `:patch`, `:delete`, `:options`). The body and the headers of the request can be specified in the options, together with the timeout.
 
   For example:
 
   ```ruby
-  client.get('/path1') { |response_1| p response_2 }
-  client.get('/path2', { 'x-custom-header' => 'custom' }) { |response_2| p response_2 }
-  client.get('/path3', {}, timeout: 1) { |response_3| p response_3 }
+  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)
   ```
 
- * **async_post(path, body, headers={}, options={})** → block called with **`NetHttp2::Response` or `nil`**
-
- Sends a POST request. Options can only specify a `:timeout` (defaults to 60).
- Returns `nil` in case a timeout occurs.
 
- * **async_put(path,body, headers={}, options={})** → block called with **`NetHttp2::Response` or `nil`**
-
- Sends a PUT request. Options can only specify a `:timeout` (defaults to 60).
- Returns `nil` in case a timeout occurs.
-
- * **async_delete(path, headers={}, options={})** → block called with **`NetHttp2::Response` or `nil`**
+##### Non-blocking calls
 
- Sends a DELETE request. Options can only specify a `:timeout` (defaults to 60).
- Returns `nil` in case a timeout occurs.
+> The real benefit of HTTP/2 is being able to receive body and header streams. The non-blocking API calls are currently being developed.
 
 
 ### `NetHttp2::Response`

data/lib/net-http2.rb

@@ -1,10 +1,6 @@
 require 'net-http2/client'
 require 'net-http2/response'
-require 'net-http2/request/base'
-require 'net-http2/request/delete'
-require 'net-http2/request/get'
-require 'net-http2/request/post'
-require 'net-http2/request/put'
+require 'net-http2/request'
 require 'net-http2/stream'
 require 'net-http2/version'
 

data/lib/net-http2/client.rb

@@ -21,44 +21,10 @@ module NetHttp2
       @mutex           = Mutex.new
     end
 
-    def get(path, headers={}, options={})
-      request = NetHttp2::Request::Get.new(@uri, path, headers, options)
-      call_with request
-    end
-
-    def post(path, body, headers={}, options={})
-      request = NetHttp2::Request::Post.new(@uri, path, body, headers, options)
-      call_with request
-    end
-
-    def put(path, body, headers={}, options={})
-      request = NetHttp2::Request::Put.new(@uri, path, body, headers, options)
-      call_with request
-    end
-
-    def delete(path, headers={}, options={})
-      request = NetHttp2::Request::Delete.new(@uri, path, headers, options)
-      call_with request
-    end
-
-    def async_get(path, headers={}, options={}, &block)
-      request = NetHttp2::Request::Get.new(@uri, path, headers, options)
-      async_call_with request, &block
-    end
-
-    def async_post(path, body, headers={}, options={}, &block)
-      request = NetHttp2::Request::Post.new(@uri, path, body, headers, options)
-      async_call_with request, &block
-    end
-
-    def async_put(path, body, headers={}, options={}, &block)
-      request = NetHttp2::Request::Put.new(@uri, path, body, headers, options)
-      async_call_with request, &block
-    end
-
-    def async_delete(path, headers={}, options={}, &block)
-      request = NetHttp2::Request::Delete.new(@uri, path, headers, options)
-      async_call_with request, &block
+    def call(method, path, options={})
+      request = NetHttp2::Request.new(method, @uri, path, options)
+      ensure_open
+      new_stream.call_with request
     end
 
     def ssl?
@@ -76,11 +42,6 @@ module NetHttp2
 
     private
 
-    def call_with(request)
-      ensure_open
-      new_stream.call_with request
-    end
-
     def async_call_with(request, &block)
       ensure_open
       new_stream.async_call_with request, &block

data/lib/net-http2/request.rb

@@ -0,0 +1,37 @@
+module NetHttp2
+
+  class Request
+
+    DEFAULT_TIMEOUT = 60
+
+    attr_reader :method, :uri, :path, :body, :timeout
+
+    def initialize(method, uri, path, options)
+      @method  = method
+      @uri     = uri
+      @path    = path
+      @body    = options[:body]
+      @headers = options[:headers] || {}
+      @timeout = options[:timeout] || DEFAULT_TIMEOUT
+    end
+
+    def headers
+      @headers.merge!({
+        ':scheme' => @uri.scheme,
+        ':method' => @method.to_s.upcase,
+        ':path'   => @path,
+      })
+
+      @headers.merge!('host' => @uri.host) unless @headers['host']
+
+      if @body
+        @headers.merge!('content-length' => @body.bytesize.to_s)
+      else
+        @headers.delete('content-length')
+      end
+
+
+      @headers
+    end
+  end
+end

data/lib/net-http2/stream.rb

@@ -15,7 +15,7 @@ module NetHttp2
       end
 
       @h2_stream.on(:data) { |d| @data << d }
-      @h2_stream.on(:close) { mark_as_completed_and_async_respond }
+      @h2_stream.on(:close) { @completed = true }
     end
 
     def call_with(request)
@@ -23,16 +23,6 @@ module NetHttp2
       sync_respond(request.timeout)
     end
 
-    def async_call_with(request, &block)
-      @block = block
-      send_data_of request
-
-      Thread.new do
-        wait(request.timeout)
-        @block.call(nil) unless @completed
-      end
-    end
-
     private
 
     def send_data_of(request)
@@ -47,23 +37,11 @@ module NetHttp2
       end
     end
 
-    def mark_as_completed_and_async_respond
-      @completed = true
-      @block.call(response) if @block
-    end
-
     def sync_respond(timeout)
       wait(timeout)
       response if @completed
     end
 
-    def response
-      NetHttp2::Response.new(
-        headers: @headers,
-        body:    @data
-      )
-    end
-
     def wait(timeout)
       cutoff_time = Time.now + timeout
 
@@ -71,5 +49,12 @@ module NetHttp2
         sleep 0.1
       end
     end
+
+    def response
+      NetHttp2::Response.new(
+        headers: @headers,
+        body:    @data
+      )
+    end
   end
 end

data/lib/net-http2/version.rb

@@ -1,3 +1,3 @@
 module NetHttp2
-  VERSION = "0.7.2"
+  VERSION = "0.8.0"
 end

data/net-http2.gemspec

@@ -4,13 +4,15 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'net-http2/version'
 
 Gem::Specification.new do |spec|
-  spec.name     = "net-http2"
-  spec.version  = NetHttp2::VERSION
-  spec.licenses = ['MIT']
-  spec.authors  = ["Roberto Ostinelli"]
-  spec.email    = ["roberto@ostinelli.net"]
-  spec.summary  = %q{NetHttp2 is an HTTP2 client for Ruby.}
-  spec.homepage = "http://github.com/ostinelli/net-http2"
+  spec.name                  = "net-http2"
+  spec.version               = NetHttp2::VERSION
+  spec.licenses              = ['MIT']
+  spec.authors               = ["Roberto Ostinelli"]
+  spec.email                 = ["roberto@ostinelli.net"]
+  spec.summary               = %q{NetHttp2 is an HTTP2 client for Ruby.}
+  spec.homepage              = "http://github.com/ostinelli/net-http2"
+  spec.required_ruby_version = '>=2.1.0'
+
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-http2
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Roberto Ostinelli
@@ -86,11 +86,7 @@ files:
 - bin/setup
 - lib/net-http2.rb
 - lib/net-http2/client.rb
-- lib/net-http2/request/base.rb
-- lib/net-http2/request/delete.rb
-- lib/net-http2/request/get.rb
-- lib/net-http2/request/post.rb
-- lib/net-http2/request/put.rb
+- lib/net-http2/request.rb
 - lib/net-http2/response.rb
 - lib/net-http2/stream.rb
 - lib/net-http2/version.rb
@@ -107,7 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/net-http2/request/base.rb

@@ -1,33 +0,0 @@
-module NetHttp2
-
-  module Request
-
-    DEFAULT_TIMEOUT = 60
-
-    class Base
-      attr_reader :uri, :path, :body, :timeout
-
-      def initialize(method, uri, path, body, headers, options={})
-        @method  = method
-        @uri     = uri
-        @path    = path
-        @body    = body
-        @headers = headers
-        @timeout = options[:timeout] || DEFAULT_TIMEOUT
-      end
-
-      def headers
-        @headers.merge!({
-          ':scheme'        => @uri.scheme,
-          ':method'        => @method,
-          ':path'          => @path,
-        })
-
-        @headers.merge!('host' => @uri.host) unless @headers['host']
-        @headers.merge!('content-length' => @body.bytesize.to_s) if @body
-
-        @headers
-      end
-    end
-  end
-end

data/lib/net-http2/request/delete.rb

@@ -1,12 +0,0 @@
-module NetHttp2
-
-  module Request
-
-    class Delete < Base
-
-      def initialize(uri, path, headers, options)
-        super('DELETE', uri, path, nil, headers, options)
-      end
-    end
-  end
-end

data/lib/net-http2/request/get.rb

@@ -1,12 +0,0 @@
-module NetHttp2
-
-  module Request
-
-    class Get < Base
-
-      def initialize(uri, path, headers, options)
-        super('GET', uri, path, nil, headers, options)
-      end
-    end
-  end
-end

data/lib/net-http2/request/post.rb

@@ -1,12 +0,0 @@
-module NetHttp2
-
-  module Request
-
-    class Post < Base
-
-      def initialize(uri, path, body, headers, options)
-        super('POST', uri, path, body, headers, options)
-      end
-    end
-  end
-end

data/lib/net-http2/request/put.rb

@@ -1,12 +0,0 @@
-module NetHttp2
-
-  module Request
-
-    class Put < Base
-
-      def initialize(uri, path, body, headers, options)
-        super('PUT', uri, path, body, headers, options)
-      end
-    end
-  end
-end