aberant-osc-ruby 0.1.6 → 0.2.0

data/README.rdoc

@@ -2,16 +2,71 @@
 
 http://opensoundcontrol.org/
 
-== GOAL
+== DESCRIPTION
 
-I've used the OSC gem originally created by Tadayoshi Funaba and wanted to update it for ruby 1.9 compatibility.  I'm also writing rspec tests for this library to allow others to more easily understand/update the code.  It's getting closer to awesome every day...
+I've used the OSC gem originally created by Tadayoshi Funaba and wanted to update it for ruby 1.9 compatibility.  I'm also writing rspec tests for this library to allow others to more easily understand/update the code.  
 
-Guaranteed to be compatible with tuio-ruby
+Compatible with ruby 1.8, 1.9, and jruby
 
+== INSTALL
+
+  sudo gem install aberant-osc-ruby
+  
+for the EMServer, you will need EventMachine
+
+  sudo gem install eventmachine
+
+== EVENT MACHINE EXAMPLE
+  
+  # compatible with ruby 1.8, 1.9, and jruby
+  require 'rubygems'
+  require 'osc-ruby'
+  require 'osc-ruby/em_server'
+  
+  @server = OSC::EMServer.new( 3333 )
+  @client = OSC::Client.new( 'localhost', 3333 )
+
+  @server.add_method '/greeting' do | message |
+    puts message.to_a
+  end
+
+  Thread.new do
+    @server.run
+  end
+
+  @client.send( OSC::Message.new( "/greeting" , "hullo!" ))
+
+  sleep( 3 )
+  
+== CLASSIC EXAMPLE
+
+  # compatible with ruby 1.8
+  require 'rubygems'
+  require 'osc-ruby'
+
+
+  @server = OSC::Server.new( 3333 )
+  @client = OSC::Client.new( 'localhost', 3333 )
+
+  @server.add_method '/greeting' do | message |
+    puts message.inspect
+  end
+
+  Thread.new do
+    @server.run
+  end
+
+  @client.send( OSC::Message.new( "/greeting", "hullo!" ))
+
+  sleep( 3 )
+  
+  
 == CREDITS
 
 Originally created by...
+
 Tadayoshi Funaba
+
 http://www.funaba.org/en/
 
 thx also to Toby Tripp and Obtiva

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
-:minor: 1
-:patch: 6
+:minor: 2
+:patch: 0

data/lib/osc-ruby.rb

@@ -4,7 +4,6 @@
 require 'forwardable'
 require 'socket'
 require 'thread'
-require 'monitor'
 
 
 $:.unshift( File.dirname( __FILE__ ) )

data/lib/osc-ruby/bundle.rb

@@ -1,19 +1,9 @@
+require File.join( File.dirname( __FILE__ ), "packet" )
+
 module OSC
   class Bundle < Packet
-    extend Forwardable
-    include Enumerable
-    
     attr_accessor :timetag
     
-    undef_method :zip
-    
-    # de = (Array.instance_methods - self.instance_methods)
-    # de -= %w(assoc flatten flatten! pack rassoc transpose)
-    # de += %w(include? sort)
-
-    # def_delegators(:@args, *de)
-
-    
     def initialize(timetag=nil, *args)
       @timetag = timetag
       @args = args

data/lib/osc-ruby/em_server.rb

@@ -0,0 +1,68 @@
+require 'rubygems'
+require 'eventmachine'
+require File.join( File.dirname( __FILE__), '..', 'osc-ruby')
+
+
+module OSC
+  Channel = EM::Channel.new
+  
+  class Connection < EventMachine::Connection 
+
+    def receive_data data    
+     Channel << OSC::OSCPacket.messages_from_network( data )
+    end
+  end
+
+
+  class EMServer
+  
+    def initialize( port = 3333 )
+      @port = port
+      setup_dispatcher
+      @tuples = []
+    end
+  
+    def run
+      EM::run { EM::open_datagram_socket "localhost",  @port, Connection }
+    end
+    
+    def add_method(address_pattern, &proc)
+      matcher = AddressPattern.new( address_pattern )
+    
+      @tuples << [matcher, proc]
+    end  
+    
+  private
+    def setup_dispatcher
+      Channel.subscribe do  |messages|
+        messages.each do |message|         
+          diff =  ( message.time || 0 ) - Time.now.to_ntp 
+
+          if diff <=  0 
+            sendmesg( message )
+          else  
+            EM.defer  do   
+              sleep(  diff  )  
+              sendmesg( message )
+            end  
+          end  
+        end  
+      end
+    end
+  
+    def sendmesg(mesg)
+      @tuples.each do |matcher, obj|
+        if matcher.match?( mesg.address )
+          obj.call( mesg )
+        end
+      end
+    end
+  
+  end
+end
+
+
+
+
+
+

data/lib/osc-ruby/message.rb

@@ -1,18 +1,10 @@
+require File.join( File.dirname( __FILE__ ), "packet" )
+
 module OSC
   class Message < Packet
-    extend Forwardable
-    # include Enumerable
-
     attr_accessor :address
     attr_accessor :time 
-    
-    # undef_method :zip
 
-    # de = (Array.instance_methods - self.instance_methods)
-    # de -= %w(assoc flatten flatten! pack rassoc transpose)
-    # de += %w(include? sort)
-
-    # def_delegators(:@args, *de)
     
     def self.new_with_time( address, time, tags=nil, *args )
       message = new( address, tags, *args )
@@ -20,29 +12,17 @@ module OSC
       message
     end
     
-    def initialize(address, tags=nil, *args)
+    def initialize(address, *args)
       @address = address
       @args = []
       
-      
       args.each_with_index do |arg, i|
-	      if tags && tags[i]
-	        case tags[i]
-	          when ?i; @args << OSCInt32.new(arg)
-	          when ?f; @args << OSCFloat32.new(arg)
-	          when ?s; @args << OSCString.new(arg)
-	          when ?b; @args << OSCBlob.new(arg)
-	          when ?*; @args << arg
-	          else; raise ArgumentError, 'unknown type'
-	        end
-	      else
-	        case arg
-	          when Integer;     @args << OSCInt32.new(arg)
-	          when Float;       @args << OSCFloat32.new(arg)
-	          when String;      @args << OSCString.new(arg)
-	          when OSCArgument; @args << arg
-	        end
-	      end
+        case arg
+          when Integer;     @args << OSCInt32.new(arg)
+          when Float;       @args << OSCFloat32.new(arg)
+          when String;      @args << OSCString.new(arg)
+          when OSCArgument; @args << arg
+        end
       end
     end
 

data/lib/osc-ruby/network_packet.rb

@@ -1,6 +1,6 @@
 module OSC
   class NetworkPacket
-    def initialize(str) 
+    def initialize(str)       
       @str, @index = str, 0 
     end
     

data/lib/osc-ruby/osc_packet.rb

@@ -3,6 +3,7 @@ require 'ostruct'
 
 module OSC
   class OSCPacket
+        
     def self.messages_from_network( string )
       messages = []
       osc = new( string )
@@ -51,10 +52,9 @@ module OSC
     
     def get_string
       result = ''
-      until (c = @packet.getc) == 0
+      until (c = @packet.getc) == string_delemeter
 	      result << c
       end
-      
       @packet.skip_padding
       result
     end
@@ -109,5 +109,10 @@ module OSC
     def bundle?
       !(@packet.to_s =~ /\A\#bundle/).nil?
     end
+    
+    def string_delemeter
+      # ruby 1.9 has multicharacter support
+      RUBY_VERSION.include?( '1.9' ) ? "\x00" : 0
+    end
   end
 end

data/lib/osc-ruby/osc_types.rb

@@ -1,4 +1,4 @@
-require 'osc-ruby/osc_argument'
+require File.join( File.dirname( __FILE__ ), "osc_argument" )
 
  module OSC
   class OSCInt32 < OSCArgument

data/lib/osc-ruby/server.rb

@@ -55,16 +55,19 @@ private
     def dispatcher
       loop do
 	      mesg = @queue.pop
-	      
         dispatch_message( mesg )
       end
     end
 
     def detector
       loop do
-	      pa = @socket.recv(16384)
+	      pa, network = @socket.recvfrom(16384)
 	      begin
-	        OSCPacket.messages_from_network(pa).each{|x| @queue.push(x)}
+	        
+	        OSCPacket.messages_from_network(pa).each do |x| 
+	          @queue.push(x)
+          end
+          
 	      rescue EOFError
 	      end
       end

data/spec/builders/message_builder.rb

@@ -37,7 +37,7 @@ class MessageBuilder
   end
   
   def build
-    message = OSC::Message.new( @address , @tags.join, *@values)
+    message = OSC::Message.new( @address , *@values)
     message.time = @time
     message
   end

data/spec/unit/message_bundle_spec.rb

@@ -2,5 +2,5 @@ require File.join( File.dirname(__FILE__) , '..', 'spec_helper' )
 
 
 describe OSC::Bundle do
-  
+
 end

data/spec/unit/message_spec.rb

@@ -26,7 +26,7 @@ describe OSC::Message do
   end
   
   it "should have accept int arguments" do
-    m = OSC::Message.new( "/hi", "i", 42 )
+    m = OSC::Message.new( "/hi", 42 )
     m.to_a.should == [42]
     m.tags.should == "i"
   end

data/spec/unit/osc_types_spec.rb

@@ -4,7 +4,6 @@ describe OSC::OSCInt32 do
   it "should not blow up" do
     OSC::OSCInt32.new 1
   end
-  
 end
 
 describe OSC::OSCFloat32 do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aberant-osc-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors: 
 - aberant
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-29 00:00:00 -07:00
+date: 2009-09-01 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -32,6 +32,7 @@ files:
 - lib/osc-ruby/core_ext/numeric.rb
 - lib/osc-ruby/core_ext/object.rb
 - lib/osc-ruby/core_ext/time.rb
+- lib/osc-ruby/em_server.rb
 - lib/osc-ruby/message.rb
 - lib/osc-ruby/network_packet.rb
 - lib/osc-ruby/osc_argument.rb