subtitle_converter 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 191363dc27d70fda96cacb9df2c059f1e31a47fa
-  data.tar.gz: fb017b62cf4898b54d36929c868c0ee64f11e9f2
+  metadata.gz: c720ac7de84f2d08c402bbcd2cab5eb54b11f867
+  data.tar.gz: cc37ddc74a0c93ba68ee8e327fcdf08ed5c708e5
 SHA512:
-  metadata.gz: 3f623e35c1d7a8cbb8b49be1f19a8f1a663fb3d6bfb54e295776a52bd44777974fc594030ae021de4c0fd579b2e43f39fe9116f24f180bd06a34036e62929f18
-  data.tar.gz: 087ba6ef0a6911ebc94d53fa573e5b4e066743877f03758bf7cfee8dd273f849b836899ddf0c45430f3319b8441774d22ac3a77c2d3fb8ee60832b1afb468978
+  metadata.gz: 0b6d90cf5b7e8e98ca2a80069dae35ef456c3861b50d3f52898c647ad349f4316f9417fe475a466e12dfc3e4e5081022d6ef8442a8784ea598c90fb04640852a
+  data.tar.gz: 9f52f5cca8b54dac0daef7ede6413ea81ccf0c98cdc1c05b8a9433e42047158b93a169ab9b811365ad4372fee53e51b53e4e334aa8995c4964f4ec3505df0cd4

data/filename

@@ -1,2 +1,9 @@
-1
-2
+1
+00:00:03,495 --> 00:00:05,858
+Tonight, The Deep Dive.
+
+
+2
+00:00:05,891 --> 00:00:10,033
+One company's secret weapon for innovation
+

data/lib/subtitle_converter/stl_reader.rb

@@ -15,12 +15,10 @@ class STLReader
 
   def parse_stl_content(content)
 
-    @stl_sub_title_lines = content.lines.select { |line|
-      line =~ /\d{2}(:[0-5]\d){3}\s+,\s+\d{2}(:[0-5]\d){3}\s+,\s+.*/
-    }.map { |line|
-      line.gsub!(", \t", ",\t")
-      line.gsub!("\t ,", "\t,")
-      line.split("\t,\t").map(&:strip).join("#")
+    @stl_sub_title_lines = content.lines.collect { |line|
+      matchdata = line.match(/(\d{2}(?::[0-5]\d){3})\s+,\s+(\d{2}(?::[0-5]\d){3})\s+,\s+(.*)/)
+      matchdata.nil? ? nil : matchdata[1] + "#" + matchdata[2] + "#" + matchdata[3]
     }
+    @stl_sub_title_lines.compact!
   end
 end

data/lib/subtitle_converter/sub_rib_writer.rb

@@ -24,10 +24,6 @@ class SubRibWriter
   end
 
   def to_file(filename)
-    File.open filename, "w" do |file|
-      subrib_sub_title_lines.each do |line|
-        file.puts line
-      end
-    end
+    File.write(filename, subrib_sub_title_lines.join)
   end
 end

data/lib/subtitle_converter/subtitle_convertor.rb

@@ -2,18 +2,31 @@
 
 class SubtitleConvertor
 
-  def from(filename)
+  def initialize
     @reader = STLReader.new
+    @writer = SubRibWriter.new
+  end
+
+  def from(content)
+    @reader.parse_stl_content(content)
+    self
+  end
+
+  def from_file(filename)
     @reader.import_stl_content(filename)
     self
   end
 
-  def to(filename)
-    @writer = SubRibWriter.new
+  def to_file(filename)
     @output_file = filename
     self
   end
 
+  def convert_to_s
+    @writer.parse_stl_lines(@reader.stl_sub_title_lines)
+    @writer.subrib_sub_title_lines.join
+  end
+
   def convert
     @writer.parse_stl_lines(@reader.stl_sub_title_lines)
     @writer.to_file(@output_file)

data/lib/subtitle_converter/version.rb

@@ -1,4 +1,4 @@
 
 module SubtitleConverterVersion
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/assets/bad scrummaster_subtitles_en.txt

@@ -35,7 +35,7 @@ $TapeOffset			=	TRUE
 00:00:51:26	,	00:00:55:22	,	As your ScrumMaster and product owner, these are the stories I need you to commit this sprint
 00:00:59:02 	,	00:01:03:07	,	My computer was stolen during a break in last night, I can't get any work done until I get a new one
 00:01:03:08	,	00:01:04:22	,	Have you heard of paper?
-00:01:04:23    	,	00:01:08:15	,	Adam, I'm gonna need this feature demo this afternoon, you can get it done right? 
+00:01:04:23    	,	00:01:08:15	,	Adam, I'm gonna need this feature demo this afternoon, you can get it done right?
 00:01:08:16	,	00:01:09:16	,	Yeah, no problem
 00:01:09:16	,	00:01:09:20	,	Great
 00:01:09:21	,	00:01:10:18	,	I'm just gonna add this to your work in progress

data/spec/integration_spec.rb

@@ -24,17 +24,17 @@ describe "Trying out different files and output to see if the integration works"
   subject { SubtitleConvertor.new }
 
   it "Can convert the IDEO shopping cart video subtitles from STL to SRT" do
-    subject.from(asset_file("IDEO_subtitles_en.txt")).to(output_file("IDEO_subtitles_en.srt")).convert
+    subject.from_file(asset_file("IDEO_subtitles_en.txt")).to_file(output_file("IDEO_subtitles_en.srt")).convert
     File.read(output_file("IDEO_subtitles_en.srt")).should== File.read(asset_file("IDEO_subtitles_en.srt"))
   end
 
   it "Can convert the Shit ScrumMasters say in English" do
-    subject.from(asset_file("bad scrummaster_subtitles_en.txt")).to(output_file("bad scrummaster_subtitles_en.srt")).convert
+    subject.from_file(asset_file("bad scrummaster_subtitles_en.txt")).to_file(output_file("bad scrummaster_subtitles_en.srt")).convert
     File.read(output_file("bad scrummaster_subtitles_en.srt")).should== File.read(asset_file("bad scrummaster_subtitles_en.srt"))
   end
 
   it "Can convert the Shit ScrumMasters say in Chinese" do
-    subject.from(asset_file("bad scrummaster_subtitles_cn.txt")).to(output_file("bad scrummaster_subtitles_cn.srt")).convert
+    subject.from_file(asset_file("bad scrummaster_subtitles_cn.txt")).to_file(output_file("bad scrummaster_subtitles_cn.srt")).convert
     File.read(output_file("bad scrummaster_subtitles_cn.srt")).should== File.read(asset_file("bad scrummaster_subtitles_cn.srt"))
   end
 

data/spec/stl_reader_spec.rb

@@ -7,19 +7,17 @@ describe STLReader do
 
     let(:stl_reader) { STLReader.new }
 
-    let(:data)    {
-      "00:00:03:15\t,\t00:00:05:26\t,\tTonight, The Deep Dive.
-       00:00:05:27\t,\t00:00:10:01\t,\tOne company's secret weapon for innovation"
-    }
-
-    let(:result)  { [
-      "00:00:03:15#00:00:05:26#Tonight, The Deep Dive.","00:00:05:27#00:00:10:01#One company's secret weapon for innovation"
-    ]}
-
     it "should open STL file and import content to 'srt_sub_title_lines'" do
+      data = "00:00:03:15\t,\t00:00:05:26\t,\tTonight, The Deep Dive.\n00:00:05:27\t,\t00:00:10:01\t,\tOne company's secret weapon for innovation"
       File.stub(:read).with("file_name") { data }
       stl_reader.import_stl_content("file_name")
-      stl_reader.stl_sub_title_lines.should eq(result)
+      stl_reader.stl_sub_title_lines.should eq(["00:00:03:15#00:00:05:26#Tonight, The Deep Dive.","00:00:05:27#00:00:10:01#One company's secret weapon for innovation"])
+    end
+
+    it "should be able to deal with files with spaces and not tabs" do
+      data = "00:00:03:15 , 00:00:05:26 , Tonight, The Deep Dive.\n00:00:05:27 , 00:00:10:01\t,\tOne company's secret weapon for innovation"
+      stl_reader.parse_stl_content(data)
+      stl_reader.stl_sub_title_lines.should eq(["00:00:03:15#00:00:05:26#Tonight, The Deep Dive.","00:00:05:27#00:00:10:01#One company's secret weapon for innovation"])
     end
   end
 end

data/spec/subrib_writer_spec.rb

@@ -43,8 +43,7 @@ describe SubRibWriter do
   describe "write_to_file" do
     it "should create file 'subrib_subtitle.srt' all data in subrib_sub_title_lines in" do
       file = double("filename")
-      File.should_receive(:open).with("filename", "w").and_yield(file)
-      file.should_receive(:puts).at_least(:twice)
+      File.should_receive(:write).with("filename", /.*/)
 
       subrib_writer.parse_stl_lines(stl_sub_title_lines)
       subrib_writer.to_file("filename")

data/spec/subtitle_convertor_spec.rb

@@ -14,13 +14,13 @@ describe "the subtitle convertor" do
     STLReader.should_receive(:new).and_return(@reader)
     @reader.should_receive(:import_stl_content).with("subtitle_stl_file")
 
-    subject.from("subtitle_stl_file")
+    subject.from_file("subtitle_stl_file")
   end
 
   it "Should create a writer when calling to" do
     SubRibWriter.should_receive(:new).and_return(nil)
 
-    subject.to("subtitle_srt_file")
+    subject.to_file("subtitle_srt_file")
   end
 
   it "Should convert from one to another on convert" do
@@ -31,8 +31,8 @@ describe "the subtitle convertor" do
     @writer.should_receive(:parse_stl_lines).with("subtitles")
     @writer.should_receive(:to_file).with("srt_file")
 
-    subject.from("stl_file")
-    subject.to("srt_file")
+    subject.from_file("stl_file")
+    subject.to_file("srt_file")
     subject.convert
   end
 
@@ -40,7 +40,10 @@ describe "the subtitle convertor" do
     STLReader.should_receive(:new).and_return(@reader)
     SubRibWriter.should_receive(:new).and_return(@writer)
 
-    subject.from("stl_file").to("srt_file").convert
+    subject.from_file("stl_file").to_file("srt_file").convert
+  end
 
+  it "Can convert content without writing to files" do
+    subject.from("00:01:08:16	,	00:01:09:16	,	Yeah, no problem").convert_to_s.should== "1\n00:01:08,528 --> 00:01:09,528\nYeah, no problem\n\n"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: subtitle_converter
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Twin Panichsombat