rack-linkeddata 1.0.0 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ef1ed257caa8575b95b77ab988a37176800c97e0
+  data.tar.gz: 91b82de5a9f3a9fe4124c08ad25b3e0d652915b8
+SHA512:
+  metadata.gz: 1aa999f9f66ff6bfede6a67939c32239e2125dd16ce778bb2f550a9332f15ac283f60d186e4620c95d6bb35b1d2fa7bbb3191cb6ccc5c45c1ab2923622b2b2ee
+  data.tar.gz: e5cf29db93b0337275de272e3c40e50f367ef68b7f11c1209c05e5cf177abaa53110f3e3594da9974ee82e83bd3ce5f352bb2698bf0baefee59919a481ecd3b5

data/CREDITS

@@ -0,0 +1 @@
+* Gregg Kellogg <gregg@greggkellogg.net>

data/README

@@ -1,5 +1,4 @@
-Linked Data Content Negotiation for Rack Applications
-=====================================================
+# Linked Data Content Negotiation for Rack Applications
 
 This is [Rack][] middleware that provides [Linked Data][] content
 negotiation for Rack applications. You can use `Rack::LinkedData` with any
@@ -8,15 +7,16 @@ Sinatra.
 
 * <http://github.com/datagraph/rack-linkeddata>
 
-Features
---------
+[![Gem Version](https://badge.fury.io/rb/rack-linkeddata.png)](http://badge.fury.io/rb/rack-linkeddata)
+[![Build Status](https://travis-ci.org/ruby-rdf/rack-linkeddata.png?branch=master)](http://travis-ci.org/ruby-rdf/rack-linkeddata)
+
+## Features
 
 * Implements [HTTP content negotiation][conneg] for RDF content types.
 * Supports all [RDF.rb][]-compatible serialization formats.
 * Compatible with any Rack application and any Rack-based framework.
 
-Examples
---------
+## Examples
 
 ### Adding Linked Data content negotiation to a Rails 3.x application
 
@@ -75,8 +75,7 @@ and different components.
     $ curl -iH "Accept: application/trix" http://localhost:9292/hello
     $ curl -iH "Accept: */*" http://localhost:9292/hello
 
-Description
------------
+## Description
 
 `Rack::LinkedData` implements content negotiation for any [Rack][] response
 object that implements the `RDF::Enumerable` mixin. You would typically
@@ -90,30 +89,26 @@ serialization formats, so it will work with whatever serialization plugins
 that are currently available for RDF.rb. (At present, this includes support
 for N-Triples, N-Quads, Turtle, RDF/XML, RDF/JSON, JSON-LD, RDFa, TriG and TriX.)
 
-Documentation
--------------
+##Documentation
 
-<http://datagraph.rubyforge.org/rack-linkeddata/>
+<http://http://rubydoc.info/github/ruby-rdf/rack-linkeddata/>
 
 * {Rack::LinkedData}
   * {Rack::LinkedData::ContentNegotiation}
 
-Dependencies
-------------
+## Dependencies
 
-* [Rack](http://rubygems.org/gems/rack) (>= 1.4.4)
-* [Linked Data](http://rubygems.org/gems/linkeddata) (>= 1.0)
+* [Rack](http://rubygems.org/gems/rack) (>= 1.5.2)
+* [Linked Data](http://rubygems.org/gems/linkeddata) (>= 1.1)
 
-Installation
-------------
+## Installation
 
 The recommended installation method is via [RubyGems](http://rubygems.org/).
 To install the latest official release of the gem, do:
 
     % [sudo] gem install rack-linkeddata
 
-Download
---------
+## Download
 
 To get a local working copy of the development repository, do:
 
@@ -124,8 +119,22 @@ follows:
 
     % wget http://github.com/ruby-rdf/rack-linkeddata/tarball/master
 
-References
-----------
+## Contributing
+This repository uses [Git Flow](https://github.com/nvie/gitflow) to mange development and release activity. All submissions _must_ be on a feature branch based on the _develop_ branch to ease staging and integration.
+
+* Do your best to adhere to the existing coding conventions and idioms.
+* Don't use hard tabs, and don't leave trailing whitespace on any line.
+* Do document every method you add using [YARD][] annotations. Read the
+  [tutorial][YARD-GS] or just look at the existing code for examples.
+* Don't touch the `.gemspec`, `VERSION` or `AUTHORS` files. If you need to
+  change them, do so on your private branch only.
+* Do feel free to add yourself to the `CREDITS` file and the corresponding
+  list in the the `README`. Alphabetical order applies.
+* Do note that in order for us to merge any non-trivial changes (as a rule
+  of thumb, additions larger than about 15 lines of code), we need an
+  explicit [public domain dedication][PDD] on record from you.
+
+## References
 
 * <http://www.w3.org/DesignIssues/LinkedData.html>
 * <http://linkeddata.org/docs/how-to-publish>
@@ -134,13 +143,12 @@ References
 * <http://www.w3.org/TR/swbp-vocab-pub/>
 * <http://patterns.dataincubator.org/book/publishing-patterns.html>
 
-Authors
--------
+## Authors
 
 * [Arto Bendiken](http://github.com/bendiken) - <http://ar.to/>
+* [Gregg Kellogg](http://github.com/gkellogg) - <http://greggkellogg.net/>
 
-License
--------
+## License
 
 This is free and unencumbered public domain software. For more information,
 see <http://unlicense.org/> or the accompanying {file:UNLICENSE} file.
@@ -149,3 +157,6 @@ see <http://unlicense.org/> or the accompanying {file:UNLICENSE} file.
 [RDF.rb]:         http://ruby-rdf.github.com/rdf/
 [Linked Data]:    http://linkeddata.org/
 [conneg]:         http://en.wikipedia.org/wiki/Content_negotiation
+[YARD]:            http://yardoc.org/
+[YARD-GS]:         http://rubydoc.info/docs/yard/file/docs/GettingStarted.md
+[PDD]:             http://unlicense.org/#unlicensing-contributions

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/lib/rack/linkeddata/conneg.rb

@@ -18,7 +18,7 @@ module Rack; module LinkedData
   #
   # @see http://www4.wiwiss.fu-berlin.de/bizer/pub/LinkedDataTutorial/
   class ContentNegotiation
-    DEFAULT_CONTENT_TYPE = "text/plain" # N-Triples
+    DEFAULT_CONTENT_TYPE = "application/n-triples" # N-Triples
     VARY = {'Vary' => 'Accept'}.freeze
 
     # @return [#call]
@@ -40,11 +40,15 @@ module Rack; module LinkedData
 
     ##
     # Handles a Rack protocol request.
+    # Parses Accept header to find appropriate mime-type and sets content_type accordingly.
+    #
+    # Inserts ordered content types into the environment as `ORDERED_CONTENT_TYPES` if an Accept header is present
     #
     # @param  [Hash{String => String}] env
     # @return [Array(Integer, Hash, #each)]
     # @see    http://rack.rubyforge.org/doc/SPEC.html
     def call(env)
+      env['ORDERED_CONTENT_TYPES'] = parse_accept_header(env['HTTP_ACCEPT']) if env.has_key?('HTTP_ACCEPT')
       response = app.call(env)
       body = response[2].respond_to?(:body) ? response[2].body : response[2]
       case body
@@ -136,19 +140,15 @@ module Rack; module LinkedData
     # @return [Array<String>]
     # @see    http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1
     def parse_accept_header(header)
-      content_types = header.to_s.split(',').map do |content_type_and_weight|
-        content_type_and_weight.strip!
-        case content_type_and_weight
-          when /^([^;]+);\s*q=(\d+\.\d+)$/
-            [[1.0, $2.to_f].min, $1, content_type_and_weight]
-          when /(\S+)/
-            [1.0, $1, content_type_and_weight]
-          else nil
-        end
-      end
-      content_types.compact! # remove nils
-      content_types = content_types.sort_by { |elem| [elem[0], elem[2].size] }
-      content_types.reverse.map { |elem| elem[1] }
+      entries = header.to_s.split(',')
+      entries.map { |e| accept_entry(e) }.sort_by(&:last).map(&:first)
+    end
+
+    def accept_entry(entry)
+      type, *options = entry.delete(' ').split(';')
+      quality = 0 # we sort smallest first
+      options.delete_if { |e| quality = 1 - e[2..-1].to_f if e.start_with? 'q=' }
+      [type, [quality, type.count('*'), 1 - options.size]]
     end
 
     ##
@@ -169,7 +169,7 @@ module Rack; module LinkedData
     # @return [Array(Integer, Hash, #each)]
     def http_error(code, message = nil, headers = {})
       message = http_status(code) + (message.nil? ? "\n" : " (#{message})\n")
-      [code, {'Content-Type' => 'text/plain; charset=utf-8'}.merge(headers), [message]]
+      [code, {'Content-Type' => "#{DEFAULT_CONTENT_TYPE}; charset=utf-8"}.merge(headers), [message]]
     end
 
     ##

metadata

@@ -1,96 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: rack-linkeddata
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Arto Bendiken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-20 00:00:00.000000000 Z
+date: 2013-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: linkeddata
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: '0.6'
 description: Rack middleware for Linked Data content negotiation.
 email: public-rdf-ruby@w3.org
 executables: []
@@ -108,27 +97,26 @@ files:
 homepage: http://ruby-rdf.github.com/rack-linkeddata
 licenses:
 - Public Domain
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.8.1
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: datagraph
-rubygems_version: 1.8.24
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Linked Data content negotiation for Rack applications.
 test_files: []
 has_rdoc: false