srtshifter 1.2.1 → 1.3.0

data/lib/srtshifter/options.rb

@@ -63,4 +63,4 @@ module SrtShifter
         end
     end
   end
-end
+end

data/lib/srtshifter/subtitle.rb

@@ -38,15 +38,26 @@ module SrtShifter
 			puts "Elapsed time: #{end_time-start_time} seconds."
 		end
 
-		def convert_time time
-
-			if @opts[:operation] == "SUB" and @opts[:time] > 0
-				@opts[:time] = -@opts[:time]
-			end
-
-			current_time = Time.parse(time)
-			new_time = Time.at(current_time.to_f + @opts[:time])
-			"#{new_time.strftime('%H:%M:%S')},#{sprintf("%.3d",new_time.usec/1000)}"
-		end
-	end
+    def convert_time(time)
+      time_diff = time_in_seconds(@opts[:time])
+      if @opts[:operation] == "SUB" and time_diff > 0
+        time_diff *= -1
+      end
+
+      current_time = Time.parse(time)
+      new_time = Time.at(current_time.to_f + time_diff)
+      "#{new_time.strftime('%H:%M:%S')},#{sprintf("%.3d",new_time.usec/1000)}"
+    end
+
+    private
+
+    def time_in_seconds(time_string)
+      return time_string if time_string.kind_of?(Numeric)
+
+      times = time_string.scan(/(\d{2}):(\d{2}):(\d{2}).(\d{3})/)
+      times.flatten!
+      times.map!(&:to_i)
+      times[3]/1_000.0 + times[2] + 60*(times[1] + times[0]*60)
+    end
+  end
 end

data/lib/srtshifter/version.rb

@@ -1,3 +1,3 @@
 module SrtShifter
-  VERSION = "1.2.1"
+  VERSION = "1.3.0"
 end

data/srtshifter.gemspec

@@ -19,5 +19,4 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'coveralls'
 end

data/test/lib/srtshifter/options_test.rb

@@ -53,4 +53,4 @@ describe SrtShifter do
 
 	end
 
-end
+end

data/test/lib/srtshifter/subtitle_test.rb

@@ -38,6 +38,33 @@ describe SrtShifter do
 
 			end
 
+			it "must accept time in '%H:%M:%S.%L' format in ADD operation" do
+				given_time = "00:00:10,000"
+				@options[:operation] = "ADD"
+				@options[:time] = "01:20:03.999"
+
+				sub = SrtShifter::Subtitle.new(@options)
+				sub.convert_time(given_time).must_equal "01:20:13,999"
+			end
+
+			it "must accept time in '%H:%M:%S.%L' format in SUB operation" do
+				given_time = "01:20:03,999"
+				@options[:operation] = "SUB"
+				@options[:time] = "01:20:01.999"
+
+				sub = SrtShifter::Subtitle.new(@options)
+				sub.convert_time(given_time).must_equal "00:00:02,000"
+			end
+
+      it "must accept time in '-%H:%M:%S.%L' format in SUB operation" do
+        given_time = "01:20:03,999"
+        @options[:operation] = "SUB"
+        @options[:time] = "-01:20:01.999"
+
+        sub = SrtShifter::Subtitle.new(@options)
+        sub.convert_time(given_time).must_equal "00:00:02,000"
+      end
+
 		end
 
 		describe "shift" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: srtshifter
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -27,22 +27,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Shifts STR Subtitles
 email:
 - kimobr@gmail.com