srt 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d78709bafbe0108d1b453ea5ccad50e65ac8d77
-  data.tar.gz: c25aceb9b79d1beb1c0be65bf6383593238d8aad
+  metadata.gz: 226ede0afdafbb23daefe624ec7becc9460ed027
+  data.tar.gz: 010fd1033ada594a51cce591d0c0fc7f430ebaa1
 SHA512:
-  metadata.gz: eca5bb6785cedd43ee20d2cc0d700713df14dc5e5d8d02d520f04730405b65c11a6cb8f2e72e802d971b87040ff356d8d919f4a74b40d1e3cf4a38fccd6af14a
-  data.tar.gz: e4a936cb2d04bb08b2e3dd64b9d8043a957ad403c57df1949cfc45d80c411f13b4efdd38d8c3636ccf8ced401261f2fbd817b9be989f4d47c8cd320b56314a36
+  metadata.gz: 3629bbcef44c932ae1b458ad73fe7339fbcd9aa06d8b297955d76bb075691237d759c2631d112f947e1331504bb135bb8d38c6643f41db7a38b267e05eb4789c
+  data.tar.gz: ab882c03bfa03565304ab707352442ecccd3ac0191d3eea1f7d86bf15b661cf1d893880979af730fd73097e98dc5617bbcdf49c463f96b5b169248ac2f1840dc

data/README.md

@@ -1,6 +1,6 @@
 # SRT [![Build Status](https://travis-ci.org/cpetersen/srt.png?branch=master)](https://travis-ci.org/cpetersen/srt)
 
-SRT stands for SubRip text file format, which is a file for storing subtitles; This is a Ruby library for manipulating SRT files.  
+SRT stands for SubRip text file format, which is a file for storing subtitles; This is a Ruby library for manipulating SRT files.
 Current functionality includes **parsing**, **appending**, **splitting** and **timeshifting** (constant, progressive and framerate-based).
 
 ## Installation
@@ -12,7 +12,7 @@ Add this line to your application's Gemfile:
 And then execute:
 
     $ bundle
-    
+
 Or install it yourself as:
 
     $ gem install srt
@@ -31,7 +31,7 @@ You can parse an SRT file with the following code:
 Each line exposes the following methods/members:
 * `sequence` The incrementing subtitle ID (starts at 1)
 * `text` An **Array** holding one or multiple lines of text.
-* `start_time` The subtitle start timecode in seconds as a float 
+* `start_time` The subtitle start timecode in seconds as a float
 * `end_time` The subtitle end timecode in seconds as a float
 * `time_str` Returns a timecode string of the form `"00:53:35,558 --> 00:53:36,556"`
 * `display_coordinates` Optional display coordinates of the form `"X1:100 X2:600 Y1:100 Y2:400"`
@@ -66,14 +66,14 @@ Example options for a multi-split: `{ :at => ["00:19:24,500", "01:32:09,120", ..
 
 The method `timeshift` takes a hash and supports three different modes of timecode processing:
 
-**Constant timeshift** 
+**Constant timeshift**
 
 ```ruby
-  file.timeshift( :all => "-2.5s" ) # Shift all subtitles so they show up 2.5 seconds earlier    
+  file.timeshift( :all => "-2.5s" ) # Shift all subtitles so they show up 2.5 seconds earlier
 ```
 
-Simply pass a hash of the form `:all => "[+|-][amount][h|m|s|mil]"`  
-Other example options, e.g.: `:all => "+700mil"`, `:all => "1.34m"`, `:all => "0.15h"`
+Simply pass a hash of the form `:all => "[+|-][amount][h|m|s|ms]"`
+Other example options, e.g.: `:all => "+1.34m"`, `:all => "0.15h"`, `:all => "90ms"`
 
  **Progressive timeshift**
 
@@ -86,14 +86,14 @@ This example call would shift the **first subtitle** to `00:02:12`, the **last s
 To make this work pass two `origin timecode => target timecode` pairs, where the *origin timecodes* can be supplied as:
 
 * `float` providing the raw timecode in *seconds*, e.g.:  `195.65`
-* `"[hh]:[mm]:[ss],[mil]"` string, which is a timecode in SRT notation, e.g.: `"00:02:12,000"`
+* `"[hh]:[mm]:[ss],[ms]"` string, which is a timecode in SRT notation, e.g.: `"00:02:12,000"`
 * `"#[id]"` string, which references the timecode of the subtitle with the supplied id, e.g.:  `"#317"`
 
 ... and the *target timecodes* can be supplied as:
 
 * `float` providing the raw timecode in *seconds*, e.g.:  `3211.3`
-* `"[hh]:[mm]:[ss],[mil]"` string, which is a timecode in SRT notation, e.g.: `"01:01:03,300"`
-* `"[+/-][amount][h|m|s|mil]"` string, describing the amount by which to shift the origin timecode, e.g.: `"+1.5s"`
+* `"[hh]:[mm]:[ss],[ms]"` string, which is a timecode in SRT notation, e.g.: `"01:01:03,300"`
+* `"[+/-][amount][h|m|s|ms]"` string, describing the amount by which to shift the origin timecode, e.g.: `"+1.5s"`
 
 So for example: `{ "00:00:51,400" => "+13s", "01:12:44,320" => "+2.436m" }`
 

data/lib/srt/file.rb

@@ -225,19 +225,18 @@ module SRT
     end
 
     def self.parse_timecode(timecode_string)
-      mres = timecode_string.match(/(?<h>\d+):(?<m>\d+):(?<s>\d+),(?<mil>\d+)/)
-      mres ? "#{mres["h"].to_i * 3600 + mres["m"].to_i * 60 + mres["s"].to_i}.#{mres["mil"]}".to_f : nil
+      mres = timecode_string.match(/(?<h>\d+):(?<m>\d+):(?<s>\d+),(?<ms>\d+)/)
+      mres ? "#{mres["h"].to_i * 3600 + mres["m"].to_i * 60 + mres["s"].to_i}.#{mres["ms"]}".to_f : nil
     end
 
     def self.parse_timespan(timespan_string)
       factors = {
-        "mil" => 0.001,
+        "ms" => 0.001,
         "s" => 1,
         "m" => 60,
         "h" => 3600
       }
-
-      mres = timespan_string.match(/(?<amount>(\+|-)?\d+((\.)?\d+)?)(?<unit>mil|s|m|h)/)
+      mres = timespan_string.match(/(?<amount>(\+|-)?\d+((\.)?\d+)?)(?<unit>ms|s|m|h)/)
       mres ? mres["amount"].to_f * factors[mres["unit"]] : nil
     end
   end

data/lib/srt/version.rb

@@ -1,3 +1,3 @@
 module SRT
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/srt_spec.rb

@@ -40,13 +40,17 @@ describe SRT do
     end
 
     describe ".parse_timespan" do
-      it "should convert a timespan string ([+|-][amount][h|m|s|mil]) to a float representing seconds" do
+      it "should convert a timespan string ([+|-][amount][h|m|s|ms]) to a float representing seconds" do
         SRT::File.parse_timespan("-3.5m").should eq(-210)
       end
 
-      it "should convert a timespan string ([+|-][amount][h|m|s|mil]) to a float representing seconds" do
+      it "should convert a timespan string ([+|-][amount][h|m|s|ms]) to a float representing seconds" do
         SRT::File.parse_timespan("-1s").should eq(-1)
       end
+
+      it "should convert a timespan string ([+|-][amount][h|m|s|ms]) to a float representing seconds" do
+        SRT::File.parse_timespan("100ms").should eq(0.1)
+      end      
     end
 
     describe ".parse_framerate" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: srt
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Christopher Petersen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-14 00:00:00.000000000 Z
+date: 2013-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake