accept_headers 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a140173043fff3155b04a77f622823cf12838bc5
-  data.tar.gz: 4dc92d7058528b3a06766be6f0e9a3dfb2408b84
+  metadata.gz: 9a061f83d7dbd285a45d4bbdbc9be56ebdca2ccc
+  data.tar.gz: 1a5a1496f0f771138858e9b09f0ed128c9ebe7c6
 SHA512:
-  metadata.gz: 597d9faad4500046b88f07648c1372120a3c008734c7f100a098c7d2ecc568ec4bb335c1a2d94708729ef0669247a136be62491680655e52bbaae5b22155f13c
-  data.tar.gz: 008ad53a88a1bc15b33564dc68361e116aa19c432ccf09c49529773ca293cb2f5fc7e8804562b594d5a801e2c90750ada349ba74029bf5c27335ee743b5bae02
+  metadata.gz: c6c86cb2c4470f793c309cd5cf742a90da0cba728551f7df3f0561f4a259d5427338e674b07069137063025c86e7503afca878428018f4afd165968675e0a10c
+  data.tar.gz: 3cb9ce5bdc3863a37126e6bde2e89997c05db3696bf28ad64e6ed330234464bc4c56ff57c5bef2a25ef8abb56174add04e755ff402dc0184986c003e06ddc868

data/CHANGELOG.md

@@ -1,11 +1,17 @@
-## 0.3 / November 15, 2014
+## 0.0.4 / November 15, 2014
+
+  * Add MediaType#media_range which is the type/subtype as a string.
+  * Add Language#language_tag which is the primary_tag/subtag as a string.
+  * Test all IANA registered media types against the parser.
+
+## 0.0.3 / November 15, 2014
 
   * Remove `Accept-Charset` support since it's obsolete.
 
-## 0.2 / November 15, 2014
+## 0.0.2 / November 15, 2014
 
   * Add `Negotiator`s which can parse and find the best match.
 
-## 0.1 / November 14, 2014
+## 0.0.1 / November 14, 2014
 
   * Initial release.

data/README.md

@@ -11,7 +11,8 @@ Some features of the library are:
   * Strict adherence to [RFC 2616][rfc], specifically [section 14][rfc-sec14]
   * Full support for the [Accept][rfc-sec14-1], [Accept-Encoding][rfc-sec14-3],
     and [Accept-Language][rfc-sec14-4] HTTP request headers
-  * `Accept-Charset` is not supported because it's [obsolete](https://developer.mozilla.org/en-US/docs/Web/HTTP/Content_negotiation#The_Accept-Charset.3A_header).
+  * `Accept-Charset` is not supported because it's [obsolete](https://developer.mozilla.org/en-US/docs/Web/HTTP/Content_negotiation#The_Accept-Charset.3A_header)
+  * Parser tested against all IANA registered [media types][iana-media-types]
   * A comprehensive [spec suite][spec] that covers many edge cases
 
 This library is optimistic when parsing headers. If a specific media type, encoding, charset, or language can't be parsed, is in an invalid format, or contains invalid characters, it will skip that specific entry when constructing the sorted list. If a `q` value can't be read or is in the wrong format (more than 3 decimal places), it will default it to `0.001` so it still has a chance to match. Lack of an explicit `q` value of course defaults to 1.
@@ -21,6 +22,7 @@ This library is optimistic when parsing headers. If a specific media type, encod
 [rfc-sec14-1]: http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1
 [rfc-sec14-3]: http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.3
 [rfc-sec14-4]: http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.4
+[iana-media-types]: https://www.iana.org/assignments/media-types/media-types.xhtml
 [spec]: http://github.com/kamui/accept_headers/tree/master/spec/
 
 ## Installation
@@ -132,6 +134,7 @@ AcceptHeaders::Language.new('en', 'us')
 
 * Write rack middleware
 * More edge case tests
+* Add rdoc
 
 ## Contributing
 

data/lib/accept_headers/language.rb

@@ -49,7 +49,11 @@ module AcceptHeaders
 
     def to_s
       qvalue = (q == 0 || q == 1) ? q.to_i : q
-      "#{primary_tag}-#{subtag};q=#{qvalue}"
+      "#{language_tag};q=#{qvalue}"
+    end
+
+    def language_tag
+      "#{primary_tag}-#{subtag}"
     end
 
     def match(other)

data/lib/accept_headers/media_type.rb

@@ -63,13 +63,17 @@ module AcceptHeaders
 
     def to_s
       qvalue = (q == 0 || q == 1) ? q.to_i : q
-      string = "#{type}/#{subtype};q=#{qvalue}"
+      string = "#{media_range};q=#{qvalue}"
       if params.size > 0
         params.each { |k, v| string.concat(";#{k}=#{v}") }
       end
       string
     end
 
+    def media_range
+      "#{type}/#{subtype}"
+    end
+
     def match(other)
       if type == other.type && subtype == other.subtype
         true

data/lib/accept_headers/version.rb

@@ -1,3 +1,3 @@
 module AcceptHeaders
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/encoding_spec.rb

@@ -64,7 +64,7 @@ module AcceptHeaders
       })
     end
 
-    it "convers to string" do
+    it "converts to string" do
       s = subject.new('gzip', q: 0.9).to_s
       s.must_equal "gzip;q=0.9"
     end

data/spec/language_spec.rb

@@ -82,9 +82,13 @@ module AcceptHeaders
       })
     end
 
-    it "convers to string" do
+    it "converts to string" do
       s = subject.new('en', 'us', q: 0.9).to_s
       s.must_equal "en-us;q=0.9"
     end
+
+    it "outputs the language tag" do
+      subject.new('en', 'us', q: 0.9).language_tag.must_equal "en-us"
+    end
   end
 end

data/spec/media_type/negotiator_spec.rb

@@ -36,6 +36,24 @@ module AcceptHeaders
           ]
         end
 
+        it "supports all registered IANA media types" do
+          require 'csv'
+          # https://www.iana.org/assignments/media-types/media-types.xhtml
+          %w[application audio image message model multipart text video].each do |filename|
+            CSV.foreach("spec/support/#{filename}.csv", headers: true) do |row|
+              media_type = row['Template']
+
+              # audio/amr-wb+ is a typo
+              media_type = 'audio/amr-wb+' if media_type == 'amr-wb+'
+
+              if media_type
+                subject.new(media_type).list.size.must_equal 1
+                subject.new(media_type).list.first.media_range.must_equal media_type.downcase
+              end
+            end
+          end
+        end
+
         it "sets media type to */* when the accept header is empty" do
           subject.new('').list.must_equal [
             MediaType.new('*', '*')

data/spec/media_type_spec.rb

@@ -91,9 +91,13 @@ module AcceptHeaders
       })
     end
 
-    it "convers to string" do
+    it "converts to string" do
       s = subject.new('text', 'html', q: 0.9, params: { 'level' => '1' }).to_s
       s.must_equal "text/html;q=0.9;level=1"
     end
+
+    it "outputs the media range" do
+      subject.new('text', 'html', params: { 'level' => '1' }).media_range.must_equal "text/html"
+    end
   end
 end