edl 0.0.6 → 0.0.7

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.0.7 / 2000-01-18
+
+* Register line_number in the original EDL for parsed events
+* Preserve the star in comments that have it
+
 === 0.0.6 / 2000-01-14
 
 * Fix comments in events appearing twice

data/Rakefile

@@ -2,6 +2,10 @@ require 'rubygems'
 require 'hoe'
 require './lib/edl.rb'
 
+# Disable spurious warnings when running tests, ActiveMagic cannot stand -w
+Hoe::RUBY_FLAGS.replace ENV['RUBY_FLAGS'] || "-I#{%w(lib test).join(File::PATH_SEPARATOR)}" + 
+  (Hoe::RUBY_DEBUG ? " #{RUBY_DEBUG}" : '')
+
 Hoe.new('edl', EDL::VERSION) do |p|
   p.rubyforge_name = 'wiretap'
   p.developer('Julik', 'me@julik.nl')

data/SPECS.txt

@@ -38,7 +38,8 @@
 * parse from a File/IOish
 * properly parse a dissolve
 * return a spliced EDL if the sources allow
-* not apply any Matchers if a match is found (empty)
+* not apply any Matchers if a match is found
+* register line numbers of the detected events
 
 == A TimewarpMatcher should
 * not create any extra events when used within a Parser
@@ -92,4 +93,4 @@
 == A FinalCutPro speedup and reverse with fade at the end should
 * parse cleanly
 
-65 specifications, 2 empty (168 requirements), 0 failures
+66 specifications, 1 empty (173 requirements), 0 failures

data/lib/edl.rb

@@ -8,8 +8,8 @@ require File.dirname(__FILE__) + '/edl/timewarp'
 
 # A simplistic EDL parser
 module EDL
-  VERSION = "0.0.6"
-  DEFAULT_FPS = 25
+  VERSION = "0.0.7"
+  DEFAULT_FPS = 25.0
   
   # Represents an EDL, is returned from the parser. Traditional operation is functional style, i.e.
   #  edl.renumbered.without_transitions.without_generators
@@ -156,7 +156,7 @@ module EDL
     end
     
     def apply(stack, line)
-      stack[-1].comments << line.scan(@regexp).flatten.pop.strip
+      stack[-1].comments.push("* %s" % line.scan(@regexp).flatten.pop.strip)
     end
   end
   
@@ -335,13 +335,18 @@ module EDL
       return parse(StringIO.new(io.to_s)) unless io.respond_to?(:eof?)
       
       stack, matchers = List.new, get_matchers
+      
+      at_line = 0
       until io.eof?
+        at_line += 1
+
         current_line = 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)
         rescue Matcher::ApplyError => e
           STDERR.puts "Cannot parse #{current_line} - #{e}"
         end

data/lib/edl/event.rb

@@ -40,6 +40,9 @@ module EDL
     # How long is the incoming transition on the next event
     attr_accessor :outgoing_transition_duration
     
+    # Where is this event located in the original file
+    attr_accessor :line_number
+    
     def initialize(opts = {})
       opts.each_pair{|k,v| send("#{k}=", v) }
       yield(self) if block_given?

data/test/test_edl.rb

@@ -290,8 +290,19 @@ context "A Parser should" do
     m1.should_receive(:apply).once
     
     flexmock(p).should_receive(:get_matchers).once.and_return([m1, m1])
+    result = p.parse("plop")
+    result.should.be.empty
+  end
+  
+  specify "register line numbers of the detected events" do
+    p = EDL::Parser.new
+    events = p.parse(File.open(SPLICEME))
+    
+    events[0].line_number.should.not.be.nil
+    events[0].line_number.should.equal 4
     
-    p.parse("plop")
+    events[1].line_number.should.not.be.nil
+    events[1].line_number.should.equal 5
   end
 end
 
@@ -492,7 +503,7 @@ context "CommentMatcher should" do
     2.times { mok_evt.should_receive(:comments).and_return(comments) }
     2.times { EDL::CommentMatcher.new.apply([mok_evt], line) }
 
-    mok_evt.comments.should.equal ["COMMENT: PURE BULLSHIT", "COMMENT: PURE BULLSHIT"] 
+    mok_evt.comments.should.equal ["* COMMENT: PURE BULLSHIT", "* COMMENT: PURE BULLSHIT"] 
   end
 end
 
@@ -548,7 +559,7 @@ context "ClipNameMatcher should" do
     mok_evt.should_receive(:comments).and_return(comments).once
     
     EDL::NameMatcher.new.apply([mok_evt], line)
-    comments.should.equal ["FROM CLIP NAME:  TAPE_6-10.MOV"] 
+    comments.should.equal ["* FROM CLIP NAME:  TAPE_6-10.MOV"] 
   end
   
 end
@@ -576,7 +587,7 @@ context "EffectMatcher should" do
     
     EDL::EffectMatcher.new.apply([mok_evt], line)
     
-    cmt.should.equal ["EFFECT NAME: CROSS DISSOLVE"]
+    cmt.should.equal ["* EFFECT NAME: CROSS DISSOLVE"]
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: edl
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Julik