rack-accept 0.4.3 → 0.4.4

data/lib/rack/accept.rb

@@ -4,13 +4,6 @@ require 'rack'
 #
 # http://mjijackson.com/rack-accept
 module Rack::Accept
-  VERSION = [0, 4, 3]
-
-  # Returns the current version of Rack::Accept as a string.
-  def self.version
-    VERSION.join('.')
-  end
-
   # Enables Rack::Accept to be used as a Rack middleware.
   def self.new(app, &block)
     Context.new(app, &block)

data/lib/rack/accept/header.rb

@@ -38,7 +38,7 @@ module Rack::Accept
     # subtype, and 3) the media type parameters. An empty array is returned if
     # no match can be made.
     def parse_media_type(media_type)
-      m = media_type.to_s.match(/^([a-z*]+)\/([a-z*-]+)(?:;([a-z0-9=;]+))?$/)
+      m = media_type.to_s.match(/^([a-z*]+)\/([a-z0-9*\-.+]+)(?:;([a-z0-9=;]+))?$/)
       m ? [m[1], m[2], m[3] || ''] : []
     end
     module_function :parse_media_type

data/lib/rack/accept/version.rb

@@ -0,0 +1,10 @@
+module Rack
+  module Accept
+    VERSION = [0, 4, 4]
+
+    # Returns the current version of Rack::Accept as a string.
+    def self.version
+      VERSION.join('.')
+    end
+  end
+end

data/rack-accept.gemspec

@@ -1,7 +1,11 @@
+$LOAD_PATH.unshift(File.expand_path('../lib', __FILE__))
+
+require 'rack/accept/version'
+
 Gem::Specification.new do |s|
   s.name = 'rack-accept'
-  s.version = '0.4.3'
-  s.date = '2010-07-29'
+  s.version = Rack::Accept.version
+  s.date = Time.now.strftime('%Y-%m-%d')
 
   s.summary = 'HTTP Accept* for Ruby/Rack'
   s.description = 'HTTP Accept, Accept-Charset, Accept-Encoding, and Accept-Language for Ruby/Rack'

data/test/media_type_test.rb

@@ -42,4 +42,17 @@ class MediaTypeTest < Test::Unit::TestCase
     m = M.new('text/*;q=0.5;a=42')
     assert_equal(0.5, m.qvalue('text/plain'))
   end
+  
+  def test_vendored_types
+    m = M.new("application/vnd.ms-excel")
+    assert_equal(nil, m.best_of(%w< application/vnd.ms-powerpoint >))
+
+    m = M.new("application/vnd.api-v1+json")
+    assert_equal(false, m.accept?("application/vnd.api-v2+json"))
+
+    v1, v2 = "application/vnd.api-v1+json", "application/vnd.api-v2+json"
+    m = M.new("#{v1},#{v2}")
+    assert_equal(v1, m.best_of([v1, v2]))
+    assert_equal(v2, m.best_of([v2, v1]))
+  end
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: rack-accept
 version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 3
-  version: 0.4.3
+  prerelease: 
+  version: 0.4.4
 platform: ruby
 authors: 
 - Michael Jackson
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-29 00:00:00 -06:00
+date: 2011-05-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,10 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 4
         version: "0.4"
   type: :runtime
   version_requirements: *id001
@@ -41,9 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id002
@@ -68,6 +56,7 @@ files:
 - lib/rack/accept/media_type.rb
 - lib/rack/accept/request.rb
 - lib/rack/accept/response.rb
+- lib/rack/accept/version.rb
 - lib/rack/accept.rb
 - test/charset_test.rb
 - test/context_test.rb
@@ -100,23 +89,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: HTTP Accept* for Ruby/Rack