fast_osc 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f284e9a9b81cb84245fbf2d9a1c7631fb670696d
-  data.tar.gz: 40f36cc032625bc34a9bd4811127fe0d1cae7c49
+  metadata.gz: e928fde0a4bf601705f34f29aab9f788d2044cf9
+  data.tar.gz: 9ea87039d5da0efa5edb45e600ee985c5caee1df
 SHA512:
-  metadata.gz: 9ca15f55e91996ed3435a378985667afe7ffe31156d257873a2d26c68cc5eb295845d025b21339233a7068abc27fc19da2f5e7e1527eb9f54bff6c77d21e1fde
-  data.tar.gz: 3ae9debfc8cfc11bb415ffe052c7346e161bef20e3abd1add9466d174401ebd240fe2ca7deef3f649a7d8cb63169e24fc190865a396c198a404b454d7dcd3edb
+  metadata.gz: 44b41b3ccf0c5aa9d35c0b586bb2e4df93710ecf7ac58a5c747c29f669bf510ebc8cb1a5438fd687344133a0185931de0b9027e829f4c1d09ff9ae853fa04b75
+  data.tar.gz: c7556261e6f6ac3895f86b4c0f5cb190eddef9b7ff3d7dfbe7ba44acf773cc8707a1b8a5b5540d47d9f0ac79dc38d424fb3c9de846a3365c88c4df855812ab0e

data/ext/fast_osc/fast_osc_wrapper.c

@@ -11,8 +11,8 @@ VALUE FastOsc = Qnil;
 // implementing.
 void Init_fast_osc();
 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);
+VALUE method_fast_osc_encode_single_message(int argc, VALUE* argv, VALUE self);
+VALUE method_fast_osc_encode_single_bundle(int argc, VALUE* argv, VALUE self);
 
 // Initial setup function, takes no arguments and returns nothing. Some API
 // notes:
@@ -29,8 +29,8 @@ VALUE method_fast_osc_encode_single_bundle(VALUE self, VALUE timestamp, VALUE ad
 void Init_fast_osc() {
   FastOsc = rb_define_module("FastOsc");
   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);
+  rb_define_singleton_method(FastOsc, "encode_single_message", method_fast_osc_encode_single_message, -1);
+  rb_define_singleton_method(FastOsc, "encode_single_bundle", method_fast_osc_encode_single_bundle, -1);
 }
 
 const char *rtosc_path(const char *msg)
@@ -95,10 +95,24 @@ VALUE method_fast_osc_decode_single_message(VALUE self, VALUE msg) {
 
 int buffer_size_for_ruby_string(VALUE rstring) {
   int str_bytesize = FIX2INT(LONG2FIX(RSTRING_LEN(rstring)));
-  return (int)((str_bytesize + sizeof(int) - 1) & ~(sizeof(int) - 1));
+  int bufsize = (int)((str_bytesize + sizeof(int) - 1) & ~(sizeof(int) - 1));
+  return (bufsize + 4) & ~3u;
 }
 
-VALUE method_fast_osc_encode_single_message(VALUE self, VALUE address, VALUE args) {
+VALUE method_fast_osc_encode_single_message(int argc, VALUE* argv, VALUE self) {
+  VALUE address, args;
+
+  rb_scan_args(argc, argv, "11", &address, &args);
+
+  if (NIL_P(args)) args = rb_ary_new();
+
+  // Ruby C API only really allows methods that slurp in all the args
+  // Since we want the method to look like
+  //
+  // def encode_single_message(path, args=[])
+  //
+  // we need to muck around with the args option a bit
+  // VALUE* brings in args as a C array
   char* c_address = StringValueCStr(address);
 
   int no_of_args = NUM2INT(LONG2NUM(RARRAY_LEN(args)));
@@ -158,8 +172,12 @@ VALUE method_fast_osc_encode_single_message(VALUE self, VALUE address, VALUE arg
 
   char buffer[max_buffer_size];
 
-
-  int len = rtosc_amessage(buffer, sizeof(buffer), c_address, StringValueCStr(tagstring), output_args);
+  int len;
+  if(RSTRING_LEN(tagstring)) {
+    len = rtosc_amessage(buffer, sizeof(buffer), c_address, StringValueCStr(tagstring), output_args);
+  } else {
+    len = rtosc_message(buffer, sizeof(buffer), c_address, "");
+  }
 
   VALUE output = rb_str_new(buffer, len);
 
@@ -191,8 +209,19 @@ uint64_t ruby_time_to_osc_timetag(VALUE rubytime) {
   return timetag;
 }
 
-VALUE method_fast_osc_encode_single_bundle(VALUE self, VALUE timetag, VALUE address, VALUE args) {
-  VALUE message = method_fast_osc_encode_single_message(self, address, args);
+VALUE method_fast_osc_encode_single_bundle(int argc, VALUE* argv, VALUE self) {
+  VALUE timetag, path, args;
+  rb_scan_args(argc, argv, "21", &timetag, &path, &args);
+
+  if (NIL_P(args)) args = rb_ary_new();
+
+  VALUE combined_args_holder = rb_ary_new();
+  rb_ary_push(combined_args_holder, path);
+  rb_ary_push(combined_args_holder, args);
+  VALUE* combined_path_and_args = RARRAY_PTR(combined_args_holder);
+
+  // There are always 2 args here - [path, [args...]]
+  VALUE message = method_fast_osc_encode_single_message(2, combined_path_and_args, self);
   int bufsize = buffer_size_for_ruby_string(message) + 16;
   int no_of_elems = 1;
   uint64_t tt = ruby_time_to_osc_timetag(timetag);

data/lib/fast_osc/version.rb

@@ -1,3 +1,3 @@
 module FastOsc
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/test/fast_osc_test.rb

@@ -5,9 +5,11 @@ require 'date'
 class FastOscTest < Minitest::Test
   def setup
     @path = "/thisisatest"
-    @args = [1, 2.0, "baz"]
+    @args = ["", 1, 2.0, "baz", ""]
     @timestamp = Date.parse("1st Jan 1990").to_time
 
+    @msg0 = OSC::Message.new(@path).encode
+    @encoded_msg0 = @msg0.encode
     @msg1 = OSC::Message.new(@path, *@args).encode
     @encoded_msg1 = @msg1.encode
   end
@@ -17,12 +19,25 @@ class FastOscTest < Minitest::Test
   end
 
   def test_that_it_encodes_a_single_message
+    msg = FastOsc.encode_single_message(@path)
+
+    assert_equal msg, @encoded_msg0
+  end
+
+  def test_that_it_decodes_a_single_message
+    path, args = FastOsc.decode_single_message(@encoded_msg0)
+
+    assert path == @path
+    assert args == []
+  end
+
+  def test_that_it_encodes_a_single_message_with_args
     msg = FastOsc.encode_single_message(@path, @args)
 
     assert msg == @encoded_msg1
   end
 
-  def test_that_it_decodes_a_single_message
+  def test_that_it_decodes_a_single_message_with_args
     path, args = FastOsc.decode_single_message(@encoded_msg1)
 
     assert path == @path
@@ -36,13 +51,6 @@ class FastOscTest < Minitest::Test
     assert_equal bundle1, bundle2
   end
 
-  def test_that_it_encodes_a_single_bundle_with_fractional_time
-    bundle1 = OSC::Bundle.new(@timestamp + 0.33, @msg1).encode
-    bundle2 = FastOsc.encode_single_bundle(@timestamp + 0.33, @path, @args)
-
-    assert_equal bundle1, bundle2
-  end
-
   def test_that_it_encodes_a_single_bundle_with_fractional_time
     bundle1 = OSC::Bundle.new(@timestamp + 0.3343215, @msg1).encode
     bundle2 = FastOsc.encode_single_bundle(@timestamp + 0.3343215, @path, @args)

metadata

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