edl 0.1.1 → 0.1.2

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.1.2 / 2010-10-23
+
+* Fix parsing of files with Windows and \r linebreaks properly
+
 === 0.1.1 / 2010-10-21
 
 * Fix parsing of files with Windows linebreaks. In an ugly manner.

data/Manifest.txt

@@ -11,6 +11,7 @@ lib/edl/cutter.rb
 lib/edl/event.rb
 lib/edl/grabber.rb
 lib/edl/parser.rb
+lib/edl/linebreak_magician.rb
 lib/edl/timewarp.rb
 lib/edl/transition.rb
 test/.DS_Store

data/lib/edl.rb

@@ -1,15 +1,16 @@
 require "rubygems"
 require "timecode"
-require 'stringio'
+require "stringio"
 
 require File.dirname(__FILE__) + '/edl/event'
 require File.dirname(__FILE__) + '/edl/transition'
 require File.dirname(__FILE__) + '/edl/timewarp'
 require File.dirname(__FILE__) + '/edl/parser'
+require File.dirname(__FILE__) + '/edl/linebreak_magician'
 
 # A simplistic EDL parser
 module EDL
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
   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

@@ -0,0 +1,24 @@
+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)
+  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/lib/edl/parser.rb

@@ -17,24 +17,21 @@ module EDL
   
     # Parse a passed File or IO object line by line, or the whole string
     def parse(input_string_or_io)
-      return parse(input_string_or_io.read) if input_string_or_io.respond_to?(:read)
+      return parse(StringIO.new(input_string_or_io)) unless input_string_or_io.respond_to?(:read)
       
-      # TODO properly normalize line breaks in a stream interface
-      input_string_or_io.gsub!(/(\r\n|\r)/, "\n")
-      input_in_io = StringIO.new(input_string_or_io)
+      magic = ::EDL::LinebreakMagician.new(input_string_or_io)
       
       # Normalize line breaks
       stack, matchers = List.new, get_matchers
       
-      until input_in_io.eof?
+      while current_line = magic.gets
         
-        current_line = input_in_io.gets.strip
         m = matchers.find{|m| m.matches?(current_line) }
         
         next unless m
         begin
           m.apply(stack, current_line)
-          stack[-1].line_number = input_in_io.lineno if m.is_a?(EventMatcher)
+          stack[-1].line_number = magic.lineno if m.is_a?(EventMatcher)
         rescue Matcher::ApplyError => e
           STDERR.puts "Cannot parse #{current_line} - #{e}"
         end

data/test/test_edl.rb

@@ -605,7 +605,7 @@ context "A complex EDL passed via Parser should" do
     assert_nothing_raised { EDL::Parser.new.parse(File.open(FORTY_FIVER)) }
   end
   
-  specify "parse the plates EDL with many events" do
+  specify "parse the EDL with \\r line breaks properly" do
     evts = EDL::Parser.new.parse(File.read(PLATES))
     assert_equal 3, evts.length
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: edl
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Julik Tarkhanov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-21 00:00:00 +02:00
+date: 2010-10-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -122,6 +122,7 @@ files:
 - lib/edl/event.rb
 - lib/edl/grabber.rb
 - lib/edl/parser.rb
+- lib/edl/linebreak_magician.rb
 - lib/edl/timewarp.rb
 - lib/edl/transition.rb
 - test/.DS_Store