depix 1.1.2 → 1.1.3

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.1.3 / 2010-02-12
+
+* Discard charfield content that comes after the first null byte (seriously, who cares?)
+* Add Editor#copy_from(another_dpx)
+
 === 1.1.2 / 2009-12-27
 
 * Do not try to work with timecode data if it's nil

data/Manifest.txt

@@ -1,4 +1,3 @@
-.DS_Store
 DPX_HEADER_STRUCTURE.txt
 History.txt
 Manifest.txt
@@ -14,12 +13,11 @@ lib/depix/enums.rb
 lib/depix/reader.rb
 lib/depix/struct_explainer.rb
 lib/depix/structs.rb
-test/.DS_Store
-test/samples/.DS_Store
 test/samples/026_FROM_HERO_TAPE_5-3-1_MOV.0029.dpx
 test/samples/E012_P001_L000002_lin.0001.dpx
 test/samples/E012_P001_L000002_lin.0002.dpx
 test/samples/E012_P001_L000002_log.0001.dpx
 test/samples/E012_P001_L000002_log.0002.dpx
+test/samples/northlight_tc_mode_mismatch.dpx
 test/test_depix.rb
 test/test_dict.rb

data/Rakefile

@@ -2,10 +2,11 @@ require 'rubygems'
 require 'hoe'
 require './lib/depix'
 
-Hoe.new('depix', Depix::VERSION) do |p|
+Hoe.spec('depix') do |p|
+  p.version = Depix::VERSION
   p.developer('Julik Tarkhanov', 'me@julik.nl')
   p.rubyforge_name = 'guerilla-di'
-  p.extra_deps << 'timecode'
+  p.extra_deps << ['timecode', ">=", "0.2.0"]
   p.remote_rdoc_dir = 'depix'
 end
 

data/lib/depix.rb

@@ -10,7 +10,7 @@ require File.dirname(__FILE__) + '/depix/editor'
 
 
 module Depix
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
   
   class InvalidHeader < RuntimeError; end
   

data/lib/depix/dict.rb

@@ -232,8 +232,9 @@ module Depix
       if v == BLANK
         nil
       else
-        2.times { BLANKING_PATTERNS.each{|p| v.gsub!(p, '')} }
-        v.empty? ? nil : v
+        # Truncate everything from the null byte up
+        upto_nulb = v.split(0x00.chr).shift
+        (upto_nulb.nil? || upto_nulb.empty?) ? nil : upto_nulb
       end
     end
     
@@ -503,6 +504,14 @@ module Depix
         options, count = (args[-1].is_a?(Hash) ? DEF_OPTS.merge(args.pop) : DEF_OPTS), (args.shift || 1)
         [count, options]
       end
+    end # End class methods
+    
+    def []=(field, value)
+      send("#{field}=", value)
+    end
+    
+    def [](field)
+      send(field)
     end
   end
   

data/lib/depix/editor.rb

@@ -26,15 +26,17 @@ module Depix
       @dpx = Depix.from_file(@path)
     end
     
+    # Copy headers from another DPX object
+    def copy_from(another)
+      @dpx = another
+    end
+    
     # Save the headers to file at path, overwriting the old ones
     def commit!
       raise "No headers" unless @dpx
       raise "Cannot pack LE headers yet" if @dpx.le?
       packed = @dpx.class.pack(@dpx)
       
-      # Validate that we can unpack first - what if something went wrong?
-      Depix::Reader.new.parse(packed, false)
-      
       # Use in-place writing into DPX file (this is what + does)
       File.open(@path, 'rb+') do | f |
         f.seek(0, IO::SEEK_SET); f.write(packed)

data/test/test_depix.rb

@@ -18,7 +18,7 @@ class ReaderTest < Test::Unit::TestCase
     assert_equal 6144, parsed.file.user_size
     assert_equal "E012_P001_L000002_lin.0001.dpx", parsed.file.filename
     assert_equal "2008:12:19:01:18:37:CEST", parsed.file.timestamp
-    assert_equal "UTODESK", parsed.file.creator
+    assert_equal nil, parsed.file.creator
     assert_equal 0, parsed.image.orientation
     
     assert_equal 320, parsed.image.pixels_per_line
@@ -43,8 +43,8 @@ class ReaderTest < Test::Unit::TestCase
     assert_equal 8192,  ie.data_offset
     assert_equal 0,     ie.end_of_line_padding
     assert_equal 0,     ie.end_of_image_padding
-    assert_equal "IMAGE DESCRIPTION DATA        \000P", ie.description
-    assert_equal "E012\000\000\000\000x\340\264\020\000\000\000\000\005", 
+    assert_equal "IMAGE DESCRIPTION DATA        ", ie.description
+    assert_equal "E012", 
       parsed.orientation.device #- this is where Flame writes the reel
     
     assert_equal 853, parsed.orientation.aspect_ratio[0]
@@ -129,6 +129,14 @@ class EditorTest < Test::Unit::TestCase
     assert_equal "E012", e.flame_reel
   end
   
+  def test_copy_from
+    e = Depix::Editor.new(SAMPLE_DPX)
+    assert_equal SAMPLE_DPX, e.path
+    another = Depix.from_file(File.dirname(__FILE__) + "/samples/northlight_tc_mode_mismatch.dpx")
+    e.copy_from(another)
+    assert_equal "Northlight", e.orientation.device
+  end
+  
   def test_commit
     temp_path = SAMPLE_DPX + ".test"
     begin

data/test/test_dict.rb

@@ -350,10 +350,10 @@ class TestCharField < Test::Unit::TestCase
     assert_equal String, f.rtype
   end
   
-  def test_char_field_does_not_clean_inner_nulls
+  def test_char_field_cleans_inner_nulls
     f = CharField.new :name => :foo, :length => 15
-    assert_equal "foo\0foo", f.clean("\0\0foo\0foo\0")
-    assert_equal "swoop\377\0bla", f.clean("\0\0\0\377\377swoop\377\0bla\0\0\0\377\377\377\377\0\0\0")
+    assert_equal nil, f.clean("\0\0foo\0foo\0")
+    assert_equal nil, f.clean("\0\0\0\377\377swoop\377\0bla\0\0\0\377\377\377\377\0\0\0")
   end
   
   def test_char_field_clean_blank
@@ -361,7 +361,7 @@ class TestCharField < Test::Unit::TestCase
     assert_equal nil, f.clean("\0")
     assert_equal nil, f.clean("\0\0\0\0\0\0")
     assert_equal nil, f.clean("\0\0\0\377\377\0\0\0")
-    assert_equal "foo\0foo", f.clean("\0\0foo\0foo\0")
+    assert_equal nil, f.clean("\0\0foo\0foo\0")
   end
   
   def test_char_field_validates_overflow
@@ -638,6 +638,8 @@ class TestDictConsume < Test::Unit::TestCase
     
     assert_equal "a", result.foo
     assert_equal "b", result.bar
+    assert_equal "a", result[:foo]
+    assert_equal "a", result["foo"]
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: depix
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors: 
 - Julik Tarkhanov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-28 00:00:00 +01:00
+date: 2010-02-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +21,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.2.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -45,7 +48,6 @@ extra_rdoc_files:
 - Manifest.txt
 - README.txt
 files: 
-- .DS_Store
 - DPX_HEADER_STRUCTURE.txt
 - History.txt
 - Manifest.txt
@@ -61,13 +63,12 @@ files:
 - lib/depix/reader.rb
 - lib/depix/struct_explainer.rb
 - lib/depix/structs.rb
-- test/.DS_Store
-- test/samples/.DS_Store
 - test/samples/026_FROM_HERO_TAPE_5-3-1_MOV.0029.dpx
 - test/samples/E012_P001_L000002_lin.0001.dpx
 - test/samples/E012_P001_L000002_lin.0002.dpx
 - test/samples/E012_P001_L000002_log.0001.dpx
 - test/samples/E012_P001_L000002_log.0002.dpx
+- test/samples/northlight_tc_mode_mismatch.dpx
 - test/test_depix.rb
 - test/test_dict.rb
 has_rdoc: true