ds9 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52aad43c3fbf23dbd113f2ee815a52bc06c22f1582adeaa791c9a9087cdd7b79
-  data.tar.gz: 2c17b45894d4414f76b6389fcdfcc7b61e830e9ba0f12a1c02e40ce23880a7a8
+  metadata.gz: e8b2fb157e8388f8d381c77c4676c9d179217648a1712a96e036eebfe1fdd17d
+  data.tar.gz: 73283b1afcac1e5703a1d121c0dbe76c17b965b950eae9207ec0d62cf03bcecb
 SHA512:
-  metadata.gz: ad3ad16ea6421c40d25a305627df176ca6cb1c718d20214dbabd44567761058987473097781e4560f8ee1a19f47250d117d2435f4ec523c1bb5b86c99e73dfd8
-  data.tar.gz: 2ac3a5df1c662ff375e07c1a527151c5135a9b3b0647b8fd236ce685f3a26fbfbbc7c48ec12cba44414ab84712b237fcc028db2e36163de50412da98648fc87e
+  metadata.gz: 8df87ef9a3b64d895c28f73c102cf4269ef5018b338e873d1f990142deaeca2ec94f6a429610f9ba45d2f3c86807c5009290abe79ee88e46adc77dd8ff86fbbb
+  data.tar.gz: ab524840e37027405339a7e9a64c58503322b82ce56893237abe818507229ad3930adaabfbc4cf29e4ab57238f98bb6cf3a0dfb24a32893b588d4bcac77bac86

data/.github/workflows/ruby.yml

@@ -0,0 +1,35 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.6', '2.7', '3.0']
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake test

data/ext/ds9/ds9.c

@@ -23,7 +23,8 @@ ID id_on_header,
    id_on_stream_close,
    id_on_data_chunk_recv,
    id_on_data_source_read,
-   id_before_frame_send;
+   id_before_frame_send,
+   id_eof_p;
 
 #define CheckSelf(ptr) \
     if (NULL == (ptr)) \
@@ -157,7 +158,7 @@ static ssize_t recv_callback(nghttp2_session *session, uint8_t *buf,
     VALUE ret;
     ssize_t len;
 
-    ret = rb_funcall(self, id_recv_event, 1, INT2NUM(length));
+    ret = rb_funcall(self, id_recv_event, 1, ULONG2NUM(length));
 
     if (FIXNUM_P(ret)) {
 	return NUM2INT(ret);
@@ -270,7 +271,7 @@ static ssize_t rb_data_read_callback(nghttp2_session *session,
     ssize_t len;
 
     ret = rb_funcall(self, id_on_data_source_read, 2, INT2NUM(stream_id),
-	    INT2NUM(length));
+	    ULONG2NUM(length));
 
     if (NIL_P(ret)) {
 	*data_flags |= NGHTTP2_DATA_FLAG_EOF;
@@ -320,8 +321,9 @@ struct hash_copy_ctx {
 };
 
 static int
-hash_copy_i(VALUE name, VALUE value, struct hash_copy_ctx * ctx)
+hash_copy_i(VALUE name, VALUE value, VALUE arg)
 {
+    struct hash_copy_ctx *ctx = (struct hash_copy_ctx *)arg;
     nghttp2_nv * head = ctx->head;
 
     head->name = (uint8_t *)StringValuePtr(name);
@@ -341,7 +343,7 @@ 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);
+    rb_hash_foreach(hash, hash_copy_i, (VALUE)&copy_ctx);
 }
 
 static VALUE allocate_session(VALUE klass)
@@ -489,6 +491,7 @@ static VALUE session_submit_trailer(VALUE self, VALUE stream_id, VALUE trailers)
 	    break;
 	default:
 	    Check_Type(trailers, T_ARRAY);
+	    UNREACHABLE;
     }
 
     nva = xcalloc(niv, sizeof(nghttp2_nv));
@@ -540,7 +543,7 @@ static VALUE session_receive(VALUE self)
 
 static VALUE session_mem_receive(VALUE self, VALUE buf)
 {
-    int rv;
+    ssize_t rv;
     nghttp2_session *session;
 
     TypedData_Get_Struct(self, nghttp2_session, &ds9_session_type, session);
@@ -548,10 +551,10 @@ static VALUE session_mem_receive(VALUE self, VALUE buf)
 
     rv = nghttp2_session_mem_recv(session, (const uint8_t *)StringValuePtr(buf), RSTRING_LEN(buf));
     if (rv < 0) {
-	explode(rv);
+	explode((int)rv);
     }
 
-    return INT2NUM(rv);
+    return ULONG2NUM(rv);
 }
 
 static VALUE session_mem_send(VALUE self)
@@ -570,7 +573,7 @@ static VALUE session_mem_send(VALUE self)
     }
 
     if (rv < 0) {
-	explode(rv);
+	explode((int)rv);
     }
 
     return rb_str_new((const char *)data, rv);
@@ -583,27 +586,33 @@ static VALUE session_outbound_queue_size(VALUE self)
     TypedData_Get_Struct(self, nghttp2_session, &ds9_session_type, session);
     CheckSelf(session);
 
-    return INT2NUM(nghttp2_session_get_outbound_queue_size(session));
+    return ULONG2NUM(nghttp2_session_get_outbound_queue_size(session));
 }
 
 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));
+    VALUE body = (VALUE)source->ptr;
+    VALUE ret = rb_funcall(body, rb_intern("read"), 1, ULONG2NUM(length));
 
-    if (NIL_P(ret)) {
-	VALUE self = (VALUE)user_data;
-	rb_funcall(self, rb_intern("remove_post_buffer"), 1, INT2NUM(stream_id));
-	*data_flags |= NGHTTP2_DATA_FLAG_EOF;
-	return 0;
-    } else if (FIXNUM_P(ret)) {
+    if (FIXNUM_P(ret)) {
         ssize_t err = NUM2INT(ret);
         if (err == NGHTTP2_ERR_DEFERRED) {
             return err;
         }
     }
 
+    if (NIL_P(ret) || (rb_respond_to(body, id_eof_p) && RTEST(rb_funcall(body, id_eof_p, 0)))) {
+	VALUE self = (VALUE)user_data;
+	rb_funcall(self, rb_intern("remove_post_buffer"), 1, INT2NUM(stream_id));
+	*data_flags |= NGHTTP2_DATA_FLAG_EOF;
+    }
+
+    if (NIL_P(ret)) {
+	return 0;
+    }
+
     Check_Type(ret, T_STRING);
     memcpy(buf, RSTRING_PTR(ret), RSTRING_LEN(ret));
     return RSTRING_LEN(ret);
@@ -635,8 +644,8 @@ file_read(nghttp2_session *session, int32_t stream_id, uint8_t *buf, size_t leng
 
 static VALUE session_submit_request(VALUE self, VALUE settings, VALUE body)
 {
-    size_t niv, i;
-    nghttp2_nv *nva, *head;
+    size_t niv;
+    nghttp2_nv *nva;
     nghttp2_session *session;
     nghttp2_data_provider provider;
     int rv;
@@ -657,6 +666,7 @@ static VALUE session_submit_request(VALUE self, VALUE settings, VALUE body)
 	    break;
 	default:
 	    Check_Type(settings, T_ARRAY);
+	    UNREACHABLE;
     }
 
     nva = xcalloc(niv, sizeof(nghttp2_nv));
@@ -673,7 +683,7 @@ static VALUE session_submit_request(VALUE self, VALUE settings, VALUE body)
 	    provider.source.ptr = rb_file;
 	    provider.read_callback = file_read;
 	} else {
-	    provider.source.ptr = body;
+	    provider.source.ptr = (void *)body;
 	    provider.read_callback = ruby_read;
 	}
 
@@ -828,7 +838,7 @@ static VALUE server_submit_response(VALUE self, VALUE stream_id, VALUE headers)
 {
     nghttp2_session *session;
     size_t niv;
-    nghttp2_nv *nva, *head;
+    nghttp2_nv *nva;
     nghttp2_data_provider provider;
     int rv;
     copy_header_func_t copy_func;
@@ -848,6 +858,7 @@ static VALUE server_submit_response(VALUE self, VALUE stream_id, VALUE headers)
 	    break;
 	default:
 	    Check_Type(headers, T_ARRAY);
+	    UNREACHABLE;
     }
 
     nva = xcalloc(niv, sizeof(nghttp2_nv));
@@ -870,7 +881,7 @@ static VALUE server_submit_response(VALUE self, VALUE stream_id, VALUE headers)
 static VALUE server_submit_headers(VALUE self, VALUE stream_id, VALUE headers) {
     nghttp2_session *session;
     size_t niv;
-    nghttp2_nv *nva, *head;
+    nghttp2_nv *nva;
     int rv;
     copy_header_func_t copy_func;
 
@@ -889,6 +900,7 @@ static VALUE server_submit_headers(VALUE self, VALUE stream_id, VALUE headers) {
 	    break;
 	default:
 	    Check_Type(headers, T_ARRAY);
+	    UNREACHABLE;
     }
 
     nva = xcalloc(niv, sizeof(nghttp2_nv));
@@ -1043,7 +1055,7 @@ void Init_ds9(void)
 
     rb_define_singleton_method(mDS9, "nghttp_version", rb_nghttp_version, 0);
 
-    cDS9Callbacks = rb_define_class_under(mDS9, "Callbacks", rb_cData);
+    cDS9Callbacks = rb_define_class_under(mDS9, "Callbacks", rb_cObject);
 
     cDS9Session = rb_define_class_under(mDS9, "Session", rb_cObject);
     cDS9Client = rb_define_class_under(mDS9, "Client", cDS9Session);
@@ -1093,6 +1105,7 @@ void Init_ds9(void)
     id_on_data_chunk_recv    = rb_intern("on_data_chunk_recv");
     id_before_frame_send     = rb_intern("before_frame_send");
     id_on_data_source_read   = rb_intern("on_data_source_read");
+    id_eof_p                 = rb_intern("eof?");
 }
 
 /* vim: set noet sws=4 sw=4: */

data/ext/ds9/ds9_frames.c

@@ -45,7 +45,7 @@ VALUE WrapDS9FrameHeader(const nghttp2_frame_hd *hd)
 {
     VALUE klass = rb_const_get(cDS9FramesFrame, rb_intern("Header"));
     return rb_funcall(klass, rb_intern("new"), 4,
-	    INT2NUM(hd->length),
+	    ULONG2NUM(hd->length),
 	    INT2NUM(hd->stream_id),
 	    INT2NUM(hd->type),
 	    INT2NUM(hd->flags));
@@ -127,7 +127,7 @@ static VALUE goaway_error_code(VALUE self)
 void Init_ds9_frames(VALUE mDS9)
 {
     mDS9Frames = rb_define_module_under(mDS9, "Frames");
-    cDS9FramesFrame = rb_define_class_under(mDS9Frames, "Frame", rb_cData);
+    cDS9FramesFrame = rb_define_class_under(mDS9Frames, "Frame", rb_cObject);
 
     mDS9FramesFlags = rb_define_module_under(cDS9FramesFrame, "Flags");
 

data/ext/ds9/ds9_option.c

@@ -122,6 +122,30 @@ static VALUE option_set_user_recv_extension_type(VALUE self, VALUE size)
     return self;
 }
 
+#if NGHTTP2_VERSION_NUM >= 0x012800 /* 1.40.0 */
+static VALUE option_set_max_outbound_ack(VALUE self, VALUE size)
+{
+    nghttp2_option *option;
+    TypedData_Get_Struct(self, nghttp2_option, &ds9_option_type, option);
+
+    nghttp2_option_set_max_outbound_ack(option, NUM2INT(size));
+
+    return self;
+}
+#endif
+
+#if NGHTTP2_VERSION_NUM >= 0x012900 /* 1.41.0 */
+static VALUE option_set_max_settings(VALUE self, VALUE size)
+{
+    nghttp2_option *option;
+    TypedData_Get_Struct(self, nghttp2_option, &ds9_option_type, option);
+
+    nghttp2_option_set_max_settings(option, NUM2INT(size));
+
+    return self;
+}
+#endif
+
 nghttp2_option* UnwrapDS9Option(VALUE opt)
 {
     nghttp2_option* option = NULL;
@@ -135,7 +159,7 @@ nghttp2_option* UnwrapDS9Option(VALUE opt)
 
 void Init_ds9_option(VALUE mDS9)
 {
-    cDS9Option = rb_define_class_under(mDS9, "Option", rb_cData);
+    cDS9Option = rb_define_class_under(mDS9, "Option", rb_cObject);
     rb_define_alloc_func(cDS9Option, allocate_option);
 
     rb_define_method(cDS9Option, "set_no_auto_ping_ack", option_set_no_auto_ping_ack, 0);
@@ -150,4 +174,10 @@ void Init_ds9_option(VALUE mDS9)
     rb_define_method(cDS9Option, "set_max_reserved_remote_streams", option_set_max_reserved_remote_streams, 1);
     rb_define_method(cDS9Option, "set_peer_max_concurrent_streams", option_set_peer_max_concurrent_streams, 1);
     rb_define_method(cDS9Option, "set_user_recv_extension_type", option_set_user_recv_extension_type, 1);
+#if NGHTTP2_VERSION_NUM >= 0x012800 /* 1.40.0 */
+    rb_define_method(cDS9Option, "set_max_outbound_ack", option_set_max_outbound_ack, 1);
+#endif
+#if NGHTTP2_VERSION_NUM >= 0x012900 /* 1.41.0 */
+    rb_define_method(cDS9Option, "set_max_settings", option_set_max_settings, 1);
+#endif
 }

data/ext/ds9/extconf.rb

@@ -23,12 +23,12 @@ else
   message "Building nghttp2\n"
   require 'rubygems'
   require 'mini_portile2'
-  recipe = MiniPortile.new('nghttp2', 'v1.34.0')
-  recipe.configure_options = recipe.configure_options + ['--with-pic', '--disable-python-bindings']
+  recipe = MiniPortile.new('nghttp2', 'v1.43.0')
+  recipe.configure_options = recipe.configure_options + ['--with-pic', '--enable-lib-only']
 
   recipe.files << {
-    url: 'https://github.com/nghttp2/nghttp2/releases/download/v1.34.0/nghttp2-1.34.0.tar.gz',
-    sha1: '2d0ad93a254a7a6e6c737f2fd2e10e4810a41f74',
+    url: 'https://github.com/nghttp2/nghttp2/releases/download/v1.43.0/nghttp2-1.43.0.tar.gz',
+    sha1: '8686c8ceee769de8b9e304739b223981df9df104',
   }
   recipe.cook
 

data/lib/ds9/version.rb

@@ -1,3 +1,3 @@
 module DS9
-  VERSION = '1.4.1'
+  VERSION = '1.4.2'
 end

data/test/helper.rb

@@ -12,7 +12,7 @@ trap("INFO") {
     puts k.backtrace
     puts "#" * 90
   end
-}
+} if Signal.list.key?("INFO")
 
 module DS9
   class TestCase < Minitest::Test

data/test/test_ds9_option.rb

@@ -84,4 +84,24 @@ class TestMeme < Minitest::Test
       assert @option.set_user_recv_extension_type('invalid')
     end
   end
+
+  def test_set_max_outbound_ack
+    assert @option.set_max_outbound_ack(100)
+  end
+
+  def test_set_max_outbound_ack_with_not_num
+    assert_raises TypeError do
+      assert @option.set_max_outbound_ack('invalid')
+    end
+  end
+
+  def test_set_max_settings
+    assert @option.set_max_settings(16)
+  end
+
+  def test_set_max_settings_with_not_num
+    assert_raises TypeError do
+      assert @option.set_max_settings('invalid')
+    end
+  end
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification
 name: ds9
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Aaron Patterson
 - Yuta Iwama
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2015-07-06 00:00:00.000000000 Z
@@ -95,6 +95,7 @@ extra_rdoc_files:
 - README.md
 files:
 - ".autotest"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - CHANGELOG.md
 - Gemfile
@@ -118,7 +119,7 @@ homepage: https://github.com/tenderlove/ds9
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -135,8 +136,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.14
+signing_key:
 specification_version: 4
 summary: This library allows you to write HTTP/2 clients and servers
 test_files: []