paperclip-ffmpeg 0.9.1 → 0.9.3

data/Gemfile

@@ -1,4 +1,5 @@
 source "http://rubygems.org"
 
 # Specify your gem's dependencies in paperclip-ffmpeg.gemspec
-gemspec
+gemspec
+rake

data/lib/paperclip-ffmpeg.rb

@@ -1,3 +1,3 @@
 require "paperclip"
-require "processors/ffmpeg"
-require "processors/qtfaststart"
+require "paperclip_processors/ffmpeg"
+require "paperclip_processors/qtfaststart"

data/lib/{processors → paperclip_processors}/ffmpeg.rb

@@ -40,13 +40,19 @@ module Paperclip
     # Performs the transcoding of the +file+ into a thumbnail/video. Returns the Tempfile
     # that contains the new image/video.
     def make
+      Ffmpeg.log("Making...") if @whiny
       src = @file
+      Ffmpeg.log("Building Destination File: '#{@basename}' + '#{@format}'") if @whiny
       dst = Tempfile.new([@basename, @format ? ".#{@format}" : ''])
+      Ffmpeg.log("Destination File Built") if @whiny
       dst.binmode
       
       parameters = []
+
+      Ffmpeg.log("Adding Geometry") if @whiny
       # Add geometry
       if @geometry
+        Ffmpeg.log("Extracting Target Dimensions") if @whiny
         # Extract target dimensions
         if @geometry =~ /(\d*)x(\d*)/
           target_width = $1
@@ -54,30 +60,37 @@ module Paperclip
         end
         # Only calculate target dimensions if we have current dimensions
         unless @meta[:size].nil?
-          current_geometry = @meta[:size].split('x')
+          Ffmpeg.log("Target Size is Available") if @whiny
+          current_width, current_height = @meta[:size].split('x')
           # Current width and height
-          current_width = current_geometry[0]
-          current_height = current_geometry[1]
           if @keep_aspect
+            Ffmpeg.log("Keeping Aspect Ratio") if @whiny
             if @enlarge_only
+              Ffmpeg.log("Enlarge Only") if @whiny
               if current_width.to_i < target_width.to_i
                 # Keep aspect ratio
                 width = target_width.to_i
                 height = (width.to_f / (@meta[:aspect].to_f)).to_i
                 @convert_options[:output][:s] = "#{width.to_i/2*2}x#{height.to_i/2*2}"
+                Ffmpeg.log("Convert Options: #{@convert_options[:output][:s]}") if @whiny
               else
-                return nil
+                Ffmpeg.log("Source is Larger than Destination, Doing Nothing") if @whiny
+                #return nil
               end
             elsif @shrink_only
+              Ffmpeg.log("Shrink Only") if @whiny
               if current_width.to_i > target_width.to_i
                 # Keep aspect ratio
                 width = target_width.to_i
                 height = (width.to_f / (@meta[:aspect].to_f)).to_i
                 @convert_options[:output][:s] = "#{width.to_i/2*2}x#{height.to_i/2*2}"
+                Ffmpeg.log("Convert Options: #{@convert_options[:output][:s]}") if @whiny
               else
-                return nil
+                Ffmpeg.log("Source is Smaller than Destination, Doing Nothing") if @whiny
+                #return nil
               end
             elsif @pad_only
+              Ffmpeg.log("Pad Only") if @whiny
               # Keep aspect ratio
               width = target_width.to_i
               height = (width.to_f / (@meta[:aspect].to_f)).to_i
@@ -88,18 +101,25 @@ module Paperclip
               else
                 @convert_options[:output][:vf] = "scale=#{width}:-1,crop=#{width.to_i}:#{height.to_i}"
               end
+              Ffmpeg.log("Convert Options: #{@convert_options[:output][:s]}") if @whiny
             else
+              Ffmpeg.log("Resize") if @whiny
               # Keep aspect ratio
               width = target_width.to_i
               height = (width.to_f / (@meta[:aspect].to_f)).to_i
               @convert_options[:output][:s] = "#{width.to_i/2*2}x#{height.to_i/2*2}"
+              Ffmpeg.log("Convert Options: #{@convert_options[:output][:s]}") if @whiny
             end
           else
+            Ffmpeg.log("Not Keeping Aspect Ratio") if @whiny
             # Do not keep aspect ratio
             @convert_options[:output][:s] = "#{target_width.to_i/2*2}x#{target_height.to_i/2*2}"
+            Ffmpeg.log("Convert Options: #{@convert_options[:output][:s]}") if @whiny
           end
         end
       end
+
+      Ffmpeg.log("Adding Format") if @whiny
       # Add format
       case @format
       when 'jpg', 'jpeg', 'png', 'gif' # Images
@@ -107,20 +127,22 @@ module Paperclip
         @convert_options[:output][:vframes] = 1
         @convert_options[:output][:f] = 'image2'
       end
-      
+
+      Ffmpeg.log("Adding Source") if @whiny
       # Add source
       parameters << @convert_options[:input].map { |k,v| "-#{k.to_s} #{v} "}
       parameters << "-i :source"
       parameters << @convert_options[:output].map { |k,v| "-#{k.to_s} #{v} "}
       parameters << ":dest"
 
+      Ffmpeg.log("Building Parameters") if @whiny
       parameters = parameters.flatten.compact.join(" ").strip.squeeze(" ")
-      
-      Paperclip.log("[ffmpeg] #{parameters}")
+
+      Ffmpeg.log(parameters)
       begin
         success = Paperclip.run("ffmpeg", parameters, :source => "#{File.expand_path(src.path)}", :dest => File.expand_path(dst.path))
       rescue Cocaine::ExitStatusError => e
-        raise PaperclipError, "error while processing video for #{@basename}: #{e}" if @whiny
+        raise Paperclip::Error, "error while processing video for #{@basename}: #{e}" if @whiny
       end
 
       dst
@@ -129,7 +151,7 @@ module Paperclip
     def identify
       meta = {}
       command = "ffmpeg -i \"#{File.expand_path(@file.path)}\" 2>&1"
-      Paperclip.log(command)
+      Paperclip.log("[ffmpeg] #{command}")
       ffmpeg = IO.popen(command)
       ffmpeg.each("\r") do |line|
         if line =~ /((\d*)\s.?)fps,/
@@ -148,8 +170,14 @@ module Paperclip
           meta[:length] = $2.to_s + ":" + $3.to_s + ":" + $4.to_s
         end
       end
+      Paperclip.log("[ffmpeg] Command Success") if @whiny
       meta
     end
+
+
+    def self.log message
+      Paperclip.log "[ffmpeg] #{message}"
+    end
   end
   
   class Attachment

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.1'
+  s.version     = '0.9.3'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Omar Abdel-Wahab"]
   s.email       = ["owahab@gmail.com"]

metadata

@@ -1,72 +1,69 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: paperclip-ffmpeg
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.9.3
   prerelease: 
-  version: 0.9.1
 platform: ruby
-authors: 
+authors:
 - Omar Abdel-Wahab
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-08-15 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-11-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: paperclip
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.5.2
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.5.2
 description: Process your attachments with FFMPEG
-email: 
+email:
 - owahab@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.md
 - Rakefile
 - lib/paperclip-ffmpeg.rb
-- lib/processors/ffmpeg.rb
-- lib/processors/qtfaststart.rb
+- lib/paperclip_processors/ffmpeg.rb
+- lib/paperclip_processors/qtfaststart.rb
 - paperclip-ffmpeg.gemspec
 homepage: http://github.com/owahab/paperclip-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
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: paperclip-ffmpeg
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Process your attachments with FFMPEG
 test_files: []
-