edl 0.0.3 → 0.0.4

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.0.4 / 2000-01-14
+
+* EDL::Event#speed works as a shortcut for timewarp speed
+
 === 0.0.2 / 2000-01-14
 
 * Fix reverse timewarps

data/Manifest.txt

@@ -10,7 +10,6 @@ lib/edl/event.rb
 lib/edl/grabber.rb
 lib/edl/timewarp.rb
 lib/edl/transition.rb
-test/.DS_Store
 test/samples/45S_SAMPLE.EDL
 test/samples/FCP_REVERSE.EDL
 test/samples/REVERSE.EDL

data/SPECS.txt

@@ -38,7 +38,7 @@
 * be parsed properly
 
 == A Final Cut Pro originating reverse should
-* be interpreted properly (FAILURE - 1)
+* be interpreted properly
 
 == EventMatcher should
 * produce an Event
@@ -70,6 +70,6 @@
 * be parsed cleanly
 
 == A FinalCutPro speedup and reverse with fade at the end should
-* parse cleanly (FAILURE - 2)
+* parse cleanly
 
-49 specifications, 1 empty (144 requirements), 2 failures
+49 specifications, 1 empty (145 requirements), 0 failures

data/lib/edl.rb

@@ -9,7 +9,7 @@ require File.dirname(__FILE__) + '/edl/timewarp'
 # A simplistic EDL parser. Current limitations: no support for DF timecode, no support for audio,
 # no support for split edits, no support for key effects, no support for audio
 module EDL
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
   DEFAULT_FPS = 25
   
   # Represents an EDL, is returned from the parser. Traditional operation is functional style, i.e.

data/lib/edl/event.rb

@@ -116,12 +116,17 @@ module EDL
 
     # Capture from (and including!) this timecode to complete this event including timewarps and transitions
     def capture_from_tc
-      timewarp ? timewarp.source_used_from : src_start_tc
+      @timewarp ? @timewarp.source_used_from : src_start_tc
     end
   
     # Capture up to (but not including!) this timecode to complete this event including timewarps and transitions
     def capture_to_tc
-      timewarp ? timewarp.source_used_upto : (src_start_tc + rec_length_with_transition)
+      @timewarp ? @timewarp.source_used_upto : (src_end_tc + outgoing_transition_duration)
+    end
+    
+    # Speed of this clip in percent relative to the source speed. 100 for non-timewarped events
+    def speed
+      @timewarp ? @timewarp.speed : 100
     end
   
     # Returns true if this event is a generator

data/test/test_edl.rb

@@ -136,6 +136,48 @@ context "An Event should" do
     e.should.be.reverse
     e.should.be.reversed
   end
+  
+  specify "report speed as 100 percent without a timewarp" do
+    e = EDL::Event.new
+    e.speed.should.equal 100
+  end
+
+  specify "consult the timewarp for speed" do
+    tw = flexmock
+    tw.should_receive(:speed).and_return(:something)
+
+    e = EDL::Event.new(:timewarp => tw)
+    e.speed.should.equal :something
+  end
+
+  
+  specify "report capture_from_tc as the source start without a timewarp" do
+    e = EDL::Event.new(:src_start_tc => "1h".tc)
+    e.capture_from_tc.should.equal "1h".tc
+  end
+  
+  specify "consult the timewarp for capture_from_tc if a timewarp is there" do
+    tw = flexmock
+    tw.should_receive(:source_used_from).and_return(:something)
+    
+    e = EDL::Event.new(:timewarp => tw)
+    e.capture_from_tc.should.equal :something
+  end
+
+  specify "report capture_to_tc as record length plus transition when no timewarp present" do
+    e = EDL::Event.new(:src_end_tc => "1h 10s".tc, :outgoing_transition_duration => 2 )
+    e.capture_to_tc.should.equal "1h 10s 2f".tc
+  end
+
+  specify "consult the timewarp for capture_to_tc if timewarp is present" do
+    tw = flexmock
+    tw.should_receive(:source_used_upto).and_return(:something)
+
+    e = EDL::Event.new(:timewarp => tw)
+    e.capture_to_tc.should.equal :something
+  end
+
+
 end
 
 context "A Parser should" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: edl
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Julik
@@ -77,7 +77,6 @@ files:
 - lib/edl/grabber.rb
 - lib/edl/timewarp.rb
 - lib/edl/transition.rb
-- test/.DS_Store
 - test/samples/45S_SAMPLE.EDL
 - test/samples/FCP_REVERSE.EDL
 - test/samples/REVERSE.EDL