video_info 1.6.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5bfff718ac239bdc03fcb92af2455394dd97d05
-  data.tar.gz: 556d2e23987b37bc175ce9603a0a367aa986fac8
+  metadata.gz: 8574cb4c5ee1da037895282d4afeebaf4266f19b
+  data.tar.gz: 65a5e6e34b10aecc9ee7e95f6ef2aa873493b7f3
 SHA512:
-  metadata.gz: ea918f3867fe980ea5f86e415ab672ddb3e78a6a01f4ddb3ef13121c7f86e08e5ada9d243c4d9e36cdf29ca358b6fc676a544d50b44bb1b5cfa4a77a3e3874b0
-  data.tar.gz: ef6e684d5c501b35af781265a0ad0f7efdc2ca0e5403652895d02c9e0398c1393820205bd816cffaf83182225c1a079204662c788e072e03f8a631ef47082784
+  metadata.gz: 338de9b7de8a9cac837dff5cabd23ad9643d63d50275989dc7e0fb3077b4b79bc4dc9fcc95e1bededd1371ade6bbc5d9aaed6cb570aa3cf0d984a0c43bad1f4d
+  data.tar.gz: 91a541df1be27bfe9e2517368bb2255777e9d7cd3f9bcdd02177e8b4f21f42251b031cb192c6b4f047e1790f18c5c16db3e5a33dbcacbcd25f7d48ec1c4d1db6

data/.travis.yml

@@ -1,10 +1,7 @@
 language: ruby
 bundler_args: --without tool
 rvm:
-  - 1.8.7
   - 1.9.3
   - 2.0.0
-  - jruby-18mode
   - jruby-19mode
-  - rbx-18mode
   - rbx-19mode

data/Gemfile

@@ -3,7 +3,7 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in video_info.gemspec
 gemspec
 
-gem 'coveralls', :require => false
+gem 'coveralls', require: false
 
 group :tool do
   gem 'ruby_gntp'

data/README.md

@@ -2,9 +2,9 @@
 
 [![Gem Version](https://badge.fury.io/rb/video_info.png)](http://badge.fury.io/rb/video_info) [![Build Status](https://travis-ci.org/thibaudgg/video_info.png?branch=master)](https://travis-ci.org/thibaudgg/video_info) [![Dependency Status](https://gemnasium.com/thibaudgg/video_info.png)](https://gemnasium.com/thibaudgg/video_info) [![Code Climate](https://codeclimate.com/github/thibaudgg/video_info.png)](https://codeclimate.com/github/thibaudgg/video_info) [![Coverage Status](https://coveralls.io/repos/thibaudgg/video_info/badge.png?branch=master)](https://coveralls.io/r/thibaudgg/video_info)
 
-Simple Ruby Gem to get video info from YouTube and Vimeo url.
+Simple Ruby Gem to get video info from YouTube, Vimeo and VK url.
 
-Tested against Ruby 1.8.7, 1.9.3, 2.0.0 and the latest versions of JRuby & Rubinius.
+Tested against Ruby 1.9.3, 2.0.0 and the latest versions of JRuby & Rubinius.
 
 Install
 --------
@@ -17,7 +17,7 @@ Usage
 -----
 
 ``` ruby
-video = VideoInfo.get("http://www.youtube.com/watch?v=mZqGqE0D0n4")
+video = VideoInfo.new("http://www.youtube.com/watch?v=mZqGqE0D0n4")
 # video.video_id         => "mZqGqE0D0n4"
 # video.provider         => "YouTube"
 # video.title            => "Cherry Bloom - King Of The Knife"
@@ -30,7 +30,7 @@ video = VideoInfo.get("http://www.youtube.com/watch?v=mZqGqE0D0n4")
 # video.embed_url        => "http://www.youtube.com/embed/mZqGqE0D0n4"
 # video.embed_code       => "'<iframe src="http://www.youtube.com/embed/mZqGqE0D0n4" frameborder="0" allowfullscreen="allowfullscreen"></iframe>'"
 
-video = VideoInfo.get("http://vimeo.com/898029")
+video = VideoInfo.new("http://vimeo.com/898029")
 # video.video_id         => "898029"
 # video.provider         => "Vimeo"
 # video.title            => "Cherry Bloom - King Of The Knife"
@@ -51,16 +51,16 @@ Options
 -------
 
 ``` ruby
-video = VideoInfo.get("http://www.youtube.com/watch?v=mZqGqE0D0n4", "User-Agent" => "My YouTube Mashup Robot/1.0")
-video = VideoInfo.get("http://www.youtube.com/watch?v=mZqGqE0D0n4", "Referer"    => "http://my-youtube-mashup.com/")
-video = VideoInfo.get("http://www.youtube.com/watch?v=mZqGqE0D0n4", "Referer"    => "http://my-youtube-mashup.com/",
+video = VideoInfo.new("http://www.youtube.com/watch?v=mZqGqE0D0n4", "User-Agent" => "My YouTube Mashup Robot/1.0")
+video = VideoInfo.new("http://www.youtube.com/watch?v=mZqGqE0D0n4", "Referer"    => "http://my-youtube-mashup.com/")
+video = VideoInfo.new("http://www.youtube.com/watch?v=mZqGqE0D0n4", "Referer"    => "http://my-youtube-mashup.com/",
                                                                     "User-Agent" => "My YouTube Mashup Robot/1.0")
 ```
 You can also use **symbols** instead of strings (any non-word (`/[^a-z]/i`) character would be converted to hyphen).
 
 ``` ruby
-video = VideoInfo.get("http://www.youtube.com/watch?v=mZqGqE0D0n4", :referer    => "http://my-youtube-mashup.com/",
-                                                                      :user_agent => "My YouTube Mashup Robot/1.0")
+video = VideoInfo.new("http://www.youtube.com/watch?v=mZqGqE0D0n4", :referer    => "http://my-youtube-mashup.com/",
+                                                                      user_agent: "My YouTube Mashup Robot/1.0")
 ```
 
 User-Agent when empty defaults to "VideoInfo/VERSION" - where version is current VideoInfo version, e.g. **"VideoInfo/0.2.7"**.
@@ -70,10 +70,10 @@ It supports all openURI header fields (options), for more information see: [open
 You can also include an `iframe_attributes` or `url_attributes` hash to the `embed_code` method to include arbitrary attributes in the iframe embed code or as additional URL params:
 
 ``` ruby
-VideoInfo.get("http://www.youtube.com/watch?v=mZqGqE0D0n4").embed_code(:iframe_attributes => { :width => 800, :height => 600, "data-key" => "value" })
+VideoInfo.new("http://www.youtube.com/watch?v=mZqGqE0D0n4").embed_code(iframe_attributes: { width: 800, height: 600, "data-key" => "value" })
 => '<iframe src="http://www.youtube.com/embed/mZqGqE0D0n4" frameborder="0" allowfullscreen="allowfullscreen" width="800" height="600" data-key="value"></iframe>
 
-'VideoInfo.get("http://www.youtube.com/watch?v=mZqGqE0D0n4").embed_code(:url_attributes => { :autoplay => 1 })
+'VideoInfo.new("http://www.youtube.com/watch?v=mZqGqE0D0n4").embed_code(url_attributes: { autoplay: 1 })
 => '<iframe src="http://www.youtube.com/embed/mZqGqE0D0n4?autoplay=1" frameborder="0" allowfullscreen="allowfullscreen"></iframe>'
 ```
 

data/Rakefile

@@ -2,4 +2,4 @@ require 'bundler/gem_tasks'
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
-task :default => :spec
+task default: :spec

data/lib/video_info.rb

@@ -1,23 +1,46 @@
 require 'video_info/version'
 require 'video_info/provider'
+require 'forwardable'
+
+class VideoInfo
+  class UrlError < StandardError; end
+  extend Forwardable
 
-module VideoInfo
   PROVIDERS = %w[Vimeo Vkontakte Youtube]
   PROVIDERS.each { |p| require "video_info/providers/#{p.downcase}" }
 
-  def self.get(url, options = {})
-    if provider_const = _providers_const.detect { |p| p.usable?(url) }
-      provider_const.new(url, options)
-    end
+  def_delegators :@provider, :provider, :video_id, :video_owner, :url, :data
+  def_delegators :@provider, :title, :description, :keywords, :view_count
+  def_delegators :@provider, :date, :duration, :width, :height
+  def_delegators :@provider, :thumbnail_small, :thumbnail_medium, :thumbnail_large
+  def_delegators :@provider, :embed_code, :embed_url
+
+  def initialize(url, options = {})
+    @provider = _select_provider(url, options)
+  end
+
+  def self.get(*args)
+    new(*args)
   end
 
   def self.usable?(url)
-    !!_providers_const.detect { |p| p.usable?(url) }
+    new(url)
+    true
+  rescue UrlError
+    false
   end
 
   private
 
-  def self._providers_const
+  def _select_provider(url, options)
+    if provider_const = _providers_const.detect { |p| p.usable?(url) }
+      provider_const.new(url, options)
+    else
+      raise UrlError, "Url is not usable by any Providers: #{url}"
+    end
+  end
+
+  def _providers_const
     PROVIDERS.map { |p| Providers.const_get(p) }
   end
 end

data/lib/video_info/provider.rb

@@ -1,14 +1,13 @@
-require "addressable/uri"
+require 'addressable/uri'
 
-module VideoInfo
+class VideoInfo
   class Provider
-    attr_accessor :url, :options, :iframe_attributes, :video_id, :video
+    attr_accessor :url, :options, :iframe_attributes, :video_id, :data
 
     def initialize(url, options = {})
       @options = _clean_options(options)
       @url = url
       _set_video_id_from_url
-      _set_info_from_api if _valid_video_id?
     end
 
     def self.usable?(url)
@@ -23,6 +22,10 @@ module VideoInfo
       "<iframe #{iframe_attrs.reject(&:empty?).join(" ")}></iframe>"
     end
 
+    def data
+      @data ||= _set_data_from_api
+    end
+
     private
 
     def _clean_options(options)
@@ -36,9 +39,9 @@ module VideoInfo
       options
     end
 
-    def _set_info_from_api
+    def _set_data_from_api
       uri = open(_api_url, options)
-      @video = MultiJson.load(uri.read)
+      MultiJson.load(uri.read)
     end
 
     def _not_openuri_option_symbol?(key)
@@ -50,7 +53,10 @@ module VideoInfo
     end
 
     def _set_video_id_from_url
-      url.gsub(_url_regex) { @video_id = $1 || $2 || $3 }
+      @url.gsub(_url_regex) { @video_id = $1 || $2 || $3 }
+      unless _valid_video_id?
+        raise UrlError, "Url is not valid, video_id is not found: #{url}"
+      end
     end
 
     def _valid_video_id?
@@ -66,10 +72,11 @@ module VideoInfo
     end
 
     def _embed_url(options)
+      url_scheme = options.fetch(:url_scheme, 'http')
       url_attrs = options.fetch(:url_attributes, {})
       url_attrs = _default_url_attributes.merge(url_attrs)
 
-      url = embed_url
+      url = "#{url_scheme}://#{embed_url}"
       url += "?#{_hash_to_params(url_attrs)}" unless url_attrs.empty?
       url
     end

data/lib/video_info/providers/vimeo.rb

@@ -1,7 +1,7 @@
 require 'open-uri'
 require 'multi_json'
 
-module VideoInfo
+class VideoInfo
   module Providers
     class Vimeo < Provider
 
@@ -13,10 +13,6 @@ module VideoInfo
         'Vimeo'
       end
 
-      def url
-        video ? video['url'] : @url
-      end
-
       %w[title description thumbnail_small thumbnail_medium thumbnail_large].each do |method|
         define_method(method) { video[method] }
       end
@@ -30,7 +26,7 @@ module VideoInfo
       end
 
       def embed_url
-        "http://player.vimeo.com/video/#{video_id}"
+        "player.vimeo.com/video/#{video_id}"
       end
 
       def date
@@ -42,7 +38,7 @@ module VideoInfo
       end
 
       def video
-        @video && @video.first
+        data && data.first
       end
 
       private
@@ -60,10 +56,10 @@ module VideoInfo
       end
 
       def _default_url_attributes
-        { :title => 0,
-          :byline => 0,
-          :portrait => 0,
-          :autoplay => 0 }
+        { title: 0,
+          byline: 0,
+          portrait: 0,
+          autoplay: 0 }
       end
 
     end

data/lib/video_info/providers/vkontakte.rb

@@ -8,7 +8,7 @@ if RUBY_VERSION.to_i < 2
   require 'iconv'
 end
 
-module VideoInfo
+class VideoInfo
   module Providers
     class Vkontakte < Provider
       attr_accessor :video_owner
@@ -21,72 +21,53 @@ module VideoInfo
         'Vkontakte'
       end
 
-      %w[description keywords].each do |method|
-        define_method(method) { HTMLEntities.new.decode(video[:description]) }
+      def description
+        content = data[/<meta name="description" content="(.*)" \/>/,1]
+        HTMLEntities.new.decode(content)
       end
+      alias_method :keywords, :description
 
-      %w[width height duration view_count].each do |method|
-        define_method(method) { video[method.to_sym].to_i }
-      end
-
-      def title
-        video[:title]
-      end
-
-      def embed_url
-        "http://vk.com/video_ext.php?oid=#{video_owner}&id=#{video_id}&hash=#{video[:hash]}"
-      end
-
-      private
-
-      def _parse_hash
-        @html[/hash2\\":\\"(\w+)/,1]
+      def width
+        { 240 => 320,
+          360 => 480,
+          480 => 640,
+          720 => 1280
+        }[height]
       end
 
-      def _parse_view_count
-        @html[/mv_num_views\\"><b>(\d+)/,1].to_i
+      def height
+        data[/url(\d+)/,1].to_i
       end
 
-      def _parse_title
-        @html[/<title>(.*)<\/title>/,1].gsub(" | ВКонтакте", "")
+      def title
+        data[/<title>(.*)<\/title>/,1].gsub(" | ВКонтакте", "")
       end
 
-      def _parse_duration
-        @html[/"duration":(\d+)/,1].to_i
+      def view_count
+        data[/mv_num_views\\">(\d+)/,1].to_i
       end
 
-      def _parse_height
-        @html[/url(\d+)/,1].to_i
+      def embed_url
+        "vk.com/video_ext.php?oid=#{video_owner}&id=#{video_id}&hash=#{_data_hash}"
       end
 
-      def _get_width(height)
-        { 240 => 320,
-          360 => 480,
-          480 => 640,
-          720 => 1280
-        }[height]
+      def duration
+        data[/"duration":(\d+)/,1].to_i
       end
 
-      def _parse_description
-        @html[/<meta name="description" content="(.*)" \/>/,1]
-      end
+      private
 
-      def _set_info_from_api
+      def _set_data_from_api
         uri = open(_api_url, options)
         if RUBY_VERSION.to_i < 2
-          @html = Iconv.iconv('utf-8', 'cp1251', uri.read)[0]
+          Iconv.iconv('utf-8', 'cp1251', uri.read)[0]
         else
-          @html = uri.read.encode("UTF-8")
+          uri.read.encode("UTF-8")
         end
-        @video = {
-          :hash => _parse_hash,
-          :view_count => _parse_view_count,
-          :title => _parse_title,
-          :duration => _parse_duration,
-          :width => _get_width(_parse_height),
-          :height => _parse_height,
-          :description => _parse_description
-        }
+      end
+
+      def _data_hash
+        data[/hash2\\":\\"(\w+)/,1]
       end
 
       def _set_video_id_from_url
@@ -102,7 +83,7 @@ module VideoInfo
       end
 
       def _default_iframe_attributes
-        { :allowfullscreen => "allowfullscreen" }
+        { allowfullscreen: "allowfullscreen" }
       end
 
       def _default_url_attributes

data/lib/video_info/providers/youtube.rb

@@ -1,7 +1,7 @@
 require 'open-uri'
 require 'multi_json'
 
-module VideoInfo
+class VideoInfo
   module Providers
     class Youtube < Provider
 
@@ -30,7 +30,7 @@ module VideoInfo
       end
 
       def embed_url
-        "http://www.youtube.com/embed/#{video_id}"
+        "www.youtube.com/embed/#{video_id}"
       end
 
       def date
@@ -64,7 +64,7 @@ module VideoInfo
       end
 
       def _default_iframe_attributes
-        { :allowfullscreen => "allowfullscreen" }
+        { allowfullscreen: "allowfullscreen" }
       end
 
       def _default_url_attributes
@@ -72,11 +72,11 @@ module VideoInfo
       end
 
       def _video_entry
-        video['entry']
+        data['entry']
       end
 
       def _video_media_group
-        video['entry']['media$group']
+        data['entry']['media$group']
       end
 
       def _video_thumbnail(id)

data/lib/video_info/version.rb

@@ -1,3 +1,3 @@
-module VideoInfo
-  VERSION = '1.6.0'
+class VideoInfo
+  VERSION = '2.0.0'
 end

data/spec/fixtures/vcr_cassettes/VideoInfo_Providers_Vimeo/with_video_898029/date/.yml

@@ -8,7 +8,7 @@ http_interactions:
       string: ''
     headers:
       User-Agent:
-      - VideoInfo/1.5.0
+      - VideoInfo/1.6.0
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
@@ -23,15 +23,15 @@ http_interactions:
       X-Ratelimit-Limit:
       - '3600'
       X-Ratelimit-Remaining:
-      - '3597'
+      - '3599'
       X-Ratelimit-Reset:
-      - '1381179443'
+      - '1382701011'
       Expires:
-      - Mon, 07 Oct 2013 19:58:24 GMT
+      - Fri, 25 Oct 2013 10:37:52 GMT
       Last-Modified:
-      - Thu, 03 Oct 2013 09:04:59 GMT
+      - Sun, 20 Oct 2013 01:45:34 GMT
       Etag:
-      - '"a1c9549c51ba7682be6cd968cbd7c1fb"'
+      - '"c632ac4e6ac3e1fcd30be3046eb936b0"'
       X-Dns-Prefetch-Control:
       - 'on'
       Vary:
@@ -39,15 +39,15 @@ http_interactions:
       Content-Type:
       - application/json
       Content-Length:
-      - '497'
+      - '498'
       Accept-Ranges:
       - bytes
       Date:
-      - Mon, 07 Oct 2013 19:57:27 GMT
+      - Fri, 25 Oct 2013 10:36:53 GMT
       X-Varnish:
-      - 636839230 636837831
+      - 1698943940 1698943341
       Age:
-      - '3'
+      - '2'
       Via:
       - 1.1 varnish
       X-Varnish-Cache:
@@ -55,15 +55,15 @@ http_interactions:
       Connection:
       - close
       X-Vserver:
-      - 10.90.128.196
+      - 10.90.128.197
     body:
       encoding: UTF-8
       string: '[{"id":898029,"title":"Cherry Bloom - King Of The Knife","description":"The
         first video from the upcoming album Secret Sounds, to download in-stores April
         14. Checkout http:\/\/www.cherrybloom.net","url":"http:\/\/vimeo.com\/898029","upload_date":"2008-04-14
         13:10:39","thumbnail_small":"http:\/\/b.vimeocdn.com\/ts\/343\/731\/34373130_100.jpg","thumbnail_medium":"http:\/\/b.vimeocdn.com\/ts\/343\/731\/34373130_200.jpg","thumbnail_large":"http:\/\/b.vimeocdn.com\/ts\/343\/731\/34373130_640.jpg","user_id":206215,"user_name":"Octave
-        Zangs","user_url":"http:\/\/vimeo.com\/octave","user_portrait_small":"http:\/\/b.vimeocdn.com\/ps\/257\/715\/2577152_30.jpg","user_portrait_medium":"http:\/\/b.vimeocdn.com\/ps\/257\/715\/2577152_75.jpg","user_portrait_large":"http:\/\/b.vimeocdn.com\/ps\/257\/715\/2577152_100.jpg","user_portrait_huge":"http:\/\/b.vimeocdn.com\/ps\/257\/715\/2577152_300.jpg","stats_number_of_likes":11,"stats_number_of_plays":4555,"stats_number_of_comments":4,"duration":175,"width":640,"height":360,"tags":"cherry
+        Zangs","user_url":"http:\/\/vimeo.com\/octave","user_portrait_small":"http:\/\/b.vimeocdn.com\/ps\/257\/715\/2577152_30.jpg","user_portrait_medium":"http:\/\/b.vimeocdn.com\/ps\/257\/715\/2577152_75.jpg","user_portrait_large":"http:\/\/b.vimeocdn.com\/ps\/257\/715\/2577152_100.jpg","user_portrait_huge":"http:\/\/b.vimeocdn.com\/ps\/257\/715\/2577152_300.jpg","stats_number_of_likes":11,"stats_number_of_plays":4557,"stats_number_of_comments":4,"duration":175,"width":640,"height":360,"tags":"cherry
         bloom, secret sounds, king of the knife, rock, alternative","embed_privacy":"anywhere"}]'
     http_version: 
-  recorded_at: Mon, 07 Oct 2013 19:57:27 GMT
-recorded_with: VCR 2.5.0
+  recorded_at: Fri, 25 Oct 2013 10:36:53 GMT
+recorded_with: VCR 2.6.0