youtube_rails 1.2.3 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86f7224eee425af232a74d07e4acb689f9e3ec3907d96ba479e561a884e8a0ac
-  data.tar.gz: e1c60b63ef630a7d77b0f7d1d4c5e172984e20c83f46c29be563831e011a98c9
+  metadata.gz: 8d1b81a5c7528335893d18d5e6ffad8da532b612851a47e6873a04e6d51206fe
+  data.tar.gz: 36767e4ac2e364e1ed8b1a7fd8250ebbfcf5f3b783a12cc5f852b6501de358e9
 SHA512:
-  metadata.gz: a0ba62d3d5160f52d90e0eccd28204f9587cbe3e7b69fa9e11e923fe62d92e35c214ea10816c8c5af6cea7747a3daa9aa6e196b5de2bd478eb021ab67e379ca6
-  data.tar.gz: '039ad878a6d2f32ce06207b842043a1f23a674a68a2c3c18e9946abe42f9ac3877eb82a8ac1b43c144fae8c236df05166d5979e9e61f756cbf883e93b6b5919a'
+  metadata.gz: b09579bc900465574939882a12abb9c3ba7b87b5c8c40e999f08be48fb2f50cd7d69498ce607523a6c228b463a072b8ffbc98b2ce32b6b1f83c2dca66ee5d969
+  data.tar.gz: 499bf7175c62027e7cfafe750b17e890e5225061f456ddad273b5218e861d348fe5281697fbd3fc3592e6c0192a0ce5cde2445b0f6599d6e4576adc07a511bc8

data/lib/youtube_rails.rb

@@ -1,13 +1,46 @@
 class YouTubeRails
-  URL_FORMATS = {
-      regular: /^(https?:\/\/)?(www\.)?youtube.com\/watch\?(.*\&)?v=(?<id>[^&]+)/,
-      shortened: /^(https?:\/\/)?(www\.)?youtu.be\/(?<id>[^&]+)/,
-      embed: /^(https?:\/\/)?(www\.)?youtube.com\/embed\/(?<id>[^&]+)/,
-      embed_as3: /^(https?:\/\/)?(www\.)?youtube.com\/v\/(?<id>[^?]+)/,
-      chromeless_as3: /^(https?:\/\/)?(www\.)?youtube.com\/apiplayer\?video_id=(?<id>[^&]+)/
+  # Converts a list of domains into a regex matching them at the start of a string
+  def self._domains_to_regex(domains)
+    pattern = [
+      '^(',
+      domains.map {|d| Regexp.quote(d) }.join('|'),
+      ')/'
+    ].join('')
+    
+    Regexp.new(pattern, Regexp::IGNORECASE | Regexp::MULTILINE)
+  end
+
+  SCHEME_FORMAT = %r{(https?:|)//}i
+  SHORTURL_DOMAIN = 'youtu.be'
+  # Some URLs are interchangeable with others. The keys here are just an ID.
+  DOMAIN_ALIASES = {
+    'youtube.com' => %w{www.youtube.com
+                            youtube.com
+                          m.youtube.com
+                        www.youtube-nocookie.com},
+    SHORTURL_DOMAIN => [SHORTURL_DOMAIN],
   }
+  DOMAIN_REGEX = DOMAIN_ALIASES.map do |placeholder, domains|
+    [placeholder, _domains_to_regex(domains)]
+  end.to_h
 
-  INVALID_CHARS = /[^a-zA-Z0-9\:\/\?\=\&\$\-\_\.\+\!\*\'\(\)\,]/
+  ID = %r{(?<id>[0-9a-zA-Z_-]+)} # URL-safe Base64 ID
+  ANYPARAMS = %r{([^;&]*[&;])*} # Zero or more URL parameters
+  URL_FORMATS = [
+    %r{^(watch|ytscreeningroom)\?#{ANYPARAMS}v=#{ID}}mi,
+    %r{^(v|e|embed|shorts)/#{ID}}mi,
+    %r{^oembed\?#{ANYPARAMS}url=[^&;]+watch(%3f|\?)v(=|%3d)#{ID}}mi, # accepts encoded delims
+    %r{^attribution_link\?#{ANYPARAMS}u=(/|%2f)watch(%3f|\?)v(=|%3d)#{ID}}mi, # ditto
+    %r{^apiplayer\?#{ANYPARAMS}video_id=#{ID}}mi,
+  ]
+  SHORTURL_FORMATS = [
+    %r{^#{ID}}i,
+  ]
+  
+  # See reserved and unreserved characters here:
+  # https://www.rfc-editor.org/rfc/rfc3986#appendix-A
+  # Note, % character must also be included, as this is used in pct-encoded escapes.
+  INVALID_CHARS = %r{[^a-zA-Z0-9:/?=&$\-_.+!*'(),~#\[\]@;%]}
 
   def self.has_invalid_chars?(youtube_url)
     !INVALID_CHARS.match(youtube_url).nil?
@@ -15,8 +48,23 @@ class YouTubeRails
 
   def self.extract_video_id(youtube_url)
     return nil if has_invalid_chars?(youtube_url)
+    youtube_url = youtube_url
+                    .strip # remove whitespace before and after
+                    .sub(%r{^#{SCHEME_FORMAT}}, '') # remove valid schemes
+
+    # Deal with shortened URLs as a special case
+    if youtube_url.sub!(DOMAIN_REGEX['youtu.be'], '')
+      SHORTURL_FORMATS.each do |regex|
+        match = youtube_url.match(regex)
+        return match[:id] if match
+      end
+      return nil # No matches
+    end
 
-    URL_FORMATS.values.inject(nil) do |result, format_regex|
+    # Ensure one of the regular allows domains matches
+    return nil unless youtube_url.sub!(DOMAIN_REGEX['youtube.com'], '')
+    
+    URL_FORMATS.inject(nil) do |result, format_regex|
       match = format_regex.match(youtube_url)
       match ? match[:id] : result
     end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: youtube_rails
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
 platform: ruby
 authors:
 - Luiz Picolo
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2016-04-11 00:00:00.000000000 Z
@@ -20,7 +20,7 @@ files:
 homepage: https://github.com/luizpicolo/youtube_rails/
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -35,8 +35,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key: 
+rubygems_version: 3.4.1
+signing_key:
 specification_version: 4
 summary: YouTube address helper
 test_files: []