video_info 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d47ec2988bd9ee02646d61ac4da49a16cd44506
-  data.tar.gz: c75a2daba684c399625c12f2bc41ca2869f37bea
+  metadata.gz: 21b79a7e562e3263f2f67aa38f96ffb252b1f019
+  data.tar.gz: eb59bbe4c81999eca8a85806d07a609f43df93cd
 SHA512:
-  metadata.gz: b080c73210b34e0b700a7497d7ae1fd818c7e45e520f4fc97234a035db4fa38982f074affcaf3372935ea423bf7127742da03efabf645b32cdb370d40de6b1d5
-  data.tar.gz: 607f4ad5c7e9c8ca0ef9e57b0f989aaea7cde900e303f215ce560dd2742349b9878118984a10a53f7ea14922e270e8d95380a1ecfede58c92833f5a3a538783e
+  metadata.gz: 37d0c60af3bd72cd2827b7d9f2ef163333b70eb56a443df3c40ccdf5459128aaea2cc49ca0b70481ad458cae6a824b60b5c1643dae2d365aa40e6e89614a7e7e
+  data.tar.gz: 78e77ef175bad01da5b4de6c3aa9fb7200b8ee9b38cd86566e7d577b39e76c254467029a50a26ad7837c73ebb27172a8999e8a6ceede4f7510ae7c1550d76cdf

data/.travis.yml

@@ -3,5 +3,9 @@ bundler_args: --without tool
 rvm:
   - 1.9.3
   - 2.0.0
-  - jruby-19mode
-  - rbx-19mode
+  - 2.1.0
+  - jruby
+  - rbx
+matrix:
+  allow_failures:
+    - rvm: rbx

data/README.md

@@ -18,6 +18,7 @@ Usage
 
 ``` ruby
 video = VideoInfo.new("http://www.youtube.com/watch?v=mZqGqE0D0n4")
+# video.available?       => true
 # video.video_id         => "mZqGqE0D0n4"
 # video.provider         => "YouTube"
 # video.title            => "Cherry Bloom - King Of The Knife"
@@ -31,6 +32,7 @@ video = VideoInfo.new("http://www.youtube.com/watch?v=mZqGqE0D0n4")
 # video.embed_code       => "'<iframe src="http://www.youtube.com/embed/mZqGqE0D0n4" frameborder="0" allowfullscreen="allowfullscreen"></iframe>'"
 
 video = VideoInfo.new("http://vimeo.com/898029")
+# video.available?       => true
 # video.video_id         => "898029"
 # video.provider         => "Vimeo"
 # video.title            => "Cherry Bloom - King Of The Knife"

data/lib/video_info.rb

@@ -14,6 +14,7 @@ class VideoInfo
   def_delegators :@provider, :date, :duration, :width, :height
   def_delegators :@provider, :thumbnail_small, :thumbnail_medium, :thumbnail_large
   def_delegators :@provider, :embed_code, :embed_url
+  def_delegators :@provider, :available?
 
   def initialize(url, options = {})
     @provider = _select_provider(url, options)

data/lib/video_info/provider.rb

@@ -28,8 +28,21 @@ class VideoInfo
       @data ||= _set_data_from_api
     end
 
+
+    def available?
+      !%w[403 404].include?(_response_code)
+    end
+
     private
 
+    def _response_code
+      response = nil
+      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.dup.each do |key, value|

data/lib/video_info/providers/vimeo.rb

@@ -44,8 +44,16 @@ class VideoInfo
         /.*\.com\/(?:(?:groups\/[^\/]+\/videos\/)|(?:video\/))?([0-9]+).*$/i
       end
 
+      def _api_base
+        "vimeo.com"
+      end
+
+      def _api_path
+        "/api/v2/video/#{video_id}.json"
+      end
+
       def _api_url
-        "http://vimeo.com/api/v2/video/#{video_id}.json"
+        "http://#{_api_base}#{_api_path}"
       end
 
       def _default_iframe_attributes

data/lib/video_info/providers/vkontakte.rb

@@ -60,6 +60,22 @@ class VideoInfo
         end
       end
 
+      def _response_code
+        response = nil
+        Net::HTTP.start(_api_base, 80) {|http|
+          response = http.get(_api_path)
+        }
+        response.code
+      end
+
+      def _api_base
+        URI::parse(url).host
+      end
+
+      def _api_path
+        URI::parse(url).path
+      end
+
       def _data_hash
         data[/hash2\\":\\"(\w+)/,1]
       end

data/lib/video_info/providers/youtube.rb

@@ -56,8 +56,16 @@ class VideoInfo
         /(?:youtube(?:-nocookie)?\.com\/(?:[^\/]+\/.+\/|(?:v|e(?:mbed)?)\/|.*[?&]v=)|youtu\.be\/)([^"&?\/ ]{11})/i
       end
 
+      def _api_base
+        "gdata.youtube.com"
+      end
+
+      def _api_path
+        "/feeds/api/videos/#{video_id}?v=2&alt=json"
+      end
+
       def _api_url
-        "http://gdata.youtube.com/feeds/api/videos/#{video_id}?v=2&alt=json"
+        "http://#{_api_base}#{_api_path}"
       end
 
       def _default_iframe_attributes

data/lib/video_info/version.rb

@@ -1,3 +1,3 @@
 class VideoInfo
-  VERSION = '2.0.2'
+  VERSION = '2.1.0'
 end

data/spec/fixtures/vcr_cassettes/VideoInfo_Providers_Vimeo/_available_/with_password_required_video/available_/.yml

@@ -0,0 +1,50 @@
+---
+http_interactions:
+- request:
+    method: head
+    uri: http://vimeo.com/api/v2/video/54189727.json
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 404
+      message: Not Found
+    headers:
+      Date:
+      - Wed, 19 Feb 2014 14:59:45 GMT
+      Server:
+      - Apache
+      Access-Control-Allow-Origin:
+      - "*"
+      X-Ratelimit-Limit:
+      - '3600'
+      X-Ratelimit-Remaining:
+      - '3594'
+      X-Ratelimit-Reset:
+      - '1392825334'
+      Cache-Control:
+      - max-age=300, must-revalidate
+      Expires:
+      - Wed, 19 Feb 2014 15:04:45 GMT
+      X-Ua-Compatible:
+      - IE=edge
+      X-Dns-Prefetch-Control:
+      - 'on'
+      Vary:
+      - Accept-Encoding
+      Nncoection:
+      - close
+      Content-Type:
+      - text/html; charset=UTF-8
+    body:
+      encoding: UTF-8
+      string: ''
+    http_version: 
+  recorded_at: Wed, 19 Feb 2014 14:59:45 GMT
+recorded_with: VCR 2.8.0

data/spec/fixtures/vcr_cassettes/VideoInfo_Providers_Vimeo/_available_/with_this_video_does_not_exist_video/available_/.yml

@@ -0,0 +1,50 @@
+---
+http_interactions:
+- request:
+    method: head
+    uri: http://vimeo.com/api/v2/video/59312311.json
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 404
+      message: Not Found
+    headers:
+      Date:
+      - Wed, 19 Feb 2014 14:59:45 GMT
+      Server:
+      - Apache
+      Access-Control-Allow-Origin:
+      - "*"
+      X-Ratelimit-Limit:
+      - '3600'
+      X-Ratelimit-Remaining:
+      - '3595'
+      X-Ratelimit-Reset:
+      - '1392825334'
+      Cache-Control:
+      - max-age=300, must-revalidate
+      Expires:
+      - Wed, 19 Feb 2014 15:04:45 GMT
+      X-Ua-Compatible:
+      - IE=edge
+      X-Dns-Prefetch-Control:
+      - 'on'
+      Vary:
+      - Accept-Encoding
+      Nncoection:
+      - close
+      Content-Type:
+      - text/html; charset=UTF-8
+    body:
+      encoding: UTF-8
+      string: ''
+    http_version: 
+  recorded_at: Wed, 19 Feb 2014 14:59:45 GMT
+recorded_with: VCR 2.8.0

data/spec/fixtures/vcr_cassettes/VideoInfo_Providers_Vimeo/_available_/with_valid_video/available_/.yml

@@ -0,0 +1,54 @@
+---
+http_interactions:
+- request:
+    method: head
+    uri: http://vimeo.com/api/v2/video/898029.json
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Wed, 19 Feb 2014 14:59:44 GMT
+      Server:
+      - Apache
+      Access-Control-Allow-Origin:
+      - "*"
+      X-Ratelimit-Limit:
+      - '3600'
+      X-Ratelimit-Remaining:
+      - '3596'
+      X-Ratelimit-Reset:
+      - '1392825334'
+      Cache-Control:
+      - max-age=60
+      Expires:
+      - Wed, 19 Feb 2014 15:00:44 GMT
+      Last-Modified:
+      - Fri, 14 Feb 2014 05:07:12 GMT
+      Etag:
+      - "\"c3db5c1f249552ac31bdff080df7ab26\""
+      X-Ua-Compatible:
+      - IE=edge
+      X-Dns-Prefetch-Control:
+      - 'on'
+      Vary:
+      - Accept-Encoding
+      Cneonction:
+      - close
+      Content-Type:
+      - application/json
+    body:
+      encoding: UTF-8
+      string: ''
+    http_version: 
+  recorded_at: Wed, 19 Feb 2014 14:59:45 GMT
+recorded_with: VCR 2.8.0

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

@@ -8,30 +8,43 @@ http_interactions:
       string: ''
     headers:
       User-Agent:
-      - VideoInfo/1.6.0
+      - VideoInfo/2.0.2
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
-      - '*/*'
+      - "*/*"
   response:
     status:
       code: 200
       message: OK
     headers:
+      Age:
+      - '3'
+      Date:
+      - Thu, 20 Feb 2014 12:43:21 GMT
+      Expires:
+      - Thu, 20 Feb 2014 12:44:21 GMT
+      Connection:
+      - Keep-Alive
+      Via:
+      - 1.1 varnish
+      - dnet-dca
+      Etag:
+      - "\"6dfa4929546eb170df1cf6c24e6b93e8\""
       Server:
       - Apache
+      Access-Control-Allow-Origin:
+      - "*"
       X-Ratelimit-Limit:
       - '3600'
       X-Ratelimit-Remaining:
-      - '3599'
+      - '3598'
       X-Ratelimit-Reset:
-      - '1382701011'
-      Expires:
-      - Fri, 25 Oct 2013 10:37:52 GMT
+      - '1392892121'
       Last-Modified:
-      - Sun, 20 Oct 2013 01:45:34 GMT
-      Etag:
-      - '"c632ac4e6ac3e1fcd30be3046eb936b0"'
+      - Fri, 14 Feb 2014 05:07:12 GMT
+      X-Ua-Compatible:
+      - IE=edge
       X-Dns-Prefetch-Control:
       - 'on'
       Vary:
@@ -42,28 +55,22 @@ http_interactions:
       - '498'
       Accept-Ranges:
       - bytes
-      Date:
-      - Fri, 25 Oct 2013 10:36:53 GMT
       X-Varnish:
-      - 1698943940 1698943341
-      Age:
-      - '2'
-      Via:
-      - 1.1 varnish
+      - '1744118388'
       X-Varnish-Cache:
-      - '1'
-      Connection:
+      - '0'
+      Nncoection:
       - close
       X-Vserver:
-      - 10.90.128.197
+      - 10.90.128.146
     body:
       encoding: UTF-8
-      string: '[{"id":898029,"title":"Cherry Bloom - King Of The Knife","description":"The
+      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":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"}]'
+        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\":4563,\"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: Fri, 25 Oct 2013 10:36:53 GMT
-recorded_with: VCR 2.6.0
+  recorded_at: Thu, 20 Feb 2014 12:43:22 GMT
+recorded_with: VCR 2.8.0

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

@@ -8,32 +8,43 @@ http_interactions:
       string: ''
     headers:
       User-Agent:
-      - VideoInfo/2.0.0
+      - VideoInfo/2.0.2
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
-      - '*/*'
+      - "*/*"
   response:
     status:
       code: 200
       message: OK
     headers:
+      Age:
+      - '2'
+      Date:
+      - Thu, 20 Feb 2014 12:43:21 GMT
+      Expires:
+      - Thu, 20 Feb 2014 12:44:21 GMT
+      Connection:
+      - Keep-Alive
+      Via:
+      - 1.1 varnish
+      - dnet-dca
+      Etag:
+      - "\"6dfa4929546eb170df1cf6c24e6b93e8\""
       Server:
       - Apache
       Access-Control-Allow-Origin:
-      - '*'
+      - "*"
       X-Ratelimit-Limit:
       - '3600'
       X-Ratelimit-Remaining:
-      - '3599'
+      - '3598'
       X-Ratelimit-Reset:
-      - '1382736836'
-      Expires:
-      - Fri, 25 Oct 2013 20:34:56 GMT
+      - '1392892121'
       Last-Modified:
-      - Sun, 20 Oct 2013 01:45:34 GMT
-      Etag:
-      - '"c632ac4e6ac3e1fcd30be3046eb936b0"'
+      - Fri, 14 Feb 2014 05:07:12 GMT
+      X-Ua-Compatible:
+      - IE=edge
       X-Dns-Prefetch-Control:
       - 'on'
       Vary:
@@ -44,28 +55,22 @@ http_interactions:
       - '498'
       Accept-Ranges:
       - bytes
-      Date:
-      - Fri, 25 Oct 2013 20:33:56 GMT
       X-Varnish:
-      - 1715089933 1715089698
-      Age:
-      - '0'
-      Via:
-      - 1.1 varnish
+      - '1744118388'
       X-Varnish-Cache:
-      - '1'
-      Connection:
+      - '0'
+      Nncoection:
       - close
       X-Vserver:
-      - 10.90.128.197
+      - 10.90.128.146
     body:
       encoding: UTF-8
-      string: '[{"id":898029,"title":"Cherry Bloom - King Of The Knife","description":"The
+      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":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"}]'
+        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\":4563,\"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: Fri, 25 Oct 2013 20:33:56 GMT
-recorded_with: VCR 2.6.0
+  recorded_at: Thu, 20 Feb 2014 12:43:21 GMT
+recorded_with: VCR 2.8.0