self_msgproto 0.0.4 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0857c1696c3c5ce7f1bd22f0ecc8bf9393758e2fe7da6007e360a5671d4d47d4'
-  data.tar.gz: 752789bf93fef19f6da65f5e904c8653b5fd095c579adf98ee61cf2499c69ee5
+  metadata.gz: cab7cc6b6f6a48df982c1ee3d9b170e85cfd55178f79bdab9e6ced5676f52199
+  data.tar.gz: 88f152ebe1b13969258c96be8d1fb98036a51509957e236bdf2ece2a15c18389
 SHA512:
-  metadata.gz: a62825acfee718518cbe3f34514089094358607ab17219b3fa6f6eeac878d246bd75b397ea5b1215587dcba622fe818df9d28a139918a12356aaeff4b2034d43
-  data.tar.gz: 43b65bce4e69770a0d342105834feb839654231be5ab7bd6b35c2feb8d9dedae772988e61e147bbc32d441a54e6b9043555aa82d809bc60f78680b72913ce2fe
+  metadata.gz: 7903916cb4d14f524c312b582b92b19d18094a582df509ae8e2cb3df8621d2b852dae659d6faf306b6402a4335c96faed5309495e997ee80cb93095baedc1255
+  data.tar.gz: 84fa5070a8d235c1e42ca4b8a93407861288b3ccb62ac307dadebb62482055afbdeca52907aaa3bae85341d29a04bc397e1f5de82694715ddc48deb78d50a370

data/ext/self_msgproto/acl.cpp

@@ -63,11 +63,21 @@ VALUE acl_to_fb(VALUE self)
     char *idstr = RSTRING_PTR(idv);
 
     VALUE commandv = rb_ivar_get(self, rb_intern("@command"));
-    uint8_t commandint = NUM2INT(commandv);
+    int64_t commandint = NUM2INT(commandv);
 
     ACLCommand command;
 
-    if (commandint < ACLCommand_MIN || commandint > ACLCommand_MAX) {
+    switch(commandint) {
+    case 0:
+        command = ACLCommand_LIST;
+        break;
+    case 1:
+        command = ACLCommand_PERMIT;
+        break;
+    case 2:
+        command = ACLCommand_REVOKE;
+        break;
+    default:
         rb_raise(rb_eStandardError, "acl command is invalid");
     }
 
@@ -75,6 +85,7 @@ VALUE acl_to_fb(VALUE self)
 
     u_char *payloadstr;
     long payloadlen;
+    flatbuffers::Offset<flatbuffers::Vector<uint8_t>> payload;
 
     if (payloadv != Qnil) {
         payloadstr = (u_char *)RSTRING_PTR(payloadv);
@@ -84,7 +95,10 @@ VALUE acl_to_fb(VALUE self)
     flatbuffers::FlatBufferBuilder builder(1024);
 
     auto id = builder.CreateString(idstr);
-    auto payload = builder.CreateVector(payloadstr, payloadlen);
+
+    if (payloadv != Qnil) {
+        payload = builder.CreateVector(payloadstr, payloadlen);
+    }
 
     ACLBuilder acl_builder(builder);
 
@@ -113,7 +127,7 @@ void acl_init() {
     VALUE cRubySelfMsg = rb_define_module("SelfMsg");
     VALUE cAcl = rb_define_class_under(cRubySelfMsg, "Acl", rb_cObject);
 
-    rb_define_method(cAcl, "initialize", acl_initialize, -1);
-    rb_define_method(cAcl, "to_fb", acl_to_fb, 0);
+    rb_define_method(cAcl, "initialize", reinterpret_cast< VALUE ( * ) ( ... ) >(acl_initialize), -1);
+    rb_define_method(cAcl, "to_fb", reinterpret_cast< VALUE ( * ) ( ... ) >(acl_to_fb), 0);
 }
 

data/ext/self_msgproto/auth.cpp

@@ -101,7 +101,7 @@ void auth_init() {
     VALUE cRubySelfMsg = rb_define_module("SelfMsg");
     VALUE cAuth = rb_define_class_under(cRubySelfMsg, "Auth", rb_cObject);
 
-    rb_define_method(cAuth, "initialize", auth_initialize, -1);
-    rb_define_method(cAuth, "to_fb", auth_to_fb, 0);
+    rb_define_method(cAuth, "initialize", reinterpret_cast< VALUE ( * ) ( ... ) >(auth_initialize), -1);
+    rb_define_method(cAuth, "to_fb", reinterpret_cast< VALUE ( * ) ( ... ) >(auth_to_fb), 0);
 }
 

data/ext/self_msgproto/header.cpp

@@ -48,6 +48,6 @@ void header_init() {
     VALUE cRubySelfMsg = rb_define_module("SelfMsg");
     VALUE cHeader = rb_define_class_under(cRubySelfMsg, "Header", rb_cObject);
 
-    rb_define_method(cHeader, "initialize", header_initialize, -1);
+    rb_define_method(cHeader, "initialize", reinterpret_cast< VALUE ( * ) ( ... ) >(header_initialize), -1);
 }
 

data/ext/self_msgproto/message.cpp

@@ -125,7 +125,7 @@ void message_init() {
     VALUE cRubySelfMsg = rb_define_module("SelfMsg");
     VALUE cMessage = rb_define_class_under(cRubySelfMsg, "Message", rb_cObject);
 
-    rb_define_method(cMessage, "initialize", message_initialize, -1);
-    rb_define_method(cMessage, "to_fb", message_to_fb, 0);
+    rb_define_method(cMessage, "initialize", reinterpret_cast< VALUE ( * ) ( ... ) >(message_initialize), -1);
+    rb_define_method(cMessage, "to_fb", reinterpret_cast< VALUE ( * ) ( ... ) >(message_to_fb), 0);
 }
 

data/ext/self_msgproto/notification.cpp

@@ -54,6 +54,6 @@ void notification_init() {
     VALUE cRubySelfMsg = rb_define_module("SelfMsg");
     VALUE cHeader = rb_define_class_under(cRubySelfMsg, "Notification", rb_cObject);
 
-    rb_define_method(cHeader, "initialize", notification_initialize, -1);
+    rb_define_method(cHeader, "initialize", reinterpret_cast< VALUE ( * ) ( ... ) >(notification_initialize), -1);
 }
 

data/lib/self_msgproto/version.rb

@@ -2,6 +2,6 @@
 
 module SelfMsg
 
-  VERSION="0.0.4"
+  VERSION="0.0.8"
 
 end

data/test/unit/test_acl.rb

@@ -13,6 +13,9 @@ class TestMessage < Minitest::Test
     p h.type
     p h.command
     p h.payload
+
+    p h.command = SelfMsg::AclCommandPERMIT
+    p h.to_fb
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: self_msgproto
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.8
 platform: ruby
 authors:
 - Tom Bevan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-22 00:00:00.000000000 Z
+date: 2021-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice