rack-accept 0.4.1 → 0.4.2

data/README

@@ -31,7 +31,7 @@ Usage
 Rack::Accept implements the Rack middleware interface and may be used with any
 Rack-based application. Simply insert the Rack::Accept module in your Rack
 middleware pipeline and access the Rack::Accept::Request object in the
-"rack-accept.request" environment key, as in the following example:
+"rack-accept.request" environment key, as in the following example.
 
     require 'rack/accept'
 
@@ -105,7 +105,7 @@ Four-letter Words
 License
 -------
 
-Copyright 2010 Michael J. I. Jackson
+Copyright 2010 Michael Jackson
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/Rakefile

@@ -49,16 +49,16 @@ end
 # PACKAGING & INSTALLATION ####################################################
 
 if defined?(Gem)
-  $spec = eval("#{File.read('.gemspec')}")
+  $spec = eval("#{File.read('rack-accept.gemspec')}")
 
   directory 'dist'
 
   def package(ext='')
-    "dist/rack-accept-#{$spec.version}" + ext
+    "dist/#{$spec.name}-#{$spec.version}" + ext
   end
 
   file package('.gem') => %w< dist > + $spec.files do |f|
-    sh "gem build .gemspec"
+    sh "gem build rack-accept.gemspec"
     mv File.basename(f.name), f.name
   end
 

data/doc/usage.markdown

@@ -4,7 +4,7 @@ Usage
 Rack::Accept implements the Rack middleware interface and may be used with any
 Rack-based application. Simply insert the Rack::Accept module in your Rack
 middleware pipeline and access the [Request][req] object in the
-"rack-accept.request" environment key, as in the following example:
+"rack-accept.request" environment key, as in the following example.
 
     require 'rack/accept'
 

data/lib/rack/accept.rb

@@ -1,11 +1,12 @@
 require 'rack'
 
+# HTTP Accept* for Ruby/Rack.
+#
+# http://mjijackson.com/rack-accept
 module Rack::Accept
+  VERSION = [0, 4, 2]
 
-  # The current version of rack-accept.
-  VERSION = [0, 4, 1]
-
-  # Returns the current version of rack-accept as a string.
+  # Returns the current version of Rack::Accept as a string.
   def self.version
     VERSION.join('.')
   end
@@ -23,5 +24,4 @@ module Rack::Accept
   autoload :MediaType,  'rack/accept/media_type'
   autoload :Request,    'rack/accept/request'
   autoload :Response,   'rack/accept/response'
-
 end

data/lib/rack/accept/charset.rb

@@ -4,8 +4,7 @@ module Rack::Accept
   # specification, and provides several convenience methods for determining
   # acceptable character sets.
   #
-  # See http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html for more
-  # information.
+  # http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.2
   class Charset
 
     include Header

data/lib/rack/accept/encoding.rb

@@ -4,8 +4,7 @@ module Rack::Accept
   # specification, and provides several convenience methods for determining
   # acceptable content encodings.
   #
-  # See http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html for more
-  # information.
+  # http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.3
   class Encoding
 
     include Header

data/lib/rack/accept/header.rb

@@ -12,8 +12,8 @@ module Rack::Accept
     def parse(header)
       qvalues = {}
 
-      header.to_s.split(/,\s*/).map do |part|
-        m = /^([^\s,]+?)(?:;\s*q=(\d+(?:\.\d+)?))?$/.match(part) # From WEBrick
+      header.to_s.split(/,\s*/).each do |part|
+        m = /^([^\s,]+?)(?:\s*;\s*q\s*=\s*(\d+(?:\.\d+)?))?$/.match(part)
 
         if m
           qvalues[m[1]] = normalize_qvalue((m[2] || 1).to_f)

data/lib/rack/accept/language.rb

@@ -4,8 +4,7 @@ module Rack::Accept
   # specification, and provides several convenience methods for determining
   # acceptable content languages.
   #
-  # See http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html for more
-  # information.
+  # http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.4
   class Language
 
     include Header

data/lib/rack/accept/media_type.rb

@@ -4,8 +4,7 @@ module Rack::Accept
   # and provides several convenience methods for determining acceptable media
   # types.
   #
-  # See http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html for more
-  # information.
+  # http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1
   class MediaType
 
     include Header
@@ -42,6 +41,16 @@ module Rack::Accept
 
   private
 
+    def initialize(header)
+      # Strip accept-extension for now. We may want to do something with this
+      # later if people actually start to use it.
+      header = header.to_s.split(/,\s*/).map {|part|
+        part.sub(/(;\s*q\s*=\s*[\d.]+).*$/, '\1')
+      }.join(', ')
+
+      super(header)
+    end
+
     # Returns true if all parameters and values in +match+ are also present in
     # +params+.
     def params_match?(params, match)
@@ -49,5 +58,6 @@ module Rack::Accept
       parsed = parse_range_params(params)
       parsed == parsed.merge(parse_range_params(match))
     end
+
   end
 end

data/{.gemspec → rack-accept.gemspec}

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name = 'rack-accept'
-  s.version = '0.4.1'
-  s.date = '2010-04-05'
+  s.version = '0.4.2'
+  s.date = '2010-05-04'
 
   s.summary = 'HTTP Accept* for Ruby/Rack'
   s.description = 'HTTP Accept, Accept-Charset, Accept-Encoding, and Accept-Language for Ruby/Rack'
 
-  s.author = 'Michael J. I. Jackson'
+  s.author = 'Michael Jackson'
   s.email = 'mjijackson@gmail.com'
 
   s.require_paths = %w< lib >
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.files = Dir['lib/**/*.rb'] +
     Dir['test/*.rb'] +
     Dir['doc/**/*'] +
-    %w< CHANGES .gemspec Rakefile README >
+    %w< CHANGES rack-accept.gemspec Rakefile README >
 
   s.test_files = s.files.select {|path| path =~ /^test\/.*_test.rb/ }
 
@@ -25,5 +25,5 @@ Gem::Specification.new do |s|
   s.rdoc_options = %w< --line-numbers --inline-source --title Rack::Accept --main Rack::Accept >
   s.extra_rdoc_files = %w< CHANGES README >
 
-  s.homepage = 'http://mjijackson.github.com/rack-accept'
+  s.homepage = 'http://mjijackson.com/rack-accept'
 end

data/test/media_type_test.rb

@@ -39,4 +39,9 @@ class MediaTypeTest < Test::Unit::TestCase
     assert_equal('text/xml', m.best_of(%w< text/xml text/html >))
   end
 
+  def test_extension
+    m = M.new('text/*;q=0.5;a=42')
+    assert_equal(0.5, m.qvalue('text/plain'))
+  end
+
 end

metadata

@@ -5,16 +5,16 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
-- Michael J. I. Jackson
+- Michael Jackson
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-04-05 00:00:00 -06:00
+date: 2010-05-04 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -75,11 +75,11 @@ files:
 - doc/license.markdown
 - doc/usage.markdown
 - CHANGES
-- .gemspec
+- rack-accept.gemspec
 - Rakefile
 - README
 has_rdoc: true
-homepage: http://mjijackson.github.com/rack-accept
+homepage: http://mjijackson.com/rack-accept
 licenses: []
 
 post_install_message: