dragonfly-ffmpeg 0.0.3 → 0.0.4

data/lib/dragonfly-ffmpeg/config.rb

@@ -28,6 +28,11 @@ module EnMasse
               e.output_directory = opts[:output_directory] if opts.has_key?(:output_directory)
               e.encoder_profiles = opts[:encoder_profiles] if opts.has_key?(:encoder_profiles)
             end
+            
+            c.job :html5 do |format, options|
+              options = options || {}
+              encode(format, :html5, options)
+            end
           end
         end
         

data/lib/dragonfly-ffmpeg/encoder.rb

@@ -29,7 +29,7 @@ module EnMasse
         
         configurable_attr :encoder_profiles, {
           :mp4 => [
-            Profile.new(:default,
+            Profile.new(:html5,
               :video_codec => "libx264",
               :resolution => "1280x720",
               :frame_rate => 29.97,
@@ -41,7 +41,7 @@ module EnMasse
             )
           ],
           :ogv => [
-            Profile.new(:default,
+            Profile.new(:html5,
               :video_codec => "libtheora",
               :resolution => "1280x720",
               :frame_rate => 29.97,
@@ -52,7 +52,7 @@ module EnMasse
             )
           ],
           :webm => [
-            Profile.new(:default,
+            Profile.new(:html5,
               :video_codec => "libvpx",
               :resolution => "1280x720",
               :frame_rate => 29.97,
@@ -67,25 +67,31 @@ module EnMasse
         
         configurable_attr :output_directory, '/tmp'
         
-        def encode(temp_object, format, profile_id = :default, options = {})
-          if profile_id.is_a?(Profile)
-            profile = profile_id
-          else
-            raise UnknownEncoderProfile unless profile_defined?(format, profile_id.to_sym)
-            profile = get_profile(format, profile_id.to_sym)
+        def encode(temp_object, format, profile = :html5, options = {})
+          format = format.to_sym
+          raise UnsupportedFormat, "Format not supported - #{format}" unless supported_format?(format)
+          unless profile.is_a?(Profile)
+            raise UnknownEncoderProfile unless profile_defined?(format, profile.to_sym)
+            profile = get_profile(format, profile.to_sym)
           end
           
           options.merge!(profile.encoding_options)
           
           origin = ::FFMPEG::Movie.new(temp_object.path)
-          new_filename = ::Pathname.new(temp_object.path).sub_ext(".#{format}").basename
-          new_filepath = File.join(output_directory, new_filename)
-          transcoded = origin.transcode(new_filepath, options)
-          ::Dragonfly::TempObject.new(File.read(transcoded.path))
+          tempfile = new_tempfile(format)
+          transcoded = origin.transcode(tempfile.path, options)
+          ::Dragonfly::TempObject.new(File.new(transcoded.path))
         end
-        
+                
         private
         
+        def new_tempfile(ext = nil)
+          tempfile = ext ? Tempfile.new(["dragonfy-video", ".#{ext}"]) : Tempfile.new("dragonfly-video")
+          tempfile.binmode
+          tempfile.close
+          tempfile
+        end
+        
         def profiles(format)
           encoder_profiles[format]
         end
@@ -95,6 +101,10 @@ module EnMasse
           result.first
         end
         
+        def supported_format?(format)
+          encoder_profiles.has_key?(format)
+        end
+        
         def profile_defined?(format, profile_name)
           return false if profiles(format).nil?
           

data/lib/dragonfly-ffmpeg/errors.rb

@@ -25,6 +25,9 @@ module EnMasse
       class EncoderError < DragonflyFFMPEGError
       end
       
+      class UnsupportedFormat < EncoderError
+      end
+      
       class UnknownEncoderProfile < EncoderError
       end
     end

data/lib/dragonfly-ffmpeg/version.rb

@@ -19,7 +19,7 @@
 module EnMasse
   module Dragonfly
     module FFMPEG
-      VERSION = "0.0.3"
+      VERSION = "0.0.4"
     end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: dragonfly-ffmpeg
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Jamie Winsor
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-01 00:00:00 -07:00
+date: 2011-07-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency