paperclip-ffmpeg 0.12.0 → 0.12.1

data/lib/paperclip_processors/ffmpeg.rb

@@ -169,17 +169,17 @@ module Paperclip
       Paperclip.log("[ffmpeg] #{command}")
       ffmpeg = IO.popen(command)
       ffmpeg.each("\r") do |line|
-        if line =~ /((\d*)\s.?)fps,/
+        if line =~ /(([\d\.]*)\s.?)fps,/
           meta[:fps] = $1.to_i
         end
         # Matching lines like:
         # Video: h264, yuvj420p, 640x480 [PAR 72:72 DAR 4:3], 10301 kb/s, 30 fps, 30 tbr, 600 tbn, 600 tbc
         if line =~ /Video:(.*)/
-          v = $1.to_s.split(',')
-          size = v[2].strip!.split(' ').first
-          meta[:size] = size.to_s
-          meta[:aspect] = size.split('x').first.to_f / size.split('x').last.to_f
-        end
+           v = $1.to_s
+           size = v.match(/\d{3,5}x\d{3,5}/).to_s
+           meta[:size] = size
+           meta[:aspect] = size.split('x').first.to_f / size.split('x').last.to_f
+         end
         # Matching Duration: 00:01:31.66, start: 0.000000, bitrate: 10404 kb/s
         if line =~ /Duration:(\s.?(\d*):(\d*):(\d*\.\d*))/
           meta[:length] = $2.to_s + ":" + $3.to_s + ":" + $4.to_s

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-ffmpeg
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-08 00:00:00.000000000 Z
+date: 2013-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
@@ -54,18 +54,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2200789204440075154
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2200789204440075154
 requirements: []
 rubyforge_project: paperclip-ffmpeg
 rubygems_version: 1.8.23
@@ -73,3 +67,4 @@ signing_key:
 specification_version: 3
 summary: Process your attachments with FFMPEG
 test_files: []
+has_rdoc: