oembed_proxy 0.2.6 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e901566bc9fd0715903da004839a7c44802c9f389b5e67b5acc56e611cbf978d
-  data.tar.gz: 6fd1ed2ce5cd3b1f4af6f952c0c9623d7f91602d3840cbe4f2c181a81ddb1441
+  metadata.gz: f604c0cdfb884bf07cf33db2c1cba4f3b3eb36a123cd2dcf795bee46bf2b17af
+  data.tar.gz: 66d599d359c6e28debd6adaf532008bed4cae542b51623aa6be78bf1e67f2f25
 SHA512:
-  metadata.gz: d1fdc9982ef1b958774ca8771f1b9fe1c62e584b9539088b9226af21ef8c30a8711d4b0e9b8a2e4ca765c900e767403b8b812ad2a3116dbc29ea769563a1fee7
-  data.tar.gz: d3da1c175fae6470645bf76de5cbbb340124d2522ae4935ed3daa17174f918657e2b4c0fe054079f7d8f7b3388daa6d2c0e7a54ac42777932065d26748a0adbd
+  metadata.gz: 4d6ca0159d8d1d4bc194b607cbd84d52cc42a753490f6d68c3ae4fbc4e16aef972407217f8e14310f5bfbce0cbcaff982166f8d993f8336ee604a76e2954da60
+  data.tar.gz: cb1d181ea1d5f04fbd97938c4ad592ac3d8f2e364f8ed9edc8914476810bf96db967c2c401de7ca933c518a602c58713ec96a8f55344ea903cfcb39da43f8cf5

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
   Exclude:
     - 'bin/*'
 

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # oEmbed Proxy Changelog
 
+## [`0.3`] (2023-08-24)
+
+[`0.3`]: https://github.com/APMG/oembed_proxy/compare/v0.2.6...v0.3
+
+* Update Spotify API URI
+* Updated redirect handling to take more obscure types of redirects into account.
+
 ## [`0.2.6`] (2020-12-15)
 
 [`0.2.6`]: https://github.com/APMG/oembed_proxy/compare/v0.2.5...v0.2.6

data/README.md

@@ -1,6 +1,6 @@
 # OembedProxy
 
-[![Build Status](https://travis-ci.org/APMG/oembed_proxy.svg?branch=master)](https://travis-ci.org/APMG/oembed_proxy)
+[![Build Status](https://travis-ci.com/APMG/oembed_proxy.svg?branch=master)](https://app.travis-ci.com/github/APMG/oembed_proxy)
 
 Library to manage multiple oEmbed providers, including officially supported oEmbeds, custom implemented "fauxembeds", and Embed.ly providers.
 

data/lib/oembed_proxy/first_party.rb

@@ -66,8 +66,8 @@ module OembedProxy
       case res
       when Net::HTTPSuccess
         JSON[res.body]
-      when Net::HTTPMovedPermanently, Net::HTTPFound
-        fetch(URI(res['location']), times_recursed: (times_recursed + 1))
+      when Net::HTTPRedirection, Net::HTTPFound
+        fetch(redirect_location(uri, res['location']), times_recursed: (times_recursed + 1))
       else
         raise OembedException, (ERROR_CLASS_MAPPING[res.class] || "Unknown response: #{res.class}")
       end
@@ -75,6 +75,20 @@ module OembedProxy
       return nil # rubocop:disable Style/RedundantReturn
     end
 
+    def redirect_location(original_uri, new_location)
+      # Absolute URL
+      return URI(new_location) if new_location.start_with?('http')
+
+      # Relative path starting at root
+      return URI("#{original_uri.scheme}://#{original_uri.host}#{new_location}") if new_location.start_with?('/')
+
+      # Relative path starting at directory of original request (yuck)
+
+      base_path = Pathname.new(original_uri.path).parent.to_s # Get the current directory
+      base_path = '' if base_path == '/' # Special case, avoiding double slash in URL
+      URI("#{original_uri.scheme}://#{original_uri.host}#{base_path}/#{new_location}")
+    end
+
     def request_builder(uri)
       req = Net::HTTP::Get.new(uri)
       req['User-Agent'] = USER_AGENT

data/lib/oembed_proxy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OembedProxy
-  VERSION = '0.2.6'
+  VERSION = '0.3'
 end

data/lib/providers/first_party.yml

@@ -83,7 +83,7 @@ instagram:
   pattern_list: ["#\\Ahttps?://(?:www\\.)?instagr(?:\\.am|am\\.com)/p/.+#i"]
 
 spotify:
-  endpoint: "https://embed.spotify.com/oembed/"
+  endpoint: "https://embed.spotify.com/oembed"
   pattern_list: ["#\\Ahttps?://(?:open|play)\\.spotify\\.com/.+#i"]
 
 audio-api:

data/oembed_proxy.gemspec

@@ -24,4 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 12.3', '>= 12.3.3'
   spec.add_development_dependency 'rspec', '~> 3.0'
+
+  spec.required_ruby_version = '>= 2.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oembed_proxy
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: '0.3'
 platform: ruby
 authors:
 - APM Digital Products Group
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-15 00:00:00.000000000 Z
+date: 2023-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,8 +58,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: 
-email: 
+description:
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -99,7 +99,7 @@ homepage: https://github.com/APMG/oembed_proxy
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -107,15 +107,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: Simple library to manage first party, embedly, and custom oembeds
 test_files: []