tc 0.0.1 → 0.0.2

data/lib/tc/duration.rb

@@ -26,7 +26,7 @@ class Tc::Duration < Parslet::Parser
 
   # unit strings
   rule(:s_seconds) { ((space? >> stri('s') >> (stri('ec') >> stri('s').maybe).maybe >> (str('.') | stri('ond')).maybe >> stri('s').maybe) | str('"'))}
-  rule(:s_minutes) { ((space? >> stri('m') >> stri('in').maybe >> (str('.') | (stri('ute') >> stri('s')).maybe).maybe) | str("'"))}
+  rule(:s_minutes) { ((space? >> stri('m') >> stri('in').maybe >> (str('.') | str('s') | (stri('ute') >> stri('s')).maybe).maybe) | str("'"))}
   rule(:s_hours) { (space? >> stri('h') >> ((stri('r') >> stri('s').maybe >> str('.').maybe) | (stri('our').maybe >> stri('s').maybe )).maybe) }
 
   # unit values
@@ -46,7 +46,9 @@ class Tc::Duration < Parslet::Parser
   rule(:min) { arbitrary_length_integer }
 
   # hours
-  rule(:small_h) { str('0').maybe >> match('[0-2]') >> integer.absnt? }
+  rule(:zero_to_three) { match('[0-3]')  >> integer.absnt?}
+  rule(:zero_zero_to_zero_three) { str('0') >> match('[0-3]')  >> integer.absnt?}
+  rule(:small_h) { (zero_to_three | zero_zero_to_zero_three) }
 
   # unit matchers
   rule(:frames) { (ndf_separator | df_separator) >> (ff | frame).as(:frames) }
@@ -91,10 +93,10 @@ class Tc::Duration < Parslet::Parser
   rule(:timecode) { approximate | exact }
 
   # header tokens
-  rule(:trt) { str('TRT').as(:trt) >> space? }
-  rule(:colon_prefix) { str(':') }
+  rule(:trt) { str('TRT').as(:trt) >> space? >> timecode }
+  rule(:colon_prefix) { str(':') >> timecode }
 
-  rule(:duration) { (trt | colon_prefix).maybe >> timecode } 
+  rule(:duration) { trt | colon_prefix | timecode } 
 
   root :duration
 end

data/lib/tc/version.rb

@@ -1,3 +1,3 @@
 module Tc
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/lib/tc_duration_spec.rb

@@ -66,6 +66,10 @@ describe Tc::Duration do
     it "should consume 'minutes'" do
       parser.s_minutes.should parse(' minutes')
     end
+
+    it "should consume 'mins'" do
+      parser.s_minutes.should parse('mins')
+    end
   end
 
   context "m" do
@@ -98,6 +102,10 @@ describe Tc::Duration do
       parser.small_h.should parse('01')
     end
 
+    it "should consume '0'" do
+      parser.small_h.should parse('0')
+    end
+
     it "should consume '2'" do
       parser.small_h.should parse('2')
     end
@@ -111,6 +119,10 @@ describe Tc::Duration do
     it "should consume '01:09:26 s'" do
       parser.small_h_m_s.should parse('01:09:26 s')
     end
+
+    it "should consume '0:28:46'" do
+      parser.small_h_m_s.should parse('0:28:46')
+    end
     
     it "should not consume '275:00:00'" do
       parser.small_h_m_s.should_not parse('275:00:00')
@@ -119,6 +131,7 @@ describe Tc::Duration do
     it "should not consume '4:52:12'" do
       parser.small_h_m_s.should_not parse('4:52:12')
     end
+
   end
 
   context 's_hours' do
@@ -318,6 +331,15 @@ describe Tc::Duration do
       parsed[:seconds].should == '02.042'
     end
 
+    it "should parse '0:51:36'" do
+      parser.exact.should parse('0:51:36')
+      parsed = parser.exact.parse('0:51:36')
+
+      parsed[:hours].should == '0'
+      parsed[:minutes].should == '51'
+      parsed[:seconds].should == '36'
+    end
+
     it "should parse '0.26875'" do
       parser.exact.should parse('0.26875')
       parsed = parser.exact.parse('0.26875')
@@ -488,5 +510,9 @@ describe Tc::Duration do
     it "should consume ':00:26:30'" do
       parser.duration.should parse(':00:26:30')
     end
+
+    it "should consume ':00:03:30'" do
+      parser.duration.should parse(':00:03:30')
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tc
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-10 00:00:00.000000000 -04:00
+date: 2011-08-11 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
-  requirement: &2161225380 !ruby/object:Gem::Requirement
+  requirement: &2165631040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161225380
+  version_requirements: *2165631040
 description: Timecode parsing
 email:
 - chris_beer@wgbh.org