ffprober 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a48f3dc5c3a59c2b99241bdd3be2cef2f1317f4
-  data.tar.gz: dc67ddb0cb794eaf341d7a422a4aa9882218f149
+  metadata.gz: 919d1151ce185635625a4202ef066333408afc39
+  data.tar.gz: 0fc63f7d15e762393ce4a858eca5370ad8bd9084
 SHA512:
-  metadata.gz: 88ba09c9ecf3e7da3cf006cb38e4470f883f703e92b9a71e8be1127de3072b43a07906bb1e4edb8b19038b8f485e434d2b4a8cb97a5a03a88db1cfffed4ae9dc
-  data.tar.gz: dab0af154e1b400ff62e83012b35f2df135c6fff8e2ffd5d7926df4babd8a461afc990a01b2b251233bd5f6d0ffd5d65efb63e713f426389e76495d0b63282d0
+  metadata.gz: 62cebe986fd0545a230c2c5ed1701f9dc155cb18c4c12fab95db66eb847a55c682641243d3edfacffde556cad12bb0ea1dedfec4aa94ac854e7e28c89da27dc3
+  data.tar.gz: f6b348f46fd23c2c385fd2d3813c7d17caad9b439a880b443023ba1a464ef1bf0228b595e9a838db9fa8684da1ea090811d0a6ade6719b74688ee18cdee3c5ee

data/ffprober.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{a Ruby wrapper for ffprobe (part of ffmpeg)}
   gem.homepage      = "https://github.com/beanieboi/ffprober"
 
-  gem.required_ruby_version     = ">= 1.9.2"
+  gem.required_ruby_version     = ">= 1.9.3"
   gem.rubyforge_project         = "ffprober"
 
   gem.licenses      = ['MIT']

data/lib/ffprober.rb

@@ -4,7 +4,20 @@ require "ffprober/format"
 require "ffprober/stream"
 require "ffprober/audio_stream"
 require "ffprober/video_stream"
+require "ffprober/ffprobe_version"
 require "json"
 
 module Ffprober
+  def self.path
+    name = 'ffprobe'
+
+    if File.executable? name
+      cmd
+    else
+      path = ENV['PATH'].split(File::PATH_SEPARATOR).find { |path|
+        File.executable? File.join(path, name)
+      }
+      path && File.expand_path(name, path)
+    end
+  end
 end

data/lib/ffprober/ffprobe_version.rb

@@ -0,0 +1,21 @@
+module Ffprober
+  class FfprobeVersion
+    @@version_regex = /^ffprobe version (\d+)\.?(\d+)\.?(|\d+)$/
+
+    MIN_VERSION = Gem::Version.new("0.9.0")
+    MAX_VERSION = Gem::Version.new("1.2.0")
+
+    def self.valid?
+      MIN_VERSION <= parsed_version && parsed_version <= MAX_VERSION
+    end
+
+    def self.parsed_version
+      version = `#{Ffprober.path} -version`.match(@@version_regex)
+      raise Errno::ENOENT  if version.nil?
+      major, minor, patch = version[1].to_i, version[2].to_i, version[3].to_i
+      Gem::Version.new([major, minor, patch].join("."))
+    rescue Errno::ENOENT => e
+      Gem::Version.new("0.0.0")
+    end
+  end
+end

data/lib/ffprober/parser.rb

@@ -1,16 +1,15 @@
 module Ffprober
   class Parser
     @@options = '-v quiet -print_format json -show_format -show_streams'
-    @@version_regex = /^ffprobe version (\d+)\.?(\d+)\.?(|\d+)$/
 
     class << self
       def from_file(file_to_parse)
-        unless ffprobe_version_valid?
+        unless FfprobeVersion.valid?
           raise ArgumentError.new("no or unsupported ffprobe version found.\
-                                  (version: #{ffprobe_version})")
+                                  (version: #{FfprobeVersion.parsed_version.to_s})")
         end
 
-        json_output = `#{ffprobe_path} #{@@options} #{file_to_parse}`
+        json_output = `#{Ffprober.path} #{@@options} #{file_to_parse}`
         from_json(json_output)
       end
 
@@ -19,70 +18,35 @@ module Ffprober
         parser.parse(json_to_parse)
         parser
       end
-
-      def ffprobe_version_valid?
-        valid_versions.include?(ffprobe_version)
-      end
-
-      def ffprobe_version
-        version = `#{ffprobe_path} -version`.match(@@version_regex)
-        raise Errno::ENOENT  if version.nil?
-        major, minor, patch = version[1].to_i, version[2].to_i, version[3].to_i
-        {major: major, minor: minor, patch: patch}
-      rescue Errno::ENOENT => e
-        {major: 0, minor: 0, patch: 0}
-      end
-
-      def valid_versions
-        [
-          {major: 0, minor: 9, patch: 0},
-          {major: 0, minor: 10, patch: 0},
-          {major: 0, minor: 11, patch: 0},
-          {major: 1, minor: 0, patch: 0},
-          {major: 1, minor: 0, patch: 1},
-          {major: 1, minor: 1, patch: 0},
-          {major: 1, minor: 1, patch: 1},
-          {major: 1, minor: 1, patch: 2},
-          {major: 1, minor: 1, patch: 3},
-          {major: 1, minor: 1, patch: 4},
-          {major: 1, minor: 2, patch: 0}
-        ]
-      end
-
-      def ffprobe_path
-        name = 'ffprobe'
-
-        if File.executable? name
-          cmd
-        else
-          path = ENV['PATH'].split(File::PATH_SEPARATOR).find { |path|
-            File.executable? File.join(path, name)
-          }
-          path && File.expand_path(name, path)
-        end
-      end
     end
 
     def parse(json_to_parse)
       raise ArgumentError.new("No JSON found") if json_to_parse.nil?
-      @video_json = JSON.parse(json_to_parse, symbolize_names: true)
+      @json_to_parse = json_to_parse
+    end
+
+    def parsed_json
+      @parsed_json ||= JSON.parse(@json_to_parse, symbolize_names: true)
     end
 
     def format
-      Ffprober::Format.new(@video_json[:format])
+      Ffprober::Format.new(parsed_json[:format])
     end
 
     def video_streams
-      @video_json[:streams].select { |stream| stream[:codec_type] == 'video'}.map do |s|
+      streams.select { |stream| stream[:codec_type] == 'video'}.map do |s|
         Ffprober::VideoStream.new(s)
       end
     end
 
     def audio_streams
-      @video_json[:streams].select { |stream| stream[:codec_type] == 'audio'}.map do |s|
+      streams.select { |stream| stream[:codec_type] == 'audio'}.map do |s|
         Ffprober::AudioStream.new(s)
       end
     end
 
+    def streams
+      parsed_json[:streams]
+    end
   end
 end

data/lib/ffprober/version.rb

@@ -1,3 +1,3 @@
 module Ffprober
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/ffprober/ffprobe_version_spec.rb

@@ -0,0 +1,38 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe Ffprober::FfprobeVersion do
+  let(:before_one_zero) { Gem::Version.new("0.9.0") }
+  let(:one_zero)        { Gem::Version.new("1.0.0") }
+  let(:one_one)         { Gem::Version.new("1.1.0") }
+  let(:after_one_zero)  { Gem::Version.new("1.9.0") }
+  let(:latest)          { Gem::Version.new("1.2") }
+
+  context 'validates the ffprobe version' do
+    it 'detects versions < 0.9' do
+      Ffprober::FfprobeVersion.stub(:parsed_version) { before_one_zero }
+      Ffprober::FfprobeVersion.valid?.should be_true
+    end
+
+    it 'detects versions 1.0' do
+      Ffprober::FfprobeVersion.stub(:parsed_version) { one_zero }
+      Ffprober::FfprobeVersion.valid?.should be_true
+    end
+
+    it 'detects versions 1.1' do
+      Ffprober::FfprobeVersion.stub(:parsed_version) { one_one }
+      Ffprober::FfprobeVersion.valid?.should be_true
+    end
+
+    it 'detects versions 1.9' do
+      Ffprober::FfprobeVersion.stub(:parsed_version) { after_one_zero }
+      Ffprober::FfprobeVersion.valid?.should be_false
+    end
+
+    it 'detects latest' do
+      Ffprober::FfprobeVersion.stub(:parsed_version) { latest }
+      Ffprober::FfprobeVersion.valid?.should be_true
+    end
+
+  end
+end

data/spec/ffprober_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 
 describe Ffprober do
-  describe "from_file", if: Ffprober::Parser.ffprobe_version_valid? do
+  describe "from_file", if: Ffprober::FfprobeVersion.valid? do
     before :each do
       @ffprobe = Ffprober::Parser.from_file('spec/assets/301-extracting_a_ruby_gem.m4v')
     end
@@ -24,7 +24,7 @@ describe Ffprober do
 
   describe "if no ffprobe is found" do
     it "should raise a exception" do
-      Ffprober::Parser.stub(:ffprobe_path).and_return("nonexistant")
+      Ffprober.stub(:path).and_return("nonexistant")
       lambda { @ffprobe = Ffprober::Parser.from_file('spec/assets/301-extracting_a_ruby_gem.m4v') }.should raise_error
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffprober
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - beanieboi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-13 00:00:00.000000000 Z
+date: 2013-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -56,6 +56,7 @@ files:
 - ffprober.gemspec
 - lib/ffprober.rb
 - lib/ffprober/audio_stream.rb
+- lib/ffprober/ffprobe_version.rb
 - lib/ffprober/format.rb
 - lib/ffprober/parser.rb
 - lib/ffprober/stream.rb
@@ -63,7 +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/ffprober/parser_spec.rb
+- spec/ffprober/ffprobe_version_spec.rb
 - spec/ffprober_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/beanieboi/ffprober
@@ -78,7 +79,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -93,6 +94,6 @@ 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/ffprober/parser_spec.rb
+- spec/ffprober/ffprobe_version_spec.rb
 - spec/ffprober_spec.rb
 - spec/spec_helper.rb

data/spec/ffprober/parser_spec.rb

@@ -1,32 +0,0 @@
-# encoding: utf-8
-require 'spec_helper'
-
-describe Ffprober::Parser do
-  let(:before_one_zero) { {major: 0, minor: 9, patch: 0} }
-  let(:one_zero)        { {major: 1, minor: 0, patch: 0} }
-  let(:one_one)         { {major: 1, minor: 1, patch: 0} }
-  let(:after_one_zero)  { {major: 1, minor: 9, patch: 0} }
-
-  context 'validates the ffprobe version' do
-    it 'detects versions < 0.9' do
-      Ffprober::Parser.stub(:ffprobe_version) { before_one_zero }
-      Ffprober::Parser.ffprobe_version_valid?.should be_true
-    end
-
-    it 'detects versions 1.0' do
-      Ffprober::Parser.stub(:ffprobe_version) { one_zero }
-      Ffprober::Parser.ffprobe_version_valid?.should be_true
-    end
-
-    it 'detects versions 1.1' do
-      Ffprober::Parser.stub(:ffprobe_version) { one_one }
-      Ffprober::Parser.ffprobe_version_valid?.should be_true
-    end
-
-
-    it 'detects versions 1.9' do
-      Ffprober::Parser.stub(:ffprobe_version) { after_one_zero }
-      Ffprober::Parser.ffprobe_version_valid?.should be_false
-    end
-  end
-end