video_info 2.3.3 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72c245255365b08898efdbbb934299fb28d7cde7
-  data.tar.gz: 4f22d1a8c36481e6443da20e3c9c7654fa4696cc
+  metadata.gz: f40dace9501dc0754efd519f98cf23d6eb037281
+  data.tar.gz: d486727f7fc75c2246d80686d9ccf44c1f8aa15b
 SHA512:
-  metadata.gz: 30e74b2e1ebece18597776a137ad4b4e9de2bd634a36022c7b25d86f5248ab63c6e7229e512b5f09d73bd948286ad324d0cbc768559d1ef17b1751af6ca6efe0
-  data.tar.gz: 406f49ea05c3c540640472ba6d02a1d68b1184b163f72e891c85b4899a252b64b321806fc65d60f707cdee93101f505f2b78d15205f62efaf11442c8a6c62c08
+  metadata.gz: faad587f1bfea1c7a37a9d134521b13e3ba7bfd892eda1e6dce7ab3a5b44510f3f7770957206a9139105fa77f3c664daef9134f52e1148a094b13e638b935d5d
+  data.tar.gz: f0d1f569b0ddafab94d51b0ebef7f0e8a4ec0f1f47cbde0f1fead7a68ee9ceb052b7908c65f053679959e274d72868d63be79a5c0062bbfbb790ded3efab8db3

data/README.md

@@ -48,6 +48,20 @@ video = VideoInfo.new("http://vimeo.com/898029")
 # video.embed_url        => "http://player.vimeo.com/video/898029"
 # video.embed_code       => "'<iframe src="//player.vimeo.com/video/898029?title=0&amp;byline=0&amp;portrait=0&amp;autoplay=0" frameborder="0"></iframe>'"
 
+video = VideoInfo.new("http://fast.wistia.com/embed/medias/pxonqr42is")
+# video.available?       => true
+# video.provider         => "Wistia"
+# video.video_id         => "pxonqr42is"
+# video.title            => "Understanding Analytics"
+# video.duration         => 250 (in seconds)
+# video.width            => 960
+# video.height           => 568
+# video.thumbnail_small  => "https://embed-ssl.wistia.com/deliveries/0fccbdc60ade35723f79f1c002bc61b135b610fa.jpg?image_crop_resized=960x540"
+# video.thumbnail_medium => "https://embed-ssl.wistia.com/deliveries/0fccbdc60ade35723f79f1c002bc61b135b610fa.jpg?image_crop_resized=960x540"
+# video.thumbnail_large  => "https://embed-ssl.wistia.com/deliveries/0fccbdc60ade35723f79f1c002bc61b135b610fa.jpg?image_crop_resized=960x540"
+# video.embed_url        => "//fast.wistia.net/embed/iframe/pxonqr42is"
+# video.embed_code       => "'<iframe src="//fast.wistia.net/embed/iframe/pxonqr42is" frameborder="0"></iframe>'"
+
 video = VideoInfo.new("http://www.youtube.com/watch?v=mZqGqE0D0n4")
 # video.available?       => true
 # video.video_id         => "mZqGqE0D0n4"

data/lib/video_info.rb

@@ -7,7 +7,11 @@ class VideoInfo
   class UrlError < StandardError; end
   extend Forwardable
 
-  PROVIDERS = %w[Vimeo VimeoPlaylist Vkontakte Youtube YoutubePlaylist Dailymotion]
+  PROVIDERS = %w[
+    Dailymotion Vkontakte Wistia
+    Vimeo VimeoPlaylist
+    Youtube YoutubePlaylist
+  ]
   PROVIDERS.each { |p| require "video_info/providers/#{p.downcase}" }
 
   def_delegators :@provider, :provider, :video_id, :video_owner, :url, :data

data/lib/video_info/provider.rb

@@ -13,13 +13,17 @@ class VideoInfo
     end
 
     def self.usable?(url)
-      raise NotImplementedError.new('Provider class must implement .usable? public method')
+      raise NotImplementedError.new(
+        'Provider class must implement .usable? public method'
+      )
     end
 
     def embed_code(options = {})
       iframe_attributes = options.fetch(:iframe_attributes, {})
       iframe_attrs = ["src=\"#{_embed_url(options)}\"", "frameborder=\"0\""]
-      iframe_attrs << _hash_to_attributes(_default_iframe_attributes.merge(iframe_attributes))
+      iframe_attrs << _hash_to_attributes(
+        _default_iframe_attributes.merge(iframe_attributes)
+      )
 
       "<iframe #{iframe_attrs.reject(&:empty?).join(" ")}></iframe>"
     end
@@ -28,7 +32,6 @@ class VideoInfo
       @data ||= _set_data_from_api
     end
 
-
     def available?
       !%w[403 404].include?(_response_code)
     end
@@ -37,14 +40,13 @@ class VideoInfo
 
     def _response_code
       response = nil
-      Net::HTTP.start(_api_base, 80) {|http|
-        response = http.head(_api_path)
-      }
+      Net::HTTP.start(_api_base, 80) { |http| response = http.head(_api_path) }
       response.code
     end
 
     def _clean_options(options)
-      options = { 'User-Agent' => "VideoInfo/#{VideoInfo::VERSION}" }.merge(options)
+      options =
+        { 'User-Agent' => "VideoInfo/#{VideoInfo::VERSION}" }.merge(options)
       options.dup.each do |key, value|
         if _not_openuri_option_symbol?(key)
           options[_http_header_field(key)] = value
@@ -79,11 +81,15 @@ class VideoInfo
     end
 
     def _url_regex
-      raise NotImplementedError.new('Provider class must implement #_url_regex private method')
+      raise NotImplementedError.new(
+        'Provider class must implement #_url_regex private method'
+      )
     end
 
     def _api_url
-      raise NotImplementedError.new('Provider class must implement #_api_url private method')
+      raise NotImplementedError.new(
+        'Provider class must implement #_api_url private method'
+      )
     end
 
     def _embed_url(options)
@@ -97,7 +103,7 @@ class VideoInfo
 
     def _hash_to_attributes(hash)
       return unless hash.is_a?(Hash)
-      hash.map{|k,v| "#{k}=\"#{v}\""}.join(' ')
+      hash.map { |k, v| "#{k}=\"#{v}\"" }.join(' ')
     end
 
     def _hash_to_params(hash)

data/lib/video_info/providers/dailymotion.rb

@@ -1,7 +1,6 @@
 class VideoInfo
   module Providers
     class Dailymotion < Provider
-
       def self.usable?(url)
         url =~ /(dai(?:\.ly|lymotion\.com))/
       end
@@ -50,9 +49,9 @@ class VideoInfo
 
       def _response_code
         response = nil
-        Net::HTTP.start(_api_base, 443, use_ssl: true) {|http|
+        Net::HTTP.start(_api_base, 443, use_ssl: true) do |http|
           response = http.get(_api_path)
-        }
+        end
         response.code
       end
 
@@ -79,7 +78,6 @@ class VideoInfo
       def _default_url_attributes
         { autoplay: 0 }
       end
-
     end
   end
 end

data/lib/video_info/providers/vimeo.rb

@@ -1,7 +1,6 @@
 class VideoInfo
   module Providers
     class Vimeo < Provider
-
       def self.usable?(url)
         url =~ /(vimeo\.com\/(?!album|hubnut\/album).*)/
       end
@@ -45,7 +44,7 @@ class VideoInfo
       end
 
       def _api_base
-        "vimeo.com"
+        'vimeo.com'
       end
 
       def _api_path
@@ -66,7 +65,6 @@ class VideoInfo
           portrait: 0,
           autoplay: 0 }
       end
-
     end
   end
 end

data/lib/video_info/providers/vimeoplaylist.rb

@@ -1,7 +1,6 @@
 class VideoInfo
   module Providers
     class VimeoPlaylist < Vimeo
-
       alias_method :playlist_id, :video_id
 
       def self.usable?(url)
@@ -58,7 +57,6 @@ class VideoInfo
           entry['id']
         end
       end
-
     end
   end
 end

data/lib/video_info/providers/vkontakte.rb

@@ -16,7 +16,7 @@ class VideoInfo
       end
 
       def description
-        content = data[/<meta name="description" content="(.*)" \/>/,1]
+        content = data[/<meta name="description" content="(.*)" \/>/, 1]
         HTMLEntities.new.decode(content)
       end
       alias_method :keywords, :description
@@ -34,11 +34,11 @@ class VideoInfo
       end
 
       def title
-        data[/<title>(.*)<\/title>/,1].gsub(" | ВКонтакте", "")
+        data[/<title>(.*)<\/title>/, 1].gsub(' | ВКонтакте', '')
       end
 
       def view_count
-        data[/mv_num_views\\">.*?(\d+)/,1].to_i
+        data[/mv_num_views\\">.*?(\d+)/, 1].to_i
       end
 
       def embed_url
@@ -46,7 +46,7 @@ class VideoInfo
       end
 
       def duration
-        data[/"duration":(\d+)/,1].to_i
+        data[/"duration":(\d+)/, 1].to_i
       end
 
       private
@@ -56,28 +56,26 @@ class VideoInfo
         if RUBY_VERSION.to_i < 2
           Iconv.iconv('utf-8', 'cp1251', uri.read)[0]
         else
-          uri.read.encode("UTF-8")
+          uri.read.encode('UTF-8')
         end
       end
 
       def _response_code
         response = nil
-        Net::HTTP.start(_api_base, 80) {|http|
-          response = http.get(_api_path)
-        }
+        Net::HTTP.start(_api_base, 80) { |http| response = http.get(_api_path) }
         response.code
       end
 
       def _api_base
-        URI::parse(url).host
+        URI.parse(url).host
       end
 
       def _api_path
-        URI::parse(url).path
+        URI.parse(url).path
       end
 
       def _data_hash
-        data[/hash2\\":\\"(\w+)/,1]
+        data[/hash2\\":\\"(\w+)/, 1]
       end
 
       def _set_video_id_from_url
@@ -89,13 +87,12 @@ class VideoInfo
       end
 
       def _default_iframe_attributes
-        { allowfullscreen: "allowfullscreen" }
+        { allowfullscreen: 'allowfullscreen' }
       end
 
       def _default_url_attributes
         {}
       end
-
     end
   end
 end

data/lib/video_info/providers/wistia.rb

@@ -0,0 +1,63 @@
+class VideoInfo
+  module Providers
+    class Wistia < Provider
+      def self.usable?(url)
+        url =~ /(.*)(wistia.com|wistia.net|wi.st)/
+      end
+
+      def provider
+        'Wistia'
+      end
+
+      %w[title duration width height].each do |method|
+        define_method(method) { data[method] }
+      end
+
+      %w[description keywords view_count date].each do |method|
+        define_method(method) { nil }
+      end
+
+      def embed_url
+        "//fast.wistia.net/embed/iframe/#{video_id}"
+      end
+
+      def thumbnail_small
+        data['thumbnail_url']
+      end
+
+      def thumbnail_medium
+        data['thumbnail_url']
+      end
+
+      def thumbnail_large
+        data['thumbnail_url']
+      end
+
+      private
+
+      def _url_regex
+        /(?:.*)(?:wistia.com|wi.st|wistia.net)\/(?:embed\/)?(?:medias\/)?(?:iframe\/)?(.+)/
+      end
+
+      def _api_base
+        'fast.wistia.com'
+      end
+
+      def _api_path
+        "/oembed?url=http%3A%2F%2Fhome.wistia.com%2Fmedias%2F#{video_id}"
+      end
+
+      def _api_url
+        "http://#{_api_base}#{_api_path}"
+      end
+
+      def _default_iframe_attributes
+        {}
+      end
+
+      def _default_url_attributes
+        {}
+      end
+    end
+  end
+end

data/lib/video_info/providers/youtube.rb

@@ -1,7 +1,6 @@
 class VideoInfo
   module Providers
     class Youtube < Provider
-
       def self.usable?(url)
         url =~ /(youtube\.com\/(?!playlist|embed\/videoseries).*)|(youtu\.be)/
       end
@@ -47,7 +46,11 @@ class VideoInfo
       end
 
       def view_count
-        _video_entry['yt$statistics'] ? _video_entry['yt$statistics']['viewCount'].to_i : 0
+        if _video_entry['yt$statistics']
+          _video_entry['yt$statistics']['viewCount'].to_i
+        else
+          0
+        end
       end
 
       private
@@ -69,7 +72,7 @@ class VideoInfo
       end
 
       def _default_iframe_attributes
-        { allowfullscreen: "allowfullscreen" }
+        { allowfullscreen: 'allowfullscreen' }
       end
 
       def _default_url_attributes
@@ -87,7 +90,6 @@ class VideoInfo
       def _video_thumbnail(id)
         _video_entry['media$group']['media$thumbnail'][id]['url']
       end
-
     end
   end
 end

data/lib/video_info/version.rb

@@ -1,3 +1,3 @@
 class VideoInfo
-  VERSION = '2.3.3'
+  VERSION = '2.4.0'
 end

data/spec/fixtures/vcr_cassettes/VideoInfo_Providers_Dailymotion/_available_/with_This_video_does_not_exist_or_has_been_deleted_/_available_/.yml

@@ -21,28 +21,32 @@ http_interactions:
       Server:
       - DMS/1.0.42
       X-Dm-Backnode:
-      - web-047.adm.dailymotion.com:80
+      - web-051.adm.dailymotion.com:80
       Vary:
       - Authorization,Accept-Encoding
       Cache-Control:
       - private, max-age=900
       Content-Type:
-      - application/json
+      - application/json; charset=UTF-8
       P3p:
       - policyref="http://www.dailymotion.com/w3c/p3p.xml", CP="IDC DSP CURa ADMa
         DEVa TAIa OUR BUS IND UNI COM NAV INT"
       Date:
-      - Wed, 29 Oct 2014 20:36:04 GMT
+      - Tue, 09 Dec 2014 19:27:23 GMT
       X-Dm-Lb:
       - 195.8.215.129
       Access-Control-Allow-Origin:
       - "*"
       Etag:
-      - W/"p3bf5_k0DFScFYlnTb63Ug"
+      - W/"bQdj-tf3xQT_eEdX1mjrEQ"
       X-Response-Time:
-      - 0.058677 seconds
+      - 0.056163 seconds
       Last-Modified:
-      - Wed, 29 Oct 2014 15:28:54 GMT
+      - Thu, 27 Nov 2014 15:31:39 GMT
+      Access-Control-Allow-Headers:
+      - Authorization
+      Access-Control-Allow-Methods:
+      - GET, POST, DELETE
       X-Dm-Page:
       - ch-fr.rest.rest_api
       Content-Length:
@@ -52,5 +56,5 @@ http_interactions:
       string: '{"error":{"code":404,"message":"This video does not exist or has been
         deleted.","type":"not_found"}}'
     http_version: 
-  recorded_at: Wed, 29 Oct 2014 20:36:04 GMT
+  recorded_at: Tue, 09 Dec 2014 19:27:23 GMT
 recorded_with: VCR 2.9.3

data/spec/fixtures/vcr_cassettes/VideoInfo_Providers_Dailymotion/_available_/with_valid_video/_available_/.yml

@@ -21,18 +21,18 @@ http_interactions:
       Server:
       - DMS/1.0.42
       X-Dm-Backnode:
-      - web-025.adm.dailymotion.com:80
+      - web-042.adm.dailymotion.com:80
       Vary:
       - Authorization,Accept-Encoding
       Cache-Control:
       - private, max-age=900
       Content-Type:
-      - application/json
+      - application/json; charset=UTF-8
       P3p:
       - policyref="http://www.dailymotion.com/w3c/p3p.xml", CP="IDC DSP CURa ADMa
         DEVa TAIa OUR BUS IND UNI COM NAV INT"
       Date:
-      - Wed, 29 Oct 2014 20:36:04 GMT
+      - Tue, 09 Dec 2014 19:27:23 GMT
       X-Dm-Lb:
       - 195.8.215.129
       Access-Control-Allow-Origin:
@@ -40,9 +40,13 @@ http_interactions:
       Etag:
       - W/"O1DJzTYSf9K1Wvn1OkaB4Q"
       X-Response-Time:
-      - 0.043934 seconds
+      - 0.055371 seconds
       Last-Modified:
       - Sat, 06 Jul 2013 19:32:30 GMT
+      Access-Control-Allow-Headers:
+      - Authorization
+      Access-Control-Allow-Methods:
+      - GET, POST, DELETE
       X-Dm-Page:
       - ch-fr.rest.rest_api
       Content-Length:
@@ -51,5 +55,5 @@ http_interactions:
       encoding: UTF-8
       string: '{"id":"x7lni3","title":"Mario Kart (R\u00e9mi Gaillard)","channel":"fun","owner":"x4r137"}'
     http_version: 
-  recorded_at: Wed, 29 Oct 2014 20:36:04 GMT
+  recorded_at: Tue, 09 Dec 2014 19:27:23 GMT
 recorded_with: VCR 2.9.3