osc-ruby 1.1.3 → 1.1.4

data/lib/osc-ruby/osc_types.rb

@@ -1,28 +1,53 @@
-require File.join( File.dirname( __FILE__ ), "osc_argument" )
+require File.join(File.dirname(__FILE__), "osc_argument")
 
 module OSC
   class OSCInt32 < OSCArgument
-    def tag() 'i' end
-    def encode() [@val].pack('N').force_encoding("BINARY") end
+    def tag
+      'i'
+    end
+
+    def encode
+      [@val].pack('N').force_encoding("BINARY")
+    end
   end
 
   class OSCFloat32 < OSCArgument
-    def tag() 'f' end
-    def encode() [@val].pack('g').force_encoding("BINARY") end
+    def tag
+      'f'
+    end
+
+    def encode
+      [@val].pack('g').force_encoding("BINARY")
+    end
   end
 
   class OSCDouble64 < OSCArgument
-    def tag() 'd' end
-    def encode() [@val].pack('G').force_encoding("BINARY") end
+    def tag
+      'd'
+    end
+
+    def encode
+      [@val].pack('G').force_encoding("BINARY")
+    end
   end
 
   class OSCString < OSCArgument
-    def tag() 's' end
-    def encode() padding(@val.sub(/\000.*\z/, '') + "\000").force_encoding("BINARY") end
+    def tag
+      's'
+    end
+
+    def encode
+      padding(@val.sub(/\000.*\z/, '') + "\000").force_encoding("BINARY")
+    end
   end
 
   class OSCBlob < OSCArgument
-    def tag() 'b' end
-    def encode() padding([@val.size].pack('N') + @val).force_encoding("BINARY") end
+    def tag
+      'b'
+    end
+
+    def encode
+      padding([@val.size].pack('N') + @val).force_encoding("BINARY")
+    end
   end
 end

data/lib/osc-ruby/server.rb

@@ -1,8 +1,8 @@
 module OSC
-  class  Server
-    def initialize( port )
+  class Server
+    def initialize(port)
       @socket = UDPSocket.new
-      @socket.bind( '', port )
+      @socket.bind('', port)
       @matchers = []
       @queue = Queue.new
     end
@@ -17,76 +17,75 @@ module OSC
       @socket.close
     end
 
-    def add_method( address_pattern, &proc )
-      matcher = AddressPattern.new( address_pattern )
+    def add_method(address_pattern, &proc)
+      matcher = AddressPattern.new(address_pattern)
 
       @matchers << [matcher, proc]
     end
 
-private
+    private
 
     def start_detector
       begin
-	      detector
+        detector
       rescue
-	      Thread.main.raise $!
+        Thread.main.raise($!)
       end
     end
 
     def start_dispatcher
       Thread.fork do
-	      begin
-	        dispatcher
-	      rescue
-	        Thread.main.raise $!
-	      end
+        begin
+          dispatcher
+        rescue
+          Thread.main.raise($!)
+        end
       end
     end
 
     def dispatcher
       loop do
-	      mesg = @queue.pop
-        dispatch_message( mesg )
+        mesg = @queue.pop
+        dispatch_message(mesg)
       end
     end
 
-    def dispatch_message( message )
-      diff = ( message.time || 0 ) - Time.now.to_ntp
+    def dispatch_message(message)
+      diff = (message.time || 0) - Time.now.to_ntp
 
       if diff <= 0
-        sendmesg( message)
+        sendmesg(message)
       else # spawn a thread to wait until it's time
         Thread.fork do
-    	    sleep( diff )
-    	    sendmesg( mesg )
-    	    Thread.exit
-    	  end
+          sleep(diff)
+          sendmesg(mesg)
+          Thread.exit
+        end
       end
     end
 
     def sendmesg(mesg)
       @matchers.each do |matcher, proc|
-	      if matcher.match?( mesg.address )
-	        proc.call( mesg )
-	      end
+        if matcher.match?(mesg.address)
+          proc.call(mesg)
+        end
       end
     end
 
     def detector
       loop do
-	      osc_data, network = @socket.recvfrom( 16384 )
-	      begin
+        osc_data, network = @socket.recvfrom(16384)
+        begin
           ip_info = Array.new
           ip_info << network[1]
           ip_info.concat(network[2].split('.'))
-	        OSCPacket.messages_from_network( osc_data, ip_info ).each do |message|
-	          @queue.push(message)
+          OSCPacket.messages_from_network( osc_data, ip_info ).each do |message|
+            @queue.push(message)
           end
 
-	      rescue EOFError
-	      end
+        rescue(EOFError)
+        end
       end
     end
-
   end
 end

data/spec/builders/message_builder.rb

@@ -1,56 +1,55 @@
 class MessageBuilder
-  
   def initialize
     @address = ""
     @tags = []
     @values = []
     @time = nil
   end
-  
-  def with_address( addr )
+
+  def with_address(addr)
     @address = addr
     self
   end
-  
-  def with_float( float )
-    with_arg( "f", float )
+
+  def with_float(float)
+    with_arg("f", float)
     self
   end
 
-  def with_double( double )
-    with_arg( "d", double)
+  def with_double(double)
+    with_arg("d", double)
     self
   end
-  
-  def with_int( int )
-    with_arg( "i", int )
+
+  def with_int(int)
+    with_arg("i", int)
     self
   end
-  
-  def with_string( string )
-    with_arg( "s", string )
+
+  def with_string(string)
+    with_arg("s", string)
     self
   end
-  
-  def with_blob( blob )
-    with_arg( "b", blob )
+
+  def with_blob(blob)
+    with_arg( "b", blob)
     self
   end
-  
-  def with_time( time )
+
+  def with_time(time)
     @time = time
   end
-  
+
   def build
-    message = OSC::Message.new( @address , *@values)
+    message = OSC::Message.new(@address , *@values)
     message.time = @time
     message
   end
-  
-private
 
-  def with_arg( tag, value )
-    @tags << tag 
-    @values << value 
+  private
+
+  def with_arg(tag, value)
+    @tags << tag
+    @values << value
   end
 end

data/spec/unit/address_pattern_spec.rb

@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__) , '..', 'spec_helper' )
+require File.join(File.dirname(__FILE__) , '..', 'spec_helper')
 
 describe OSC::AddressPattern do
   # it "..." do
@@ -13,81 +13,81 @@ describe OSC::AddressPattern do
   # end
 
   it "should match anything if the pattern is nil" do
-    ap = OSC::AddressPattern.new( nil )
+    ap = OSC::AddressPattern.new(nil)
 
-    ap.match?( "/some/nonsense" ).must_equal true
-    ap.match?( "/completely.different" ).must_equal true
+    _(ap.match?("/some/nonsense")).must_equal(true)
+    _(ap.match?("/completely.different")).must_equal(true)
   end
 
   it "should match based on a regex" do
-    ap = OSC::AddressPattern.new( /hi/ )
+    ap = OSC::AddressPattern.new(/hi/)
 
-    ap.match?( '/hi' ).must_equal true
-    ap.match?( '/hidden' ).must_equal true
+    _(ap.match?('/hi')).must_equal(true)
+    _(ap.match?('/hidden')).must_equal(true)
 
-    ap.match?( '/bye' ).must_equal false
+    _(ap.match?('/bye')).must_equal(false)
   end
 
   it "should return a regex if the pattern is a string" do
-    ap = OSC::AddressPattern.new( "/hi" )
+    ap = OSC::AddressPattern.new("/hi")
 
-    ap.match?( '/hi' ).must_equal true
+    _(ap.match?('/hi')).must_equal(true)
 
-    ap.match?( '   /hi' ).must_equal false
-    ap.match?( '/ahi' ).must_equal false
-    ap.match?( '/hidden' ).must_equal false
-    ap.match?( '/bye' ).must_equal false
+    _(ap.match?('   /hi')).must_equal(false)
+    _(ap.match?('/ahi')).must_equal(false)
+    _(ap.match?('/hidden')).must_equal(false)
+    _(ap.match?('/bye')).must_equal(false)
   end
 
   it "should match with question mark" do
-    ap = OSC::AddressPattern.new( "/h?l" )
-
-    ap.match?( '/hal' ).must_equal true
-    ap.match?( '/hel' ).must_equal true
-    ap.match?( '/hil' ).must_equal true
-    ap.match?( '/hol' ).must_equal true
-    ap.match?( '/hul' ).must_equal true
-    ap.match?( '/hub' ).must_equal false
+    ap = OSC::AddressPattern.new("/h?l")
+
+    _(ap.match?('/hal')).must_equal(true)
+    _(ap.match?('/hel')).must_equal(true)
+    _(ap.match?('/hil')).must_equal(true)
+    _(ap.match?('/hol')).must_equal(true)
+    _(ap.match?('/hul')).must_equal(true)
+    _(ap.match?('/hub')).must_equal(false)
   end
 
   it "should match with *" do
-    ap = OSC::AddressPattern.new( "/believ*d" )
+    ap = OSC::AddressPattern.new("/believ*d")
 
-    ap.match?( '/believd' ).must_equal true
-    ap.match?( '/believed' ).must_equal true
-    ap.match?( '/believeeed' ).must_equal true
-    ap.match?( '/believaeeeioud' ).must_equal true
-    ap.match?( '/believaeeeioud' ).must_equal true
+    _(ap.match?('/believd')).must_equal(true)
+    _(ap.match?('/believed')).must_equal(true)
+    _(ap.match?('/believeeed')).must_equal(true)
+    _(ap.match?('/believaeeeioud')).must_equal(true)
+    _(ap.match?('/believaeeeioud')).must_equal(true)
   end
 
   it "should match with []" do
-    ap = OSC::AddressPattern.new( "/believ[aeiou]d" )
-
-    ap.match?( '/believad' ).must_equal true
-    ap.match?( '/believed' ).must_equal true
-    ap.match?( '/believid' ).must_equal true
-    ap.match?( '/believod' ).must_equal true
-    ap.match?( '/believud' ).must_equal true
-    ap.match?( '/believkd' ).must_equal false
+    ap = OSC::AddressPattern.new("/believ[aeiou]d")
+
+    _(ap.match?('/believad')).must_equal(true)
+    _(ap.match?('/believed')).must_equal(true)
+    _(ap.match?('/believid')).must_equal(true)
+    _(ap.match?('/believod')).must_equal(true)
+    _(ap.match?('/believud')).must_equal(true)
+    _(ap.match?('/believkd')).must_equal(false)
   end
 
   it "should match with [!]" do
-    ap = OSC::AddressPattern.new( "/believ[!aeiou]d" )
-
-    ap.match?( '/believad' ).must_equal false
-    ap.match?( '/believed' ).must_equal false
-    ap.match?( '/believid' ).must_equal false
-    ap.match?( '/believod' ).must_equal false
-    ap.match?( '/believud' ).must_equal false
-    ap.match?( '/believkd' ).must_equal true
-    ap.match?( '/believzd' ).must_equal true
+    ap = OSC::AddressPattern.new("/believ[!aeiou]d")
+
+    _(ap.match?('/believad')).must_equal(false)
+    _(ap.match?('/believed')).must_equal(false)
+    _(ap.match?('/believid')).must_equal(false)
+    _(ap.match?('/believod')).must_equal(false)
+    _(ap.match?('/believud')).must_equal(false)
+    _(ap.match?('/believkd')).must_equal(true)
+    _(ap.match?('/believzd')).must_equal(true)
   end
 
   it "should match with {}" do
-    ap = OSC::AddressPattern.new( "/{hi,bye}" )
+    ap = OSC::AddressPattern.new("/{hi,bye}")
 
-    ap.match?( '/hi' ).must_equal true
-    ap.match?( '/bye' ).must_equal true
-    ap.match?( '/greetings' ).must_equal false
+    _(ap.match?('/hi')).must_equal(true)
+    _(ap.match?('/bye')).must_equal(true)
+    _(ap.match?('/greetings')).must_equal(false)
   end
 end

data/spec/unit/message_builder_spec.rb

@@ -1,45 +1,43 @@
-# sanity checks
 require File.join( File.dirname(__FILE__) , '..', 'spec_helper' )
 
 describe MessageBuilder do
   before :each do
     @builder = MessageBuilder.new
   end
-   
+
   it "encodes just the address" do
     mesg = @builder.with_address("/hi")
-   mesg.build.encode.must_equal binary_string("/hi\000,\000\000\000")
+    _(mesg.build.encode).must_equal binary_string("/hi\000,\000\000\000")
   end
-  
+
   it "encodes single int values" do
     mesg = @builder.with_address("/hi").
-                    with_int(33)
-                    
-    mesg.build.encode.must_equal binary_string("/hi\000,i\000\000\000\000\000!")
+    with_int(33)
+    _(mesg.build.encode).must_equal binary_string("/hi\000,i\000\000\000\000\000!")
   end
-  
+
   it "encodes single string values" do
     mesg = @builder.with_address("/hi").
-                    with_string("hello")
-                    
-    mesg.build.encode.must_equal binary_string("/hi\000,s\000\000hello\000\000\000")
+    with_string("hello")
+
+    _(mesg.build.encode).must_equal binary_string("/hi\000,s\000\000hello\000\000\000")
   end
-  
+
   it "encodes single float values" do
     mesg = @builder.with_address("/hi").
-                    with_float(3.14159)
-                    
-    mesg.build.encode.must_equal binary_string("/hi\000,f\000\000@I\017\320")
+    with_float(3.14159)
+
+    _(mesg.build.encode).must_equal binary_string("/hi\000,f\000\000@I\017\320")
   end
-  
+
   it "encodes multiple floats" do
     mesg = @builder.with_address("/hi").
-                    with_float(3.14159).
-                    with_float(4.5)
-                    
-    mesg.build.encode.must_equal [47, 104, 105, 0, 44, 102, 102, 0, 64, 73, 15, 208, 64, 144, 0, 0].pack("C*")
+    with_float(3.14159).
+    with_float(4.5)
+
+    _(mesg.build.encode).must_equal [47, 104, 105, 0, 44, 102, 102, 0, 64, 73, 15, 208, 64, 144, 0, 0].pack("C*")
   end
-  
+
   def binary_string(string)
     string.force_encoding("BINARY")
   end