fixed for 1.9.3 and eventmachine 0.12.10

Author: macario

README.rdoc

@@ -13,32 +13,30 @@ 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
+    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:
 

examples/localtest.rb

@@ -1,8 +1,9 @@
+$:.unshift( File.join( File.dirname( __FILE__), '..', 'lib' ) ) 
 require 'ruby-osc'
 
-include  OSC
+include OSC
 
-EventMachine.run do
+OSC.run do
   server = Server.new 9090
   client = Client.new 9090
 
@@ -26,5 +27,3 @@
   client.send Message.new('/foo/bar/zar', 1, 1.2, 'a string')
   client.send Bundle.new(Time.now + 2, Message.new('/exit'))
 end
-
-OSC::Thread.join

lib/ruby-osc.rb

@@ -12,14 +12,6 @@
 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
@@ -45,6 +37,14 @@ def self.decode str #:nodoc:
   def self.padding_size size
     (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

lib/ruby-osc/version.rb

@@ -1,3 +1,3 @@
 module Osc
-  VERSION = "0.3.4"
+  VERSION = "0.31.0"
 end