rack-link_headers 2.1.0 → 2.2.0

data/README.md

@@ -19,23 +19,23 @@ Or install it yourself as:
 ## Usage
 
 ```ruby
-response.link "rel", "http://abc.de/"
-response.link "rss", "http://test.host/feed.xml"
+response.link "http://abc.de/", :rel => :search
+response.link "http://test.host/feed.xml", :rel => :rss, :type => "application/rss+xml"
 ```
 ```
 response.headers["Link"]
-# => <http://abc.de/> rel="rel", <http://test.host/feed.xml> rel="rss"
+# => <http://abc.de/>; rel="rel", <http://test.host/feed.xml>; rel="rss"; type="application/rss+xml"
 ```
 
 Manual set Link header will be overridden. All links can be
 accessed via `links`:
 
 ```ruby
-response.link "rel", "http://abc.de/"
-response.link "rss", "http://test.host/feed.xml"
+response.link "http://abc.de/", :rel => :search
+response.link "http://test.host/feed.xml", :rel => :rss, :type => "application/rss+xml"
 
 response.links
-# => [{:rel=>"rel", :url=>"http://abc.de/"}, {:rel=>"rss", :url=>"http://test.host/feed.xml"}]
+# => [{:url=>"http://abc.de/", :params=>{:ref=>:search}}, {:url=>"http://test.host/feed.xml", :params=>{:rel=>:rss, :type=>"application/rss+xml"}}]
 ```
 
 ## Contributing

data/lib/rack/link_headers/helper.rb

@@ -10,12 +10,17 @@ module Rack
 
       module InstanceMethods
         # Add a new Link header to response headers. Requires
-        # a rel string and a URL. Does not escape or sanitize
-        # anything. Manual added Link headers will be
+        # a URL and a params hash. Does not escape or
+        # sanitize anything. Manual added Link headers will be
         # overridden.
-        def link(rel, url)
-          links << {:rel => rel.to_s, :url => url.to_s }
-          self["Link"] = links.to_a.map{|link| "<#{link[:url]}> rel=\"#{link[:rel]}\""}.join(', ')
+        def link(url, params = {})
+          links << {:url => url.to_s, :params => params}
+
+          self["Link"] = links.to_a.map do |link|
+            "<#{link[:url]}>" + link[:params].to_a.map do |k, v|
+              "; #{k}=\"#{v}\""
+            end.join
+          end.join(', ')
         end
 
         def links

data/lib/rack/link_headers/version.rb

@@ -2,7 +2,7 @@ module Rack
   module LinkHeaders
     module VERSION
       MAJOR = 2
-      MINOR = 1
+      MINOR = 2
       PATCH = 0
       STAGE = nil
 

data/test/helper_test.rb

@@ -17,23 +17,24 @@ class HelperTest < MiniTest::Unit::TestCase
   end
 
   def test_link_writes_header
-    @response.link "search", "http://google.com/path?query=5#frag"
+    @response.link "http://google.com/path?query=5#frag", :rel => :search
 
-    assert_equal "<http://google.com/path?query=5#frag> rel=\"search\"", @response.headers["Link"]
+    assert_equal "<http://google.com/path?query=5#frag>; rel=\"search\"", @response.headers["Link"]
   end
 
   def test_multiple_link_writes_header
-    @response.link "search", "http://google.com/path?query=5#frag"
-    @response.link "rss", "http://test.host/feed.rss"
+    @response.link "http://google.com/path?query=5#frag", :rel => :search
+    @response.link "http://test.host/feed.rss", :rel => :rss, :type => "application/rss+xml"
 
-    assert_equal "<http://google.com/path?query=5#frag> rel=\"search\", <http://test.host/feed.rss> rel=\"rss\"", @response.headers["Link"]
+    assert_equal "<http://google.com/path?query=5#frag>; rel=\"search\", <http://test.host/feed.rss>; rel=\"rss\"; type=\"application/rss+xml\"", @response.headers["Link"]
   end
 
   def test_links
-    @response.link "search", "http://google.com/path?query=5#frag"
-    @response.link "rss", "http://test.host/feed.rss"
+    @response.link "http://google.com/path?query=5#frag", :rel => :search
+    @response.link "http://test.host/feed.rss", :rel => :rss, :type => "application/rss+xml"
 
-    assert_equal @response.links, [{:rel=>"search", :url=> "http://google.com/path?query=5#frag"}, {:rel=>"rss", :url=>"http://test.host/feed.rss"}]
+    assert_equal @response.links, [{:url => "http://google.com/path?query=5#frag", :params => {:rel => :search}},
+      {:url => "http://test.host/feed.rss", :params => {:rel => :rss, :type => "application/rss+xml"}}]
   end
 
   def test_overrides_manual_headers
@@ -41,9 +42,9 @@ class HelperTest < MiniTest::Unit::TestCase
 
     assert_equal "http://abc.de/", @response.headers["Link"]
 
-    @response.link "search", "http://google.com/path?query=5#frag"
+    @response.link "http://google.com/path?query=5#frag", :rel => :search
 
-    assert_equal "<http://google.com/path?query=5#frag> rel=\"search\"", @response.headers["Link"]
+    assert_equal "<http://google.com/path?query=5#frag>; rel=\"search\"", @response.headers["Link"]
   end
 
   if ENV["GEM"].to_s.include?('ad')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-link_headers
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -59,7 +59,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3994897237737635876
+      hash: -3911852956380959271
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -68,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3994897237737635876
+      hash: -3911852956380959271
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24