tracksperanto 1.8.1 → 1.8.2

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.8.2 / 2010-03-04
+
+* Fix the bug in the Flame exporter that was convincing Flame that there is only one tracker in the setup
+* Buffer temporary outputs to String buffers until they reach a certain size. Helps with tempfile pollution and IO speed
+
 === 1.8.1 / 2010-02-18
 
 * Add Flame stabilizer export support

data/Manifest.txt

@@ -42,6 +42,7 @@ lib/middleware/slipper.rb
 lib/pipeline/base.rb
 lib/tracksperanto.rb
 lib/tracksperanto/block_init.rb
+lib/tracksperanto/buffer_io.rb
 lib/tracksperanto/casts.rb
 lib/tracksperanto/const_name.rb
 lib/tracksperanto/ext_io.rb
@@ -49,6 +50,7 @@ lib/tracksperanto/flame_builder.rb
 lib/tracksperanto/format_detector.rb
 lib/tracksperanto/keyframe.rb
 lib/tracksperanto/progressive_io.rb
+lib/tracksperanto/returning.rb
 lib/tracksperanto/safety.rb
 lib/tracksperanto/simple_export.rb
 lib/tracksperanto/tracker.rb
@@ -130,6 +132,7 @@ test/middleware/test_reformat_middleware.rb
 test/middleware/test_scaler_middleware.rb
 test/middleware/test_shift_middleware.rb
 test/middleware/test_slip_middleware.rb
+test/test_buffer_io.rb
 test/test_const_name.rb
 test/test_extio.rb
 test/test_flame_builder.rb

data/README.txt

@@ -69,7 +69,7 @@ Import and export support:
 * Syntheyes 2D tracking data exports
 * 3DE point exports (as output by the default script) - versions 3 and 4
 * MatchMover Pro .rz2
-* MayaLive track export (square pixel aspect only)
+* MayaLive track export (square pixel aspect only, you will need to write some extra code to convert that)
 * Flame .stabilizer file
 
 Import only:
@@ -98,6 +98,11 @@ are themselves arrays of Tracksperanto::Keyframe objects.
 
 You can easily write an exporter. Refer to the Tracksperanto::Export::Base docs.
 
+== Ading your own processing steps
+
+You probably want to write a Middleware (consult the Tracksperanto::Middleware::Base docs). A Middleware is just like
+an exporter, except that it wraps another exporter instead (so you can intercept export calls and massage the data as it is moving through).
+
 == Limitations
 
 Information about the search area, reference area and offset is not passed along (outside

data/Rakefile

@@ -8,6 +8,7 @@ begin
     (Hoe::RUBY_DEBUG ? " #{RUBY_DEBUG}" : '')
   
   Hoe.spec('tracksperanto') do | p |
+    p.clean_globs = %w( **/.DS_Store )
     p.version = Tracksperanto::VERSION
     p.extra_dev_deps = {"flexmock" => ">=0"}
     p.rubyforge_name = 'guerilla-di'

data/lib/export/equalizer3.rb

@@ -14,7 +14,7 @@ class Tracksperanto::Export::Equalizer3 < Tracksperanto::Export::Base
   def start_export( img_width, img_height)
     @w, @h = img_width, img_height
     # 3DE needs to know the number of keyframes in advance
-    @buffer = Tempfile.new("ts3dex")
+    @buffer = Tracksperanto::BufferIO.new
     @highest_keyframe = 0
   end
   

data/lib/export/equalizer4.rb

@@ -12,13 +12,13 @@ class Tracksperanto::Export::Equalizer4 < Tracksperanto::Export::Base
   def start_export( img_width, img_height)
     # 3DE needs to know the number of points in advance,
     # so we will just buffer to a StringIO
-    @internal_io, @num_of_trackers = Tempfile.new("teq4x"), 0
+    @internal_io, @num_of_trackers = Tracksperanto::BufferIO.new, 0
   end
   
   def start_tracker_segment(tracker_name)
     @internal_io.puts(tracker_name)
     @num_of_trackers += 1
-    @tracker_buffer, @num_of_kfs = Tempfile.new("teq4x_p"), 0
+    @tracker_buffer, @num_of_kfs = Tracksperanto::BufferIO.new, 0
   end
   
   def export_point(frame, abs_float_x, abs_float_y, float_residual)

data/lib/export/flame_stabilizer.rb

@@ -1,6 +1,9 @@
+# TODO: this exporter is MAJORLY slow now
 class Tracksperanto::Export::FlameStabilizer < Tracksperanto::Export::Base
   
   COLOR = "50 50 50"
+  DATETIME_FORMAT = '%a %b %d %H:%M:%S %Y'
+  
   def self.desc_and_extension
     "flame.stabilizer"
   end
@@ -12,22 +15,27 @@ class Tracksperanto::Export::FlameStabilizer < Tracksperanto::Export::Base
   def start_export( img_width, img_height)
     @counter = 0
     @width, @height = img_width, img_height
-    @temp = Tempfile.new("flamexp")
+    @temp = Tracksperanto::BufferIO.new
     @writer = Tracksperanto::FlameBuilder.new(@temp)
   end
   
   def end_export
+    # Now make another writer, this time for our main IO
     @writer = Tracksperanto::FlameBuilder.new(@io)
-    write_header
+    
+    # Now we know how many trackers we have so we can write the header
+    # data along with NbTrackers
+    write_header_with_number_of_trackers(@counter)
     
     # Now write everything that we accumulated earlier into the base IO
     @temp.rewind
     @io.write(@temp.read) until @temp.eof?
     @temp.close!
     
+    # Send the ChannelEnd command and list the trackers
     @writer.channel_end
     @counter.times do |i|
-      @writer.tracker(i) do |t|
+      @writer.write_unterminated_block!("tracker", i) do |t|
         t.active true
         t.color_hash!("colour", 0, 100, 0)
         t.fixed_ref true
@@ -40,30 +48,39 @@ class Tracksperanto::Export::FlameStabilizer < Tracksperanto::Export::Base
   
   def start_tracker_segment(tracker_name)
     @counter += 1
-    @tracker_name = tracker_name
-    @x_values, @y_values = [], []
     @write_first_frame = true
   end
   
   def export_point(frame, abs_float_x, abs_float_y, float_residual)
+    flame_frame = frame + 1
     if @write_first_frame
-      write_first_frame(abs_float_x, abs_float_y, frame)
-      @x_values << [frame, 0]
-      @y_values << [frame, 0]
+      @base_x, @base_y = abs_float_x, abs_float_y
+      write_first_frame(abs_float_x, abs_float_y)
+      # For Flame to recognize the reference frame of the Shift channel
+      # we need it to contain zero as an int, not as a float. The shift proceeds
+      # from there.
+      @x_shift_values = [[flame_frame, 0]]
+      @y_shift_values = [[flame_frame, 0]]
+      @write_first_frame = false
     else
-      @x_values << [frame, (@base_x - abs_float_x)]
-      @y_values << [frame, (@base_y - abs_float_y)]
+      # Just continue buffering the upcoming shift keyframes and flush them in the end
+      shift_x, shift_y = @base_x - abs_float_x, @base_y - abs_float_y
+      @x_shift_values.push([flame_frame, shift_x])
+      @y_shift_values.push([flame_frame, shift_y])
     end
   end
   
   def end_tracker_segment
-    write_shift_channel("shift/x", @x_values, @base_x)
-    write_shift_channel("shift/y", @y_values, @base_y)
+    # We write these at tracker end since we need to know in advance
+    # how many keyframes they should contain
+    write_shift_channel("shift/x", @x_shift_values)
+    write_shift_channel("shift/y", @y_shift_values)
   end
   
   private
   
-  def write_shift_channel(name_without_prefix, values, base)
+  # The shift channel is what determines how the tracking point moves.
+  def write_shift_channel(name_without_prefix, values)
     @writer.channel(prefix(name_without_prefix)) do | c |
       c.extrapolation :constant
       c.value values[0][1]
@@ -71,8 +88,8 @@ class Tracksperanto::Export::FlameStabilizer < Tracksperanto::Export::Base
       c.size values.length
       values.each_with_index do | (f, v), i |
         c.key(i) do | k |
-          k.frame(f + 1)
-          k.value(v)
+          k.frame f
+          k.value v
           k.interpolation :linear
           k.left_slope 2.4
           k.right_slope 2.4
@@ -85,12 +102,12 @@ class Tracksperanto::Export::FlameStabilizer < Tracksperanto::Export::Base
     ["tracker#{@counter}", tracker_channel].join("/")
   end
   
-  def write_header
+  def write_header_with_number_of_trackers(number_of_trackers)
     @writer.stabilizer_file_version "5.0"
-    @writer.creation_date(Time.now.strftime('%a %b %d %H:%M:%S %Y'))
+    @writer.creation_date(Time.now.strftime(DATETIME_FORMAT))
     @writer.linebreak!(2)
     
-    @writer.nb_trackers(@counter)
+    @writer.nb_trackers number_of_trackers
     @writer.selected 0
     @writer.frame_width @width
     @writer.frame_height @height
@@ -109,19 +126,31 @@ class Tracksperanto::Export::FlameStabilizer < Tracksperanto::Export::Base
     @writer.anim
   end
   
-  def write_first_frame(x, y, f)
-    @write_first_frame = false
-    @base_x, @base_y = x, y
+  def write_first_frame(x, y)
+    write_track_channels
+    write_track_width_and_height
+    write_ref_width_and_height
+    write_ref_channels(x, y)
+    write_deltax_and_deltay_channels
+    write_offset_channels
+  end
+  
+  def write_track_channels
+    ctr_x, ctr_y = @width / 2, @height / 2
     
-    tx, ty = @width / 2, @height / 2
-    %w( track/x track/y).map(&method(:prefix)).zip([tx, ty]).each do | cname, default |
+    # track determines where the tracking box is, and should be in the center
+    # of the image for Flame to compute all other shifts properly
+    %w( track/x track/y).map(&method(:prefix)).zip([ctr_x, ctr_y]).each do | cname, default |
       @writer.channel(cname) do | c |
         c.extrapolation("constant")
         c.value(default.to_i)
         c.colour(COLOR)
       end
     end
-    
+  end
+
+  # The size of the tracking area
+  def write_track_width_and_height
     %w( track/width track/height ).map(&method(:prefix)).each do | channel_name |
       @writer.channel(channel_name) do | c |
         c.extrapolation :linear
@@ -129,7 +158,10 @@ class Tracksperanto::Export::FlameStabilizer < Tracksperanto::Export::Base
         c.colour COLOR
       end
     end
-    
+  end
+  
+  # The size of the reference area
+  def write_ref_width_and_height
     %w( ref/width ref/height).map(&method(:prefix)).each do | channel_name |
       @writer.channel(channel_name) do | c |
         c.extrapolation :linear
@@ -137,8 +169,14 @@ class Tracksperanto::Export::FlameStabilizer < Tracksperanto::Export::Base
         c.colour COLOR
       end
     end
-    
-    %w( ref/x ref/y).map(&method(:prefix)).zip([x, y]).each do | cname, default |
+  end
+
+  # The Ref channel contains the reference for the shift channel in absolute
+  # coordinates, and is set as float. Since we do not "snap" the tracker in
+  # the process it's enough for us to make one keyframe in the ref channels
+  # at the same frame as the first shift keyframe
+  def write_ref_channels(ref_x, ref_y)
+    %w( ref/x ref/y).map(&method(:prefix)).zip([ref_x, ref_y]).each do | cname, default |
       @writer.channel(cname) do | c |
         c.extrapolation("constant")
         c.value(default)
@@ -154,7 +192,11 @@ class Tracksperanto::Export::FlameStabilizer < Tracksperanto::Export::Base
         end
       end
     end
-    
+  end
+  
+  def write_deltax_and_deltay_channels
+    # This is used for deltax and deltay (offset tracking).
+    # We set it to zero and lock
     %w( ref/dx ref/dy).map(&method(:prefix)).each do | chan, v |
       @writer.channel(chan) do | c |
         c.extrapolation("constant")
@@ -177,14 +219,16 @@ class Tracksperanto::Export::FlameStabilizer < Tracksperanto::Export::Base
           k.interpolation :constant
         end
       end # Chan block
-      
-      %w(offset/x offset/y).map(&method(:prefix)).each do | c |
-        @writer.channel(c) do | chan |
-          chan.extrapolation :constant
-          chan.value 0
-        end
+    end
+  end
+  
+  def write_offset_channels
+    %w(offset/x offset/y).map(&method(:prefix)).each do | c |
+      @writer.channel(c) do | chan |
+        chan.extrapolation :constant
+        chan.value 0
       end
-    end #Iter
-  end # Meth
+    end
+  end
   
 end

data/lib/export/nuke_script.rb

@@ -45,7 +45,7 @@ Constant {
       # We allocate an IO for the file being output that will contain all the trackers,
       # and then write that one into the script preceded by the preamble that sets length
       # based on the last frame position in time
-      @trackers_io = Tempfile.new("nukex")
+      @trackers_io = Tracksperanto::BufferIO.new
     end
     
     # We accumulate a tracker and on end dump it out in one piece

data/lib/export/pftrack.rb

@@ -13,20 +13,24 @@ class Tracksperanto::Export::PFTrack4 < Tracksperanto::Export::Base
     
     def start_tracker_segment(tracker_name)
       # Setup for the next tracker
-      @prev_tracker = []
+      @frame_count = 0
       @tracker_name = tracker_name
+      @tracker_io = Tracksperanto::BufferIO.new
     end
     
     def end_tracker_segment
-      block = [ "\n",
-        @tracker_name.inspect, # "autoquotes"
-        @prev_tracker.length,
-        @prev_tracker.join("\n") ]
-      @io.puts block.join("\n")
+      @io.write("\n\n")
+      @io.puts(@tracker_name.inspect) # autoquotes
+      @io.puts(@frame_count)
+      
+      @tracker_io.rewind
+      @io.write(@tracker_io.read) until @tracker_io.eof?
+      @tracker_io.close!
     end
     
     def export_point(frame, abs_float_x, abs_float_y, float_residual)
+      @frame_count += 1
       line = KEYFRAME_TEMPLATE % [frame, abs_float_x, abs_float_y, float_residual / 8]
-      @prev_tracker << line
+      @tracker_io.puts(line)
     end
 end

data/lib/export/pftrack_5.rb

@@ -10,11 +10,13 @@ class Tracksperanto::Export::PFTrack5 < Tracksperanto::Export::PFTrack4
     end
     
     def end_tracker_segment
-      block = [ "\n",
-        @tracker_name.inspect, # "autoquotes"
-        "Primary".inspect, # For primary/secondary cam in stereo pair
-        @prev_tracker.length,
-        @prev_tracker.join("\n") ]
-      @io.puts block.join("\n")
+      @io.write("\n\n")
+      @io.puts(@tracker_name.inspect) # autoquotes
+      @io.puts("Primary".inspect) # For primary/secondary cam in stereo pair
+      @io.puts(@frame_count)
+      
+      @tracker_io.rewind
+      @io.write(@tracker_io.read) until @tracker_io.eof?
+      @tracker_io.close!
     end
 end

data/lib/import/match_mover.rb

@@ -21,6 +21,7 @@ class Tracksperanto::Import::MatchMover < Tracksperanto::Import::Base
   private
   
   def detect_format(io)
+    report_progress("Detecting width and height")
     lines = (0..2).map{ io.gets }
     last_line = lines[-1]
     w, h, _ = last_line.scan(/(\d+)/).flatten
@@ -37,10 +38,12 @@ class Tracksperanto::Import::MatchMover < Tracksperanto::Import::Base
   
   def extract_track(start_line, io)
     tracker_name = start_line.scan(/\"([^\"]+)\"/).flatten[0]
+    report_progress("Extracting tracker #{tracker_name}")
     t = Tracksperanto::Tracker.new(:name => tracker_name)
     while(line = io.gets) do
       return t if line =~ /\}/
       t.keyframes.push(extract_key(line.strip)) if line =~ /^(\s+?)(\d)/
+      report_progress("Extracting keyframe")
     end
     raise "Track didn't close"
   end

data/lib/pipeline/base.rb

@@ -59,9 +59,11 @@ class Tracksperanto::Pipeline::Base
     # Yield middlewares to the block
     yield(*middlewares) if block_given?
     
-    @converted_points, @converted_keyframes = run_export(read_data, importer, middlewares[-1]) do | p, m |
-      @progress_block.call(p, m) if @progress_block
-    end
+    @converted_points, @converted_keyframes = run_export(read_data, importer, middlewares[-1])
+  end
+  
+  def report_progress(percent_complete, message)
+    @progress_block.call(percent_complete, message) if @progress_block
   end
   
   def detect_importer_or_use_options(path, opts)
@@ -87,31 +89,26 @@ class Tracksperanto::Pipeline::Base
   def run_export(tracker_data_io, parser, processor)
     points, keyframes, percent_complete = 0, 0, 0.0
     
-    yield(percent_complete, "Starting the parser") if block_given?
+    report_progress(percent_complete, "Starting the parser")
     
     # Report progress from the parser
-    parser.progress_block = lambda do | message |
-      yield(percent_complete, message) if block_given?
-    end
+    parser.progress_block = lambda { | m | report_progress(percent_complete, m) }
     
-    # Wrap the input in a progressive IO
-    io_with_progress = Tracksperanto::ProgressiveIO.new(tracker_data_io)
-    @ios << io_with_progress
-    
-    # Setup a lambda that will spy on the reader and update the percentage.
-    # We will only broadcast messages that come from the parser though (complementing it
-    # with a percentage)
-    io_with_progress.progress_block = lambda do | offset, of_total |
+    # Wrap the input in a progressive IO, setup a lambda that will spy on the reader and 
+    # update the percentage. We will only broadcast messages that come from the parser 
+    # though (complementing it with a percentage)
+    io_with_progress = Tracksperanto::ProgressiveIO.new(tracker_data_io) do | offset, of_total |
       percent_complete = (50.0 / of_total) * offset
     end
+    @ios << io_with_progress
     
     trackers = parser.parse(io_with_progress)
     
-    yield(percent_complete = 50.0, "Validating #{trackers.length} imported trackers") if block_given?
+    report_progress(percent_complete = 50.0, "Validating #{trackers.length} imported trackers")
     
     validate_trackers!(trackers)
     
-    yield(percent_complete, "Starting export") if block_given?
+    report_progress(percent_complete, "Starting export")
     
     percent_per_tracker = (100.0 - percent_complete) / trackers.length
     
@@ -124,13 +121,13 @@ class Tracksperanto::Pipeline::Base
       t.each_with_index do | kf, idx |
         keyframes += 1
         processor.export_point(kf.frame, kf.abs_x, kf.abs_y, kf.residual)
-        yield(percent_complete += kf_weight, "Writing keyframe #{idx+1} of #{t.name.inspect}") if block_given?
+        report_progress(percent_complete += kf_weight, "Writing keyframe #{idx+1} of #{t.name.inspect}, #{trackers.length - idx + 1} trackers to go")
       end
       processor.end_tracker_segment
     end
     processor.end_export
     
-    yield(100.0, "Wrote #{points} points and #{keyframes} keyframes") if block_given?
+    report_progress(100.0, "Wrote #{points} points and #{keyframes} keyframes")
     
     [points, keyframes]
   ensure
@@ -176,7 +173,7 @@ class Tracksperanto::Pipeline::Base
   
   # Check that the trackers made by the parser are A-OK
   def validate_trackers!(trackers)
-    trackers.reject!{|t| t.length < 2 }
+    trackers.reject!{|t| t.empty? }
     raise "Could not recover any non-empty trackers from this file. Wrong import format maybe?" if trackers.empty?
   end
 end

data/lib/tracksperanto.rb

@@ -4,7 +4,7 @@ require 'tempfile'
 
 module Tracksperanto
   PATH = File.expand_path(File.dirname(__FILE__))
-  VERSION = '1.8.1'
+  VERSION = '1.8.2'
   
   module Import; end
   module Export; end
@@ -59,6 +59,7 @@ module Tracksperanto
 end
 
 %w(
+  returning
   const_name
   casts
   block_init
@@ -69,6 +70,7 @@ end
   format_detector
   ext_io
   progressive_io
+  buffer_io
   simple_export
   uv_coordinates
   flame_builder

data/lib/tracksperanto/buffer_io.rb

@@ -0,0 +1,48 @@
+require "tempfile"
+
+# BufferIO is used for writing big segments of text. When the segment is bigger than a certain number of bytes,
+# the underlying memory buffer will be swapped with a tempfile
+class Tracksperanto::BufferIO < DelegateClass(IO)
+  include Tracksperanto::Returning
+  
+  IN_MEMORY_SIZE_LIMIT = 100_000
+  
+  def initialize
+    __setobj__(StringIO.new)
+  end
+  
+  def write(s)
+    returning(super) { replace_with_tempfile_if_needed }
+  end
+  
+  def puts(s)
+    returning(super) { replace_with_tempfile_if_needed }
+  end
+  
+  def <<(s)
+    returning(super) { replace_with_tempfile_if_needed }
+  end
+  
+  def putc(c)
+    returning(super) { replace_with_tempfile_if_needed }
+  end
+  
+  def close!
+    __getobj__.close! if @tempfile_in
+    __setobj__(nil)
+  end
+  
+  private
+  
+  def replace_with_tempfile_if_needed
+    return if @tempfile_in
+    io = __getobj__
+    if io.pos > IN_MEMORY_SIZE_LIMIT
+      @tempfile_in = true
+      tf = Tempfile.new("tracksperanto-xbuf")
+      io.rewind
+      tf.write(io.read) until io.eof?
+      __setobj__(tf)
+    end
+  end
+end

data/lib/tracksperanto/flame_builder.rb

@@ -12,6 +12,11 @@ class Tracksperanto::FlameBuilder
     @io.puts(INDENT * (@indent + 1) + "End")
   end
   
+  def write_unterminated_block!(name, value = nil, &blk)
+    value.nil? ? write_loose!(name) : write_tuple!(name, value)
+    yield(self.class.new(@io, @indent + 1))
+  end
+  
   def write_tuple!(key, value)
     @io.puts("%s%s %s" % [INDENT * @indent, __camelize(key), __flameize(value)])
   end
@@ -25,34 +30,36 @@ class Tracksperanto::FlameBuilder
   end
   
   def color_hash!(name, red, green, blue)
-    write_loose!(name)
-    n = self.class.new(@io, @indent + 1)
-    n.red(red)
-    n.green(green)
-    n.blue(blue)
+    write_unterminated_block!(name) do | b |
+      b.red(red)
+      b.green(green)
+      b.blue(blue)
+    end
   end
   
-  private
-  
-  def method_missing(meth, arg = nil)
-    self.class.send(:alias_method, meth, :__generic)
-    if block_given?
-      __generic(meth, arg) {|*a| yield(*a) if block_given? }
-    else
-      __generic(meth, arg)
+  def <<(some_verbatim_string)
+    some_verbatim_string.split("\n").each do | line |
+      @io.puts(["\t" * @indent, line].join)
     end
   end
   
-  def __generic(meth, arg = nil)
+  private
+  
+  def method_missing(meth, arg = nil)
     if block_given?
-      write_block!(meth, arg) { |c| yield(c) }
+      write_block!(meth, arg) {|c| yield(c) }
     else
-      arg.nil? ? write_loose!(meth) : write_tuple!(meth, arg)
+      if arg.nil?
+        write_loose!(meth)
+      else
+        write_tuple!(meth, arg)
+      end
     end
   end
   
   def __camelize(s)
-    s.to_s.gsub(/(^|_)(.)/) { $2.upcase }
+    @@camelizations ||= {}
+    @@camelizations[s] ||= s.to_s.gsub(/(^|_)(.)/) { $2.upcase }
   end
   
   def __flameize(v)

data/lib/tracksperanto/progressive_io.rb

@@ -1,17 +1,17 @@
 # Used for IO objects that need to report the current offset at each operation that changes the said offset
 # (useful for building progress bars that report on a file read operation)
 class Tracksperanto::ProgressiveIO < DelegateClass(IO)
-  
-  # Should contain a block that accepts the current offset in bytes and the total size
-  attr_accessor :progress_block
+  include Tracksperanto::Returning
   
   # Get or set the total size of the contained IO. If the passed IO is a File object 
   # the size will be preset automatically
   attr_accessor :total_size
+  attr_accessor :progress_block
   
-  def initialize(with_file)
+  def initialize(with_file, &blk)
     __setobj__(with_file)
     @total_size = with_file.stat.size if with_file.respond_to?(:stat)
+    @progress_block = blk.to_proc if blk
   end
   
   def each(sep_string = $/, &blk)
@@ -69,9 +69,6 @@ class Tracksperanto::ProgressiveIO < DelegateClass(IO)
   end
   
   private
-    def returning(r)
-      yield; r
-    end
     
     def notify_read
       @progress_block.call(pos, @total_size) if @progress_block

data/lib/tracksperanto/returning.rb

@@ -0,0 +1,6 @@
+module Tracksperanto::Returning
+  # The "returning" idiomn copied from ActiveSupport
+  def returning(r)
+    yield(r); r
+  end
+end

data/test/export/samples/ref_flame.stabilizer

@@ -101,14 +101,6 @@ Channel tracker1/ref/dx
 		Interpolation constant
 		End
 	End
-Channel tracker1/offset/x
-	Extrapolation constant
-	Value 0
-	End
-Channel tracker1/offset/y
-	Extrapolation constant
-	Value 0
-	End
 Channel tracker1/ref/dy
 	Extrapolation constant
 	Value 0
@@ -495,14 +487,6 @@ Channel tracker2/ref/dx
 		Interpolation constant
 		End
 	End
-Channel tracker2/offset/x
-	Extrapolation constant
-	Value 0
-	End
-Channel tracker2/offset/y
-	Extrapolation constant
-	Value 0
-	End
 Channel tracker2/ref/dy
 	Extrapolation constant
 	Value 0
@@ -821,7 +805,6 @@ Tracker 0
 	FixedX no
 	FixedY no
 	Tolerance 100
-	End
 Tracker 1
 	Active yes
 	Colour
@@ -832,4 +815,3 @@ Tracker 1
 	FixedX no
 	FixedY no
 	Tolerance 100
-	End

data/test/export/test_flame_stabilizer_export.rb

@@ -7,7 +7,7 @@ class FlameStabilizerExportTestTest < Test::Unit::TestCase
   def test_export_output_written
     t = Time.local(2010, "Feb", 18, 17, 22, 12)
     flexmock(Time).should_receive(:now).once.and_return(t)
-    ensure_same_output Tracksperanto::Export::FlameStabilizer, P
+    ensure_same_output Tracksperanto::Export::FlameStabilizer, P 
   end
   
   def test_exporter_meta

data/test/test_buffer_io.rb

@@ -0,0 +1,22 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestBufferIO < Test::Unit::TestCase
+  
+  def test_write_in_mem_has_a_stringio
+    io = Tracksperanto::BufferIO.new
+    9000.times { io.write("a") }
+    assert_kind_of StringIO, io.__getobj__
+    assert_nothing_raised { io.close! }
+  end
+  
+  def test_write_larger_than_max_swaps_tempfile
+    io = Tracksperanto::BufferIO.new
+    110_000.times { io.write("a") }
+    f = io.__getobj__
+    assert_kind_of Tempfile, f
+    f.rewind
+    assert_equal 110_000, f.read.length
+    flexmock(f).should_receive(:close!).once
+    io.close!
+  end
+end

data/test/test_flame_builder.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/helper'
+require "benchmark"
 
 class FlameBuilderTest < Test::Unit::TestCase
   def setup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tracksperanto
 version: !ruby/object:Gem::Version 
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors: 
 - Julik Tarkhanov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-18 00:00:00 +01:00
+date: 2010-03-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,6 +89,7 @@ files:
 - lib/pipeline/base.rb
 - lib/tracksperanto.rb
 - lib/tracksperanto/block_init.rb
+- lib/tracksperanto/buffer_io.rb
 - lib/tracksperanto/casts.rb
 - lib/tracksperanto/const_name.rb
 - lib/tracksperanto/ext_io.rb
@@ -96,6 +97,7 @@ files:
 - lib/tracksperanto/format_detector.rb
 - lib/tracksperanto/keyframe.rb
 - lib/tracksperanto/progressive_io.rb
+- lib/tracksperanto/returning.rb
 - lib/tracksperanto/safety.rb
 - lib/tracksperanto/simple_export.rb
 - lib/tracksperanto/tracker.rb
@@ -177,6 +179,7 @@ files:
 - test/middleware/test_scaler_middleware.rb
 - test/middleware/test_shift_middleware.rb
 - test/middleware/test_slip_middleware.rb
+- test/test_buffer_io.rb
 - test/test_const_name.rb
 - test/test_extio.rb
 - test/test_flame_builder.rb
@@ -248,6 +251,7 @@ test_files:
 - test/middleware/test_scaler_middleware.rb
 - test/middleware/test_shift_middleware.rb
 - test/middleware/test_slip_middleware.rb
+- test/test_buffer_io.rb
 - test/test_const_name.rb
 - test/test_extio.rb
 - test/test_flame_builder.rb