Parsing string arguments

Author: jwarwick

lib/osc/message.ex

@@ -39,8 +39,8 @@ defmodule OSC.Message do
       |> :binary.bin_to_list 
   end
 
-  defp remove_extra_nulls(type_tag, arguments) do
-    extra_null_count = extra_nulls type_tag
+  defp remove_extra_nulls(string, arguments) do
+    extra_null_count = extra_nulls string
     len = size(arguments) - extra_null_count
     :binary.part arguments, extra_null_count, len
   end
@@ -75,5 +75,11 @@ defmodule OSC.Message do
     {{:osc_float, value}, rest}
   end
 
+  defp get_next_value(?s, arguments) do
+    [string, rest] = String.split arguments, <<0>>, global: false
+    rest = remove_extra_nulls string, rest
+    {{:osc_string, string}, rest}
+  end
+
 end
 

test/osc/message_test.exs

@@ -43,5 +43,19 @@ defmodule OSC.MessageTest do
     assert_in_delta 440.0, float_value, 0.001
   end
 
+  test "parses a string message" do
+    msg = <<"/ab", 0, ",s", 0, 0, "john", 0, 0, 0, 0>>
+    assert {"/ab", [{:osc_string, "john"}]} = OSC.Message.parse(msg)
+
+    msg = <<"/ab", 0, ",s", 0, 0, "hello", 0, 0, 0>>
+    assert {"/ab", [{:osc_string, "hello"}]} = OSC.Message.parse(msg)
+
+    msg = <<"/ab", 0, ",s", 0, 0, "ab", 0, 0>>
+    assert {"/ab", [{:osc_string, "ab"}]} = OSC.Message.parse(msg)
+
+    msg = <<"/ab", 0, ",s", 0, 0, "bob", 0>>
+    assert {"/ab", [{:osc_string, "bob"}]} = OSC.Message.parse(msg)
+  end
+
 end