video_dimensions 0.3.0 → 0.3.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 429db8d27c2415bb3be6cfda51417f8ebfdcbc32
+  data.tar.gz: 0df0b2b5f97654db70aca0d055189a02ec4d67db
+SHA512:
+  metadata.gz: 2af0a574cc75c92a49c968ae7435a9e864d230babf91abbdd7ac7ea8904b25c95e8205e7a3278f326485ee752499e05011fa30b36a823f829ad4293326594d2b
+  data.tar.gz: e564548b4fdef9d4b51a5d7edb6d18f8fd7b229f870d4d1921b6b8784f84288a0600fd24b23ecfb5d1397458dbd44d0c5c11dcc53bf86c4b6054e47568a458d0

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Robert Speicher
+Copyright (c) 2012-2015 Robert Speicher
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -47,6 +47,10 @@ One of the supported backends available in the system's `$PATH`.
 
 ## Version History
 
+**0.3.1** (2015-02-23)
+
+* Fix edge case in FFmpeg backend
+
 **0.3.0** (2013-03-25)
 
 * Add `framerate` attribute
@@ -65,6 +69,6 @@ One of the supported backends available in the system's `$PATH`.
 
 ## Copyright
 
-Copyright (c) 2012 Robert Speicher
+Copyright (c) 2012-2015 Robert Speicher
 
 See LICENSE.txt for details.

data/lib/video_dimensions/backends/ffmpeg.rb

@@ -56,12 +56,18 @@ module VideoDimensions
 
       private
 
+      def ffmpeg_output
+        `#{self.class.binary} -i "#{@input}" 2>&1`.strip
+      end
+
       def output
         unless @output
-          @output = `#{self.class.binary} -i "#{@input}" 2>&1`.strip
-
-          # Strip out the Audio codec section(s)
-          @output.gsub!(/.*(Input #0.*)output file must be specified.*/m, '\1')
+          # Get raw output, then:
+          # - Guard against invalid UTF-8 byte sequences
+          # - Strip out the Audio codec section(s)
+          @output = ffmpeg_output
+            .encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '')
+            .gsub(/.*(Input #0.*)output file must be specified.*/m, '\1')
         end
 
         @output

data/lib/video_dimensions/version.rb

@@ -1,3 +1,3 @@
 module VideoDimensions
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'rspec'
+require 'rspec/its'
 require 'video_dimensions'
 
 Dir[File.expand_path("./spec/support/*.rb")].each { |f| require(f) }

data/spec/video_dimensions/backends/ffmpeg_spec.rb

@@ -5,12 +5,12 @@ module VideoDimensions::Backends
     describe ".available?" do
       it "returns true when utility is available" do
         described_class.stubs(:binary).returns('whoami')
-        described_class.should be_available
+        expect(described_class).to be_available
       end
 
       it "returns false when utility is not available" do
         described_class.stubs(:binary).returns('invalidbinary')
-        described_class.should_not be_available
+        expect(described_class).not_to be_available
       end
     end
 
@@ -55,8 +55,6 @@ module VideoDimensions::Backends
         end
 
         its(:dimensions) { should == [1280, 720] }
-        its(:width)      { should == 1280 }
-        its(:height)     { should == 720 }
         its(:bitrate)    { should == 3578 }
         its(:codec)      { should == 'h264' }
         its(:duration)   { should == '00:47:10' }
@@ -87,8 +85,6 @@ module VideoDimensions::Backends
         end
 
         its(:dimensions) { should == [720, 404] }
-        its(:width)      { should == 720 }
-        its(:height)     { should == 404 }
         its(:bitrate)    { should == 1333 }
         its(:codec)      { should == 'h264' }
         its(:duration)   { should == '00:21:08' }
@@ -109,8 +105,6 @@ module VideoDimensions::Backends
         end
 
         its(:dimensions) { should == [624, 352] }
-        its(:width)      { should == 624 }
-        its(:height)     { should == 352 }
         its(:bitrate)    { should == 1109 }
         its(:codec)      { should == 'mpeg4' }
         its(:duration)   { should == '00:21:58' }
@@ -131,8 +125,6 @@ module VideoDimensions::Backends
         end
 
         its(:dimensions) { should == [624, 352] }
-        its(:width)      { should == 624 }
-        its(:height)     { should == 352 }
         its(:bitrate)    { should == 949 }
         its(:codec)      { should == 'mpeg4' }
         its(:duration)   { should == '00:51:33' }
@@ -152,15 +144,58 @@ module VideoDimensions::Backends
           EOF
         end
 
-
         its(:dimensions) { should == [1280, 720] }
-        its(:width)      { should == 1280 }
-        its(:height)     { should == 720 }
         its(:bitrate)    { should == 9728 }
         its(:codec)      { should == 'h264' }
         its(:duration)   { should == '00:10:14' }
         its(:framerate)  { should == 60.00 }
       end
+
+      context "invalid UTF-8 byte sequence sample" do
+        subject { FFmpeg.new('') }
+
+        before do
+          subject.stubs(:ffmpeg_output).returns <<-EOF
+            Input #0, mov,mp4,m4a,3gp,3g2,mj2, from 'foo.mov':
+              Metadata:
+                major_brand     : qt  
+                minor_version   : 537199360
+                compatible_brands: qt  
+                creation_time   : 2014-11-30 18:01:59
+              Duration: 00:10:21.32, start: 0.000000, bitrate: 3589 kb/s
+                Stream #0:0(eng): Video: h264 (Main) (avc1 / 0x31637661), yuv420p(tv, smpte170m/smpte170m/bt709), 720x480, 2049 kb/s, SAR 40:33 DAR 20:11, 29.97 fps, 29.97 tbr, 30k tbn, 60k tbc (default)
+                Metadata:
+                  creation_time   : 2014-11-30 18:02:00
+                  handler_name    : \xCE\xE1\xF0\xE0\xE1\xEE\xF2\xF7\xE8\xEA \xEF\xF1\xE5\xE2\xE4\xEE\xED\xE8\xEC\xEE\xE2 Apple
+                  encoder         : H.264
+                Stream #0:1(eng): Audio: pcm_s16be (twos / 0x736F7774), 48000 Hz, 2 channels, s16, 1536 kb/s (default)
+                Metadata:
+                  creation_time   : 2014-11-30 18:02:06
+                  handler_name    : \xCE\xE1\xF0\xE0\xE1\xEE\xF2\xF7\xE8\xEA \xEF\xF1\xE5\xE2\xE4\xEE\xED\xE8\xEC\xEE\xE2 Apple
+            At least one output file must be specified
+          EOF
+        end
+
+        it 'returns the correct dimensions' do
+          expect(subject.dimensions).to eq [720, 480]
+        end
+
+        it 'returns the correct bitrate' do
+          expect(subject.bitrate).to eq 3589
+        end
+
+        it 'returns the correct codec' do
+          expect(subject.codec).to eq 'h264'
+        end
+
+        it 'returns the correct duration' do
+          expect(subject.duration).to eq '00:10:21'
+        end
+
+        it 'returns the correct framerate' do
+          expect(subject.framerate).to eq 29.97
+        end
+      end
     end
   end
 end

data/spec/video_dimensions/backends/media_info_spec.rb

@@ -5,12 +5,12 @@ module VideoDimensions::Backends
     describe ".available?" do
       it "returns true when utility is available" do
         described_class.stubs(:binary).returns('whoami')
-        described_class.should be_available
+        expect(described_class).to be_available
       end
 
       it "returns false when utility is not available" do
         described_class.stubs(:binary).returns('invalidbinary')
-        described_class.should_not be_available
+        expect(described_class).not_to be_available
       end
     end
 
@@ -91,7 +91,7 @@ module VideoDimensions::Backends
             """.unindent)
         end
 
-        its(:duration)   { should == '01:32:00' }
+        its(:duration) { should == '01:32:00' }
       end
 
       context "duration of at least 1 minute" do
@@ -114,7 +114,7 @@ module VideoDimensions::Backends
             """.unindent)
         end
 
-        its(:duration)   { should == '00:04:10' }
+        its(:duration) { should == '00:04:10' }
       end
     end
   end

data/spec/video_dimensions/backends_spec.rb

@@ -6,11 +6,11 @@ module VideoDimensions
       it "returns the first available backend" do
         Backends::MediaInfo.stubs(:available?).returns(true)
         Backends::FFmpeg.stubs(:available?).returns(false)
-        Backends.first_available.should == Backends::MediaInfo
+        expect(Backends.first_available).to eq Backends::MediaInfo
 
         Backends::MediaInfo.stubs(:available?).returns(false)
         Backends::FFmpeg.stubs(:available?).returns(true)
-        Backends.first_available.should == Backends::FFmpeg
+        expect(Backends.first_available).to eq Backends::FFmpeg
       end
 
       it "raises exception when none are available" do

data/spec/video_dimensions_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe VideoDimensions do
   describe "method" do
     it "instantiates a Backend object" do
-      VideoDimensions(fixture('720p.wmv')).should be_kind_of(VideoDimensions::Backends::Base)
+      expect(VideoDimensions(fixture('720p.wmv'))).to be_kind_of(VideoDimensions::Backends::Base)
     end
   end
 

data/video_dimensions.gemspec

@@ -16,8 +16,9 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_development_dependency 'bundler', '~> 1.0'
+  gem.add_development_dependency 'bundler'
   gem.add_development_dependency 'mocha'
-  gem.add_development_dependency 'rake',    '~> 0.8'
-  gem.add_development_dependency 'rspec',   '~> 2.4'
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rspec', '~> 2.14'
+  gem.add_development_dependency 'rspec-its'
 end

metadata

@@ -1,80 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: video_dimensions
 version: !ruby/object:Gem::Version
-  version: 0.3.0
-  prerelease: 
+  version: 0.3.1
 platform: ruby
 authors:
 - Robert Speicher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.14'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Quick and easy video attributes -- width, height, bitrate, codec, duration,
   framerate.
 email: rspeicher@gmail.com
@@ -82,8 +87,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -107,33 +112,26 @@ files:
 homepage: https://github.com/tsigo/video_dimensions
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2405270881637614437
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2405270881637614437
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Quick and easy video attributes
 test_files:
 - spec/fixtures/1080p.wmv