paperclip-ffmpeg 0.9.4 → 0.10.0

data/Gemfile

@@ -1,4 +1,10 @@
 source "http://rubygems.org"
 
 # Specify your gem's dependencies in paperclip-ffmpeg.gemspec
-gemspec
+gemspec
+
+group :test do
+  gem 'rake'
+  gem 'bundler'
+  gem 'rspec'
+end

data/README.md

@@ -17,26 +17,32 @@ directory to its path.
 
 In development mode, you might add this line to `config/environments/development.rb)`:
 
-    Paperclip.options[:command_path] = "/usr/local/bin/"
+```ruby
+Paperclip.options[:command_path] = "/usr/local/bin/"
+```
 
 Installation
 ------------
 
 Include the gem in your Gemfile:
 
-    gem "paperclip-ffmpeg"
+```ruby
+gem "paperclip-ffmpeg"
+```
 
 Quick Start
 -----------
 
 In your model:
 
-    class User < ActiveRecord::Base
-      has_attached_file :avatar, :styles => { 
-          :medium => { :geometry => "640x480", :format => 'flv' }
-          :thumb => { :geometry => "100x100#", :format => 'jpg', :time => 10 }
-        }, :processors => [:ffmpeg]
-    end
+```ruby
+class User < ActiveRecord::Base
+  has_attached_file :avatar, :styles => { 
+    :medium => { :geometry => "640x480", :format => 'flv' }
+    :thumb => { :geometry => "100x100#", :format => 'jpg', :time => 10 }
+  }, :processors => [:ffmpeg]
+end
+```
 
 This will produce:
 
@@ -52,15 +58,17 @@ When ffmpeg produces mp4 files, it places the moov atom at the end which makes i
 
 In your model:
 
-    class Lesson < ActiveRecord::Base
-      has_attached_file :video, :styles => {
-          :mobile => {:geometry => "400x300", :format => 'mp4', :streaming => true}
-      }, :processors => [:ffmpeg, :qtfaststart]
-    end
+```ruby
+class Lesson < ActiveRecord::Base
+  has_attached_file :video, :styles => {
+    :mobile => {:geometry => "400x300", :format => 'mp4', :streaming => true}
+  }, :processors => [:ffmpeg, :qtfaststart]
+end
+```
 
 See [danielgtaylor/qtfaststart](https://github.com/danielgtaylor/qtfaststart) for instructions on how to setup qtfaststart.
 
 License
 -------
 
-Licensed under BSD license.
+Licensed under BSD license.

data/Rakefile

@@ -1,2 +1,6 @@
 require 'bundler'
+require 'rspec/core/rake_task'
 Bundler::GemHelper.install_tasks
+
+task :default
+RSpec::Core::RakeTask.new

data/lib/paperclip_processors/ffmpeg.rb

@@ -96,10 +96,13 @@ module Paperclip
               height = (width.to_f / (@meta[:aspect].to_f)).to_i
               # We should add half the delta as a padding offset Y
               pad_y = (target_height.to_f - height.to_f) / 2
+              # There could be options already set
+              @convert_options[:output][:vf][/\A/] = ',' if @convert_options[:output][:vf]
+              @convert_options[:output][:vf] ||= ''
               if pad_y > 0
-                @convert_options[:output][:vf] = "scale=#{width}:-1,pad=#{width.to_i}:#{target_height.to_i}:0:#{pad_y}:#@pad_color"
+                @convert_options[:output][:vf][/\A/] = "scale=#{width}:-1,pad=#{width.to_i}:#{target_height.to_i}:0:#{pad_y}:#@pad_color"
               else
-                @convert_options[:output][:vf] = "scale=#{width}:-1,crop=#{width.to_i}:#{height.to_i}"
+                @convert_options[:output][:vf][/\A/] = "scale=#{width}:-1,crop=#{width.to_i}:#{height.to_i}"
               end
               Ffmpeg.log("Convert Options: #{@convert_options[:output][:s]}") if @whiny
             else
@@ -130,10 +133,11 @@ module Paperclip
 
       Ffmpeg.log("Adding Source") if @whiny
       # Add source
-      parameters << @convert_options[:input].map { |k,v| "-#{k.to_s} #{v} "}
+      # Validations on the values. These could be either nil.
+      parameters << @convert_options[:input].map { |k,v| "-#{k.to_s} #{v} " if !v.nil? && (v.is_a?(Numeric) || !v.empty?) }
       parameters << "-i :source"
-      parameters << @convert_options[:output].map { |k,v| "-#{k.to_s} #{v} "}
-      parameters << ":dest"
+      parameters << @convert_options[:output].map { |k,v| "-#{k.to_s} #{v} " if !v.nil? && (v.is_a?(Numeric) || !v.empty?) }
+      parameters << "-y :dest"
 
       Ffmpeg.log("Building Parameters") if @whiny
       parameters = parameters.flatten.compact.join(" ").strip.squeeze(" ")

data/paperclip-ffmpeg.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "paperclip-ffmpeg"
-  s.version     = '0.9.4'
+  s.version     = '0.10.0'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Omar Abdel-Wahab"]
   s.email       = ["owahab@gmail.com"]
@@ -19,5 +19,4 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   
   s.add_dependency('paperclip', '>=2.5.2')
-  s.add_dependency('paperclip', '>=0.9.2')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-ffmpeg
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-06 00:00:00.000000000 Z
+date: 2013-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
@@ -27,22 +27,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.5.2
-- !ruby/object:Gem::Dependency
-  name: paperclip
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.2
 description: Process your attachments with FFMPEG
 email:
 - owahab@gmail.com
@@ -70,12 +54,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1147482643793522172
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1147482643793522172
 requirements: []
 rubyforge_project: paperclip-ffmpeg
 rubygems_version: 1.8.24