edl 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dde5075293fc802bba0d09eb6dc71071b912ce22
-  data.tar.gz: a6af8337266f89253d64909d16fc354ee5a0a522
+  metadata.gz: 8229f60333ce6d40281980eb5dfb8188f5283882
+  data.tar.gz: 24b0c0eb16e8563a228543213142d06104876312
 SHA512:
-  metadata.gz: eef75cec8b6edb8c4abef6a672ffcb5158537e33afe64d529de88765dc263644755485797a8a52abb3df258644300a437919059bd2d4b4f44499c1b026ad6cf0
-  data.tar.gz: 75afefe92e6aed8ad08a5dc5a86617c272fbdf41997aa7c06c8f15af0b1e97cd2882a24cdba34911aee3bf6356f15aeba8dbd9813d762c68e2857c8842d07347
+  metadata.gz: 895259b1cf0bc020766d6dc6b075a3cb1b5853ab2775f65c385544d0113cb0b3d74a34fe2f2d4082f53d0381e1ab09368d2cb5670bae1479b61a196d72567438
+  data.tar.gz: 7bd9cfccbd517a5a1f2c5ccc9541c5552d7a529409d11cd9dc89377ea6970c9eb352b015839e7f323af8c684101e4a571d3d70ba4451031d2e8b0c765317b0b6

data/History.txt

@@ -1,39 +1,39 @@
-=== 0.1.3 / 2010-10-25
+=== 0.1.3
 
 * Adds Event#capture_to_and_including_tc which is convenient for frame searches
 
-=== 0.1.2 / 2010-10-23
+=== 0.1.2
 
 * Fix parsing of files with Windows and \r linebreaks properly
 
-=== 0.1.1 / 2010-10-21
+=== 0.1.1
 
 * Fix parsing of files with Windows linebreaks. In an ugly manner.
 
-=== 0.0.8 / 2009-01-18
+=== 0.0.8
 
 * Switch Rubyforge project to guerilla-di
 
-=== 0.0.7 / 2009-01-18
+=== 0.0.7
 
 * Register line_number in the original EDL for parsed events
 * Preserve the star in comments that have it
 
-=== 0.0.6 / 2009-01-14
+=== 0.0.6
 
 * Fix comments in events appearing twice
 * Capture extra comments that have no star at the beginning as fallback
 
-=== 0.0.5 / 2009-01-14
+=== 0.0.5
 
 * EDL::Event#starts_with_transition? is an alias
 * EDL::Event#incoming_transition_duration works as a shortcut for EDL::Transition#duration
 
-=== 0.0.4 / 2009-01-14
+=== 0.0.4
 
 * EDL::Event#speed works as a shortcut for timewarp speed
 
-=== 0.0.2 / 2009-01-14
+=== 0.0.2
 
 * Fix reverse timewarps
 * Migrate to specs
@@ -44,7 +44,7 @@
 * Deprecate EDL::Clip - everything is an EDL::Event now
 * Parse and save verbatim comments in EDL::Event#comments
   
-=== 0.0.1 / 2008-12-22
+=== 0.0.1
 
 * 1 major enhancement
 

data/edl.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "edl"
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik Tarkhanov"]
-  s.date = "2014-02-18"
+  s.date = "2014-03-24"
   s.email = "me@julik.nl"
   s.extra_rdoc_files = [
     "README.rdoc"
@@ -42,6 +42,7 @@ Gem::Specification.new do |s|
     "test/samples/TIMEWARP.EDL",
     "test/samples/TIMEWARP_HALF.EDL",
     "test/samples/TRAILER_EDL.edl",
+    "test/samples/edl_mixed_line_endings.edl",
     "test/test_edl.rb"
   ]
   s.homepage = "http://guerilla-di.org/edl"

data/lib/edl.rb

@@ -10,7 +10,7 @@ require File.dirname(__FILE__) + '/edl/linebreak_magician'
 
 # A simplistic EDL parser
 module EDL
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
   DEFAULT_FPS = 25.0
   
   # Represents an EDL, is returned from the parser. Traditional operation is functional style, i.e.

data/lib/edl/linebreak_magician.rb

@@ -1,24 +1,11 @@
-require "delegate"
-
 # EDLs sometimes come with \r line breaks, and this is something that fails
 # with Ruby standard line separator detection. We need something to help us
-# with that
-class EDL::LinebreakMagician < DelegateClass(IO)
-  
-  def initialize(with_file)
-    sample = with_file.read(2048)
-    @linebreak = ["\r\n", "\r", "\n"].find{|separator| sample.include?(separator) }
-    with_file.rewind
-    __setobj__(with_file)
+# with that. In this case we can just do a bulk replace because EDLs will be relatively
+# small for even very long features.
+class EDL::LinebreakMagician < StringIO
+  LOOSE_CR = /#{Regexp.escape("\r")}/
+  def initialize(with_io)
+    blob = with_io.read
+    super(blob.gsub(LOOSE_CR, "\n"))
   end
-  
-  def each(sep_string = $/, &blk)
-    super(@linebreak || sep_string, &blk)
-  end
-  alias_method :each_line, :each
-  
-  def gets(sep_string = $/)
-    super(@linebreak || sep_string)
-  end
-  
 end

data/test/samples/edl_mixed_line_endings.edl

@@ -0,0 +1,12 @@
+TITLE: EDL_TEST
+FCM: NON-DROP FRAME
+
+000001 A001C004_130917 V C 01:23:39:00 01:23:49:01 10:02:51:10 10:03:01:11
+* A
+* B
+* C
+* D
+* E
+* F
+* G
+

data/test/test_edl.rb

@@ -21,6 +21,7 @@ FCP_REVERSE                 = File.dirname(__FILE__) + '/samples/FCP_REVERSE.EDL
 PLATES                      = File.dirname(__FILE__) + '/samples/PLATES.EDL'
 KEY                         = File.dirname(__FILE__) + '/samples/KEY_TRANSITION.EDL'
 CLIP_NAMES                  = File.dirname(__FILE__) + '/samples/REEL_IS_CLIP.txt'
+MIXED_LINEBREAKS            = File.dirname(__FILE__) + '/samples/edl_mixed_line_endings.edl'
 
 class String
   def tc(fps = Timecode::DEFAULT_FPS)
@@ -640,6 +641,13 @@ context "EffectMatcher" do
 
 end
 
+context "An EDL with mixed line breaks" do
+  should 'parse without errors' do
+    list = EDL::Parser.new.parse(File.open(MIXED_LINEBREAKS))
+    assert_equal ["* A", "* B", "* C", "* D", "* E", "* F", "* G"], list[0].comments
+  end
+end
+
 context "A complex EDL passed via Parser" do
   should "parse without errors" do
     assert_nothing_raised { EDL::Parser.new.parse(File.open(FORTY_FIVER)) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edl
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Julik Tarkhanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2014-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: timecode
@@ -128,6 +128,7 @@ files:
 - test/samples/TIMEWARP.EDL
 - test/samples/TIMEWARP_HALF.EDL
 - test/samples/TRAILER_EDL.edl
+- test/samples/edl_mixed_line_endings.edl
 - test/test_edl.rb
 homepage: http://guerilla-di.org/edl
 licenses: []