dragonfly-ffmpeg 0.1.2 → 0.1.4

data/lib/dragonfly-ffmpeg/encoder.rb

@@ -66,9 +66,16 @@ module EnMasse
         
         configurable_attr :output_directory, '/tmp'
         
+        # Encodes a Dragonfly::TempObject with the given format.
+        #
+        # An optional profile may be specified by passing a symbol in as the optional profile parameter.
+        # Profiles are defined by the configurable attribute 'encoder_profiles' - by default one profile
+        # is defined for major web formats, :html5.
         def encode(temp_object, format, profile = :html5, options = {})
+          options[:meta] = {} unless options[:meta]
           format = format.to_sym
-          original_filename = File.basename(temp_object.path, '.*')
+
+          original_basename = File.basename(temp_object.path, '.*')
           
           raise UnsupportedFormat, "Format not supported - #{format}" unless supported_format?(format)
           unless profile.is_a?(Profile)
@@ -79,15 +86,15 @@ module EnMasse
           options.merge!(profile.encoding_options)
           
           origin = ::FFMPEG::Movie.new(temp_object.path)
-          tempfile = new_tempfile(format, original_filename)
+          tempfile = new_tempfile(format, original_basename)
           transcoded_file = origin.transcode(tempfile.path, options)
           
           content = ::Dragonfly::TempObject.new(File.new(transcoded_file.path))
           meta = {
-              :name => original_filename,
+              :name => (original_basename + ".#{format}"),
               :format => format,
               :ext => File.extname(transcoded_file.path)
-          }
+          }.merge(options[:meta])
           
           [ content, meta ]
         end

data/lib/dragonfly-ffmpeg/version.rb

@@ -19,7 +19,7 @@
 module EnMasse
   module Dragonfly
     module FFMPEG
-      VERSION = "0.1.2"
+      VERSION = "0.1.4"
     end
   end
 end

metadata

@@ -1,90 +1,126 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: dragonfly-ffmpeg
-version: !ruby/object:Gem::Version
-  version: 0.1.2
+version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 4
+  version: 0.1.4
 platform: ruby
-authors:
+authors: 
 - Jamie Winsor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-09 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: dragonfly
-  requirement: &70152818693000 !ruby/object:Gem::Requirement
+
+date: 2011-11-14 00:00:00 -08:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 9
+        version: "0.9"
   type: :runtime
+  name: dragonfly
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70152818693000
-- !ruby/object:Gem::Dependency
-  name: streamio-ffmpeg
-  requirement: &70152818692500 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 8
+        - 0
         version: 0.8.0
   type: :runtime
+  name: streamio-ffmpeg
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70152818692500
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70152818692040 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
         version: 0.9.2
   type: :runtime
+  name: rake
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70152818692040
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70152818691580 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 6
+        - 0
         version: 2.6.0
   type: :development
+  name: rspec
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70152818691580
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: &70152818691120 !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 4
+        - 2
         version: 0.4.2
   type: :development
+  name: guard-rspec
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70152818691120
-- !ruby/object:Gem::Dependency
-  name: fuubar
-  requirement: &70152818690740 !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70152818690740
-description: FFMPEG libraries for processesing, encoding, analysing and generating
-  videos with Dragonfly
-email:
+  name: fuubar
+  version_requirements: *id006
+description: FFMPEG libraries for processesing, encoding, analysing and generating videos with Dragonfly
+email: 
 - jamie@enmasse.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rspec
 - .travis.yml
@@ -106,31 +142,41 @@ files:
 - spec/dragonfly-ffmpeg/encoder_spec.rb
 - spec/spec_helper.rb
 - spec/support/video_matchers.rb
+has_rdoc: true
 homepage: https://github.com/enmasse-entertainment/dragonfly-ffmpeg
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: dragonfly-ffmpeg
-rubygems_version: 1.8.11
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A video manipulation plugin for Dragonfly
-test_files:
+test_files: 
 - spec/dragonfly-ffmpeg/analyser_spec.rb
 - spec/dragonfly-ffmpeg/encoder_spec.rb
 - spec/spec_helper.rb