ds9 1.3.3 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05561a1e3a004b4c749dc741c0f338dceecef463
-  data.tar.gz: f8aaffa9e3386aefb2c7f98d986f7b8bd26dbf9c
+  metadata.gz: ee1e610bf18252586cdc9870329bec845a845666
+  data.tar.gz: 5554cbbb9f42c3a017a482509b083d2ef23d3cec
 SHA512:
-  metadata.gz: 52045bb2c7d53d296e7f1dd3e32cb214f07bc2ce9a24f3c850e648d1fd9f55872deea4d70ec01aea6fd8e28b9ccb3d5075be1ae1a128b3530c0d6ed139f09dea
-  data.tar.gz: 4d42d79b7dae8e8f4dd9f412bcc3d72ed853acb00dd2a92b79cc79be3790616d35d0b1ff6a10b5a0ba2ca80aefde8b626144d4ccb5ce11b4d435cf9621d2ef1e
+  metadata.gz: c412989f68af4025bb659c040f7953d5fab107aa3613616f16afb48e5e4147543ac2e04b86a1930e518d45924abcd6a2079ce63eaf033ab017ee7b8ea98dff7c
+  data.tar.gz: ea9aa79692a1d0a8a879d16a85199561b1e46672629d5d5c66bc59707d287d94a7197768b76d9fad5be4428b0f7a49b8d8e22b428c14fe128099f6c59569c98e

data/ext/ds9/ds9.c

@@ -349,10 +349,11 @@ static VALUE allocate_session(VALUE klass)
     return TypedData_Wrap_Struct(klass, &ds9_session_type, 0);
 }
 
-static VALUE client_init_internals(VALUE self, VALUE cb)
+static VALUE client_init_internals(VALUE self, VALUE cb, VALUE opt)
 {
     nghttp2_session_callbacks *callbacks;
     nghttp2_session *session;
+    nghttp2_option *option;
     nghttp2_mem mem = {
 	NULL,
 	wrap_xmalloc,
@@ -362,17 +363,18 @@ static VALUE client_init_internals(VALUE self, VALUE cb)
     };
 
     TypedData_Get_Struct(cb, nghttp2_session_callbacks, &ds9_callbacks_type, callbacks);
-
-    nghttp2_session_client_new3(&session, callbacks, (void *)self, NULL, &mem);
+    option = UnwrapDS9Option(opt);
+    nghttp2_session_client_new3(&session, callbacks, (void *)self, option, &mem);
     DATA_PTR(self) = session;
 
     return self;
 }
 
-static VALUE server_init_internals(VALUE self, VALUE cb)
+static VALUE server_init_internals(VALUE self, VALUE cb, VALUE opt)
 {
     nghttp2_session_callbacks *callbacks;
     nghttp2_session *session;
+    nghttp2_option *option;
     nghttp2_mem mem = {
 	NULL,
 	wrap_xmalloc,
@@ -382,8 +384,8 @@ static VALUE server_init_internals(VALUE self, VALUE cb)
     };
 
     TypedData_Get_Struct(cb, nghttp2_session_callbacks, &ds9_callbacks_type, callbacks);
-
-    nghttp2_session_server_new3(&session, callbacks, (void *)self, NULL, &mem);
+    option = UnwrapDS9Option(opt);
+    nghttp2_session_server_new3(&session, callbacks, (void *)self, option, &mem);
     DATA_PTR(self) = session;
 
     return self;
@@ -1010,6 +1012,7 @@ void Init_ds9(void)
     mDS9 = rb_define_module("DS9");
 
     Init_ds9_frames(mDS9);
+    Init_ds9_option(mDS9);
 
     rb_define_const(mDS9, "PROTO_VERSION_ID", rb_str_new(NGHTTP2_PROTO_VERSION_ID, NGHTTP2_PROTO_VERSION_ID_LEN));
 
@@ -1066,8 +1069,8 @@ void Init_ds9(void)
 
     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);
+    rb_define_private_method(cDS9Client, "init_internals", client_init_internals, 2);
+    rb_define_private_method(cDS9Server, "init_internals", server_init_internals, 2);
 
     rb_define_method(cDS9Server, "submit_response", server_submit_response, 2);
     rb_define_method(cDS9Server, "submit_push_promise", server_submit_push_promise, 2);

data/ext/ds9/ds9.h

@@ -4,6 +4,7 @@
 #include <ruby.h>
 #include <ruby/io.h>
 #include <nghttp2/nghttp2.h>
+#include <ds9_option.h>
 
 static const rb_data_type_t ds9_session_type = {
     "DS9/session",

data/ext/ds9/ds9_option.c

@@ -0,0 +1,153 @@
+#include <ds9_option.h>
+
+VALUE cDS9Option;
+
+static VALUE allocate_option(VALUE klass)
+{
+    nghttp2_option *option;
+
+    nghttp2_option_new(&option);
+
+    return TypedData_Wrap_Struct(klass, &ds9_option_type, option);
+}
+
+static VALUE option_set_no_auto_ping_ack(VALUE self)
+{
+    nghttp2_option *option;
+    TypedData_Get_Struct(self, nghttp2_option, &ds9_option_type, option);
+
+    nghttp2_option_set_no_auto_ping_ack(option, 1);
+
+    return self;
+}
+
+static VALUE option_set_no_auto_window_update(VALUE self)
+{
+    nghttp2_option *option;
+    TypedData_Get_Struct(self, nghttp2_option, &ds9_option_type, option);
+
+    nghttp2_option_set_no_auto_window_update(option, 1);
+
+    return self;
+}
+
+static VALUE option_set_no_closed_streams(VALUE self)
+{
+    nghttp2_option *option;
+    TypedData_Get_Struct(self, nghttp2_option, &ds9_option_type, option);
+
+    nghttp2_option_set_no_closed_streams(option, 1);
+
+    return self;
+}
+
+static VALUE option_set_no_http_messaging(VALUE self)
+{
+    nghttp2_option *option;
+    TypedData_Get_Struct(self, nghttp2_option, &ds9_option_type, option);
+
+    nghttp2_option_set_no_http_messaging(option, 1);
+
+    return self;
+}
+
+static VALUE option_set_no_recv_client_magic(VALUE self)
+{
+    nghttp2_option *option;
+    TypedData_Get_Struct(self, nghttp2_option, &ds9_option_type, option);
+
+    nghttp2_option_set_no_recv_client_magic(option, 1);
+
+    return self;
+}
+
+
+static VALUE option_set_builtin_recv_extension_type(VALUE self, VALUE size)
+{
+    nghttp2_option *option;
+    TypedData_Get_Struct(self, nghttp2_option, &ds9_option_type, option);
+
+    nghttp2_option_set_builtin_recv_extension_type(option, NUM2INT(size));
+
+    return self;
+}
+
+static VALUE option_set_max_deflate_dynamic_table_size(VALUE self, VALUE size)
+{
+    nghttp2_option *option;
+    TypedData_Get_Struct(self, nghttp2_option, &ds9_option_type, option);
+
+    nghttp2_option_set_max_deflate_dynamic_table_size(option, NUM2INT(size));
+
+    return self;
+}
+
+static VALUE option_set_max_send_header_block_length(VALUE self, VALUE size)
+{
+    nghttp2_option *option;
+    TypedData_Get_Struct(self, nghttp2_option, &ds9_option_type, option);
+
+    nghttp2_option_set_max_send_header_block_length(option, NUM2INT(size));
+
+    return self;
+}
+
+static VALUE option_set_max_reserved_remote_streams(VALUE self, VALUE size)
+{
+    nghttp2_option *option;
+    TypedData_Get_Struct(self, nghttp2_option, &ds9_option_type, option);
+
+    nghttp2_option_set_max_reserved_remote_streams(option, NUM2INT(size));
+
+    return self;
+}
+
+static VALUE option_set_peer_max_concurrent_streams(VALUE self, VALUE size)
+{
+    nghttp2_option *option;
+    TypedData_Get_Struct(self, nghttp2_option, &ds9_option_type, option);
+
+    nghttp2_option_set_peer_max_concurrent_streams(option, NUM2INT(size));
+
+    return self;
+}
+
+static VALUE option_set_user_recv_extension_type(VALUE self, VALUE size)
+{
+    nghttp2_option *option;
+    TypedData_Get_Struct(self, nghttp2_option, &ds9_option_type, option);
+
+    nghttp2_option_set_user_recv_extension_type(option, NUM2INT(size));
+
+    return self;
+}
+
+nghttp2_option* UnwrapDS9Option(VALUE opt)
+{
+    nghttp2_option* option = NULL;
+
+    if (!NIL_P(opt)) {
+	TypedData_Get_Struct(opt, nghttp2_option, &ds9_option_type, option);
+    }
+
+    return option;
+}
+
+void Init_ds9_option(VALUE mDS9)
+{
+    cDS9Option = rb_define_class_under(mDS9, "Option", rb_cData);
+    rb_define_alloc_func(cDS9Option, allocate_option);
+
+    rb_define_method(cDS9Option, "set_no_auto_ping_ack", option_set_no_auto_ping_ack, 0);
+    rb_define_method(cDS9Option, "set_no_auto_window_update", option_set_no_auto_window_update, 0);
+    rb_define_method(cDS9Option, "set_no_closed_streams", option_set_no_closed_streams, 0);
+    rb_define_method(cDS9Option, "set_no_http_messaging", option_set_no_http_messaging, 0);
+    rb_define_method(cDS9Option, "set_no_recv_client_magic", option_set_no_recv_client_magic, 0);
+
+    rb_define_method(cDS9Option, "set_builtin_recv_extension_type", option_set_builtin_recv_extension_type, 1);
+    rb_define_method(cDS9Option, "set_max_deflate_dynamic_table_size", option_set_max_deflate_dynamic_table_size, 1);
+    rb_define_method(cDS9Option, "set_max_send_header_block_length", option_set_max_send_header_block_length, 1);
+    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);
+}

data/ext/ds9/ds9_option.h

@@ -0,0 +1,19 @@
+#ifndef DS9_OPTION_H
+#define DS9_OPTION_H
+
+#include <ruby.h>
+#include <nghttp2/nghttp2.h>
+
+static const rb_data_type_t ds9_option_type = {
+    "DS9/option",
+    {0, (void (*)(void *))nghttp2_option_del, 0,},
+    0, 0,
+#ifdef RUBY_TYPED_FREE_IMMEDIATELY
+    RUBY_TYPED_FREE_IMMEDIATELY,
+#endif
+};
+
+void Init_ds9_option(VALUE mDS9);
+nghttp2_option* UnwrapDS9Option(VALUE opt);
+
+#endif

data/lib/ds9.rb

@@ -75,10 +75,11 @@ module DS9
   end
 
   class Session
-    def initialize
+    # @param option [DS9::Option]
+    def initialize(option: nil)
       @post_buffers = {}
       cbs = make_callbacks
-      init_internals cbs
+      init_internals(cbs, option)
     end
 
     private

data/lib/ds9/version.rb

@@ -1,3 +1,3 @@
 module DS9
-  VERSION = '1.3.3'
+  VERSION = '1.4.0'
 end

data/test/test_ds9_option.rb

@@ -0,0 +1,87 @@
+require 'helper'
+
+class TestMeme < Minitest::Test
+  def setup
+    @option = DS9::Option.new
+  end
+
+  def test_set_no_auto_ping_ack
+    assert @option.set_no_auto_ping_ack
+  end
+
+  def test_set_no_auto_window_update
+    assert @option.set_no_auto_window_update
+  end
+
+  def test_set_no_closed_streams
+    assert @option.set_no_closed_streams
+  end
+
+  def test_set_no_http_messaging
+    assert @option.set_no_http_messaging
+  end
+
+  def test_set_no_recv_client_magic
+    assert @option.set_no_recv_client_magic
+  end
+
+  def test_set_builtin_recv_extension_type
+    assert @option.set_builtin_recv_extension_type(1)
+  end
+
+  def test_set_builtin_recv_extension_type_with_not_num
+    assert_raises TypeError do
+      assert @option.set_builtin_recv_extension_type('invalid')
+    end
+  end
+
+  def test_set_max_deflate_dynamic_table_size
+    assert @option.set_max_deflate_dynamic_table_size(1)
+  end
+
+  def test_set_max_deflate_dynamic_table_size_with_not_num
+    assert_raises TypeError do
+      @option.set_max_deflate_dynamic_table_size('invalid')
+    end
+  end
+
+  def test_set_max_send_header_block_length
+    assert @option.set_max_send_header_block_length(1)
+  end
+
+  def test_set_max_send_header_block_length_with_not_num
+    assert_raises TypeError do
+      assert @option.set_max_send_header_block_length('invalid')
+    end
+  end
+
+  def test_set_max_reserved_remote_streams
+    assert @option.set_max_reserved_remote_streams(100)
+  end
+
+  def test_set_max_reserved_remote_streams_not_num
+    assert_raises TypeError do
+      @option.set_max_reserved_remote_streams('invalid')
+    end
+  end
+
+  def test_set_peer_max_concurrent_streams
+    assert @option.set_peer_max_concurrent_streams(1)
+  end
+
+  def test_set_peer_max_concurrent_stream_with_not_num
+    assert_raises TypeError do
+      assert @option.set_peer_max_concurrent_streams('invalid')
+    end
+  end
+
+  def test_set_user_recv_extension_type
+    assert @option.set_user_recv_extension_type(1)
+  end
+
+  def test_set_user_recv_extension_type_with_not_num
+    assert_raises TypeError do
+      assert @option.set_user_recv_extension_type('invalid')
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ds9
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.4.0
 platform: ruby
 authors:
 - Aaron Patterson
@@ -104,12 +104,15 @@ files:
 - ext/ds9/ds9.c
 - ext/ds9/ds9.h
 - ext/ds9/ds9_frames.c
+- ext/ds9/ds9_option.c
+- ext/ds9/ds9_option.h
 - ext/ds9/extconf.rb
 - lib/ds9.rb
 - lib/ds9/version.rb
 - test/helper.rb
 - test/test_client.rb
 - test/test_ds9.rb
+- test/test_ds9_option.rb
 - test/test_server.rb
 homepage: https://github.com/tenderlove/ds9
 licenses:
@@ -133,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: This library allows you to write HTTP/2 clients and servers