osc-ruby 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: a91d90ff91f39a91cd81c950008d4c127798e9c800fccfe7f5df711696167e35
-  data.tar.gz: 548c9390af5f763913458ada02e0a71f7321720a65298cf125ac17a025832f4a
+SHA1:
+  metadata.gz: 6c72442242b273fbc11e6cb48c2c4b4b906a404f
+  data.tar.gz: 43b65407de6f406116439cd01439a3b14b0c3d2a
 SHA512:
-  metadata.gz: ccbfa77d5d55529e12cb96da0a2796309c58184755e874222d15192546dbee4d4b1db38ba5578ada33685a2e57fc88e58b046d3bc5bbc805a6f948b59a7adc77
-  data.tar.gz: 14438d52dd04715cba9ea19ca4c974611444a81742b6dfcbebb8ebcb6d073a14814aac7acc2c25a27779175016f07281dd4b6a0485085b7797344cdb6fdf6ca0
+  metadata.gz: 5fc3f71473e08423d0fff5cf1baad0cf18b8b7c447946e23448e0a68b3b46b767917c1df9fd203820b846b287b8f2ff70084a8b50e25c022544c835be21c2479
+  data.tar.gz: 050b7b71dbda1a73f3762d5f310473db311e0862fc808bf2643d209679c9caa9f5f497810f54ce86aca1d5e614a71490f781f343a350e5acda85bfe4b973d9ce

data/VERSION

@@ -1 +1 @@
-1.1.3
+1.1.4

data/lib/osc-ruby.rb

@@ -17,5 +17,3 @@ require 'osc-ruby/address_pattern'
 require 'osc-ruby/server'
 require 'osc-ruby/client'
 require 'osc-ruby/broadcast_client'
-
-

data/lib/osc-ruby/address_pattern.rb

@@ -1,55 +1,57 @@
 module OSC
   class AddressPattern
-    def initialize( pattern )
+    def initialize(pattern)
       @pattern = pattern
 
       generate_regex_from_pattern
     end
 
-    def match?( address )
-      !!(@re.nil? || @re.match( address ))
+    def match?(address)
+      !!(@re.nil? || @re.match(address))
     end
 
-private
+    private
+
     def generate_regex_from_pattern
       case @pattern
-        when NIL; @re = @pattern
-        when Regexp; @re = @pattern
-        when String
-
-          # i'm unsure what this does
-          # @pattern.gsub!(/[.^(|)]/, '\\1')
+      when nil
+        @re = @pattern
+      when Regexp
+        @re = @pattern
+      when String
+        # i'm unsure what this does
+        # @pattern.gsub!(/[.^(|)]/, '\\1')
 
-          # handles osc single char wildcard matching
-          @pattern.gsub!(/\?/, '[^/]')
+        # handles osc single char wildcard matching
+        @pattern.gsub!(/\?/, '[^/]')
 
-          # handles ** - used in creating osc routers
-          # TODO: turns out the OSC 1.1 spec says that we shoudl use "//" 
-          # this will be implemented in the next major release of this gem
-          #@pattern.gsub!(/\*\*/, '.*' )
+        # handles ** - used in creating osc routers
+        # TODO: turns out the OSC 1.1 spec says that we shoudl use "//"
+        # this will be implemented in the next major release of this gem
+        #@pattern.gsub!(/\*\*/, '.*' )
 
-          # handles osc * - 0 or more matching
-          @pattern.gsub!(/\*[^\*]/, '[^/]*')
+        # handles osc * - 0 or more matching
+        @pattern.gsub!(/\*[^\*]/, '[^/]*')
 
-          # handles [!] matching
-          @pattern.gsub!(/\[!/, '[^')
+        # handles [!] matching
+        @pattern.gsub!(/\[!/, '[^')
 
-          # handles {} matching
-          @pattern.gsub!(/\{/, '(')
-          @pattern.gsub!(/,/, '|')
-          @pattern.gsub!(/\}/, ')')
+        # handles {} matching
+        @pattern.gsub!(/\{/, '(')
+        @pattern.gsub!(/,/, '|')
+        @pattern.gsub!(/\}/, ')')
 
 
-          # keeps from matching before the begining of the pattern
-          @pattern.gsub!(/\A/, '\A')
+        # keeps from matching before the begining of the pattern
+        @pattern.gsub!(/\A/, '\A')
 
-          # keeps from matching beyond the end,
-          # eg. pattern /hi does not match /hidden
-          @pattern.gsub!(/\z/, '\z')
+        # keeps from matching beyond the end,
+        # eg. pattern /hi does not match /hidden
+        @pattern.gsub!(/\z/, '\z')
 
-          @re = Regexp.new(@pattern)
-        else
-          raise ArgumentError, 'invalid pattern'
+        @re = Regexp.new(@pattern)
+      else
+        raise(ArgumentError, 'invalid pattern')
       end
     end
   end

data/lib/osc-ruby/bundle.rb

@@ -15,26 +15,28 @@ module OSC
       end.join
     end
 
-    def to_a() @args.collect{|x| x.to_a} end
+    def to_a
+      @args.collect{|x| x.to_a}
+    end
 
-  private
+    private
 
     def encode_timetag(t)
       case t
-        when nil # immediately
-          t1 = 0
-          t2 = 1
-        when Numeric
-          t1, t2 = construct_timetag( t )
-        when Time
-          t1, t2 = construct_timetag( t.to_ntp )
-        else
-          raise ArgumentError, 'invalid time'
+      when nil # immediately
+        t1 = 0
+        t2 = 1
+      when Numeric
+        t1, t2 = construct_timetag(t)
+      when Time
+        t1, t2 = construct_timetag(t.to_ntp)
+      else
+        raise(ArgumentError, 'invalid time')
       end
       [t1, t2].pack('N2')
     end
 
-    def construct_timetag( time )
+    def construct_timetag(time)
       t1, fr = time.divmod(1)
       t2 = (fr * (2**32)).to_i
 

data/lib/osc-ruby/em_server.rb

@@ -4,42 +4,48 @@ module OSC
   Channel = EM::Channel.new
 
   class Connection < EventMachine::Connection
-    def receive_data data
-     ip_info = get_peername[2,6].unpack "nC4"  
-     Channel << OSC::OSCPacket.messages_from_network( data, ip_info )
+    def receive_data(data)
+      ip_info = get_peername[2,6].unpack("nC4")
+      Channel << OSC::OSCPacket.messages_from_network(data, ip_info)
     end
   end
 
   class EMServer
 
-    def initialize( port = 3333 )
+    def initialize(port = 3333)
       @port = port
       setup_dispatcher
       @tuples = []
     end
 
     def run
-      EM::run { EM::open_datagram_socket "0.0.0.0",  @port, Connection }
+      EM.error_handler{ |e|
+        Thread.main.raise e
+      }
+
+      EM.run do
+        EM::open_datagram_socket "0.0.0.0",  @port, Connection
+      end
     end
 
     def add_method(address_pattern, &proc)
-      matcher = AddressPattern.new( address_pattern )
+      matcher = AddressPattern.new(address_pattern)
 
       @tuples << [matcher, proc]
     end
 
-  private
+    private
     def setup_dispatcher
-      Channel.subscribe do  |messages|
+      Channel.subscribe do |messages|
         messages.each do |message|
-          diff =  ( message.time || 0 ) - Time.now.to_ntp
+          diff =  (message.time || 0) - Time.now.to_ntp
 
-          if diff <=  0
-            sendmesg( message )
+          if diff <= 0
+            sendmesg(message)
           else
-            EM.defer  do
-              sleep(  diff  )
-              sendmesg( message )
+            EM.defer do
+              sleep(diff)
+              sendmesg(message)
             end
           end
         end
@@ -48,16 +54,10 @@ module OSC
 
     def sendmesg(mesg)
       @tuples.each do |matcher, obj|
-        if matcher.match?( mesg.address )
-          obj.call( mesg )
+        if matcher.match?(mesg.address)
+          obj.call(mesg)
         end
       end
     end
   end
 end
-
-
-
-
-
-

data/lib/osc-ruby/message.rb

@@ -5,39 +5,42 @@ module OSC
     attr_accessor :ip_address
     attr_accessor :ip_port
 
-    def self.new_with_time( address, time, tags=nil, *args )
-      message = new( address, tags, *args )
+    def self.new_with_time(address, time, tags=nil, *args)
+      message = new(address, tags, *args)
       message.time = time
       message
     end
 
-    def initialize( address, *args )
+    def initialize(address, *args)
       @address = address
       @args = []
 
       args.each do |arg|
         case arg
-          when Integer;     @args << OSCInt32.new(arg)
-          when Float;       @args << OSCFloat32.new(arg)
-          when String;      @args << OSCString.new(arg)
-          when OSCArgument; @args << 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
 
-    def tags() @args.collect{|x| x.tag}.join end
+    def tags
+      @args.collect{|x| x.tag}.join
+    end
 
     def encode
-      s = OSCString.new( @address ).encode
-      s << OSCString.new( ',' + tags ).encode
+      s = OSCString.new(@address).encode
+      s << OSCString.new(',' + tags).encode
       s << @args.collect{|x| x.encode}.join
     end
 
-    def to_a() @args.collect{|x| x.val} end
+    def to_a
+      @args.collect{|x| x.val}
+    end
 
-    def ==( other )
-      @address == other.address &&
-      to_a == other.to_a
+    def ==(other)
+      @address == other.address && to_a == other.to_a
     end
   end
-end
+end

data/lib/osc-ruby/network_packet.rb

@@ -1,18 +1,19 @@
 module OSC
   class NetworkPacket
     def initialize(str)
-      @str, @index = str.force_encoding("BINARY"), 0
+      @str = str.force_encoding("BINARY")
+      @index = 0
     end
 
     def to_s
       @str
     end
 
-    def rem()
+    def rem
       @str.length - @index
     end
 
-    def eof? ()
+    def eof?
       rem <= 0
     end
 
@@ -20,22 +21,22 @@ module OSC
       @index += n
     end
 
-    def skip_padding()
+    def skip_padding
       skip((4 - (@index % 4)) % 4)
     end
 
     def getn(n)
-    	raise EOFError if rem < n
-    	s = @str[@index, n]
-    	skip(n)
-    	s
+      raise(EOFError) if rem < n
+      s = @str[@index, n]
+      skip(n)
+      s
     end
 
     def getc
-    	raise EOFError if rem < 1
-    	c = @str[@index]
-    	skip(1)
-    	c
+      raise(EOFError) if rem < 1
+      c = @str[@index]
+      skip(1)
+      c
     end
   end
-end
+end

data/lib/osc-ruby/osc_argument.rb

@@ -1,14 +1,24 @@
 module OSC
   class OSCArgument
-    def initialize(val) @val = val end
+    def initialize(val)
+      @val = val
+    end
 
     attr_accessor :val
 
-    def to_i() @val.to_i end
-    def to_f() @val.to_f end
-    def to_s() @val.to_s end
+    def to_i()
+      @val.to_i
+    end
+
+    def to_f()
+      @val.to_f
+    end
+
+    def to_s()
+      @val.to_s
+    end
 
-  private
+    private
     def padding(s)
       s + ("\000" * ((4 - (s.size % 4)) % 4))
     end

data/lib/osc-ruby/osc_packet.rb

@@ -1,21 +1,20 @@
-require File.join( File.dirname( __FILE__ ), 'network_packet')
+require File.join(File.dirname( __FILE__ ), 'network_packet')
 require 'ostruct'
 
 module OSC
   class UnknownType < StandardError; end
 
   class OSCPacket
-
-    def self.messages_from_network( string, ip_info=nil )
+    def self.messages_from_network(string, ip_info=nil)
       messages = []
-      osc = new( string )
+      osc = new(string)
 
       if osc.bundle?
-        osc.get_string #=> bundle
+        osc.get_string
         time = osc.get_timestamp
 
-        osc.get_bundle_messages.each do | message |
-          msg = decode_simple_message( time, OSCPacket.new( message ) )
+        osc.get_bundle_messages.each do |message|
+          msg = decode_simple_message(time, OSCPacket.new(message))
           if ip_info
             # Append info for the ip address
             msg.ip_port = ip_info.shift
@@ -25,11 +24,11 @@ module OSC
         end
 
       else
-        msg = decode_simple_message( time, osc )
+        msg = decode_simple_message(time, osc)
         if ip_info
           # Append info for the ip address
-            msg.ip_port = ip_info.shift
-            msg.ip_address = ip_info.join(".")
+          msg.ip_port = ip_info.shift
+          msg.ip_address = ip_info.join(".")
         end
         messages << msg
       end
@@ -37,22 +36,23 @@ module OSC
       return messages
     end
 
-    def self.decode_simple_message( time, osc_packet )
+    def self.decode_simple_message(time, osc_packet)
       address = osc_packet.get_string
       args = osc_packet.get_arguments
 
-      Message.new_with_time(address, time, nil, *args )
+      Message.new_with_time(address, time, nil, *args)
     end
 
-    def initialize( string )
-      @packet = NetworkPacket.new( string )
+    def initialize(string)
+      @packet = NetworkPacket.new(string)
 
-      @types = { "i" => lambda{  OSCInt32.new(    get_int32 ) },
-                 "f" => lambda{  OSCFloat32.new(  get_float32 ) },
-                 "d" => lambda{  OSCDouble64.new( get_double64 )},
-                 "s" => lambda{  OSCString.new(   get_string ) },
-                 "b" => lambda{  OSCBlob.new(     get_blob )}
-                }
+      @types = {
+       "i" => lambda{OSCInt32.new(get_int32)},
+       "f" => lambda{  OSCFloat32.new(get_float32)},
+       "d" => lambda{  OSCDouble64.new(get_double64)},
+       "s" => lambda{  OSCString.new(get_string)},
+       "b" => lambda{  OSCBlob.new(get_blob)}
+     }
     end
 
     def get_bundle_messages
@@ -67,8 +67,8 @@ module OSC
 
     def get_string
       result = ''
-      until (c = @packet.getc) == string_delemeter
-	      result << c
+      until ((c = @packet.getc) == string_delemeter)
+        result << c
       end
       @packet.skip_padding
       result
@@ -90,14 +90,13 @@ module OSC
     end
 
     def get_arguments
-      if @packet.getc == ?,
-
+      if (@packet.getc == ?,)
         tags = get_string
         args = []
 
-        tags.scan(/./) do | tag |
+        tags.scan(/./) do |tag|
           type_handler = @types[tag]
-          raise( UnknownType, "Unknown OSC type: #{tag}" ) unless type_handler
+          raise(UnknownType, "Unknown OSC type: #{tag}") unless type_handler
           args << type_handler.call
         end
         args
@@ -135,7 +134,7 @@ module OSC
     end
 
     def string_delemeter
-     "\x00"
+      "\x00"
     end
   end
 end