edl 0.1.0 → 0.1.1

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.1.1 / 2010-10-21
+
+* Fix parsing of files with Windows linebreaks. In an ugly manner.
+
 === 0.0.8 / 2009-01-18
 
 * Switch Rubyforge project to guerilla-di

data/Manifest.txt

@@ -22,6 +22,7 @@ test/samples/SPEEDUP_AND_FADEOUT.EDL
 test/samples/SPEEDUP_REVERSE_AND_FADEOUT.EDL
 test/samples/SPLICEME.EDL
 test/samples/TIMEWARP.EDL
+test/samples/PLATES.EDL
 test/samples/TIMEWARP_HALF.EDL
 test/samples/TRAILER_EDL.edl
 test/test_edl.rb

data/lib/edl.rb

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

data/lib/edl/parser.rb

@@ -16,22 +16,25 @@ module EDL
     end
   
     # Parse a passed File or IO object line by line, or the whole string
-    def parse(io_or_string)
-      return parse(StringIO.new(io_or_string.to_s)) unless io_or_string.respond_to?(:eof?)
-    
+    def parse(input_string_or_io)
+      return parse(input_string_or_io.read) if 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)
+      
+      # Normalize line breaks
       stack, matchers = List.new, get_matchers
-    
-      at_line = 0
-      until io_or_string.eof?
-        at_line += 1
-
-        current_line = io_or_string.gets.strip
+      
+      until input_in_io.eof?
+        
+        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 = at_line if m.is_a?(EventMatcher)
+          stack[-1].line_number = input_in_io.lineno if m.is_a?(EventMatcher)
         rescue Matcher::ApplyError => e
           STDERR.puts "Cannot parse #{current_line} - #{e}"
         end

data/test/samples/PLATES.EDL

@@ -0,0 +1 @@
+TITLE:   PLATES.

data/test/test_edl.rb

@@ -18,6 +18,7 @@ AVID_REVERSE                = File.dirname(__FILE__) + '/samples/REVERSE.EDL'
 SPEEDUP_AND_FADEOUT         = File.dirname(__FILE__) + '/samples/SPEEDUP_AND_FADEOUT.EDL'
 SPEEDUP_REVERSE_AND_FADEOUT = File.dirname(__FILE__) + '/samples/SPEEDUP_REVERSE_AND_FADEOUT.EDL'
 FCP_REVERSE                 = File.dirname(__FILE__) + '/samples/FCP_REVERSE.EDL'
+PLATES                      = File.dirname(__FILE__) + '/samples/PLATES.EDL'
 
 class String
   def tc(fps = Timecode::DEFAULT_FPS)
@@ -406,6 +407,7 @@ context "EventMatcher should" do
     '024        AX V     C        00:00:00:00 00:00:01:00 01:00:28:19 01:00:29:19', 
     '025        BL V     C        00:00:00:00 00:00:00:00 01:00:29:19 01:00:29:19', 
     '025  GEN      V     D    025 00:00:55:10 00:00:58:11 01:00:29:19 01:00:32:20',
+    '002  REDACTED V     C        03:09:00:13 03:09:55:19 01:00:43:12 01:01:38:18',
   ]
 
   specify "produce an Event" do
@@ -603,6 +605,11 @@ 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
+    evts = EDL::Parser.new.parse(File.read(PLATES))
+    assert_equal 3, evts.length
+  end
+  
   # TODO: this does not belong here
   specify "be properly rewritten from zero" do
     complex = EDL::Parser.new.parse(File.open(FORTY_FIVER))

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: edl
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  hash: 25
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Julik Tarkhanov
@@ -9,50 +15,88 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-21 00:00:00 +02:00
+date: 2010-10-21 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: test-spec
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: timecode
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 0
+        - 1
+        - 9
         version: 0.1.9
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: flexmock
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: rubyforge
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 0
+        - 4
+        version: 2.0.4
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
-    version: 
-description: Work with EDL files from Ruby http://en.wikipedia.org/wiki/Edit_decision_list
+        hash: 21
+        segments: 
+        - 2
+        - 6
+        - 1
+        version: 2.6.1
+  type: :development
+  version_requirements: *id005
+description: |-
+  Work with EDL files from Ruby
+  http://en.wikipedia.org/wiki/Edit_decision_list
 email: 
 - me@julik.nl
 executables: []
@@ -89,11 +133,14 @@ files:
 - test/samples/SPEEDUP_REVERSE_AND_FADEOUT.EDL
 - test/samples/SPLICEME.EDL
 - test/samples/TIMEWARP.EDL
+- test/samples/PLATES.EDL
 - test/samples/TIMEWARP_HALF.EDL
 - test/samples/TRAILER_EDL.edl
 - test/test_edl.rb
 has_rdoc: true
 homepage: 
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -101,23 +148,29 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: guerilla-di
-rubygems_version: 1.3.1
+rubygems_version: 1.3.7
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Work with EDL files from Ruby http://en.wikipedia.org/wiki/Edit_decision_list
 test_files: 
 - test/test_edl.rb