carrierwave-video 0.5.3 → 0.5.4

data/README.rdoc

@@ -65,6 +65,9 @@ Logging:
     progress: :method # method that accepts a value of progress e.g. 0.2 (20%)
                       # from https://github.com/streamio/streamio-ffmpeg#transcoding
 
+progress can take 1 or 3 arguments. With three arguments, it receives format, format_options, and the value of progress.
+e.g. `def progress(format, format_options, progress)` would receive something like `progress(:mp4, {}, 0.2)`
+
 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.
   custom: '-b 1500k'

data/lib/carrierwave-video/version.rb

@@ -1,5 +1,5 @@
 module Carrierwave
   module Video
-    VERSION = "0.5.3"
+    VERSION = "0.5.4"
   end
 end

data/lib/carrierwave/video/ffmpeg_options.rb

@@ -24,7 +24,10 @@ module CarrierWave
       end
 
       def progress(model)
-        lambda {|val| model.send(@progress, val)} if @progress
+        if @progress
+          args = model.method(@progress).arity == 3 ? [@format, @format_options] : []
+          lambda { |val| model.send(@progress, *(args + [val])) }
+        end
       end
 
       def encoder_options

data/spec/lib/carrierwave_video_spec.rb

@@ -155,11 +155,20 @@ describe CarrierWave::Video do
         File.should_receive(:rename)
         movie.stub(:transcode).and_yield(0.0).and_yield(1.0)
       end
+      let(:opts) { {progress: :progress} }
+
       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
+
+      it "logs progress with format and options" do
+        converter.model.stub_chain(:method, :arity).and_return(3)
+        converter.model.should_receive(:progress).with(format, hash_including(opts), 0.0)
+        converter.model.should_receive(:progress).with(format, hash_including(opts), 1.0)
+        converter.encode_video(format, opts)
+      end
     end
 
     context "with watermark set" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-video
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-02 00:00:00.000000000 Z
+date: 2013-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -111,7 +111,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3465872708842603125
+      hash: -2491521969780735956
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3465872708842603125
+      hash: -2491521969780735956
 requirements:
 - ruby, version 1.9 or greater
 - ffmpeg, version 0.11.1 or greater with libx256, libfaac, libtheora, libvorbid, libvpx