ruby-oembed 0.14.1 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98b11115f745309211d4fdd9856ee88d281e22b15bfd86facf82caaff3e9b6e3
-  data.tar.gz: 83386c348c75465abc60fc57cb866355e7d07f65b5770090440d2a3512e4a3f1
+  metadata.gz: 0e3021fa6c864c1372498ae5f2467fc06fe430def7252f2301c7dbc955c8ec0a
+  data.tar.gz: b84a4dcb5fdeb59e3cd0bd0f1ce04eb66e43cca450f07f2eb5bb2fa8eb473a65
 SHA512:
-  metadata.gz: a39256713d10577bca4888c6dbdb53c849cb4e9e6bd79b21c8692842091d634b71bd9f151eb46adbb71af6c5b4ae463d676a5e1b72da2ac8a72c0f933bc0ac40
-  data.tar.gz: f7d2ad213770c02f235925e234d89158ac3ec3cf6b94aa5e926eb539fd5cce67759a5a4a6ca56a8ae483fd0bb997d6ffe90f8884369238d2b9073b8e5fd95e7f
+  metadata.gz: a5e74bb8e0487882d07cb70ec920a967cd7e28ea5b404fc16a771d28a755ace31243ec83549691116c41f1c8acc04b7440890cf7ba9d055fb3f9130ec3928020
+  data.tar.gz: d48b92fb4a08e469dcfd74cd310a894dff0b54edd3c3496ca9ba6b1726e8a503cff98fb213d9258bae50ffd5dd332035322fe4c46428e04e1dd176dd50edccac

data/.travis.yml

@@ -7,3 +7,6 @@ cache: bundler
 rvm:
   - 2.4.1
   - 2.6.5
+env:
+  global:
+    - RUN_ALL_TESTS=true

data/CHANGELOG.rdoc

@@ -1,7 +1,18 @@
 = CHANGELOG
 
-== Unreleased (0.14.2)
+== Unreleased (0.15.1)
 
+== 0.15.0 - 1 January 2021
+
+* *DEPRECATION* When creating an `OEmbed::Provider` instance, specifying the format via positional argument is now deprecated. Please use a named argument instead: `OEmbed::Provider.new(@endpoint_url, format: :json)`
+* *DEPRECATION* Do not use the `new` method for `Instagram`, `FacebookPost`, or `FacebookVideo` providers to set your access token. Instead either use the `OEMBED_FACEBOOK_TOKEN` environment variable or call `Instagram.access_token = @your_token`.
+* Add built-in TikTok provider (Happy 2021)!
+* Add support for Instgram Reels URLs to the built-in OEmbed::Providers::Instagram.
+* Updated the list of {Embedly}[https://embed.ly/] and {Noembed}[https://noembed.com/] URL schemes.
+* Fix Issue #77: Built-in Instagram & Facebook providers are now instances again.
+* Add support for `OEmbed::Provider` instances with `required_query_params` (like access tokens), where the provider will fail to answer until it is fully configured.
+* Support focused rspec tests for local development (e.g. "fcontext" or "fit")
+* Fix a few typos in documentation & tests; Pull #76 (Inge Jørgensen)
 
 == 0.14.1 - 28 December 2020
 
@@ -9,6 +20,7 @@
 
 == 0.14.0 - 5 November 2020
 
+* *BREAKING* Built-in providers for Instagram & Facebook are now classes, not instances, and therefore can't manually be registered via `OEmbed::Providers.register(OEmbed::Providers::Instagram)`; See Issue #77
 * Add support for Facebook/Instagram access tokens; Pull #75 (Inge Jørgensen)
 
 == 0.13.1 - 25 May 2020

data/lib/oembed.rb

@@ -8,6 +8,7 @@ require 'oembed/formatter'
 require 'oembed/provider'
 require 'oembed/provider_discovery'
 require 'oembed/providers'
+require 'oembed/providers/builtin_providers'
 require 'oembed/response'
 require 'oembed/response/photo'
 require 'oembed/response/video'

data/lib/oembed/provider.rb

@@ -36,9 +36,15 @@ module OEmbed
     # In actual requests to this Provider, this string will be replaced with a String
     # representing the request format (e.g. "json").
     #
-    # If give, the format should be the name of the default format for all request
+    # The `format:` option should be the name of the default format for all request
     # to this Provider (e.g. 'json'). Defaults to OEmbed::Formatter.default
     #
+    # # @deprecated *Note*: The `positional_format` is deprecated. Please used the named argument instead.
+    #
+    # The `required_query_params:` option should be a Hash
+    # representing query params that will be appended to the endpoint on each request
+    # and the optional name of an environment variable (i.e. ENV) whose value will be used
+    #
     # For example:
     #   # If requests should be sent to:
     #   # "http://my.service.com/oembed?format=#{OEmbed::Formatter.default}"
@@ -46,14 +52,31 @@ module OEmbed
     #
     #   # If requests should be sent to:
     #   # "http://my.service.com/oembed.xml"
-    #   @xml_provider = OEmbed::Provider.new("http://my.service.com/oembed.{format}", :xml)
-    def initialize(endpoint, format = OEmbed::Formatter.default)
+    #   @xml_provider = OEmbed::Provider.new("http://my.service.com/oembed.{format}", format: :xml)
+    #
+    #   # If the endpoint requires an `access_token` be specified:
+    #   @provider_with_auth = OEmbed::Provider.new("http://my.service.com/oembed", required_query_params: { access_token: 'MY_SERVICE_ACCESS_TOKEN' })
+    #   # You can optionally override the value from `ENV['MY_SERVICE_ACCESS_TOKEN']`
+    #   @provider_with_auth.access_token = @my_access_token
+    def initialize(endpoint, positional_format = OEmbed::Formatter.default, format: nil, required_query_params: {})
       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)
 
+      @required_query_params = {}
+      required_query_params.each do |param, default_env_var|
+        param = param.to_sym
+        @required_query_params[param] = nil
+        set_required_query_params(param, ENV[default_env_var]) if default_env_var
+
+        # Define a getter and a setter for each required_query_param
+        define_singleton_method("#{param}") { @required_query_params[param] } unless respond_to?("#{param}")
+        define_singleton_method("#{param}=") { |val| set_required_query_params(param, val) } unless respond_to?("#{param}=")
+      end
+      required_query_params_set?(reset_cache: true)
+
       @endpoint = endpoint
       @urls = []
-      @format = format
+      @format = format || positional_format
     end
 
     # Adds the given url scheme to this Provider instance.
@@ -75,6 +98,28 @@ module OEmbed
       @urls << url
     end
 
+    # Given the name of a required_query_param and a value
+    # store that value internally, so that it can be sent along
+    # with requests to this provider's endpoint.
+    # Raises an ArgumentError if the given param is not listed with required_query_params
+    # during instantiation.
+    def set_required_query_params(param, val)
+      raise ArgumentError.new("This provider does NOT have a required_query_param named #{param.inspect}") unless @required_query_params.has_key?(param)
+
+      @required_query_params[param] = val.nil? ? nil : ::CGI.escape(val.to_s)
+
+      required_query_params_set?(reset_cache: true)
+
+      @required_query_params[param]
+    end
+
+    # Returns true if all of this provider's required_query_params have a value
+    def required_query_params_set?(reset_cache: false)
+      return @all_required_query_params_set unless reset_cache || @all_required_query_params_set.nil?
+
+      @all_required_query_params_set = !@required_query_params.values.include?(nil)
+    end
+
     # Send a request to the Provider endpoint to get information about the
     # given url and return the appropriate OEmbed::Response.
     #
@@ -92,7 +137,9 @@ module OEmbed
 
     # Determine whether the given url is supported by this Provider by matching
     # against the Provider's URL schemes.
+    # It will always return false of a provider has required_query_params that are not set.
     def include?(url)
+      return false unless required_query_params_set?
       @urls.empty? || !!@urls.detect{ |u| u =~ url }
     end
 
@@ -100,10 +147,12 @@ module OEmbed
     def build(url, query = {})
       raise OEmbed::NotFound, url unless include?(url)
 
-      query = query.merge({:url => ::CGI.escape(url)})
       query.delete(:timeout)
       query.delete(:max_redirects)
 
+      query = query.merge(@required_query_params)
+      query = query.merge({:url => ::CGI.escape(url)})
+
       # TODO: move this code exclusively into the get method, once build is private.
       this_format = (query[:format] ||= @format.to_s).to_s
 

data/lib/oembed/providers.rb

@@ -1,10 +1,6 @@
 require 'rubygems'
 require 'yaml'
 
-require 'oembed/providers/facebook_post'
-require 'oembed/providers/facebook_video'
-require 'oembed/providers/instagram'
-
 module OEmbed
   # Allows OEmbed to perform tasks across several, registered, Providers
   # at once.
@@ -13,6 +9,7 @@ module OEmbed
       @@urls = {}
       @@fallback = []
       @@to_register = {}
+      @@access_token_setters = {}
 
       # A Hash of all url schemes, where the keys represent schemes supported by
       # all registered Provider instances and values are an Array of Providers
@@ -48,14 +45,14 @@ module OEmbed
       # Register all Providers built into this gem.
       # The including_sub_type parameter should be one of the following values:
       # * :aggregators: also register provider aggregator endpoints, like Embedly
-      # The access_token keys can be one of the following:
+      # The access_tokens keys can be one of the following:
       # * :facebook: See https://developers.facebook.com/docs/instagram/oembed#access-tokens
       def register_all(*including_sub_type, access_tokens: {})
         register(*@@to_register[""])
-        register_access_token_providers(access_tokens)
         including_sub_type.each do |sub_type|
           register(*@@to_register[sub_type.to_s])
         end
+        set_access_tokens(access_tokens)
       end
 
       # Unregister all currently-registered Provider instances.
@@ -81,10 +78,19 @@ module OEmbed
         @@fallback
       end
 
-      # Returns a Provider instance who's url scheme matches the given url.
+      # Returns a Provider instance whose url scheme matches the given url.
+      # Skips any Provider with missing required_query_params.
       def find(url)
-        providers = @@urls[@@urls.keys.detect { |u| u =~ url }]
-        Array(providers).first || nil
+        @@urls.keys.each do |url_regexp|
+          next unless url_regexp.match?(url)
+
+          matching_provider = @@urls[url_regexp].detect { |p| p.include?(url) }
+
+          # If we've found a matching provider, return it right away!
+          return matching_provider if matching_provider
+        end
+
+        nil
       end
 
       # Finds the appropriate Provider for this url and return the raw response.
@@ -118,313 +124,46 @@ module OEmbed
       private
 
       # Takes an OEmbed::Provider instance and registers it so that when we call
-      # the register_all method, they all register. The sub_type can be be any value
+      # the register_all method, they all register.
+      # The sub_type can be be any value
       # used to uniquely group providers. Official sub_types are:
       # * nil: a normal provider
       # * :aggregators: an endpoint for an OEmbed aggregator
-      def add_official_provider(provider_class, sub_type=nil)
+      # :access_token takes a Hash with the following required keys:
+      # * :name: A Symbol: the name of access token, to be used with `register_all`
+      # * :method: A Symbol: the name of the required_query_params for the access token.
+      def add_official_provider(provider_class, sub_type=nil, access_token: nil)
         raise TypeError, "Expected OEmbed::Provider instance but was #{provider_class.class}" \
           unless provider_class.is_a?(OEmbed::Provider)
 
         @@to_register[sub_type.to_s] ||= []
         @@to_register[sub_type.to_s] << provider_class
+
+        if access_token.is_a?(Hash) && access_token[:name] && access_token[:method]
+          setter_method = "#{access_token[:method]}="
+          raise TypeError, "Expected OEmbed::Provider instance to respond to the given access_token method #{setter_method}" \
+            unless provider_class.respond_to?(setter_method)
+
+          @@access_token_setters[access_token[:name]] ||= []
+          @@access_token_setters[access_token[:name]] << provider_class.method(setter_method)
+        end
       end
 
-      # Takes a Hash of tokens, and registers providers that use the given tokens.
+      # Takes a Hash of tokens, and calls the setter method
+      # for all providers that use the given tokens.
       # Also supports "OEMBED_*_TOKEN" environment variables.
       # Currently supported tokens:
       # * facebook: See https://developers.facebook.com/docs/instagram/oembed#access-tokens
-      def register_access_token_providers(access_tokens)
-        tokens = { facebook: ENV['OEMBED_FACEBOOK_TOKEN'] }.merge(access_tokens)
+      def set_access_tokens(access_tokens)
+        access_tokens.each do |token_name, token_value|
+          token_name = token_name.to_sym
+          next unless @@access_token_setters.has_key?(token_name)
 
-        if tokens[:facebook]
-          register OEmbed::Providers::FacebookPost.new(access_token: tokens[:facebook])
-          register OEmbed::Providers::FacebookVideo.new(access_token: tokens[:facebook])
-          register OEmbed::Providers::Instagram.new(access_token: tokens[:facebook])
+          @@access_token_setters[token_name].each do |token_setter_method|
+            token_setter_method.call(token_value)
+          end
         end
       end
     end
-
-    # Custom providers:
-
-    # Provider for youtube.com
-    # http://apiblog.youtube.com/2009/10/oembed-support.html
-    #
-    # Options:
-    # * To get the iframe embed code
-    #     OEmbed::Providers::Youtube.endpoint += "?iframe=1"
-    # * To get the flash/object embed code
-    #     OEmbed::Providers::Youtube.endpoint += "?iframe=0"
-    # * To require https embed code
-    #     OEmbed::Providers::Youtube.endpoint += "?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/*"
-    Youtube << "https://*.youtu.be/*"
-    add_official_provider(Youtube)
-
-    # Provider for codepen.io
-    CodePen = OEmbed::Provider.new("https://codepen.io/api/oembed")
-    CodePen << "http://codepen.io/*"
-    CodePen << "https://codepen.io/*"
-    add_official_provider(CodePen)
-
-    # Provider for flickr.com
-    Flickr = OEmbed::Provider.new("https://www.flickr.com/services/oembed/")
-    Flickr << "http://*.flickr.com/*"
-    Flickr << "https://*.flickr.com/*"
-    Flickr << "http://flic.kr/*"
-    Flickr << "https://flic.kr/*"
-    add_official_provider(Flickr)
-
-    # Provider for viddler.com
-    # http://developers.viddler.com/documentation/services/oembed/
-    Viddler = OEmbed::Provider.new("http://lab.viddler.com/services/oembed/")
-    Viddler << "http://*.viddler.com/*"
-    add_official_provider(Viddler)
-
-    # Provider for qik.com
-    # http://qik.com/blog/qik-embraces-oembed-for-embedding-videos/
-    Qik = OEmbed::Provider.new("http://qik.com/api/oembed.{format}")
-    Qik << "http://qik.com/*"
-    Qik << "http://qik.com/video/*"
-    add_official_provider(Qik)
-
-    # Provider for revision3.com
-    Revision3 = OEmbed::Provider.new("http://revision3.com/api/oembed/")
-    Revision3 << "http://*.revision3.com/*"
-    add_official_provider(Revision3)
-
-    # Provider for hulu.com
-    Hulu = OEmbed::Provider.new("https://www.hulu.com/api/oembed.{format}")
-    Hulu << "http://www.hulu.com/watch/*"
-    Hulu << "https://www.hulu.com/watch/*"
-    add_official_provider(Hulu)
-
-    # Provider for vimeo.com
-    # https://developer.vimeo.com/apis/oembed
-    Vimeo = OEmbed::Provider.new("https://vimeo.com/api/oembed.{format}")
-    Vimeo << "http://*.vimeo.com/*"
-    Vimeo << "https://*.vimeo.com/*"
-    add_official_provider(Vimeo)
-
-    # Provider for twitter.com
-    # https://dev.twitter.com/rest/reference/get/statuses/oembed
-    Twitter = OEmbed::Provider.new("https://publish.twitter.com/oembed", :json)
-    Twitter << "https://*.twitter.com/*/status/*"
-    add_official_provider(Twitter)
-
-    # Provider for vine.co
-    # https://dev.twitter.com/web/vine/oembed
-    Vine = OEmbed::Provider.new("https://vine.co/oembed.{format}")
-    Vine << "http://*.vine.co/v/*"
-    Vine << "https://*.vine.co/v/*"
-    add_official_provider(Vine)
-
-    # Provider for slideshare.net
-    # http://www.slideshare.net/developers/oembed
-    Slideshare = OEmbed::Provider.new("https://www.slideshare.net/api/oembed/2")
-    Slideshare << 'http://*.slideshare.net/*/*'
-    Slideshare << 'https://*.slideshare.net/*/*'
-    Slideshare << 'http://*.slideshare.net/mobile/*/*'
-    Slideshare << 'https://*.slideshare.net/mobile/*/*'
-    add_official_provider(Slideshare)
-
-    # Provider for yfrog
-    # http://code.google.com/p/imageshackapi/wiki/OEMBEDSupport
-    Yfrog = OEmbed::Provider.new("https://www.yfrog.com/api/oembed", :json)
-    Yfrog << "http://yfrog.com/*"
-    add_official_provider(Yfrog)
-
-    # Provider for Giphy
-    Giphy = OEmbed::Provider.new("http://giphy.com/services/oembed")
-    Giphy << "http://giphy.com/*"
-    Giphy << "https://giphy.com/*"
-    add_official_provider(Giphy)
-
-    # Provider for imgur.com
-    Imgur = OEmbed::Provider.new("https://api.imgur.com/oembed.{format}")
-    Imgur << "https://*.imgur.com/gallery/*"
-    Imgur << "http://*.imgur.com/gallery/*"
-    add_official_provider(Imgur)
-
-    # Provider for Kickstarter
-    Kickstarter = OEmbed::Provider.new("https://www.kickstarter.com/services/oembed")
-    Kickstarter << "http://www.kickstarter.com/projects/*"
-    Kickstarter << "https://www.kickstarter.com/projects/*"
-    add_official_provider(Kickstarter)
-
-    # provider for mlg-tv
-    # http://tv.majorleaguegaming.com/oembed
-    MlgTv = OEmbed::Provider.new("http://tv.majorleaguegaming.com/oembed")
-    MlgTv << "http://tv.majorleaguegaming.com/video/*"
-    MlgTv << "http://mlg.tv/video/*"
-    add_official_provider(MlgTv)
-
-    # pownce.com closed in 2008
-    #Pownce = OEmbed::Provider.new("http://api.pownce.com/2.1/oembed.{format}")
-    #Pownce << "http://*.pownce.com/*"
-    #add_official_provider(Pownce)
-
-    # Provider for polleverywhere.com
-    PollEverywhere = OEmbed::Provider.new("http://www.polleverywhere.com/services/oembed/")
-    PollEverywhere << "http://www.polleverywhere.com/polls/*"
-    PollEverywhere << "http://www.polleverywhere.com/multiple_choice_polls/*"
-    PollEverywhere << "http://www.polleverywhere.com/free_text_polls/*"
-    add_official_provider(PollEverywhere)
-
-    # Provider for my.opera.com
-    # http://my.opera.com/devblog/blog/2008/12/02/embedding-my-opera-content-oembed
-    MyOpera = OEmbed::Provider.new("http://my.opera.com/service/oembed", :json)
-    MyOpera << "http://my.opera.com/*"
-    add_official_provider(MyOpera)
-
-    # Provider for clearspring.com
-    ClearspringWidgets = OEmbed::Provider.new("http://widgets.clearspring.com/widget/v1/oembed/")
-    ClearspringWidgets << "http://www.clearspring.com/widgets/*"
-    add_official_provider(ClearspringWidgets)
-
-    # Provider for nfb.ca
-    NFBCanada = OEmbed::Provider.new("http://www.nfb.ca/remote/services/oembed/")
-    NFBCanada << "http://*.nfb.ca/film/*"
-    add_official_provider(NFBCanada)
-
-    # Provider for scribd.com
-    Scribd = OEmbed::Provider.new("https://www.scribd.com/services/oembed")
-    Scribd << "http://*.scribd.com/*"
-    add_official_provider(Scribd)
-
-    # Provider for speakerdeck.com
-    # https://speakerdeck.com/faq#oembed
-    SpeakerDeck = OEmbed::Provider.new("https://speakerdeck.com/oembed.json")
-    SpeakerDeck << "http://speakerdeck.com/*/*"
-    SpeakerDeck << "https://speakerdeck.com/*/*"
-    add_official_provider(SpeakerDeck)
-
-    # Provider for movieclips.com
-    MovieClips = OEmbed::Provider.new("http://movieclips.com/services/oembed/")
-    MovieClips << "http://movieclips.com/watch/*/*/"
-    add_official_provider(MovieClips)
-
-    # Provider for 23hq.com
-    TwentyThree = OEmbed::Provider.new("http://www.23hq.com/23/oembed")
-    TwentyThree << "http://www.23hq.com/*"
-    add_official_provider(TwentyThree)
-
-    # Provider for soundcloud.com
-    # http://developers.soundcloud.com/docs/oembed
-    SoundCloud = OEmbed::Provider.new("https://soundcloud.com/oembed", :json)
-    SoundCloud << "http://*.soundcloud.com/*"
-    SoundCloud << "https://*.soundcloud.com/*"
-    add_official_provider(SoundCloud)
-
-    # Provider for spotify.com
-    # https://twitter.com/nicklas2k/status/330094611202723840
-    # http://blog.embed.ly/post/45149936446/oembed-for-spotify
-    Spotify = OEmbed::Provider.new("https://embed.spotify.com/oembed/")
-    Spotify << "http://open.spotify.com/*"
-    Spotify << "https://open.spotify.com/*"
-    Spotify << "http://play.spotify.com/*"
-    Spotify << "https://play.spotify.com/*"
-    Spotify << /^spotify\:(.*?)/
-    add_official_provider(Spotify)
-
-    # Provider for skitch.com
-    # http://skitch.com/oembed/%3C/endpoint
-    Skitch = OEmbed::Provider.new("http://skitch.com/oembed")
-    Skitch << "http://*.skitch.com/*"
-    Skitch << "https://*.skitch.com/*"
-    add_official_provider(Skitch)
-
-    # Provider for TED
-    Ted = OEmbed::Provider.new("https://www.ted.com/talks/oembed.{format}")
-    Ted << "http://*.ted.com/talks/*"
-    Ted << "https://*.ted.com/talks/*"
-    add_official_provider(Ted)
-
-    # Provider for tumblr.com
-    Tumblr = OEmbed::Provider.new("http://www.tumblr.com/oembed/1.0/", :json)
-    Tumblr << "http://*.tumblr.com/post/*"
-    Tumblr << "https://*.tumblr.com/post/*"
-    add_official_provider(Tumblr)
-
-    ## Provider for clikthrough.com
-    # http://corporate.clikthrough.com/wp/?p=275
-    #Clickthrough = OEmbed::Provider.new("http://www.clikthrough.com/services/oembed/")
-    #Clickthrough << "http://*.clikthrough.com/theater/video/*"
-    #add_official_provider(Clickthrough)
-
-    ## Provider for kinomap.com
-    # http://www.kinomap.com/#!oEmbed
-    #Kinomap = OEmbed::Provider.new("http://www.kinomap.com/oembed")
-    #Kinomap << "http://www.kinomap.com/*"
-    #add_official_provider(Kinomap)
-
-    # Provider for oohembed.com, which is a provider aggregator. See
-    # OEmbed::Providers::OohEmbed.urls for a full list of supported url schemas.
-    # Embed.ly has taken over the oohembed.com domain and as of July 20 all oohEmbed
-    # request will require you use an API key. For details on the transition see
-    # http://blog.embed.ly/oohembed
-    OohEmbed = OEmbed::Provider.new("http://oohembed.com/oohembed/", :json)
-    OohEmbed << "http://*.5min.com/Video/*" # micro-video host
-    OohEmbed << %r{http://(.*?).amazon.(com|co.uk|de|ca|jp)/(.*?)/(gp/product|o/ASIN|obidos/ASIN|dp)/(.*?)} # Online product shopping
-    OohEmbed << "http://*.blip.tv/*"
-    OohEmbed << "http://*.clikthrough.com/theater/video/*"
-    OohEmbed << "http://*.collegehumor.com/video:*" # Comedic & original videos
-    OohEmbed << "http://*.thedailyshow.com/video/*" # Syndicated show
-    OohEmbed << "http://*.dailymotion.com/*"
-    OohEmbed << "http://dotsub.com/view/*"
-    OohEmbed << "http://*.flickr.com/photos/*"
-    OohEmbed << "http://*.funnyordie.com/videos/*" # Comedy video host
-    OohEmbed << "http://video.google.com/videoplay?*" # Video hosting
-    OohEmbed << "http://www.hulu.com/watch/*"
-    OohEmbed << "http://*.kinomap.com/*"
-    OohEmbed << "http://*.livejournal.com/"
-    OohEmbed << "http://*.metacafe.com/watch/*" # Video host
-    OohEmbed << "http://*.nfb.ca/film/*"
-    OohEmbed << "http://*.photobucket.com/albums/*"
-    OohEmbed << "http://*.photobucket.com/groups/*"
-    OohEmbed << "http://*.phodroid.com/*/*/*" # Photo host
-    OohEmbed << "http://qik.com/*"
-    OohEmbed << "http://*.revision3.com/*"
-    OohEmbed << "http://*.scribd.com/*"
-    OohEmbed << "http://*.slideshare.net/*" # Share presentations online
-    OohEmbed << "http://*.twitpic.com/*" # Picture hosting for Twitter
-    OohEmbed << "http://twitter.com/*/statuses/*" # Mirco-blogging network
-    OohEmbed << "http://*.viddler.com/explore/*"
-    OohEmbed << "http://www.vimeo.com/*"
-    OohEmbed << "http://www.vimeo.com/groups/*/videos/*"
-    OohEmbed << "http://*.wikipedia.org/wiki/*" # Online encyclopedia
-    OohEmbed << "http://*.wordpress.com/*/*/*/*" # Blogging Engine & community
-    OohEmbed << "http://*.xkcd.com/*" # A hilarious stick figure comic
-    OohEmbed << %r{http://yfrog.(com|ru|com.tr|it|fr|co.il|co.uk|com.pl|pl|eu|us)/(.*?)} # image & video hosting
-    OohEmbed << "http://*.youtube.com/watch*"
-
-    # Provider for noembed.com, which is a provider aggregator. See
-    # OEmbed::Providers::Noembed.urls for a full list of supported url schemas.
-    # https://noembed.com/#supported-sites
-    Noembed = OEmbed::Provider.new("https://noembed.com/embed")
-    # Add all known URL regexps for Noembed.
-    # To update this list run `rake oembed:update_noembed`
-    YAML.load_file(File.join(File.dirname(__FILE__), "/providers/aggregators/noembed_urls.yml")).each do |url|
-      Noembed << Regexp.new(url)
-    end
-    add_official_provider(Noembed, :aggregators)
-
-    # Provider for Embedly.com, which is a provider aggregator. See
-    # OEmbed::Providers::Embedly.urls for a full list of supported url schemas.
-    # http://embed.ly/docs/endpoints/1/oembed
-    #
-    # You can append your Embed.ly API key to the provider so that all requests are signed
-    #     OEmbed::Providers::Embedly.endpoint += "?key=#{my_embedly_key}"
-    #
-    # If you don't yet have an API key you'll need to sign up here: http://embed.ly/pricing
-    Embedly = OEmbed::Provider.new("http://api.embed.ly/1/oembed")
-    # Add all known URL regexps for Embedly. To update this list run `rake oembed:update_embedly`
-    YAML.load_file(File.join(File.dirname(__FILE__), "/providers/aggregators/embedly_urls.yml")).each do |url|
-      Embedly << url
-    end
-    add_official_provider(Embedly, :aggregators)
   end
 end