titlekit 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7b9b35e1b03b4b9643a8c75982aec3d425fb5b84
-  data.tar.gz: 40794f1843dd4cfbc18895dd5bffbd0a8bde6546
+SHA256:
+  metadata.gz: cef9e09e7354eaede06fe3d337e7d2204d0e74452a24a0ce9c5926876c827822
+  data.tar.gz: 214d47cf6102c6529aa37f7cbdd22d4c41cb9fb24cc79b5907f3ab218eede9c7
 SHA512:
-  metadata.gz: 325f6862335038d5a8ecc03454ec35559b28aa113cdbef9b2183d5d84723e4b83cb6d15abcbee9cfa4541f1e35ab545b3a0a64fb4ef3640dee764d006ea53480
-  data.tar.gz: d300e60449e00888d1799d2e1e3c127bb4975f32c9f502869d609e1b62f5b9e98935800bcbdbfef1f6e9debb3a32edfc047457a627c9070d5a0f0ec3298f9c89
+  metadata.gz: e72816bc7ec5098f03917edddbdbfb38ffa8a1dac35f31f5e77b0ded1b47890afe9d60b2cb909cd7d4de279cba189f8fd48e35c5edb85a348a07ee0b9a77317b
+  data.tar.gz: a9c5bda2b3611c92201e9e2bd1827fbe892d4d49709e49429cb7530f3c0285bb5add0d55572fd2449f1cf6bd4ea749104ac48fa5043d8ff4cd3d49d107c09131

data/.travis.yml

@@ -1,3 +1,3 @@
 language: ruby
 rvm:
-  - 2.2.2
+  - 2.7.0

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+# Changelog
+
+This project follows semantic versioning.
+
+## 1.2.3
+
+- Fix inequalities caused by float addition (William T. Nelson) `8c84718`
+
+## <= 1.2.2
+
+*See commit history*

data/lib/titlekit/parsers/ass.rb

@@ -188,7 +188,7 @@ module Titlekit
     # @param [Float] an amount of seconds
     def self.parse_timecode(timecode)
       m = timecode.match(/(?<h>\d):(?<m>\d{2}):(?<s>\d{2})[:|\.](?<ms>\d+)/)
-      m['h'].to_i * 3600 + m['m'].to_i * 60 + m['s'].to_i + "0.#{m['ms']}".to_f
+      "#{m['h'].to_i * 3600 + m['m'].to_i * 60 + m['s'].to_i}.#{m['ms']}".to_f
     end
   end
 end

data/lib/titlekit/parsers/srt.rb

@@ -29,8 +29,7 @@ module Titlekit
         value += hours.text_value.to_i * 3600
         value += minutes.text_value.to_i * 60
         value += seconds.text_value.to_i
-        value += "0.#{fractions.text_value}".to_f
-        value
+        "#{value}.#{fractions.text_value}".to_f
       end
     end
 

data/lib/titlekit/parsers/ssa.rb

@@ -192,7 +192,7 @@ module Titlekit
     # @param [Float] an amount of seconds
     def self.parse_timecode(timecode)
       m = timecode.match(/(?<h>\d):(?<m>\d{2}):(?<s>\d{2})[:|\.](?<ms>\d+)/)
-      m['h'].to_i * 3600 + m['m'].to_i * 60 + m['s'].to_i + "0.#{m['ms']}".to_f
+      "#{m['h'].to_i * 3600 + m['m'].to_i * 60 + m['s'].to_i}.#{m['ms']}".to_f
     end
   end
 end

data/lib/titlekit/version.rb

@@ -1,4 +1,4 @@
 module Titlekit
   # Versioning follows the semantic versioning scheme: http://semver.org/
-  VERSION = '1.2.2'
+  VERSION = '1.2.3'
 end

data/spec/ass_spec.rb

@@ -131,6 +131,7 @@ Dialogue: 0,0:00:01.50,0:00:03.70,Default,,0000,0000,0000,,Oh yeah ... 寧為太
   describe '.parse_timecode' do
     it 'obtains a float timecode value from an ASS timecode' do
       expect(Titlekit::ASS.parse_timecode('0:00:35.96')).to eq(35.96)
+      expect(Titlekit::ASS.parse_timecode('0:00:04.56')).to eq(4.56)
     end
   end
 end

data/spec/simultaneous_subtitles/triple_plus/ass/expected.ass

@@ -36,9 +36,9 @@ Dialogue: 0,0:00:10.00,0:00:10.35,EDF393,,0000,0000,0000,,Wir verwenden zu viele
 Dialogue: 0,0:00:10.35,0:00:10.38,89BABE,,0000,0000,0000,,We are using way too many here
 Dialogue: 0,0:00:10.35,0:00:10.38,EDF393,,0000,0000,0000,,Wir verwenden zu viele Untertitel zur gleichen Zeit
 Dialogue: 0,0:00:10.38,0:00:11.00,EDF393,,0000,0000,0000,,Wir verwenden zu viele Untertitel zur gleichen Zeit
-Dialogue: 0,0:00:11.95,0:00:11.97,FFA891,,0000,0000,0000,,¡Dios mio!
-Dialogue: 0,0:00:11.97,0:00:11.99,EDF393,,0000,0000,0000,,That is correct
-Dialogue: 0,0:00:11.97,0:00:11.99,FFA891,,0000,0000,0000,,¡Dios mio!
+Dialogue: 0,0:00:11.95,0:00:11.98,FFA891,,0000,0000,0000,,¡Dios mio!
+Dialogue: 0,0:00:11.98,0:00:11.99,EDF393,,0000,0000,0000,,That is correct
+Dialogue: 0,0:00:11.98,0:00:11.99,FFA891,,0000,0000,0000,,¡Dios mio!
 Dialogue: 0,0:00:11.99,0:00:12.04,EDF393,,0000,0000,0000,,That is correct
 Dialogue: 0,0:00:11.99,0:00:12.04,F5E665,,0000,0000,0000,,Esto es correcto
 Dialogue: 0,0:00:11.99,0:00:12.04,FFA891,,0000,0000,0000,,¡Dios mio!

data/spec/simultaneous_subtitles/triple_plus/ass/out.ass

@@ -36,9 +36,9 @@ Dialogue: 0,0:00:10.00,0:00:10.35,EDF393,,0000,0000,0000,,Wir verwenden zu viele
 Dialogue: 0,0:00:10.35,0:00:10.38,89BABE,,0000,0000,0000,,We are using way too many here
 Dialogue: 0,0:00:10.35,0:00:10.38,EDF393,,0000,0000,0000,,Wir verwenden zu viele Untertitel zur gleichen Zeit
 Dialogue: 0,0:00:10.38,0:00:11.00,EDF393,,0000,0000,0000,,Wir verwenden zu viele Untertitel zur gleichen Zeit
-Dialogue: 0,0:00:11.95,0:00:11.97,FFA891,,0000,0000,0000,,¡Dios mio!
-Dialogue: 0,0:00:11.97,0:00:11.99,EDF393,,0000,0000,0000,,That is correct
-Dialogue: 0,0:00:11.97,0:00:11.99,FFA891,,0000,0000,0000,,¡Dios mio!
+Dialogue: 0,0:00:11.95,0:00:11.98,FFA891,,0000,0000,0000,,¡Dios mio!
+Dialogue: 0,0:00:11.98,0:00:11.99,EDF393,,0000,0000,0000,,That is correct
+Dialogue: 0,0:00:11.98,0:00:11.99,FFA891,,0000,0000,0000,,¡Dios mio!
 Dialogue: 0,0:00:11.99,0:00:12.04,EDF393,,0000,0000,0000,,That is correct
 Dialogue: 0,0:00:11.99,0:00:12.04,F5E665,,0000,0000,0000,,Esto es correcto
 Dialogue: 0,0:00:11.99,0:00:12.04,FFA891,,0000,0000,0000,,¡Dios mio!

data/spec/simultaneous_subtitles/triple_plus/ssa/expected.ssa

@@ -36,9 +36,9 @@ Dialogue: 0,0:00:10.00,0:00:10.35,EDF393,,0000,0000,0000,,Wir verwenden zu viele
 Dialogue: 0,0:00:10.35,0:00:10.38,89BABE,,0000,0000,0000,,We are using way too many here
 Dialogue: 0,0:00:10.35,0:00:10.38,EDF393,,0000,0000,0000,,Wir verwenden zu viele Untertitel zur gleichen Zeit
 Dialogue: 0,0:00:10.38,0:00:11.00,EDF393,,0000,0000,0000,,Wir verwenden zu viele Untertitel zur gleichen Zeit
-Dialogue: 0,0:00:11.95,0:00:11.97,FFA891,,0000,0000,0000,,¡Dios mio!
-Dialogue: 0,0:00:11.97,0:00:11.99,EDF393,,0000,0000,0000,,That is correct
-Dialogue: 0,0:00:11.97,0:00:11.99,FFA891,,0000,0000,0000,,¡Dios mio!
+Dialogue: 0,0:00:11.95,0:00:11.98,FFA891,,0000,0000,0000,,¡Dios mio!
+Dialogue: 0,0:00:11.98,0:00:11.99,EDF393,,0000,0000,0000,,That is correct
+Dialogue: 0,0:00:11.98,0:00:11.99,FFA891,,0000,0000,0000,,¡Dios mio!
 Dialogue: 0,0:00:11.99,0:00:12.04,EDF393,,0000,0000,0000,,That is correct
 Dialogue: 0,0:00:11.99,0:00:12.04,F5E665,,0000,0000,0000,,Esto es correcto
 Dialogue: 0,0:00:11.99,0:00:12.04,FFA891,,0000,0000,0000,,¡Dios mio!

data/spec/simultaneous_subtitles/triple_plus/ssa/out.ssa

@@ -36,9 +36,9 @@ Dialogue: 0,0:00:10.00,0:00:10.35,EDF393,,0000,0000,0000,,Wir verwenden zu viele
 Dialogue: 0,0:00:10.35,0:00:10.38,89BABE,,0000,0000,0000,,We are using way too many here
 Dialogue: 0,0:00:10.35,0:00:10.38,EDF393,,0000,0000,0000,,Wir verwenden zu viele Untertitel zur gleichen Zeit
 Dialogue: 0,0:00:10.38,0:00:11.00,EDF393,,0000,0000,0000,,Wir verwenden zu viele Untertitel zur gleichen Zeit
-Dialogue: 0,0:00:11.95,0:00:11.97,FFA891,,0000,0000,0000,,¡Dios mio!
-Dialogue: 0,0:00:11.97,0:00:11.99,EDF393,,0000,0000,0000,,That is correct
-Dialogue: 0,0:00:11.97,0:00:11.99,FFA891,,0000,0000,0000,,¡Dios mio!
+Dialogue: 0,0:00:11.95,0:00:11.98,FFA891,,0000,0000,0000,,¡Dios mio!
+Dialogue: 0,0:00:11.98,0:00:11.99,EDF393,,0000,0000,0000,,That is correct
+Dialogue: 0,0:00:11.98,0:00:11.99,FFA891,,0000,0000,0000,,¡Dios mio!
 Dialogue: 0,0:00:11.99,0:00:12.04,EDF393,,0000,0000,0000,,That is correct
 Dialogue: 0,0:00:11.99,0:00:12.04,F5E665,,0000,0000,0000,,Esto es correcto
 Dialogue: 0,0:00:11.99,0:00:12.04,FFA891,,0000,0000,0000,,¡Dios mio!

data/spec/srt_spec.rb

@@ -41,6 +41,7 @@ describe Titlekit::SRT do
       end
 
       it 'parses and builds correct timecodes' do
+        expect(subtitles[7][:end]).to eq(22.952)
         expect(subtitles[299][:start]).to eq(1426.564)
         expect(subtitles[299][:end]).to eq(1428.759)
       end

data/spec/ssa_spec.rb

@@ -85,6 +85,7 @@ Dialogue: 0,0:00:01.50,0:00:03.70,Default,,0000,0000,0000,,Oh yeah ... 寧為太
   describe '.parse_timecode' do
     it 'obtains a float timecode value from an SSA timecode' do
       expect(Titlekit::SSA.parse_timecode('0:00:35.96')).to eq(35.96)
+      expect(Titlekit::SSA.parse_timecode('0:00:04.56')).to eq(4.56)
     end
   end
 end

data/titlekit.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.homepage = 'https://github.com/simonrepp/titlekit'
 
   spec.author = 'Simon Repp'
-  spec.email = 'simon@fdpl.foundation'
+  spec.email = 'simon@fdpl.io'
 
   spec.license = 'MIT'
 
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency('rspec')
 
   spec.platform = Gem::Platform::RUBY
-  spec.required_ruby_version = '>= 2.0.0'
+  spec.required_ruby_version = '>= 2.4.0'
   spec.files = `git ls-files`.split($\)
   spec.executables = spec.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   spec.test_files = spec.files.grep(%r{^(test|spec|features)/})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: titlekit
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Simon Repp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-05 00:00:00.000000000 Z
+date: 2020-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rchardet19
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Featureful Ruby library for SRT / ASS / SSA subtitles
-email: simon@fdpl.foundation
+email: simon@fdpl.io
 executables:
 - titlekit
 extensions: []
@@ -75,8 +75,9 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
-- LICENSE
+- LICENSE.txt
 - README.md
 - Rakefile
 - bin/titlekit
@@ -204,15 +205,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Featureful Ruby library for SRT / ASS / SSA subtitles