ruby-oembed 0.8.14 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f272f1578d7a957040f57d7be37efd0d5f3d0c38
-  data.tar.gz: aa9c139bd3f26aeafd8a591331a0e3c3ba8160ea
+  metadata.gz: 7678131f1e0f05d6cb7a47c34fc92965fbfafb93
+  data.tar.gz: a1c6ccaca29f4f001027eb6e51c1ca6016fafaac
 SHA512:
-  metadata.gz: d0793e3de5c2a4ffc40c75cefceab7890bf6ab43b24cd8e5f9da7ac37f8732074170f80cf384d63e7f656a391e526f254d06535c3aec4d5456c60b7a3c36bf3b
-  data.tar.gz: 25b144a3c8c6682ae9e1d5c99a1cede9cf8013ce9cbc83e05b50f0401eca8e11ad1bfab7e986cef2a08cca2cf5c49ad3d83ae98f849f17525bb1d9d2d802ab7a
+  metadata.gz: 50f755636f113f3b8c05beffceb1de302ee3285b6b353a5d2d62577984372d3fc99844aabc4a89176aed9c919a0bbaf7c6c32c9b4ad78948c512d6f97e4e6a8f
+  data.tar.gz: 950b05436f26c660fd0d0978e8c9883625859b6e9f7c6cb977599c33cf8ced1b064f36ca4057ece5e7d31fb41e67e7dd3e6eae13532a2593bee919997a878216

data/.gitignore

@@ -5,3 +5,6 @@
 Gemfile.lock
 .yardoc
 .DS_Store
+/.rvm
+/.ruby-version
+/.ruby-gemset

data/.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
+before_install:
+  - gem install bundler --version="~> 1.10"
 cache: bundler
 rvm:
   - 1.9.3

data/CHANGELOG.rdoc

@@ -1,5 +1,13 @@
 = CHANGELOG
 
+== 0.9.0 - 12 December 2015
+
+* Add support for HTTP redirects in ProviderDiscovery; Pull #39 (Sebastian de Castelberg) and Pull #38 (Sven Schwyn)
+* Add support for a :max_redirects option to Provider#get and ProviderDiscovery#get  (Marcos Wright-Kuhns)
+* Change built-in YouTube, Slideshare, Yfrog, Scribd, & SoundCloud providers to use the https oembed endpoint; Pull #48 (Javan Makhmali)
+* Change built-in Instagram provider to recognize URLs in the www subdomain; Pull #52 (Javan Makhmali)
+* Updated the list of {Embedly}[http://embed.ly] URL schemes. (Marcos Wright-Kuhns)
+
 == 0.8.14 - 25 April 2015
 
 * Change built-in Vimeo provider to use https oembed endpoint; Pull #44 (Jonne Haß)

data/Gemfile

@@ -1,3 +1,11 @@
 source "https://rubygems.org"
 
+# Travis CI was running into several bundler-related bug
+# * https://github.com/bundler/bundler/pull/3559
+# * https://github.com/bundler/bundler/issues/3560
+# that only apply to older versions of Bundler.
+# I added this requirement so that future Travis CI builds
+# fail quickly if an old version of bundler is being used.
+gem 'bundler', '~>1.10'
+
 gemspec

data/lib/oembed/http_helper.rb

@@ -0,0 +1,64 @@
+module OEmbed
+  module HttpHelper
+
+    private
+
+    # Given a URI, make an HTTP request
+    #
+    # The options Hash recognizes the following keys:
+    # :timeout:: specifies the timeout (in seconds) for the http request.
+    # :max_redirects:: the number of times this request will follow 3XX redirects before throwing an error. Default: 4
+    def http_get(uri, options = {})
+      found = false
+      remaining_redirects = options[:max_redirects] ? options[:max_redirects].to_i : 4
+      until found
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = uri.scheme == 'https'
+        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        http.read_timeout = http.open_timeout = options[:timeout] if options[:timeout]
+
+        methods = if RUBY_VERSION < "2.2"
+            %w{scheme userinfo host port registry}
+        else
+            %w{scheme userinfo host port}
+        end
+        methods.each { |method| uri.send("#{method}=", nil) }
+        req = Net::HTTP::Get.new(uri.to_s)
+        req['User-Agent'] = "Mozilla/5.0 (compatible; ruby-oembed/#{OEmbed::VERSION})"
+        res = http.request(req)
+
+        if remaining_redirects == 0
+          found = true
+        elsif res.is_a?(Net::HTTPRedirection) && res.header['location']
+          uri = URI.parse(res.header['location'])
+          remaining_redirects -= 1
+        else
+          found = true
+        end
+      end
+
+      case res
+      when Net::HTTPNotImplemented
+        raise OEmbed::UnknownFormat
+      when Net::HTTPNotFound
+        raise OEmbed::NotFound, uri
+      when Net::HTTPSuccess
+        res.body
+      else
+        raise OEmbed::UnknownResponse, res && res.respond_to?(:code) ? res.code : 'Error'
+      end
+    rescue StandardError
+      # Convert known errors into OEmbed::UnknownResponse for easy catching
+      # up the line. This is important if given a URL that doesn't support
+      # OEmbed. The following are known errors:
+      # * Net::* errors like Net::HTTPBadResponse
+      # * JSON::JSONError errors like JSON::ParserError
+      if defined?(::JSON) && $!.is_a?(::JSON::JSONError) || $!.class.to_s =~ /\ANet::/
+        raise OEmbed::UnknownResponse, res && res.respond_to?(:code) ? res.code : 'Error'
+      else
+        raise $!
+      end
+    end
+
+  end
+end

data/lib/oembed/provider.rb

@@ -1,33 +1,36 @@
 require 'cgi'
+require 'oembed/http_helper'
+
 module OEmbed
   # An OEmbed::Provider has information about an individual oEmbed enpoint.
   class Provider
-    
+    include OEmbed::HttpHelper
+
     # The String that is the http URI of the Provider's oEmbed endpoint.
     # This URL may also contain a {{format}} portion. In actual requests to
     # this Provider, this string will be replaced with a string representing
     # the request format (e.g. "json").
     attr_accessor :endpoint
-    
+
     # The name of the default format for all request to this Provider (e.g. 'json').
     attr_accessor :format
-    
+
     # An Array of all URL schemes supported by this Provider.
     attr_accessor :urls
-    
+
     # The human-readable name of the Provider.
     #
     # @deprecated *Note*: This accessor currently isn't used anywhere in the codebase.
     attr_accessor :name
-    
+
     # @deprecated *Note*: Added in a fork of the gem, a while back. I really would like
     # to get rid of it, though. --Marcos
     attr_accessor :url
-    
+
 
     # Construct a new OEmbed::Provider instance, pointing at a specific oEmbed
     # endpoint.
-    # 
+    #
     # The endpoint should be a String representing the http URI of the Provider's
     # oEmbed endpoint. The endpoint String may also contain a {format} portion.
     # In actual requests to this Provider, this string will be replaced with a String
@@ -35,7 +38,7 @@ module OEmbed
     #
     # If give, the format should be the name of the default format for all request
     # to this Provider (e.g. 'json'). Defaults to OEmbed::Formatter.default
-    # 
+    #
     # For example:
     #   # If requests should be sent to:
     #   # "http://my.service.com/oembed?format=#{OEmbed::Formatter.default}"
@@ -47,7 +50,7 @@ module OEmbed
     def initialize(endpoint, format = OEmbed::Formatter.default)
       endpoint_uri = URI.parse(endpoint.gsub(/[\{\}]/,'')) rescue nil
       raise ArgumentError, "The given endpoint isn't a valid http(s) URI: #{endpoint.to_s}" unless endpoint_uri.is_a?(URI::HTTP)
-      
+
       @endpoint = endpoint
       @urls = []
       @format = format
@@ -57,7 +60,7 @@ module OEmbed
     # The url scheme can be either a String, containing wildcards specified
     # with an asterisk, (see http://oembed.com/#section2.1 for details),
     # or a Regexp.
-    # 
+    #
     # For example:
     #   @provider << "http://my.service.com/video/*"
     #   @provider << "http://*.service.com/photo/*/slideshow"
@@ -81,11 +84,12 @@ module OEmbed
     # :timeout:: specifies the timeout (in seconds) for the http request.
     # :format:: overrides this Provider's default request format.
     # :url:: will be ignored, replaced by the url param.
+    # :max_redirects:: the number of times this request will follow 3XX redirects before throwing an error. Default: 4
     def get(url, query = {})
       query[:format] ||= @format
       OEmbed::Response.create_for(raw(url, query), self, url, query[:format].to_s)
     end
-    
+
     # Determine whether the given url is supported by this Provider by matching
     # against the Provider's URL schemes.
     def include?(url)
@@ -98,10 +102,11 @@ module OEmbed
 
       query = query.merge({:url => ::CGI.escape(url)})
       query.delete(:timeout)
+      query.delete(:max_redirects)
 
       # TODO: move this code exclusively into the get method, once build is private.
       this_format = (query[:format] ||= @format.to_s).to_s
-      
+
       endpoint = @endpoint.clone
 
       if endpoint.include?("{format}")
@@ -126,56 +131,10 @@ module OEmbed
     # @deprecated *Note*: This method will be made private in the future.
     def raw(url, query = {})
       uri = build(url, query)
-      
-      found = false
-      max_redirects = 4
-      until found
-        http = Net::HTTP.new(uri.host, uri.port)
-        http.use_ssl = uri.scheme == 'https'
-        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-        http.read_timeout = http.open_timeout = query[:timeout] if query[:timeout]
-        
-        methods = if RUBY_VERSION < "2.2"
-            %w{scheme userinfo host port registry}
-        else
-            %w{scheme userinfo host port}
-        end
-        methods.each { |method| uri.send("#{method}=", nil) }
-        req = Net::HTTP::Get.new(uri.to_s)
-        req['User-Agent'] = "Mozilla/5.0 (compatible; ruby-oembed/#{OEmbed::VERSION})"
-        res = http.request(req)
-        
-        #res = Net::HTTP.start(uri.host, uri.port) {|http| http.get(uri.request_uri) }
-        
-        res.header['location'] ? uri = URI.parse(res.header['location']) : found = true
-        if max_redirects == 0
-          found = true
-        else
-          max_redirects -= 1
-        end
-      end
-      
-      case res
-      when Net::HTTPNotImplemented
-        raise OEmbed::UnknownFormat, format
-      when Net::HTTPNotFound
-        raise OEmbed::NotFound, url
-      when Net::HTTPSuccess
-        res.body
-      else
-        raise OEmbed::UnknownResponse, res && res.respond_to?(:code) ? res.code : 'Error'
-      end
-    rescue StandardError
-      # Convert known errors into OEmbed::UnknownResponse for easy catching
-      # up the line. This is important if given a URL that doesn't support
-      # OEmbed. The following are known errors:
-      # * Net::* errors like Net::HTTPBadResponse
-      # * JSON::JSONError errors like JSON::ParserError
-      if defined?(::JSON) && $!.is_a?(::JSON::JSONError) || $!.class.to_s =~ /\ANet::/
-        raise OEmbed::UnknownResponse, res && res.respond_to?(:code) ? res.code : 'Error'
-      else
-        raise $!
-      end
+      http_get(uri, query)
+    rescue OEmbed::UnknownFormat
+      # raise with format to be backward compatible
+      raise OEmbed::UnknownFormat, format
     end
   end
 end

data/lib/oembed/provider_discovery.rb

@@ -1,15 +1,19 @@
+require 'oembed/http_helper'
+
 module OEmbed
   # Uses {oEmbed Discover}[http://oembed.com/#section4] to generate a new Provider
   # instance about a URL for which a Provider didn't previously exist.
   class ProviderDiscovery
     class << self
 
+    include OEmbed::HttpHelper
+
     # Discover the Provider for the given url, then call Provider#raw on that provider.
     # The query parameter will be passed to both discover_provider and Provider#raw
     # @deprecated *Note*: This method will be made private in the future.
     def raw(url, query={})
       provider = discover_provider(url, query)
-      provider.raw(url, options)
+      provider.raw(url, query)
     end
 
     # Discover the Provider for the given url, then call Provider#get on that provider.
@@ -24,44 +28,36 @@ module OEmbed
     #
     # The options Hash recognizes the following keys:
     # :format:: If given only discover endpoints for the given format. If not format is given, use the first available format found.
+    # :timeout:: specifies the timeout (in seconds) for the http request.
+    # :max_redirects:: the number of times this request will follow 3XX redirects before throwing an error. Default: 4
     def discover_provider(url, options = {})
       uri = URI.parse(url)
 
-      res = Net::HTTP.start(uri.host, uri.port) do |http|
-        http.get(uri.request_uri)
+      res = http_get(uri, options)
+      format = options[:format]
+
+      if format.nil? || format == :json
+        provider_endpoint ||= /<link.*href=['"]*([^\s'"]+)['"]*.*application\/json\+oembed.*>/.match(res)[1] rescue nil
+        provider_endpoint ||= /<link.*application\/json\+oembed.*href=['"]*([^\s'"]+)['"]*.*>/.match(res)[1] rescue nil
+        format ||= :json if provider_endpoint
+      end
+      if format.nil? || format == :xml
+        # {The specification}[http://oembed.com/#section4] says XML discovery should have
+        # type="text/xml+oembed" but some providers use type="application/xml+oembed"
+        provider_endpoint ||= /<link.*href=['"]*([^\s'"]+)['"]*.*(application|text)\/xml\+oembed.*>/.match(res)[1] rescue nil
+        provider_endpoint ||= /<link.*(application|text)\/xml\+oembed.*href=['"]*([^\s'"]+)['"]*.*>/.match(res)[2] rescue nil
+        format ||= :xml if provider_endpoint
       end
 
-      case res
-      when Net::HTTPNotFound
+      begin
+        provider_endpoint = URI.parse(provider_endpoint)
+        provider_endpoint.query = nil
+        provider_endpoint = provider_endpoint.to_s
+      rescue URI::Error
         raise OEmbed::NotFound, url
-      when Net::HTTPSuccess
-        format = options[:format]
-
-        if format.nil? || format == :json
-          provider_endpoint ||= /<link.*href=['"]*([^\s'"]+)['"]*.*application\/json\+oembed.*>/.match(res.body)[1] rescue nil
-          provider_endpoint ||= /<link.*application\/json\+oembed.*href=['"]*([^\s'"]+)['"]*.*>/.match(res.body)[1] rescue nil
-          format ||= :json if provider_endpoint
-        end
-        if format.nil? || format == :xml
-          # {The specification}[http://oembed.com/#section4] says XML discovery should have
-          # type="text/xml+oembed" but some providers use type="application/xml+oembed"
-          provider_endpoint ||= /<link.*href=['"]*([^\s'"]+)['"]*.*(application|text)\/xml\+oembed.*>/.match(res.body)[1] rescue nil
-          provider_endpoint ||= /<link.*(application|text)\/xml\+oembed.*href=['"]*([^\s'"]+)['"]*.*>/.match(res.body)[2] rescue nil
-          format ||= :xml if provider_endpoint
-        end
-
-        begin
-          provider_endpoint = URI.parse(provider_endpoint)
-          provider_endpoint.query = nil
-          provider_endpoint = provider_endpoint.to_s
-        rescue URI::Error
-          raise OEmbed::NotFound, url
-        end
-
-        Provider.new(provider_endpoint, format || OEmbed::Formatter.default)
-      else
-        raise OEmbed::UnknownResponse, res.code
       end
+
+      Provider.new(provider_endpoint, format || OEmbed::Formatter.default)
     end
 
     end

data/lib/oembed/providers.rb

@@ -136,7 +136,7 @@ module OEmbed
     #     OEmbed::Providers::Youtube.endpoint += "?iframe=0"
     # * To require https embed code
     #     OEmbed::Providers::Youtube.endpoint += "?scheme=https"
-    Youtube = OEmbed::Provider.new("http://www.youtube.com/oembed?scheme=https")
+    Youtube = OEmbed::Provider.new("https://www.youtube.com/oembed?scheme=https")
     Youtube << "http://*.youtube.com/*"
     Youtube << "https://*.youtube.com/*"
     Youtube << "http://*.youtu.be/*"
@@ -199,20 +199,22 @@ module OEmbed
     Instagram = OEmbed::Provider.new("https://api.instagram.com/oembed", :json)
     Instagram << "http://instagr.am/p/*"
     Instagram << "http://instagram.com/p/*"
+    Instagram << "http://www.instagram.com/p/*"
     Instagram << "https://instagr.am/p/*"
     Instagram << "https://instagram.com/p/*"
+    Instagram << "https://www.instagram.com/p/*"
     add_official_provider(Instagram)
 
     # Provider for slideshare.net
     # http://www.slideshare.net/developers/oembed
-    Slideshare = OEmbed::Provider.new("http://www.slideshare.net/api/oembed/2")
+    Slideshare = OEmbed::Provider.new("https://www.slideshare.net/api/oembed/2")
     Slideshare << "http://www.slideshare.net/*/*"
     Slideshare << "http://www.slideshare.net/mobile/*/*"
     add_official_provider(Slideshare)
 
     # Provider for yfrog
     # http://code.google.com/p/imageshackapi/wiki/OEMBEDSupport
-    Yfrog = OEmbed::Provider.new("http://www.yfrog.com/api/oembed", :json)
+    Yfrog = OEmbed::Provider.new("https://www.yfrog.com/api/oembed", :json)
     Yfrog << "http://yfrog.com/*"
     add_official_provider(Yfrog)
 
@@ -258,7 +260,7 @@ module OEmbed
     add_official_provider(NFBCanada)
 
     # Provider for scribd.com
-    Scribd = OEmbed::Provider.new("http://www.scribd.com/services/oembed")
+    Scribd = OEmbed::Provider.new("https://www.scribd.com/services/oembed")
     Scribd << "http://*.scribd.com/*"
     add_official_provider(Scribd)
 
@@ -274,7 +276,7 @@ module OEmbed
 
     # Provider for soundcloud.com
     # http://developers.soundcloud.com/docs/oembed
-    SoundCloud = OEmbed::Provider.new("http://soundcloud.com/oembed", :json)
+    SoundCloud = OEmbed::Provider.new("https://soundcloud.com/oembed", :json)
     SoundCloud << "http://*.soundcloud.com/*"
     SoundCloud << "https://*.soundcloud.com/*"
     add_official_provider(SoundCloud)

data/lib/oembed/providers/embedly_urls.yml

@@ -21,8 +21,10 @@
 - http://*.deviantart.com/gallery/*
 - http://*.deviantart.net/*/*.gif
 - http://*.deviantart.net/*/*.jpg
+- http://*.hosted.panopto.com/*
 - http://*.iplayerhd.com/player/video/*
 - http://*.iplayerhd.com/playerframe/*
+- http://*.kaltura.com/*
 - http://*.kastio.com/webcasts/*
 - http://*.kinomap.com/*
 - http://*.linkedin.com/company/*
@@ -30,6 +32,7 @@
 - http://*.linkedin.com/pub/*
 - http://*.looplogic.com/*
 - http://*.polarb.com/*
+- http://*.silk.co/explore/*
 - http://*.slideshare.net/*/*
 - http://*.smugmug.com/*
 - http://*.smugmug.com/*#*
@@ -88,6 +91,8 @@
 - http://achewood.com/*
 - http://achewood.com/index.php*
 - http://alkislarlayasiyorum.com/*
+- http://alpha.vrchive.com/*
+- http://alphahat.com/view/*
 - http://amzn.com/*
 - http://aniboom.com/animation-video/*
 - http://animal.discovery.com/videos/*
@@ -97,8 +102,11 @@
 - http://api.minoto-video.com/publishers/*/videos/*
 - http://api.shopstyle.com/action/apiVisitRetailer*
 - http://app.sliderocket.com/*
+- http://app.stghv.com/*
 - http://app.ustudio.com/embed/*/*
+- http://app.videocheckout.com/embed/*
 - http://app.wistia.com/embed/medias/*
+- http://arcg.is/*
 - http://askmen.com/video/*
 - http://asofterworld.com/*.jpg
 - http://audioboom.com/boos/*
@@ -112,6 +120,7 @@
 - http://beta.polstir.com/*/*
 - http://bigthink.com/ideas/*
 - http://bigthink.com/series/*
+- http://blab.im/*
 - http://blip.tv/*/*
 - http://boo.fm/b*
 - http://bop.fm/s/*/*
@@ -123,15 +132,19 @@
 - http://break.com/*/*
 - http://bubb.li/*
 - http://bunkrapp.com/*/*
+- http://calameo.com/*
 - http://canalplus.fr/*
 - http://cbsnews.com/video/watch/*
 - http://chirb.it/*
 - http://cl.ly/*
 - http://cl.ly/*/content
+- http://clippituser.tv/*
 - http://clipter.com/c/*
 - http://clyp.it/*
+- http://cnb.cx/*
 - http://cnbc.com/id/*/play/1/video/*
 - http://cnbc.com/id/*?*video*
+- http://cnn.it/*
 - http://codepen.io/*/pen/*
 - http://codepen.io/*/pen/*
 - http://codepicnic.com/bites/*
@@ -146,23 +159,26 @@
 - http://crocodoc.com/*
 - http://crowdmap.com/map/*
 - http://crowdmap.com/post/*
-- http://crunchbase.com/*/*
 - http://d.pr/i/*
 - http://dashboard.minoto-video.com/main/video/details/*
 - http://distrify.com/film/*
 - http://dnbradio.com/*
 - http://dotsub.com/view/*
 - http://drbl.in/*
+- http://dreambroker.com/channel/*
 - http://dsc.discovery.com/videos/*
 - http://edition.cnn.com/video/*
+- http://edition.cnn.com/videos/*
 - http://embed.imajize.com/*
 - http://embed.minoto-video.com/*
 - http://espn.go.com/*/story*
 - http://espn.go.com/video/clip*
 - http://etsy.com/listing/*
 - http://fav.me/*
+- http://fb.com
 - http://fb.me/*
 - http://fiverr.com/*/*
+- http://flat.io/score/*
 - http://flic.kr/*
 - http://flowvella.com/s/*
 - http://fora.tv/*/*/*/*
@@ -172,6 +188,7 @@
 - http://fotopedia.com/*/*
 - http://foursquare.com/*
 - http://fr.peoplbrain.com/tutoriaux/*
+- http://frankly.me/*
 - http://freemusicarchive.org/curator/*
 - http://freemusicarchive.org/music/*
 - http://frontback.me/p/*
@@ -186,6 +203,7 @@
 - http://goanimate.com/videos/*
 - http://godtube.com/featured/video/*
 - http://godtube.com/watch/*
+- http://google.*/maps/*
 - http://google.com/profiles/*
 - http://gph.is/*
 - http://grindtv.com/*/video/*
@@ -196,6 +214,7 @@
 - http://huffduffer.com/*/*
 - http://hulu.com/w/*
 - http://hulu.com/watch*
+- http://hulu.tv/*
 - http://hypem.com/premiere/*
 - http://i*.photobucket.com/albums/*
 - http://i.giflike.com/*
@@ -215,6 +234,7 @@
 - http://investigation.discovery.com/videos/*
 - http://isnare.com/*
 - http://issuu.com/*/docs/*
+- http://it.youtube.com/*
 - http://itunes.apple.com/*
 - http://izlesene.com/video/*
 - http://jdsupra.com/legalnews/*
@@ -236,6 +256,7 @@
 - http://logotv.com/video/*
 - http://lonelyplanet.com/Clip.aspx?*
 - http://lustich.de/videos/*
+- http://lynda.com/*
 - http://m.youtube.com/index*
 - http://m.youtube.com/watch*
 - http://maps.google.com/?*
@@ -254,6 +275,7 @@
 - http://mlkshk.com/p/*
 - http://moby.to/*
 - http://money.cnn.com/video/*
+- http://money.cnn.com/videos/*
 - http://mpora.com/videos/*
 - http://msn.foxsports.com/video*
 - http://msnbc.msn.com/*/watch/*
@@ -262,6 +284,7 @@
 - http://muzu.tv/*
 - http://my.opera.com/*/albums/show.dml?id=*
 - http://my.opera.com/*/albums/showpic.dml?album=*&picture=*
+- http://my.storygami.com/video/*
 - http://myloc.me/*
 - http://mynet.com/video/*
 - http://nbcnews.com/*
@@ -272,6 +295,7 @@
 - http://on.aol.com/video/*
 - http://on.bubb.li/*
 - http://open.spotify.com/*
+- http://oumy.com/v/*
 - http://ow.ly/i/*
 - http://pastebin.com/*
 - http://pastie.org/*
@@ -286,35 +310,40 @@
 - http://planetgreen.discovery.com/videos/*
 - http://play.minoto-video.com/*
 - http://play.spotify.com/*
+- http://player.videopath.com/*
 - http://player.vimeo.com/*
+- http://plays.tv/video/*
 - http://plus.google.com/*
 - http://polarb.com/*
 - http://polldaddy.com/community/poll/*
 - http://polldaddy.com/poll/*
+- http://pollplug.com/poll/*
 - http://polstir.com/*/*
 - http://ponga.com/*
 - http://portal.sliderocket.com/*
 - http://prezi.com/*/*
 - http://public.chartblocks.com/c/*
 - http://public.talely.com/*/*
+- http://publons.com/author/*
 - http://qik.com/*
 - http://qik.com/video/*
 - http://qik.ly/*
 - http://questionablecontent.net/
 - http://questionablecontent.net/comics/*.png
 - http://questionablecontent.net/view.php*
-- http://quora.com/*
+- http://quora.com/*/answer/*
 - http://radd.it/comments/*
 - http://radd.it/magic/*
 - http://radd.it/playlists/*
 - http://radd.it/r/*
 - http://radd.it/user/*
-- http://radionomy.com/*/radio/*
 - http://radioreddit.com/?q=songs*
 - http://radioreddit.com/songs*
 - http://rapidengage.com/s/*
 - http://redux.com/f/*/*
 - http://redux.com/stream/item/*/*
+- http://relayto.com/*
+- http://reuters.com/video/*
 - http://reuters.com/video/*
 - http://s*.photobucket.com/albums/*
 - http://say.ly/*
@@ -331,11 +360,13 @@
 - http://sendables.jibjab.com/view/*
 - http://sendvid.com/*
 - http://shoplocket.com/products/*
+- http://shorti.org/*
 - http://showme.com/sh/*
 - http://siteanalytics.compete.com/*
 - http://skitch.com/*/*/*
 - http://sliderocket.com/*
 - http://slidesha.re/*
+- http://slidr.io/*/*
 - http://snappytv.com/*
 - http://snd.sc/*
 - http://snotr.com/video/*
@@ -353,6 +384,7 @@
 - http://sproutvideo.com/videos/*
 - http://stepic.org/*
 - http://storify.com/*/*
+- http://streamable.com/*
 - http://streamio.com/api/v1/*
 - http://streetfire.net/video/*.htm*
 - http://tagmotion.com/tree/*
@@ -361,6 +393,7 @@
 - http://thedailyshow.cc.com/videos/*
 - http://theguardian.com/*/video/*/*/*/*
 - http://theonion.com/video/*
+- http://ticker.tv/v/*
 - http://tinypic.com/player.php*
 - http://tinypic.com/r/*/*
 - http://tinypic.com/view.php*
@@ -396,6 +429,7 @@
 - http://video.pbs.org/video/*
 - http://video.uludagsozluk.com/*
 - http://video214.com/play/*
+- http://videobio.com/playerjs/*
 - http://videodetective.com/*/*
 - http://videodonor.com/video/*
 - http://videos.nymag.com/*
@@ -409,6 +443,7 @@
 - http://vzaar.com/videos/*
 - http://vzaar.me/*
 - http://vzaar.tv/*
+- http://w.graphiq.com/w/*
 - http://washingtonpost.com/wp-dyn/*/video/*/*/*/*
 - http://weavly.com/watch/*
 - http://web.tv/*
@@ -426,6 +461,7 @@
 - http://www.achewood.com/index.php*
 - http://www.alkislarlayasiyorum.com/*
 - http://www.allego.com/*
+- http://www.alphahat.com/view/*
 - http://www.amzn.com/*
 - http://www.aniboom.com/animation-video/*
 - http://www.askmen.com/video/*
@@ -439,13 +475,18 @@
 - http://www.branchtrack.com/projects/*
 - http://www.bravotv.com/*/*/videos/*
 - http://www.break.com/*/*
+- http://www.calameo.com/*
 - http://www.canalplus.fr/*
+- http://www.candybank.com/*
 - http://www.clikthrough.com/theater/video/*
 - http://www.clipfish.de/*/*/video/*
+- http://www.clippituser.tv/*
 - http://www.clipsyndicate.com/video/playlist/*/*
 - http://www.cnbc.com/id/*/play/1/video/*
 - http://www.cnbc.com/id/*?*video*
 - http://www.cnn.com/video/*
+- http://www.cnn.com/videos/*
+- http://www.cnn.com/videos/*
 - http://www.codeply.com/view/*
 - http://www.colbertnation.com/full-episodes/*
 - http://www.colbertnation.com/the-colbert-report-collections/*
@@ -455,15 +496,16 @@
 - http://www.comedycentral.com/videos/index.jhtml?*
 - http://www.confreaks.com/videos/*
 - http://www.confreaks.net/videos/*
-- http://www.crunchbase.com/*/*
 - http://www.dailymile.com/people/*/entries/*
 - http://www.dnbradio.com/*
+- http://www.dreambroker.com/channel/*
 - http://www.etsy.com/listing/*
 - http://www.eyeem.com/a/*
 - http://www.eyeem.com/p/*
 - http://www.eyeem.com/u/*
 - http://www.facebook.com/*/photos/*
 - http://www.facebook.com/*/posts/*
+- http://www.facebook.com/*/videos/*
 - http://www.facebook.com/photo.php*
 - http://www.facebook.com/video.php*
 - http://www.fiverr.com/*/*
@@ -480,11 +522,15 @@
 - http://www.gametrailers.com/video*
 - http://www.gettyimages.com/detail/photo/*
 - http://www.giflike.com/a/*
+- http://www.globalgiving.org/funds/*
+- http://www.globalgiving.org/microprojects/*
+- http://www.globalgiving.org/projects/*
 - http://www.globalpost.com/dispatch/*
 - http://www.globalpost.com/video/*
 - http://www.godtube.com/featured/video/*
 - http://www.godtube.com/watch/*
 - http://www.gogoyoko.com/song/*
+- http://www.google.*/maps/*
 - http://www.google.com/profiles/*
 - http://www.grindtv.com/*/video/*
 - http://www.guardian.co.uk/*/video/*/*/*/*
@@ -499,6 +545,7 @@
 - http://www.ifood.tv/recipe/*
 - http://www.ifood.tv/video/*
 - http://www.ign.com/videos/*
+- http://www.instagram.com/p/*
 - http://www.isnare.com/*
 - http://www.izlesene.com/video/
 - http://www.jdsupra.com/legalnews/*
@@ -516,6 +563,7 @@
 - http://www.livestream.com/*
 - http://www.logotv.com/video/*
 - http://www.lonelyplanet.com/Clip.aspx?*
+- http://www.lynda.com/*
 - http://www.meinvz.net/*
 - http://www.meinvz.net/Gadgets/Info/*
 - http://www.meinvz.net/Gadgets/Install/*
@@ -538,33 +586,38 @@
 - http://www.myspace.com/index.cfm?fuseaction=*&videoid*
 - http://www.myvideo.de/watch/*
 - http://www.nbcnews.com/*
+- http://www.newhive.com/*/*
 - http://www.npr.org/*/*/*/*/*
 - http://www.npr.org/*/*/*/*/*/*
 - http://www.npr.org/*/*/*/*/*/*/*
 - http://www.npr.org/templates/story/story.php*
 - http://www.nytimes.com/video/*/*
 - http://www.nzonscreen.com/title/*
+- http://www.oumy.com/v/*
 - http://www.overstream.net/view.php?oid=*
 - http://www.pastie.org/*
 - http://www.pixorial.com/watch/*
 - http://www.polleverywhere.com/free_text_polls/*
 - http://www.polleverywhere.com/multiple_choice_polls/*
 - http://www.polleverywhere.com/polls/*
+- http://www.publons.com/author/*
 - http://www.quantcast.com/*
 - http://www.quantcast.com/wd:*
 - http://www.questionablecontent.net/
 - http://www.questionablecontent.net/comics/*.png
 - http://www.questionablecontent.net/view.php*
-- http://www.quora.com/*
+- http://www.quora.com/*/answer/*
 - http://www.qwantz.com/index.php?comic=*
 - http://www.qwiki.com/q/*
-- http://www.radionomy.com/*/radio/*
+- http://www.qzzr.com/quiz/*
 - http://www.radioreddit.com/?q=songs*
 - http://www.radioreddit.com/songs*
 - http://www.rdio.com/#/artist/*/album/*
 - http://www.rdio.com/artist/*/album/*
 - http://www.redux.com/f/*/*
 - http://www.redux.com/stream/item/*/*
+- http://www.relayto.com/*
+- http://www.reuters.com/video/*
 - http://www.reuters.com/video/*
 - http://www.rts.ch/play/tv/*
 - http://www.saynow.com/playMsg.html*
@@ -587,6 +640,7 @@
 - http://www.shopstyle.com/action/apiVisitRetailer*
 - http://www.shopstyle.com/action/viewLook*
 - http://www.shopstyle.com/browse*
+- http://www.shorti.org/*
 - http://www.showme.com/sh/*
 - http://www.sliderocket.com/*
 - http://www.slideshare.net/*/*
@@ -667,6 +721,7 @@
 - http://www.xiami.com/song/*
 - http://www.xkcd.com/*
 - http://www.xtranormal.com/watch/*
+- http://www.youtube.com/attribution_link*
 - http://www.youtube.com/embed/*
 - http://www.youtube.com/gif*
 - http://www.zapiks.com/*
@@ -678,16 +733,30 @@
 - http://xkcd.com/*
 - http://yahoo.com/movies/*
 - http://youtu.be/*
+- http://youtube.ca/*
+- http://youtube.co.uk/*
+- http://youtube.com.br/*
+- http://youtube.com/attribution_link*
 - http://youtube.com/gif*
+- http://youtube.es/*
+- http://youtube.fr/*
+- http://youtube.ie/*
+- http://youtube.jp/*
+- http://youtube.nl/*
+- http://youtube.pl/*
 - http://zeit.de/video/*
 - http://zie.nl/video/*
 - https://*.23video.com/*
+- https://*.accredible.com/*
 - https://*.brainsonic.com/*
 - https://*.cartodb.com/*/*
 - https://*.crocodoc.com/*
+- https://*.hosted.panopto.com/*
 - https://*.iplayerhd.com/player/video/*
 - https://*.iplayerhd.com/playerframe/*
+- https://*.kaltura.com/*
 - https://*.looplogic.com/*
+- https://*.silk.co/explore/*
 - https://*.stream.co.jp/apiservice/*
 - https://*.stream.ne.jp/apiservice/*
 - https://*.wi.st/*
@@ -698,40 +767,60 @@
 - https://*vidyard.com/*
 - https://*youtube.com/watch*
 - https://23video.com/*
+- https://accredible.com/*
+- https://alpha.vrchive.com/*
 - https://animoto.com/play/*
 - https://api.lovelive.tv/v1/*
 - https://app.devhv.com/oembed/*
+- https://app.stghv.com/*
+- https://app.videocheckout.com/embed/*
 - https://app.wistia.com/embed/medias/*
+- https://blab.im/*
 - https://bop.fm/a/*
 - https://bop.fm/p/*
 - https://bop.fm/s/*/*
 - https://brainshark.com/*/*
 - https://brainsonic.com/*
 - https://bunkrapp.com/*/*
+- https://calameo.com/*
 - https://chirb.it/*
 - https://clipmine.com/embed/*
 - https://clipmine.com/video/*
+- https://clippituser.tv/*
 - https://clipter.com/c/*
 - https://cloudup.com/*
 - https://clyp.it/*
 - https://codepicnic.com/bites/*
 - https://codepicnic.com/consoles/*
+- https://coub.com/embed/*
+- https://coub.com/view/*
 - https://crocodoc.com/*
+- https://dreambroker.com/channel/*
 - https://fb.me/*
 - https://flowvella.com/s/*
 - https://foursquare.com/*
 - https://fr.peoplbrain.com/tutoriaux/*
 - https://ganxy.com/*
 - https://gfycat.com/*
+- https://gifs.com/*
+- https://gifs.com/gif/*
 - https://gist.github.com/*
+- https://glitter.club/*
+- https://google.*/maps/*
 - https://hackpad.com/*
 - https://ifttt.com/recipes/*
+- https://iloopit.net/*/*
 - https://img.skitch.com/*
+- https://invis.io/*
+- https://it.youtube.com/*
 - https://itunes.apple.com/*
 - https://khanacademy.org/*
+- https://lynda.com/*
+- https://lynda.com/*
 - https://maps.google.com/?*
 - https://maps.google.com/maps/ms?*
 - https://maps.google.com/maps?*
+- https://marvelapp.com/*
 - https://medium.com/*
 - https://medium.com/*/*
 - https://megavisor.com/en/view/*
@@ -741,19 +830,29 @@
 - https://mix.office.com/mix/*
 - https://mix.office.com/watch/*
 - https://mixbit.com/v/*
+- https://my.storygami.com/video/*
+- https://newhive.com/*/*
+- https://newhive.com/*/*
 - https://open.spotify.com/*
+- https://oumy.com/v/*
 - https://picasaweb.google.com*/*/*
 - https://picasaweb.google.com*/*/*#*
 - https://picasaweb.google.com*/lh/photo/*
 - https://play.spotify.com/*
+- https://player.videopath.com/*
 - https://player.vimeo.com/*
+- https://plays.tv/video/*
 - https://plus.google.com/*
+- https://pollplug.com/poll/*
 - https://portfolium.com/entry/*
+- https://projects.invisionapp.com/share/*
 - https://public.chartblocks.com/c/*
-- https://quora.com/*
+- https://publons.com/author/*
+- https://quora.com/*/answer/*
 - https://rapidengage.com/s/*
 - https://readtapestry.com/s/*/
 - https://reelhouse.org/*
+- https://relayto.com/*
 - https://screen.yahoo.com/*/*
 - https://scribblemaps.com/maps/view/*/*
 - https://sendvid.com/*
@@ -761,6 +860,7 @@
 - https://sketchfab.com/models/*
 - https://sketchfab.com/show/*
 - https://skitch.com/*/*/*
+- https://slidr.io/*/*
 - https://soundcloud.com/*
 - https://soundcloud.com/*/*
 - https://soundcloud.com/*/sets/*
@@ -768,38 +868,72 @@
 - https://speakerdeck.com/*/*
 - https://stepic.org/*
 - https://storify.com/*/*
+- https://streamable.com/*
 - https://streamio.com/api/v1/*
 - https://tr.instela.com/*
 - https://tun.in/*
 - https://tunein.com/*
+- https://uploadly.com/*
 - https://urtak.com/clr/*
 - https://urtak.com/u/*
 - https://vid.me/*
 - https://vidd.me/*
 - https://video.esri.com/*
 - https://video214.com/play/*
+- https://view.stacker.cc/*
+- https://view.stacker.cc/*
 - https://vimeo.com/*
 - https://vine.co/v/*
+- https://w.graphiq.com/w/*
 - https://wi.st/*
 - https://wistia.com/*
 - https://www.allego.com/*
 - https://www.brainshark.com/*/*
 - https://www.branchtrack.com/projects/*
+- https://www.calameo.com/*
+- https://www.clippituser.tv/*
+- https://www.dreambroker.com/channel/*
 - https://www.facebook.com/*/photos/*
 - https://www.facebook.com/*/posts/*
+- https://www.facebook.com/*/videos/*
 - https://www.facebook.com/photo.php*
 - https://www.facebook.com/video.php*
+- https://www.flat.io/score/*
 - https://www.foursquare.com/*
 - https://www.ganxy.com/*
+- https://www.gifs.com/*
+- https://www.gifs.com/gif/*
+- https://www.globalgiving.org/funds/*
+- https://www.globalgiving.org/microprojects/*
+- https://www.globalgiving.org/projects/*
+- https://www.google.*/maps/*
+- https://www.instagram.com/p/*
 - https://www.khanacademy.org/*
-- https://www.quora.com/*
+- https://www.newhive.com/*/*
+- https://www.oumy.com/v/*
+- https://www.publons.com/author/*
+- https://www.quora.com/*/answer/*
+- https://www.qzzr.com/quiz/*
 - https://www.reelhouse.org/*
+- https://www.relayto.com/*
 - https://www.scribblemaps.com/maps/view/*/*
 - https://www.streamio.com/api/v1/*
 - https://www.vimeo.com/*
 - https://www.vine.co/v/*
 - https://www.wedgies.com/question/*
+- https://www.youtube.com/attribution_link*
 - https://www.youtube.com/embed/*
 - https://www.youtube.com/gif*
 - https://yahoo.com/movies/*
+- https://youtu.be/*
+- https://youtube.ca/*
+- https://youtube.co.uk/*
+- https://youtube.com.br/*
+- https://youtube.com/attribution_link*
 - https://youtube.com/gif*
+- https://youtube.es/*
+- https://youtube.fr/*
+- https://youtube.ie/*
+- https://youtube.jp/*
+- https://youtube.nl/*
+- https://youtube.pl/*