tracksperanto 2.9.5 → 2.9.6

data/test/middleware/test_flop_middleware.rb

@@ -2,14 +2,9 @@
 require File.expand_path(File.dirname(__FILE__)) + '/../helper'
 
 class FlopMiddlewareTest < Test::Unit::TestCase
-  def test_shift_supports_hash_init
-    receiver = flexmock
-    
-    m = Tracksperanto::Middleware::Flop.new(receiver)
-    assert !m.enabled
-    
-    m = Tracksperanto::Middleware::Flop.new(receiver, :enabled => true)
-    assert m.enabled
+  
+  def test_action_description
+    assert_equal "Mirror all the tracker paths vertically", Tracksperanto::Middleware::Flop.action_description
   end
   
   def test_export_flip_and_flop
@@ -17,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, :enabled => true)
+    m = Tracksperanto::Middleware::Flop.new(receiver)
     m.start_export(110, 120)
     m.export_point(1, 10, 95, 0)
   end

data/test/middleware/test_golden_middleware.rb

@@ -2,16 +2,9 @@
 require File.expand_path(File.dirname(__FILE__)) + '/../helper'
 
 class GoldenMiddlewareTest < Test::Unit::TestCase
-  def test_default_golden_set_to_false
-    receiver = flexmock
-    m = Tracksperanto::Middleware::Golden.new(receiver)
-    assert_nil m.enabled
-  end
   
-  def test_golden_supports_hash_init
-    receiver = flexmock
-    m = Tracksperanto::Middleware::Golden.new(receiver, :enabled => true)
-    assert_equal true, m.enabled
+  def test_action_description
+    assert_equal "Reset residual of all the trackers to zero", Tracksperanto::Middleware::Golden.action_description
   end
   
   def test_golden_bypasses_methods
@@ -23,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, :enabled => true)
+    m = Tracksperanto::Middleware::Golden.new(receiver)
     m.start_export(120, 120)
     m.start_tracker_segment("Tracker")
     m.export_point(0, 100, 100, 0.56)

data/test/middleware/test_length_cutoff_middleware.rb

@@ -2,6 +2,11 @@
 require File.expand_path(File.dirname(__FILE__)) + '/../helper'
 
 class LengthCutoffMiddlewareTest < 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
+  end
+  
   def test_default_length_set_to_zero_and_ignored
     receiver = flexmock
     m = Tracksperanto::Middleware::LengthCutoff.new(receiver)

data/test/middleware/test_lerp_middleware.rb

@@ -2,9 +2,14 @@
 require File.expand_path(File.dirname(__FILE__)) + '/../helper'
 
 class LerpMiddlewareTest < Test::Unit::TestCase
+  
+  def test_action_description
+    assert_equal "Interpolate missing keyframes of all the trackers", Tracksperanto::Middleware::Lerp.action_description
+  end
+  
   def test_lerp
     receiver = flexmock
-    m = Tracksperanto::Middleware::Lerp.new(receiver, :enabled => true)
+    m = Tracksperanto::Middleware::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
@@ -21,23 +26,4 @@ class LerpMiddlewareTest < Test::Unit::TestCase
     m.end_tracker_segment
     m.end_export
   end
-  
-  def test_lerp_should_react_to_enabled_flag
-    receiver = flexmock
-    m = Tracksperanto::Middleware::Lerp.new(receiver, :enabled => false)
-    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
-    receiver.should_receive(:export_point).with(4, 4.0, 5.0, 0).once
-    receiver.should_receive(:end_tracker_segment).once
-    receiver.should_receive(:end_export).once
-    
-    m.start_export(720, 576)
-    m.start_tracker_segment("Foo")
-    m.export_point(1, 1.0, 2.0, 0)
-    m.export_point(4, 4.0, 5.0, 0)
-    m.end_tracker_segment
-    m.end_export
-  end
-  
 end

data/test/middleware/test_lint_middleware.rb

@@ -2,6 +2,11 @@
 require File.expand_path(File.dirname(__FILE__)) + '/../helper'
 
 class LintMiddlewareTest < Test::Unit::TestCase
+  
+  def test_action_description
+    assert_equal "Verify all the exported trackers and check for errors", Tracksperanto::Middleware::Lint.action_description
+  end
+  
   def test_empty_export_raises
     m = flexmock
     m.should_receive(:start_export).once

data/test/middleware/test_move_to_first_frame_middleware.rb

@@ -0,0 +1,38 @@
+# -*- encoding : utf-8 -*-
+require File.expand_path(File.dirname(__FILE__)) + '/../helper'
+
+class MoveToFirstFrameMiddlewareTest < 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
+  end
+  
+  def test_move_to_first_frame
+    receiver = flexmock
+    receiver.should_receive(:start_export).with(120,120)
+
+    receiver.should_receive(:start_tracker_segment).with("Tracker1")
+    receiver.should_receive(:export_point).with(4, 100, 100, 0)
+    receiver.should_receive(:end_tracker_segment)
+
+    receiver.should_receive(:start_tracker_segment).with("Tracker2")
+    receiver.should_receive(:export_point).with(0, 100, 100, 0)
+    receiver.should_receive(:end_tracker_segment)
+
+    receiver.should_receive(:end_export)
+    
+    m = Tracksperanto::Middleware::MoveToFirst.new(receiver)
+    
+    m.start_export(120, 120)
+    
+    m.start_tracker_segment("Tracker1")
+    m.export_point(14, 100, 100, 0)
+    m.end_tracker_segment
+    
+    m.start_tracker_segment("Tracker1")
+    m.export_point(10, 100, 100, 0)
+    m.end_tracker_segment
+    
+    m.end_export
+  end
+end

data/test/middleware/test_pad_middleware.rb

@@ -2,6 +2,11 @@
 require File.expand_path(File.dirname(__FILE__)) + '/../helper'
 
 class PadMiddlewareTest < 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
+  end
+  
   def test_shift_supports_hash_init
     receiver = flexmock
     m = Tracksperanto::Middleware::Pad.new(receiver, 

data/test/middleware/test_prefix.rb

@@ -3,6 +3,10 @@ require File.expand_path(File.dirname(__FILE__)) + '/../helper'
 
 class PrefixMiddlewareTest < Test::Unit::TestCase
   
+  def test_action_description
+    assert_equal "Prefix tracker names with text", Tracksperanto::Middleware::Prefix.action_description
+  end
+  
   def test_prefix_supports_hash_init
     receiver = flexmock
     m = Tracksperanto::Middleware::Prefix.new(receiver, :prefix => "foo")

data/test/middleware/test_reformat_middleware.rb

@@ -2,8 +2,9 @@
 require File.expand_path(File.dirname(__FILE__)) + '/../helper'
 
 class ReformatMiddlewareTest < Test::Unit::TestCase
-  def test_inherits_and_thus_complies
-    assert Tracksperanto::Middleware::Reformat.ancestors.include?(Tracksperanto::Middleware::Base)
+  
+  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
   end
   
   def test_default_params_zeroed

data/test/middleware/test_scaler_middleware.rb

@@ -2,6 +2,11 @@
 require File.expand_path(File.dirname(__FILE__)) + '/../helper'
 
 class ScalerMiddlewareTest < Test::Unit::TestCase
+  
+  def test_action_description
+    assert_equal "Scale the comp by a specified factor", Tracksperanto::Middleware::Scaler.action_description
+  end
+  
   def test_default_factor_set_to_one
     receiver = flexmock
     m = Tracksperanto::Middleware::Scaler.new(receiver)

data/test/middleware/test_shift_middleware.rb

@@ -2,6 +2,11 @@
 require File.expand_path(File.dirname(__FILE__)) + '/../helper'
 
 class ShiftMiddlewareTest < Test::Unit::TestCase
+  
+  def test_action_description
+    assert_equal "Move all the trackers by a specified number of pixels", Tracksperanto::Middleware::Shift.action_description
+  end
+  
   def test_shift_supports_hash_init
     receiver = flexmock
     m = Tracksperanto::Middleware::Shift.new(receiver, :x_shift => 1.2)

data/test/middleware/test_slip_middleware.rb

@@ -2,6 +2,11 @@
 require File.expand_path(File.dirname(__FILE__)) + '/../helper'
 
 class SlipMiddlewareTest < Test::Unit::TestCase
+  
+  def test_action_description
+    assert_equal "Slip all the tracker keyframes in time", Tracksperanto::Middleware::Slipper.action_description
+  end
+  
   def test_default_slip_set_to_zero
     receiver = flexmock
     m = Tracksperanto::Middleware::Slipper.new(receiver)

data/test/middleware/test_start_trim_middleware.rb

@@ -3,14 +3,8 @@ require File.expand_path(File.dirname(__FILE__)) + '/../helper'
 
 class StartTrimMiddlewareTest < Test::Unit::TestCase
   
-  def test_default_set_to_false
-    m = Tracksperanto::Middleware::StartTrim.new(nil)
-    assert_nil m.enabled
-  end
-  
-  def test_start_trim_supports_hash_init
-    m = Tracksperanto::Middleware::StartTrim.new(nil, :enabled => true)
-    assert_equal true, m.enabled
+  def test_action_description
+    assert_equal "Remove all the keyframes that are on frames below 1", Tracksperanto::Middleware::StartTrim.action_description
   end
   
   def test_start_mw_works
@@ -22,7 +16,7 @@ class StartTrimMiddlewareTest < Test::Unit::TestCase
     x.should_receive(:end_tracker_segment).once
     x.should_receive(:end_export).once
     
-    m = Tracksperanto::Middleware::StartTrim.new(x, :enabled => true)
+    m = Tracksperanto::Middleware::StartTrim.new(x)
     
     m.start_export(720, 576)
     m.start_tracker_segment("TrackerBehind")

data/test/test_cli.rb

@@ -42,20 +42,20 @@ class TestCli < Test::Unit::TestCase
       flm_pftrack_v5.2dt flm_shake_trackers.txt flm_syntheyes_2dt.txt flm_flame_cornerpin.stabilizer 
       flm_tracksperanto_ruby.rb flm_mayaLocators.ma flm_createNulls.jsx
     )
-    
+    assert_match /Found and converted 1 trackers with 232 keyframes\./, o, "Should have output coversion statistics"
     assert_same_set fs, Dir.entries(TEMP_DIR)
   end
   
   def test_cli_with_nonexisting_only_exporter_prints_proper_error_message
     status, o, e = cli("--only microsoftfuckingword " + TEMP_DIR + "/flm.stabilizer")
-    assert_equal 2, status, "Should exit with abnormal state"
+    assert_not_equal 0, status, "Should exit with abnormal state"
     assert e.include?("Unknown exporter \"microsoftfuckingword\"")
     assert e.include?("The following export modules are available")
   end
   
   def test_cli_with_nonexisting_importer_prints_proper_error_message
     status, o, e = cli("--from microsoftfuckingword " + TEMP_DIR + "/flm.stabilizer")
-    assert_equal 2, status, "Should exit with abnormal state"
+    assert_not_equal 0, status, "Should exit with abnormal state"
     assert e.include?("Unknown importer \"microsoftfuckingword\"")
     assert e.include?("The following import modules are available")
   end

data/test/test_format_detector.rb

@@ -23,7 +23,7 @@ class TestFormatDetector < Test::Unit::TestCase
     assert d.match?
     assert !d.auto_size?
     assert_equal Tracksperanto::Import::NukeScript, d.importer_klass
-    assert_equal "Nuke .nk script file", d.human_importer_name
+    assert_equal Tracksperanto::Import::NukeScript.human_name, d.human_importer_name
   end
   
   def test_match_flame

data/test/test_parameters.rb

@@ -0,0 +1,38 @@
+# -*- encoding : utf-8 -*-
+require File.expand_path(File.dirname(__FILE__)) + '/helper'
+
+class TestParameters < Test::Unit::TestCase
+  
+  def setup
+    @class = Class.new do
+      include Tracksperanto::Parameters
+    end
+  end
+  
+  def test_parameters_empty_by_default
+    assert_equal [], @class.parameters
+  end
+  
+  def test_parameter_initialization
+    flexmock(@class).should_receive(:attr_accessor).once.with(:foo)
+    @class.parameter :foo
+    assert_equal 1, @class.parameters.length
+    
+    first_param = @class.parameters[0]
+    assert_equal :foo, first_param.name
+    assert_nil first_param.desc
+  end
+
+  def test_parameter_initialization_with_safety
+    flexmock(@class).should_receive(:attr_accessor).once.with(:foo)
+    flexmock(@class).should_receive(:safe_reader).once.with(:foo)
+    @class.parameter :foo, :required => true
+  end
+  
+  def test_parameter_initialization_with_cast
+    flexmock(@class).should_receive(:attr_accessor).once.with(:foo)
+    flexmock(@class).should_receive(:cast_to_junk).once.with(:foo)
+    @class.parameter :foo, :cast => :junk
+  end
+  
+end

data/test/test_tracksperanto.rb

@@ -23,6 +23,16 @@ class TracksperantoTest < Test::Unit::TestCase
     end
   end
   
+  def test_importers_array_sorted_by_description
+     m = Tracksperanto.importers.map{|e| e.human_name }
+     assert_equal m.sort, m
+   end
+  
+  def test_exporters_array_sorted_by_description
+    m = Tracksperanto.exporters.map{|e| e.human_name }
+    assert_equal m.sort, m
+  end
+  
   def test_middleware_names
     m = Tracksperanto.middleware_names
     assert m.include?("Golden")

data/test/test_yield_non_empty.rb

@@ -0,0 +1,11 @@
+# -*- encoding : utf-8 -*-
+require File.expand_path(File.dirname(__FILE__)) + '/helper'
+
+class TestYieldNonEmpty < Test::Unit::TestCase
+  
+  def test_yield_non_empty
+    arr = ["", "a"]
+    assert_equal ["a"], Tracksperanto::YieldNonEmpty.new(arr).to_a
+  end
+  
+end

data/tracksperanto.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "tracksperanto"
-  s.version = "2.9.5"
+  s.version = "2.9.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik Tarkhanov"]
-  s.date = "2012-02-16"
+  s.date = "2012-03-14"
   s.description = "Converts 2D track exports between different apps like Flame, MatchMover, PFTrack..."
   s.email = "me@julik.nl"
   s.executables = ["tracksperanto"]
@@ -67,6 +67,7 @@ Gem::Specification.new do |s|
     "lib/middleware/length_cutoff.rb",
     "lib/middleware/lerp.rb",
     "lib/middleware/lint.rb",
+    "lib/middleware/move_to_first.rb",
     "lib/middleware/pad.rb",
     "lib/middleware/prefix.rb",
     "lib/middleware/reformat.rb",
@@ -84,11 +85,13 @@ Gem::Specification.new do |s|
     "lib/tracksperanto/ext_io.rb",
     "lib/tracksperanto/format_detector.rb",
     "lib/tracksperanto/keyframe.rb",
+    "lib/tracksperanto/parameters.rb",
     "lib/tracksperanto/returning.rb",
     "lib/tracksperanto/safety.rb",
     "lib/tracksperanto/simple_export.rb",
     "lib/tracksperanto/tracker.rb",
     "lib/tracksperanto/uv_coordinates.rb",
+    "lib/tracksperanto/yield_non_empty.rb",
     "lib/tracksperanto/zip_tuples.rb",
     "test/export/README_EXPORT_TESTS.txt",
     "test/export/samples/ref_AfterEffects.jsx",
@@ -150,6 +153,7 @@ Gem::Specification.new do |s|
     "test/middleware/test_length_cutoff_middleware.rb",
     "test/middleware/test_lerp_middleware.rb",
     "test/middleware/test_lint_middleware.rb",
+    "test/middleware/test_move_to_first_frame_middleware.rb",
     "test/middleware/test_pad_middleware.rb",
     "test/middleware/test_prefix.rb",
     "test/middleware/test_reformat_middleware.rb",
@@ -165,11 +169,13 @@ Gem::Specification.new do |s|
     "test/test_extio.rb",
     "test/test_format_detector.rb",
     "test/test_keyframe.rb",
+    "test/test_parameters.rb",
     "test/test_pipeline.rb",
     "test/test_safety.rb",
     "test/test_simple_export.rb",
     "test/test_tracker.rb",
     "test/test_tracksperanto.rb",
+    "test/test_yield_non_empty.rb",
     "test/test_zip_tuples.rb",
     "tracksperanto.gemspec"
   ]
@@ -183,7 +189,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<obuf>, ["~> 1.0.4"])
+      s.add_runtime_dependency(%q<obuf>, ["~> 1.1.0"])
       s.add_runtime_dependency(%q<progressive_io>, ["~> 1.0"])
       s.add_runtime_dependency(%q<flame_channel_parser>, ["~> 4.0"])
       s.add_runtime_dependency(%q<progressbar>, ["= 0.10.0"])
@@ -193,7 +199,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<flexmock>, ["~> 0.8"])
       s.add_development_dependency(%q<cli_test>, ["~> 1.0"])
     else
-      s.add_dependency(%q<obuf>, ["~> 1.0.4"])
+      s.add_dependency(%q<obuf>, ["~> 1.1.0"])
       s.add_dependency(%q<progressive_io>, ["~> 1.0"])
       s.add_dependency(%q<flame_channel_parser>, ["~> 4.0"])
       s.add_dependency(%q<progressbar>, ["= 0.10.0"])
@@ -204,7 +210,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<cli_test>, ["~> 1.0"])
     end
   else
-    s.add_dependency(%q<obuf>, ["~> 1.0.4"])
+    s.add_dependency(%q<obuf>, ["~> 1.1.0"])
     s.add_dependency(%q<progressive_io>, ["~> 1.0"])
     s.add_dependency(%q<flame_channel_parser>, ["~> 4.0"])
     s.add_dependency(%q<progressbar>, ["= 0.10.0"])