video_thumb 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e2c0deaffc0f6ee237c256e84eab81b159869a9f
-  data.tar.gz: 24319ee7d2eba9cebace79e6f04d92c2e7071e2b
+SHA256:
+  metadata.gz: 6888ae1ea891885747b25475f3a4c10db4a76a16936d48c1a8877a2f677da472
+  data.tar.gz: 4e4a771830e18b4173c50a9a0d55e448cc5882e650ae5212bc440e890a062822
 SHA512:
-  metadata.gz: 63e7aaf90ba7f2fb51b83254410a248559dd9fe144efdb0713985fbf397351575e2f2342bf0ab1766a4c99a8e856970540cba19ae89b51eb4333fed0732aa904
-  data.tar.gz: 81545d0ceafdbfd340173c324473cd71339948841b5c4cc41eb682f8c6c6fe106cd3ab67cc7969c195c695926541fd7d77076fd82dfe6f0ff55933e148ad75a2
+  metadata.gz: e78be4a60f4589de74446a6f4024e3e4fb47cee74aa02337d1763459d94afada8c5bdbd4994a7a184bc4c575dd9b8322884940305fcd0d4ad3edbbd383dedea0
+  data.tar.gz: b67321f0c1621ca470216ea7f23b621de1d9d73cd5d5167fec03ec1a9a13678bd24ea3e8b749e3dd313dcb6f41d53f12c72bf2a1c8c970f201655cf3ce81057d

data/README.md

@@ -82,4 +82,4 @@ VideoThumb::get("http://www.izlesene.com/video/feder-goodbye-feat-lyse/7886121")
 5. Create a new Pull Request
 
 **Thanks**
-[deegz](https://github.com/deegz) - [akosipc](https://github.com/akosipc)
+[deegz](https://github.com/deegz) - [akosipc](https://github.com/akosipc) - [adzierzanowski](https://github.com/adzierzanowski)

data/lib/video_thumb.rb

@@ -3,61 +3,80 @@ require 'video_thumb/version'
 require 'nokogiri'
 require 'open-uri'
 require 'json'
+require 'uri'
+require 'net/http'
 
 module VideoThumb
-  def self.get url, size = 'large'
-    # size_parameter = { 'small', 'medium', 'large', 'max'}
-
-    # youtube
-    #   default: small - 120x90
-    #   mqdefault: medium - 320x180
-    #   hqdefault: high - 480x360
-    #   sddefault: 640x480
-    #   maxresdefault: original
-
-    # vimeo
-    #   thumbnail_small: 100x75
-    #   thumbnail_medium: 200x150
-    #   thumbnail_large: 640xauto
-
-    case size
-    when "small"
-      youtube_size  = 'default'
-      vimeo_size    = 'thumbnail_small'
-    when "medium"
-      youtube_size  = 'mqdefault'
-      vimeo_size    = 'thumbnail_medium'
-    when "large"
-      youtube_size  = 'sddefault'
-      vimeo_size    = 'thumbnail_large'
-    when "max"
-      youtube_size  = 'maxresdefault'
-      vimeo_size    = 'thumbnail_large'
-    else
-      youtube_size  = 'sddefault'
-      vimeo_size    = 'thumbnail_large'
-    end
+  class << self
+    def get(url, size = 'large')
+      # size_parameter = { 'small', 'medium', 'large', 'max'}
 
-    if url.include?('youtu.be') || url.include?('youtube')
-      regex = /(https?:\/\/)?(www.)?(youtube\.com\/watch\?v=|youtu\.be\/|youtube\.com\/watch\?feature=player_embedded&v=)([A-Za-z0-9_-]*)(\&\S+)?(\?\S+)?/
-      url.gsub(regex) do
-        youtube_video_id = $4
-        image = "https://img.youtube.com/vi/#{youtube_video_id}/#{youtube_size}.jpg"
-        return image
+      # youtube
+      #   default: small - 120x90
+      #   mqdefault: medium - 320x180
+      #   hqdefault: high - 480x360
+      #   sddefault: 640x480
+      #   maxresdefault: original
+
+      # vimeo
+      #   thumbnail_small: 100x75
+      #   thumbnail_medium: 200x150
+      #   thumbnail_large: 640xauto
+
+      case size
+      when 'small'
+        youtube_size  = 'default'
+        vimeo_size    = 'thumbnail_small'
+      when 'medium'
+        youtube_size  = 'mqdefault'
+        vimeo_size    = 'thumbnail_medium'
+      when 'large'
+        youtube_size  = 'sddefault'
+        vimeo_size    = 'thumbnail_large'
+      when 'max'
+        youtube_size  = 'maxresdefault'
+        vimeo_size    = 'thumbnail_large'
+      else
+        youtube_size  = 'sddefault'
+        vimeo_size    = 'thumbnail_large'
       end
-    elsif url.include?('vimeo')
-      regex = /^https?:\/\/(?:.*?)\.?(vimeo)\.com\/(\d+).*$/
-      url.gsub(regex) do
-        vimeo_video_id = $2
-        vimeo_video_json_url = 'http://vimeo.com/api/v2/video/%s.json' % vimeo_video_id
-        image = JSON.parse(open(vimeo_video_json_url).read).first[vimeo_size] rescue nil
+
+      if url.include?('youtu.be') || url.include?('youtube')
+        regex = /(https?:\/\/)?(www.)?(youtube\.com\/watch\?v=|youtu\.be\/|youtube\.com\/watch\?[A-Za-z0-9_=-]+&v=)([A-Za-z0-9_-]*)(\&\S+)?(\?\S+)?/
+        url.gsub(regex) do
+          youtube_video_id = Regexp.last_match(4)
+          image = "https://img.youtube.com/vi/#{youtube_video_id}/#{youtube_size}.jpg"
+          return image
+        end
+      elsif url.include?('vimeo')
+        regex = /^https?:\/\/(?:.*?)\.?(vimeo)\.com\/(\d+).*$/
+        url = get_redirect_url(url) unless regex.match?(url)
+        url.gsub(regex) do
+          vimeo_video_id = Regexp.last_match(2)
+          vimeo_video_json_url = format('http://vimeo.com/api/v2/video/%s.json', vimeo_video_id)
+          image = begin
+                    JSON.parse(open(vimeo_video_json_url).read).first[vimeo_size]
+                  rescue StandardError
+                    nil
+                  end
+          return image
+        end
+      elsif url.include?('izlesene')
+        image = Nokogiri::HTML(open(url)).css("meta[property='og:image']").at_css('meta[property="og:image"]')['content']
         return image
+      else
+        return false
       end
-    elsif url.include?('izlesene')
-      image = Nokogiri::HTML(open(url)).css("meta[property='og:image']").at_css('meta[property="og:image"]')['content']
-      return image
-    else
-      return false
+    end
+
+    private
+
+    def get_redirect_url(url)
+      parsed_url = URI(url)
+      http = Net::HTTP.new(parsed_url.host, parsed_url.port)
+      http.use_ssl = true
+      location = http.get(parsed_url.path).header['location']
+      "#{parsed_url.scheme}://#{parsed_url.host}#{location}"
     end
   end
 end

data/lib/video_thumb/version.rb

@@ -1,3 +1,3 @@
 module VideoThumb
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/test/video_thumb_test.rb

@@ -3,12 +3,22 @@ require 'video_thumb'
 
 class VideoThumbTest < Minitest::Test
   def test_youtube_video
-    assert_equal "https://img.youtube.com/vi/iEPTlhBmwRg/mqdefault.jpg", VideoThumb::get("http://www.youtube.com/watch?v=iEPTlhBmwRg", "medium")
+    assert_equal 'https://img.youtube.com/vi/iEPTlhBmwRg/mqdefault.jpg', VideoThumb.get('http://www.youtube.com/watch?v=iEPTlhBmwRg', 'medium')
   end
+
   def test_vimeo_video
-    assert_equal "http://i.vimeocdn.com/video/483188148_640.jpg", VideoThumb::get("http://vimeo.com/101419884")
+    assert_equal 'http://i.vimeocdn.com/video/483188148_640.jpg', VideoThumb.get('http://vimeo.com/101419884')
   end
+
   def test_secure_vimeo_video
-    assert_equal "http://i.vimeocdn.com/video/483188148_640.jpg", VideoThumb::get("https://vimeo.com/101419884")
+    assert_equal 'http://i.vimeocdn.com/video/483188148_640.jpg', VideoThumb.get('https://vimeo.com/101419884')
+  end
+
+  def test_aliased_vimeo_video
+    assert_equal 'http://i.vimeocdn.com/video/699818221_640.jpg', VideoThumb.get('https://vimeo.com/madeinyuhara/watasinoinaihoshi')
+  end
+
+  def test_reversed_url_params
+    assert_equal 'https://img.youtube.com/vi/9BOuRUlRKzA/sddefault.jpg', VideoThumb.get('https://www.youtube.com/watch?time_continue=3&v=9BOuRUlRKzA')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: video_thumb
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Tolga Gezginiş
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2018-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Youtube, Vimeo and İzlesene thumbnails