vtools 0.1.0 → 0.1.1

data/lib/vtools/convert_options.rb

@@ -6,8 +6,9 @@ module VTools
   class ConvertOptions < Hash
     include SharedMethods
 
-    def initialize options = {}
+    def initialize options = {}, additional = {}
       @ignore = [:width, :height, :resolution, :extension, :preserve_aspect, :duration, :postfix]
+      merge! additional
       parse! options
     end
 

data/lib/vtools/thumbnailer.rb

@@ -36,8 +36,10 @@ module VTools
         options = nil
 
         Open3.popen3(exec) do |stdin, stdout, stderr|
+          lines = stdout.readlines.join(" ")
+          VTools.fix_encoding lines
           # save thumb if no error
-          if (error = VTools.fix_encoding(stdout.readlines).join(" ")).empty?
+          if (error = lines).empty?
             thumbs << thumb = {:path => file, :offset => time_offset(seconds)}
 
             Handler.exec :in_thumb, @video, thumb # callbacks

data/lib/vtools/version.rb

@@ -2,5 +2,5 @@
 
 # current version
 module VTools
-  VERSION = [ 0, 1, 0 ]
+  VERSION = [ 0, 1, 1 ]
 end

data/lib/vtools/video.rb

@@ -42,13 +42,13 @@ module VTools
 
     # generate thumbs
     def create_thumbs setup = {}
-      @thumbs_options = ThumbsOptions.new setup.merge({:aspect => calculated_aspect_ratio})
+      @thumbs_options = ThumbsOptions.new setup
       @thumbnailer.run
     end
 
     # convert video
     def convert setup = {}
-      @convert_options = ConvertOptions.new(setup)
+      @convert_options = ConvertOptions.new(setup, {:aspect => calculated_aspect_ratio})
       @converter.run
     end
 

data/spec/thumbnailer_spec.rb

@@ -129,6 +129,22 @@ describe VTools::Thumbnailer do
 
       expect { @thumbnailer.run }.to raise_error VTools::ProcessError, /Thumbnailer error:/
     end
+
+    it "processes invalid encoding" do
+      @options = {:thumb_count => 1, :thumb_start_point => 0}
+      prepare_thumbnailer [
+        File.readlines(
+          "#{File.realpath(File.dirname(__FILE__))}/fixtures/outputs/file_with_iso-8859-1.txt"
+        )[10]
+      ]
+
+      VTools::Handler.should_receive(:exec).with(:thumb_error, video, / Errors: /)
+
+      @thumbnailer.should_not_receive(:time_offset)
+      @thumbnailer.should_receive(:set_point).and_return { |sec| sec }
+
+      expect { @thumbnailer.run }.to raise_error VTools::ProcessError, /Thumbnailer error:/
+    end
   end
 
   context "#set_point" do

data/spec/video_spec.rb

@@ -36,11 +36,10 @@ describe VTools::Video do
 
     it "executes thumbnailer" do
       thumb = double(nil)
-      @video.stub(:calculated_aspect_ratio).and_return { 1.2 }
       @video.instance_variable_set(:@thumbnailer, thumb)
 
       setup = { :thumb => "options" }
-      VTools::ThumbsOptions.should_receive(:new).with(setup.merge(:aspect => 1.2))
+      VTools::ThumbsOptions.should_receive(:new).with(setup)
       thumb.should_receive(:run)
 
       @video.create_thumbs setup
@@ -51,10 +50,11 @@ describe VTools::Video do
 
     it "executes converter" do
       convert = double(nil)
+      @video.stub(:calculated_aspect_ratio).and_return(1.2)
       @video.instance_variable_set(:@converter, convert)
 
       setup = { :convert => "options" }
-      VTools::ConvertOptions.should_receive(:new).with(setup)
+      VTools::ConvertOptions.should_receive(:new).with(setup, {:aspect => 1.2})
       convert.should_receive(:run)
 
       @video.convert setup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vtools
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &82591300 !ruby/object:Gem::Requirement
+  requirement: &82931940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *82591300
+  version_requirements: *82931940
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &82591110 !ruby/object:Gem::Requirement
+  requirement: &82933480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *82591110
+  version_requirements: *82933480
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &82590880 !ruby/object:Gem::Requirement
+  requirement: &82933220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82590880
+  version_requirements: *82933220
 description: FFMPEG & FFMPEGTHUMBNAILER based video processor. Permits to generate
   thumbs and encode/edit video. Can be started as daemon.
 email: v.tofir@gmail.com