titlekit 1.2.1 → 1.2.4

data/spec/simultaneous_subtitles/simultaneous_subtitles_spec.rb

@@ -3,10 +3,10 @@ require File.join(File.expand_path(__dir__), '../spec_helper')
 describe Titlekit::Job do
 
   describe 'Simultaneous Subtitles' do
-    
+
     context 'with dual subtitles' do
       let(:ins) do
-        %w{one two}.map do |file|
+        %w(one two).map do |file|
           File.join(__dir__, 'dual', "#{file}.srt")
         end
       end
@@ -23,7 +23,7 @@ describe Titlekit::Job do
           job = Titlekit::Job.new
           ins.each { |file| job.have.file(file).encoding('UTF-8') }
           job.want.file(@out)
-          
+
           expect(job.run).to be true
         end
 
@@ -65,19 +65,19 @@ describe Titlekit::Job do
           job = Titlekit::Job.new
           ins.each { |file| job.have.file(file).encoding('UTF-8') }
           job.want.file(@out)
-          
+
           expect(job.run).to be true
         end
 
         it 'delivers the expected output' do
           expect(FileUtils.compare_file(@out, @expected)).to be true
         end
-      end            
+      end
     end
 
     context 'with triple subtitles' do
       let(:ins) do
-        %w{one two three}.map do |file|
+        %w(one two three).map do |file|
           File.join(__dir__, 'triple', "#{file}.srt")
         end
       end
@@ -94,7 +94,7 @@ describe Titlekit::Job do
           job = Titlekit::Job.new
           ins.each { |file| job.have.file(file).encoding('UTF-8') }
           job.want.file(@out)
-          
+
           expect(job.run).to be true
         end
 
@@ -115,7 +115,7 @@ describe Titlekit::Job do
           job = Titlekit::Job.new
           ins.each { |file| job.have.file(file).encoding('UTF-8') }
           job.want.file(@out)
-          
+
           expect(job.run).to be true
         end
 
@@ -136,19 +136,19 @@ describe Titlekit::Job do
           job = Titlekit::Job.new
           ins.each { |file| job.have.file(file).encoding('UTF-8') }
           job.want.file(@out)
-          
+
           expect(job.run).to be true
         end
 
         it 'delivers the expected output' do
           expect(FileUtils.compare_file(@out, @expected)).to be true
         end
-      end            
+      end
     end
 
     context 'with three+ simultaneous subtitles' do
       let(:ins) do
-        %w{one two three four five six}.map do |file|
+        %w(one two three four five six).map do |file|
           File.join(__dir__, 'triple_plus', "#{file}.srt")
         end
       end
@@ -159,13 +159,13 @@ describe Titlekit::Job do
           @expected = File.join(__dir__, 'triple_plus', 'srt', 'expected.srt')
 
           File.delete(@out) if File.exist?(@out)
-        end      
+        end
 
         it 'runs the job' do
           job = Titlekit::Job.new
           ins.each { |file| job.have.file(file).encoding('UTF-8') }
           job.want.file(@out)
-          
+
           expect(job.run).to be true
         end
 
@@ -180,13 +180,13 @@ describe Titlekit::Job do
           @expected = File.join(__dir__, 'triple_plus', 'ssa', 'expected.ssa')
 
           File.delete(@out) if File.exist?(@out)
-        end      
+        end
 
         it 'runs the job' do
           job = Titlekit::Job.new
           ins.each { |file| job.have.file(file).encoding('UTF-8') }
           job.want.file(@out)
-          
+
           expect(job.run).to be true
         end
 
@@ -201,20 +201,20 @@ describe Titlekit::Job do
           @expected = File.join(__dir__, 'triple_plus', 'ass', 'expected.ass')
 
           File.delete(@out) if File.exist?(@out)
-        end      
+        end
 
         it 'runs the job' do
           job = Titlekit::Job.new
           ins.each { |file| job.have.file(file).encoding('UTF-8') }
           job.want.file(@out)
-          
+
           expect(job.run).to be true
         end
 
         it 'delivers the expected output' do
           expect(FileUtils.compare_file(@out, @expected)).to be true
         end
-      end            
+      end
     end
   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/spec_helper.rb

@@ -5,4 +5,4 @@ RSpec.configure do |config|
   config.expect_with :rspec do |c|
     c.syntax = :expect
   end
-end
+end

data/spec/specifications_spec.rb

@@ -63,7 +63,7 @@ shared_examples 'a specification' do
       it 'returns the set named reference for a timecode' do
         expect(specification.references[:some_point][:timecode]).to eq(210)
       end
-    end    
+    end
 
     context 'specifying an SRT timecode' do
       let(:specification) do
@@ -105,7 +105,7 @@ shared_examples 'a specification' do
       it 'returns the set named reference for a timecode' do
         expect(specification.references[:some_point][:timecode]).to eq(210)
       end
-    end       
+    end
   end
 end
 
@@ -135,4 +135,4 @@ end
 
 describe Titlekit::Want do
   it_behaves_like 'a specification'
-end
+end

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
@@ -48,7 +49,7 @@ describe Titlekit::SRT do
       it 'parses and builds correct lines' do
         expect(subtitles[0][:lines]).to eq("<i>(male narrator) Previously\r\non Battlestar Galactica.</i>")
       end
-    end 
+    end
 
     context 'with a file that contains coordinates' do
       let(:subtitles) do
@@ -75,7 +76,7 @@ describe Titlekit::SRT do
       it 'ignores the display coordinates' do
         # just fyi
       end
-    end     
+    end
   end
 
   describe '.export' do
@@ -122,13 +123,13 @@ Oh yeah ... 寧為太平犬，不做亂世人
 
   describe '.build_timecode' do
     it 'builds an SRT timecode from a float timecode value' do
-       expect(Titlekit::SRT.build_timecode(35.9678)).to eq('00:00:35,968')
+      expect(Titlekit::SRT.build_timecode(35.9678)).to eq('00:00:35,968')
     end
   end
 
   describe '.parse_timecode' do
     it 'obtains a float timecode value from an SRT timecode' do
-       expect(Titlekit::SRT.parse_timecode('00:00:35,968')).to eq(35.968)
+      expect(Titlekit::SRT.parse_timecode('00:00:35,968')).to eq(35.968)
     end
-  end    
-end
+  end
+end

data/spec/ssa_spec.rb

@@ -9,7 +9,7 @@ describe Titlekit::SSA do
         Titlekit::SSA.import(File.read('spec/files/ssa/simple.ssa'))
       end
 
-      it 'parses and builds 3 subtitles' do
+      it 'parses and builds 2 subtitles' do
         expect(subtitles.length).to eq(2)
       end
 
@@ -23,7 +23,7 @@ describe Titlekit::SSA do
       end
 
       it 'parses and builds correct lines' do
-        expect(subtitles[1][:lines]).to eq("{\\a2}Story Script & Direction - MIYAZAKI Hayao")
+        expect(subtitles[1][:lines]).to eq('{\\a2}Story Script & Direction - MIYAZAKI Hayao')
       end
     end
   end
@@ -78,13 +78,14 @@ Dialogue: 0,0:00:01.50,0:00:03.70,Default,,0000,0000,0000,,Oh yeah ... 寧為太
 
   describe '.build_timecode' do
     it 'builds an SSA timecode from a float timecode value' do
-       expect(Titlekit::SSA.build_timecode(35.9678)).to eq('0:00:35.97')
+      expect(Titlekit::SSA.build_timecode(35.9678)).to eq('0:00:35.97')
     end
   end
 
   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:35.96')).to eq(35.96)
+      expect(Titlekit::SSA.parse_timecode('0:00:04.56')).to eq(4.56)
     end
-  end    
-end
+  end
+end

data/spec/timecode_correction/timecode_correction_spec.rb

@@ -29,7 +29,7 @@ describe Titlekit::Job do
 
       it 'delivers the expected output' do
         expect(FileUtils.compare_file(@out, @expected)).to be true
-      end      
+      end
     end
 
     context 'Based on a single reference' do
@@ -57,7 +57,7 @@ describe Titlekit::Job do
 
       it 'delivers the expected output' do
         expect(FileUtils.compare_file(@out, @expected)).to be true
-      end       
+      end
     end
 
     context 'Based on differing framerates plus a reference' do
@@ -87,7 +87,7 @@ describe Titlekit::Job do
 
       it 'delivers the expected output' do
         expect(FileUtils.compare_file(@out, @expected)).to be true
-      end       
+      end
     end
 
     context 'Based on two references' do
@@ -120,4 +120,4 @@ describe Titlekit::Job do
       end
     end
   end
-end
+end

data/spec/transcoding/transcoding_spec.rb

@@ -19,11 +19,11 @@ describe Titlekit::Job do
         have = job.have
         have.encoding('ISO-8859-1')
         have.file(@in)
-        
+
         want = job.want
         want.encoding('UTF-8')
         want.file(@out)
-        
+
         expect(job.run).to be true
       end
 
@@ -47,11 +47,11 @@ describe Titlekit::Job do
         have = job.have
         have.encoding('Windows-1252')
         have.file(@in)
-        
+
         want = job.want
         want.encoding('UTF-8')
         want.file(@out)
-        
+
         expect(job.run).to be true
       end
 
@@ -75,11 +75,11 @@ describe Titlekit::Job do
         have = job.have
         have.encoding('UTF-8')
         have.file(@in)
-        
+
         want = job.want
         want.encoding('GBK')
         want.file(@out)
-        
+
         expect(job.run).to be true
       end
 
@@ -103,14 +103,14 @@ describe Titlekit::Job do
         have = job.have
         have.encoding('GB2312')
         have.file(@in)
-        
+
         want = job.want
         want.encoding('ASCII')
         want.file(@out)
-        
+
         expect(job.run).to be false
         expect(job.report.join).to include('Failure while transcoding')
       end
-    end        
+    end
   end
-end
+end

data/titlekit.gemspec

@@ -1,27 +1,22 @@
 require File.expand_path('../lib/titlekit/version', __FILE__)
 
 Gem::Specification.new do |spec|
-  spec.name = 'titlekit'
-  spec.summary = 'Featureful Ruby library for SRT / ASS / SSA subtitles'
-  spec.description = 'Featureful Ruby library for SRT / ASS / SSA subtitles'
-  
-  spec.homepage = 'https://github.com/simonrepp/titlekit'
-  
   spec.author = 'Simon Repp'
-  spec.email = 'simon@fdpl.foundation'
-
+  spec.description = 'Featureful Ruby library for SRT / ASS / SSA subtitles'
+  spec.homepage = 'https://codeberg.org/simonrepp/titlekit'
   spec.license = 'MIT'
+  spec.name = 'titlekit'
+  spec.summary = 'Featureful Ruby library for SRT / ASS / SSA subtitles'
 
-  spec.add_runtime_dependency('rchardet19')
-  spec.add_runtime_dependency('treetop')
+  spec.add_runtime_dependency('rchardet19', '~> 1.3.7')
+  spec.add_runtime_dependency('treetop', '~> 1.6.11')
 
-  spec.add_development_dependency('rake')
-  spec.add_development_dependency('rspec')
+  spec.add_development_dependency('rspec', '~> 3.11.0')
 
   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.executables = spec.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
   spec.version = Titlekit::VERSION

metadata

@@ -1,84 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: titlekit
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.4
 platform: ruby
 authors:
 - Simon Repp
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-23 00:00:00.000000000 Z
+date: 2022-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rchardet19
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.7
 - !ruby/object:Gem::Dependency
   name: treetop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-- !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'
+        version: 1.6.11
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.11.0
 description: Featureful Ruby library for SRT / ASS / SSA subtitles
-email: simon@fdpl.foundation
+email:
 executables:
 - titlekit
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
-- LICENSE
+- LICENSE.txt
 - README.md
-- Rakefile
 - bin/titlekit
 - lib/titlekit.rb
 - lib/titlekit/have.rb
@@ -110,6 +95,7 @@ files:
 - spec/encoding_detection/c/out.srt
 - spec/encoding_detection/encoding_detection_spec.rb
 - spec/files/ass/authentic.ass
+- spec/files/ass/bom.ass
 - spec/files/ass/hard.ass
 - spec/files/ass/simple.ass
 - spec/files/srt/authentic.srt
@@ -191,11 +177,11 @@ files:
 - spec/transcoding/windows-1252_utf-8/in.srt
 - spec/transcoding/windows-1252_utf-8/out.srt
 - titlekit.gemspec
-homepage: https://github.com/simonrepp/titlekit
+homepage: https://codeberg.org/simonrepp/titlekit
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -203,16 +189,15 @@ 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.6
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Featureful Ruby library for SRT / ASS / SSA subtitles
 test_files:
@@ -233,6 +218,7 @@ test_files:
 - spec/encoding_detection/c/out.srt
 - spec/encoding_detection/encoding_detection_spec.rb
 - spec/files/ass/authentic.ass
+- spec/files/ass/bom.ass
 - spec/files/ass/hard.ass
 - spec/files/ass/simple.ass
 - spec/files/srt/authentic.srt

data/.travis.yml

@@ -1,3 +0,0 @@
-language: ruby
-rvm:
-  - 2.2.0

data/Rakefile

@@ -1,8 +0,0 @@
-#!/usr/bin/env rake
-require "bundler/gem_tasks"
-
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec)
-
-task :test => :spec
-task :default => :spec