tracksperanto 2.6.3 → 2.7.0

data/test/import/test_pftrack_import.rb

@@ -73,7 +73,7 @@ class PFTrackImportTest < Test::Unit::TestCase
   def test_stereoscopy
     fixture = File.open(File.dirname(__FILE__) + '/samples/pftrack5/stereo.2dt')
     parser = Tracksperanto::Import::PFTrack.new(:io => fixture, :width => 1920, :height => 1080)
-    acc = Tracksperanto::Accumulator.new
+    acc = Obuf.new
     parser.each{|t| acc << t }
     
     assert_equal 1690, acc.size, "Should have recovered 1690 trackers"

data/test/import/test_shake_text_import.rb

@@ -5,7 +5,7 @@ class ShakeTextImportTest < Test::Unit::TestCase
   
   def test_introspects_properly
     i = Tracksperanto::Import::ShakeText
-    assert_equal "Shake .txt tracker file", i.human_name
+    assert_equal "Shake .txt tracker file and Nuke CameraTracker auto tracks export", i.human_name
     assert !i.autodetects_size?
   end
   
@@ -48,4 +48,24 @@ class ShakeTextImportTest < Test::Unit::TestCase
     t2 = trackers[-1]
     assert_equal "track2", t2.name
   end
+
+  def test_parsing_from_nuke_camera_tracker
+    fixture = File.open(File.dirname(__FILE__) + '/samples/shake_text/nuke_camtracker.txt')
+    trackers = Tracksperanto::Import::ShakeText.new(:io => fixture).to_a
+    
+    assert_kind_of Enumerable, trackers
+    assert_equal 261, trackers.length
+    
+    t = trackers[0]
+    
+    assert_equal "autotrack0", t.name
+    assert_kind_of Tracksperanto::Tracker, t
+    assert_equal 11, t.keyframes.length
+    
+    second_kf = t.keyframes[1]
+    assert_in_delta 1, second_kf.frame, DELTA
+    
+    t2 = trackers[-1]
+    assert_equal "autotrack260", t2.name
+  end
 end

data/test/test_bufferingreader.rb

@@ -0,0 +1,47 @@
+require File.expand_path(File.dirname(__FILE__)) + '/helper'
+
+class TestBufferingReader < Test::Unit::TestCase
+  def test_reads_once
+    s = StringIO.new("This is a string")
+    
+    reader = Tracksperanto::BufferingReader.new(s)
+    assert_equal "T", reader.read_one_byte
+    assert_equal "h", reader.read_one_byte
+    assert !reader.data_exhausted?
+  end
+  
+  def test_reads_set_buffer_size
+    s = StringIO.new("abcd")
+    flexmock(s).should_receive(:read).with(4).once.and_return("abcd")
+    reader = Tracksperanto::BufferingReader.new(s, 4)
+    reader.read_one_byte
+  end
+  
+  def test_reads_in_10kb_chunks_by_default
+    s = StringIO.new("abcd")
+    flexmock(s).should_receive(:read).with(10240).once.and_return("abcd")
+    reader = Tracksperanto::BufferingReader.new(s)
+    reader.read_one_byte
+  end
+  
+  def test_eof_with_empty
+    s = StringIO.new
+    reader = Tracksperanto::BufferingReader.new(s)
+    assert s.eof?
+  end
+  
+  def test_eof_with_io_at_eof
+    s = StringIO.new("foo")
+    s.read(3)
+    reader = Tracksperanto::BufferingReader.new(s)
+    assert reader.data_exhausted?
+  end
+  
+  def test_eof_with_string_to_size
+    s = "Foobarboo another"
+    s = StringIO.new(s)
+    reader = Tracksperanto::BufferingReader.new(s, 1)
+    s.length.times { reader.read_one_byte }
+    assert reader.data_exhausted?
+  end
+end

data/test/test_pipeline.rb

@@ -52,8 +52,8 @@ class PipelineTest < Test::Unit::TestCase
     
     pipeline = Tracksperanto::Pipeline::Base.new(:progress_block => accum)
     assert_nothing_raised { pipeline.run(@stabilizer) }
-    reference = File.read(File.dirname(__FILE__) + "/fixtures/processing_log.txt")
-    assert_equal reference, processing_log, "The log output should be the same"
+    assert processing_log.include?("Parsing the file")
+    assert processing_log.include?("Parsing channel \"tracker1/ref/y\"")
   end
   
   def test_run_crashes_with_empty_file

metadata

@@ -2,7 +2,7 @@
 name: tracksperanto
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.6.3
+  version: 2.7.0
 platform: ruby
 authors: 
 - Julik Tarkhanov
@@ -10,74 +10,96 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-31 00:00:00 Z
+date: 2011-10-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: flame_channel_parser
+  name: obuf
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: progressive_io
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: flame_channel_parser
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
         version: 2.2.1
   type: :runtime
-  version_requirements: *id001
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: progressbar
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: "0.9"
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: update_hints
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: "1.0"
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: flexmock
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: "0.8"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: cli_test
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: "1.0"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: "2.10"
   type: :development
-  version_requirements: *id006
+  version_requirements: *id008
 description: Tracksperanto is a universal 2D-track translator between many apps.
 email: 
 - me@julik.nl
@@ -145,16 +167,15 @@ files:
 - lib/middleware/start_trim.rb
 - lib/pipeline/base.rb
 - lib/tracksperanto.rb
-- lib/tracksperanto/accumulator.rb
 - lib/tracksperanto/block_init.rb
 - lib/tracksperanto/buffer_io.rb
+- lib/tracksperanto/buffering_reader.rb
 - lib/tracksperanto/casts.rb
 - lib/tracksperanto/const_name.rb
 - lib/tracksperanto/ext_io.rb
 - 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
@@ -188,7 +209,6 @@ files:
 - test/export/test_pftrack_export.rb
 - test/export/test_shake_export.rb
 - test/export/test_syntheyes_export.rb
-- test/fixtures/processing_log.txt
 - test/helper.rb
 - test/import/samples/3de_v3/3de_export_v3.txt
 - test/import/samples/3de_v4/3de_export_cube.txt
@@ -229,6 +249,7 @@ files:
 - test/import/samples/shake_script/three_tracks_in_one_stabilizer.shk
 - test/import/samples/shake_script/track.shk
 - test/import/samples/shake_script/two_tracks_in_one_tracker.shk
+- test/import/samples/shake_text/nuke_camtracker.txt
 - test/import/samples/shake_text/one_shake_tracker.txt
 - test/import/samples/shake_text/one_shake_tracker_from_first.txt
 - test/import/samples/shake_text/two_shake_trackers.txt
@@ -262,8 +283,8 @@ files:
 - test/middleware/test_shift_middleware.rb
 - test/middleware/test_slip_middleware.rb
 - test/middleware/test_start_trim_middleware.rb
-- test/test_accumulator.rb
 - test/test_buffer_io.rb
+- test/test_bufferingreader.rb
 - test/test_cli.rb
 - test/test_const_name.rb
 - test/test_extio.rb
@@ -271,7 +292,6 @@ files:
 - test/test_format_detector.rb
 - test/test_keyframe.rb
 - test/test_pipeline.rb
-- test/test_progressive_io.rb
 - test/test_simple_export.rb
 - test/test_tracker.rb
 - test/test_tracksperanto.rb
@@ -343,8 +363,8 @@ test_files:
 - test/middleware/test_shift_middleware.rb
 - test/middleware/test_slip_middleware.rb
 - test/middleware/test_start_trim_middleware.rb
-- test/test_accumulator.rb
 - test/test_buffer_io.rb
+- test/test_bufferingreader.rb
 - test/test_cli.rb
 - test/test_const_name.rb
 - test/test_extio.rb
@@ -352,7 +372,6 @@ test_files:
 - test/test_format_detector.rb
 - test/test_keyframe.rb
 - test/test_pipeline.rb
-- test/test_progressive_io.rb
 - test/test_simple_export.rb
 - test/test_tracker.rb
 - test/test_tracksperanto.rb

data/lib/tracksperanto/accumulator.rb

@@ -1,103 +0,0 @@
-# An accumulator buffer for Ruby objects. Use it to sequentially store a shitload
-# of objects on disk and then retreive them one by one. Make sure to call clear when done
-# with it to discard the stored blob. It can be used like a disk-based object buffer.
-# (Tracksperanto stores parsed trackers into it)
-#
-#  a = Tracksperanto::Accumulator.new
-#  parse_big_file do | one_node |
-#    a.push(one_node)
-#  end
-#
-#  a.size #=> 30932 # We've stored 30 thousand objects on disk without breaking a sweat
-#  a.each do | node_read_from_disk |
-#     # do something with node that has been recovered from disk
-#  end
-#
-#  a.clear # ensure that the file is deleted
-class Tracksperanto::Accumulator
-  include Enumerable
-  
-  DELIM = "\n"
-  
-  # Returns the number of objects stored so far
-  attr_reader :size
-  
-  def initialize
-    @store = Tracksperanto::BufferIO.new
-    @size = 0
-    
-    super
-  end
-  
-  def empty?
-    @size.zero?
-  end
-  
-  # Store an object
-  def push(object_to_store)
-    blob = marshal_object(object_to_store)
-    @store.write(blob)
-    @size += 1
-    
-    object_to_store
-  end
-  
-  alias_method :<<, :push
-  
-  # Retreive each stored object in succession. All other Enumerable
-  # methods are also available (but be careful with Enumerable#map and to_a)
-  def each
-    with_separate_read_io do | iterable |
-      @size.times { yield(recover_object_from(iterable)) }
-    end
-  end
-  
-  # Calls close! on the datastore and deletes the objects in it
-  def clear
-    @store.close!
-    @size = 0
-  end
-  
-  # Retreive a concrete object at index
-  def [](idx)
-    idx.respond_to?(:each) ? idx.map{|i| recover_at(i) } : recover_at(idx)
-  end
-  
-  private
-  
-  def recover_at(idx)
-    with_separate_read_io do | iterable |
-      iterable.seek(0)
-      
-      # Do not unmarshal anything but wind the IO in fixed offsets
-      idx.times do
-        skip_bytes = iterable.gets("\t").to_i
-        iterable.seek(iterable.pos + skip_bytes)
-      end
-      
-      recover_object_from(iterable)
-    end
-  end
-  
-  # We first ensure that we have a disk-backed file, then reopen it as read-only
-  # and iterate through that (we will have one IO handle per loop nest)
-  def with_separate_read_io
-    iterable = File.open(@store.to_file.path, "r")
-    yield(iterable)
-  ensure
-    iterable.close
-  end
-  
-  def marshal_object(object_to_store)
-    d = Marshal.dump(object_to_store)
-    blob = [d.size, "\t", d, DELIM].join
-  end
-  
-  def recover_object_from(io)
-    # Up to the tab is the amount of bytes to read
-    demarshal_bytes = io.gets("\t").to_i
-    blob = io.read(demarshal_bytes)
-    
-    Marshal.load(blob)
-  end
-end

data/lib/tracksperanto/progressive_io.rb

@@ -1,78 +0,0 @@
-# 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). Pass the actual IO and a block to
-# report progress to the constructor.
-class Tracksperanto::ProgressiveIO < DelegateClass(IO)
-  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, &blk)
-    __setobj__(with_file)
-    @total_size = with_file.stat.size if with_file.respond_to?(:stat)
-    @progress_block = blk.to_proc if blk
-  end
-  
-  # Report offset at each line
-  def each(sep_string = $/, &blk)
-    # Report offset at each call of the iterator
-    result = super(sep_string) do | line |
-      yield(line)
-      notify_read
-    end
-  end
-  alias_method :each_line, :each
-  
-  def each_byte(&blk)
-    # Report offset at each call of the iterator
-    super { |b| yield(b); notify_read }
-  end
-  
-  def getc
-    returning(super) { notify_read }
-  end
-  
-  def gets
-    returning(super) { notify_read }
-  end
-  
-  def read(*a)
-    returning(super) { notify_read }
-  end
-  
-  def readbytes(*a)
-    returning(super) { notify_read }
-  end
-  
-  def readchar
-    returning(super) { notify_read }
-  end
-  
-  def readline(*a)
-    returning(super) { notify_read }
-  end
-  
-  def readlines(*a)
-    returning(super) { notify_read }
-  end
-  
-  def seek(*a)
-    returning(super) { notify_read }
-  end
-  
-  def ungetc(*a)
-    returning(super) { notify_read }
-  end 
-  
-  def pos=(p)
-    returning(super) { notify_read }
-  end
-  
-  private
-    
-    def notify_read
-      @progress_block.call(pos, @total_size) if @progress_block
-    end
-end

data/test/fixtures/processing_log.txt

@@ -1,50 +0,0 @@
-0 -> Starting the parser
-0 -> Extracting setup size
-0 -> Extracting all animation channels
-3 -> Parsing the file
-6 -> Parsing the file
-9 -> Parsing the file
-13 -> Parsing the file
-16 -> Parsing the file
-19 -> Parsing the file
-22 -> Parsing the file
-25 -> Parsing the file
-28 -> Parsing the file
-31 -> Parsing the file
-34 -> Parsing the file
-37 -> Parsing the file
-40 -> Parsing the file
-43 -> Parsing the file
-46 -> Parsing the file
-49 -> Parsing the file
-50 -> Assembling tracker curves from channels
-50 -> Detected reference channel tracker1/ref/x
-50 -> Extracting tracker tracker1
-50 -> Detecting base value
-50 -> Extracting keyframe 2 of tracker1
-50 -> Extracting keyframe 3 of tracker1
-50 -> Extracting keyframe 4 of tracker1
-50 -> Detected reference channel tracker2/ref/x
-50 -> Extracting tracker tracker2
-50 -> Detecting base value
-50 -> Extracting keyframe 2 of tracker2
-50 -> Extracting keyframe 3 of tracker2
-50 -> Extracting keyframe 4 of tracker2
-50 -> Detected reference channel tracker3/ref/x
-50 -> Extracting tracker tracker3
-50 -> Detecting base value
-50 -> Extracting keyframe 2 of tracker3
-50 -> Extracting keyframe 3 of tracker3
-50 -> Extracting keyframe 4 of tracker3
-50 -> Validating 3 imported trackers
-50 -> Starting export
-55 -> Writing keyframe 1 of "tracker1", 3 trackers to go
-61 -> Writing keyframe 2 of "tracker1", 3 trackers to go
-66 -> Writing keyframe 3 of "tracker1", 3 trackers to go
-72 -> Writing keyframe 1 of "tracker2", 2 trackers to go
-77 -> Writing keyframe 2 of "tracker2", 2 trackers to go
-83 -> Writing keyframe 3 of "tracker2", 2 trackers to go
-88 -> Writing keyframe 1 of "tracker3", 1 trackers to go
-94 -> Writing keyframe 2 of "tracker3", 1 trackers to go
-100 -> Writing keyframe 3 of "tracker3", 1 trackers to go
-100 -> Wrote 3 points and 9 keyframes

data/test/test_accumulator.rb

@@ -1,74 +0,0 @@
-require File.expand_path(File.dirname(__FILE__)) + '/helper'
-
-class TestAccumulator < Test::Unit::TestCase
-  
-  def test_accumulator_saves_objs
-    a = Tracksperanto::Accumulator.new
-    values = [3, {:foo => "bar"}, "foo"]
-    values.map(&a.method(:push))
-    
-    assert_equal 3, a.size
-    assert_equal values, a.map{|e| e }, "Should return the same elements from the storage"
-  end
-  
-  def test_accumulator_saves_shitload_of_objs
-    a = Tracksperanto::Accumulator.new
-    50_000.times { a.push("A string" => rand) }
-    assert_equal 50_000, a.size
-  end
-  
-  def test_accumulator_saves_shitload_of_objs
-    a = Tracksperanto::Accumulator.new
-    4.times { a.push("A \tstring") }
-    a.each {|e| assert_equal "A \tstring", e }
-  end
-  
-  def test_accumulator_empty
-    a = Tracksperanto::Accumulator.new
-    assert a.empty?
-    a.push(1)
-    assert !a.empty?
-  end
-  
-  def test_accumulator_supports_nested_iteration
-    a = Tracksperanto::Accumulator.new
-    ("A".."Z").each{|e| a << e}
-    
-    accumulated = []
-    seen_g = false
-    a.each do | first_level |
-      if first_level == "G"
-        seen_g = true
-        # Force a nested iteration and break it midway
-        a.each do | second_level |
-          accumulated.push(second_level)
-          break if second_level == "E"
-        end
-      elsif seen_g
-        assert_equal "H", first_level
-        return
-      end
-    end
-  end
-  
-  def test_random_access
-    a = Tracksperanto::Accumulator.new
-    letters = ("A".."Z").map{|e| "#{e}\r\nWow!"}.to_a
-    letters.map(&a.method(:push))
-    
-    assert_equal "B\r\nWow!", a[1]
-    assert_equal "E\r\nWow!", a[4]
-  end
-  
-  def test_clear_calls_close_on_buffer
-    io = Tracksperanto::BufferIO.new
-    flexmock(io).should_receive(:close!)
-    flexmock(Tracksperanto::BufferIO).should_receive(:new).once.and_return(io)
-    
-    a = Tracksperanto::Accumulator.new
-    40.times { a.push("A string" => rand) }
-    assert_equal 40, a.size
-    a.clear
-    assert_equal 0, a.size
-  end
-end