paperclip-av-transcoder 0.6.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 433c06e0961326b0e9567a95d80b4f873ca005b6
-  data.tar.gz: 8a2ffb774e893e9dd1228a36f0055492d0e2d056
+  metadata.gz: 49b96b030b3b02bf3b54a25b1a83941cecf68ae1
+  data.tar.gz: 488f2c30830a67a17f2d99517df1ed7ffafdd25f
 SHA512:
-  metadata.gz: 6d71cbd417c1b572b492deddf43bfcb207455080fee9e036a256c112f0a0228a4df88beebf9dbaef41cca08ad0cc7faf3d4cfb54c011b8e494c93490f3954d70
-  data.tar.gz: e5fd3fb58f3fa0df7973403b3759f421f26ca75ffe3b777f930111ede5f4b84830d39ed46e8c42971a9c29a415fad54902bb15fbbf97f856ea46f53f1539e5bc
+  metadata.gz: 651815d9159d9b32ee83f9df60bca189b89bd482fce62077a93b12b448a7e1298461e5c87ab78b460f812a480d6b2e61fa18c7804542d7949fe3adc0820fb25e
+  data.tar.gz: 89b6a56b799aade2aab07399dcf46d7c49c81ce67f8dd6b009d50703583bc90fb7123224d1147bca76c4cbe9aa54ff379a499ef5b207d6cb8aae99cd266ac8d1

data/README.md

@@ -34,7 +34,7 @@ In your model:
       has_attached_file :avatar, :styles => {
         :medium => { :geometry => "640x480", :format => 'flv' },
         :thumb => { :geometry => "100x100#", :format => 'jpg', :time => 10 }
-      }, :processors => [:ffmpeg]
+      }, :processors => [:transcoder]
     end
 
 This will produce:
@@ -44,6 +44,13 @@ This will produce:
 
 You may optionally add `<attachment>_meta` to your model and it will get populated with information about the processed video.
 
+The geometry parameters are:
+
+1. '!' - Keep the same aspect of the image/video, but with the passed dimesion.
+2. '#' - Pad the image/video.
+3. '<' - Enlarge the image/video.
+4. '>' - Shrink the image/video.
+
 ## Contributing
 
 1. Fork it ( https://github.com/ruby-av/paperclip-av-transcoder/fork )

data/lib/paperclip/av/transcoder/version.rb

@@ -1,7 +1,7 @@
 module Paperclip
   module Av
     module Transcoder
-      VERSION = "0.6.0"
+      VERSION = "0.6.2"
     end
   end
 end

data/lib/paperclip/paperclip_processors/transcoder.rb

@@ -11,6 +11,7 @@ module Paperclip
       @file             = file
       @current_format   = File.extname(@file.path)
       @basename         = File.basename(@file.path, @current_format)
+      @cli              = ::Av.cli
       @meta             = ::Av.cli.identify(@file.path)
       @whiny            = options[:whiny].nil? ? true : options[:whiny]
       
@@ -38,39 +39,42 @@ module Paperclip
     # Performs the transcoding of the +file+ into a thumbnail/video. Returns the Tempfile
     # that contains the new image/video.
     def make
-      ::Av.cli.add_source @file
+      ::Av.logger = Paperclip.logger
+      @cli.add_source @file
       dst = Tempfile.new([@basename, @format ? ".#{@format}" : ''])
       dst.binmode
       
       if @meta
         log "Transocding supported file #{@file.path}"
-        cli = ::Av.cli(quite: true)
-        cli.add_source(@file.path)
-        cli.add_destination(dst.path)
-        cli.reset_input_filters
+        @cli.add_source(@file.path)
+        @cli.add_destination(dst.path)
+        @cli.reset_input_filters
         if @convert_options.present?
           if @convert_options[:input]
             @convert_options[:input].each do |h|
-              cli.add_input_param h
+              @cli.add_input_param h
             end
           end
           if @convert_options[:output]
             @convert_options[:output].each do |h|
-              cli.add_output_param h
+              @cli.add_output_param h
             end
           end
         end
 
         begin
-          cli.run
-          log "Successfully transcoded #{@base} to #{dst}"
-          return dst
+          @cli.run
+          log "Successfully transcoded #{@basename} to #{dst}"
         rescue Cocaine::ExitStatusError => e
           raise Paperclip::Error, "error while transcoding #{@basename}: #{e}" if @whiny
         end
+      else
+        log "Unsupported file #{@file.path}"
+        # If the file is not supported, just return it
+        dst << @file.read
+        dst.close
       end
-      # If the file is not supported, just return it
-      @file
+      dst
     end
     
     def log message

data/paperclip-av-transcoder.gemspec

@@ -26,5 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "coveralls"
   
   spec.add_dependency "paperclip", ">=2.5.2"
-  spec.add_dependency "av", ">= 0.4.0"
+  spec.add_dependency "av", ">= 0.7.1"
 end

data/spec/transcoder/transcoder_spec.rb

@@ -7,7 +7,7 @@ describe Paperclip::Transcoder do
   let(:destination) { Pathname.new("#{Dir.tmpdir}/transcoder/") }
   
   describe "supported formats" do
-    let(:subject) { Paperclip::Chainer.new(supported) }
+    let(:subject) { Paperclip::Transcoder.new(supported) }
     let(:document) { Document.create(video: Rack::Test::UploadedFile.new(supported, 'video/mp4')) }
     
     describe ".transcode" do
@@ -16,7 +16,7 @@ describe Paperclip::Transcoder do
   end
   
   describe "unsupported formats" do
-    let(:subject) { Paperclip::Chainer.new(unsupported) }
+    let(:subject) { Paperclip::Transcoder.new(unsupported) }
     let(:document) { Document.create(image: Rack::Test::UploadedFile.new(unsupported, 'image/png')) }
     describe ".transcode" do
       it { expect(File.exists?(document.image.path(:small))).to eq true }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-av-transcoder
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.2
 platform: ruby
 authors:
 - Omar Abdel-Wahab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-13 00:00:00.000000000 Z
+date: 2014-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.7.1
 description: Audio/Video Transcoder for Paperclip using FFMPEG/Avconv
 email:
 - owahab@gmail.com