ruby-osc 0.3.4 → 0.4.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c7a3ed90d79d95eb44be4341b5e0e3cd13b19826
+  data.tar.gz: 860511677129f64f5de77c761c6adce36accad05
+SHA512:
+  metadata.gz: 5508fc05070baa6616cf7494e7a020c313dbfdf5e870e7db58c45e0d7c80cd3f89b054cec32f5bee0bb78615c232c39e7c38bcd8b2f5a53a09471178a8a1efc6
+  data.tar.gz: 3373a2777db15a1c6e4fe73ca7bacc0808ba8fba2ad66653bcd2c46b7e0e687a7f4a4146a9129ffc7c28b493bbe28701b7fe1dea054bf6230e67e0afd904e921

data/README.rdoc

@@ -13,32 +13,32 @@ Concise OSC implementation for Ruby
     require 'rubygems'
     require 'ruby-osc'
     
-    include  OSC
-    
-    server = Server.new 9090
-    client = Client.new 9090
-    
-    server.add_pattern /.*/ do |*args|       # this will match any address
-      p "/.*/:       #{ args.join(', ') }"
-    end
-    
-    server.add_pattern %r{foo/.*} do |*args| # this will match any /foo node
-      p "%r{foo/.*}: #{ args.join(', ') }"
-    end
-    
-    server.add_pattern "/foo/bar" do |*args| # this will just match /foo/bar address
-      p "'/foo/bar': #{ args.join(', ') }"
-    end
-    
-    server.add_pattern "/exit" do |*args|    # this will just match /exit address
-      exit
+    include OSC
+
+    OSC.run do
+      server = Server.new 9090
+      client = Client.new 9090
+
+      server.add_pattern /.*/ do |*args|       # this will match any address
+        p "/.*/:       #{ args.join(', ') }"
+      end
+
+      server.add_pattern %r{foo/.*} do |*args| # this will match any /foo node
+        p "%r{foo/.*}: #{ args.join(', ') }"
+      end
+
+      server.add_pattern "/foo/bar" do |*args| # this will just match /foo/bar address
+        p "'/foo/bar': #{ args.join(', ') }"
+      end
+
+      server.add_pattern "/exit" do |*args|    # this will just match /exit address
+        exit
+      end
+
+      client.send Message.new('/foo/bar', 1, 1.2, 'a string')
+      client.send Message.new('/foo/bar/zar', 1, 1.2, 'a string')
+      client.send Bundle.new(Time.now + 2, Message.new('/exit'))
     end
-    
-    client.send Message.new('/foo/bar', 1, 1.2, 'a string')
-    client.send Message.new('/foo/bar/zar', 1, 1.2, 'a string')
-    client.send Bundle.new(Time.now + 2, Message.new('/exit'))
-    
-    OSC::Thread.join
 
 == REQUIREMENTS:
 

data/examples/localtest.rb

@@ -1,30 +1,30 @@
 require 'rubygems'
-# require "#{ File.dirname __FILE__ }/../lib/ruby-osc" 
 require 'ruby-osc'
 
-include  OSC
+include OSC
 
-server = Server.new 9090
-client = Client.new 9090
+OSC.run do
+  server = Server.new 9090
+  client = Client.new 9090
 
-server.add_pattern /.*/ do |*args|       # this will match any address
-  p "/.*/:       #{ args.join(', ') }"
-end
+  server.add_pattern /.*/ do |*args|       # this will match any address
+    p "/.*/:       #{ args.join(', ') }"
+  end
 
-server.add_pattern %r{foo/.*} do |*args| # this will match any /foo node
-  p "%r{foo/.*}: #{ args.join(', ') }"
-end
+  server.add_pattern %r{foo/.*} do |*args| # this will match any /foo node
+    p "%r{foo/.*}: #{ args.join(', ') }"
+  end
 
-server.add_pattern "/foo/bar" do |*args| # this will just match /foo/bar address
-  p "'/foo/bar': #{ args.join(', ') }"
-end
+  server.add_pattern "/foo/bar" do |*args| # this will just match /foo/bar address
+    p "'/foo/bar': #{ args.join(', ') }"
+  end
 
-server.add_pattern "/exit" do |*args|    # this will just match /exit address
-  exit
-end
+  server.add_pattern "/exit" do |*args|    # this will just match /exit address
+    exit
+  end
 
-client.send Message.new('/foo/bar', 1, 1.2, 'a string')
-client.send Message.new('/foo/bar/zar', 1, 1.2, 'a string')
-client.send Bundle.new(Time.now + 2, Message.new('/exit'))
 
-OSC::Thread.join
+  client.send Message.new('/foo/bar', 1, 1.2, 'a string')
+  client.send Message.new('/foo/bar/zar', 1, 1.2, 'a string')
+  client.send Bundle.new(Time.now + 2, Message.new('/exit'))
+end

data/lib/ruby-osc.rb

@@ -4,6 +4,9 @@ require 'socket' # Strange side effects with eventmachine udp client and SuperCo
 require 'strscan'
 require 'thread'
 
+$:.unshift( File.join( File.dirname( __FILE__), '..', 'lib' ) )
+
+# encoding: UTF-8
 require 'ruby-osc/message'
 require 'ruby-osc/bundle'
 require 'ruby-osc/server'
@@ -11,24 +14,16 @@ require 'ruby-osc/client'
 require "ruby-osc/version"
 
 module OSC
-  Thread  = EM.reactor_running? ? nil : Thread.new { 
-    EM.run do 
-      EM.error_handler { |e| puts e }
-      EM.set_quantum 5 
-    end	
-  }
-  Thread.run if RUBY_VERSION.to_f >= 1.9
-    
   class DecodeError < StandardError; end
-  
+
   class Blob < String; end
-  
+
   module OSCArgument
     def to_osc_type
       raise NotImplementedError, "#to_osc_type method should be implemented for #{ self.class }"
     end
   end
-  
+
   def self.coerce_argument arg
     case arg
     when OSCArgument then arg.to_osc_type
@@ -36,21 +31,29 @@ module OSC
     when String, Float, Fixnum, Blob, String then arg # Pure osc 1.0 specification
     else raise(TypeError, "#{ arg.inspect } is not a valid Message argument") end
   end
-  
+
   def self.decode str #:nodoc:
     str.match(/^#bundle/) ? Bundle.decode(str) : Message.decode(str)
   end
-  
+
   def self.padding_size size
-    (4 - (size) % 4) % 4 
+    (4 - (size) % 4) % 4
+  end
+
+  def self.run
+    EM.run do
+      EM.error_handler { |e| puts e }
+      EM.set_quantum 5
+      yield
+    end
   end
-  
+
   def self.encoding_directive obj #:nodoc:
     case obj
     when Float  then [obj, 'f', 'g']
     when Fixnum then [obj, 'i', 'N']
-    when Blob   then [[obj.size, obj], 'b', "Na*x#{ padding_size obj.size + 4 }"]
-    when String then [obj, 's', "Z*x#{ padding_size obj.size + 1 }"]
+    when Blob   then [[obj.bytesize, obj], 'b', "Na*x#{ padding_size obj.bytesize + 4 }"]
+    when String then [obj, 's', "Z*x#{ padding_size obj.bytesize + 1 }"]
     when Time
       t1, fr = (obj.to_f + 2208988800).divmod(1)
       t2 = (fr * (2**32)).to_i

data/lib/ruby-osc/bundle.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module OSC
   class Bundle < Array
     attr_accessor :timetag
@@ -15,7 +16,7 @@ module OSC
         time, tag, dir = OSC.encoding_directive @timetag
         time.pack dir
       else "\000\000\000\000\000\000\000\001" end
-        
+
       "#bundle\000#{ timetag }" + collect do |x|
         x = x.encode
         [x.size].pack('N') + x
@@ -25,26 +26,26 @@ module OSC
     def self.decode string
       string.sub! /^#bundle\000/, ''
       t1, t2, content_str = string.unpack('N2a*')
-      
+
       timetag   = t1 == 0 && t2 == 1 ? nil : Time.at(t1 + t2 / (2**32.0) - 2_208_988_800)
       scanner   = StringScanner.new content_str
       args      = []
-      
+
       until scanner.eos?
         size    = scanner.scan(/.{4}/).unpack('N').first
         arg_str = scanner.scan(/.{#{ size }}/nm) rescue raise(DecodeError, "An error occured while trying to decode bad formatted osc bundle")
         args   << OSC.decode(arg_str)
       end
-      
+
       new timetag, *args
     end
-    
+
     def == other
       self.class == other.class and self.timetag == other.timetag and self.to_a == other.to_a
     end
 
     def to_a; Array.new self; end
-    
+
     def to_s
       "OSC::Bundle(#{ self.join(', ') })"
     end

data/lib/ruby-osc/client.rb

@@ -1,12 +1,17 @@
+# encoding: UTF-8
+require 'socket' # Strange side effects with eventmachine udp client and SuperCollider
+
 # From the Funaba osc gem:
 module OSC
   class Client
- 
-    def initialize port, host = 'localhost'
+
+    def initialize port, host = '127.0.0.1'
       @socket = UDPSocket.new
+      @socket = UDPSocket.open
+      @socket.setsockopt(Socket::SOL_SOCKET, Socket::SO_BROADCAST, true)
       @socket.connect host, port
     end
- 
+
     def send mesg, *args
       @socket.send mesg.encode, 0
     end
@@ -15,25 +20,25 @@ end
 
 # module OSC
 #   class Client
-#     
+#
 #     def initialize port, address = 'localhost'
 #       @address, @port = address, port
 #       run
 #     end
-#     
+#
 #     def run
 #       @connection = EventMachine.open_datagram_socket 'localhost', 0, Connection
 #     end
-#  
+#
 #     def stop
 #       @connection.close_connection if @connection
 #     end
-#  
+#
 #     def send item
-#       @connection.send_datagram item.encode, @address, @port 
+#       @connection.send_datagram item.encode, @address, @port
 #     end
-#     
+#
 #     class Connection < EventMachine::Connection #:nodoc:
 #     end
 #   end
-# end
+# end

data/lib/ruby-osc/message.rb

@@ -31,36 +31,51 @@ module OSC
 
     def self.decode string
       scanner        = StringScanner.new string
-      address, tags  = (1..2).map do
-        string       = scanner.scan(/[^\000]+\000/)
-        scanner.pos += OSC.padding_size(string.size)
-        string.chomp("\000")
-      end
+      msg            = self.decode_message scanner
+      raise DecodeError if not scanner.eos?
+      return msg
+    end
 
-      args = []
-      tags.scan(/\w/) do |tag|
-        case tag
-        when 'i'
-          int = scanner.scan(/.{4}/nm).unpack('N').first
-          args.push( int > (2**31-1) ? int - 2**32 : int )
-        when 'f'
-          args.push scanner.scan(/.{4}/nm).unpack('g').first
-        when 's'
-          str = scanner.scan(/[^\000]+\000/)
-          scanner.pos += OSC.padding_size(str.size)
-          args.push str.chomp("\000")
-        when 'b'
-          size = scanner.scan(/.{4}/).unpack('N').first
-          str  = scanner.scan(/.{#{ size }}/nm)
-          scanner.pos += OSC.padding_size(size + 4)
-          args.push Blob.new(str)
-        else
-          raise DecodeError, "#{ t } is not a known tag"
+    def self.decode_message scanner
+      pos = scanner.pos
+      begin
+        address, tags  = (1..2).map do
+          string       = scanner.scan(/[^\000]+\000/)
+          raise DecodeError, "no address or tags" if string.nil?
+          scanner.pos += OSC.padding_size(string.bytesize)
+          string.chomp("\000")
         end
-      end
 
-      new address, *args
+        args = []
+        tags.scan(/\w/) do |tag|
+          case tag
+          when 'i'
+            int = scanner.scan(/.{4}/nm).unpack('N').first
+            args.push( int > (2**31-1) ? int - 2**32 : int )
+          when 'f'
+            args.push scanner.scan(/.{4}/nm).unpack('g').first
+          when 's'
+            str = scanner.scan(/[^\000]+\000/)
+            scanner.pos += OSC.padding_size(str.size)
+            str = str.respond_to?(:force_encoding) ? str.force_encoding('UTF-8') : str
+            args.push str.chomp("\000")
+          when 'b'
+            size = scanner.scan(/.{4}/).unpack('N').first
+            str  = scanner.scan(/.{#{ size }}/nm)
+            scanner.pos += OSC.padding_size(size + 4)
+            args.push Blob.new(str)
+          else
+            raise DecodeError, "#{ tag } is not a known tag"
+          end
+        end
+        new address, *args
+      end
+    rescue DecodeError => e
+      scanner.pos = pos
+      raise e
+    rescue => e
+      scanner.pos = pos
+      raise DecodeError, e
     end
-
   end
 end

data/lib/ruby-osc/server.rb

@@ -1,9 +1,8 @@
-
 module OSC
   class Server
     attr_accessor :port, :address
 
-    def initialize port, address = 'localhost'
+    def initialize port, address = '127.0.0.1'
       @port, @address   = port, address
       @queue, @patterns = [], []
       @mutex = Mutex.new
@@ -37,7 +36,7 @@ module OSC
       when Message
         dispatch decoded
       end
-      rescue => e 
+      rescue => e
         warn "Bad data received: #{ e }"
     end
 
@@ -55,7 +54,7 @@ module OSC
     end
 
     def dispatch message
-      @patterns.each do |pat, block| 
+      @patterns.each do |pat, block|
         block.call(*message.to_a) if pat === message.address
       end
     end
@@ -66,7 +65,7 @@ module OSC
       end
 
       def receive_data data
-        @server.receive(data) 
+        @server.receive(data)
       end
     end
   end

data/lib/ruby-osc/version.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module Osc
-  VERSION = "0.3.4"
+  VERSION = "0.4.1"
 end

data/spec/bundle_spec.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require "#{ File.dirname __FILE__ }/spec_helper"
 
 describe Bundle do
@@ -12,11 +13,11 @@ describe Bundle do
   it "should rise TypeError if passing passing incorrect type" do
     lambda { Bundle.new Time.now, 1 }.should raise_error(TypeError)
   end
-  
+
   it "should raise TypeError if timetag is not Time" do
     lambda { Bundle.new 1 }.should raise_error(TypeError)
   end
-  
+
   it "should accept nil for timetag" do
     Bundle.new nil
   end
@@ -38,15 +39,15 @@ describe Bundle do
       Bundle.decode(@expected).should == @bundle
     end
   end
-  
+
   describe 'Empty bundle nil timetag' do
     before do
       @bundle   = Bundle.new
-      @expected = "#bundle\000\000\000\000\000\000\000\000\001"
+      @expected = "#bundle\000\000\000\000\000\000\000\000\001".force_encoding("binary")
     end
     it_should_behave_like 'Encodable Bundle'
   end
-  
+
   describe 'Empty bundle with timetag' do
     before do
       @bundle   = Bundle.new Time.at(1251420949.16959)
@@ -54,7 +55,7 @@ describe Bundle do
     end
     it_should_behave_like 'Encodable Bundle'
   end
-  
+
   describe 'Bundle with timetag and messages' do
     before do
       @bundle   = Bundle.new Time.at(946702800), Message.new('/bar/foo', 4, 3, 2, 1), Message.new('/foo/bar', 1, 2, 3, 4)
@@ -62,15 +63,15 @@ describe Bundle do
     end
     it_should_behave_like 'Encodable Bundle'
   end
-  
+
   describe 'Nested bundles' do
     before do
       @bundle   = Bundle.new( nil, Bundle.new(nil, Message.new('/a')), Message.new('/b') )
-      @expected = "#bundle\000\000\000\000\000\000\000\000\001\000\000\000\034#bundle\000\000\000\000\000\000\000\000\001\000\000\000\b/a\000\000,\000\000\000\000\000\000\b/b\000\000,\000\000\000"
+      @expected = "#bundle\000\000\000\000\000\000\000\000\001\000\000\000\034#bundle\000\000\000\000\000\000\000\000\001\000\000\000\b/a\000\000,\000\000\000\000\000\000\b/b\000\000,\000\000\000".force_encoding("binary")
     end
     it_should_behave_like 'Encodable Bundle'
   end
-  
+
   describe 'Complex blob' do
     before do
       data      = [ 83, 67, 103, 102, 0, 0, 0, 1, 0, 1, 4, 104, 111, 108, 97, 0, 2, 67, -36, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 6, 83, 105, 110, 79, 115, 99, 2, 0, 2, 0, 1, 0, 0, -1, -1, 0, 0, -1, -1, 0, 1, 2, 0, 0 ].pack('C*')
@@ -79,7 +80,7 @@ describe Bundle do
     end
     it_should_behave_like 'Encodable Bundle'
   end
-  
+
   describe 'Complex blob 2' do
     before do
       data      = [ 83, 67, 103, 102, 0, 0, 0, 1, 0, 1, 2, 97, 109, 0, 7, 0, 0, 0, 0, 63, 0, 0, 0, 63, -128, 0, 0, 64, 0, 0, 0, -62, -58, 0, 0, 64, -96, 0, 0, -64, -128, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 103, 97, 116, 101, 0, 0, 9, 112, 111, 114, 116, 97, 100, 111, 114, 97, 0, 1, 10, 109, 111, 100, 117, 108, 97, 100, 111, 114, 97, 0, 2, 3, 97, 109, 112, 0, 3, 0, 8, 7, 67, 111, 110, 116, 114, 111, 108, 1, 0, 0, 0, 4, 0, 0, 1, 1, 1, 1, 6, 83, 105, 110, 79, 115, 99, 1, 0, 2, 0, 1, 0, 0, 0, 0, 0, 2, -1, -1, 0, 0, 1, 6, 77, 117, 108, 65, 100, 100, 1, 0, 3, 0, 1, 0, 0, 0, 1, 0, 0, -1, -1, 0, 1, -1, -1, 0, 1, 1, 6, 83, 105, 110, 79, 115, 99, 2, 0, 2, 0, 1, 0, 0, 0, 0, 0, 1, -1, -1, 0, 0, 2, 12, 66, 105, 110, 97, 114, 121, 79, 112, 85, 71, 101, 110, 2, 0, 2, 0, 1, 0, 2, 0, 3, 0, 0, 0, 2, 0, 0, 2, 6, 69, 110, 118, 71, 101, 110, 1, 0, 17, 0, 1, 0, 0, 0, 0, 0, 0, -1, -1, 0, 2, -1, -1, 0, 0, -1, -1, 0, 2, -1, -1, 0, 3, -1, -1, 0, 0, -1, -1, 0, 3, -1, -1, 0, 2, -1, -1, 0, 4, -1, -1, 0, 2, -1, -1, 0, 3, -1, -1, 0, 5, -1, -1, 0, 6, -1, -1, 0, 0, -1, -1, 0, 3, -1, -1, 0, 5, -1, -1, 0, 6, 1, 12, 66, 105, 110, 97, 114, 121, 79, 112, 85, 71, 101, 110, 2, 0, 2, 0, 1, 0, 2, 0, 4, 0, 0, 0, 5, 0, 0, 2, 3, 79, 117, 116, 2, 0, 2, 0, 0, 0, 0, -1, -1, 0, 0, 0, 6, 0, 0, 0, 0 ].pack('C*')
@@ -88,9 +89,9 @@ describe Bundle do
       end
     it_should_behave_like 'Encodable Bundle'
   end
-  
+
   it 'Should raise OSC::DecodeError with bad encoded bundle' do
-    bad_data = "#bundle\000\000\000\000\000\000\000\000\001\000\000\000\034#bundle\000\000\000\000\000\001\000\000\000\b/a\000\000,\000\000\000\000\000\000\b/b\000\000,\000\000\000"
+    bad_data = "#bundle\000\000\000\000\000\000\000\000\001\000\000\000\034#bundle\000\000\000\000\000\001\000\000\000\b/a\000\000,\000\000\000\000\000\000\b/b\000\000,\000\000\000".force_encoding("binary")
     lambda { Bundle.decode bad_data }.should raise_error(DecodeError)
   end
 end

data/spec/message_spec.rb

@@ -1,56 +1,59 @@
+# encoding: UTF-8
 require "#{ File.dirname __FILE__ }/spec_helper"
 
 describe Message do
-  
   it "should raise TypeError if passing wrong type" do
-    lambda { Message.new('address', Class) }.should raise_error(TypeError)
+    expect { Message.new('address', Class) }.to raise_error(TypeError)
   end
-  
+
   it "should raise TypeError if not passing a string for address" do
-    lambda { Message.new(OSC) }.should raise_error(TypeError)
+    expect { Message.new(OSC) }.to raise_error(TypeError)
   end
-  
+
   it "should have address" do
     Message.new('/foo/bar').address.should == '/foo/bar'
   end
+
+  it "should accept utf8 address" do
+    Message.new('/foo/bär').address.should == '/foo/bär'
+  end
   
   it "should collect args" do
     Message.new('/foo/bar', 1, 2, 3, 4).args.size.should == 4
   end
-  
+
   it "should accept integer" do
     Message.new('/foo/bar', 1).args.should == [1]
   end
-  
+
   it "should should accept float" do
     Message.new('/foo/bar', 1.0).args.should == [1.0]
   end
-  
+
   it "should accept string" do
     Message.new('/foo/bar', 'string').args.should == ['string']
   end
-  
+
   it "should accept Blob" do
     Message.new('/foo/bar', Blob.new('blob')).args.should == [Blob.new('blob')]
   end
-  
+
   it "should convert to array" do
     Message.new('/foo/bar', 1, 2, 3, 4).to_a.should == ['/foo/bar', 1, 2, 3, 4]
   end
-  
+
   describe 'Custom argument coercion' do
-    
     before do
       TrueClass.send(:include, OSCArgument)
       TrueClass.send( :define_method, :to_osc_type){ 1 }
       FalseClass.send(:include, OSCArgument)
       FalseClass.send( :define_method, :to_osc_type){ 0 }
       Hash.send(:include, OSCArgument)
-      Hash.send( :define_method, :to_osc_type) do 
+      Hash.send( :define_method, :to_osc_type) do
         self.to_a.collect{ |pair| pair.collect{ |a| OSC.coerce_argument a } }
       end
     end
-    
+
     it "should accept true" do
       Message.new('/foo/bar', true).args.should == [1]
     end
@@ -63,50 +66,50 @@ describe Message do
       Message.new('/foo/bar', {:a => :b}).args.should == ["a", "b"]
     end
   end
-  
+
   describe 'Encode/decode' do
     shared_examples_for 'Encodable Message' do
       it "should encode" do
         @message.encode.should == @expected
       end
-      
+
       it "should decode to message" do
         Message.decode(@expected).should be_a(Message)
       end
-      
+
       it "should decode address" do
         Message.decode(@expected).address.should == @message.address
       end
-      
+
       it "should actually decode" do
         Message.decode(@expected).to_a.inspect.should == @message.to_a.inspect.to_s # Problem with float comparing
       end
     end
-    
+
     describe 'Address' do
       before do
         @message  = Message.new('/foo/bar/long/very/long/long/long/address')
-        @expected = "/foo/bar/long/very/long/long/long/address\000\000\000,\000\000\000"
+        @expected = "/foo/bar/long/very/long/long/long/address\000\000\000,\000\000\000".force_encoding("binary")
       end
       it_should_behave_like 'Encodable Message'
     end
-    
+
     describe 'Integer' do
       before do
         @message  = Message.new('/foo/barz', 2)
-        @expected = "/foo/barz\000\000\000,i\000\000\000\000\000\002"
+        @expected = "/foo/barz\000\000\000,i\000\000\000\000\000\002".force_encoding("binary")
       end
       it_should_behave_like 'Encodable Message'
     end
-    
+
     describe 'Negative Integer' do
       before do
         @message  = Message.new('/foo/barz', -2)
-        @expected = "/foo/barz\000\000\000,i\000\000\377\377\377\376"
+        @expected = "/foo/barz\000\000\000,i\000\000\377\377\377\376".force_encoding("binary")
       end
       it_should_behave_like 'Encodable Message'
     end
-    
+
     describe 'Float' do
       before do
         @message  = Message.new('/foo/bar', 1.100000023841858)
@@ -114,7 +117,7 @@ describe Message do
       end
       it_should_behave_like 'Encodable Message'
     end
-    
+
     describe 'Negative Float' do
       before do
         @message  = Message.new('/foo/bar', -1.100000023841858)
@@ -122,11 +125,19 @@ describe Message do
       end
       it_should_behave_like 'Encodable Message'
     end
-    
+
     describe 'String' do
       before do
         @message  = Message.new('/foo/bar', 'a string to encode')
-        @expected = "/foo/bar\000\000\000\000,s\000\000a string to encode\000\000"
+        @expected = "/foo/bar\000\000\000\000,s\000\000a string to encode\000\000".force_encoding("binary")
+      end
+      it_should_behave_like 'Encodable Message'
+    end
+
+    describe 'UTF8 String' do
+      before do
+        @message  = Message.new('/foo/bar', 'a string to äncode')
+        @expected = "/foo/bar\000\000\000\000,s\000\000a string to äncode\000".force_encoding("binary")
       end
       it_should_behave_like 'Encodable Message'
     end
@@ -138,27 +149,35 @@ describe Message do
       end
       it_should_behave_like 'Encodable Message'
     end
-    
+
     describe 'Blob' do
       before do
         @message  = Message.new('/foo/bar', Blob.new('test blob'))
-        @expected = "/foo/bar\000\000\000\000,b\000\000\000\000\000\ttest blob\000\000\000"
+        @expected = "/foo/bar\000\000\000\000,b\000\000\000\000\000\ttest blob\000\000\000".force_encoding("binary")
       end
       it_should_behave_like 'Encodable Message'
-      
+
       it "should raise if size doesn't correspond and return empty message" do
         lambda do
-          Message.decode("/foo/bar\000\000\000\000,b\000\000\000\000\000\020test blob\000\000\000")
+          Message.decode("/foo/bar\000\000\000\000,b\000\000\000\000\000\020test blob\000\000\000".force_encoding("binary"))
         end.should raise_error
       end
     end
-    
+
     describe 'Lots of ints' do
       before do
         @message  = Message.new('/bar/foo', 4, 3, 2, 1)
-        @expected = "/bar/foo\000\000\000\000,iiii\000\000\000\000\000\000\004\000\000\000\003\000\000\000\002\000\000\000\001" 
+        @expected = "/bar/foo\000\000\000\000,iiii\000\000\000\000\000\000\004\000\000\000\003\000\000\000\002\000\000\000\001".force_encoding("binary")
       end
       it_should_behave_like 'Encodable Message'
     end
-  end    
+
+    describe 'Invalid message' do
+      it "should raise if invalid tag is used" do
+        lambda do
+          Message.decode("/foo/bar\000\000\000\000,k\000\000\000\000\000\020test blob\000\000\000".force_encoding("binary"))
+        end.should raise_exception(DecodeError)
+      end
+    end
+  end
 end

data/spec/server_spec.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require "#{ File.dirname __FILE__ }/spec_helper"
 
 describe Server do

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
-require 'rubygems'
+# encoding: UTF-8
 require 'rspec'
 
-$:.unshift( File.join( File.dirname( __FILE__), '..', 'lib' ) ) 
+$:.unshift( File.join( File.dirname( __FILE__), '..', 'lib' ) )
 
 require 'ruby-osc'
 include OSC

data/streamscanner_benchmark.rb

@@ -0,0 +1,37 @@
+require 'benchmark'
+
+$:.unshift( File.join( File.dirname( __FILE__), 'lib' ) )
+
+require 'ruby-osc/streamscanner'
+
+@ss = OSC::StreamScanner.new
+
+count = 10_000
+
+Benchmark.bm(23) do |x|
+  x.report("add new string") do
+    count.times do
+      @ss << "/bar/foo\000\000\000\000,iiii\000\000\000\000\000\000\004\000\000\000\003\000\000\000\002\000\000\000\001".force_encoding("binary")
+    end
+  end
+
+  x.report("parse string") do
+    count.times do
+      @ss.tryparse
+    end
+  end
+
+
+  x.report("try parse each message") do
+    count.times do
+      OSC::Message.decode("/bar/foo\000\000\000\000,iiii\000\000\000\000\000\000\004\000\000\000\003\000\000\000\002\000\000\000\001".force_encoding("binary"))
+    end
+  end
+
+  x.report("parse failure") do
+    count.times do
+      @ss.tryparse rescue nil
+    end
+  end
+end
+

metadata

@@ -1,50 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: ruby-osc
 version: !ruby/object:Gem::Version
-  version: 0.3.4
-  prerelease: 
+  version: 0.4.1
 platform: ruby
 authors:
 - Macario
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-03 00:00:00.000000000 -05:00
-default_executable: 
+date: 2013-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2161094580 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2161094580
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2161093920 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *2161093920
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2161093260 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.12.8
   type: :runtime
   prerelease: false
-  version_requirements: *2161093260
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.12.8
 description: Concise OSC Ruby implementation
 email:
 - macarui@gmail.com
@@ -69,30 +76,29 @@ files:
 - spec/message_spec.rb
 - spec/server_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
+- streamscanner_benchmark.rb
 homepage: http://makarius.me
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: ruby-osc
-rubygems_version: 1.6.2
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Concise OSC Ruby implementation
 test_files:
 - spec/bundle_spec.rb