fast_osc 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9a41c6181bc5aacee5d21c72ed458afa8e8ab83
-  data.tar.gz: 4826ac56d60fb8361a2b993b770353bd8cea2263
+  metadata.gz: b61fec8aa9b7da4919beb24194add024e7fc96ed
+  data.tar.gz: f3b8f4387da0d02161f4d173b60de999c9851948
 SHA512:
-  metadata.gz: 89e221df978a9ddd6e4652e47e54223cf3080ee398f55768a0d3bf91ef98fb62b4807788e720c2df37d80e872a366a0b5dfe18c2c999a2f8107757d128366add
-  data.tar.gz: f1cbc5bd780f52a26d3c78648ccdf7fe7c4dc8c6c053f9703ec62c6ab6dfa73cbc81f51f5e8df27e2e80dc46a283830fd82eab3dc81ab81b6692b5ccfccac1b6
+  metadata.gz: d6f8997f138ca1d6a78c3d686cbd24fcd9b29638dae90d817becd9f2a97ced738eb2f33025c5f6a86a0ece2abad5794ffa640bb690a8d92a0850108f8c1fb7cf
+  data.tar.gz: 58723176381c238b7591c82e1ff43f24ae4cb829311b862f03639236d16e47c65bbf914b26e1986ef494d45b799e88f688d680385dd761fb049ecf321ab61094

data/README.md

@@ -65,19 +65,19 @@ I'll include a better test in the repo in time.
 ## Usage
 
 ```
->> FastOsc.serialize("/foo", ["baz", 1, 2.0])
+>> FastOsc.encode_single_message("/foo", ["baz", 1, 2.0])
 => "/foo\x00\x00\x00\x00,sif\x00\x00\x00\x00baz\x00\x00\x00\x00\x01@\x00\x00\x00"
 >> res = _
->> FastOsc.deserialize(res)
-=> ["baz", 1, 2.0]
+>> FastOsc.decode_single_message(res)
+=> ["/foo", ["baz", 1, 2.0]]
+>> FastOsc.encode_single_bundle(Time.now.to_i, "/foo", ["baz", 1, 2.0])
+=> "#bundle\x00\x00\x00\x00\x00W*1\x7F\x00\x00\x00\x1C/foo\x00\x00\x00\x00,sif\x00\x00\x00\x00baz\x00\x00\x00\x00\x01@\x00\x00\x00"
 ```
 
 ## Still todo
 
 * Implement more types
-* return address with `deserialize` (doh!)
 * add tests at the Ruby level (rtosc C code is already tested)
-* figure out build process
 
 ## Development notes
 

data/ext/fast_osc/fast_osc_wrapper.c

@@ -10,8 +10,9 @@ VALUE FastOsc = Qnil;
 // when this file is loaded, and the second is the actual business logic we're
 // implementing.
 void Init_fast_osc();
-VALUE method_fast_osc_deserialize(VALUE self, VALUE msg);
-VALUE method_fast_osc_serialize(VALUE self, VALUE address, VALUE args);
+VALUE method_fast_osc_decode_single_message(VALUE self, VALUE msg);
+VALUE method_fast_osc_encode_single_message(VALUE self, VALUE address, VALUE args);
+VALUE method_fast_osc_encode_single_bundle(VALUE self, VALUE timestamp, VALUE address, VALUE args);
 
 // Initial setup function, takes no arguments and returns nothing. Some API
 // notes:
@@ -27,15 +28,24 @@ VALUE method_fast_osc_serialize(VALUE self, VALUE address, VALUE args);
 //
 void Init_fast_osc() {
   FastOsc = rb_define_module("FastOsc");
-  rb_define_singleton_method(FastOsc, "deserialize", method_fast_osc_deserialize, 1);
-  rb_define_singleton_method(FastOsc, "serialize", method_fast_osc_serialize, 2);
+  rb_define_singleton_method(FastOsc, "decode_single_message", method_fast_osc_decode_single_message, 1);
+  rb_define_singleton_method(FastOsc, "encode_single_message", method_fast_osc_encode_single_message, 2);
+  rb_define_singleton_method(FastOsc, "encode_single_bundle", method_fast_osc_encode_single_bundle, 3);
 }
 
-VALUE method_fast_osc_deserialize(VALUE self, VALUE msg) {
+const char *rtosc_path(const char *msg)
+{
+  return msg;
+}
+
+VALUE method_fast_osc_decode_single_message(VALUE self, VALUE msg) {
   rtosc_arg_itr_t itr;
   char* data = StringValuePtr(msg);
   itr = rtosc_itr_begin(data);
   VALUE output = rb_ary_new();
+  VALUE args_output = rb_ary_new();
+
+  VALUE path = rb_str_new2(rtosc_path(data));
 
   rtosc_arg_val_t next_val;
 
@@ -46,38 +56,40 @@ VALUE method_fast_osc_deserialize(VALUE self, VALUE msg) {
     switch(next_val.type) {
       case 'i' :
         // INT2FIX() for integers within 31bits.
-        rb_ary_push(output, INT2FIX(next_val.val.i));
+        rb_ary_push(args_output, INT2FIX(next_val.val.i));
         break;
       case 'f' :
-        rb_ary_push(output, rb_float_new(next_val.val.f));
+        rb_ary_push(args_output, rb_float_new(next_val.val.f));
         break;
       case 's' :
-        rb_ary_push(output, rb_str_new2(next_val.val.s));
+        rb_ary_push(args_output, rb_str_new2(next_val.val.s));
         break;
       case 'b' :
-        rb_ary_push(output, rb_str_new((const char*)next_val.val.b.data, next_val.val.b.len));
+        rb_ary_push(args_output, rb_str_new((const char*)next_val.val.b.data, next_val.val.b.len));
         break;
       case 'h' :
         // INT2NUM() for arbitrary sized integers
-        rb_ary_push(output, INT2NUM(next_val.val.h));
+        rb_ary_push(args_output, INT2NUM(next_val.val.h));
         break;
       case 't' :
         // OSC time tag
         // not implemented
         break;
       case 'd' :
-        rb_ary_push(output, rb_float_new(next_val.val.d));
+        rb_ary_push(args_output, rb_float_new(next_val.val.d));
         break;
       case 'S' :
-        rb_ary_push(output, ID2SYM(rb_intern(next_val.val.s)));
+        rb_ary_push(args_output, ID2SYM(rb_intern(next_val.val.s)));
         break;
       case 'c' :
-        rb_ary_push(output, rb_str_concat(rb_str_new2(""), INT2FIX(next_val.val.i)));
+        rb_ary_push(args_output, rb_str_concat(rb_str_new2(""), INT2FIX(next_val.val.i)));
         break;
     }
 
   }
 
+  rb_ary_push(output, path);
+  rb_ary_push(output, args_output);
   return output;
 }
 
@@ -86,7 +98,7 @@ int buffer_size_for_ruby_string(VALUE rstring) {
   return (int)((str_bytesize + sizeof(int) - 1) & ~(sizeof(int) - 1));
 }
 
-VALUE method_fast_osc_serialize(VALUE self, VALUE address, VALUE args) {
+VALUE method_fast_osc_encode_single_message(VALUE self, VALUE address, VALUE args) {
   char* c_address = StringValueCStr(address);
 
   int no_of_args = NUM2INT(LONG2NUM(RARRAY_LEN(args)));
@@ -153,3 +165,17 @@ VALUE method_fast_osc_serialize(VALUE self, VALUE address, VALUE args) {
 
   return output;
 }
+
+VALUE method_fast_osc_encode_single_bundle(VALUE self, VALUE timestamp, VALUE address, VALUE args) {
+  VALUE message = method_fast_osc_encode_single_message(self, address, args);
+  int bufsize = buffer_size_for_ruby_string(message) + 16;
+  int no_of_elems = 1;
+  uint64_t tt = FIX2LONG(timestamp);
+  char output_buffer[bufsize];
+
+  int len = rtosc_bundle(output_buffer, bufsize, tt, no_of_elems, StringValuePtr(message));
+
+  VALUE output = rb_str_new(output_buffer, len);
+
+  return output;
+}

data/lib/fast_osc/version.rb

@@ -1,5 +1,3 @@
 module FastOsc
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end
-
-require "fast_osc/fast_osc"

data/lib/fast_osc.rb

@@ -1,4 +1,5 @@
 require "fast_osc/version"
+require "fast_osc/fast_osc"
 
 module FastOsc
   # Your code goes here...

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fast_osc
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Xavier Riley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-03 00:00:00.000000000 Z
+date: 2016-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler