ruby-oembed 0.8.5 → 0.8.7

data/.rvmrc

@@ -1 +1 @@
-rvm default@oembed
+rvm --create use default@oembed

data/CHANGELOG.rdoc

@@ -1,10 +1,18 @@
 = CHANGELOG
 
+== 0.8.7 - 11 March 2012
+
+* Support for https provider endpoints; Issue #16 (Marcos Wright Kuhns)
+* OEmbed::Providers.register_all now actually registers all bundled providers; Issue #18 (Marcos Wright Kuhns)
+* Added built-in provider for SoundCloud (Hendrik Mans)
+* Updated the list of {Embedly}[http://embed.ly] URL schemes. (Marcos Wright Kuhns)
+* For developers who work on this gem, the rvmrc now automatically creates an oembed gemset; Issue #20 (Florian Staudacher)
+
 == 0.8.5 - 14 November 2011
 
 * Fixed problems ProviderDiscovery and some xml endpoints. Also added much better test coverage. (Marcos Wright Kuhns)
 * Added support for XML parsing using {Nokogiri}[http://nokogiri.org/] (Marcos Wright Kuhns)
-* Added built-in providers for MLG.TV (Matt Wilson)
+* Added built-in provider for MLG.TV (Matt Wilson)
 * Added https support to the built-in YouTube provider (Marcos Wright Kuhns)
 * Updated the list of {Embedly}[http://embed.ly] URL schemes. (Marcos Wright Kuhns)
 

data/lib/oembed/provider.rb

@@ -125,13 +125,20 @@ module OEmbed
       found = false
       max_redirects = 4
       until found
-        host, port = uri.host, uri.port if uri.host && uri.port
-        res = Net::HTTP.start(uri.host, uri.port) {|http| http.get(uri.request_uri) }
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = uri.scheme == 'https'
+        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        
+        %w{scheme userinfo host port registry}.each { |method| uri.send("#{method}=", nil) }
+        res = http.request(Net::HTTP::Get.new(uri.to_s))
+        
+        #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
+          found = true
         else
-            max_redirects = max_redirects - 1
+          max_redirects -= 1
         end
       end
       

data/lib/oembed/providers.rb

@@ -8,6 +8,7 @@ module OEmbed
     class << self
       @@urls = {}
       @@fallback = []
+      @@to_register = {}
 
       # A Hash of all url schemes, where the keys represent schemes supported by
       # all registered Provider instances and values are an Array of Providers
@@ -40,16 +41,14 @@ module OEmbed
         end
       end
 
-      # Register a standard set of common Provider instances, including:
-      # * Flickr
-      # * Hulu
-      # * Qik
-      # * Revision3
-      # * Viddler
-      # * Vimeo
-      # * Youtube
-      def register_all
-        register(Youtube, Flickr, Viddler, Qik, Revision3, Hulu, Vimeo)
+      # Register all Providers built into this gem.
+      # The including_sub_type parameter should be one of the following values:
+      # * :aggregators: also register provider agregator endpoints, like Embedly
+      def register_all(*including_sub_type)
+        register(*@@to_register[""])
+        including_sub_type.each do |sub_type|
+          register(*@@to_register[sub_type.to_s])
+        end
       end
 
       # Unregister all currently-registered Provider instances.
@@ -108,6 +107,21 @@ module OEmbed
           raise(OEmbed::NotFound)
         end
       end
+      
+      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
+      # 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)
+        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
+      end
     end
 
     # Custom providers:
@@ -121,63 +135,131 @@ module OEmbed
     Youtube << "https://*.youtube.com/*"
     Youtube << "http://*.youtu.be/*"
     Youtube << "https://*.youtu.be/*"
+    add_official_provider(Youtube)
 
     # Provider for flickr.com
     # http://developer.yahoo.com/blogs/ydn/posts/2008/05/oembed_embeddin/
     Flickr = OEmbed::Provider.new("http://www.flickr.com/services/oembed/")
     Flickr << "http://*.flickr.com/*"
+    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("http://www.hulu.com/api/oembed.{format}")
     Hulu << "http://www.hulu.com/watch/*"
+    add_official_provider(Hulu)
 
     # Provider for vimeo.com
     # http://vimeo.com/api/docs/oEmbed
     Vimeo = OEmbed::Provider.new("http://www.vimeo.com/api/oembed.{format}")
     Vimeo << "http://*.vimeo.com/*"
-    Vimeo << "http://*.vimeo.com/groups/*/videos/*"
+    Vimeo << "https://*.vimeo.com/*"
+    add_official_provider(Vimeo)
     
     # Provider for instagram.com
     # http://instagr.am/developer/embedding/
     Instagram = OEmbed::Provider.new("http://api.instagram.com/oembed", :json)
     Instagram << "http://instagr.am/p/*"
     Instagram << "http://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 << "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 << "http://yfrog.com/*"
+    add_official_provider(Yfrog)
     
     # 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("http://www.scribd.com/services/oembed")
+    Scribd << "http://*.scribd.com/*"
+    add_official_provider(Scribd)
+
+    # 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("http://soundcloud.com/oembed", :json)
+    SoundCloud << "http://*.soundcloud.com/*"
+    add_official_provider(SoundCloud)
+
+    ## 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 agregator. See
     # OEmbed::Providers::OohEmbed.urls for a full list of supported url schemas.
@@ -229,44 +311,6 @@ module OEmbed
     YAML.load_file(File.join(File.dirname(__FILE__), "/providers/embedly_urls.yml")).each do |url|
       Embedly << url
     end
-    
-    # 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/*"
-
-    # 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/*"
-
-    # Provider for clearspring.com
-    ClearspringWidgets = OEmbed::Provider.new("http://widgets.clearspring.com/widget/v1/oembed/")
-    ClearspringWidgets << "http://www.clearspring.com/widgets/*"
-
-    # Provider for nfb.ca
-    NFBCanada = OEmbed::Provider.new("http://www.nfb.ca/remote/services/oembed/")
-    NFBCanada << "http://*.nfb.ca/film/*"
-
-    # Provider for scribd.com
-    Scribd = OEmbed::Provider.new("http://www.scribd.com/services/oembed")
-    Scribd << "http://*.scribd.com/*"
-
-    # Provider for movieclips.com
-    MovieClips = OEmbed::Provider.new("http://movieclips.com/services/oembed/")
-    MovieClips << "http://movieclips.com/watch/*/*/"
-
-    # Provider for 23hq.com
-    TwentyThree = OEmbed::Provider.new("http://www.23hq.com/23/oembed")
-    TwentyThree << "http://www.23hq.com/*"
-    
-    # Provider for clikthrough.com
-    #Clickthrough = OEmbed::Provider.new("http://www.clikthrough.com/services/oembed/")
-    #Clickthrough << "http://*.clikthrough.com/theater/video/*"
-    #
-    ## Provider for kinomap.com
-    #Kinomap = OEmbed::Provider.new("http://www.kinomap.com/oembed")
-    #Kinomap << "http://www.kinomap.com/*"
+    add_official_provider(Embedly, :aggregators)
   end
 end

data/lib/oembed/providers/embedly_urls.yml

@@ -72,7 +72,6 @@
 - http://aniboom.com/animation-video/*
 - http://animal.discovery.com/videos/*
 - http://animoto.com/play/*
-- http://answers.polldaddy.com/poll/*
 - http://api.shopstyle.com/action/apiVisitRetailer*
 - http://app.wistia.com/embed/medias/*
 - http://asofterworld.com/*.jpg
@@ -215,10 +214,9 @@
 - http://pics.brizzly.com/*.jpg
 - http://pikchur.com/*
 - http://ping.fm/p/*
+- http://pinterest.com/pin/*
 - http://pixorial.com/watch/*
 - http://planetgreen.discovery.com/videos/*
-- http://polldaddy.com/community/poll/*
-- http://polldaddy.com/poll/*
 - http://post.ly/*
 - http://prezi.com/*/*
 - http://qik.com/*

data/lib/oembed/version.rb

@@ -2,7 +2,7 @@ module OEmbed
   class Version
     MAJOR = 0
     MINOR = 8
-    PATCH = 5
+    PATCH = 7
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
     
     class << self

data/lib/tasks/oembed.rake

@@ -1,4 +1,5 @@
 begin
+  require 'yaml'
   require 'json'
   require 'open-uri'
 

data/ruby-oembed.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby-oembed"
-  s.version = "0.8.5"
+  s.version = "0.8.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Magnus Holm", "Alex Kessinger", "Aris Bartee", "Marcos Wright Kuhns"]
-  s.date = "2011-11-15"
+  s.date = "2012-03-12"
   s.description = "An oEmbed consumer library written in Ruby, letting you easily get embeddable HTML representations of supported web pages, based on their URLs. See http://oembed.com for more information about the protocol."
   s.email = "arisbartee@gmail.com"
   s.extra_rdoc_files = [
@@ -54,6 +54,7 @@ Gem::Specification.new do |s|
     "lib/tasks/oembed.rake",
     "lib/tasks/rspec.rake",
     "ruby-oembed.gemspec",
+    "spec/cassettes/OEmbed_Provider.yml",
     "spec/cassettes/OEmbed_ProviderDiscovery.yml",
     "spec/formatter/ducktype_backend_spec.rb",
     "spec/formatter/json/.DS_Store",
@@ -67,11 +68,12 @@ Gem::Specification.new do |s|
     "spec/provider_spec.rb",
     "spec/providers_spec.rb",
     "spec/response_spec.rb",
-    "spec/spec_helper.rb"
+    "spec/spec_helper.rb",
+    "spec/spec_helper_examples.yml"
   ]
   s.homepage = "http://github.com/judofyr/ruby-oembed"
   s.licenses = ["MIT"]
-  s.rdoc_options = ["--main", "README.rdoc", "--title", "ruby-oembed-0.8.5", "--inline-source", "--exclude", "tasks", "CHANGELOG.rdoc"]
+  s.rdoc_options = ["--main", "README.rdoc", "--title", "ruby-oembed-0.8.7", "--inline-source", "--exclude", "tasks", "CHANGELOG.rdoc"]
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.10"
   s.summary = "oEmbed for Ruby"

data/spec/cassettes/OEmbed_Provider.yml

@@ -0,0 +1,224 @@
+---
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
+    method: :get
+    uri: http://www.flickr.com:80/services/oembed/?format=json&url=http://flickr.com/photos/bees/2362225867/
+    body: !!null 
+    headers: !!null 
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
+      code: 200
+      message: OK
+    headers:
+      date:
+      - Sat, 26 Nov 2011 01:53:45 GMT
+      p3p:
+      - policyref="http://p3p.yahoo.com/w3c/p3p.xml", CP="CAO DSP COR CUR ADM DEV
+        TAI PSA PSD IVAi IVDi CONi TELo OTPi OUR DELi SAMi OTRi UNRi PUBi IND PHY
+        ONL UNI PUR FIN COM NAV INT DEM CNT STA POL HEA PRE GOV"
+      set-cookie:
+      - localization=en-us%3Bus%3Bus; expires=Sat, 23-Nov-2013 01:53:45 GMT; path=/;
+        domain=.flickr.com
+      cache-control:
+      - private
+      x-served-by:
+      - www129.flickr.mud.yahoo.com
+      vary:
+      - Accept-Encoding
+      content-type:
+      - application/json
+      age:
+      - '0'
+      via:
+      - HTTP/1.1 r08.ycpi.ne1.yahoo.net (YahooTrafficServer/1.20.9 [cMsSf ]), HTTP/1.1
+        r22.ycpi.sp2.yahoo.net (YahooTrafficServer/1.20.9 [cMsSf ])
+      server:
+      - YTS/1.20.9
+    body: ! '{"version":"1.0","type":"photo","author_url":"http:\/\/www.flickr.com\/photos\/bees\/","cache_age":3600,"provider_name":"Flickr","provider_url":"http:\/\/www.flickr.com\/","title":"Bacon
+      Lollys","author_name":"\u202e\u202d\u202cbees\u202c","width":"500","height":"375","url":"http:\/\/farm4.staticflickr.com\/3040\/2362225867_4a87ab8baf.jpg"}
+
+'
+    http_version: '1.1'
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
+    method: :get
+    uri: http://www.flickr.com:80/services/oembed/?format=json&url=http://flickr.com/photos/bees/2362225867/404
+    body: !!null 
+    headers: !!null 
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
+      code: 404
+      message: Not Found
+    headers:
+      date:
+      - Sat, 26 Nov 2011 01:53:45 GMT
+      p3p:
+      - policyref="http://p3p.yahoo.com/w3c/p3p.xml", CP="CAO DSP COR CUR ADM DEV
+        TAI PSA PSD IVAi IVDi CONi TELo OTPi OUR DELi SAMi OTRi UNRi PUBi IND PHY
+        ONL UNI PUR FIN COM NAV INT DEM CNT STA POL HEA PRE GOV"
+      set-cookie:
+      - localization=en-us%3Bus%3Bus; expires=Sat, 23-Nov-2013 01:53:45 GMT; path=/;
+        domain=.flickr.com
+      cache-control:
+      - private
+      x-served-by:
+      - www129.flickr.mud.yahoo.com
+      vary:
+      - Accept-Encoding
+      content-type:
+      - application/json
+      age:
+      - '0'
+      via:
+      - HTTP/1.1 r08.ycpi.ne1.yahoo.net (YahooTrafficServer/1.20.9 [cMsSf ]), HTTP/1.1
+        r22.ycpi.sp2.yahoo.net (YahooTrafficServer/1.20.9 [cMsSf ])
+      server:
+      - YTS/1.20.9
+    body: ! ' '
+    http_version: '1.1'
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
+    method: :get
+    uri: http://www.flickr.com:80/services/oembed/?format=json&url=http://flickr.com/photos/bees/2362225867/405
+    body: !!null 
+    headers: !!null 
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
+      code: 405
+      message: Method Not Allowed
+    headers:
+      date:
+      - Sat, 26 Nov 2011 01:53:45 GMT
+      p3p:
+      - policyref="http://p3p.yahoo.com/w3c/p3p.xml", CP="CAO DSP COR CUR ADM DEV
+        TAI PSA PSD IVAi IVDi CONi TELo OTPi OUR DELi SAMi OTRi UNRi PUBi IND PHY
+        ONL UNI PUR FIN COM NAV INT DEM CNT STA POL HEA PRE GOV"
+      set-cookie:
+      - localization=en-us%3Bus%3Bus; expires=Sat, 23-Nov-2013 01:53:45 GMT; path=/;
+        domain=.flickr.com
+      cache-control:
+      - private
+      x-served-by:
+      - www129.flickr.mud.yahoo.com
+      vary:
+      - Accept-Encoding
+      content-type:
+      - application/json
+      age:
+      - '0'
+      via:
+      - HTTP/1.1 r08.ycpi.ne1.yahoo.net (YahooTrafficServer/1.20.9 [cMsSf ]), HTTP/1.1
+        r22.ycpi.sp2.yahoo.net (YahooTrafficServer/1.20.9 [cMsSf ])
+      server:
+      - YTS/1.20.9
+    body: ! ' '
+    http_version: '1.1'
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
+    method: :get
+    uri: http://www.flickr.com:80/services/oembed/?format=json&url=http://flickr.com/photos/bees/2362225867/500
+    body: !!null 
+    headers: !!null 
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
+      code: 500
+      message: Internal Server Error
+    headers:
+      date:
+      - Sat, 26 Nov 2011 01:53:45 GMT
+      p3p:
+      - policyref="http://p3p.yahoo.com/w3c/p3p.xml", CP="CAO DSP COR CUR ADM DEV
+        TAI PSA PSD IVAi IVDi CONi TELo OTPi OUR DELi SAMi OTRi UNRi PUBi IND PHY
+        ONL UNI PUR FIN COM NAV INT DEM CNT STA POL HEA PRE GOV"
+      set-cookie:
+      - localization=en-us%3Bus%3Bus; expires=Sat, 23-Nov-2013 01:53:45 GMT; path=/;
+        domain=.flickr.com
+      cache-control:
+      - private
+      x-served-by:
+      - www129.flickr.mud.yahoo.com
+      vary:
+      - Accept-Encoding
+      content-type:
+      - application/json
+      age:
+      - '0'
+      via:
+      - HTTP/1.1 r08.ycpi.ne1.yahoo.net (YahooTrafficServer/1.20.9 [cMsSf ]), HTTP/1.1
+        r22.ycpi.sp2.yahoo.net (YahooTrafficServer/1.20.9 [cMsSf ])
+      server:
+      - YTS/1.20.9
+    body: ! ' '
+    http_version: '1.1'
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
+    method: :get
+    uri: http://www.flickr.com:80/services/oembed/?format=json&url=http://flickr.com/photos/bees/2362225867/501
+    body: !!null 
+    headers: !!null 
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
+      code: 501
+      message: Not Implemented
+    headers:
+      date:
+      - Sat, 26 Nov 2011 01:53:45 GMT
+      p3p:
+      - policyref="http://p3p.yahoo.com/w3c/p3p.xml", CP="CAO DSP COR CUR ADM DEV
+        TAI PSA PSD IVAi IVDi CONi TELo OTPi OUR DELi SAMi OTRi UNRi PUBi IND PHY
+        ONL UNI PUR FIN COM NAV INT DEM CNT STA POL HEA PRE GOV"
+      set-cookie:
+      - localization=en-us%3Bus%3Bus; expires=Sat, 23-Nov-2013 01:53:45 GMT; path=/;
+        domain=.flickr.com
+      cache-control:
+      - private
+      x-served-by:
+      - www129.flickr.mud.yahoo.com
+      vary:
+      - Accept-Encoding
+      content-type:
+      - application/json
+      age:
+      - '0'
+      via:
+      - HTTP/1.1 r08.ycpi.ne1.yahoo.net (YahooTrafficServer/1.20.9 [cMsSf ]), HTTP/1.1
+        r22.ycpi.sp2.yahoo.net (YahooTrafficServer/1.20.9 [cMsSf ])
+      server:
+      - YTS/1.20.9
+    body: ! ' '
+    http_version: '1.1'
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
+    method: :get
+    uri: https://vimeo.com:443/api/oembed.json?url=https://vimeo.com/31158841
+    body: !!null 
+    headers: !!null 
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
+      code: 200
+      message: OK
+    headers:
+      date:
+      - Sat, 26 Nov 2011 02:02:58 GMT
+      server:
+      - Apache
+      x-powered-by:
+      - PHP/5.3.5-0.dotdeb.0
+      expires:
+      - Fri, 25 Nov 2011 14:02:58 GMT
+      cache-control:
+      - no-store, no-cache, must-revalidate
+      - post-check=0, pre-check=0
+      vary:
+      - Accept-Encoding
+      content-length:
+      - '697'
+      content-type:
+      - application/json
+    body: ! '{"type":"video","version":"1.0","provider_name":"Vimeo","provider_url":"http:\/\/vimeo.com\/","title":"Murmuration","author_name":"Sophie
+      Windsor Clive","author_url":"http:\/\/vimeo.com\/user3069761","is_plus":"0","html":"<iframe
+      src=\"https:\/\/player.vimeo.com\/video\/31158841\" width=\"640\" height=\"512\"
+      frameborder=\"0\" webkitAllowFullScreen mozallowfullscreen allowFullScreen><\/iframe>","width":640,"height":512,"duration":120,"description":"A
+      chance encounter and shared moment with one of natures greatest and most fleeting
+      phenomena.","thumbnail_url":"https:\/\/secure-b.vimeocdn.com\/ts\/209\/801\/209801744_640.jpg","thumbnail_width":640,"thumbnail_height":512,"video_id":31158841}'
+    http_version: '1.1'

data/spec/provider_spec.rb

@@ -1,6 +1,20 @@
 require File.dirname(__FILE__) + '/spec_helper'
+require 'vcr'
+
+VCR.config do |c|
+  c.default_cassette_options = { :record => :new_episodes }
+  c.cassette_library_dir = 'spec/cassettes'
+  c.stub_with :fakeweb
+end
 
 describe OEmbed::Provider do
+  before(:all) do
+    VCR.insert_cassette('OEmbed_Provider')
+  end
+  after(:all) do
+    VCR.eject_cassette
+  end
+  
   include OEmbedSpecHelper
 
   before(:all) do
@@ -36,7 +50,6 @@ describe OEmbed::Provider do
       "http://not a uri",
       nil, 1,
     ].each do |endpoint|
-      #puts "given a endpoint of #{endpoint.inspect}"
       proc { OEmbed::Provider.new(endpoint) }.
       should raise_error(ArgumentError)
     end
@@ -236,44 +249,55 @@ describe OEmbed::Provider do
 
   describe "#raw" do
     it "should return the body on 200" do
-      res = Net::HTTPOK.new("1.1", 200, "OK").instance_eval do
-        @body = "raw content"
-        @read = true
-        self
-      end
-      Net::HTTP.stub!(:start).and_return(res)
-
-      @flickr.send(:raw, example_url(:flickr)).should == "raw content"
+      res = @flickr.send(:raw, example_url(:flickr))
+      res.should == example_body(:flickr)
     end
+    
+    it "should return the body on 200 even over https" do
+      @vimeo_ssl = OEmbed::Provider.new("https://vimeo.com/api/oembed.{format}")
+      @vimeo_ssl << "http://*.vimeo.com/*"
+      @vimeo_ssl << "https://*.vimeo.com/*"
 
-    it "should raise error on 501" do
-      res = Net::HTTPNotImplemented.new("1.1", 501, "Not Implemented")
-      Net::HTTP.stub!(:start).and_return(res)
+      proc do
+        @vimeo_ssl.send(:raw, example_url(:vimeo_ssl)).should == example_body(:vimeo_ssl)
+      end.should_not raise_error
+    end
 
+    it "should raise an UnknownFormat error on 501" do
+      # Note: This test relies on a custom-written VCR response in the
+      # cassettes/OEmbed_Provider.yml file.
+      
       proc do
-        @flickr.send(:raw, example_url(:flickr))
+        @flickr.send(:raw, File.join(example_url(:flickr), '501'))
       end.should raise_error(OEmbed::UnknownFormat)
     end
 
-    it "should raise error on 404" do
-      res = Net::HTTPNotFound.new("1.1", 404, "Not Found")
-      Net::HTTP.stub!(:start).and_return(res)
-
+    it "should raise a NotFound error on 404" do
+      # Note: This test relies on a custom-written VCR response in the
+      # cassettes/OEmbed_Provider.yml file.
+      
       proc do
-        @flickr.send(:raw, example_url(:flickr))
+        @flickr.send(:raw, File.join(example_url(:flickr), '404'))
       end.should raise_error(OEmbed::NotFound)
     end
 
-    it "should raise error on all other responses" do
-      Net::HTTPResponse::CODE_TO_OBJ.delete_if do |code, res|
-        ("200".."299").include?(code) ||
-        ["404", "501"].include?(code)
-      end.each do |code, res|
-        r = res.new("1.1", code, "Message")
-        Net::HTTP.stub!(:start).and_return(r)
-
+    it "should raise an UnknownResponse error on other responses" do
+      # Note: This test relies on a custom-written VCR response in the
+      # cassettes/OEmbed_Provider.yml file.
+      
+      statuses_to_check = ['405', '500']
+      
+      statuses_to_check.each do |status|
+        proc do
+          proc do
+            @flickr.send(:raw, File.join(example_url(:flickr), status))
+          end.should_not raise_error(OEmbed::NotFound)
+        end.should_not raise_error(OEmbed::UnknownResponse)
+      end
+      
+      statuses_to_check.each do |status|
         proc do
-          @flickr.send(:raw, example_url(:flickr))
+          @flickr.send(:raw, File.join(example_url(:flickr), status))
         end.should raise_error(OEmbed::UnknownResponse)
       end
     end

data/spec/providers_spec.rb

@@ -16,81 +16,85 @@ describe OEmbed::Providers do
     OEmbed::Providers.unregister_all
   end
 
-  it "should register providers" do
-    OEmbed::Providers.urls.should be_empty
+  describe ".register" do
+    it "should register providers" do
+      OEmbed::Providers.urls.should be_empty
     
-    OEmbed::Providers.register(@flickr, @qik)
+      OEmbed::Providers.register(@flickr, @qik)
     
-    OEmbed::Providers.urls.keys.should == @flickr.urls + @qik.urls
+      OEmbed::Providers.urls.keys.should == @flickr.urls + @qik.urls
 
-    @flickr.urls.each do |regexp|
-      OEmbed::Providers.urls.should have_key(regexp)
-      OEmbed::Providers.urls[regexp].should include(@flickr)
-    end
+      @flickr.urls.each do |regexp|
+        OEmbed::Providers.urls.should have_key(regexp)
+        OEmbed::Providers.urls[regexp].should include(@flickr)
+      end
 
-    @qik.urls.each do |regexp|
-      OEmbed::Providers.urls.should have_key(regexp)
-      OEmbed::Providers.urls[regexp].should include(@qik)
+      @qik.urls.each do |regexp|
+        OEmbed::Providers.urls.should have_key(regexp)
+        OEmbed::Providers.urls[regexp].should include(@qik)
+      end
     end
-  end
 
-  it "should find by URLs" do
-    OEmbed::Providers.register(@flickr, @qik) # tested in "should register providers"
+    it "should find by URLs" do
+      OEmbed::Providers.register(@flickr, @qik) # tested in "should register providers"
     
-    OEmbed::Providers.find(example_url(:flickr)).should == @flickr
-    OEmbed::Providers.find(example_url(:qik)).should == @qik
+      OEmbed::Providers.find(example_url(:flickr)).should == @flickr
+      OEmbed::Providers.find(example_url(:qik)).should == @qik
+    end
   end
 
-  it "should unregister providers" do
-    OEmbed::Providers.register(@flickr, @qik) # tested in "should register providers"
+  describe ".unregister" do
+    it "should unregister providers" do
+      OEmbed::Providers.register(@flickr, @qik) # tested in "should register providers"
     
-    OEmbed::Providers.unregister(@flickr)
+      OEmbed::Providers.unregister(@flickr)
     
-    @flickr.urls.each do |regexp|
-      OEmbed::Providers.urls.should_not have_key(regexp)
-    end
+      @flickr.urls.each do |regexp|
+        OEmbed::Providers.urls.should_not have_key(regexp)
+      end
     
-    OEmbed::Providers.urls.keys.should == @qik.urls
+      OEmbed::Providers.urls.keys.should == @qik.urls
 
-    @qik.urls.each do |regexp|
-      OEmbed::Providers.urls.should have_key(regexp)
-      OEmbed::Providers.urls[regexp].should include(@qik)
+      @qik.urls.each do |regexp|
+        OEmbed::Providers.urls.should have_key(regexp)
+        OEmbed::Providers.urls[regexp].should include(@qik)
+      end
     end
-  end
 
-  it "should not unregister duplicate provider urls at first" do
-    @qik_mirror = OEmbed::Provider.new("http://mirror.qik.com/api/oembed.{format}")
-    @qik_mirror << "http://qik.com/*"
+    it "should not unregister duplicate provider urls at first" do
+      @qik_mirror = OEmbed::Provider.new("http://mirror.qik.com/api/oembed.{format}")
+      @qik_mirror << "http://qik.com/*"
     
-    @qik_mirror.urls.each do |regexp|
-      @qik.urls.should include(regexp)
-    end
+      @qik_mirror.urls.each do |regexp|
+        @qik.urls.should include(regexp)
+      end
     
-    OEmbed::Providers.register(@qik, @qik_mirror)
+      OEmbed::Providers.register(@qik, @qik_mirror)
     
-    OEmbed::Providers.urls.keys.should == @qik.urls
+      OEmbed::Providers.urls.keys.should == @qik.urls
 
-    @qik_mirror.urls.each do |regexp|
-      OEmbed::Providers.urls[regexp].should include(@qik_mirror)
-      OEmbed::Providers.urls[regexp].should include(@qik)
-    end
+      @qik_mirror.urls.each do |regexp|
+        OEmbed::Providers.urls[regexp].should include(@qik_mirror)
+        OEmbed::Providers.urls[regexp].should include(@qik)
+      end
     
-    OEmbed::Providers.find(example_url(:qik)).should == @qik
+      OEmbed::Providers.find(example_url(:qik)).should == @qik
     
-    OEmbed::Providers.unregister(@qik)
+      OEmbed::Providers.unregister(@qik)
     
-    urls = OEmbed::Providers.urls.dup
+      urls = OEmbed::Providers.urls.dup
 
-    @qik_mirror.urls.each do |regexp|
-      OEmbed::Providers.urls[regexp].should include(@qik_mirror)
-    end
+      @qik_mirror.urls.each do |regexp|
+        OEmbed::Providers.urls[regexp].should include(@qik_mirror)
+      end
     
-    OEmbed::Providers.find(example_url(:qik)).should == @qik_mirror
+      OEmbed::Providers.find(example_url(:qik)).should == @qik_mirror
     
-    OEmbed::Providers.unregister(@qik_mirror)
+      OEmbed::Providers.unregister(@qik_mirror)
     
-    @qik_mirror.urls.each do |regexp|
-      OEmbed::Providers.urls.should_not have_key(regexp)
+      @qik_mirror.urls.each do |regexp|
+        OEmbed::Providers.urls.should_not have_key(regexp)
+      end
     end
   end
 
@@ -118,67 +122,137 @@ describe OEmbed::Providers do
 	#    and_return(valid_response(:object))
   #end
 
-  it "should bridge #get and #raw to the right provider" do
-    OEmbed::Providers.register_all
-    all_example_urls.each do |url|
-      provider = OEmbed::Providers.find(url)
-      provider.should_receive(:raw).
-        with(url, {})
-      provider.should_receive(:get).
-        with(url, {})
-      OEmbed::Providers.raw(url)
-      OEmbed::Providers.get(url)
+  describe "#raw and #get" do
+    it "should bridge #get and #raw to the right provider" do
+      OEmbed::Providers.register_all
+      all_example_urls.each do |url|
+        provider = OEmbed::Providers.find(url)
+        provider.should_receive(:raw).
+          with(url, {})
+        provider.should_receive(:get).
+          with(url, {})
+        OEmbed::Providers.raw(url)
+        OEmbed::Providers.get(url)
+      end
     end
-  end
 
-  it "should raise an error if no embeddable content is found" do
-    OEmbed::Providers.register_all
-    ["http://fake.com/", example_url(:google_video)].each do |url|
-      proc { OEmbed::Providers.get(url) }.should raise_error(OEmbed::NotFound)
-      proc { OEmbed::Providers.raw(url) }.should raise_error(OEmbed::NotFound)
+    it "should raise an error if no embeddable content is found" do
+      OEmbed::Providers.register_all
+      ["http://fake.com/", example_url(:google_video)].each do |url|
+        proc { OEmbed::Providers.get(url) }.should raise_error(OEmbed::NotFound)
+        proc { OEmbed::Providers.raw(url) }.should raise_error(OEmbed::NotFound)
+      end
     end
   end
 
-  it "should register fallback providers" do
-    OEmbed::Providers.register_fallback(OEmbed::Providers::Hulu)
-    OEmbed::Providers.register_fallback(OEmbed::Providers::OohEmbed)
+  describe ".register_fallback" do
+    it "should register fallback providers" do
+      OEmbed::Providers.register_fallback(OEmbed::Providers::Hulu)
+      OEmbed::Providers.register_fallback(OEmbed::Providers::OohEmbed)
 
-    OEmbed::Providers.fallback.should == [ OEmbed::Providers::Hulu, OEmbed::Providers::OohEmbed]
-  end
+      OEmbed::Providers.fallback.should == [ OEmbed::Providers::Hulu, OEmbed::Providers::OohEmbed]
+    end
 
-  it "should fallback to the appropriate provider when URL isn't found" do
-    OEmbed::Providers.register_all
-    OEmbed::Providers.register_fallback(OEmbed::Providers::Hulu)
-    OEmbed::Providers.register_fallback(OEmbed::Providers::OohEmbed)
-    
-    url = example_url(:google_video)
-
-    provider = OEmbed::Providers.fallback.last
-    provider.should_receive(:raw).
-      with(url, {}).
-      and_return(valid_response(:raw))
-    provider.should_receive(:get).
-      with(url, {}).
-      and_return(valid_response(:object))
-
-    OEmbed::Providers.fallback.each do |p|
-      next if p == provider
-      p.should_receive(:raw).and_raise(OEmbed::NotFound)
-      p.should_receive(:get).and_raise(OEmbed::NotFound)
+    it "should fallback to the appropriate provider when URL isn't found" do
+      OEmbed::Providers.register_all
+      OEmbed::Providers.register_fallback(OEmbed::Providers::Hulu)
+      OEmbed::Providers.register_fallback(OEmbed::Providers::OohEmbed)
+    
+      url = example_url(:google_video)
+
+      provider = OEmbed::Providers.fallback.last
+      provider.should_receive(:raw).
+        with(url, {}).
+        and_return(valid_response(:raw))
+      provider.should_receive(:get).
+        with(url, {}).
+        and_return(valid_response(:object))
+
+      OEmbed::Providers.fallback.each do |p|
+        next if p == provider
+        p.should_receive(:raw).and_raise(OEmbed::NotFound)
+        p.should_receive(:get).and_raise(OEmbed::NotFound)
+      end
+
+      OEmbed::Providers.raw(url)
+      OEmbed::Providers.get(url)
     end
 
-    OEmbed::Providers.raw(url)
-    OEmbed::Providers.get(url)
+    it "should still raise an error if no embeddable content is found" do
+      OEmbed::Providers.register_all
+      OEmbed::Providers.register_fallback(OEmbed::Providers::Hulu)
+      OEmbed::Providers.register_fallback(OEmbed::Providers::OohEmbed)
+    
+      ["http://fa.ke/"].each do |url|
+        proc { OEmbed::Providers.get(url) }.should raise_error(OEmbed::NotFound)
+        proc { OEmbed::Providers.raw(url) }.should raise_error(OEmbed::NotFound)
+      end
+    end
   end
 
-  it "should still raise an error if no embeddable content is found" do
-    OEmbed::Providers.register_all
-    OEmbed::Providers.register_fallback(OEmbed::Providers::Hulu)
-    OEmbed::Providers.register_fallback(OEmbed::Providers::OohEmbed)
+  describe ".register_all" do
+    after(:each) do
+      OEmbed::Providers.send(:remove_const, :Fake) if defined?(OEmbed::Providers::Fake)
+    end
+    
+    it "should not register a provider that is not marked as official" do
+      defined?(OEmbed::Providers::Fake).should_not be
+      
+      class OEmbed::Providers
+        Fake = OEmbed::Provider.new("http://new.fa.ke/oembed/")
+        Fake << "http://new.fa.ke/*"
+      end
+      
+      OEmbed::Providers.register_all
+      ["http://new.fa.ke/20C285E0"].each do |url|
+        provider = OEmbed::Providers.find(url)
+        provider.should be_nil
+      end
+    end
     
-    ["http://fake.com/"].each do |url|
-      proc { OEmbed::Providers.get(url) }.should raise_error(OEmbed::NotFound)
-      proc { OEmbed::Providers.raw(url) }.should raise_error(OEmbed::NotFound)
+    describe 'add_official_provider' do
+      it "should register a new official provider" do
+        defined?(OEmbed::Providers::Fake).should_not be
+        
+        class OEmbed::Providers
+          Fake = OEmbed::Provider.new("http://official.fa.ke/oembed/")
+          Fake << "http://official.fa.ke/*"
+          add_official_provider(Fake)
+        end
+
+        ["http://official.fa.ke/20C285E0"].each do |url|
+          provider = OEmbed::Providers.find(url)
+          provider.should_not be_a(OEmbed::Provider)
+        end
+        
+        OEmbed::Providers.register_all
+        ["http://official.fa.ke/20C285E0"].each do |url|
+          provider = OEmbed::Providers.find(url)
+          provider.should be_a(OEmbed::Provider)
+        end
+      end
+
+      it "should register an official sub_type provider separately" do
+        defined?(OEmbed::Providers::Fake).should_not be
+        
+        class OEmbed::Providers
+          Fake = OEmbed::Provider.new("http://sub.fa.ke/oembed/")
+          Fake << "http://sub.fa.ke/*"
+          add_official_provider(Fake, :fakes)
+        end
+
+        OEmbed::Providers.register_all
+        ["http://sub.fa.ke/20C285E0"].each do |url|
+          provider = OEmbed::Providers.find(url)
+          provider.should_not be_a(OEmbed::Provider)
+        end
+        
+        OEmbed::Providers.register_all(:fakes)
+        ["http://sub.fa.ke/20C285E0"].each do |url|
+          provider = OEmbed::Providers.find(url)
+          provider.should be_a(OEmbed::Provider)
+        end
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -3,23 +3,15 @@ require 'vcr'
 require File.dirname(__FILE__) + '/../lib/oembed'
 
 module OEmbedSpecHelper
-  EXAMPLE = {
-    :flickr => "http://flickr.com/photos/bees/2362225867/",
-    :viddler => "http://www.viddler.com/explore/cdevroe/videos/424/",
-    :qik => "http://qik.com/video/49565",
-    :vimeo => "http://vimeo.com/3100878",
-    :rev3 => "http://revision3.com/diggnation/2008-04-17xsanned/",
-    :hulu => "http://www.hulu.com/watch/4569/firefly-serenity#x-0,vepisode,1",
-    :google_video => "http://video.google.com/videoplay?docid=8372603330420559198",
-  } unless defined?(EXAMPLE)
+  EXAMPLE = YAML.load_file(File.expand_path(File.join(__FILE__, '../spec_helper_examples.yml'))) unless defined?(EXAMPLE)
 
   def example_url(site)
     return "http://fake.com/" if site == :fake
-    EXAMPLE[site]
+    EXAMPLE[site][:url]
   end
 
   def all_example_urls(*fallback)
-    results = EXAMPLE.values
+    results = EXAMPLE.values.map{ |v| v[:url] }
 
     # By default don't return example_urls that won't be recognized by
     # the included default providers
@@ -35,6 +27,10 @@ module OEmbedSpecHelper
 
     results
   end
+  
+  def example_body(site)
+    EXAMPLE[site][:body]
+  end
 
   def valid_response(format)
     case format.to_s

data/spec/spec_helper_examples.yml

@@ -0,0 +1,34 @@
+--- 
+:flickr: 
+  :url: "http://flickr.com/photos/bees/2362225867/"
+  :body: !
+    '{"version":"1.0","type":"photo","author_url":"http:\/\/www.flickr.com\/photos\/bees\/","cache_age":3600,"provider_name":"Flickr","provider_url":"http:\/\/www.flickr.com\/","title":"Bacon
+      Lollys","author_name":"\u202e\u202d\u202cbees\u202c","width":"500","height":"375","url":"http:\/\/farm4.staticflickr.com\/3040\/2362225867_4a87ab8baf.jpg"}
+
+'
+:viddler: 
+  :url: "http://www.viddler.com/explore/cdevroe/videos/424/"
+:qik: 
+  :url: "http://qik.com/video/49565"
+:vimeo: 
+  :url: "http://vimeo.com/3100878"
+  :body: ! '{"type":"video","version":"1.0","provider_name":"Vimeo","provider_url":"http:\/\/vimeo.com\/","title":"Murmuration","author_name":"Sophie
+    Windsor Clive","author_url":"http:\/\/vimeo.com\/user3069761","is_plus":"0","html":"<iframe
+    src=\"https:\/\/player.vimeo.com\/video\/31158841\" width=\"640\" height=\"512\"
+    frameborder=\"0\" webkitAllowFullScreen mozallowfullscreen allowFullScreen><\/iframe>","width":640,"height":512,"duration":120,"description":"A
+    chance encounter and shared moment with one of natures greatest and most fleeting
+    phenomena.","thumbnail_url":"https:\/\/secure-b.vimeocdn.com\/ts\/209\/801\/209801744_640.jpg","thumbnail_width":640,"thumbnail_height":512,"video_id":31158841}'
+:vimeo_ssl: 
+  :url: "https://vimeo.com/31158841"
+  :body: ! '{"type":"video","version":"1.0","provider_name":"Vimeo","provider_url":"http:\/\/vimeo.com\/","title":"Murmuration","author_name":"Sophie
+    Windsor Clive","author_url":"http:\/\/vimeo.com\/user3069761","is_plus":"0","html":"<iframe
+    src=\"https:\/\/player.vimeo.com\/video\/31158841\" width=\"640\" height=\"512\"
+    frameborder=\"0\" webkitAllowFullScreen mozallowfullscreen allowFullScreen><\/iframe>","width":640,"height":512,"duration":120,"description":"A
+    chance encounter and shared moment with one of natures greatest and most fleeting
+    phenomena.","thumbnail_url":"https:\/\/secure-b.vimeocdn.com\/ts\/209\/801\/209801744_640.jpg","thumbnail_width":640,"thumbnail_height":512,"video_id":31158841}'
+:rev3: 
+  :url: "http://revision3.com/diggnation/2008-04-17xsanned/"
+:hulu: 
+  :url: "http://www.hulu.com/watch/4569/firefly-serenity#x-0,vepisode,1"
+:google_video: 
+  :url: "http://video.google.com/videoplay?docid=8372603330420559198"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-oembed
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.7
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-15 00:00:00.000000000Z
+date: 2012-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2170353860 !ruby/object:Gem::Requirement
+  requirement: &70130727181160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2170353860
+  version_requirements: *70130727181160
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2170353280 !ruby/object:Gem::Requirement
+  requirement: &70130727180620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2170353280
+  version_requirements: *70130727180620
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2170352700 !ruby/object:Gem::Requirement
+  requirement: &70130727179960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2170352700
+  version_requirements: *70130727179960
 - !ruby/object:Gem::Dependency
   name: xml-simple
-  requirement: &2170352120 !ruby/object:Gem::Requirement
+  requirement: &70130727179260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2170352120
+  version_requirements: *70130727179260
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2170351480 !ruby/object:Gem::Requirement
+  requirement: &70130727178760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2170351480
+  version_requirements: *70130727178760
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2170350980 !ruby/object:Gem::Requirement
+  requirement: &70130727178240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *2170350980
+  version_requirements: *70130727178240
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &2170350500 !ruby/object:Gem::Requirement
+  requirement: &70130727177700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -90,10 +90,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *2170350500
+  version_requirements: *70130727177700
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &2170350020 !ruby/object:Gem::Requirement
+  requirement: &70130727177160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,7 +101,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2170350020
+  version_requirements: *70130727177160
 description: An oEmbed consumer library written in Ruby, letting you easily get embeddable
   HTML representations of supported web pages, based on their URLs. See http://oembed.com
   for more information about the protocol.
@@ -149,6 +149,7 @@ files:
 - lib/tasks/oembed.rake
 - lib/tasks/rspec.rake
 - ruby-oembed.gemspec
+- spec/cassettes/OEmbed_Provider.yml
 - spec/cassettes/OEmbed_ProviderDiscovery.yml
 - spec/formatter/ducktype_backend_spec.rb
 - spec/formatter/json/.DS_Store
@@ -163,6 +164,7 @@ files:
 - spec/providers_spec.rb
 - spec/response_spec.rb
 - spec/spec_helper.rb
+- spec/spec_helper_examples.yml
 homepage: http://github.com/judofyr/ruby-oembed
 licenses:
 - MIT
@@ -171,7 +173,7 @@ rdoc_options:
 - --main
 - README.rdoc
 - --title
-- ruby-oembed-0.8.5
+- ruby-oembed-0.8.7
 - --inline-source
 - --exclude
 - tasks