ffprober 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcb2bb4dcd2ba2306fd3f32b5b03095dfa3bc8d5
-  data.tar.gz: 5441108c41049b6104757992599a96825b2fb2b6
+  metadata.gz: b29847084d8dbc8e10c2c4193b5957a6fcf08af9
+  data.tar.gz: 9fe8c79d5a88d4c4a5cf740e98ba55081b9c83ac
 SHA512:
-  metadata.gz: 566b46750ba822e42be96b09c3b0a22d8652230fd6d3ba80c174a11e39294ff2086712d2df17388402b4fb9baa0c596a5030a6bf1496021f7712b44b86d2e2b0
-  data.tar.gz: c0319d56f55b03cbd6817f77ec43c44a6ae7b9836eb1f6d65fd45cb1034ddb5fe8e6cfc8f8d70481d8dce8da04b9c08f876d1e85f7d50cc30e93fb12ff21b66a
+  metadata.gz: 72b340b1bbf4e915a1bcfb4dc6d6c10d99aefd74054e2f4a789607db5e8492950e9d2712d6739963c9e4583ac440e5c21c16a44d666f6e500fc227bd195cfbba
+  data.tar.gz: 421320686370ba7698fd688312fed908a3d1f10c63be8abcb734de04561bcfef42682dd564299e29e7c69041984cf5514e44ca04f92102f57dca06d0d55f3b4f

data/README.md

@@ -31,6 +31,8 @@ tested with ffprobe version 0.9, 0.10, 0.11, 1.0, 1.1 and 1.2
 
 according to [ffmpeg changelog](http://git.videolan.org/?p=ffmpeg.git;a=blob_plain;f=Changelog) json output was added in version 0.9
 
+[ffprobe documentation](http://www.ffmpeg.org/ffprobe.html)
+
 ## Supported Rubies
 
 Ffprober is tested under 1.9.3, 2.0, JRuby (1.9mode) and Rubinius (1.9mode) and ruby-head.

data/lib/ffprober/ffprobe_version.rb

@@ -3,7 +3,7 @@ module Ffprober
     @@version_regex = /^ffprobe version (\d+)\.?(\d+)\.?(|\d+)$/
 
     MIN_VERSION = Gem::Version.new("0.9.0")
-    MAX_VERSION = Gem::Version.new("1.2.0")
+    MAX_VERSION = Gem::Version.new("1.2.1")
 
     def self.valid?
       MIN_VERSION <= parsed_version && parsed_version <= MAX_VERSION

data/lib/ffprober/parser.rb

@@ -26,7 +26,11 @@ module Ffprober
     end
 
     def parsed_json
-      @parsed_json ||= JSON.parse(@json_to_parse, symbolize_names: true)
+      @parsed_json ||=  begin
+                          json = JSON.parse(@json_to_parse, symbolize_names: true)
+                          raise InvalidInputFileError.new("Invalid input file") if json.empty?
+                          json
+                        end
     end
 
     def format

data/lib/ffprober/version.rb

@@ -1,3 +1,3 @@
 module Ffprober
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/lib/ffprober.rb

@@ -20,4 +20,6 @@ module Ffprober
       path && File.expand_path(name, path)
     end
   end
+
+  class InvalidInputFileError < ::StandardError; end
 end

data/spec/ffprober_spec.rb

@@ -22,6 +22,32 @@ describe Ffprober do
     end
   end
 
+  describe "from invalid file", if: Ffprober::FfprobeVersion.valid? do
+    before :each do
+      @ffprobe = Ffprober::Parser.from_file('spec/assets/empty_file')
+    end
+
+    describe "format" do
+      it "should determine the correct filename" do
+        expect do
+          @ffprobe.format.filename.should eq("spec/assets/empty_file")
+        end.to raise_error
+      end
+
+      it "should find the correct size" do
+        expect do
+          @ffprobe.format.size.should eq("130694")
+        end.to raise_error
+      end
+
+      it "should find the correct bit_rate" do
+        expect do
+          @ffprobe.format.bit_rate.should eq("502669")
+        end.to raise_error
+      end
+    end
+  end
+
   describe "if no ffprobe is found" do
     it "should raise a exception" do
       Ffprober.stub(:path).and_return("nonexistant")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffprober
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - beanieboi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-15 00:00:00.000000000 Z
+date: 2013-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -64,6 +64,7 @@ files:
 - lib/ffprober/video_stream.rb
 - spec/assets/301-extracting_a_ruby_gem.json
 - spec/assets/301-extracting_a_ruby_gem.m4v
+- spec/assets/empty_file
 - spec/ffprober/ffprobe_version_spec.rb
 - spec/ffprober_spec.rb
 - spec/spec_helper.rb
@@ -94,6 +95,7 @@ summary: a Ruby wrapper for ffprobe (part of ffmpeg)
 test_files:
 - spec/assets/301-extracting_a_ruby_gem.json
 - spec/assets/301-extracting_a_ruby_gem.m4v
+- spec/assets/empty_file
 - spec/ffprober/ffprobe_version_spec.rb
 - spec/ffprober_spec.rb
 - spec/spec_helper.rb