srt 0.1.3 → 0.1.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MjNjZmQyOWE3OTQzNjg5YzdlYjM4Zjk2ZGMzNzU2YzdiN2IyZjBlZQ==
-  data.tar.gz: !binary |-
-    NWIwZDk0MDFjOTVlM2ZhZjMxNDE2NTdmYTUxYzJmZTgwZTI5MDRjNw==
+SHA1:
+  metadata.gz: d968cae2699fc1dd691a20c0714412659feed184
+  data.tar.gz: 209e318fd211fb54b2a9792f3cf61b691327612a
 SHA512:
-  metadata.gz: !binary |-
-    NDlhNmM2NWMzNjhlMzIzODkxMDMxNDU2OTBiZDFmZGRiNjA0YWJlM2IzMzVi
-    ZjkwYzc4NmQ2NzJjOWE1OWIxODE0ZTE1ZGIxNmFmYTJkY2U4OGY4MjBjZmUz
-    ZTUwOWYzYTY3Yzc3NzYzNjQ4NjhhOTEzOGM0ZDE5N2U3N2M4MTQ=
-  data.tar.gz: !binary |-
-    NzFiZDYxYWQwNzhkZjI4MzI2N2U0MjQ1NDU5NWY2YWI3ZGYyZjM0MzFiMGRk
-    NWVhMDA3YzY1OGU2ZGQ5MGFkY2ZiMjcxOTgwMDQxZTBiNDU5OTU5YTA0MWZk
-    ZTFlMzM3NmFkZGYzYTgyOTI5MDhlYTI1ZmI2MjA4YzA1MDc3NzQ=
+  metadata.gz: '095c33709a65f85f6e5eb1d05a2577f941b1f31d75399563dad423779fa66256caad3f9fc091db4e86ae57bc9cf51d161da7d2e896cd916222ba2717073e9518'
+  data.tar.gz: 9e5551a03c3380f0bbb322985ceea14670196c7815756f34c34a38a7971e027b859ccfbc1931e201513a97d06f21c2c88e97d192251a759cd6094c731ac47a2e

data/.travis.yml

@@ -1,6 +1,8 @@
 language: ruby
+cache: bundler
 rvm:
-  - 1.9.3
   - 2.0.0
+  - 2.1.0
+  - 2.3.0
 script:
-  - bundle exec rake spec
+  - bundle exec rake spec

data/lib/srt/file.rb

@@ -168,10 +168,10 @@ module SRT
             line.end_time += seconds
           end
         elsif (original_framerate = Parser.framerate(options.keys[0])) && (target_framerate = Parser.framerate(options.values[0]))
-          ratio = target_framerate / original_framerate
+          time_ratio = original_framerate / target_framerate
           lines.each do |line|
-            line.start_time *= ratio
-            line.end_time *= ratio
+            line.start_time *= time_ratio
+            line.end_time *= time_ratio
           end
         end
       elsif options.length == 2

data/lib/srt/line.rb

@@ -41,7 +41,9 @@ module SRT
     end
 
     def to_s(time_str_function=:time_str)
-      [sequence, (display_coordinates ? send(time_str_function) + display_coordinates : send(time_str_function)), text, ''].flatten.join("\n")
+      content = text.empty? ? [''] : text
+      coordinates = display_coordinates ? display_coordinates : ""
+      [sequence, send(time_str_function) + coordinates, content, ""].flatten.join("\n")
     end
   end
 end

data/lib/srt/parser.rb

@@ -12,7 +12,7 @@ module SRT
       end
 
       def timecode(timecode_string)
-        mres = timecode_string.match(/(?<h>\d+):(?<m>\d+):(?<s>\d+)[,.](?<ms>\d+)/)
+        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
 

data/lib/srt/version.rb

@@ -1,3 +1,3 @@
 module SRT
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/file_spec.rb

@@ -333,11 +333,11 @@ describe SRT::File do
         before { file.timeshift({ "25fps" => "23.976fps" }) }
 
         it "should have correctly scaled timecodes for subtitle #24" do
-          expect(file.lines[23].time_str).to eq("00:01:52,007 --> 00:01:53,469")
+          expect(file.lines[23].time_str).to eq("00:02:01,779 --> 00:02:03,368")
         end
 
         it "should have correctly scaled timecodes for subtitle #43" do
-          expect(file.lines[42].time_str).to eq("00:03:34,503 --> 00:03:35,910")
+          expect(file.lines[42].time_str).to eq("00:03:53,217 --> 00:03:54,746")
         end
       end
 

data/spec/line_spec.rb

@@ -22,4 +22,20 @@ describe SRT::Line do
       expect(line.time_str).to eq("00:03:44,200 --> 00:04:04,578")
     end
   end
+
+  describe "#to_s" do
+    let(:line) { SRT::Line.new }
+
+    before do
+      line.sequence = "1"
+      line.start_time = 224.2
+      line.end_time = 244.578
+    end
+    
+    context "with empty content" do
+      it "creates a valid empty node" do
+        expect(line.to_s).to eq("1\n00:03:44,200 --> 00:04:04,578\n\n")
+      end
+    end
+  end
 end

data/spec/parser_spec.rb

@@ -14,6 +14,10 @@ describe SRT::Parser do
     it "should convert the SRT timecode format to a float representing seconds" do
       expect(subject.timecode("01:03:44,200")).to eq(3824.2)
     end
+
+    it "should handle timecodes with no milliseconds component" do
+      expect(subject.timecode("01:03:44")).to eq(3824.0)
+    end
   end
 
   describe ".timespan" do

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: srt
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Christopher Petersen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
+date: 2018-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby gem for parsing srt (subtitle) files. SRT stands for SubRip text
@@ -60,8 +60,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -92,17 +92,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Ruby gem for parsing subtitle files.