bulldog 0.0.7 → 0.0.8

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.0.8 2009-11-18
+
+ * Fix invocations of ffmpeg over multiple styles.
+
 == 0.0.7 2009-11-17
 
  * Allow configuration through config/bulldog.yml in Rails.

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/bulldog.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bulldog}
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["George Ogata"]
-  s.date = %q{2009-11-17}
+  s.date = %q{2009-11-18}
   s.description = %q{= Bulldog
 
 Flexible file attachments for active record.

data/lib/bulldog/processor/ffmpeg.rb

@@ -7,7 +7,6 @@ module Bulldog
 
       def initialize(*args)
         super
-        @operation = nil
         @arguments = style_list_map
         @still_frame_callbacks = style_list_map
       end
@@ -15,13 +14,14 @@ module Bulldog
       def process
         return if styles.empty?
         super
-        run_ffmpeg
         run_still_frame_callbacks
       end
 
       def process_style(*args)
+        @operation = nil
         super
-        run_default_operation
+        set_default_operation
+        run_ffmpeg
       end
 
       def use_threads(num_threads)
@@ -37,6 +37,7 @@ module Bulldog
         style_option '-acodec', params[:audio_codec]
         preset_option '-vpre', params[:video_preset]
         preset_option '-apre', params[:audio_preset]
+        preset_option '-spre', params[:subtitle_preset]
         operate '-s', attachment.dimensions(style.name).join('x') if params[:size]
         style_option '-r', params[:frame_rate]
         style_option '-b', params[:video_bit_rate]
@@ -50,7 +51,6 @@ module Bulldog
         style_option '-coder', params[:coder]
         style_option '-v', params[:verbosity]
         style_option '-flags', params[:flags]
-        preset_option '-spre', params[:subtitle_preset]
         style_option '-y', output_file(style.name)
       end
 
@@ -91,7 +91,7 @@ module Bulldog
         @arguments[style].concat args.map(&:to_s)
       end
 
-      def run_default_operation
+      def set_default_operation
         encode if @operation.nil?
       end
 
@@ -152,13 +152,11 @@ module Bulldog
       end
 
       def run_ffmpeg
-        @arguments.each do |style, arguments|
-          command = [self.class.ffmpeg_path]
-          command << '-i' << input_file
-          command.concat(arguments)
-          Bulldog.run(*command) or
-            record.errors.add name, "convert failed (status #$?)"
-        end
+        command = [self.class.ffmpeg_path]
+        command << '-i' << input_file
+        command.concat(@arguments[style])
+        Bulldog.run(*command) or
+          record.errors.add name, "convert failed (status #$?)"
       end
 
       def run_still_frame_callbacks

data/spec/unit/processor/ffmpeg_spec.rb

@@ -29,8 +29,8 @@ describe Processor::Ffmpeg do
     "#{temporary_directory}/video.original.mov"
   end
 
-  def output_video_path
-    "#{temporary_directory}/video.output.mov"
+  def output_video_path(style=:output)
+    "#{temporary_directory}/video.#{style}.mov"
   end
 
   def original_frame_path
@@ -55,16 +55,14 @@ describe Processor::Ffmpeg do
   end
 
   describe "#process" do
-    before do
-      video_style :output
-    end
-
     it "should run ffmpeg" do
+      video_style :output
       Bulldog.expects(:run).once.with(ffmpeg, '-i', original_video_path, '-y', output_video_path)
       process_video
     end
 
     it "should log the command run" do
+      video_style :output
       log_path = "#{temporary_directory}/log"
       open(log_path, 'w') do |file|
         Bulldog.logger = Logger.new(file)
@@ -95,6 +93,14 @@ describe Processor::Ffmpeg do
       process_video{encode}
     end
 
+    it "should run ffmpeg once for each style" do
+      video_style :one
+      video_style :two
+      Bulldog.expects(:run).once.with(ffmpeg, '-i', original_video_path, '-y', output_video_path(:one))
+      Bulldog.expects(:run).once.with(ffmpeg, '-i', original_video_path, '-y', output_video_path(:two))
+      process_video
+    end
+
     it "should allow overriding style attributes from parameters" do
       video_style :output, :video_codec => 'libx264'
       Bulldog.expects(:run).once.with(ffmpeg, '-i', original_video_path, '-vcodec', 'libtheora', '-y', output_video_path)
@@ -216,6 +222,14 @@ describe Processor::Ffmpeg do
   end
 
   describe "encoding style attributes" do
+    it "should add arguments for style attributes to the relevant invocation" do
+      video_style :one, :verbosity => 1
+      video_style :two, :verbosity => 2
+      Bulldog.expects(:run).once.with(ffmpeg, '-i', original_video_path, '-v', '1', '-y', output_video_path(:one))
+      Bulldog.expects(:run).once.with(ffmpeg, '-i', original_video_path, '-v', '2', '-y', output_video_path(:two))
+      process_video{encode}
+    end
+
     describe "video" do
       it "should interpret '30fps' as a frame rate of 30fps" do
         video_style :output, :video => '30fps'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bulldog
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - George Ogata
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-17 00:00:00 -05:00
+date: 2009-11-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency