vtt2ass 0.2.11 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31678ee311f3ad71017e2960d227b8a572cbc45df381902e11631598a96558cd
-  data.tar.gz: 22b253a6b93847211744f26cdd368d32d6a22d2063997d21928f13e1016e53d9
+  metadata.gz: 41589b113a0b7b9e79ca957027d7ffdcadc4878a3a58c6ac679de1fb381cb020
+  data.tar.gz: 99f4dc6156626c91fce3c9fa2c8a995022eb420593bc0c59fe85a34999cf89c8
 SHA512:
-  metadata.gz: 1ce253cfbefd7566a3de6554639428448e85fe1dbc8289ef1ae44aa0e627682bf7d2967e617ffd14de2e4fb418cf77208e896b27c06d0937e24d286aef01d29e
-  data.tar.gz: 38016a471e9dc9be1a19529e56f41bcbcd9fb0f104a51192e4951834e15e556f0cfaca81a741efdd87e3a0431292e9ce13e99bf59b54bd4aceadc5389f3d34e3
+  metadata.gz: 2f28df173df92ac71c61565e8f5dcc3c1eda7caf54ef9a8aa1f7a8333bfc8d96e27af5850d5a4356f99c7d5d5c41db373a334c201a085515d2f1d3b71b409b3c
+  data.tar.gz: 2f5390f9f5bf8ae5d74a7ef0564f57ce3b93fe830cd282eaf3f4cc26211a5258b5475854b8e01975e9edf4f9b7cb8b97b3784b928de9ae1ca5d3e761a27e0685

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in vtt2ass.gemspec
 gemspec
 
-gem 'htmlentities'
-gem 'yard'
-gem "rake", "~> 12.0"
-gem "minitest", "~> 5.0"
+gem 'htmlentities', '~> 4.3'
+gem 'yard', '~> 0.9'
+gem 'rake', '~> 12.0'
+gem 'minitest', '~> 5.0'

data/lib/vtt2ass/ASSFile.rb

@@ -45,7 +45,7 @@ class ASSFile
             @ass_lines.push(ASSLine.new(line.style, line.time_start, line.time_end, line.text))
             style_exists = false
             @ass_styles.each do |style|
-                if (style.style_name == line.style) then
+                if (style.style_name.eql? line.style) then
                     style_exists = true
                     break
                 end

data/lib/vtt2ass/ASSStyle.rb

@@ -20,7 +20,7 @@ class ASSStyle
         @font_size = font_size
         @style_name = style_name
         @s_params = ASSStyleParams.new(params, width, height)
-        if style_name.eql? 'MainTop'
+        if style_name.eql? 'MainTop' then
             @s_params.vertical_margin = 50
         end
     end

data/lib/vtt2ass/Application.rb

@@ -41,7 +41,7 @@ class Application
     # This method creates a new VTTFile object from the file path provided and convert its content
     # inside a new ASSFile object.
     def vtt_to_ass(file_path)
-        vtt_file = VTTFile.new(file_path)
+        vtt_file = VTTFile.new(file_path, @width, @height)
         ass_file = ASSFile.new(
             (defined?(@title) ? @title : File.basename(file_path).gsub('.vtt', '')),
             @width,

data/lib/vtt2ass/VTTFile.rb

@@ -8,7 +8,7 @@ class VTTFile
 
     ##
     # Creates a new VTTFile instance and assigns the default values of instance variables.
-    def initialize(file_path)
+    def initialize(file_path, width, height)
         @title = File.basename(file_path).gsub('.vtt', '')
         @lines = []
         separator = determine_line_ending(file_path) ? "\n\n" : "\r\n\r\n"
@@ -16,7 +16,7 @@ class VTTFile
         File.foreach(file_path, separator) do |paragraph|
             paragraph = paragraph.rstrip.gsub(/[\r\n]/, "\n")
             if not paragraph.eql? "" then
-                vtt_line = VTTLine.new(paragraph)
+                vtt_line = VTTLine.new(paragraph, width, height)
                 @lines.push(vtt_line)
                 count += 1
             end

data/lib/vtt2ass/VTTLine.rb

@@ -7,7 +7,7 @@ class VTTLine
     # This method creates an instance of an VTTLine.
     #
     # * Requires +paragraph+, a VTT formatted string as input.
-    def initialize(paragraph)
+    def initialize(paragraph, width, height)
         lines = paragraph.split("\n")
         rx = /^([\d:.]*) --> ([\d:.]*)\s?(.*?)\s*$/
         @style = "Main"
@@ -22,7 +22,8 @@ class VTTLine
                 @time_start = m[1]
                 @time_end = m[2]
                 @params = m[3]
-                if @params.include? "align:middle line:7%" or @params.include? "align:middle line:10%" then
+                ass_style = ASSStyleParams.new(@params, width, height)
+                if @style.eql? 'Main' and ass_style.alignment == 8 then
                     @style = "MainTop"
                 end
             else

data/lib/vtt2ass/version.rb

@@ -4,5 +4,5 @@ module Vtt2ass
   ##
   # This is the version of the application.
   # This needs to be changed for each gem release.
-  VERSION = "0.2.11"
+  VERSION = "0.2.12"
 end

data/vtt2ass.gemspec

@@ -25,9 +25,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'htmlentities'
+  spec.add_dependency 'htmlentities', '~> 4.3'
 
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'minitest'
-  spec.add_development_dependency 'yard'
+  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'minitest', '~> 5.0'
+  spec.add_development_dependency 'yard', '~> 0.9'
 end

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: vtt2ass
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
 platform: ruby
 authors:
 - Louis-Philippe Fortin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-17 00:00:00.000000000 Z
+date: 2021-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 description: 
 email:
 - timemaster.lpf@gmail.com