tc 0.0.2 → 0.0.3

data/lib/tc/duration.rb

@@ -49,6 +49,7 @@ class Tc::Duration < Parslet::Parser
   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) }
+  rule(:small_m) { ((match('[0-3]') >> integer >> integer) | (integer >> integer) ).as(:minutes) >> integer.absnt?}
 
   # unit matchers
   rule(:frames) { (ndf_separator | df_separator) >> (ff | frame).as(:frames) }
@@ -61,6 +62,10 @@ class Tc::Duration < Parslet::Parser
   rule(:h) { hours >> s_hours.maybe }
   rule(:m) { minutes >> s_minutes.maybe }
 
+  rule(:m_mins) { minutes >> s_minutes }
+  rule(:s_secs) { seconds >> s_seconds }
+
+
   # timecode matchers
   rule(:smpte) { hh.as(:hours) >> separator >> mm.as(:minutes) >> separator >> ss.as(:seconds) >> frames } 
   rule(:h_m) { hours >> separator >> minutes >> s_minutes.maybe }
@@ -74,7 +79,7 @@ class Tc::Duration < Parslet::Parser
   rule(:min_sec) {  minutes >> s_minutes >> space? >> (seconds >> s_seconds.maybe).maybe }
 
   rule(:unambiguous) { smpte | small_h_m_s | hr_min | hr_min_sec | min_sec }
-  rule(:ambiguous) { m_s_f | h_m_s | m_s | h_m | m | s }
+  rule(:ambiguous) { m_s_f | h_m_s | m_s | h_m | m_mins | s_secs | small_m | s | m }
   rule(:exact) { unambiguous | ambiguous }
 
   # approximate indicators

data/lib/tc/version.rb

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

data/spec/lib/tc_duration_spec.rb

@@ -115,6 +115,16 @@ describe Tc::Duration do
     end
   end
 
+  context "small_m" do
+    it "should consume '300'" do
+      parser.small_m.should parse('300')
+    end
+
+    it "should not consume '1234'" do
+      parser.small_m.should_not parse('1234')
+    end
+  end
+
   context "small_h_m_s" do
     it "should consume '01:09:26 s'" do
       parser.small_h_m_s.should parse('01:09:26 s')
@@ -426,9 +436,17 @@ describe Tc::Duration do
       parsed[:seconds].should == '5100.0'
     end
 
+    it "should parse '5678'" do
+      parser.exact.should parse('5678')
+      parsed = parser.exact.parse('5678')
+
+      parsed[:seconds].should == '5678'
+    end
+
     it "should parse '120'" do
       parser.exact.should parse('120')
       parsed = parser.exact.parse('120')
+
       parsed[:minutes].should == '120'
     end
 

metadata

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