tracksperanto 2.1.1 → 2.2.0

data/test/import/test_3de_import.rb

@@ -12,11 +12,8 @@ class EqualizerImportTest < Test::Unit::TestCase
   def test_parsing_from_importable
     fixture = File.open(File.dirname(__FILE__) + '/samples/3de_v4/3de_export_cube.txt')
     
-    parser = Tracksperanto::Import::Equalizer4.new
-    parser.width = 1024
-    parser.height = 512
-    trackers = parser.parse(fixture)
-    
+    parser = Tracksperanto::Import::Equalizer4.new(:io => fixture, :width => 1024, :height => 512)
+    trackers = parser.to_a
     assert_equal 8, trackers.length
     
     first_t = trackers[0]

data/test/import/test_3de_import3.rb

@@ -12,8 +12,8 @@ class Equalizer3ImportTest < Test::Unit::TestCase
   def test_parsing_from_importable
     fixture = File.open(File.dirname(__FILE__) + '/samples/3de_v3/3de_export_v3.txt')
     
-    parser = Tracksperanto::Import::Equalizer3.new
-    trackers = parser.parse(fixture)
+    parser = Tracksperanto::Import::Equalizer3.new(:io => fixture)
+    trackers = parser.to_a
     
     assert_equal 2048, parser.width
     assert_equal 778, parser.height

data/test/import/test_boujou_import.rb

@@ -12,8 +12,8 @@ class BoujouImportTest < Test::Unit::TestCase
   def test_parsing_from_fixture
      fixture = File.open(File.dirname(__FILE__) + '/samples/boujou_features_text/boujou_txt_export.txt')
      
-     parser = Tracksperanto::Import::Boujou.new(:width => 2560, :height => 1200)
-     trackers = parser.parse(fixture)
+     parser = Tracksperanto::Import::Boujou.new(:io => fixture, :width => 2560, :height => 1200)
+     trackers = parser.to_a
      
      assert_equal 21, trackers.length
      

data/test/import/test_flame_import.rb

@@ -86,9 +86,9 @@ class FlameImportTest < Test::Unit::TestCase
   def test_parsing_from_flame
     fixture = File.open(File.dirname(__FILE__) + '/samples/flame_stabilizer/hugeFlameSetup.stabilizer')
     
-    parser = Tracksperanto::Import::FlameStabilizer.new
+    parser = Tracksperanto::Import::FlameStabilizer.new(:io => fixture)
+    trackers = parser.to_a
     
-    trackers = parser.parse(fixture)
     assert_equal 2048, parser.width
     assert_equal 1176, parser.height
     
@@ -115,9 +115,9 @@ class FlameImportTest < Test::Unit::TestCase
   def test_parsing_another_track
     fixture = File.open(File.dirname(__FILE__) + '/samples/flame_stabilizer/megaTrack.action.3dtrack.stabilizer')
     
-    parser = Tracksperanto::Import::FlameStabilizer.new
+    parser = Tracksperanto::Import::FlameStabilizer.new(:io => fixture)
+    trackers = parser.to_a
     
-    trackers = parser.parse(fixture)
     assert_equal 1920, parser.width
     assert_equal 1080, parser.height
     
@@ -127,9 +127,9 @@ class FlameImportTest < Test::Unit::TestCase
   def test_simple_from_combustion
     fixture = File.open(File.dirname(__FILE__) + '/samples/flame_stabilizer/fromCombustion_fromMidClip_wSnap.stabilizer')
     
-    parser = Tracksperanto::Import::FlameStabilizer.new
+    parser = Tracksperanto::Import::FlameStabilizer.new(:io => fixture)
+    trackers = parser.to_a
     
-    trackers = parser.parse(fixture)
     assert_equal 1280, parser.width
     assert_equal 540, parser.height
     
@@ -151,8 +151,9 @@ class FlameImportTest < Test::Unit::TestCase
   
   def test_from_tracksperanto
     fixture = File.open(File.dirname(__FILE__) + '/samples/flame_stabilizer/fromTracksperanto.stabilizer')
-    parser = Tracksperanto::Import::FlameStabilizer.new
-    trackers = parser.parse(fixture)
+    parser = Tracksperanto::Import::FlameStabilizer.new(:io => fixture)
+    trackers = parser.to_a
+    
     assert_equal 3, trackers.length
     assert_equal 3, trackers[0].length
   end

data/test/import/test_match_mover_import.rb

@@ -14,11 +14,9 @@ class MatchMoverImportTest < Test::Unit::TestCase
   def test_parsing_from_matchmover
     fixture = File.open(P)
     
-    parser = Tracksperanto::Import::MatchMover.new
-    parser.width = 2048
-    parser.height = 1176
+    parser = Tracksperanto::Import::MatchMover.new(:io => fixture, :width => 2048, :height => 1176)
+    trackers = parser.to_a
     
-    trackers = parser.parse(fixture)
     assert_equal 2560, parser.width
     assert_equal 1080, parser.height
     

data/test/import/test_maya_live_import.rb

@@ -12,8 +12,8 @@ class MayaLiveImportTest < Test::Unit::TestCase
   def test_parse_file
     f = File.open(File.dirname(__FILE__) + "/samples/mayalive/mayalive_kipShot.txt")
     
-    p = Tracksperanto::Import::MayaLive.new
-    trackers = p.parse(f)
+    p = Tracksperanto::Import::MayaLive.new(:io => f)
+    trackers = p.to_a
     
     assert_in_delta 2.37, p.aspect, DELTA
     assert_equal 1280, p.width
@@ -34,9 +34,10 @@ class MayaLiveImportTest < Test::Unit::TestCase
   def test_parse_file_with_custom_aspect
     f = File.open(File.dirname(__FILE__) + "/samples/mayalive/mayalive_kipShot.txt")
     
-    p = Tracksperanto::Import::MayaLive.new
+    p = Tracksperanto::Import::MayaLive.new(:io => f)
     p.aspect = 1.78
-    trackers = p.parse(f)
+    trackers = p.to_a
+    
     assert_in_delta 1.78, p.aspect, DELTA
     
     assert_equal 1280, p.width

data/test/import/test_nuke_import.rb

@@ -11,21 +11,22 @@ class NukeImportTest < Test::Unit::TestCase
   
   def test_parsing_big_file_from_nuke
     fixture = File.open(File.dirname(__FILE__) + '/samples/nuke/45trackers.nk')
-    parser = Tracksperanto::Import::NukeScript.new
+    parser = Tracksperanto::Import::NukeScript.new(:io => fixture)
     parser.width = 2048
     parser.height = 1176
-    trackers = parser.parse(fixture)
+    
+    trackers = parser.to_a
     assert_equal 45, trackers.length
   end
   
   def test_parsing_from_nuke
     fixture = File.open(File.dirname(__FILE__) + '/samples/nuke/one_tracker_with_break.nk')
     
-    parser = Tracksperanto::Import::NukeScript.new
+    parser = Tracksperanto::Import::NukeScript.new(:io => fixture)
     parser.width = 2048
     parser.height = 1176
     
-    trackers = parser.parse(fixture)
+    trackers = parser.to_a
     
     assert_equal 2, trackers.length
     sec_tracker = trackers[1]
@@ -37,19 +38,21 @@ class NukeImportTest < Test::Unit::TestCase
   
   def test_parsing_many_tracks_per_node
     fixture = File.open(File.dirname(__FILE__) + '/samples/nuke/018.nk')
-    parser = Tracksperanto::Import::NukeScript.new
+    parser = Tracksperanto::Import::NukeScript.new(:io => fixture)
     parser.width = 1920
     parser.height = 1080
-    trackers = parser.parse(fixture)
+    trackers = parser.to_a
+    
     assert_equal 21, trackers.length
   end
   
   def test_parsing_node_with_gaps
     fixture = File.open(File.dirname(__FILE__) + '/samples/nuke/tracker_with_differing_gaps.nk')
-    parser = Tracksperanto::Import::NukeScript.new
+    parser = Tracksperanto::Import::NukeScript.new(:io => fixture)
     parser.width = 2048
     parser.height = 3112
-    trackers = parser.parse(fixture)
+    
+    trackers = parser.to_a
     assert_equal 1, trackers.length
     t = trackers[0]
     assert_equal 45, t.length
@@ -62,10 +65,10 @@ class NukeImportTest < Test::Unit::TestCase
   
   def test_parsing_node_with_succesive_gaps_larger_than_one_frame
     fixture = File.open(File.dirname(__FILE__) + '/samples/nuke/tracker_with_repeating_gaps.nk')
-    parser = Tracksperanto::Import::NukeScript.new
+    parser = Tracksperanto::Import::NukeScript.new(:io => fixture)
     parser.width = 2048
     parser.height = 1556
-    trackers = parser.parse(fixture)
+    trackers = parser.to_a
     assert_equal 1, trackers.length
     t = trackers[0]
     assert_equal 5, t[3].frame
@@ -76,11 +79,11 @@ class NukeImportTest < Test::Unit::TestCase
   def test_parsing_from_nuke_group
     fixture = File.open(File.dirname(__FILE__) + '/samples/nuke/one_tracker_with_break_in_grp.nk')
     
-    parser = Tracksperanto::Import::NukeScript.new
+    parser = Tracksperanto::Import::NukeScript.new(:io => fixture)
     parser.width = 2048
     parser.height = 1176
     
-    trackers = parser.parse(fixture)
+    trackers = parser.to_a
     assert_equal 2, trackers.length
     
     sec_tracker = trackers[1]
@@ -92,9 +95,10 @@ class NukeImportTest < Test::Unit::TestCase
   
   def test_parsing_nuke_curve
     curve = '{curve x742 888 890.2463989 891.6602783 \
-893.5056763 895.6155396 s95 897.2791748 899.1762695 x754 912.0731812 x755 913.7190552 916.0959473 918.1025391 920.0751953 922.1898804}'
-    p = Tracksperanto::Import::NukeScript.new
-    result = p.send(:parse_curve, curve)
+893.5056763 895.6155396 s95 897.2791748 899.1762695 \
+x754 912.0731812 x755 913.7190552 916.0959473 918.1025391 920.0751953 922.1898804}'
+    p = Tracksperanto::NukeGrammarUtils.new
+    result = p.parse_curve(curve)
     assert_kind_of Array, result
     assert_equal 13, result.length
     assert_equal 742, result[0][0]
@@ -104,7 +108,7 @@ class NukeImportTest < Test::Unit::TestCase
   def test_zip_channels
     tuples_x = [[1, 125], [3, 234], [5, 456], [9,876]]
     tuples_y = [[2, 437], [3, 123], [6, 432], [9, 430]]
-    result = Tracksperanto::Import::NukeScript.new.send(:zip_curve_tuples, tuples_x, tuples_y)
+    result = Tracksperanto::Import::NukeScript.new(:io => StringIO.new).send(:zip_curve_tuples, tuples_x, tuples_y)
     assert_equal [[3, 234, 123], [9, 876, 430]], result
   end
 end

data/test/import/test_pftrack_import.rb

@@ -11,9 +11,9 @@ class PFTrackImportTest < Test::Unit::TestCase
   
   def test_parsing_from_pftrack5_with_digit_names
     fixture = File.open(File.dirname(__FILE__) + '/samples/pftrack5/apft.2dt')
-    parser = Tracksperanto::Import::PFTrack.new(:width => 1920, :height => 1080)
+    parser = Tracksperanto::Import::PFTrack.new(:io => fixture, :width => 1920, :height => 1080)
     
-    trackers = parser.parse(fixture)
+    trackers = parser.to_a
     assert_equal 4, trackers.length
     second_tracker = trackers[1]
     assert_equal "1015_Primary", second_tracker.name
@@ -23,11 +23,11 @@ class PFTrackImportTest < Test::Unit::TestCase
     
     fixture = File.open(File.dirname(__FILE__) + '/samples/pftrack4/sourcefile_pftrack.2dt')
     
-    parser = Tracksperanto::Import::PFTrack.new
+    parser = Tracksperanto::Import::PFTrack.new(:io => fixture)
     parser.width = 2560
     parser.height = 1080
     
-    trackers = parser.parse(fixture)
+    trackers = parser.to_a
     assert_equal 43, trackers.length
     
     first_kf = trackers[0].keyframes[0]
@@ -50,8 +50,9 @@ class PFTrackImportTest < Test::Unit::TestCase
   
   def test_garage_shot_from_pftrack_5
     fixture = File.open(File.dirname(__FILE__) + '/samples/pftrack5/garage.2dt')
-    parser = Tracksperanto::Import::PFTrack.new(:width => 1920, :height => 1080)
-    trackers = parser.parse(fixture)
+    parser = Tracksperanto::Import::PFTrack.new(:io => fixture, :width => 1920, :height => 1080)
+    
+    trackers = parser.to_a
     assert_equal 250, trackers.length
     assert_equal "Tracker121_Primary", trackers[0].name
     assert_equal 189, trackers[0].length
@@ -59,8 +60,9 @@ class PFTrackImportTest < Test::Unit::TestCase
   
   def test_pfmatchit_file
     fixture = File.open(File.dirname(__FILE__) + '/samples/pfmatchit/pfmatchit_example.2dt')
-    parser = Tracksperanto::Import::PFTrack.new(:width => 1920, :height => 1080)
-    trackers = parser.parse(fixture)
+    parser = Tracksperanto::Import::PFTrack.new(:io => fixture, :width => 1920, :height => 1080)
+    
+    trackers = parser.to_a
     assert_equal 2, trackers.length
     assert_equal "Feature1_1", trackers[0].name
     assert_equal 37, trackers[0].length

data/test/import/test_shake_script_import.rb

@@ -6,8 +6,8 @@ class ShakeScriptImportTest < Test::Unit::TestCase
   def test_parsing_fifty_tracker_nodes_with_one_track_each
     fixture = File.open(File.dirname(__FILE__) + '/samples/shake_script/shake_tracker_nodes.shk')
     
-    trackers = Tracksperanto::Import::ShakeScript.new.parse(fixture)
-    assert_equal 50, trackers.length
+    trackers = Tracksperanto::Import::ShakeScript.new(:io => fixture).to_a
+    assert_equal 26, trackers.length
     
     t = trackers[-1]
     assert_equal "Tracker8_track1", t.name
@@ -26,7 +26,7 @@ class ShakeScriptImportTest < Test::Unit::TestCase
   def test_parse_tracker_node_with_no_animation
     fixture = File.open(File.dirname(__FILE__) + '/samples/shake_script/shake_tracker_with_no_anim.shk')
     assert_nothing_raised do
-      trackers = Tracksperanto::Import::ShakeScript.new.parse(fixture)
+      trackers = Tracksperanto::Import::ShakeScript.new(:io => fixture).to_a
       assert_equal 0, trackers.length
     end
   end
@@ -34,7 +34,7 @@ class ShakeScriptImportTest < Test::Unit::TestCase
   def test_parsing_two_tracks_in_one_tracker_node
     fixture = File.open(File.dirname(__FILE__) + '/samples/shake_script/two_tracks_in_one_tracker.shk')
     
-    trackers = Tracksperanto::Import::ShakeScript.new.parse(fixture)
+    trackers = Tracksperanto::Import::ShakeScript.new(:io => fixture).to_a
     assert_equal 2, trackers.length
     
     t = trackers[0]
@@ -57,7 +57,7 @@ class ShakeScriptImportTest < Test::Unit::TestCase
   def test_parsing_three_tracks_in_one_stabilizer_node
     fixture = File.open(File.dirname(__FILE__) + '/samples/shake_script/three_tracks_in_one_stabilizer.shk')
     
-    trackers = Tracksperanto::Import::ShakeScript.new.parse(fixture)
+    trackers = Tracksperanto::Import::ShakeScript.new(:io => fixture).to_a
     ft = trackers[0]
     assert_equal "Stabilize1_track1", ft.name
     assert_equal 3, trackers.length
@@ -66,7 +66,7 @@ class ShakeScriptImportTest < Test::Unit::TestCase
   def test_parsing_four_tracks_in_one_stabilizer_node
     fixture = File.open(File.dirname(__FILE__) + '/samples/shake_script/four_tracks_in_one_stabilizer.shk')
     
-    trackers = Tracksperanto::Import::ShakeScript.new.parse(fixture)
+    trackers = Tracksperanto::Import::ShakeScript.new(:io => fixture).to_a
     ft = trackers[0]
     assert_equal "Stabilize2_track1", ft.name
     assert_equal 4, trackers.length
@@ -75,7 +75,7 @@ class ShakeScriptImportTest < Test::Unit::TestCase
   def test_parsing_four_tracks_in_one_matchmove_node
     fixture = File.open(File.dirname(__FILE__) + '/samples/shake_script/four_tracks_in_one_matchmove.shk')
     
-    trackers = Tracksperanto::Import::ShakeScript.new.parse(fixture)
+    trackers = Tracksperanto::Import::ShakeScript.new(:io => fixture).to_a
     assert_equal 4, trackers.length
     
     ft = trackers[0]
@@ -85,21 +85,21 @@ class ShakeScriptImportTest < Test::Unit::TestCase
   def test_parsing_from_nspline_curves
     fixture = File.open(File.dirname(__FILE__) + '/samples/shake_script/shake_trackers_with_Nspline.shk')
     
-    trackers = Tracksperanto::Import::ShakeScript.new.parse(fixture)
+    trackers = Tracksperanto::Import::ShakeScript.new(:io => fixture).to_a
     assert_equal 3, trackers.length
     assert_equal 160, trackers[0].length
   end
   
   def test_boujou_exported_script
     fixture = File.open(File.dirname(__FILE__) + "/samples/shake_script/shake_script_from_boujou.shk")
-    trackers = Tracksperanto::Import::ShakeScript.new.parse(fixture)
+    trackers = Tracksperanto::Import::ShakeScript.new(:io => fixture).to_a
     assert_equal 1, trackers.length
     assert_equal 387, trackers[0].length
   end
   
   def test_hermite_interpolation
     fixture = File.open(File.dirname(__FILE__) + "/samples/shake_script/stabilize_nodes_with_hermite.shk")
-    trackers = Tracksperanto::Import::ShakeScript.new.parse(fixture)
+    trackers = Tracksperanto::Import::ShakeScript.new(:io => fixture).to_a
     assert_equal 3, trackers.length
     last_t = trackers[0]
     assert_equal "Stabilize1_track1", last_t.name
@@ -113,24 +113,14 @@ class ShakeScriptImportTest < Test::Unit::TestCase
   
   def test_file_from_matchmover
     fixture = File.open(File.dirname(__FILE__) + "/samples/shake_script/from_matchmover.shk")
-    trackers = Tracksperanto::Import::ShakeScript.new(:width => 1920, :height => 1080).parse(fixture)
+    trackers = Tracksperanto::Import::ShakeScript.new(:io => fixture, :width => 1920, :height => 1080).to_a
     assert_equal 8, trackers.length
   end
   
   def test_tracker_node_from_stoneage_shake_version
     fixture = File.open(File.dirname(__FILE__) + "/samples/shake_script/oldTrackerNode.shk")
-    p = Tracksperanto::Import::ShakeScript.new(:width => 5000, :height => 5000)
-    trackers = p.parse(fixture)
+    trackers = Tracksperanto::Import::ShakeScript.new(:io => fixture, :width => 5000, :height => 5000).to_a
     assert_equal 1, trackers.length
     assert_equal 850, trackers[0].length
   end
-
-  def test_script_with_stabilizer_node_without_animation
-    fixture = File.open(File.dirname(__FILE__) + "/samples/shake_script/track.shk")
-    p = Tracksperanto::Import::ShakeScript.new(:width => 1920, :height => 1080)
-    trackers = p.parse(fixture)
-    assert_equal 2, trackers.length
-    assert_equal 261, trackers[0].length
-  end
-
 end

data/test/import/test_shake_text_import.rb

@@ -11,7 +11,7 @@ class ShakeTextImportTest < Test::Unit::TestCase
   
   def test_parsing
     fixture = File.open(File.dirname(__FILE__) + '/samples/shake_text/one_shake_tracker.txt')
-    trackers = Tracksperanto::Import::ShakeText.new.parse(fixture)
+    trackers = Tracksperanto::Import::ShakeText.new(:io => fixture).to_a
     
     assert_kind_of Enumerable, trackers
     assert_equal 1, trackers.length
@@ -31,7 +31,7 @@ class ShakeTextImportTest < Test::Unit::TestCase
   
   def test_parsing_two_trackers
     fixture = File.open(File.dirname(__FILE__) + '/samples/shake_text/two_shake_trackers.txt')
-    trackers = Tracksperanto::Import::ShakeText.new.parse(fixture)
+    trackers = Tracksperanto::Import::ShakeText.new(:io => fixture).to_a
     
     assert_kind_of Enumerable, trackers
     assert_equal 2, trackers.length

data/test/import/test_syntheyes_import.rb

@@ -2,6 +2,7 @@ require File.expand_path(File.dirname(__FILE__)) + '/../helper'
 
 class SyntheyesImportTest < Test::Unit::TestCase
   DELTA = 0.9 # our SynthEyes sample is somewhat inaccurate :-P
+  
   def test_introspects_properly
     i = Tracksperanto::Import::Syntheyes
     assert_equal "Syntheyes 2D tracker paths file", i.human_name
@@ -10,9 +11,8 @@ class SyntheyesImportTest < Test::Unit::TestCase
   
   def test_parsing_from_importable
     fixture = File.open(File.dirname(__FILE__) + '/samples/syntheyes_2d_paths/shake_tracker_nodes_to_syntheyes.txt')
-    parser = Tracksperanto::Import::Syntheyes.new(:width => 2560, :height => 1080)
+    trackers = Tracksperanto::Import::Syntheyes.new(:io => fixture, :width => 2560, :height => 1080).to_a
     
-    trackers = parser.parse(fixture)
     assert_equal 50, trackers.length
     
     first_kf = trackers[0].keyframes[0]
@@ -27,24 +27,23 @@ class SyntheyesImportTest < Test::Unit::TestCase
   
   def test_parsing_cola_plate
     fixture = File.open(File.dirname(__FILE__) + '/samples/syntheyes_2d_paths/cola_plate.txt')
-    parser = Tracksperanto::Import::Syntheyes.new(:width => 1920, :height => 1080)
+    trackers = Tracksperanto::Import::Syntheyes.new(:io => fixture, :width => 1920, :height => 1080).to_a
     
-    trackers = parser.parse(fixture)
     assert_equal 6, trackers.length
   end
   
   def test_parsing_with_one_tracker
     fixture = File.open(File.dirname(__FILE__) + '/samples/syntheyes_2d_paths/one_tracker.txt')
-    parser = Tracksperanto::Import::Syntheyes.new(:width => 1920, :height => 1080)
-    trackers = parser.parse(fixture)
+    trackers = Tracksperanto::Import::Syntheyes.new(:io => fixture, :width => 1920, :height => 1080).to_a
+    
     assert_equal 1, trackers.length
     assert_equal 49, trackers[0].length
   end
   
   def test_parsing_from_sy_2010
     fixture = File.open(File.dirname(__FILE__) + '/samples/syntheyes_2d_paths/morePoints_sy2010.txt')
-    parser = Tracksperanto::Import::Syntheyes.new(:width => 1920, :height => 1080)
-    trackers = parser.parse(fixture)
+    trackers = Tracksperanto::Import::Syntheyes.new(:io => fixture, :width => 1920, :height => 1080).to_a
+    
     assert_equal 26, trackers.length
   end
 end