paperclip-av-transcoder 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49b96b030b3b02bf3b54a25b1a83941cecf68ae1
-  data.tar.gz: 488f2c30830a67a17f2d99517df1ed7ffafdd25f
+  metadata.gz: ea21b7a277ffa9f666d26ed95b469a6ee4afa7b4
+  data.tar.gz: e6c81e05cbecb7f258bcc02e8cafdddedfdb35e0
 SHA512:
-  metadata.gz: 651815d9159d9b32ee83f9df60bca189b89bd482fce62077a93b12b448a7e1298461e5c87ab78b460f812a480d6b2e61fa18c7804542d7949fe3adc0820fb25e
-  data.tar.gz: 89b6a56b799aade2aab07399dcf46d7c49c81ce67f8dd6b009d50703583bc90fb7123224d1147bca76c4cbe9aa54ff379a499ef5b207d6cb8aae99cd266ac8d1
+  metadata.gz: e4f800b29571e09eebaf76bb888a6b56cdb6b3baf1d41f35db19bcb99061221f9a32dfc5dc8a80f9da21f34534c3d4e452150a668ef54718cf4bb6ce18dbb28f
+  data.tar.gz: 8b960fcca8db70c7436ea4d724bb188754979473cf6bcfd3e3495acbc5ded65ab412d8f0ae25df503a3cefccbc07d22e95d09e34905a4db8af757f17c4168367

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

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

data/lib/paperclip/paperclip_processors/transcoder.rb

@@ -14,10 +14,11 @@ module Paperclip
       @cli              = ::Av.cli
       @meta             = ::Av.cli.identify(@file.path)
       @whiny            = options[:whiny].nil? ? true : options[:whiny]
-      
-      @convert_options  = options[:convert_options]
+
+      @convert_options  = set_convert_options(options)
+
       @format           = options[:format]
-      
+
       @geometry         = options[:geometry]
       unless @geometry.nil?
         modifier = @geometry[0]
@@ -28,14 +29,16 @@ module Paperclip
         @enlarge_only     = @keep_aspect    && modifier == '<'
         @shrink_only      = @keep_aspect    && modifier == '>'
       end
-      
+
       @time             = options[:time].nil? ? 3 : options[:time]
       @auto_rotate      = options[:auto_rotate].nil? ? false : options[:auto_rotate]
       @pad_color        = options[:pad_color].nil? ? "black" : options[:pad_color]
-      
+
+      @convert_options[:output][:s] = format_geometry(@geometry) if @gemotry.present?
+
       attachment.instance_write(:meta, @meta) if attachment
     end
-    
+
     # Performs the transcoding of the +file+ into a thumbnail/video. Returns the Tempfile
     # that contains the new image/video.
     def make
@@ -43,7 +46,7 @@ module Paperclip
       @cli.add_source @file
       dst = Tempfile.new([@basename, @format ? ".#{@format}" : ''])
       dst.binmode
-      
+
       if @meta
         log "Transocding supported file #{@file.path}"
         @cli.add_source(@file.path)
@@ -76,10 +79,21 @@ module Paperclip
       end
       dst
     end
-    
+
     def log message
       Paperclip.log "[transcoder] #{message}"
     end
+
+    def set_convert_options options
+      return options[:convert_options] if options[:convert_options].present?
+      options[:convert_options] = {output: {}}
+      return options[:convert_options]
+    end
+
+    def format_geometry geometry
+      return unless geometry.present?
+      return geometry.gsub(/[#!<>)]/, '')
+    end
   end
 
   class Attachment

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.7.1"
+  spec.add_dependency "av", "~> 0.8.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-av-transcoder
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Omar Abdel-Wahab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -112,16 +112,16 @@ dependencies:
   name: av
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.1
 description: Audio/Video Transcoder for Paperclip using FFMPEG/Avconv
 email:
 - owahab@gmail.com
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Audio/Video Transcoder for Paperclip using FFMPEG/Avconv