ffprober 0.5.1 → 0.5.2

data/lib/ffprober/ffmpeg/version_validator.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Ffprober
   module Ffmpeg
     class VersionValidator
-      MIN_VERSION = Gem::Version.new("0.9.0")
+      MIN_VERSION = Gem::Version.new('0.9.0')
 
       def initialize(ffmpeg_version)
         @ffmpeg_version = ffmpeg_version
@@ -17,9 +19,7 @@ module Ffprober
         MIN_VERSION <= ffmpeg_version.version
       end
 
-      def ffmpeg_version
-        @ffmpeg_version
-      end
+      attr_reader :ffmpeg_version
     end
   end
 end

data/lib/ffprober/ffprobe_version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ffprober
   class FfprobeVersion
     def self.invalid?

data/lib/ffprober/format.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ffprober
   class Format
     include Ffprober::DynamicInitializer

data/lib/ffprober/parser.rb

@@ -1,24 +1,33 @@
-require "shellwords"
+# frozen_string_literal: true
 
 module Ffprober
   class Parser
     def self.from_file(file_to_parse)
-      if FfprobeVersion.invalid?
-        fail UnsupportedVersion, "found version: #{FfprobeVersion.version}"
-      end
+      check_version
 
-      if File.zero?(file_to_parse)
-        fail EmptyInput, file_to_parse
-      end
+      raise EmptyInput, file_to_parse if File.zero?(file_to_parse)
 
-      file_parser = Ffprober::Parsers::File.new(file_to_parse)
+      file_parser = Parsers::FileParser.new(file_to_parse)
       json_parser = file_parser.load
       Ffprober::Wrapper.new(json_parser.json)
     end
 
+    def self.from_url(url_to_parse)
+      check_version
+
+      url_parser = Parsers::UrlParser.new(url_to_parse)
+      json_parser = url_parser.load
+      Ffprober::Wrapper.new(json_parser.json)
+    end
+
     def self.from_json(json_to_parse)
-      json_parser = Ffprober::Parsers::Json.new(json_to_parse)
+      json_parser = Parsers::JsonParser.new(json_to_parse)
       Ffprober::Wrapper.new(json_parser.json)
     end
+
+    def self.check_version
+      msg = "found version: #{FfprobeVersion.version}"
+      raise UnsupportedVersion, msg if FfprobeVersion.invalid?
+    end
   end
 end

data/lib/ffprober/parsers/file.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Ffprober
   module Parsers
-    class File
-      def initialize(file_to_parse, exec=Ffprober::Ffmpeg::Exec.new)
+    class FileParser
+      def initialize(file_to_parse, exec = Ffprober::Ffmpeg::Exec.new)
         unless ::File.exist?(file_to_parse)
-          fail ArgumentError.new("File not found #{file_to_parse}")
+          raise ArgumentError, "File not found #{file_to_parse}"
         end
 
         @file_to_parse = file_to_parse
@@ -11,7 +13,7 @@ module Ffprober
       end
 
       def load
-        Ffprober::Parsers::Json.new(@exec.json_output(@file_to_parse))
+        JsonParser.new(@exec.json_output(@file_to_parse))
       end
     end
   end

data/lib/ffprober/parsers/json.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module Ffprober
   module Parsers
-    class Json
+    class JsonParser
       def initialize(json_to_parse)
-        fail ArgumentError.new("No JSON input data") if json_to_parse.nil?
+        raise ArgumentError, 'No JSON input data' if json_to_parse.nil?
         @json_to_parse = json_to_parse
       end
 

data/lib/ffprober/parsers/url.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'uri'
+
+module Ffprober
+  module Parsers
+    class UrlParser
+      VALID_URI_REGEX = /\A#{URI::DEFAULT_PARSER.make_regexp}\z/
+
+      def initialize(url_to_parse, exec = Ffprober::Ffmpeg::Exec.new)
+        unless valid_url?(url_to_parse)
+          raise ArgumentError, "#{url_to_parse} is not a valid URL"
+        end
+
+        @url_to_parse = url_to_parse
+        @exec = exec
+      end
+
+      def load
+        JsonParser.new(@exec.json_output(@url_to_parse))
+      end
+
+      private
+
+      def valid_url?(url)
+        URI.escape(url) =~ VALID_URI_REGEX
+      end
+    end
+  end
+end

data/lib/ffprober/stream.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ffprober
   class Stream
     include Ffprober::DynamicInitializer

data/lib/ffprober/subtitle_stream.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ffprober
   class SubtitleStream < Stream
   end

data/lib/ffprober/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ffprober
-  VERSION = "0.5.1"
+  VERSION = '0.5.2'
 end

data/lib/ffprober/video_stream.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ffprober
   class VideoStream < Stream
   end

data/lib/ffprober/wrapper.rb

@@ -1,33 +1,44 @@
+# frozen_string_literal: true
+
 module Ffprober
   class Wrapper
     attr_reader :json
 
     def initialize(json)
+      raise FfprobeError, json[:error] if json[:error]
       @json = json
     end
 
     def format
-      @format ||= Ffprober::Format.new(json[:format])
+      @format ||= Format.new(json[:format])
     end
 
     def video_streams
-      @video_streams ||= stream_by_codec("video").map { |data| Ffprober::VideoStream.new(data) }
+      @video_streams ||= stream_by_codec('video').map do |data|
+        VideoStream.new(data)
+      end
     end
 
     def audio_streams
-      @audio_streams ||= stream_by_codec("audio").map { |data| Ffprober::AudioStream.new(data) }
+      @audio_streams ||= stream_by_codec('audio').map do |data|
+        AudioStream.new(data)
+      end
     end
 
     def data_streams
-      @data_streams ||= stream_by_codec("data").map { |data| Ffprober::DataStream.new(data) }
+      @data_streams ||= stream_by_codec('data').map do |data|
+        DataStream.new(data)
+      end
     end
 
     def chapters
-      @chapters ||= json[:chapters].map { |chapter| Ffprober::Chapter.new(chapter) }
+      @chapters ||= json[:chapters].map { |chapter| Chapter.new(chapter) }
     end
 
     def subtitle_streams
-      @subtitle_streams ||= stream_by_codec("subtitle").map { |stream| Ffprober::SubtitleStream.new(stream) }
+      @subtitle_streams ||= stream_by_codec('subtitle').map do |stream|
+        SubtitleStream.new(stream)
+      end
     end
 
     private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffprober
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - beanieboi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-08 00:00:00.000000000 Z
+date: 2018-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: a Ruby wrapper for ffprobe
 email:
 - beanie@benle.de
@@ -59,6 +73,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- circle.yml
 - examples/from_file.rb
 - ffprober.gemspec
 - lib/ffprober.rb
@@ -75,6 +90,7 @@ files:
 - lib/ffprober/parser.rb
 - lib/ffprober/parsers/file.rb
 - lib/ffprober/parsers/json.rb
+- lib/ffprober/parsers/url.rb
 - lib/ffprober/stream.rb
 - lib/ffprober/subtitle_stream.rb
 - lib/ffprober/version.rb
@@ -100,9 +116,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: a Ruby wrapper for ffprobe (part of ffmpeg)
 test_files: []
-has_rdoc: