tracksperanto 3.3.6 → 3.3.7

data/{DEVELOPER_DOCS.rdoc → CONTRIBUTING.md}

@@ -1,11 +1,11 @@
-== Hacking Tracksperanto
+## Hacking Tracksperanto
 
-=== Tests
+### Tests
 
 Tracksperanto is heavily tested. Please use the Github checkout to also receive some 17+ megabytes of test files that the test suite
 can chew on. Contributions or patches without tests will be rejected at sight.
 
-=== Development environment
+### Development environment
 
 Tracksperanto is currently being developed on Ruby 1.9.3 but it should also work fine on 1.8.7.
 What you will need is everything mentioned in the Gemfile plus Bundler.
@@ -16,13 +16,13 @@ The test corpus on Tracksperanto is HUGE at the moment, and it makes no sense to
 
 So, to get started:
 
-* Make sure you have Ruby and Bundler (+sudo gem install bundler+ if unsure)
+* Make sure you have Ruby and Bundler (`sudo gem install bundler` if unsure)
 * Checkout the repo at http://github.com/guerilla-di/tracksperanto
-* Run +bundle install+ and +bundle exec rake+ to run the tests
+* Run `bundle install` and `bundle exec rake` to run the tests
 * Do your thing, in a separate branch
-* File a pull request or send a patch to +me at julik dot nl+
+* File a pull request or send a patch to **me at julik dot nl**
 
-=== Internal tracker representation
+### Internal tracker representation
 
 The trackers are represented by Tracker objects, which work like addressable hashes per frame number. The Tracker objects
 contain Keyframe objects, and those in turn contain coordinates. The coordinates are stored in absolute pixels, relative to
@@ -31,80 +31,81 @@ the zero coordinate in the lower left corner.
 Note on subpixel precision: the absolute left/bottom of the image has coordinates 0,0 
 (at the lower left corner of the leftmost bottommost pixel) and 0.5x0.5 in the middle of that pixel.
 
-=== Importing your own formats
+### Importing your own formats
 
 To write an import module refer to Tracksperanto::Import::Base
 docs. Your importer will be configured with width and height of the comp that it is importing, and will get an IO 
 object with the file that you are processing. You should then yield parsed trackers within the each method (tracker objects should
 be Tracksperanto::Tracker objects or compatibles)
 
-=== Exporting your own formats
+### Exporting your own formats
 
 You can easily write an exporter. Refer to the Tracksperanto::Export::Base docs. Note that your exporter should be able to chew alot of data
 (hundreds of trackers with thousands of keyframes with exported files growing up to 5-10 megs in size are not uncommon!). This means that
 the exporter should work with streams (smaller parts of the file being exported will be held in memory at a time).
 
-=== Ading your own processing steps
+### Ading your own processing steps
 
 You probably want to write a Tool (consult the Tracksperanto::Tool::Base docs) if you need some processing applied to the tracks
 or their data. A Tool is just like an export module, except that instead it sits between the exporter and the exporting routine. Tools wrap export
 modules or each other, so you can stack different tool modules together (like "scale first, then move").
 
-=== Writing your own processing pipelines from start to finish
+### Writing your own processing pipelines from start to finish
 
 You probably want to write a descendant of Tracksperanto::Pipeline::Base. This is a class that manages a conversion from start to finish, including detecting the
 input format, allocating output files and building a chain of Tools to process the export. If you want to make a GUI for Tracksperanto you will likely need
 to write your own Pipeline class or reimplement parts of it.
 
-=== Reporting status from long-running operations
+### Reporting status from long-running operations
 
 Almost every module in Tracksperanto has a method called report_progress. This method is used to notify an external callback of what you are doing, and helps keep
 the software user-friendly. A well-behaved Tracksperanto module should manage it's progress reports properly.
 
-=== Sample script
-
-  require "rubygems"
-  require "tracksperanto"
-
-  include Tracksperanto
-
-  # Create the importer object, for example for a Shake script.
-  # get_importer will give you the good class even you get the capitalization
-  # wrong!
-  some_importer = Tracksperanto.get_importer("shakescript").new
-  
-  # This importer needs to know width and height
-  some_importer.width = 1024
-  some_importer.height = 576
-  some_importer.io = File.open("source_file.shk")
-  
-  # The importer responds to each() so if your file is not too big you can just load all the trackers
-  # as an array. If you expect to have alot of trackers investigate a way to buffer them on disk
-  # instead (see Obuf)
-  trackers = some_importer.to_a
-  
-  # Create the exporter and pass the output file to it
-  destination_file = File.open("exported_file.other", "wb")
-  some_exporter = Tracksperanto.get_exporter("flamestabilizer").new(destination_file)
-  
-  # Now add some tools, for example a Scale
-  scaler = Tool::Scaler.new(some_exporter, :x_factor => 2)
-  # ... and a slip. Tools wrap exporters and other tools, so you can chain them
-  # ad nauseam
-  slipper = Tool::Slipper.new(scaler, :offset => 2)
-  
-  # Now when we send export commands to the Slipper it will play them through
-  # to the Scaler and the Scaler in turn will send commands to the exporter.
-  # As you can see when you run export commands you do not have to use the Tracker
-  # objects, you just have to stream the right arguments in the right sequence
-  slipper.start_export(1024, 576)
-  trackers.each do | t |
-    slipper.start_tracker_segment(t.name)
-    t.each do | keyframe |
-      slipper.export_point(keyframe.frame, keyframe.abs_x, keyframe.abs_y, keyframe.residual)
+### Sample script
+
+    require "rubygems"
+    require "tracksperanto"
+    
+    include Tracksperanto
+    
+    # Create the importer object, for example for a Shake script.
+    # get_importer will give you the good class even you get the capitalization
+    # wrong!
+    some_importer = Tracksperanto.get_importer("shakescript").new
+    
+    # This importer needs to know width and height
+    some_importer.width = 1024
+    some_importer.height = 576
+    some_importer.io = File.open("source_file.shk")
+    
+    # The importer responds to each() so if your file is not too big you can just load all the trackers
+    # as an array. If you expect to have alot of trackers investigate a way to buffer them on disk
+    # instead (see Obuf)
+    trackers = some_importer.to_a
+    
+    # Create the exporter and pass the output file to it
+    destination_file = File.open("exported_file.other", "wb")
+    some_exporter = Tracksperanto.get_exporter("flamestabilizer").new(destination_file)
+    
+    # Now add some tools, for example a Scale
+    scaler = Tool::Scaler.new(some_exporter, :x_factor => 2)
+    # ... and a slip. Tools wrap exporters and other tools, so you can chain them
+    # ad nauseam
+    slipper = Tool::Slipper.new(scaler, :offset => 2)
+    
+    # Now when we send export commands to the Slipper it will play them through
+    # to the Scaler and the Scaler in turn will send commands to the exporter.
+    # As you can see when you run export commands you do not have to use the Tracker
+    # objects, you just have to stream the right arguments in the right sequence
+    slipper.start_export(1024, 576)
+    trackers.each do | t |
+      slipper.start_tracker_segment(t.name)
+      t.each do | keyframe |
+        slipper.export_point(keyframe.frame, keyframe.abs_x, keyframe.abs_y, keyframe.residual)
+      end
+      slipper.end_tracker_segment
     end
-    slipper.end_tracker_segment
-  end
-  slipper.end_export
-  
-  # And we are done!
+    slipper.end_export
+    
+    # And we are done!
+    

data/Gemfile

@@ -1,5 +1,5 @@
 # -*- ruby -*-
-source :rubygems
+source 'http://rubygems.org'
 
 gem "bundler"
 
@@ -19,12 +19,11 @@ group :development do
   gem "linebyline"
   
   if RUBY_VERSION > "1.8"
-    gem "flexmock", "~> 1.3", :require => %w( flexmock flexmock/test_unit )
+    gem "flexmock", "~> 1.3.2", :require => %w( flexmock flexmock/test_unit )
   else
     gem "flexmock", "~> 0.8", :require => %w( flexmock flexmock/test_unit )
   end
   
   gem "cli_test", "~>1.0"
   gem "rake-hooks"
-  gem "ruby-prof"
 end

data/History.txt

@@ -1,3 +1,8 @@
+=== 3.3.7
+
+* Fix PlanarTracker import support in Nuke 7 scripts
+* Add Nuke CornerPin node support
+
 === 3.3.6
 
 * Shake out the latest Bundler integration issues

data/README.rdoc

@@ -52,7 +52,7 @@ that you export - and you can apply multiple transformations if desired.
 == Using Tracksperanto from the command line
 
 To run on your own computer, make sure you have Ruby installed. Versions from 1.8.7
-and up are supported.
+and up are supported. Wea re also testing on Ruby 2.0.0 now.
     
     $ ruby -v
     ruby 1.9.3p286 (2012-10-12 revision 37165) [x86_64-darwin12.2.0]
@@ -100,7 +100,7 @@ If you want your own copy of the web application at your facility we can discuss
 * MatchMover REALVIZ Ascii Point Tracks .rz2 file
 * MatchMover RZML .rzml file
 * Maya Live track export file
-* Nuke .nk script file with Tracker, Reconcile3D and PlanarTracker nodes
+* Nuke .nk script file with Tracker, Reconcile3D, PlanarTracker and CornerPin nodes
 * PFTrack/PFMatchit .2dt file
 * Shake .shk script file
 * Shake .txt tracker file and Nuke CameraTracker auto tracks export
@@ -139,7 +139,7 @@ Consult the --help option to see what is available.
 == Development
 
 If you are interested in reusing Tracksperanto's code or adding modules to the software consult
-the {short developer introduction}[https://github.com/guerilla-di/tracksperanto/blob/master/DEVELOPER_DOCS.rdoc]
+the {short developer introduction}[https://github.com/guerilla-di/tracksperanto/blob/master/CONTRIBUTING.md]
 
 == Limitations
 

data/bin/tracksperanto

@@ -10,6 +10,9 @@
 # == Author
 #   Julik <me@julik.nl>
 
+# Show the message just in case
+$stdout.puts "Starting Tracksperanto. For information and support please contact info#{64.chr}guerilla-di.org"
+
 # Require the xperanto lib, which in turn requires Bundler and pulls in all the gems
 require File.dirname(__FILE__) + '/../lib/tracksperanto' unless defined?(Tracksperanto)
 require 'update_hints'
@@ -17,8 +20,7 @@ require 'optparse'
 require 'progressbar'
 
 def disclaimer
-  "Please consider a small donation to keep Tracksperanto going: http://guerilla-di.org/source-and-license/\n"+
-  "For information and support please contact info#{64.chr}guerilla-di.org"
+  "Please consider a small donation to keep Tracksperanto going: http://guerilla-di.org/source-and-license/"
 end
 
 options = {}

data/lib/import/base.rb

@@ -22,7 +22,7 @@ class Tracksperanto::Import::Base
   # Trakcksperanto will assign the passed width and height to the importer object before running
   # the import. If not, you can replace the assigned values with your own. At the end of the import
   # procedure, Tracksperanto will read the values from you again and will use the read values
-  # for determining the original comp size. +width+ and +height+ MUST return integer values after
+  # for determining the original comp size. +width+ and +height+ MUST return unsigned integer values after
   # the import completes
   attr_accessor :width, :height
   
@@ -64,7 +64,7 @@ class Tracksperanto::Import::Base
   end
   
   # The main method of the parser. Should
-  # yield each tracker that has been fully parsed. After calling this method the caller can ask for
+  # yield each Tracker that has been fully parsed. After calling this method the caller can ask for
   # width and height as well.
   def each
   end

data/lib/import/flame_stabilizer.rb

@@ -65,28 +65,41 @@ class Tracksperanto::Import::FlameStabilizer < Tracksperanto::Import::Base
       end
     end
     
+    # Extracts the animation channels and stores them in Obufs
+    # keyed by the channel path (like "tracker1/ref/x")
     def extract_channels_from_stream(io)
       parser = StabilizerParser.new
       parser.logger_proc = method(:report_progress)
       
-      channels = Obuf.new
-      names = []
+      channel_map = {}
       parser.parse(io) do | channel |
-        channels.push(channel)
-        names.push(channel.path)
+        # Serialize the channel and store it on disk.
+        # Flame stabilizers are NOT likely to contain hundreds of
+        # trackers unless they were machine-exported from something,
+        # but we need to be memory-aware when we do things like this.
+        # On our test suite we lose half a second on disk IO overhead
+        # of the Obuf here, which is an acceptable compromise.
+        # To get rid of the disk-based cache just toss the outer
+        # Obuf constructor and pass in an Array
+        channel_map[channel.path] = Obuf.new([channel])
       end
       
-      [channels, names]
+      channel_map
     end
     
-    def scavenge_trackers_from_channels(channels, names)
-      channels.each do |c|
-        next unless c.name =~ /\/ref\/x/
+    def scavenge_trackers_from_channels(channel_map, names)
+      # Use Hash#keys.sort because we want a consistent export order
+      # irregardless of the Ruby version in use
+      # (hash keys are ordered on 1.9 and not ordered on 1.8)
+      channel_map.keys.sort.each do |c|
+        next unless c =~ /\/ref\/x$/
         
-        report_progress("Detected reference channel #{c.name}")
+        report_progress("Detected reference channel #{c.inspect}")
         
-        t = grab_tracker(channels, c, names)
-        yield(t) if t
+        extracted_tracker = grab_tracker(channel_map, c)
+        if extracted_tracker
+          yield(extracted_tracker)
+        end
       end
     end
     
@@ -94,29 +107,25 @@ class Tracksperanto::Import::FlameStabilizer < Tracksperanto::Import::Base
       chan.map{|key| [key.frame, key.value]}
     end
     
-    def grab_tracker(channels, track_x, names)
-      t = Tracksperanto::Tracker.new(:name => track_x.name.split('/').shift)
+    def grab_tracker(channel_map, ref_x_channel_name)
+      t = Tracksperanto::Tracker.new(:name => ref_x_channel_name.split('/').shift)
       
       report_progress("Extracting tracker #{t.name}")
       
-      # This takes a LONG time when we have alot of channels, we need a precache of
-      # some sort to do this
-      ref_idx = names.index("#{t.name}/ref/y")
-      shift_x_idx = names.index("#{t.name}/shift/x")
-      shift_y_idx = names.index("#{t.name}/shift/y")
-      
-      track_y = channels[ref_idx]
-      shift_x = channels[shift_x_idx]
-      shift_y = channels[shift_y_idx]
+      shift_x = channel_map["#{t.name}/shift/x"][0]
+      shift_y = channel_map["#{t.name}/shift/y"][0]
+      ref_x = channel_map["#{t.name}/ref/x"][0]
+      ref_y = channel_map["#{t.name}/ref/y"][0]
       
+      # Collapse separate X and Y curves into series of XY values
       shift_tuples = zip_curve_tuples(channel_to_frames_and_values(shift_x), channel_to_frames_and_values(shift_y))
-      track_tuples = zip_curve_tuples(channel_to_frames_and_values(track_x), channel_to_frames_and_values(track_y))
+      ref_tuples = zip_curve_tuples(channel_to_frames_and_values(ref_x), channel_to_frames_and_values(ref_y))
       
       # If the channels are just empty go to next tracker
-      return if shift_tuples.empty? || track_tuples.empty?
+      return if shift_tuples.empty? || ref_tuples.empty?
       
       report_progress("Detecting base value")
-      base_x, base_y =  find_base_x_and_y(track_tuples, shift_tuples)
+      base_x, base_y =  find_base_x_and_y(ref_tuples, shift_tuples)
       
       total_kf = 1
       t.keyframes = shift_tuples.map do | (at, x, y) |
@@ -131,10 +140,10 @@ class Tracksperanto::Import::FlameStabilizer < Tracksperanto::Import::Base
       return t
     end
     
-    def find_base_x_and_y(track_tuples, shift_tuples)
-      base_track_tuple = track_tuples.find do | track_tuple |
+    def find_base_x_and_y(ref_tuples, shift_tuples)
+      base_ref_tuple = ref_tuples.find do | track_tuple |
         shift_tuples.find { |shift_tuple| shift_tuple[0] == track_tuple[0] }
       end
-      (base_track_tuple || track_tuples[0])[1..2]
+      (base_ref_tuple || ref_tuples[0])[1..2]
     end
 end

data/lib/import/nuke_script.rb

@@ -5,7 +5,7 @@ require 'tickly'
 class Tracksperanto::Import::NukeScript < Tracksperanto::Import::Base
   
   def self.human_name
-    "Nuke .nk script file with Tracker, Reconcile3D and PlanarTracker nodes"
+    "Nuke .nk script file with Tracker, Reconcile3D, PlanarTracker and CornerPin nodes"
   end
   
   def self.distinct_file_ext
@@ -13,7 +13,8 @@ class Tracksperanto::Import::NukeScript < Tracksperanto::Import::Base
   end
   
   def self.known_snags
-    'The only supported nodes that we can extract tracks from are Reconcile3D, PlanarTracker and Tracker (supported Nuke versions are 5, 6 and 7)'
+    'The only supported nodes that we can extract tracks from are Reconcile3D,'
+    + ' PlanarTracker and Tracker (supported Nuke versions are 5, 6 and 7)'
   end
   
   def each
@@ -21,7 +22,9 @@ class Tracksperanto::Import::NukeScript < Tracksperanto::Import::Base
     parser.add_node_handler_class(Tracker3)
     parser.add_node_handler_class(Reconcile3D)
     parser.add_node_handler_class(PlanarTracker1_0)
+    parser.add_node_handler_class(PlanarTracker)
     parser.add_node_handler_class(Tracker4)
+    parser.add_node_handler_class(CornerPin2D)
     
     parser.parse(@io) do | node |
       node.trackers.each do | t |
@@ -87,12 +90,26 @@ class Tracksperanto::Import::NukeScript < Tracksperanto::Import::Base
     end
   end
   
+  # Planar tracker in Nuke 6
   class PlanarTracker1_0 < Tracker3
     def point_channels
       %w( outputBottomLeft outputBottomRight outputTopLeft outputTopRight)
     end
   end
   
+  # Planar tracker in Nuke 7
+  class PlanarTracker < PlanarTracker1_0
+    def point_channels
+      %w( outputBottomLeft outputBottomRight outputTopLeft outputTopRight)
+    end
+  end
+  
+  class CornerPin2D < Tracker3
+    def point_channels
+      %w( to1 to2 to3 to4 )
+    end
+  end
+  
   class Tracker4 < Tracker3
     
     def initialize(options)

data/lib/import/pftrack.rb

@@ -76,7 +76,9 @@ class Tracksperanto::Import::PFTrack < Tracksperanto::Import::Base
       (1..num_of_keyframes).map do | keyframe_idx |
         report_progress("Reading keyframe #{keyframe_idx} of #{num_of_keyframes} in #{t.name}")
         f, x, y, residual = io.gets.chomp.split
-        t.keyframe!(:frame => f.to_f - 1, :abs_x => from_pfcoord(x), :abs_y => from_pfcoord(y), :residual => residual.to_f * 8)
+        t.keyframe!(:frame => f.to_f - 1, 
+          :abs_x => from_pfcoord(x), :abs_y => from_pfcoord(y),
+             :residual => residual.to_f * 8)
       end
     end
     

data/lib/import/shake_script.rb

@@ -13,7 +13,8 @@ class Tracksperanto::Import::ShakeScript < Tracksperanto::Import::Base
   end
   
   def self.known_snags
-    'Expressions in node parameters may cause parse errors or incomplete imports. Take care to remove expressions or nodes containing them first.'
+    'Expressions in node parameters may cause parse errors or incomplete imports. ' +
+    'Take care to remove expressions or nodes containing them first.'
   end
   
   def each

data/lib/tracksperanto.rb

@@ -3,7 +3,7 @@
 
 module Tracksperanto
   PATH = File.expand_path(File.dirname(__FILE__))
-  VERSION = '3.3.6'
+  VERSION = '3.3.7'
   
   module Import; end
   module Export; end

data/lib/tracksperanto/block_init.rb

@@ -2,7 +2,8 @@
 # Implements the conventional constructor with "hash of attributes" and block support
 module Tracksperanto::BlockInit
   def initialize(object_attribute_hash = {})
-    object_attribute_hash.map { |(k, v)| send("#{k}=", v) }
+    m = method(respond_to?(:public_send) ? :public_send : :send)
+    object_attribute_hash.map { |(k, v)| m.call("#{k}=", v) }
     yield(self) if block_given?
   end
 end

data/lib/tracksperanto/keyframe.rb

@@ -9,16 +9,16 @@
 class Tracksperanto::Keyframe
   include Tracksperanto::Casts, Tracksperanto::BlockInit, Comparable
   
-  # Absolute integer frame where this keyframe is placed, 0 based
+  # Integer frame where this keyframe is placed, 0-based
   attr_accessor :frame
   
-  # Absolute float X value of the point, zero is lower left
+  # Float X value of the point, zero is lower left
   attr_accessor :abs_x
   
-  # Absolute float Y value of the point, zero is lower left
+  # Float Y value of the point, zero is lower left
   attr_accessor :abs_y
   
-  # Absolute float residual (0 is "spot on")
+  # Float residual (0 is "spot on")
   attr_accessor :residual
   
   cast_to_float :abs_x, :abs_y, :residual

data/test/export/test_boujou_export.rb

@@ -7,7 +7,7 @@ class BoujouExportTest < Test::Unit::TestCase
   
   def test_export_output_written
     t = Time.local(2010, "Apr", 15, 17, 21, 26)
-    flexmock(Time).should_receive(:now).once.and_return(t)
+    flexmock(Time).should_receive(:now).and_return(t)
     ensure_same_output Tracksperanto::Export::Boujou, P
   end
   

data/test/export/test_flame_stabilizer_export.rb

@@ -1,13 +1,13 @@
 # -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__)) + '/../helper'
 
-class FlameStabilizerExportTestTest < Test::Unit::TestCase
+class TestFlameStabilizerExport < Test::Unit::TestCase
   include ParabolicTracks
   P = File.dirname(__FILE__) + "/samples/ref_flame.stabilizer"
   
   def test_export_output_written
     t = Time.local(2010, "Feb", 18, 17, 22, 12)
-    flexmock(Time).should_receive(:now).once.and_return(t)
+    flexmock(Time).should_receive(:now).and_return(t)
     ensure_same_output Tracksperanto::Export::FlameStabilizer, P 
   end
   

data/test/import/README.rdoc

@@ -0,0 +1,10 @@
+Tracksperanto has a huge test corpus of test files, which is stored in the project's Github repo.
+
+This is why the repo is so big.
+
+However, most users of Tracksperanto are actually _users_, they won't need 
+all the testing data. And without this data, tracksperanto is less than 
+100 kilobytes in size.
+
+If you intend to actually write code that uses Tracksperanto or to fix
+a bug, you will most definitely need all the test data. In that case, just do a git checkout.

data/test/import/test_flame_import.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__)) + '/../helper'
 
-class FlameImportTest < Test::Unit::TestCase
+class TestFlameImport < Test::Unit::TestCase
   DELTA = 0.1 
   
   def test_parsing_from_flame
@@ -105,8 +105,8 @@ class FlameImportTest < Test::Unit::TestCase
   def test_bilinear_passes_proper_naming
     fixture = File.open(File.dirname(__FILE__) + '/samples/flame_stabilizer/cornerpin_2012.stabilizer')
     trackers = Tracksperanto::Import::FlameStabilizer.new(:io => fixture).to_a
-    assert_equal "top_left", trackers[0].name
-    assert_equal "bottom_right", trackers[-1].name
+    tracker_order = ["bottom_left", "bottom_right", "top_left", "top_right"]
+    assert_equal tracker_order, trackers.map(&:name)
   end
   
 end

data/test/import/test_match_mover_import.rb

@@ -6,6 +6,7 @@ class MatchMoverImportTest < Test::Unit::TestCase
   
   P = File.dirname(__FILE__) + '/samples/match_mover/kipPointsMatchmover.rz2'
   P2 = File.dirname(__FILE__) + '/samples/match_mover/NonSequentialMatchmoverPoints.rz2'
+  P3 = File.dirname(__FILE__) + '/samples/match_mover/cha_171_1020_atb_v001.rz2'
   
   def test_introspects_properly
     i = Tracksperanto::Import::MatchMover
@@ -22,6 +23,14 @@ class MatchMoverImportTest < Test::Unit::TestCase
     assert_equal 0, trackers[0][0].frame, "Should have offset the first frame to 0"
   end
   
+  def test_parsing_case_nil_exception
+    fixture = File.open(P3)
+    
+    parser = Tracksperanto::Import::MatchMover.new(:io => fixture)
+    trackers = parser.to_a
+    assert_equal 6, trackers.length
+  end
+  
   def test_parsing_from_matchmover
     fixture = File.open(P)
     

data/test/import/test_nuke_import.rb

@@ -6,7 +6,7 @@ class NukeImportTest < Test::Unit::TestCase
   
   def test_introspects_properly
     i = Tracksperanto::Import::NukeScript
-    assert_equal "Nuke .nk script file with Tracker, Reconcile3D and PlanarTracker nodes", i.human_name
+    assert_equal "Nuke .nk script file with Tracker, Reconcile3D, PlanarTracker and CornerPin nodes", i.human_name
     assert !i.autodetects_size?
   end
   
@@ -34,6 +34,17 @@ class NukeImportTest < Test::Unit::TestCase
     assert_equal 128, trackers[0].length
   end
   
+  def test_parsing_cornerpin
+    fixture = File.open(File.dirname(__FILE__) + '/samples/nuke/cornerpin.nk')
+    
+    parser = Tracksperanto::Import::NukeScript.new(:io => fixture)
+    parser.width = 4096
+    parser.height = 2304
+    
+    trackers = parser.to_a
+    assert_equal 4, trackers.length
+  end
+  
   def test_parsing_planar_tracker
     fixture = File.open(File.dirname(__FILE__) + '/samples/nuke/planar.nk')
     
@@ -49,6 +60,21 @@ class NukeImportTest < Test::Unit::TestCase
     assert_equal ref_names, trackers.map{|e| e.name }
   end
   
+  def test_parsing_planar_tracker_nuke7
+    fixture = File.open(File.dirname(__FILE__) + '/samples/nuke/nuke7_planar.nk')
+    
+    parser = Tracksperanto::Import::NukeScript.new(:io => fixture)
+    parser.width = 1920
+    parser.height = 1080
+    
+    trackers = parser.to_a
+    assert_equal 4, trackers.length
+    
+    ref_names = %w( PlanarTracker1_outputBottomLeft PlanarTracker1_outputBottomRight 
+      PlanarTracker1_outputTopLeft PlanarTracker1_outputTopRight )
+    assert_equal ref_names, trackers.map{|e| e.name }
+  end
+  
   def test_parsing_from_nuke
     fixture = File.open(File.dirname(__FILE__) + '/samples/nuke/one_tracker_with_break.nk')
     

data/test/test_block_init.rb

@@ -0,0 +1,49 @@
+# -*- encoding : utf-8 -*-
+require File.expand_path(File.dirname(__FILE__)) + '/helper'
+
+class TestBlockInit < Test::Unit::TestCase
+  
+  class Settable
+    include Tracksperanto::BlockInit
+    
+    attr_accessor :foo, :bar
+    
+    private
+    def privatized=(something)
+    end
+  end
+  
+  def test_block_init_with_hash
+    s = Settable.new(:foo => "x", :bar => "y")
+    assert_equal "x", s.foo
+    assert_equal "y", s.bar
+  end
+  
+  def test_block_init_with_hash_raises_on_unknown_attribute
+    assert_raise(NoMethodError) { Settable.new(:nonexistent => true) }
+  end
+  
+  def test_block_init_with_block_yields_the_object
+    within_blk = nil
+    s = Settable.new do | f |
+      within_blk = f
+      f.foo = "x"
+    end
+    
+    assert_equal s, within_blk, "Should have yielded the object to the blk"
+    assert_equal "x", s.foo
+  end
+
+  def test_block_init_attributes_overwrite_hash_attributes
+    s = Settable.new(:foo => "bar") { |f| f.foo = "x" }
+    assert_equal "x", s.foo
+  end
+  
+  if RUBY_VERSION > '1.9'
+    def test_block_init_uses_public_send
+      assert_raise(NoMethodError) { Settable.new(:privatized => true) }
+    end
+  end
+  
+  
+end

data/tracksperanto.gemspec

@@ -5,20 +5,19 @@
 
 Gem::Specification.new do |s|
   s.name = "tracksperanto"
-  s.version = "3.3.6"
+  s.version = "3.3.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik Tarkhanov"]
-  s.date = "2013-04-04"
+  s.date = "2013-07-25"
   s.description = "Converts 2D track exports between different apps like Flame, MatchMover, PFTrack..."
   s.email = "me@julik.nl"
   s.executables = ["tracksperanto"]
   s.extra_rdoc_files = [
-    "DEVELOPER_DOCS.rdoc",
     "README.rdoc"
   ]
   s.files = [
-    "DEVELOPER_DOCS.rdoc",
+    "CONTRIBUTING.md",
     "Gemfile",
     "History.txt",
     "MIT_LICENSE.txt",
@@ -141,7 +140,7 @@ Gem::Specification.new do |s|
     "test/export/test_syntheyes_export.rb",
     "test/export/test_xsi_python_export.rb",
     "test/helper.rb",
-    "test/import/README_SAMPLES.txt",
+    "test/import/README.rdoc",
     "test/import/test_3de_import.rb",
     "test/import/test_3de_import3.rb",
     "test/import/test_boujou_import.rb",
@@ -165,6 +164,7 @@ Gem::Specification.new do |s|
     "test/subpixel/subpixel_grid.sni",
     "test/subpixel/subpixel_grid.tif",
     "test/subpixel/sy_subpix_2dpaths.txt",
+    "test/test_block_init.rb",
     "test/test_buffer_io.rb",
     "test/test_casts.rb",
     "test/test_cli.rb",
@@ -202,7 +202,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://guerilla-di.org/tracksperanto"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.25"
   s.summary = "A universal 2D tracks converter"
 
   if s.respond_to? :specification_version then
@@ -221,10 +221,9 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<linebyline>, [">= 0"])
-      s.add_development_dependency(%q<flexmock>, ["~> 1.3"])
+      s.add_development_dependency(%q<flexmock>, ["~> 1.3.2"])
       s.add_development_dependency(%q<cli_test>, ["~> 1.0"])
       s.add_development_dependency(%q<rake-hooks>, [">= 0"])
-      s.add_development_dependency(%q<ruby-prof>, [">= 0"])
     else
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<obuf>, ["~> 1.1"])
@@ -238,10 +237,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<linebyline>, [">= 0"])
-      s.add_dependency(%q<flexmock>, ["~> 1.3"])
+      s.add_dependency(%q<flexmock>, ["~> 1.3.2"])
       s.add_dependency(%q<cli_test>, ["~> 1.0"])
       s.add_dependency(%q<rake-hooks>, [">= 0"])
-      s.add_dependency(%q<ruby-prof>, [">= 0"])
     end
   else
     s.add_dependency(%q<bundler>, [">= 0"])
@@ -256,10 +254,9 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<linebyline>, [">= 0"])
-    s.add_dependency(%q<flexmock>, ["~> 1.3"])
+    s.add_dependency(%q<flexmock>, ["~> 1.3.2"])
     s.add_dependency(%q<cli_test>, ["~> 1.0"])
     s.add_dependency(%q<rake-hooks>, [">= 0"])
-    s.add_dependency(%q<ruby-prof>, [">= 0"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tracksperanto
 version: !ruby/object:Gem::Version
-  version: 3.3.6
+  version: 3.3.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-04 00:00:00.000000000 Z
+date: 2013-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -210,7 +210,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -218,7 +218,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: cli_test
   requirement: !ruby/object:Gem::Requirement
@@ -251,22 +251,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby-prof
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Converts 2D track exports between different apps like Flame, MatchMover,
   PFTrack...
 email: me@julik.nl
@@ -274,10 +258,9 @@ executables:
 - tracksperanto
 extensions: []
 extra_rdoc_files:
-- DEVELOPER_DOCS.rdoc
 - README.rdoc
 files:
-- DEVELOPER_DOCS.rdoc
+- CONTRIBUTING.md
 - Gemfile
 - History.txt
 - MIT_LICENSE.txt
@@ -400,7 +383,7 @@ files:
 - test/export/test_syntheyes_export.rb
 - test/export/test_xsi_python_export.rb
 - test/helper.rb
-- test/import/README_SAMPLES.txt
+- test/import/README.rdoc
 - test/import/test_3de_import.rb
 - test/import/test_3de_import3.rb
 - test/import/test_boujou_import.rb
@@ -424,6 +407,7 @@ files:
 - test/subpixel/subpixel_grid.sni
 - test/subpixel/subpixel_grid.tif
 - test/subpixel/sy_subpix_2dpaths.txt
+- test/test_block_init.rb
 - test/test_buffer_io.rb
 - test/test_casts.rb
 - test/test_cli.rb
@@ -472,7 +456,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4545677537433489103
+      hash: -4537325556160571006
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -481,7 +465,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A universal 2D tracks converter

data/test/import/README_SAMPLES.txt

@@ -1,5 +0,0 @@
-Tracksperanto has a huge test corpus of test files, which is stored in the project's Github repo.
-Checkout the repo to run tests against these samples.
-Since most users of Tracksperanto are actually USERS, they do not need to download the 4 megabytes of test fixtures
-as opposed to 80 kilobytes of the program itself. If you want to develop against Tracksperanto we advise you DO use
-the test corpus though, so please pretty please just pull it off Github.