Generalize 'Link' header parsing

lostisland · Feb 16, 2021 · 7fef469 · 7fef469
1 parent 7d57eda
commit 7fef469
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/lib/sawyer/response.rb b/lib/sawyer/response.rb
@@ -48,8 +48,13 @@ def process_data(data)
     #
     # Returns an array of Relations
     def process_rels
-      links = ( @headers["Link"] || "" ).split(', ').map do |link|
-        href, name = link.match(/<(.*?)>; rel="(\w+)"/).captures
+      links = ( @headers["Link"] || "" ).split(',').map do |link|
+        href, params = link.match(/<(.*?)>;(.*)?/).captures
+        name = nil
+        params.split(';').map do |param|
+          param.match(/rel="?(\w+)/) { |m| name = m[1] }
+          break if name
+        end
 
         [name.to_sym, Relation.from_link(@agent, name, :href => href)]
       end