edl 0.0.7 → 0.0.8

data/History.txt

@@ -1,23 +1,27 @@
-=== 0.0.7 / 2000-01-18
+=== 0.0.8 / 2009-01-18
+
+* Switch Rubyforge project to guerilla-di
+
+=== 0.0.7 / 2009-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
+=== 0.0.6 / 2009-01-14
 
 * Fix comments in events appearing twice
 * Capture extra comments that have no star at the beginning as fallback
 
-=== 0.0.5 / 2000-01-14
+=== 0.0.5 / 2009-01-14
 
 * EDL::Event#starts_with_transition? is an alias
 * EDL::Event#incoming_transition_duration works as a shortcut for EDL::Transition#duration
 
-=== 0.0.4 / 2000-01-14
+=== 0.0.4 / 2009-01-14
 
 * EDL::Event#speed works as a shortcut for timewarp speed
 
-=== 0.0.2 / 2000-01-14
+=== 0.0.2 / 2009-01-14
 
 * Fix reverse timewarps
 * Migrate to specs

data/Rakefile

@@ -7,7 +7,7 @@ Hoe::RUBY_FLAGS.replace ENV['RUBY_FLAGS'] || "-I#{%w(lib test).join(File::PATH_S
   (Hoe::RUBY_DEBUG ? " #{RUBY_DEBUG}" : '')
 
 Hoe.new('edl', EDL::VERSION) do |p|
-  p.rubyforge_name = 'wiretap'
+  p.rubyforge_name = 'guerilla-di'
   p.developer('Julik', 'me@julik.nl')
   p.extra_deps << "flexmock" << "timecode" << "test-spec"
   p.remote_rdoc_dir = 'edl'

data/lib/edl.rb

@@ -5,10 +5,11 @@ 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'
 
 # A simplistic EDL parser
 module EDL
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
   DEFAULT_FPS = 25.0
   
   # Represents an EDL, is returned from the parser. Traditional operation is functional style, i.e.
@@ -314,51 +315,5 @@ module EDL
   end
   
   #:startdoc:
-  
-  # Is used to parse an EDL
-  class Parser
-    
-    attr_reader :fps
-    
-    # Initialize an EDL parser. Pass the FPS to it, as the usual EDL does not contain any kind of reference 
-    # to it's framerate
-    def initialize(with_fps = DEFAULT_FPS)
-      @fps = with_fps
-    end
-    
-    def get_matchers #:nodoc:
-      [ EventMatcher.new(@fps), EffectMatcher.new, NameMatcher.new, TimewarpMatcher.new(@fps), CommentMatcher.new ]
-    end
-    
-    # Parse a passed File or IO object line by line, or the whole string
-    def parse(io)
-      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
-      end
-      stack
-    end
-    
-    # Init a Timecode object from the passed elements with the passed framerate
-    def self.timecode_from_line_elements(elements, fps) #:nodoc:
-      args = (0..3).map{|_| elements.shift.to_i} + [fps.to_f]
-      Timecode.at(*args)
-    end
-  end
 
 end

data/lib/edl/event.rb

@@ -1,5 +1,5 @@
 module EDL
-  # Represents an edit event
+  # Represents an edit event (or, more specifically, an EDL line denoting a clip being part of an EDL event)
   class Event
     # Event number as in the EDL
     attr_accessor :num
@@ -111,7 +111,7 @@ module EDL
       (rec_end_tc.to_i - rec_start_tc.to_i).to_i
     end
 
-    # Get the record length of the event (how long it occupies in the EDL without an eventual outgoing transition)
+    # Get the record length of the event (how long it occupies in the EDL with an eventual outgoing transition)
     def rec_length_with_transition
       rec_length + outgoing_transition_duration.to_i
     end
@@ -135,7 +135,7 @@ module EDL
     
     # Speed of this clip in percent relative to the source speed. 100 for non-timewarped events
     def speed
-      @timewarp ? @timewarp.speed : 100
+      @timewarp ? @timewarp.speed : 100.0
     end
     
     # Returns true if this event is a generator

data/test/test_edl.rb

@@ -110,6 +110,11 @@ context "An Event should" do
     e.src_length.should.equal "2s".tc.to_i 
   end
   
+  specify "support line_number" do
+    EDL::Event.new.line_number.should.be.nil
+    EDL::Event.new(:line_number => 3).line_number.should.equal 3
+  end
+  
   specify "support capture_length as an alias to src_length" do
     tw = flexmock
     tw.should_receive(:actual_length_of_source).and_return(:something)
@@ -139,7 +144,8 @@ context "An Event should" do
   
   specify "report speed as 100 percent without a timewarp" do
     e = EDL::Event.new
-    e.speed.should.equal 100
+    e.speed.should.be.kind_of Float
+    e.speed.should.equal 100.0
   end
 
   specify "consult the timewarp for speed" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: edl
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Julik
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-17 00:00:00 +01:00
+date: 2009-01-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: wiretap
+rubyforge_project: guerilla-di
 rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2