rack-linkeddata 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6f256b9f4c6c2ca900800412440bfe3c4fe2109
-  data.tar.gz: 42dddfa7e2be4edfc3e023bcdffcdd4949dcee40
+  metadata.gz: b1c9a0ddbc3a23ee37f6aefc9ba4adde4671181e
+  data.tar.gz: 14c2fbc74dfc76f243292eb7763b30ec4e3b23cb
 SHA512:
-  metadata.gz: a309c4379b535569527cfd056707b93a37f42dbbeb82f1a78e18d3d05e105bffa7007b9a2b09147d84df6f34d4f4d476b6e8adc04ee74083bbfe1a6614ef23e7
-  data.tar.gz: 2cd8c4237b8068a5ba950b9681d7f5860da93e588e0f3424711b3e293300ae1d72ecad835e6ede5ba9ebb1c79a167a1209ef038e7b103f89f801523c5c505da5
+  metadata.gz: 6270b177a3a3c72b8a28208c23ee207cd350da68cdff0ba3e5a0824df80bfcd0ed549a271ef4a845522f964396c136e4e2584dc5f3ab62253105557135ecec1e
+  data.tar.gz: 699e48429e41637e23cdea4d532ba6b8cb933755c80550465bbb69de5a276e2884e984dc67385c004d8e8123b55a5d02976565e8eea2b039b4d79ad3ca61fc3f

data/VERSION

@@ -1 +1 @@
-2.2.1
+2.2.2

data/lib/rack/linkeddata/conneg.rb

@@ -119,14 +119,7 @@ module Rack; module LinkedData
     # @param  [String, #to_s] content_type
     # @return [Array(Class, String)]
     def find_writer_for_content_type(content_type)
-      writer = case content_type.to_s
-        when '*/*'
-          RDF::Writer.for(:content_type => (content_type = options[:default]))
-        when /^([^\/]+)\/\*$/
-          nil # TODO: match subtype wildcards
-        else
-          RDF::Writer.for(:content_type => content_type)
-      end
+      writer = RDF::Writer.for(content_type: content_type) if content_type
       writer ? [writer, content_type] : nil
     end
 
@@ -141,7 +134,8 @@ module Rack; module LinkedData
     # @see    http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1
     def parse_accept_header(header)
       entries = header.to_s.split(',')
-      entries.map { |e| accept_entry(e) }.sort_by(&:last).map(&:first)
+      entries = entries.map { |e| accept_entry(e) }.sort_by(&:last).map(&:first)
+      entries.map { |e| find_content_type_for_media_range(e) }
     end
 
     def accept_entry(entry)
@@ -151,6 +145,32 @@ module Rack; module LinkedData
       [type, [quality, type.count('*'), 1 - options.size]]
     end
 
+    ##
+    # Returns a content type appropriate for the given `media_range`,
+    # returns `nil` if `media_range` contains a wildcard subtype
+    # that is not mapped.
+    #
+    # @param  [String, #to_s] media_range
+    # @return [String, nil]
+    def find_content_type_for_media_range(media_range)
+      case media_range.to_s
+      when '*/*'
+        options[:default]
+      when 'text/*'
+        'text/turtle'
+      when 'application/*'
+        'application/ld+json'
+      when 'application/json'
+        'application/ld+json'
+      when 'application/xml'
+        'application/rdf+xml'
+      when /^([^\/]+)\/\*$/
+        nil
+      else
+        media_range.to_s
+      end
+    end
+
     ##
     # Outputs an HTTP `406 Not Acceptable` response.
     #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-linkeddata
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Arto Bendiken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-24 00:00:00.000000000 Z
+date: 2017-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: linkeddata
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement