RubyGems - video_info - Versions diffs - 2.0.0 → 2.0.1 - Mend

video_info 2.0.0 → 2.0.1

Files changed (27) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8574cb4c5ee1da037895282d4afeebaf4266f19b
-  data.tar.gz: 65a5e6e34b10aecc9ee7e95f6ef2aa873493b7f3
+  metadata.gz: 408755121a9ec3c89f17e40a899758aa89066705
+  data.tar.gz: 19d209c4e0143e296dca691d927995b8b584db8d
 SHA512:
-  metadata.gz: 338de9b7de8a9cac837dff5cabd23ad9643d63d50275989dc7e0fb3077b4b79bc4dc9fcc95e1bededd1371ade6bbc5d9aaed6cb570aa3cf0d984a0c43bad1f4d
-  data.tar.gz: 91a541df1be27bfe9e2517368bb2255777e9d7cd3f9bcdd02177e8b4f21f42251b031cb192c6b4f047e1790f18c5c16db3e5a33dbcacbcd25f7d48ec1c4d1db6
+  metadata.gz: 6cedfd1f862e27e2cca3aa04e43614f7a0e4a4994c11d4b2cf9271f9f490e3664539ffb33c97544c43a982d6f1d328dc801f4ea367292772ad12c217a4440065
+  data.tar.gz: fedb5fe52034dceb7eb502e95bcd50bcab025fcce591afb466c78dddafd60225b3066fa050303fa5be1d08a821699df2f2e58b0c5e8e35925af3a215d7e3ff06

data/lib/video_info/provider.rb CHANGED Viewed

@@ -1,3 +1,5 @@
+require 'open-uri'
+require 'multi_json'
 require 'addressable/uri'
 class VideoInfo

data/lib/video_info/providers/vimeo.rb CHANGED Viewed

@@ -1,6 +1,3 @@
-require 'open-uri'
-require 'multi_json'
 class VideoInfo
   module Providers
     class Vimeo < Provider

data/lib/video_info/providers/vkontakte.rb CHANGED Viewed

@@ -1,12 +1,5 @@
-# encoding: UTF-8
-require 'open-uri'
-require 'multi_json'
 require 'htmlentities'
-if RUBY_VERSION.to_i < 2
-  require 'iconv'
-end
+require 'iconv' if RUBY_VERSION.to_i < 2
 class VideoInfo
   module Providers
@@ -44,7 +37,7 @@ class VideoInfo
       end
       def view_count
-        data[/mv_num_views\\">(\d+)/,1].to_i
+        data[/mv_num_views\\">.*?(\d+)/,1].to_i
       end
       def embed_url
@@ -58,7 +51,7 @@ class VideoInfo
       private
       def _set_data_from_api
-        uri = open(_api_url, options)
+        uri = open(url, options)
         if RUBY_VERSION.to_i < 2
           Iconv.iconv('utf-8', 'cp1251', uri.read)[0]
         else
@@ -71,15 +64,11 @@ class VideoInfo
       end
       def _set_video_id_from_url
-        url.gsub(_url_regex) { @video_owner, @video_id = ($1 || $2 || $3).split('_') }
+        url.gsub(_url_regex) { @video_owner, @video_id = $1.split('_') }
       end
       def _url_regex
-        /(?:vkontakte\.ru\/video|vk\.com\/video)(\d+_\d+)/i
-      end
-      def _api_url
-        "http://vk.com/video#{video_owner}_#{video_id}"
+        /(?:vkontakte\.ru\/video|vk\.com\/video)(-?\d+_\d+)/i
       end
       def _default_iframe_attributes

data/lib/video_info/providers/youtube.rb CHANGED Viewed

@@ -1,6 +1,3 @@
-require 'open-uri'
-require 'multi_json'
 class VideoInfo
   module Providers
     class Youtube < Provider

data/lib/video_info/version.rb CHANGED Viewed

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

data/spec/fixtures/vcr_cassettes/VideoInfo_Providers_Vkontakte/with_video_39576223_108370515/description/.yml CHANGED Viewed

@@ -1095,4 +1095,45 @@ http_interactions:
         c2NyaXB0Pgo8L2JvZHk+Cgo8L2h0bWw+
     http_version:
   recorded_at: Fri, 25 Oct 2013 20:34:00 GMT
+- request:
+    method: get
+    uri: http://vk.com/video_
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - VideoInfo/2.0.0
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+  response:
+    status:
+      code: 404
+      message: Not Found
+    headers:
+      Server:
+      - nginx/1.2.4
+      Date:
+      - Sat, 26 Oct 2013 11:12:56 GMT
+      Content-Type:
+      - text/html
+      Content-Length:
+      - '397'
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: |
+        <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
+        <html><head>
+        <title>404 Not Found</title>
+        </head>
+          <body style="background: #3f5d81 url(http://vk.me/images/error404.png) no-repeat 50% 50%; width: 100%; height: 100%; overflow: hidden;">
+            <a style="position: absolute; left: 50%; top: 50%; margin: -265px -345px 0px; height: 530px; width: 690px;" href="http://vk.com/"></a>
+          </body>
+        </html>
+    http_version:
+  recorded_at: Sat, 26 Oct 2013 11:12:56 GMT
 recorded_with: VCR 2.6.0

data/spec/fixtures/vcr_cassettes/VideoInfo_Providers_Vkontakte/with_video_39576223_108370515/duration/.yml CHANGED Viewed

@@ -1095,4 +1095,45 @@ http_interactions:
         c2NyaXB0Pgo8L2JvZHk+Cgo8L2h0bWw+
     http_version:
   recorded_at: Fri, 25 Oct 2013 20:34:00 GMT
+- request:
+    method: get
+    uri: http://vk.com/video_
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - VideoInfo/2.0.0
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+  response:
+    status:
+      code: 404
+      message: Not Found
+    headers:
+      Server:
+      - nginx/1.2.4
+      Date:
+      - Sat, 26 Oct 2013 11:12:57 GMT
+      Content-Type:
+      - text/html
+      Content-Length:
+      - '397'
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: |
+        <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
+        <html><head>
+        <title>404 Not Found</title>
+        </head>
+          <body style="background: #3f5d81 url(http://vk.me/images/error404.png) no-repeat 50% 50%; width: 100%; height: 100%; overflow: hidden;">
+            <a style="position: absolute; left: 50%; top: 50%; margin: -265px -345px 0px; height: 530px; width: 690px;" href="http://vk.com/"></a>
+          </body>
+        </html>
+    http_version:
+  recorded_at: Sat, 26 Oct 2013 11:12:57 GMT
 recorded_with: VCR 2.6.0

data/spec/fixtures/vcr_cassettes/VideoInfo_Providers_Vkontakte/with_video_39576223_108370515/embed_code/.yml CHANGED Viewed

@@ -1095,4 +1095,45 @@ http_interactions:
         L3NjcmlwdD4KPC9ib2R5PgoKPC9odG1sPg==
     http_version:
   recorded_at: Fri, 25 Oct 2013 20:33:59 GMT
+- request:
+    method: get
+    uri: http://vk.com/video_
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - VideoInfo/2.0.0
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+  response:
+    status:
+      code: 404
+      message: Not Found
+    headers:
+      Server:
+      - nginx/1.2.4
+      Date:
+      - Sat, 26 Oct 2013 11:12:56 GMT
+      Content-Type:
+      - text/html
+      Content-Length:
+      - '397'
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: |
+        <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
+        <html><head>
+        <title>404 Not Found</title>
+        </head>
+          <body style="background: #3f5d81 url(http://vk.me/images/error404.png) no-repeat 50% 50%; width: 100%; height: 100%; overflow: hidden;">
+            <a style="position: absolute; left: 50%; top: 50%; margin: -265px -345px 0px; height: 530px; width: 690px;" href="http://vk.com/"></a>
+          </body>
+        </html>
+    http_version:
+  recorded_at: Sat, 26 Oct 2013 11:12:56 GMT
 recorded_with: VCR 2.6.0

data/spec/fixtures/vcr_cassettes/VideoInfo_Providers_Vkontakte/with_video_39576223_108370515/embed_url/.yml CHANGED Viewed

@@ -1095,4 +1095,45 @@ http_interactions:
         L3NjcmlwdD4KPC9ib2R5PgoKPC9odG1sPg==
     http_version:
   recorded_at: Fri, 25 Oct 2013 20:33:59 GMT
+- request:
+    method: get
+    uri: http://vk.com/video_
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - VideoInfo/2.0.0
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+  response:
+    status:
+      code: 404
+      message: Not Found
+    headers:
+      Server:
+      - nginx/1.2.4
+      Date:
+      - Sat, 26 Oct 2013 11:12:56 GMT
+      Content-Type:
+      - text/html
+      Content-Length:
+      - '397'
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: |
+        <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
+        <html><head>
+        <title>404 Not Found</title>
+        </head>
+          <body style="background: #3f5d81 url(http://vk.me/images/error404.png) no-repeat 50% 50%; width: 100%; height: 100%; overflow: hidden;">
+            <a style="position: absolute; left: 50%; top: 50%; margin: -265px -345px 0px; height: 530px; width: 690px;" href="http://vk.com/"></a>
+          </body>
+        </html>
+    http_version:
+  recorded_at: Sat, 26 Oct 2013 11:12:56 GMT
 recorded_with: VCR 2.6.0

data/spec/fixtures/vcr_cassettes/VideoInfo_Providers_Vkontakte/with_video_39576223_108370515/height/.yml CHANGED Viewed

@@ -1095,4 +1095,45 @@ http_interactions:
         c2NyaXB0Pgo8L2JvZHk+Cgo8L2h0bWw+
     http_version:
   recorded_at: Fri, 25 Oct 2013 20:34:00 GMT
+- request:
+    method: get
+    uri: http://vk.com/video_
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - VideoInfo/2.0.0
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+  response:
+    status:
+      code: 404
+      message: Not Found
+    headers:
+      Server:
+      - nginx/1.2.4
+      Date:
+      - Sat, 26 Oct 2013 11:12:57 GMT
+      Content-Type:
+      - text/html
+      Content-Length:
+      - '397'
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: |
+        <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
+        <html><head>
+        <title>404 Not Found</title>
+        </head>
+          <body style="background: #3f5d81 url(http://vk.me/images/error404.png) no-repeat 50% 50%; width: 100%; height: 100%; overflow: hidden;">
+            <a style="position: absolute; left: 50%; top: 50%; margin: -265px -345px 0px; height: 530px; width: 690px;" href="http://vk.com/"></a>
+          </body>
+        </html>
+    http_version:
+  recorded_at: Sat, 26 Oct 2013 11:12:57 GMT
 recorded_with: VCR 2.6.0

data/spec/fixtures/vcr_cassettes/VideoInfo_Providers_Vkontakte/with_video_39576223_108370515/keywords/.yml CHANGED Viewed

@@ -1095,4 +1095,45 @@ http_interactions:
         c2NyaXB0Pgo8L2JvZHk+Cgo8L2h0bWw+
     http_version:
   recorded_at: Fri, 25 Oct 2013 20:34:00 GMT
+- request:
+    method: get
+    uri: http://vk.com/video_
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - VideoInfo/2.0.0
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+  response:
+    status:
+      code: 404
+      message: Not Found
+    headers:
+      Server:
+      - nginx/1.2.4
+      Date:
+      - Sat, 26 Oct 2013 11:12:57 GMT
+      Content-Type:
+      - text/html
+      Content-Length:
+      - '397'
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: |
+        <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
+        <html><head>
+        <title>404 Not Found</title>
+        </head>
+          <body style="background: #3f5d81 url(http://vk.me/images/error404.png) no-repeat 50% 50%; width: 100%; height: 100%; overflow: hidden;">
+            <a style="position: absolute; left: 50%; top: 50%; margin: -265px -345px 0px; height: 530px; width: 690px;" href="http://vk.com/"></a>
+          </body>
+        </html>
+    http_version:
+  recorded_at: Sat, 26 Oct 2013 11:12:57 GMT
 recorded_with: VCR 2.6.0

data/spec/fixtures/vcr_cassettes/VideoInfo_Providers_Vkontakte/with_video_39576223_108370515/title/.yml CHANGED Viewed

@@ -1095,4 +1095,45 @@ http_interactions:
         L3NjcmlwdD4KPC9ib2R5PgoKPC9odG1sPg==
     http_version:
   recorded_at: Fri, 25 Oct 2013 20:33:59 GMT
+- request:
+    method: get
+    uri: http://vk.com/video_
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - VideoInfo/2.0.0
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+  response:
+    status:
+      code: 404
+      message: Not Found
+    headers:
+      Server:
+      - nginx/1.2.4
+      Date:
+      - Sat, 26 Oct 2013 11:12:56 GMT
+      Content-Type:
+      - text/html
+      Content-Length:
+      - '397'
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: |
+        <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
+        <html><head>
+        <title>404 Not Found</title>
+        </head>
+          <body style="background: #3f5d81 url(http://vk.me/images/error404.png) no-repeat 50% 50%; width: 100%; height: 100%; overflow: hidden;">
+            <a style="position: absolute; left: 50%; top: 50%; margin: -265px -345px 0px; height: 530px; width: 690px;" href="http://vk.com/"></a>
+          </body>
+        </html>
+    http_version:
+  recorded_at: Sat, 26 Oct 2013 11:12:56 GMT
 recorded_with: VCR 2.6.0

data/spec/fixtures/vcr_cassettes/VideoInfo_Providers_Vkontakte/with_video_39576223_108370515/view_count/.yml CHANGED Viewed

@@ -1095,4 +1095,45 @@ http_interactions:
         c2NyaXB0Pgo8L2JvZHk+Cgo8L2h0bWw+
     http_version:
   recorded_at: Fri, 25 Oct 2013 20:34:00 GMT
+- request:
+    method: get
+    uri: http://vk.com/video_
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - VideoInfo/2.0.0
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+  response:
+    status:
+      code: 404
+      message: Not Found
+    headers:
+      Server:
+      - nginx/1.2.4
+      Date:
+      - Sat, 26 Oct 2013 11:12:58 GMT
+      Content-Type:
+      - text/html
+      Content-Length:
+      - '397'
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: |
+        <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
+        <html><head>
+        <title>404 Not Found</title>
+        </head>
+          <body style="background: #3f5d81 url(http://vk.me/images/error404.png) no-repeat 50% 50%; width: 100%; height: 100%; overflow: hidden;">
+            <a style="position: absolute; left: 50%; top: 50%; margin: -265px -345px 0px; height: 530px; width: 690px;" href="http://vk.com/"></a>
+          </body>
+        </html>
+    http_version:
+  recorded_at: Sat, 26 Oct 2013 11:12:58 GMT
 recorded_with: VCR 2.6.0