aberant-tuio-ruby 0.0.2 → 0.1.0

data/VERSION.yml

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

data/lib/core_ext/float.rb

@@ -0,0 +1,5 @@
+class Float 
+  def approx_equal?(other,threshold=0.00001) 
+    (self-other).abs < threshold  
+  end 
+end

data/lib/core_ext/object.rb

@@ -0,0 +1,11 @@
+class Object
+  def client_block_setter( *args )
+    args.each do | blk_setter_name |      
+     self.class_eval <<-EOF
+        def on_#{blk_setter_name}( &#{blk_setter_name}_blk )
+         @#{blk_setter_name}_callback_blk = #{blk_setter_name}_blk
+        end
+      EOF
+    end
+  end
+end

data/lib/my_environment.rb

@@ -0,0 +1,6 @@
+$: << File.dirname( __FILE__ )
+$: << File.join( File.dirname(__FILE__), 'core_ext' )
+
+require 'float'
+require 'object'
+

data/lib/tuio_client.rb

@@ -1,13 +1,18 @@
 require 'rubygems'
 require 'osc'
 
+require File.join( File.dirname( __FILE__ ), 'my_environment')
 
+require "tuio_object"
+require "tuio_cursor"
 
-class TUIOClient
+class TuioClient
   include OSC
   
+  client_block_setter :object_creation, :object_update, :object_removal
+  client_block_setter :cursor_creation, :cursor_update, :cursor_removal
+  
   def initialize( args = {} )
-    @host = args[:host] || 'localhost'
     @port = args[:port] || 3333
 
     @tuio_objects = { }
@@ -15,25 +20,29 @@ class TUIOClient
     
     @osc = OSC::SimpleServer.new(@port)
     
-    @osc.add_method '/tuio/2Dobj', nil do |msg|
+    @osc.add_method '/tuio/2Dobj' do |msg|
       args = msg.to_a
       
       case args.shift
       when "set"
-        update_tuio_objects( args ) 
+        track_tuio_object( args ) 
       when "alive"
         keep_alive( :tuio_objects, args )
+      when "fseq"
+        # puts args
       end
     end
 
-    @osc.add_method '/tuio/2Dcur', nil do |msg|
+    @osc.add_method '/tuio/2Dcur' do |msg|
       args = msg.to_a
 
       case args.shift
       when "set"
-        update_tuio_cursors args
+        track_tuio_cursor args
       when "alive"
         keep_alive( :tuio_cursors, args )
+      when "fseq"
+        # puts args
       end
     end
   end
@@ -44,6 +53,10 @@ class TUIOClient
     end
   end
   
+  ####################################
+  #           getters                #
+  ####################################
+  
   def tuio_objects
     @tuio_objects
   end
@@ -60,55 +73,159 @@ class TUIOClient
     @tuio_cursors[id]
   end
   
+  ####################################
+  #           call backs             #
+  ####################################
+  
+  # def on_cursor_update( &cur_update_blk )
+  #   @cur_update_blk = cur_update_blk
+  # end
+  
 private
-  #TODO clean up these, each_with_index methinks
-  def cur_args_to_hash( args )
-    {
-      :session_id  => args[0],
-      :x_pos       => args[1],
-      :y_pos       => args[2],
-      :x_move      => args[3],
-      :y_move      => args[4],
-      :motion_acc  => args[5],
-    }
+
+  def track_tuio_object( args )
+    session_id = session_id_from( args )
+  
+    if tuio_object_previously_tracked?( session_id )
+      
+      tuio_object = grab_tuio_object_by( session_id )
+      
+      return if tuio_object.args_equal?( args )
+
+      tuio_object.update( *update_object_params_from( args ) )  
+
+      trigger_object_update_callback( tuio_object )
+    else
+      tuio_object = track_new_tuio_object_with( session_id, args )
+      
+      trigger_object_creation_callback( tuio_object  )
+    end
+  end
+  
+  def track_tuio_cursor( args )
+    session_id = session_id_from( args )
+    
+    if tuio_cursor_previously_tracked?( session_id )
+      tuio_cursor = grab_tuio_cursor_by( session_id )
+      
+      return if tuio_cursor.args_equal?( args )
+      tuio_cursor.update( *update_cursor_params_from( args ))
+      
+      trigger_cursor_update_callback( tuio_cursor )
+      
+    else # this is a new cursor      
+      finger_id = @tuio_cursors.size
+      track_new_tuio_cursor_with( session_id, args )
+      
+      trigger_cursor_creation_callback( grab_tuio_cursor_by( session_id )  )
+      
+    end
+  end
+  
+  def session_id_from( args )
+    args[0]
+  end
+  
+  def new_object_params_from( args )
+    args[0..4]
+  end
+  
+  def update_object_params_from( args )
+    args[2..9]
+  end
+  
+  def new_cursor_params_from( args )
+    args[0..2]
+  end
+
+  def update_cursor_params_from( args )
+    args[1..5]
   end
 
-  def obj_args_to_hash( args )
-    { :session_id    =>  args[0],
-      :class_id      =>  args[1],
-      :x_pos         =>  args[2],
-      :y_pos         =>  args[3],
-      :angle         =>  args[4],
-      :x_move        =>  args[5],
-      :y_move        =>  args[6],
-      :angle_move    =>  args[7],
-      :motion_acc    =>  args[8],
-      :rotation_acc  =>  args[9],
-    }
-  end
-  
-  def update_tuio_objects( args )
-    tuio_object = obj_args_to_hash( args )
+  
+  def tuio_object_previously_tracked?( session_id )
+    @tuio_objects.has_key?( session_id )
+  end
+  
+  def tuio_cursor_previously_tracked?( session_id )
+    @tuio_cursors.has_key?( session_id )
+  end
+  
+  def grab_tuio_object_by( session_id )
+    @tuio_objects[session_id]
+  end
+  
+  def grab_tuio_cursor_by( session_id )
+    @tuio_cursors[session_id]
+  end
+  
+  def track_new_tuio_object_with( session_id, args )
+    @tuio_objects[session_id] = TuioObject.new( *new_object_params_from( args ) )    
+  end
+
+  def track_new_tuio_cursor_with( session_id, args )    
+    @tuio_cursors[session_id] = TuioCursor.new( *new_cursor_params_from( args ) ) 
+  end
+
+  ####################################
+  #           call backs             #
+  ####################################
+  
+  def trigger_object_update_callback( tuio_object )
+    @object_update_callback_blk.call( tuio_object ) if @object_update_callback_blk
+  end
+  
+  def trigger_object_creation_callback( tuio_object )
+    @object_creation_callback_blk.call( tuio_object ) if @object_creation_callback_blk
+  end
+  
+  def trigger_object_deletion_callback( tuio_object )
+    @object_removal_callback_blk.call( tuio_object ) if @object_removal_callback_blk
+  end
+  
+  def trigger_cursor_creation_callback( tuio_cursor )
+    @cursor_creation_callback_blk.call( tuio_cursor ) if @cursor_creation_callback_blk
+  end
+  
+  def trigger_cursor_update_callback( tuio_cursor )
+    @cursor_update_callback_blk.call( tuio_cursor ) if @cursor_update_callback_blk
+  end
+  
+  def trigger_cursor_update_callback( tuio_cursor )    
+    @cursor_update_callback_blk.call( tuio_cursor ) if @cursor_update_callback_blk
+  end
+  
+  def trigger_cursor_deletion_callback( tuio_object )
+    @cursor_removal_callback_blk.call( tuio_object ) if @cursor_removal_callback_blk
+  end
+  
+  def delete_tuio_objects( session_id )
+    tuio_object = grab_tuio_object_by( session_id )
     
-    @tuio_objects[tuio_object[:session_id]] = tuio_object
+    trigger_object_deletion_callback( tuio_object )
   end
   
-  def update_tuio_cursors( args )
-    tuio_cursor = cur_args_to_hash( args )
-    @tuio_cursors[tuio_cursor[:session_id]] = tuio_cursor
+  def delete_tuio_cursors( session_id )
+    tuio_cursor = grab_tuio_cursor_by( session_id )
+    
+    trigger_cursor_deletion_callback( tuio_cursor )
   end
   
+  
   def keep_alive( type, session_ids )
+    return if session_ids.nil?
     all_keys = send( type ).keys
     
     dead = all_keys.reject { |key|  session_ids.include? key }
         
-    dead.each do |d|
-      send( type ).delete( d )
+    dead.each do | session_id |
+      send( "delete_#{type}", session_id )
+      
+      send( type ).delete( session_id )
     end
   end
 end
 
 if $0 == __FILE__
-  TUIOClient.new.start
+  TuioClient.new.start
 end

data/lib/tuio_container.rb

@@ -0,0 +1,50 @@
+require 'tuio_point'
+
+module TuioContainer 
+  attr_accessor :session_id, :x_pos, :y_pos, :x_speed, :y_speed, :motion_accel
+
+  
+  def initialize( session_id, x_pos, y_pos )
+    @session_id = session_id
+    @x_pos = x_pos
+    @y_pos = y_pos
+    
+    @x_speed = 0.0
+    @y_speed = 0.0
+    @motion_accel = 0.0
+    
+    add_point_to_path( TuioPoint.new( x_pos, y_pos ) )
+  end
+  
+  def update( x_pos, y_pos, x_speed, y_speed, motion_accel )  
+    @x_pos = x_pos
+    @y_pos = y_pos  
+    @x_speed = x_speed
+    @y_speed = y_speed
+    @motion_accel = motion_accel
+    
+    new_point = TuioPoint.new( x_pos, y_pos )
+    add_point_to_path( new_point ) unless new_point == @path.last
+  end
+  
+  def path
+    @path 
+  end
+  
+  def args_equal?( args )
+    @session_id == args[0] &&
+    @x_pos.approx_equal?( args[1] ) &&
+    @y_pos.approx_equal?( args[2] ) &&
+    @x_speed.approx_equal?( args[3] ) &&
+    @y_speed.approx_equal?( args[4] ) &&
+    @motion_accel.approx_equal?( args[5] )
+  end
+  
+private
+
+  def add_point_to_path( tuio_point )
+    @path ||= []
+    @path << tuio_point
+  end
+end
+

data/lib/tuio_cursor.rb

@@ -0,0 +1,53 @@
+class TuioCursor
+  include TuioContainer
+  
+  attr_reader :finger_id, :x_speed, :y_speed, :motion_accel
+  
+  def initialize( session_id, x_pos, y_pos ) #, x_speed, y_speed, motion_accel )
+    super( session_id, x_pos, y_pos )
+    
+    @x_speed = 0.0
+    @y_speed = 0.0
+    @motion_accel = 0.0
+  end
+    
+  def args_equal?( args )
+    super( args_to_container_from_cursor( args ) ) &&
+    
+    @x_speed.approx_equal?(args[3] ) &&
+    @y_speed.approx_equal?(args[4] ) &&
+    @motion_accel.approx_equal?(args[5] )
+  end
+  
+  def inspect
+    puts "TuioCursor:"
+    puts "session_id >> #{session_id}"
+    puts "x_pos >> #{x_pos}"
+    puts "y_pos >> #{y_pos}"
+    puts "x_speed >> #{x_speed}"
+    puts "y_speed >> #{y_speed}"
+    puts "motion_accel >> #{motion_accel}"
+  end
+  
+  
+private 
+  def args_to_container_from_cursor( args )
+      #session_id, 
+    [ args[0],
+
+      # x_pos
+      args[1], 
+
+      # y_pos
+      args[2], 
+
+      # x_speed
+      args[3], 
+
+      # y_speed
+      args[4], 
+
+      # motion_accel
+      args[5] ]
+  end
+end

data/lib/tuio_object.rb

@@ -0,0 +1,80 @@
+require 'tuio_container'
+
+class TuioObject 
+  attr_reader :angle, :fiducial_id, :rotation_speed, :rotation_accel
+  
+  include TuioContainer
+  
+  def initialize( session_id, fiducial_id, x_pos,  y_pos, angle )
+    super( session_id, x_pos, y_pos )
+
+    @fiducial_id = fiducial_id
+    @angle = angle
+    
+    @rotation_speed = 0.0
+    @rotation_accel = 0.0
+  end 
+  
+  def update( x_pos, y_pos, angle, x_speed, y_speed, rotation_speed, motion_accel, rotation_accel )
+    super( x_pos, y_pos, x_speed, y_speed, motion_accel )
+    
+    @angle = angle
+    @rotation_speed = rotation_speed
+    @rotation_accel = rotation_accel
+  end
+  
+  def args_equal?( args )
+    fiducial_id == args[1] &&
+    rotation_speed.approx_equal?( args[7] ) && 
+    rotation_accel.approx_equal?( args[9] ) &&
+    super( args_to_container_from_object( args ) )
+  end
+  
+  def to_args
+    [ session_id,
+      fiducial_id,
+      x_pos,
+      y_pos,
+      angle,
+      x_speed,
+      y_speed,
+      rotation_speed,
+      motion_accel,
+      rotation_accel]
+  end
+  
+  def inspect
+    puts "TuioObject:"
+    puts "session_id >> #{session_id}"
+    puts "fiducial_id >> #{fiducial_id}"
+    puts "x_pos >> #{x_pos}"
+    puts "y_pos >> #{y_pos}"
+    puts "angle >> #{angle}"
+    puts "x_speed >> #{x_speed}"
+    puts "y_speed >> #{y_speed}"
+    puts "rotation_speed >> #{rotation_speed}"
+    puts "motion_accel >> #{motion_accel}"
+    puts "rotation_accel >> #{rotation_accel}"
+  end
+
+private
+  def args_to_container_from_object( args )
+      #session_id, 
+    [ args[0],
+
+      # x_pos
+      args[2], 
+
+      # y_pos
+      args[3], 
+
+      # x_speed
+      args[5], 
+
+      # y_speed
+      args[6], 
+
+      # motion_accel
+      args[8] ]
+  end
+end

data/lib/tuio_point.rb

@@ -0,0 +1,45 @@
+class TuioPoint
+  attr_accessor :x_pos, :y_pos, :updated_at
+  
+  def initialize( x_pos, y_pos )
+    @x_pos, @y_pos = x_pos, y_pos
+  end
+  
+  def update( x_pos, y_pos )
+    @x_pos, @y_pos = x_pos, y_pos
+  
+    clear_update_time
+  end
+  
+  def distance_to( another_point )
+    dx = @x_pos - another_point.x_pos
+    dy = @y_pos - another_point.y_pos
+    
+    Math.sqrt( dx*dx + dy*dy )
+  end
+  
+  def radians_to( another_point )
+    side =   another_point.x_pos - @x_pos
+    height = another_point.y_pos - @y_pos
+    distance = distance_to( another_point )
+    
+    angle = Math.asin( side / distance ) + Math::PI / 2 
+    angle = 2.0 * Math.PI - angle if height < 0 
+    angle
+  end
+  
+  def degrees_to( another_point )
+    ( radians_to( another_point ) / Math::PI ) * 180.0
+  end
+  
+  def eql?( another_point )
+    @x_pos == another_point.x_pos &&
+    @y_pos == another_point.y_pos
+  end
+  
+private
+
+  def clear_update_time
+    @updated_at = nil
+  end
+end

data/spec/integration/tuio_event_spec.rb

@@ -0,0 +1,165 @@
+require File.join( File.dirname(__FILE__) , '..', 'spec_helper' )
+
+describe "tuio object" do
+  before :each do
+    setup_server
+  end 
+  
+  describe "in general" do
+    it "should call the creation hook" do
+      @server.on_object_creation do | object |
+        raise "creation hook called!" if object.session_id == 49
+      end
+    
+      lambda {
+        send_message( '/tuio/2Dobj', "set", 49, 25, 0.38, 0.35, 3.14, 0.0, 0.0, 0.0, 0.0, 0.0 )
+      }.should raise_error
+      
+      lambda {
+        send_message( '/tuio/2Dobj', "set", 49, 25, 0.38, 0.35, 3.14, 0.0, 0.0, 0.0, 0.0, 0.0 )
+      }.should_not raise_error
+    end
+    
+    it "should call the update hook when session_id is set again with different location" do
+      @server.on_object_update do | object |
+        raise "update hook called!" if object.session_id == 49
+      end
+
+      lambda {
+        # this one calls the create hook
+        send_message( '/tuio/2Dobj', "set", 49, 25, 0.38, 0.35, 3.14, 0.0, 0.0, 0.0, 0.0, 0.0 )
+        send_message( '/tuio/2Dobj', "alive", 49)
+        
+        #this one is the same as before, so nothing to update
+        send_message( '/tuio/2Dobj', "set", 49, 25, 0.38, 0.35, 3.14, 0.0, 0.0, 0.0, 0.0, 0.0 )
+        send_message( '/tuio/2Dobj', "alive", 49)
+      }.should_not raise_error
+      
+      
+      lambda {
+        #this one calls the update hook
+        send_message( '/tuio/2Dobj', "set", 49, 25, 0.12, 0.12, 3.14, 0.0, 0.0, 0.0, 0.0, 0.0 )
+        send_message( '/tuio/2Dobj', "alive", 49)
+        
+      }.should raise_error
+    end
+    
+    it "should call the removal hook when an object is not on the alive list" do
+      @server.on_object_removal do | object |
+        raise "removal hook called!" if object.session_id == 51
+      end
+      
+      send_message( '/tuio/2Dobj', "set", 49, 25, 0.38, 0.35, 3.14, 0.0, 0.0, 0.0, 0.0, 0.0 )
+      send_message( '/tuio/2Dobj', "set", 51, 26, 0.12, 0.50, 3.14, 0.0, 0.0, 0.0, 0.0, 0.0 )
+
+      lambda {
+        send_message( '/tuio/2Dobj', "alive", 49)
+      }.should raise_error
+      
+    end
+  end
+  
+  describe "receiving message" do
+    before :each do
+      send_message( '/tuio/2Dobj', "set", 49, 25, 0.38, 0.35, 3.14, 0.0, 0.0, 0.0, 0.0, 0.0 )
+    end
+    
+    describe "set" do
+      it 'should update tracking' do
+        @server.tuio_objects.size.should == 1
+        @server.tuio_objects[49].fiducial_id.should == 25
+      end
+    end
+  
+    describe "alive" do
+      it 'should only keep alive the objects the client says are alive' do    
+        send_message( '/tuio/2Dobj', "set", 51, 26, 0.12, 0.50, 3.14, 0.0, 0.0, 0.0, 0.0, 0.0 )
+        send_message( '/tuio/2Dobj', "alive", 49)
+
+        @server.tuio_objects.size.should == 1
+      end
+    end
+    
+    describe "fseq" do
+      it "should probably have a test!"
+    end
+  end
+end
+
+describe "tuio_cursors" do
+  before :each do
+    setup_server
+  end
+  
+  it 'should update tracking' do
+    send_message( '/tuio/2Dcur', "set", 22, 0.38, 0.35, 0.0, 0.0, 0.0 )
+    
+    @server.tuio_cursors.size.should == 1
+  end
+  
+  it 'should update tracking for multiples' do
+    send_message( '/tuio/2Dcur', "set", 22, 0.38, 0.35, 0.0, 0.0, 0.0 )
+    send_message( '/tuio/2Dcur', "set", 27, 0.12, 0.50, 0.0, 0.0, 0.0 )
+    
+    
+    @server.tuio_cursors.size.should == 2
+  end
+  
+  it 'should only keep alive the cursors the client says are alive' do
+    send_message( '/tuio/2Dcur', "set", 22, 0.38, 0.35, 0.0, 0.0, 0.0 )
+    send_message( '/tuio/2Dcur', "set", 27, 0.12, 0.50, 0.0, 0.0, 0.0 )
+    
+    send_message( '/tuio/2Dcur', "alive", 22)
+    
+    @server.tuio_cursors.size.should == 1
+    @server.tuio_cursors[22].session_id.should == 22
+  end
+  
+  it "should call the creation hooks" do
+    @server.on_cursor_creation do | objects |
+      raise "create! hook called!"
+    end
+    
+    lambda {
+      send_message( '/tuio/2Dcur', "set", 27, 0.12, 0.50, 0.0, 0.0, 0.0 )
+    }.should raise_error
+  end
+  
+  it "should call the update hooks" do
+    @server.on_cursor_update do | objects |
+      raise "update hook called!"
+    end
+
+    lambda {
+      send_message( '/tuio/2Dcur', "set", 27, 0.12, 0.50, 0.0, 0.0, 0.0 )
+      send_message( '/tuio/2Dcur', "alive", 27)
+      
+      send_message( '/tuio/2Dcur', "set", 27, 0.12, 0.50, 0.0, 0.0, 0.0 )
+      send_message( '/tuio/2Dcur', "alive", 27)
+      
+    }.should_not raise_error
+    
+    lambda {
+      send_message( '/tuio/2Dcur', "set", 27, 0.12, 0.32, 0.0, 0.0, 0.0 )
+      send_message( '/tuio/2Dcur', "alive", 27)
+      
+    }.should raise_error
+    
+  end
+  
+  it "should call the removal hooks" do
+    @server.on_cursor_removal do | objects |
+      raise "removal hook called!"
+    end
+    
+    lambda {
+      send_message( '/tuio/2Dcur', "set", 27, 0.12, 0.50, 0.0, 0.0, 0.0 )
+      send_message( '/tuio/2Dcur', "set", 32, 0.18, 0.98, 0.0, 0.0, 0.0 )
+    }.should_not raise_error
+
+    lambda {
+      send_message( '/tuio/2Dcur', "alive", 27)
+      
+    }.should raise_error
+  end
+end

data/spec/spec_helper.rb

@@ -2,14 +2,15 @@ require 'rubygems'
 require 'spec'
 require 'rr'
 require 'osc'
-require 'lib/tuio_client'
+
+require File.join( File.dirname( __FILE__ ), '..', 'lib', 'tuio_client' )
 
 Spec::Runner.configure do |config|
     config.mock_with RR::Adapters::Rspec
 end
 
 # monkey patch to get at osc core to send messages
-class TUIOClient
+class TuioClient
   def osc
     @osc
   end
@@ -29,5 +30,5 @@ def setup_server
   stub(socket).bind("", 3333)
   stub(UDPSocket).new { socket }
 
-  @server = TUIOClient.new
+  @server = TuioClient.new
 end

data/spec/unit/tuio_container_spec.rb

@@ -0,0 +1,74 @@
+# require File.join( File.dirname(__FILE__) , '..', 'spec_helper' )
+# 
+# class TuioContainer
+#   # we want to be able to instantiate this class for testing
+#   def self.abstract?
+#     false
+#   end
+# end
+# 
+# describe TuioContainer do
+#   before :each do
+#     @session_id = 42
+#     @x_pos = 0.8
+#     @y_pos = 0.3
+#     @tc = TuioContainer.new( @session_id, @x_pos, @y_pos )
+#   end
+#   
+#   describe "in general" do
+#     it "should know it's session id" do
+#       @tc.session_id.should == @session_id
+#     end
+#   
+#     it "should know it's x position" do
+#       @tc.x_pos.should == @x_pos
+#     end
+#   
+#     it "should know its y position" do
+#       @tc.y_pos.should == @y_pos
+#     end
+#   end
+#   
+#   describe "updates" do
+#     before :each do
+#       @x_pos2 = 0.7
+#       @y_pos2 = 0.4
+#       @x_speed = 0.1
+#       @y_speed = 0.1
+#       @motion_accel = 0.1
+#       
+#       @tc.update( @x_pos2, @y_pos2, @x_speed, @y_speed, @motion_accel )
+#     end
+# 
+#     it "should know it's new x position" do
+#       @tc.x_pos.should == @x_pos2
+#     end
+#     
+#     it "should know it's new y position" do
+#       @tc.y_pos.should == @y_pos2
+#     end
+#     
+#     it "should know it's x speed" do
+#       @tc.x_speed.should == @x_speed
+#     end
+#     
+#     it "should know it's y speed" do
+#       @tc.y_speed.should == @y_speed
+#     end
+#     
+#     it "should know it's motion acceleration" do
+#       @tc.motion_accel.should == @motion_accel
+#     end
+#     
+#     it "should know the path it's traveled" do
+#       first = @tc.path.first
+#       second = @tc.path.last
+#       
+#       first.x_pos.should == 0.8
+#       first.y_pos.should == 0.3
+#       
+#       second.x_pos.should == 0.7
+#       second.y_pos.should == 0.4
+#     end
+#   end
+# end

data/spec/unit/tuio_cursor_spec.rb

@@ -0,0 +1,29 @@
+require File.join( File.dirname(__FILE__) , '..', 'spec_helper' )
+
+describe TuioCursor do
+  before :each do
+    @args1 = [
+      @session_id = 42,
+      @x_pos = 0.8,
+      @y_pos = 0.4,
+    ]
+    @tc = TuioCursor.new( *@args1 )
+  end
+  
+  describe "update" do
+    before :each do
+      @args2 = [
+        @x_pos2 = 0.23,
+        @y_pos2 = 0.54,
+        @x_speed = 0.01,
+        @y_speed = 0.03,
+        @motion_accel = 0.02
+      ]
+      @tc.update( *@args2 )
+    end
+    
+    it "should it is equal to some arguments" do
+      @tc.args_equal?( [@session_id, @x_pos, @y_pos] )
+    end
+  end
+end

data/spec/unit/tuio_object_spec.rb

@@ -0,0 +1,96 @@
+require File.join( File.dirname(__FILE__) , '..', 'spec_helper' )
+
+describe TuioObject do
+  before :each do
+    @args1 = [
+      @session_id = 42,
+      @fiducial_id = 1,
+      @x_pos = 0.8,
+      @y_pos = 0.4,
+      @angle = 1
+    ]
+    @to = TuioObject.new( *@args1 )
+  end
+  
+  describe "in general" do
+    it "should know it's session id" do
+      @to.session_id.should == @session_id
+    end
+    
+    it "should know it's fiducial id" do
+      @to.fiducial_id.should == @fiducial_id
+    end
+    
+    it "should know it's x position" do
+      @to.x_pos.should == @x_pos
+    end
+    
+    it "should know it's y postion" do
+      @to.y_pos.should == @y_pos
+    end
+    
+    it "should know it's angle" do
+      @to.angle.should == @angle
+    end
+  end
+  
+  describe "on update" do
+    before :each do
+      @args2 = [
+        @x_pos2 = 0.7,
+        @y_pos2 = 0.4,
+        @angle2 = 1.1,
+        @x_speed = 0.1,
+        @y_speed = 0.2,
+        @rotation_speed = 0.11,
+        @motion_accel = 0.12,
+        @rotation_accel = 0.13
+      ]
+      
+      @to.update( *@args2 )
+    end
+    
+    it "should be able to compare it's args" do
+      @to.args_equal?( [
+        @session_id,
+        @fiducial_id,
+        @x_pos2,
+        @y_pos2,
+        @angle2,
+        @x_speed,
+        @y_speed,
+        @rotation_speed,
+        @motion_accel,
+        @rotation_accel
+      ]).should be_true
+    end
+    
+    it "should know it's new x position" do
+      @to.x_pos.should == @x_pos2
+    end
+    
+    it "should know it's new y position" do
+      @to.y_pos.should == @y_pos2
+    end
+    
+    it "should know it's new angle" do
+      @to.angle.should == @angle2
+    end
+    
+    it "should know it's x speed" do
+      @to.x_speed.should == @x_speed
+    end
+    
+    it "should know it's y speed" do
+      @to.y_speed.should == @y_speed
+    end
+    
+    it "should know it's rotation speed" do
+      @to.rotation_speed.should == @rotation_speed
+    end
+    
+    it "should know it's rotation accel" do
+      @to.rotation_accel.should == @rotation_accel
+    end
+  end
+end

data/spec/unit/tuio_point_spec.rb

@@ -0,0 +1,46 @@
+require File.join( File.dirname(__FILE__) , '..', 'spec_helper' )
+
+describe TuioPoint do
+  before :each do
+    @location1 = [0.1, 0.1]
+    @location2 = [0.1, 0.21]
+    
+    @point1 = TuioPoint.new( *@location1 )
+    @point2 = TuioPoint.new( *@location2 )
+  end
+  
+  describe "in general" do
+    it "should know the distance to another point" do
+      # not a wonderful test, but a sanity check
+      @point1.distance_to( @point2 ).should be_close( 0.11, 0.00001 )
+    end
+  
+    it "should know the angle to another point" do
+      # not a wonderful test, but a sanity check
+      @point1.radians_to( @point2 ).should be_close( 1.5707963, 0.00001 )
+    end
+  
+    it "should know when it was last updated" do
+      @point1.should respond_to(:updated_at)
+    end
+    
+    it "should know if it is equal to another point" do
+      @other_point = TuioPoint.new( *@location1 )
+      
+      @point1.should be_eql( @other_point )
+    end
+  end
+  
+  describe "updates" do
+    before :each do
+      @point1.updated_at = Time.now
+      
+      @point1.update( *@location2 )
+    end
+    
+    it "should clear the updated at time" do
+      @point1.updated_at.should == nil
+    end
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aberant-tuio-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - aberant
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-22 00:00:00 -07:00
+date: 2009-04-05 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -25,9 +25,23 @@ extra_rdoc_files:
 files: 
 - README.rdoc
 - VERSION.yml
+- lib/core_ext
+- lib/core_ext/float.rb
+- lib/core_ext/object.rb
+- lib/my_environment.rb
 - lib/tuio_client.rb
+- lib/tuio_container.rb
+- lib/tuio_cursor.rb
+- lib/tuio_object.rb
+- lib/tuio_point.rb
+- spec/integration
+- spec/integration/tuio_event_spec.rb
 - spec/spec_helper.rb
-- spec/tuio_event_spec.rb
+- spec/unit
+- spec/unit/tuio_container_spec.rb
+- spec/unit/tuio_cursor_spec.rb
+- spec/unit/tuio_object_spec.rb
+- spec/unit/tuio_point_spec.rb
 - LICENSE
 has_rdoc: true
 homepage: http://github.com/aberant/tuio-ruby

data/spec/tuio_event_spec.rb

@@ -1,55 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-describe "tuio objects" do
-  before :each do
-    setup_server
-  end
-  
-  it 'should update tracking' do
-    send_message( '/tuio/2Dobj', "set", 49, 25, 0.38, 0.35, 3.14, 0.0, 0.0, 0.0, 0.0, 0.0 )
-    
-    @server.tuio_objects.size.should == 1
-    @server.tuio_objects[49][:class_id].should == 25
-  end
-  
-  it 'should only keep alive the objects the client says are alive' do
-    send_message( '/tuio/2Dobj', "set", 49, 25, 0.38, 0.35, 3.14, 0.0, 0.0, 0.0, 0.0, 0.0 )
-    send_message( '/tuio/2Dobj', "set", 51, 26, 0.12, 0.50, 3.14, 0.0, 0.0, 0.0, 0.0, 0.0 )
-    
-    send_message( '/tuio/2Dobj', "alive", 49)
-    
-    @server.tuio_objects.size.should == 1
-  end
-  
-end
-
-describe "tuio_cursors" do
-  before :each do
-    setup_server
-  end
-  
-  it 'should update tracking' do
-    send_message( '/tuio/2Dcur', "set", 22, 0.38, 0.35, 0.0, 0.0, 0.0 )
-    
-    @server.tuio_cursors.size.should == 1
-  end
-  
-  it 'should update tracking for multiples' do
-    send_message( '/tuio/2Dcur', "set", 22, 0.38, 0.35, 0.0, 0.0, 0.0 )
-    send_message( '/tuio/2Dcur', "set", 27, 0.12, 0.50, 0.0, 0.0, 0.0 )
-    
-    
-    @server.tuio_cursors.size.should == 2
-  end
-  
-  it 'should only keep alive the cursors the client says are alive' do
-    send_message( '/tuio/2Dcur', "set", 22, 0.38, 0.35, 0.0, 0.0, 0.0 )
-    send_message( '/tuio/2Dcur', "set", 27, 0.12, 0.50, 0.0, 0.0, 0.0 )
-    
-    send_message( '/tuio/2Dcur', "alive", 22)
-    
-    @server.tuio_cursors.size.should == 1
-    @server.tuio_cursors[22][:session_id].should == 22
-    
-  end
-end