self_msgproto 0.0.1 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 942aa1cdb3405dedc5c909d8a1e78e748e0b0720f7e18ee312ac21ed599bf069
-  data.tar.gz: 6fb51a8cb6df6d3cb4533c249f3cdc6d09085780048b7982c18e5ed218d37a65
+  metadata.gz: a0b31d30e9104bcdb37adfe3c1ac5cafc5ab8db54cd40b2424e34b047e0296db
+  data.tar.gz: 820acdeff754f6c9f7961591c7c4b138cb2ad1337957a20072c8ddbb597c76bc
 SHA512:
-  metadata.gz: 4293de44b79d15028271c37adc119f13babc823826dede717c89563508b03396fa5ed2a348c47e66f8862d21968d080aaa40884a47bd200ea05dc85a1a941e9a
-  data.tar.gz: 66cbf37d983e27eb422bd9ccfc3f35c141e1035ebc6f9e66967af8c8e369473223ecdba409e94e2c324970977a9b1fab55de4f580449c1fc88c8da51cba0fa7d
+  metadata.gz: 314c1fcecdb84da0aeba491ebda587d95724d20a2a286d2dc6d1f4cabf346d810af26b0962cec448cc98515fe016e311fd1e80fcf342be5c0925ac25c8c12e53
+  data.tar.gz: 9fe32a3c8f76b1d052c13ee9812de38ba5873e686d28d5fa55d779fface5e9622e6c52a0eb5584915332855cf9026d2826c89c89d30c1de130c9067f9fd3e3bd

data/ext/self_msgproto/acl.cpp

@@ -45,11 +45,13 @@ VALUE acl_initialize(int argc, VALUE *argv, VALUE self)
         VALUE commandint = rb_int2inum(command);
         rb_ivar_set(self, rb_intern("@command"), commandint);
 
-        const u_char *payloaddata = payload->data();
-        long payloadsize = payload->size();
+        if (payload != NULL) {
+            const u_char *payloaddata = payload->data();
+            long payloadsize = payload->size();
 
-        VALUE payloadstr = rb_str_new((const char *)payloaddata, payloadsize);
-        rb_ivar_set(self, rb_intern("@payload"), payloadstr);
+            VALUE payloadstr = rb_str_new((const char *)payloaddata, payloadsize);
+            rb_ivar_set(self, rb_intern("@payload"), payloadstr);
+        }
     }
 
     return self;
@@ -65,13 +67,19 @@ VALUE acl_to_fb(VALUE self)
 
     ACLCommand command;
 
-    if (commandint < ACLCommand_MIN || commandint > ACLCommand_MAX) {
+    if (commandint > ACLCommand_MAX) {
         rb_raise(rb_eStandardError, "acl command is invalid");
     }
 
     VALUE payloadv = rb_ivar_get(self, rb_intern("@payload"));
-    u_char *payloadstr = (u_char *)RSTRING_PTR(payloadv);
-    long payloadlen = RSTRING_LEN(payloadv);
+
+    u_char *payloadstr;
+    long payloadlen;
+
+    if (payloadv != Qnil) {
+        payloadstr = (u_char *)RSTRING_PTR(payloadv);
+        payloadlen = RSTRING_LEN(payloadv);
+    }
 
     flatbuffers::FlatBufferBuilder builder(1024);
 
@@ -83,7 +91,10 @@ VALUE acl_to_fb(VALUE self)
     acl_builder.add_id(id);
     acl_builder.add_msgtype(MsgType_ACL);
     acl_builder.add_command(command);
-    acl_builder.add_payload(payload);
+
+    if (payloadv != Qnil) {
+        acl_builder.add_payload(payload);
+    }
 
     auto acl = acl_builder.Finish();
     builder.Finish(acl);
@@ -102,7 +113,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

@@ -41,8 +41,10 @@ VALUE notification_initialize(int argc, VALUE *argv, VALUE self)
         VALUE mtypeint = rb_int2inum(mtype);
         rb_ivar_set(self, rb_intern("@type"), mtypeint);
 
-        VALUE errorstr = rb_str_new(error, std::strlen(error));
-        rb_ivar_set(self, rb_intern("@error"), errorstr);
+        if (ntf->error() != NULL) {
+            VALUE errorstr = rb_str_new(error, std::strlen(error));
+            rb_ivar_set(self, rb_intern("@error"), errorstr);
+        }
     }
 
     return self;
@@ -52,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.rb

@@ -9,4 +9,15 @@ require 'self_msgproto/notification'
 require 'self_msgproto/self_msgproto'
 
 module SelfMsg
+
+  MsgTypeMSG = 0
+  MsgTypeACK = 1
+  MsgTypeERR = 2
+  MsgTypeAUTH = 3
+  MsgTypeACL = 4
+
+  AclCommandLIST = 0
+  AclCommandPERMIT = 1 
+  AclCommandREVOKE = 2 
+  
 end

data/lib/self_msgproto/version.rb

@@ -2,6 +2,6 @@
 
 module SelfMsg
 
-  VERSION="0.0.1"
+  VERSION="0.0.5"
 
 end

data/test/spec/test_message.rb

@@ -9,12 +9,12 @@ describe "SelfMsg" do
 
   describe "Message" do
   
-    let(:msg){ SelfMsg::Message.new(data: "test") }
+    #let(:msg){ SelfMsg::Message.new(data: "test") }
   
-    describe "#methods" do
+    #describe "#methods" do
   
-      it("returns a Array"){ _(msg.methods).must_be_kind_of Array }
+      #it("returns a Array"){ _(msg.methods).must_be_kind_of Array }
   
-    end
+    #end
   end
 end

data/test/unit/test_acl.rb

@@ -0,0 +1,20 @@
+require 'minitest/autorun'
+require 'base64'
+require 'self_msgproto'
+
+class TestMessage < Minitest::Test
+
+  include SelfMsg
+
+  def test_new_acl
+    d = Base64.decode64('EAAAAAwAFAAMABMACwAEAAwAAAAQAAAAAAAAARQAAAAAAAAEBwAAAHBheWxvYWQAJAAAADk5NDliMWEzLWRhN2QtNGQzYy05OTMxLTlkYzkzMTJhZWI4YQAAAAA')
+    h = SelfMsg::Acl.new(data: d)
+    p h.id
+    p h.type
+    p h.command
+    p h.payload
+  end
+
+end
+
+#EAAAAAwAFAAMABMACwAEAAwAAAAQAAAAAAAAAQwAAAAAAAAEAAAAACQAAAA4M2I1Zjg3Zi0yYTYxLTRiM2YtOWU2Zi0yOTk5OTk3ZDdhNDgAAAAA

data/test/unit/test_auth.rb

@@ -0,0 +1,18 @@
+require 'minitest/autorun'
+require 'base64'
+require 'self_msgproto'
+
+class TestMessage < Minitest::Test
+
+  include SelfMsg
+
+  def test_new_auth
+    d = Base64.decode64('EAAAAAwAFAAQAA8ABAAIAAwAAAAYAAAADAAAAAAAAANsAQAAAQAAADEAAABbAQAAZXlKaGJHY2lPaUpGWkVSVFFTSXNJbXRwWkNJNklpSjkuZXlKamFXUWlPaUk1TjJVM1pXUmhZeTAyWW1WaUxUUXpNalV0WVRRNE9DMWxZakkzWm1NNVkyVTBOV1VpTENKbGVIQWlPakUyTWpZNE9UY3lNRElzSW1saGRDSTZNVFl5TmpnNU56RXpOeXdpYVhOeklqb2lkR1Z6ZENJc0ltcDBhU0k2SWpKak9HRmxZalJtTFRreE9EUXROR0ZtWWkxaFpXWXlMVFZqTW1NM01qZzRabUkxWkNJc0luTjFZaUk2SW5SbGMzUWlMQ0owZVhBaU9pSmhkWFJvTG5SdmEyVnVJbjAuM0FlSXRPRzBPMWd1cTVmbjF6TGxZV3ZHelZyTmNSV2djekRFTnk4a05MLXE3NktPRDF4VVJQV2NYSFd1cDlGY3l5Z3k3dHo5cVQ1TjV4SGl0MnlWQ3cAJAAAADdkZmM0MjIzLWU2NzgtNDI1NC1iZmM5LTlkOWQxOGNlYmZjOAAAAAA')
+    h = SelfMsg::Auth.new(data: d)
+    p h.id
+    p h.type
+    p h.device
+    p h.token
+  end
+
+end

data/test/unit/test_notification.rb

@@ -0,0 +1,18 @@
+require 'minitest/autorun'
+require 'base64'
+require 'self_msgproto'
+
+class TestMessage < Minitest::Test
+
+  include SelfMsg
+
+  def test_new_notification
+    d = Base64.decode64('DAAAAAgADAAEAAsACAAAAAgAAAAAAAABJAAAADg0Y2M1M2YwLWQ1NDUtNDk5OC1iOWIxLWRmOTdmZjNkYjRjOQAAAAA')
+    h = SelfMsg::Notification.new(data: d)
+    p h.id
+    p h.type
+  end
+
+end
+
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: self_msgproto
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.5
 platform: ruby
 authors:
 - Tom Bevan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-21 00:00:00.000000000 Z
+date: 2021-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice
@@ -17,7 +17,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -109,8 +109,11 @@ files:
 - lib/self_msgproto/notification.rb
 - lib/self_msgproto/version.rb
 - test/spec/test_message.rb
+- test/unit/test_acl.rb
+- test/unit/test_auth.rb
 - test/unit/test_header.rb
 - test/unit/test_message.rb
+- test/unit/test_notification.rb
 homepage: https://github.com/joinself/self-msgproto-ruby
 licenses:
 - MIT
@@ -136,5 +139,8 @@ specification_version: 4
 summary: Bindings for Self's Flatbuffer messaging protocol
 test_files:
 - test/unit/test_header.rb
+- test/unit/test_auth.rb
+- test/unit/test_acl.rb
+- test/unit/test_notification.rb
 - test/unit/test_message.rb
 - test/spec/test_message.rb