tracksperanto 1.5.6 → 1.5.7

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.5.7 / 2009-11-08
+
+* Add a Prefix middleware that prefixes tracker names
+
 === 1.5.6 / 2009-11-08
 
 * Rerelase of 1.5.5 without the huge binary blob in the middle

data/Manifest.txt

@@ -31,6 +31,7 @@ lib/import/shake_text.rb
 lib/import/syntheyes.rb
 lib/middleware/base.rb
 lib/middleware/golden.rb
+lib/middleware/prefix.rb
 lib/middleware/reformat.rb
 lib/middleware/scaler.rb
 lib/middleware/shift.rb
@@ -93,11 +94,11 @@ test/import/samples/one_tracker_with_break_in_grp.nk
 test/import/samples/shake_tracker_nodes.shk
 test/import/samples/shake_tracker_nodes_to_syntheyes.txt
 test/import/samples/shake_tracker_with_no_anim.shk
+test/import/samples/shake_trackers_with_Nspline.shk
 test/import/samples/sourcefile_pftrack.2dt
 test/import/samples/three_tracks_in_one_stabilizer.shk
 test/import/samples/two_shake_trackers.txt
 test/import/samples/two_tracks_in_one_tracker.shk
-test/import/samples/shake_trackers_with_Nspline.shk
 test/import/test_3de_import.rb
 test/import/test_3de_import3.rb
 test/import/test_flame_import.rb
@@ -111,6 +112,7 @@ test/import/test_shake_script_import.rb
 test/import/test_shake_text_import.rb
 test/import/test_syntheyes_import.rb
 test/middleware/test_golden_middleware.rb
+test/middleware/test_prefix.rb
 test/middleware/test_reformat_middleware.rb
 test/middleware/test_scaler_middleware.rb
 test/middleware/test_shift_middleware.rb
@@ -120,4 +122,4 @@ test/test_extio.rb
 test/test_format_detector.rb
 test/test_keyframe.rb
 test/test_simple_export.rb
-test/test_tracker.rb
+test/test_tracker.rb

data/bin/tracksperanto

@@ -25,6 +25,7 @@ slip = 0
 golden_tracks = false
 x_shift = 0
 y_shift = 0
+set_prefix = ''
 
 readers = Tracksperanto.importer_names
 
@@ -43,6 +44,7 @@ parser = OptionParser.new do | p |
      exit(-1)
     end
  end
+ p.on(" -p", "--prefix PREFIX", String, "A prefix to prepend to tracker names in bluk") { |w| set_prefix = w }
  p.on(" -w", "--width WIDTH_IN_PIXELS", Integer, "Absolute input comp width in pixels (will try to autodetect)") { |w| width = w }
  p.on(" -h", "--height HEIGHT_IN_PIXELS", Integer, "Absolute input comp height in pixels (will try to autodetect)") {|w| height = w }
  p.on(" -xs", "--xscale X_SCALING_FACTOR", Float, "Scale the result in X by this factor (1.0 is the default)") {|sx| scale_x = sx }
@@ -82,7 +84,7 @@ end
 
 pipe = Tracksperanto::Pipeline::Base.new
 pipe.progress_block = lambda{|percent, msg| STDOUT.write(".") }
-pipe.run(input_file, :pix_w => width, :pix_h => height, :parser => reader_klass) do | scaler, slipper, golden, reformat, shift |
+pipe.run(input_file, :pix_w => width, :pix_h => height, :parser => reader_klass) do | scaler, slipper, golden, reformat, shift, prefix |
   slipper.slip = slip
   scaler.x_factor = scale_x
   scaler.y_factor = scale_y
@@ -91,5 +93,6 @@ pipe.run(input_file, :pix_w => width, :pix_h => height, :parser => reader_klass)
   reformat.height = reformat_h if reformat_h
   shift.x_shift = x_shift
   shift.y_shift = y_shift
+  prefix.prefix = set_prefix
 end
 STDOUT.write("\n")

data/lib/middleware/prefix.rb

@@ -0,0 +1,13 @@
+# This middleware prepends the names of the trackers passing through it with a prefix
+# and an underscore
+class Tracksperanto::Middleware::Prefix < Tracksperanto::Middleware::Base
+  attr_accessor :prefix
+  cast_to_string :prefix
+  
+  def start_tracker_segment(tracker_name)
+    prefixed_name = [prefix.gsub(/_$/, ''), tracker_name]
+    prefixed_name.reject!{|e| e.empty? }
+    super(prefixed_name.join('_'))
+  end
+  
+end

data/lib/pipeline/base.rb

@@ -148,7 +148,8 @@ class Tracksperanto::Pipeline::Base
     golden = Tracksperanto::Middleware::Golden.new(slipper)
     reformat = Tracksperanto::Middleware::Reformat.new(golden)
     shift = Tracksperanto::Middleware::Shift.new(reformat)
-    [scaler, slipper, golden, reformat, shift]
+    prefix = Tracksperanto::Middleware::Prefix.new(shift)
+    [scaler, slipper, golden, reformat, shift, prefix]
   end
   
   # Open the file for writing and register it to be closed automatically

data/lib/tracksperanto.rb

@@ -4,7 +4,7 @@ require 'tempfile'
 
 module Tracksperanto
   PATH = File.expand_path(File.dirname(__FILE__))
-  VERSION = '1.5.6'
+  VERSION = '1.5.7'
   
   module Import; end
   module Export; end

data/test/middleware/test_prefix.rb

@@ -0,0 +1,27 @@
+require File.dirname(__FILE__) + '/../helper'
+
+class PrefixMiddlewareTest < Test::Unit::TestCase
+  
+  def test_prefix_supports_hash_init
+    receiver = flexmock
+    m = Tracksperanto::Middleware::Prefix.new(receiver, :prefix => "foo")
+    assert_equal "foo", m.prefix
+  end
+  
+  def test_prefixes
+    receiver = flexmock
+    receiver.should_receive(:start_tracker_segment).once.with("Pre_Tracker")
+    
+    m = Tracksperanto::Middleware::Prefix.new(receiver, :prefix => "Pre_")
+    m.start_tracker_segment("Tracker")
+  end
+
+  def test_does_not_prefix_with_empty
+    receiver = flexmock
+    receiver.should_receive(:start_tracker_segment).once.with("Tracker")
+    
+    m = Tracksperanto::Middleware::Prefix.new(receiver)
+    m.start_tracker_segment("Tracker")
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tracksperanto
 version: !ruby/object:Gem::Version 
-  version: 1.5.6
+  version: 1.5.7
 platform: ruby
 authors: 
 - Julik Tarkhanov
@@ -77,6 +77,7 @@ files:
 - lib/import/syntheyes.rb
 - lib/middleware/base.rb
 - lib/middleware/golden.rb
+- lib/middleware/prefix.rb
 - lib/middleware/reformat.rb
 - lib/middleware/scaler.rb
 - lib/middleware/shift.rb
@@ -139,11 +140,11 @@ files:
 - test/import/samples/shake_tracker_nodes.shk
 - test/import/samples/shake_tracker_nodes_to_syntheyes.txt
 - test/import/samples/shake_tracker_with_no_anim.shk
+- test/import/samples/shake_trackers_with_Nspline.shk
 - test/import/samples/sourcefile_pftrack.2dt
 - test/import/samples/three_tracks_in_one_stabilizer.shk
 - test/import/samples/two_shake_trackers.txt
 - test/import/samples/two_tracks_in_one_tracker.shk
-- test/import/samples/shake_trackers_with_Nspline.shk
 - test/import/test_3de_import.rb
 - test/import/test_3de_import3.rb
 - test/import/test_flame_import.rb
@@ -157,6 +158,7 @@ files:
 - test/import/test_shake_text_import.rb
 - test/import/test_syntheyes_import.rb
 - test/middleware/test_golden_middleware.rb
+- test/middleware/test_prefix.rb
 - test/middleware/test_reformat_middleware.rb
 - test/middleware/test_scaler_middleware.rb
 - test/middleware/test_shift_middleware.rb
@@ -169,6 +171,8 @@ files:
 - test/test_tracker.rb
 has_rdoc: true
 homepage: http://guerilla-di.org/tracksperanto
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -190,9 +194,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: guerilla-di
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Tracksperanto is a universal 2D-track translator between many apps.
 test_files: 
 - test/export/test_equalizer3_export.rb
@@ -218,6 +222,7 @@ test_files:
 - test/import/test_shake_text_import.rb
 - test/import/test_syntheyes_import.rb
 - test/middleware/test_golden_middleware.rb
+- test/middleware/test_prefix.rb
 - test/middleware/test_reformat_middleware.rb
 - test/middleware/test_scaler_middleware.rb
 - test/middleware/test_shift_middleware.rb