carrierwave-video 0.4.0 → 0.5.0

data/README.rdoc

@@ -60,7 +60,10 @@ They will be called with the parameters sent to process.
     }
 
 Logging:
-    logger: :method  #returns object that behaves like Logger
+    logger: :method   # returns object that behaves like Logger
+
+    progress: :method # method that accepts a value of progress e.g. 0.2 (20%)
+                      # from https://github.com/streamio/streamio-ffmpeg#transcoding
 
 Custom:
 streamio-ffmpeg accepts custom params. You may pass these in but keep in mind the watermarking params will be appended if there were any.

data/lib/carrierwave-video/version.rb

@@ -1,5 +1,5 @@
 module Carrierwave
   module Video
-    VERSION = "0.4.0"
+    VERSION = "0.5.0"
   end
 end

data/lib/carrierwave/video.rb

@@ -53,8 +53,16 @@ module CarrierWave
 
       yield(file, @options.format_options) if block_given?
 
+      progress = @options.progress(model)
+
       with_trancoding_callbacks do
-        file.transcode(tmp_path, @options.format_params, @options.encoder_options)
+        if progress
+          file.transcode(tmp_path, @options.format_params, @options.encoder_options) {
+              |value| progress.call(value)
+          }
+        else
+          file.transcode(tmp_path, @options.format_params, @options.encoder_options)
+        end
         File.rename tmp_path, current_path
       end
     end

data/lib/carrierwave/video/ffmpeg_options.rb

@@ -10,6 +10,7 @@ module CarrierWave
         @callbacks = options[:callbacks] || {}
         @logger = options[:logger]
         @unparsed = options
+        @progress = options[:progress]
 
         @format_options = defaults.merge(options)
       end
@@ -22,6 +23,10 @@ module CarrierWave
         model.send(@logger) if @logger.present?
       end
 
+      def progress(model)
+        lambda {|val| model.send(@progress, val)}
+      end
+
       def encoder_options
         { preserve_aspect_ratio: :width }
       end

data/spec/lib/carrierwave_video_spec.rb

@@ -150,6 +150,18 @@ describe CarrierWave::Video do
       end
     end
 
+    context "with progress set" do
+      before do
+        File.should_receive(:rename)
+        movie.stub(:transcode).and_yield(0.0).and_yield(1.0)
+      end
+      it "logs progress" do
+        converter.model.should_receive(:progress).with(0.0)
+        converter.model.should_receive(:progress).with(1.0)
+        converter.encode_video(format, progress: :progress)
+      end
+    end
+
     context "with watermark set" do
       before { File.should_receive(:rename) }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-video
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-04 00:00:00.000000000 Z
+date: 2013-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -109,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2425759314384983104
+      hash: -223199868145326282
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2425759314384983104
+      hash: -223199868145326282
 requirements:
 - ruby, version 1.9 or greater
 - ffmpeg, version 0.11.1 or greater with libx256, libfaac, libtheora, libvorbid, libvpx