carrierwave-video 0.0.2 → 0.1.0

data/README.rdoc

@@ -22,7 +22,7 @@ Using bundler:
     class Video
       mount_uploader :file, VideoUploader
 
-      def set_success
+      def set_success(format, opts)
         self.success = true
       end
     end
@@ -46,6 +46,8 @@ Watermark:
 Callbacks:
 These are methods defined on the model. They will be run as part of the transcoding process.
 Useful for notating failure and completion.
+They will be called with the parameters sent to process.
+
     callbacks: {
       before_transcode: :method
       after_transcode: :method

data/lib/carrierwave-video/version.rb

@@ -1,5 +1,5 @@
 module Carrierwave
   module Video
-    VERSION = "0.0.2"
+    VERSION = "0.1.0"
   end
 end

data/lib/carrierwave/video.rb

@@ -15,31 +15,30 @@ module CarrierWave
       # move upload to local cache
       cache_stored_file! if !cached?
 
-      options = CarrierWave::Video::FfmpegOptions.new(format, opts)
+      @options = CarrierWave::Video::FfmpegOptions.new(format, opts)
       tmp_path  = File.join( File.dirname(current_path), "tmpfile.#{format}" )
 
 
-      with_trancoding_callbacks(opts) do
+      with_trancoding_callbacks do
         file = ::FFMPEG::Movie.new(current_path)
-        file.transcode(tmp_path, options.format_options, options.encoder_options)
+        file.transcode(tmp_path, @options.format_options, @options.encoder_options)
         File.rename tmp_path, current_path
       end
     end
 
     private
-      def with_trancoding_callbacks(opts, &block)
-        callbacks = opts[:callbacks] || {}
-        logger_opt = opts[:logger]
+      def with_trancoding_callbacks(&block)
+        callbacks = @options.callbacks
+        logger = @options.logger(model)
         begin
           send_callback(callbacks[:before_transcode])
-          setup_logger(logger_opt)
+          setup_logger
           block.call
           send_callback(callbacks[:after_transcode])
         rescue => e
           send_callback(callbacks[:rescue])
 
-          if logger_opt
-            logger = model.send(logger_opt)
+          if logger
             logger.error "#{e.class}: #{e.message}"
             e.backtrace.each do |b|
               logger.error b
@@ -54,13 +53,13 @@ module CarrierWave
       end
 
       def send_callback(callback)
-        model.send(callback) if callback.present?
+        model.send(callback, @options.format, @options.raw) if callback.present?
       end
 
-      def setup_logger(opt)
-        return unless opt.present?
+      def setup_logger
+        return unless @options.logger(model).present?
         @ffmpeg_logger = ::FFMPEG.logger
-        ::FFMPEG.logger = model.send(opt)
+        ::FFMPEG.logger = @options.logger(model)
       end
 
       def reset_logger

data/lib/carrierwave/video/ffmpeg_options.rb

@@ -2,12 +2,16 @@ module CarrierWave
   module Video
     class FfmpegOptions
       attr_reader :watermark_path, :watermark_position, :watermark_pixels,
-        :format, :resolution
+        :format, :resolution, :callbacks
 
       def initialize(format, options)
         @format = format.to_s
         @watermark = options[:watermark].present?
         @resolution = options[:resolution] || "640x360"
+        @callbacks = options[:callbacks] || {}
+        @logger = options[:logger]
+        @unparsed = options
+
         if watermark?
           @watermark_path = options[:watermark][:path]
           @watermark_position = options[:watermark][:position].to_s || :bottom_right
@@ -15,6 +19,14 @@ module CarrierWave
         end
       end
 
+      def raw
+        @unparsed
+      end
+
+      def logger(model)
+        model.send(@logger) if @logger.present?
+      end
+
       def encoder_options
         {preserve_aspect_ratio: :width}
       end

data/spec/lib/carrierwave_video_spec.rb

@@ -55,22 +55,26 @@ describe CarrierWave::Video do
 
     context "callbacks set" do
       before { movie.should_receive(:transcode) }
+      let(:opts) do
+        { callbacks: {
+             before_transcode: :method1,
+             after_transcode: :method2,
+             rescue: :method3,
+             ensure: :method4
+          }
+        }
+      end
 
       context "no exceptions raised" do
         before {  File.should_receive(:rename) }
 
         it "calls before_transcode, after_transcode, and ensure" do
-          converter.model.should_receive(:method1).ordered
-          converter.model.should_receive(:method2).ordered
+          converter.model.should_receive(:method1).with(format, opts).ordered
+          converter.model.should_receive(:method2).with(format, opts).ordered
           converter.model.should_not_receive(:method3)
-          converter.model.should_receive(:method4).ordered
-
-          converter.encode_video(format, callbacks: {
-                                 before_transcode: :method1,
-                                 after_transcode: :method2,
-                                 rescue: :method3,
-                                 ensure: :method4
-          })
+          converter.model.should_receive(:method4).with(format, opts).ordered
+
+          converter.encode_video(format, opts)
         end
       end
 
@@ -78,19 +82,15 @@ describe CarrierWave::Video do
         let(:e) { StandardError.new("test error") }
         before { File.should_receive(:rename).and_raise(e) }
 
+
         it "calls before_transcode and ensure" do
-          converter.model.should_receive(:method1).ordered
+          converter.model.should_receive(:method1).with(format, opts).ordered
           converter.model.should_not_receive(:method2)
-          converter.model.should_receive(:method3).ordered
-          converter.model.should_receive(:method4).ordered
+          converter.model.should_receive(:method3).with(format, opts).ordered
+          converter.model.should_receive(:method4).with(format, opts).ordered
 
           lambda do
-            converter.encode_video(format, callbacks: {
-                                   before_transcode: :method1,
-                                   after_transcode: :method2,
-                                   rescue: :method3,
-                                   ensure: :method4
-            })
+            converter.encode_video(format, opts)
           end.should raise_exception(e)
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-video
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70331058547100 !ruby/object:Gem::Requirement
+  requirement: &70165811358460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70331058547100
+  version_requirements: *70165811358460
 - !ruby/object:Gem::Dependency
   name: streamio-ffmpeg
-  requirement: &70331058546500 !ruby/object:Gem::Requirement
+  requirement: &70165811357860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70331058546500
+  version_requirements: *70165811357860
 - !ruby/object:Gem::Dependency
   name: carrierwave
-  requirement: &70331058545760 !ruby/object:Gem::Requirement
+  requirement: &70165811357160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70331058545760
+  version_requirements: *70165811357160
 description: Transcodes to html5-friendly videos.
 email:
 - rachelmheaton@gmail.com