ds9 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fa3ba996d357a12053551efdb6f4f60b89db4807
-  data.tar.gz: 24e779cd44010f0d19158199c75f849ff9db37c2
+SHA256:
+  metadata.gz: 01fed28540c96e99ddb6513b914d305459d44518385ae18449a718089bf206ff
+  data.tar.gz: adee017da6138cbe133f12d33ce01b2d1e9dbd73f1fbb5b694b4f7ef02e377be
 SHA512:
-  metadata.gz: 5cd6a8a0d6e38d1374c1c0cde4e3c34cd46639a28e76df77e024281322570e33e1ed38afd5f62371604693fa5e4306675311f8b5a9913d90c225306b3c88a828
-  data.tar.gz: ca98ca2db7715ac4ad8e7ec22b0eecdbceb76f31e5ba701026f5c450e0d38b0664c6e91030c2b624704213a2688446005c980bdad6cd335bba31d4128ae6b23d
+  metadata.gz: 3bba90e6ae993d0f9fa1654482760da4696cbd8858e2a609b4e45ac206e812ddd8ad09835d04e3be61ffc7c28e1b8e4876e3b8752309fb735826269af04af6c2
+  data.tar.gz: 455f543137a742a2c0b9f10408ee02b9aaf7f1546e6fec7a18815928c3d184abcaf54d4f8299356e10578df0f5cb9b2e4a05d76feaa1b9d60f6bdf98a7f2bed2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 1.1.0
+
+* Added support for post bodies
+
 === 1.0.0 / 2015-06-23
 
 * 1 major enhancement

data/Rakefile

@@ -12,7 +12,7 @@ gem 'rake-compiler', '>= 0.4.1'
 require "rake/extensiontask"
 
 Hoe.spec 'ds9' do
-  developer('Aaron Patterson', 'aaron@tenderlovemaking.com')
+  developer('Aaron Patterson', 'tenderlove@ruby-lang.org')
   self.readme_file   = 'README.md'
   self.history_file  = 'CHANGELOG.md'
   self.extra_rdoc_files  = FileList['*.md']

data/ext/ds9/ds9.c

@@ -1,6 +1,8 @@
 #include <ds9.h>
 #include <assert.h>
 
+typedef void (*copy_header_func_t)(VALUE, nghttp2_nv *, size_t);
+
 VALUE mDS9;
 VALUE cDS9Session;
 VALUE cDS9Client;
@@ -300,6 +302,35 @@ static void copy_list_to_nv(VALUE list, nghttp2_nv * head, size_t niv)
     }
 }
 
+struct hash_copy_ctx {
+    nghttp2_nv * head;
+};
+
+static int
+hash_copy_i(VALUE name, VALUE value, struct hash_copy_ctx * ctx)
+{
+    nghttp2_nv * head = ctx->head;
+
+    head->name = (uint8_t *)StringValuePtr(name);
+    head->namelen = RSTRING_LEN(name);
+
+    head->value = (uint8_t *)StringValuePtr(value);
+    head->valuelen = RSTRING_LEN(value);
+    head->flags = NGHTTP2_NV_FLAG_NONE;
+
+    ctx->head = head + 1;
+
+    return ST_CONTINUE;
+}
+
+static void copy_hash_to_nv(VALUE hash, nghttp2_nv * head, size_t niv)
+{
+    struct hash_copy_ctx copy_ctx;
+    copy_ctx.head = head;
+
+    rb_hash_foreach(hash, hash_copy_i, &copy_ctx);
+}
+
 static VALUE allocate_session(VALUE klass)
 {
     return TypedData_Wrap_Struct(klass, &ds9_session_type, 0);
@@ -498,23 +529,89 @@ static VALUE session_outbound_queue_size(VALUE self)
     return INT2NUM(nghttp2_session_get_outbound_queue_size(session));
 }
 
-static VALUE session_submit_request(VALUE self, VALUE settings)
+static ssize_t
+ruby_read(nghttp2_session *session, int32_t stream_id, uint8_t *buf, size_t length,
+    uint32_t *data_flags, nghttp2_data_source *source, void *user_data)
+{
+    VALUE ret = rb_funcall(source->ptr, rb_intern("read"), 1, INT2NUM(length));
+
+    if (NIL_P(ret)) {
+	*data_flags |= NGHTTP2_DATA_FLAG_EOF;
+	return 0;
+    } else {
+	memcpy(buf, RSTRING_PTR(ret), RSTRING_LEN(ret));
+	return RSTRING_LEN(ret);
+    }
+}
+
+static ssize_t
+file_read(nghttp2_session *session, int32_t stream_id, uint8_t *buf, size_t length,
+    uint32_t *data_flags, nghttp2_data_source *source, void *user_data)
+{
+    ssize_t nread;
+    rb_io_t * fptr;
+
+    fptr = (rb_io_t *)source->ptr;
+    rb_io_check_readable(fptr);
+
+    nread = read(fptr->fd, buf, length);
+
+    if (nread == -1) {
+	return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
+    }
+
+    if (nread == 0) {
+	*data_flags |= NGHTTP2_DATA_FLAG_EOF;
+    }
+    return nread;
+}
+
+static VALUE session_submit_request(VALUE self, VALUE settings, VALUE body)
 {
     size_t niv, i;
     nghttp2_nv *nva, *head;
     nghttp2_session *session;
+    nghttp2_data_provider provider;
     int rv;
+    copy_header_func_t copy_func;
 
     TypedData_Get_Struct(self, nghttp2_session, &ds9_session_type, session);
     CheckSelf(session);
 
-    Check_Type(settings, T_ARRAY);
-    niv = RARRAY_LEN(settings);
-    nva = xcalloc(niv, sizeof(nghttp2_nv));
+    switch(TYPE(settings))
+    {
+	case T_ARRAY:
+	    niv = RARRAY_LEN(settings);
+	    copy_func = copy_list_to_nv;
+	    break;
+	case T_HASH:
+	    niv = RHASH_SIZE(settings);
+	    copy_func = copy_hash_to_nv;
+	    break;
+	default:
+	    Check_Type(settings, T_ARRAY);
+    }
 
-    copy_list_to_nv(settings, nva, niv);
+    nva = xcalloc(niv, sizeof(nghttp2_nv));
 
-    rv = nghttp2_submit_request(session, NULL, nva, niv, NULL, NULL);
+    copy_func(settings, nva, niv);
+
+    if (NIL_P(body)) {
+	rv = nghttp2_submit_request(session, NULL, nva, niv, NULL, NULL);
+    } else {
+	if (TYPE(body) == T_FILE) {
+	    rb_io_t * rb_file;
+	    GetOpenFile(body, rb_file);
+	    /* Treat as a file descriptor */
+	    provider.source.ptr = rb_file;
+	    provider.read_callback = file_read;
+	} else {
+	    provider.source.ptr = body;
+	    provider.read_callback = ruby_read;
+	}
+
+	rv = nghttp2_submit_request(session, NULL, nva, niv, &provider, NULL);
+    }
 
     xfree(nva);
 
@@ -632,14 +729,28 @@ static VALUE server_submit_response(VALUE self, VALUE stream_id, VALUE headers)
     nghttp2_nv *nva, *head;
     nghttp2_data_provider provider;
     int rv;
+    copy_header_func_t copy_func;
 
     TypedData_Get_Struct(self, nghttp2_session, &ds9_session_type, session);
     CheckSelf(session);
 
-    niv = RARRAY_LEN(headers);
+    switch(TYPE(headers))
+    {
+	case T_ARRAY:
+	    niv = RARRAY_LEN(headers);
+	    copy_func = copy_list_to_nv;
+	    break;
+	case T_HASH:
+	    niv = RHASH_SIZE(headers);
+	    copy_func = copy_hash_to_nv;
+	    break;
+	default:
+	    Check_Type(headers, T_ARRAY);
+    }
+
     nva = xcalloc(niv, sizeof(nghttp2_nv));
 
-    copy_list_to_nv(headers, nva, niv);
+    copy_func(headers, nva, niv);
 
     provider.read_callback = rb_data_read_callback;
 
@@ -809,7 +920,7 @@ void Init_ds9(void)
     rb_define_method(cDS9Session, "stream_local_closed?", session_stream_local_closed_p, 1);
     rb_define_method(cDS9Session, "stream_remote_closed?", session_stream_remote_closed_p, 1);
 
-    rb_define_method(cDS9Session, "submit_request", session_submit_request, 1);
+    rb_define_private_method(cDS9Session, "submit_request", session_submit_request, 2);
     rb_define_private_method(cDS9Session, "make_callbacks", make_callbacks, 0);
     rb_define_private_method(cDS9Client, "init_internals", client_init_internals, 1);
     rb_define_private_method(cDS9Server, "init_internals", server_init_internals, 1);

data/ext/ds9/ds9.h

@@ -2,6 +2,7 @@
 #define DS9_H
 
 #include <ruby.h>
+#include <ruby/io.h>
 #include <nghttp2/nghttp2.h>
 
 static const rb_data_type_t ds9_session_type = {

data/lib/ds9.rb

@@ -1,7 +1,8 @@
 require 'ds9.so'
+require 'stringio'
 
 module DS9
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 
   module Frames
     class Frame
@@ -103,4 +104,14 @@ module DS9
       super(str)
     end
   end
+
+  class Client
+    def submit_request headers, body = nil
+      case body
+      when String
+        body = StringIO.new body
+      end
+      super(headers, body)
+    end
+  end
 end

data/test/helper.rb

@@ -78,7 +78,7 @@ module DS9
       include IOEvents
 
       class Response
-        attr_reader :stream_id, :body
+        attr_reader :stream_id, :body, :headers
 
         def initialize stream_id
           @stream_id = stream_id
@@ -131,6 +131,7 @@ module DS9
       def initialize read, write, app
         @app           = app
         @read_streams  = {}
+        @read_post_streams  = {}
         @write_streams = {}
         super(read, write)
       end
@@ -159,10 +160,13 @@ module DS9
       end
 
       def on_header name, value, frame, flags
+        if name == ":method" && value == "POST"
+          @read_post_streams[frame.stream_id] = []
+        end
         @read_streams[frame.stream_id] << [name, value]
       end
 
-      class Request < Struct.new :stream, :stream_id, :headers
+      class Request < Struct.new :stream, :stream_id, :headers, :body
         def path
           headers[':path']
         end
@@ -183,13 +187,20 @@ module DS9
         end
       end
 
+      def on_data_chunk_recv id, data, flags
+        @read_post_streams[id] << data
+      end
+
       def on_frame_recv frame
-        return unless frame.headers?
+        return unless (frame.data? || frame.headers?) && frame.end_stream?
 
         req_headers = @read_streams[frame.stream_id]
 
         response = Response.new(self, frame.stream_id, [])
         request = Request.new(self, frame.stream_id, Hash[req_headers])
+        if @read_post_streams[frame.stream_id]
+          request.body = @read_post_streams[frame.stream_id].join
+        end
 
         @app.call request, response
 

data/test/test_client.rb

@@ -131,6 +131,82 @@ class TestClient < DS9::TestCase
     assert_equal ["omglolwut", "lololol"], responses.map(&:body).map(&:string)
   end
 
+  def test_post
+    body = 'omglolwut'
+
+    server, client = pipe do |req, res|
+      case req.path
+      when '/'
+        res.submit_response [[":status", '200'],
+                             ["server", 'test server'],
+                             ["date", 'Sat, 27 Jun 2015 17:29:21 GMT'],
+                             ["X-Whatever", "blah"]]
+        res.finish req.body
+      end
+    end
+
+    s = Thread.new { server.run }
+    c = Thread.new { client.run }
+
+    client.submit_request [
+      [':method', 'POST'],
+      [':path', '/'],
+      [':scheme', 'https'],
+      [':authority', ['localhost', '8080'].join(':')],
+      ['accept', '*/*'],
+      ['user-agent', 'test'],
+    ], body
+
+    responses = []
+    while response = client.responses.pop
+      responses << response
+      if responses.length == 1
+        client.terminate_session DS9::NO_ERROR
+      end
+    end
+
+    s.join
+    c.join
+    assert_equal [body], responses.map(&:body).map(&:string)
+  end
+
+  def test_post_file
+    server, client = pipe do |req, res|
+      case req.path
+      when '/'
+        res.submit_response [[":status", '200'],
+                             ["server", 'test server'],
+                             ["date", 'Sat, 27 Jun 2015 17:29:21 GMT'],
+                             ["X-Whatever", "blah"]]
+        res.finish req.body
+      end
+    end
+
+    s = Thread.new { server.run }
+    c = Thread.new { client.run }
+
+    client.submit_request [
+      [':method', 'POST'],
+      [':path', '/'],
+      [':scheme', 'https'],
+      [':authority', ['localhost', '8080'].join(':')],
+      ['accept', '*/*'],
+      ['user-agent', 'test'],
+    ], File.open(__FILE__, "r")
+
+    responses = []
+    while response = client.responses.pop
+      responses << response
+      if responses.length == 1
+        client.terminate_session DS9::NO_ERROR
+      end
+    end
+
+    s.join
+    c.join
+    assert_equal File.read(__FILE__), responses.map(&:body).map(&:string).first
+  end
+
   def test_request
     body = 'omglolwut'
 
@@ -166,4 +242,49 @@ class TestClient < DS9::TestCase
     c.join
     assert_equal ["omglolwut"], responses.map(&:body).map(&:string)
   end
+
+  def test_request_response_with_hashes
+    body = 'omglolwut'
+
+    req_hash = {
+      ':method'    => 'GET',
+      ':path'      => '/',
+      ':scheme'    => 'https',
+      ':authority' => ['localhost', '8080'].join(':'),
+      'accept'     => '*/*',
+      'user-agent' => 'test',
+    }
+
+    res_hash = {
+      ":status"    => '200',
+      "server"     => 'test server',
+      "date"       => 'Sat, 27 Jun 2015 17:29:21 GMT',
+      "x-whatever" => "blah"
+    }
+
+    server, client = pipe do |req, res|
+      assert_equal req_hash, req.headers
+
+      res.submit_response res_hash
+      res.finish body
+    end
+
+    client.submit_request req_hash
+
+    s = Thread.new { server.run }
+    c = Thread.new { client.run }
+
+    responses = []
+    while response = client.responses.pop
+      responses << response
+      if responses.length == 1
+        client.terminate_session DS9::NO_ERROR
+      end
+    end
+
+    s.join
+    c.join
+    assert_equal res_hash, responses.first.headers
+    assert_equal ["omglolwut"], responses.map(&:body).map(&:string)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ds9
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Aaron Patterson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-06 00:00:00.000000000 Z
+date: 2018-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -16,61 +16,67 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.8'
+        version: '5.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.8'
+        version: '5.11'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 0.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '3.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '3.17'
 description: |-
   This library allows you to write HTTP/2 clients and servers.  It is a wrapper
   around nghttp2.
 email:
-- aaron@tenderlovemaking.com
+- tenderlove@ruby-lang.org
 executables: []
 extensions:
 - ext/ds9/extconf.rb
@@ -114,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: This library allows you to write HTTP/2 clients and servers