tracksperanto 2.12.0 → 3.0.0

data/test/subpixel/subpix_import_test.rb

@@ -0,0 +1,75 @@
+# -*- encoding : utf-8 -*-
+require File.expand_path(File.dirname(__FILE__)) + '/../helper'
+
+class SubpixelImportTest < Test::Unit::TestCase
+  DELTA = 0.1
+  
+  # We know that the following apps use the edge of the pixel raster as 0:
+  # Shake, Flame, 3DE.
+  
+  # In Syntheyes, the coordinates of the corners are effectively at the center of the pixels of the grid.
+  # WE NEED to make adjustments to the Syntheyes workflows to account for "on-pixel" coordinates as opposed to "pixel corner"
+  def test_parsing_from_syntheyes_2dp
+    fixture = File.open(File.dirname(__FILE__) + '/sy_subpix_2dpaths.txt')
+    trackers = Tracksperanto::Import::Syntheyes.new(:io => fixture, :width => 720, :height => 576).to_a
+    
+    bl_kf = trackers[2][0]
+    assert_in_delta 0.0, bl_kf.abs_x, DELTA
+    assert_in_delta 0.0, bl_kf.abs_y, DELTA
+
+    tr_kf = trackers[3][0]
+    assert_in_delta 720.0, tr_kf.abs_x, DELTA
+    assert_in_delta 576.0, tr_kf.abs_y, DELTA
+  end
+  
+  # In PFTrack the coordinates are shifted by .5 pixels and the 0 coordinate is not at the edge of the pixel raster,
+  # but in the middle of the leftmost bottom pixel.
+  def test_parsing_from_pftrack
+    fixture = File.open(File.dirname(__FILE__) + '/julik_pftrack.txt')
+    trackers = Tracksperanto::Import::PFTrack.new(:io => fixture, :width => 720, :height => 576).to_a
+    
+    bl_kf = trackers[0][0]
+    assert_in_delta 0.5, bl_kf.abs_x, DELTA
+    assert_in_delta 0.5, bl_kf.abs_y, DELTA
+    
+    tr_kf = trackers[1][0]
+    assert_in_delta 715.5, tr_kf.abs_x, DELTA
+    assert_in_delta 571.514, tr_kf.abs_y, DELTA
+  end
+  
+  # Subpixel accuracy is native in Shake.
+  # It is therefore IN LINE with the Tracksperanto spec.
+  def test_parsing_from_shake_script
+    fixture = File.open(File.dirname(__FILE__) + '/shake_subpix_v01.shk')
+    
+    trackers = Tracksperanto::Import::ShakeScript.new(:io => fixture, :width => 720, :height => 576).to_a
+    assert_equal 2, trackers.length
+    
+    bl_kf = trackers[0][0]
+    assert_in_delta 0.5, bl_kf.abs_x, DELTA
+    assert_in_delta 0.5, bl_kf.abs_y, DELTA
+    
+    tr_kf = trackers[1][0]
+    assert_in_delta 715.5, tr_kf.abs_x, DELTA
+    assert_in_delta 571.514, tr_kf.abs_y, DELTA
+  end
+  
+  # Flame DOES allow subpix references, however in Action the coordinates of the first tracked keyframe
+  # will be nudged to whole pixels. Which is shit. However we care about the stabilizer data, not about
+  # how it gets applied.
+  # Subpixel handling in Flame is therefore IN LINE with the Tracksperanto spec.
+  def test_from_flame_setup
+    fixture = File.open(File.dirname(__FILE__) + '/Flame_Smk2013_SubpixSample.stabilizer')
+    t = Tracksperanto::Import::FlameStabilizer.new(:io => fixture).to_a[0]
+    first_kf = t[0]
+    assert_in_delta 0.5, first_kf.abs_x, DELTA
+    assert_in_delta 0.5, first_kf.abs_y, DELTA
+  end
+  
+  # Nuke properly computes coordinates off the corner.
+  # def test_from_nuke_script
+  #   fixture = File.open(File.dirname(__FILE__) + '/julik_nuke.nk')
+  #   t = Tracksperanto::Import::NukeScript.new(:width => 720, :height => 576, :io => fixture).to_a
+  #   assert_equal 1, t.length, "Should have imported one tracker"
+  # end
+end

data/test/subpixel/subpixel_grid.ifl

@@ -0,0 +1 @@
+/Users/julik/Code/apps/tracksperanto/test/subpixel/subpixel_grid.tif

data/test/subpixel/sy_subpix_2dpaths.txt

@@ -0,0 +1,4 @@
+Tracker1 0 -0.997265 0.996381 15
+Tracker2 0 0.988916 -0.986120 15
+Corner1 0 -1.001360 1.001627 15
+Tracker4 0 1.001373 -1.001747 15

data/test/test_const_name.rb

@@ -4,8 +4,8 @@ require File.expand_path(File.dirname(__FILE__)) + '/helper'
 class TestConstName < Test::Unit::TestCase
   
   def test_const_name
-    assert_equal "Scaler", Tracksperanto::Middleware::Scaler.const_name
-    assert_equal "Scaler", Tracksperanto::Middleware::Scaler.new(nil).const_name
+    assert_equal "Scaler", Tracksperanto::Tool::Scaler.const_name
+    assert_equal "Scaler", Tracksperanto::Tool::Scaler.new(nil).const_name
     assert_equal "ShakeScript", Tracksperanto::Import::ShakeScript.const_name
     assert_equal "ShakeText", Tracksperanto::Export::ShakeText.const_name
   end

data/test/test_pipeline.rb

@@ -32,8 +32,8 @@ class TestPipeline < Test::Unit::TestCase
   end
   
   def test_supports_block_init
-    pipeline = Tracksperanto::Pipeline::Base.new(:middleware_tuples => [:a, :b])
-    assert_equal [:a, :b], pipeline.middleware_tuples
+    pipeline = Tracksperanto::Pipeline::Base.new(:tool_tuples => [:a, :b])
+    assert_equal [:a, :b], pipeline.tool_tuples
   end
   
   def test_run_with_autodetected_importer_and_size_without_progress_block
@@ -87,24 +87,24 @@ class TestPipeline < Test::Unit::TestCase
     assert_raise(Tracksperanto::Pipeline::NoTrackersRecoveredError) { pipeline.run(empty_file_path) }
   end
   
-  def test_middleware_initialization_from_tuples
+  def test_tool_initialization_from_tuples
     create_stabilizer_file
     
     pipeline = Tracksperanto::Pipeline::Base.new
-    pipeline.middleware_tuples = [
+    pipeline.tool_tuples = [
       ["Bla", {:foo=> 234}]
     ]
     
     mock_mux = flexmock("MUX")
     mock_lint = flexmock("LINT")
     flexmock(Tracksperanto::Export::Mux).should_receive(:new).and_return(mock_mux)
-    flexmock(Tracksperanto::Middleware::Lint).should_receive(:new).with(mock_mux).and_return(mock_lint)
+    flexmock(Tracksperanto::Tool::Lint).should_receive(:new).with(mock_mux).and_return(mock_lint)
 
-    m = flexmock("middleware object")
-    mock_middleware_class = flexmock("middleware class")
+    m = flexmock("tool object")
+    mock_tool_class = flexmock("tool class")
     
-    flexmock(Tracksperanto).should_receive(:get_middleware).with("Bla").once.and_return(mock_middleware_class)
-    mock_middleware_class.should_receive(:new).with(mock_lint, {:foo => 234}).once
+    flexmock(Tracksperanto).should_receive(:get_tool).with("Bla").once.and_return(mock_tool_class)
+    mock_tool_class.should_receive(:new).with(mock_lint, {:foo => 234}).once
     
     assert_raise(NoMethodError) { pipeline.run(@stabilizer) }
   end
@@ -146,7 +146,7 @@ class TestPipeline < Test::Unit::TestCase
   
   def test_importing_file_with_trackers_of_zero_length_does_not_accumulate_any_trackers
     pft_with_empty_trackers = "./import/samples/pftrack5/empty_trackers.2dt"
-    i = Tracksperanto::Import::PFTrack.new(:io => File.open(pft_with_empty_trackers))
+    i = Tracksperanto::Import::PFTrack.new(:io => File.open(pft_with_empty_trackers), :width => 1920, :height => 1080)
     tks = i.to_a
     assert_equal 3, tks.length
     assert_equal 0, tks[0].length, "The tracker should have 0 keyframes for this test to make sense"

data/test/test_tracksperanto.rb

@@ -2,10 +2,10 @@
 require File.expand_path(File.dirname(__FILE__)) + '/helper'
 
 class TracksperantoTest < Test::Unit::TestCase
-  def test_middlewares
-    m = Tracksperanto.middlewares
-    m.each do | middleware_module |
-      assert_kind_of Module, middleware_module
+  def test_tools
+    m = Tracksperanto.tools
+    m.each do | tool_module |
+      assert_kind_of Module, tool_module
     end
   end
 
@@ -33,8 +33,8 @@ class TracksperantoTest < Test::Unit::TestCase
     assert_equal m.sort, m
   end
   
-  def test_middleware_names
-    m = Tracksperanto.middleware_names
+  def test_tool_names
+    m = Tracksperanto.tool_names
     assert m.include?("Golden")
   end
   
@@ -53,9 +53,9 @@ class TracksperantoTest < Test::Unit::TestCase
     assert_equal i1, Tracksperanto::Import::Syntheyes
   end
   
-  def test_get_middleware
-    i1 = Tracksperanto.get_middleware("lERP")
-    assert_equal i1, Tracksperanto::Middleware::Lerp
+  def test_get_tool
+    i1 = Tracksperanto.get_tool("lERP")
+    assert_equal i1, Tracksperanto::Tool::Lerp
   end
   
   def test_get_importer_multicase
@@ -82,8 +82,8 @@ class TracksperantoTest < Test::Unit::TestCase
     assert_raise(Tracksperanto::UnknownImporterError) { Tracksperanto.get_importer("foo") }
   end
   
-  def test_get_unknown_middleware_should_raise
-    assert_raise(Tracksperanto::UnknownMiddlewareError) { Tracksperanto.get_middleware("foo") }
+  def test_get_unknown_tool_should_raise
+    assert_raise(Tracksperanto::UnknownToolError) { Tracksperanto.get_tool("foo") }
   end
   
 end

data/test/test_uv_coords.rb

@@ -0,0 +1,29 @@
+# -*- encoding : utf-8 -*-
+require File.expand_path(File.dirname(__FILE__)) + '/helper'
+
+class TestUVCoords < Test::Unit::TestCase
+  include Tracksperanto::UVCoordinates
+  
+  DELTA = 0.001
+  
+  def test_from_uv
+    assert_in_delta 719.5, convert_from_uv(1.0, 720), DELTA
+    assert_in_delta 0.5, convert_from_uv(-1.0, 720), DELTA
+  end
+  
+  def test_from_uv_with_small_values
+    assert_in_delta 0.5, convert_from_uv(-1.0, 16), DELTA
+    assert_in_delta 15.5, convert_from_uv(1.0, 16), DELTA
+  end
+  
+  def test_to_uv_with_small_values
+    assert_in_delta -1.0, convert_to_uv(0.5, 16), DELTA
+    assert_in_delta 1.0, convert_to_uv(15.5, 16), DELTA
+  end
+  
+  
+  def test_to_uv
+    assert_in_delta 1.0, convert_to_uv(719.5, 720), DELTA
+    assert_in_delta -1.0, convert_to_uv(0.5, 720), DELTA
+  end
+end

data/test/{middleware → tools}/test_crop_middleware.rb

@@ -1,15 +1,15 @@
 # -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__)) + '/../helper'
 
-class CropMiddlewareTest < Test::Unit::TestCase
+class CropToolTest < Test::Unit::TestCase
   
   def test_action_description
-    assert_equal "Crop or pad the image by a specified number of pixels", Tracksperanto::Middleware::Crop.action_description
+    assert_equal "Crop or pad the image by a specified number of pixels", Tracksperanto::Tool::Crop.action_description
   end
   
   def test_crop_supports_hash_init
     receiver = flexmock
-    m = Tracksperanto::Middleware::Crop.new(receiver, :left => 13, :right => 0, :top => 25)
+    m = Tracksperanto::Tool::Crop.new(receiver, :left => 13, :right => 0, :top => 25)
   end
   
   def test_shift_bypasses_methods
@@ -22,7 +22,7 @@ class CropMiddlewareTest < Test::Unit::TestCase
     receiver.should_receive(:end_tracker_segment).once
     receiver.should_receive(:end_export).once
     
-    m = Tracksperanto::Middleware::Crop.new(receiver, :left => -60, :bottom => 58)
+    m = Tracksperanto::Tool::Crop.new(receiver, :left => -60, :bottom => 58)
     m.start_export(720, 576)
     m.start_tracker_segment("Tracker")
     m.export_point(1, 60, 30, 0)

data/test/{middleware → tools}/test_flip_middleware.rb

@@ -1,10 +1,10 @@
 # -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__)) + '/../helper'
 
-class FlipMiddlewareTest < Test::Unit::TestCase
+class FlipToolTest < Test::Unit::TestCase
   
   def test_action_description
-    assert_equal "Mirrors all the tracker paths horizontally", Tracksperanto::Middleware::Flip.action_description
+    assert_equal "Mirrors all the tracker paths horizontally", Tracksperanto::Tool::Flip.action_description
   end
   
   def test_export_with_enabled_flip
@@ -12,7 +12,7 @@ class FlipMiddlewareTest < Test::Unit::TestCase
     receiver.should_receive(:start_export).once.with(110, 120)
     receiver.should_receive(:export_point).once.with(1, 100, 95, 0)
 
-    m = Tracksperanto::Middleware::Flip.new(receiver)
+    m = Tracksperanto::Tool::Flip.new(receiver)
     m.start_export(110, 120)
     m.export_point(1, 10, 95, 0)
   end

data/test/{middleware → tools}/test_flop_middleware.rb

@@ -1,10 +1,10 @@
 # -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__)) + '/../helper'
 
-class FlopMiddlewareTest < Test::Unit::TestCase
+class FlopToolTest < Test::Unit::TestCase
   
   def test_action_description
-    assert_equal "Mirror all the tracker paths vertically", Tracksperanto::Middleware::Flop.action_description
+    assert_equal "Mirror all the tracker paths vertically", Tracksperanto::Tool::Flop.action_description
   end
   
   def test_export_flip_and_flop
@@ -12,7 +12,7 @@ class FlopMiddlewareTest < Test::Unit::TestCase
     receiver.should_receive(:start_export).once.with(110, 120)
     receiver.should_receive(:export_point).once.with(1, 10, 25, 0)
     
-    m = Tracksperanto::Middleware::Flop.new(receiver)
+    m = Tracksperanto::Tool::Flop.new(receiver)
     m.start_export(110, 120)
     m.export_point(1, 10, 95, 0)
   end

data/test/{middleware → tools}/test_golden_middleware.rb

@@ -1,10 +1,10 @@
 # -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__)) + '/../helper'
 
-class GoldenMiddlewareTest < Test::Unit::TestCase
+class GoldenToolTest < Test::Unit::TestCase
   
   def test_action_description
-    assert_equal "Reset residual of all the trackers to zero", Tracksperanto::Middleware::Golden.action_description
+    assert_equal "Reset residual of all the trackers to zero", Tracksperanto::Tool::Golden.action_description
   end
   
   def test_golden_bypasses_methods
@@ -16,7 +16,7 @@ class GoldenMiddlewareTest < Test::Unit::TestCase
     receiver.should_receive(:end_tracker_segment).once
     receiver.should_receive(:end_export).once
     
-    m = Tracksperanto::Middleware::Golden.new(receiver)
+    m = Tracksperanto::Tool::Golden.new(receiver)
     m.start_export(120, 120)
     m.start_tracker_segment("Tracker")
     m.export_point(0, 100, 100, 0.56)

data/test/{middleware → tools}/test_length_cutoff_middleware.rb

@@ -1,21 +1,21 @@
 # -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__)) + '/../helper'
 
-class LengthCutoffMiddlewareTest < Test::Unit::TestCase
+class LengthCutoffToolTest < Test::Unit::TestCase
   
   def test_action_description
-    assert_equal "Remove trackers that have less than the specified number of keyframes", Tracksperanto::Middleware::LengthCutoff.action_description
+    assert_equal "Remove trackers that have less than the specified number of keyframes", Tracksperanto::Tool::LengthCutoff.action_description
   end
   
   def test_default_length_set_to_zero_and_ignored
     receiver = flexmock
-    m = Tracksperanto::Middleware::LengthCutoff.new(receiver)
+    m = Tracksperanto::Tool::LengthCutoff.new(receiver)
     assert_equal 0, m.min_length
   end
   
   def test_slip_supports_hash_init
     receiver = flexmock
-    m = Tracksperanto::Middleware::LengthCutoff.new(receiver, :min_length => 23)
+    m = Tracksperanto::Tool::LengthCutoff.new(receiver, :min_length => 23)
     assert_equal 23, m.min_length
   end
   
@@ -30,7 +30,7 @@ class LengthCutoffMiddlewareTest < Test::Unit::TestCase
     receiver.should_receive(:end_export).once
     
     
-    m = Tracksperanto::Middleware::LengthCutoff.new(receiver, :min_length => 12)
+    m = Tracksperanto::Tool::LengthCutoff.new(receiver, :min_length => 12)
     m.start_export(120, 120)
     m.start_tracker_segment("Tracker")
     12.times {|t|  m.export_point(t, 100, 100, 0) }

data/test/{middleware → tools}/test_lens_middleware.rb

@@ -1,12 +1,12 @@
 # -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__)) + '/../helper'
 
-class LensMiddlewareTest < Test::Unit::TestCase
+class LensToolTest < Test::Unit::TestCase
   
   include Approximately
   
   def test_action_description
-    assert_equal "Apply or remove lens distortion with the Syntheyes algorithm", Tracksperanto::Middleware::LensDisto.action_description
+    assert_equal "Apply or remove lens distortion with the Syntheyes algorithm", Tracksperanto::Tool::LensDisto.action_description
   end
   
   def test_lens_bypasses_centerpoint
@@ -17,7 +17,7 @@ class LensMiddlewareTest < Test::Unit::TestCase
     receiver.should_receive(:end_tracker_segment).once
     receiver.should_receive(:end_export).once
     
-    m = Tracksperanto::Middleware::LensDisto.new(receiver, :k => 0.0168)
+    m = Tracksperanto::Tool::LensDisto.new(receiver, :k => 0.0168)
     m.start_export(1920, 1080)
     m.start_tracker_segment("Tracker")
     m.export_point(1, 1920 / 2.0, 1080.0 / 2.0, 0)
@@ -29,12 +29,12 @@ class LensMiddlewareTest < Test::Unit::TestCase
     receiver = flexmock
     receiver.should_receive(:start_export).once.with(1920, 1080)
     receiver.should_receive(:start_tracker_segment).once.with("Tracker")
-    receiver.should_receive(:export_point).once.with(1, approx(66.03), approx(43.978), approx(0))
+    receiver.should_receive(:export_point).once.with(1, approx(66.06), approx(43.99), approx(0))
     
     receiver.should_receive(:end_tracker_segment).once
     receiver.should_receive(:end_export).once
     
-    m = Tracksperanto::Middleware::LensDisto.new(receiver, :k => -0.0298, :kcube => 0.0078)
+    m = Tracksperanto::Tool::LensDisto.new(receiver, :k => -0.0298, :kcube => 0.0078)
     m.start_export(1920, 1080)
     m.start_tracker_segment("Tracker")
     m.export_point(1, 12.0, 14.0, 0)
@@ -46,11 +46,11 @@ class LensMiddlewareTest < Test::Unit::TestCase
     receiver = flexmock
     receiver.should_receive(:start_export).once.with(1920, 1080)
     receiver.should_receive(:start_tracker_segment).once.with("Tracker")
-    receiver.should_receive(:export_point).once.with(1, approx(11.999914830236555), approx(13.99995274335909), 0)
+    receiver.should_receive(:export_point).once.with(1, approx(11.96), approx(13.98), 0)
     receiver.should_receive(:end_tracker_segment).once
     receiver.should_receive(:end_export).once
     
-    m = Tracksperanto::Middleware::LensDisto.new(receiver, :k => -0.0298, :kcube => 0.0078, :remove => true)
+    m = Tracksperanto::Tool::LensDisto.new(receiver, :k => -0.0298, :kcube => 0.0078, :remove => true)
     m.start_export(1920, 1080)
     m.start_tracker_segment("Tracker")
     m.export_point(1, 66.03001446825158, 43.978678913818925, 0)
@@ -66,8 +66,8 @@ class LensMiddlewareTest < Test::Unit::TestCase
     receiver.should_receive(:end_tracker_segment).once
     receiver.should_receive(:end_export).once
     
-    apply = Tracksperanto::Middleware::LensDisto.new(receiver, :k => -0.0298, :kcube => 0.2178)
-    remove = Tracksperanto::Middleware::LensDisto.new(apply, :k => -0.0298, :kcube => 0.2178, :remove => true)
+    apply = Tracksperanto::Tool::LensDisto.new(receiver, :k => -0.0298, :kcube => 0.2178)
+    remove = Tracksperanto::Tool::LensDisto.new(apply, :k => -0.0298, :kcube => 0.2178, :remove => true)
     
     remove.start_export(1920, 1080)
     remove.start_tracker_segment("Tracker")

data/test/{middleware → tools}/test_lerp_middleware.rb

@@ -1,15 +1,15 @@
 # -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__)) + '/../helper'
 
-class LerpMiddlewareTest < Test::Unit::TestCase
+class LerpToolTest < Test::Unit::TestCase
   
   def test_action_description
-    assert_equal "Interpolate missing keyframes of all the trackers", Tracksperanto::Middleware::Lerp.action_description
+    assert_equal "Interpolate missing keyframes of all the trackers", Tracksperanto::Tool::Lerp.action_description
   end
   
   def test_lerp
     receiver = flexmock
-    m = Tracksperanto::Middleware::Lerp.new(receiver)
+    m = Tracksperanto::Tool::Lerp.new(receiver)
     receiver.should_receive(:start_export).with(720, 576).once
     receiver.should_receive(:start_tracker_segment).with("Foo").once
     receiver.should_receive(:export_point).with(1, 1.0, 2.0, 0).once

data/test/{middleware → tools}/test_lint_middleware.rb

@@ -1,19 +1,19 @@
 # -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__)) + '/../helper'
 
-class LintMiddlewareTest < Test::Unit::TestCase
+class LintToolTest < Test::Unit::TestCase
   
   def test_action_description
-    assert_equal "Verify all the exported trackers and check for errors", Tracksperanto::Middleware::Lint.action_description
+    assert_equal "Verify all the exported trackers and check for errors", Tracksperanto::Tool::Lint.action_description
   end
   
   def test_empty_export_raises
     m = flexmock
     m.should_receive(:start_export).once
     
-    ex = Tracksperanto::Middleware::Lint.new(m)
+    ex = Tracksperanto::Tool::Lint.new(m)
     ex.start_export(100, 100)
-    assert_raise(Tracksperanto::Middleware::Lint::NoTrackersExportedError) do
+    assert_raise(Tracksperanto::Tool::Lint::NoTrackersExportedError) do
       ex.end_export
     end
     
@@ -24,11 +24,11 @@ class LintMiddlewareTest < Test::Unit::TestCase
     m.should_receive(:start_export).once
     m.should_receive(:start_tracker_segment).once
     
-    ex = Tracksperanto::Middleware::Lint.new(m)
+    ex = Tracksperanto::Tool::Lint.new(m)
     ex.start_export(100, 100)
     ex.start_tracker_segment("Foo")
     
-    assert_raise(Tracksperanto::Middleware::Lint::EmptyTrackerSentError) do
+    assert_raise(Tracksperanto::Tool::Lint::EmptyTrackerSentError) do
       ex.end_tracker_segment
     end
   end
@@ -39,12 +39,12 @@ class LintMiddlewareTest < Test::Unit::TestCase
     m.should_receive(:start_tracker_segment).once
     m.should_receive(:export_point).once
     
-    ex = Tracksperanto::Middleware::Lint.new(m)
+    ex = Tracksperanto::Tool::Lint.new(m)
     ex.start_export(100, 100)
     ex.start_tracker_segment("Foo")
     ex.export_point(2, 123.3, 456.0, 0.0)
     
-    assert_raise(Tracksperanto::Middleware::Lint::NonSequentialKeyframes) do
+    assert_raise(Tracksperanto::Tool::Lint::NonSequentialKeyframes) do
       ex.export_point(1, 123.3, 456.0, 0.0)
     end
   end
@@ -56,7 +56,7 @@ class LintMiddlewareTest < Test::Unit::TestCase
     m.should_receive(:start_tracker_segment).once
     m.should_receive(:export_point).twice
     
-    ex = Tracksperanto::Middleware::Lint.new(m)
+    ex = Tracksperanto::Tool::Lint.new(m)
     ex.start_export(100, 100)
     ex.start_tracker_segment("Foo")
     ex.export_point(-1, 123.3, 456.0, 0.0)
@@ -68,11 +68,11 @@ class LintMiddlewareTest < Test::Unit::TestCase
     m.should_receive(:start_export).once
     m.should_receive(:start_tracker_segment).once
     
-    ex = Tracksperanto::Middleware::Lint.new(m)
+    ex = Tracksperanto::Tool::Lint.new(m)
     ex.start_export(100, 100)
     ex.start_tracker_segment("Foo")
     
-    assert_raise(Tracksperanto::Middleware::Lint::TrackerRestartedError) do
+    assert_raise(Tracksperanto::Tool::Lint::TrackerRestartedError) do
       ex.start_tracker_segment("Bar")
     end
   end

data/test/{middleware → tools}/test_move_to_first_frame_middleware.rb

@@ -1,10 +1,10 @@
 # -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__)) + '/../helper'
 
-class MoveToFirstFrameMiddlewareTest < Test::Unit::TestCase
+class MoveToFirstFrameToolTest < Test::Unit::TestCase
   
   def test_action_description
-    assert_equal "Move all the keyframes in time so that the first frame is the first animated keyframe", Tracksperanto::Middleware::MoveToFirst.action_description
+    assert_equal "Move all the keyframes in time so that the track starts at frame 1", Tracksperanto::Tool::MoveToFirst.action_description
   end
   
   def test_move_to_first_frame
@@ -21,7 +21,7 @@ class MoveToFirstFrameMiddlewareTest < Test::Unit::TestCase
 
     receiver.should_receive(:end_export)
     
-    m = Tracksperanto::Middleware::MoveToFirst.new(receiver)
+    m = Tracksperanto::Tool::MoveToFirst.new(receiver)
     
     m.start_export(120, 120)
     

data/test/{middleware → tools}/test_pad_middleware.rb

@@ -1,15 +1,15 @@
 # -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__)) + '/../helper'
 
-class PadMiddlewareTest < Test::Unit::TestCase
+class PadToolTest < Test::Unit::TestCase
   
   def test_action_description
-    assert_equal "Pad or crop the image by a fraction of it's original size", Tracksperanto::Middleware::Pad.action_description
+    assert_equal "Pad or crop the image by a fraction of it's original size", Tracksperanto::Tool::Pad.action_description
   end
   
   def test_shift_supports_hash_init
     receiver = flexmock
-    m = Tracksperanto::Middleware::Pad.new(receiver, 
+    m = Tracksperanto::Tool::Pad.new(receiver, 
       :left_pad => 0.5, :right_pad => 0, :top_pad => -0.2)
     assert_in_delta 0.5, m.left_pad, 0.001 
     assert_in_delta 0.0, m.bottom_pad, 0.001 
@@ -25,7 +25,7 @@ class PadMiddlewareTest < Test::Unit::TestCase
     receiver.should_receive(:end_tracker_segment).once
     receiver.should_receive(:end_export).once
     
-    m = Tracksperanto::Middleware::Pad.new(receiver, :left_pad => -0.25, :bottom_pad => 0.10)
+    m = Tracksperanto::Tool::Pad.new(receiver, :left_pad => -0.25, :bottom_pad => 0.10)
     m.start_export(720, 576)
     m.start_tracker_segment("Tracker")
     m.export_point(1, 60, 30, 0)

data/test/{middleware → tools}/test_prefix.rb

@@ -1,15 +1,15 @@
 # -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__)) + '/../helper'
 
-class PrefixMiddlewareTest < Test::Unit::TestCase
+class PrefixToolTest < Test::Unit::TestCase
   
   def test_action_description
-    assert_equal "Prefix tracker names with text", Tracksperanto::Middleware::Prefix.action_description
+    assert_equal "Prefix tracker names with text", Tracksperanto::Tool::Prefix.action_description
   end
   
   def test_prefix_supports_hash_init
     receiver = flexmock
-    m = Tracksperanto::Middleware::Prefix.new(receiver, :prefix => "foo")
+    m = Tracksperanto::Tool::Prefix.new(receiver, :prefix => "foo")
     assert_equal "foo", m.prefix
   end
   
@@ -17,7 +17,7 @@ class PrefixMiddlewareTest < Test::Unit::TestCase
     receiver = flexmock
     receiver.should_receive(:start_tracker_segment).once.with("Pre_Tracker")
     
-    m = Tracksperanto::Middleware::Prefix.new(receiver, :prefix => "Pre_")
+    m = Tracksperanto::Tool::Prefix.new(receiver, :prefix => "Pre_")
     m.start_tracker_segment("Tracker")
   end
 
@@ -25,7 +25,7 @@ class PrefixMiddlewareTest < Test::Unit::TestCase
     receiver = flexmock
     receiver.should_receive(:start_tracker_segment).once.with("Tracker")
     
-    m = Tracksperanto::Middleware::Prefix.new(receiver)
+    m = Tracksperanto::Tool::Prefix.new(receiver)
     m.start_tracker_segment("Tracker")
   end
   

data/test/{middleware → tools}/test_reformat_middleware.rb

@@ -1,22 +1,22 @@
 # -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__)) + '/../helper'
 
-class ReformatMiddlewareTest < Test::Unit::TestCase
+class ReformatToolTest < Test::Unit::TestCase
   
   def test_action_description
-    assert_equal "Reformat the comp together with it's trackers to conform to a specific format", Tracksperanto::Middleware::Reformat.action_description
+    assert_equal "Reformat the comp together with it's trackers to conform to a specific format", Tracksperanto::Tool::Reformat.action_description
   end
   
   def test_default_params_zeroed
     receiver = flexmock
-    m = Tracksperanto::Middleware::Reformat.new(receiver)
+    m = Tracksperanto::Tool::Reformat.new(receiver)
     assert_equal 0, m.width
     assert_equal 0, m.height
   end
   
   def test_reformat_supports_hash_init
     receiver = flexmock
-    m = Tracksperanto::Middleware::Reformat.new(receiver, :width => 1920, :height => 1080)
+    m = Tracksperanto::Tool::Reformat.new(receiver, :width => 1920, :height => 1080)
     assert_equal 1920, m.width
     assert_equal 1080, m.height
   end
@@ -29,7 +29,7 @@ class ReformatMiddlewareTest < Test::Unit::TestCase
     receiver.should_receive(:start_export).once.with(1920,1080)
     receiver.should_receive(:end_export).once
     
-    m = Tracksperanto::Middleware::Reformat.new(receiver, :width => 1920, :height => 1080)
+    m = Tracksperanto::Tool::Reformat.new(receiver, :width => 1920, :height => 1080)
     
     m.start_export(720, 576)
     m.end_export