carrierwave-video 0.0.1 → 0.0.2

data/README.rdoc

@@ -44,9 +44,12 @@ 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.
     callbacks: {
       before_transcode: :method
       after_transcode: :method
+      rescue: :method
       ensure: :method
     }
 

data/lib/carrierwave-video/version.rb

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

data/lib/carrierwave/video.rb

@@ -35,6 +35,18 @@ module CarrierWave
           setup_logger(logger_opt)
           block.call
           send_callback(callbacks[:after_transcode])
+        rescue => e
+          send_callback(callbacks[:rescue])
+
+          if logger_opt
+            logger = model.send(logger_opt)
+            logger.error "#{e.class}: #{e.message}"
+            e.backtrace.each do |b|
+              logger.error b
+            end
+          end
+
+          raise e
         ensure
           reset_logger
           send_callback(callbacks[:ensure])

data/spec/lib/carrierwave_video_spec.rb

@@ -62,12 +62,14 @@ describe CarrierWave::Video do
         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(:method3).ordered
+          converter.model.should_not_receive(:method3)
+          converter.model.should_receive(:method4).ordered
 
           converter.encode_video(format, callbacks: {
                                  before_transcode: :method1,
                                  after_transcode: :method2,
-                                 ensure: :method3
+                                 rescue: :method3,
+                                 ensure: :method4
           })
         end
       end
@@ -80,12 +82,14 @@ describe CarrierWave::Video do
           converter.model.should_receive(:method1).ordered
           converter.model.should_not_receive(:method2)
           converter.model.should_receive(:method3).ordered
+          converter.model.should_receive(:method4).ordered
 
           lambda do
             converter.encode_video(format, callbacks: {
                                    before_transcode: :method1,
                                    after_transcode: :method2,
-                                   ensure: :method3
+                                   rescue: :method3,
+                                   ensure: :method4
             })
           end.should raise_exception(e)
         end
@@ -115,6 +119,9 @@ describe CarrierWave::Video do
         before { File.should_receive(:rename).and_raise(e) }
 
         it "logs exception" do
+          logger.should_receive(:error).with("#{e.class}: #{e.message}")
+          logger.should_receive(:error).any_number_of_times #backtrace
+
           lambda do
             converter.encode_video(format, logger: :logger)
           end.should raise_exception(e)

metadata

@@ -1,68 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: carrierwave-video
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
+version: !ruby/object:Gem::Version
+  version: 0.0.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - rheaton
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-11 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  requirement: &70331058547100 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: streamio-ffmpeg
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *70331058547100
+- !ruby/object:Gem::Dependency
+  name: streamio-ffmpeg
+  requirement: &70331058546500 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: carrierwave
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *70331058546500
+- !ruby/object:Gem::Dependency
+  name: carrierwave
+  requirement: &70331058545760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *70331058545760
 description: Transcodes to html5-friendly videos.
-email: 
+email:
 - rachelmheaton@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.rdoc
@@ -73,37 +61,33 @@ files:
 - lib/carrierwave/video/ffmpeg_options.rb
 - spec/lib/carrierwave_video_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements:
 - ruby, version 1.9 or greater
-- ffmpeg, version 0.10 or greater with libx256, libfaac, libtheora, libvorbid, libvpx enabled
+- ffmpeg, version 0.10 or greater with libx256, libfaac, libtheora, libvorbid, libvpx
+  enabled
 rubyforge_project: carrierwave-video
-rubygems_version: 1.3.6
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Carrierwave extension that uses ffmpeg to transcode videos.
-test_files: 
+test_files:
 - spec/lib/carrierwave_video_spec.rb
 - spec/spec_helper.rb