ruby-oembed 0.10.1 → 0.14.0

data/spec/provider_discovery_spec.rb

@@ -24,8 +24,8 @@ describe OEmbed::ProviderDiscovery do
       :json,
     ],
     'vimeo' => [
-      'http://vimeo.com/27953845',
-      {:json=>'http://vimeo.com/api/oembed.json', :xml=>'http://vimeo.com/api/oembed.xml'},
+      'https://vimeo.com/27953845',
+      {:json=>'https://vimeo.com/api/oembed.json', :xml=>'https://vimeo.com/api/oembed.xml'},
       :json,
     ],
     'facebook-photo' => [
@@ -38,11 +38,6 @@ describe OEmbed::ProviderDiscovery do
       'https://www.tumblr.com/oembed/1.0',
       :json
     ],
-    'noteflight' => [
-      'http://www.noteflight.com/scores/view/09665392c94475f65dfaf5f30aadb6ed0921939d',
-      {:json=>'http://www.noteflight.com/services/oembed', :xml=>'http://www.noteflight.com/services/oembed'},
-      :json,
-    ],
     # TODO: Enhance ProviderDiscovery to support arbitrary query parameters. See https://github.com/ruby-oembed/ruby-oembed/issues/15
     #'wordpress' => [
     #  'http://sweetandweak.wordpress.com/2011/09/23/nothing-starts-the-morning-like-a-good-dose-of-panic/',

data/spec/provider_spec.rb

@@ -267,37 +267,30 @@ describe OEmbed::Provider do
       @vimeo_ssl << "http://*.vimeo.com/*"
       @vimeo_ssl << "https://*.vimeo.com/*"
 
-      expect {
-        res = @vimeo_ssl.send(:raw, example_url(:vimeo_ssl))
-        expect(res).to eq(example_body(:vimeo_ssl))
-      }.not_to raise_error
+      res = @vimeo_ssl.send(:raw, example_url(:vimeo_ssl))
+      expect(res).to eq(example_body(:vimeo_ssl).strip)
     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.
+      stub_request(:get, /flickr/).to_return(status: 501)
 
       expect {
-        @flickr.send(:raw, File.join(example_url(:flickr), '501'))
+        result = @flickr.send(:raw, File.join(example_url(:flickr), '501'))
       }.to raise_error(OEmbed::UnknownFormat)
     end
 
     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.
+      stub_request(:get, /flickr/).to_return(status: 404)
 
       expect {
         @flickr.send(:raw, File.join(example_url(:flickr), '404'))
       }.to raise_error(OEmbed::NotFound)
     end
 
-    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']
+    ['405', '500'].each do |status|
+      it "should raise an UnknownResponse error on other responses (#{status})" do
+        stub_request(:get, /flickr/).to_return(status: status)
 
-      statuses_to_check.each do |status|
         expect {
           @flickr.send(:raw, File.join(example_url(:flickr), status))
         }.to raise_error(OEmbed::UnknownResponse)
@@ -364,7 +357,7 @@ describe OEmbed::Provider do
       @viddler.get(example_url(:viddler))
     end
 
-    it "handles the :timeout option" do
+    it "handles the :timeout option", pending: true do
       expect_any_instance_of(Net::HTTP).to receive(:open_timeout=).with(5)
       expect_any_instance_of(Net::HTTP).to receive(:read_timeout=).with(5)
       @flickr.get(example_url(:flickr), :timeout => 5)

data/spec/providers/facebook_spec.rb

@@ -0,0 +1,50 @@
+require File.join(File.dirname(__FILE__), '../spec_helper')
+
+describe 'Facebook providers' do
+  let(:access_token) { 'my-fake-access-token' }
+
+  describe 'FacebookPost provider' do
+    let(:provider) { OEmbed::Providers::FacebookPost.new(access_token: access_token) }
+    let(:embed_url) { 'https://www.facebook.com/exampleuser/posts/1234567890' }
+
+    it 'sets the endpoint URL' do
+      expect(provider.endpoint).to(
+        eq("https://graph.facebook.com/v8.0/oembed_post?access_token=#{access_token}")
+      )
+    end
+
+    it 'recognizes embed URLs' do
+      expect(provider).to include(embed_url)
+    end
+  end
+
+  describe 'FacebookVideo provider' do
+    let(:provider) { OEmbed::Providers::FacebookVideo.new(access_token: access_token) }
+    let(:embed_url) { 'https://www.facebook.com/exampleuser/videos/1234567890' }
+
+    it 'sets the endpoint URL' do
+      expect(provider.endpoint).to(
+        eq("https://graph.facebook.com/v8.0/oembed_video?access_token=#{access_token}")
+      )
+    end
+
+    it 'recognizes embed URLs' do
+      expect(provider).to include(embed_url)
+    end
+  end
+
+  describe 'Instagram provider' do
+    let(:provider) { OEmbed::Providers::Instagram.new(access_token: access_token) }
+    let(:embed_url) { 'https://www.instagram.com/p/r4nd0m1mg/' }
+
+    it 'sets the endpoint URL' do
+      expect(provider.endpoint).to(
+        eq("https://graph.facebook.com/v8.0/instagram_oembed?access_token=#{access_token}")
+      )
+    end
+
+    it 'recognizes embed URLs' do
+      expect(provider).to include(embed_url)
+    end
+  end
+end

data/spec/providers_spec.rb

@@ -210,6 +210,54 @@ describe OEmbed::Providers do
       end
     end
 
+    describe 'register_access_token_providers' do
+      describe 'tokens[:facebook]' do
+        let(:access_token) { 'my-fake-access-token' }
+        let(:embed_url) { 'https://www.facebook.com/exampleuser/posts/1234567890' }
+
+        around(:each) do |each|
+          previous_value = ENV['OEMBED_FACEBOOK_TOKEN']
+          ENV['OEMBED_FACEBOOK_TOKEN'] = nil
+          each.run
+          ENV['OEMBED_FACEBOOK_TOKEN'] = previous_value
+          OEmbed::Providers.unregister_all
+        end
+
+        subject { OEmbed::Providers.find(embed_url) }
+
+        context 'when NO access token is provided' do
+          before do
+            OEmbed::Providers.register_all
+          end
+
+          it { is_expected.to_not be_a(OEmbed::Providers::FacebookPost) }
+        end
+
+        context 'when access token is provided to register_all' do
+          before do
+            OEmbed::Providers.register_all(access_tokens: { facebook: access_token })
+          end
+
+          it { is_expected.to be_a(OEmbed::Providers::FacebookPost) }
+        end
+
+        context 'when access token is set as an environment variable' do
+          before do
+            ENV['OEMBED_FACEBOOK_TOKEN'] = access_token
+            OEmbed::Providers.register_all
+          end
+
+          it { is_expected.to be_a(OEmbed::Providers::FacebookPost) }
+        end
+
+        context 'without access token' do
+          before { OEmbed::Providers.register_all }
+
+          it { is_expected.to eq(nil) }
+        end
+      end
+    end
+
     describe 'add_official_provider' do
       it "should register a new official provider" do
         expect(defined?(OEmbed::Providers::Fake)).to_not be

data/spec/spec_helper.rb

@@ -4,9 +4,10 @@ require 'vcr'
 VCR.config do |c|
   c.default_cassette_options = { :record => :new_episodes }
   c.cassette_library_dir = 'spec/cassettes'
-  c.stub_with :fakeweb
+  c.hook_into :webmock
 end
 
+require 'webmock/rspec'
 require 'coveralls'
 Coveralls.wear!
 
@@ -16,6 +17,7 @@ RSpec.configure do |config|
   config.raise_errors_for_deprecations!
   config.tty = true
   config.color = true
+  config.example_status_persistence_file_path = '.rspec-status'
 end
 
 module OEmbedSpecHelper

data/spec/spec_helper_examples.yml

@@ -1,11 +1,9 @@
 --- 
 :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"}
+  :body: |
+    {"type":"photo","flickr_type":"photo","title":"Bacon Lollys","author_name":"\u202e\u202d\u202cbees\u202c","author_url":"https:\/\/www.flickr.com\/photos\/bees\/","width":1024,"height":768,"url":"https:\/\/live.staticflickr.com\/3040\/2362225867_4a87ab8baf_b.jpg","web_page":"https:\/\/www.flickr.com\/photos\/bees\/2362225867\/","thumbnail_url":"https:\/\/live.staticflickr.com\/3040\/2362225867_4a87ab8baf_q.jpg","thumbnail_width":150,"thumbnail_height":150,"web_page_short_url":"https:\/\/flic.kr\/p\/4AK2sc","license":"All Rights Reserved","license_id":0,"html":"<a data-flickr-embed=\"true\" href=\"https:\/\/www.flickr.com\/photos\/bees\/2362225867\/\" title=\"Bacon Lollys by \u202e\u202d\u202cbees\u202c, on Flickr\"><img src=\"https:\/\/live.staticflickr.com\/3040\/2362225867_4a87ab8baf_b.jpg\" width=\"1024\" height=\"768\" alt=\"Bacon Lollys\"><\/a><script async src=\"https:\/\/embedr.flickr.com\/assets\/client-code.js\" charset=\"utf-8\"><\/script>","version":"1.0","cache_age":3600,"provider_name":"Flickr","provider_url":"https:\/\/www.flickr.com\/"}
 
-'
 :skitch:
   :url: "http://skitch.com/sethferreira/nmbr8/the-kings-new-toy"
   :body: ! '{"type":"photo","version":"1.0","author_name":"sethferreira","author_url":"http:\/\/skitch.com\/sethferreira\/","provider_name":"Skitch.com","provider_url":"http:\/\/skitch.com\/","width":804,"height":804,"url":"https:\/\/img.skitch.com\/20091210-m9cq9r2e6cy1j1sn23acn38kx.jpg","thumbnail_width":337,"thumbnail_height":337,"thumbnail_url":"https:\/\/img.skitch.com\/20091210-m9cq9r2e6cy1j1sn23acn38kx.preview.jpg","cache_age":86400}'
@@ -15,20 +13,12 @@
   :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}'
+  :body: |
+    {"type":"video","version":"1.0","provider_name":"Vimeo","provider_url":"https:\/\/vimeo.com\/","title":"Murmuration","author_name":"Islands & Rivers","author_url":"https:\/\/vimeo.com\/islandsandrivers","is_plus":"0","account_type":"basic","html":"<iframe src=\"https:\/\/player.vimeo.com\/video\/31158841?app_id=122963\" width=\"400\" height=\"320\" frameborder=\"0\" allow=\"autoplay; fullscreen\" allowfullscreen title=\"Murmuration\"><\/iframe>","width":400,"height":320,"duration":123,"description":"A chance encounter and shared moment with one of natures greatest and most fleeting phenomena.\n\nFacebook: Islands And Rivers\nFor licensing information contact Dale Dobson - dale@iconiclinx.com","thumbnail_url":"https:\/\/i.vimeocdn.com\/video\/448600816_295x166.jpg","thumbnail_width":295,"thumbnail_height":221,"thumbnail_url_with_play_button":"https:\/\/i.vimeocdn.com\/filter\/overlay?src0=https%3A%2F%2Fi.vimeocdn.com%2Fvideo%2F448600816_295x166.jpg&src1=http%3A%2F%2Ff.vimeocdn.com%2Fp%2Fimages%2Fcrawler_play.png","upload_date":"2011-10-26 14:43:13","video_id":31158841,"uri":"\/videos\/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}'
+  :body: |
+    {"type":"video","version":"1.0","provider_name":"Vimeo","provider_url":"https:\/\/vimeo.com\/","title":"Murmuration","author_name":"Islands & Rivers","author_url":"https:\/\/vimeo.com\/islandsandrivers","is_plus":"0","account_type":"basic","html":"<iframe src=\"https:\/\/player.vimeo.com\/video\/31158841?app_id=122963\" width=\"400\" height=\"320\" frameborder=\"0\" allow=\"autoplay; fullscreen\" allowfullscreen title=\"Murmuration\"><\/iframe>","width":400,"height":320,"duration":123,"description":"A chance encounter and shared moment with one of natures greatest and most fleeting phenomena.\n\nFacebook: Islands And Rivers\nFor licensing information contact Dale Dobson - dale@iconiclinx.com","thumbnail_url":"https:\/\/i.vimeocdn.com\/video\/448600816_295x166.jpg","thumbnail_width":295,"thumbnail_height":221,"thumbnail_url_with_play_button":"https:\/\/i.vimeocdn.com\/filter\/overlay?src0=https%3A%2F%2Fi.vimeocdn.com%2Fvideo%2F448600816_295x166.jpg&src1=http%3A%2F%2Ff.vimeocdn.com%2Fp%2Fimages%2Fcrawler_play.png","upload_date":"2011-10-26 14:43:13","video_id":31158841,"uri":"\/videos\/31158841"}
 :rev3: 
   :url: "http://revision3.com/diggnation/2008-04-17xsanned/"
 :hulu: 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-oembed
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.14.0
 platform: ruby
 authors:
 - Magnus Holm
@@ -11,36 +11,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-21 00:00:00.000000000 Z
+date: 2020-11-05 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: xml-simple
   requirement: !ruby/object:Gem::Requirement
@@ -69,48 +41,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: fakeweb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 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,8 +79,12 @@ files:
 - lib/oembed/provider.rb
 - lib/oembed/provider_discovery.rb
 - lib/oembed/providers.rb
-- lib/oembed/providers/embedly_urls.yml
-- lib/oembed/providers/oohembed_urls.yml
+- lib/oembed/providers/aggregators/embedly_urls.yml
+- lib/oembed/providers/aggregators/noembed_urls.yml
+- lib/oembed/providers/aggregators/oohembed_urls.yml
+- lib/oembed/providers/facebook_post.rb
+- lib/oembed/providers/facebook_video.rb
+- lib/oembed/providers/instagram.rb
 - lib/oembed/response.rb
 - lib/oembed/response/link.rb
 - lib/oembed/response/photo.rb
@@ -174,6 +108,7 @@ files:
 - spec/formatter_spec.rb
 - spec/provider_discovery_spec.rb
 - spec/provider_spec.rb
+- spec/providers/facebook_spec.rb
 - spec/providers/slideshare_spec.rb
 - spec/providers/twitter_spec.rb
 - spec/providers_spec.rb
@@ -190,7 +125,7 @@ rdoc_options:
 - "--main"
 - README.rdoc
 - "--title"
-- ruby-oembed-0.10.1
+- ruby-oembed-0.14.0
 - "--inline-source"
 - "--exclude"
 - tasks
@@ -208,10 +143,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.4
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: oEmbed for Ruby
 test_files:
 - spec/cassettes/OEmbed_Provider.yml
@@ -228,6 +162,7 @@ test_files:
 - spec/formatter_spec.rb
 - spec/provider_discovery_spec.rb
 - spec/provider_spec.rb
+- spec/providers/facebook_spec.rb
 - spec/providers/slideshare_spec.rb
 - spec/providers/twitter_spec.rb
 - spec/providers_spec.rb