accept_headers 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a061f83d7dbd285a45d4bbdbc9be56ebdca2ccc
-  data.tar.gz: 1a5a1496f0f771138858e9b09f0ed128c9ebe7c6
+  metadata.gz: 4df1427bbf8cc170c8d3eb303c6978f4c03d4b3e
+  data.tar.gz: 7efc9d1f82cfd666507f72fae4b09e7020516970
 SHA512:
-  metadata.gz: c6c86cb2c4470f793c309cd5cf742a90da0cba728551f7df3f0561f4a259d5427338e674b07069137063025c86e7503afca878428018f4afd165968675e0a10c
-  data.tar.gz: 3cb9ce5bdc3863a37126e6bde2e89997c05db3696bf28ad64e6ed330234464bc4c56ff57c5bef2a25ef8abb56174add04e755ff402dc0184986c003e06ddc868
+  metadata.gz: 339ce5ee8e97554e7d890179f6362e279d1933deec79f351c617ada281415d1f30e80f92080cb4eebe20e56a5436b2b5cd5ecc663940a65b77ee9697252dd165
+  data.tar.gz: 899d66e7efd0d9479adbc800de51d6abc3f3cb8d4c7950bf0ce1de344f7218757b5936d0d7814bbbdeb640daaa4faaf068b3a7fa39b879e1a4a6c0770040563c

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## HEAD
+
+## 0.0.5 / November 16, 2014
+
+  * Add `#accept?` and `#reject?` methods to all negotiators.
+  * Add `#accept?` method to all negotiators.
+  * Return nil if no matches on `#negotiate`.
+  * Fix matching logic in `MediaType`, `Encoding`, and `Language`.
+  * Test all IANA registered encodings against the parser.
+  * Fix `simplecov` loading.
+  * Update `audio.csv` media type file with typo fix.
+  * More specs.
+
 ## 0.0.4 / November 15, 2014
 
   * Add MediaType#media_range which is the type/subtype as a string.

data/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-# Specify your gem's dependencies in retriable.gemspec
+# Specify your gem's dependencies in accept_headers.gemspec
 gemspec
 
 group :test do

data/README.md

@@ -63,16 +63,22 @@ media_types.list
 ]
 ```
 
-`#negotiate` takes a string of media types supported (by your API or route/controller) and returns the best match as a `MediaType`. This will first check the available list for any matching media types with a `q` of 0 and return `nil` if there is a match. Then it'll look to the highest `q` values and look for matches in descending `q` value order and return the first match account for wildcards.
+`#negotiate` takes a string of media types supported (by your API or route/controller) and returns the best match as a `MediaType`. This will first check the available list for any matching media types with a `q` of 0 and return `nil` if there is a match. Then it'll look to the highest `q` values and look for matches in descending `q` value order and return the first match (accounting for wildcards). Finally, if there are no matches, it returns `nil`.
 
 ```ruby
-media_type.negotiate('text/html')
+media_types.negotiate('text/html')
 
 # Returns:
 
 AcceptHeaders::MediaType.new('text', 'html', params: { 'level' => '1' })
 ```
 
+`#accept?`:
+
+```ruby
+media_types.accept?('text/html') # true
+```
+
 ### Accept-Encoding
 
 `AcceptHeader::Charset::Encoding`:
@@ -86,7 +92,6 @@ encodings.list
 
 [
   AcceptHeaders::Encoding.new('gzip'),
-  AcceptHeaders::Encoding.new('identity'),
   AcceptHeaders::Encoding.new('compress', q: 0.8),
   AcceptHeaders::Encoding.new('deflate', q: 0.5)
 ]
@@ -95,11 +100,21 @@ encodings.list
 `#negotiate`:
 
 ```ruby
-encodings.negotiate('identity')
+encodings.negotiate('gzip')
 
 # Returns:
 
-AcceptHeaders::Encoding.new('identity')
+AcceptHeaders::Encoding.new('gzip')
+```
+
+`#accept?`:
+
+```ruby
+encodings.accept?('gzip') # true
+
+# Identity is accepted as long as it's not explicitly rejected 'identity;q=0'
+
+encodings.accept?('identity') # true
 ```
 
 ### Accept-Language
@@ -130,7 +145,13 @@ languages.negotiate('en-us')
 AcceptHeaders::Language.new('en', 'us')
 ```
 
-## Todo
+`#accept?`:
+
+```ruby
+languages.accept?('en-gb') # true
+```
+
+## TODO
 
 * Write rack middleware
 * More edge case tests

data/accept_headers.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Jack Chu"]
   spec.email         = ["kamuigt@gmail.com"]
   spec.summary       = %q{A ruby library that does content negotiation and parses and sorts http accept headers.}
-  spec.description   = %q{a ruby library that does content negotiation and parses and sorts http accept headers. Adheres to RFC 2616.}
+  spec.description   = %q{A ruby library that does content negotiation and parses and sorts http accept headers. Adheres to RFC 2616.}
   spec.homepage      = ""
   spec.license       = "MIT"
 

data/lib/accept_headers/acceptable.rb

@@ -5,8 +5,20 @@ module AcceptHeaders
 
     attr_reader :q
 
-    def match(other)
-      raise NotImplementedError.new("#match is not implemented")
+    def reject?(other)
+      if q != 0.0
+        false
+      else
+        match(other)
+      end
+    end
+
+    def accept?(other)
+      if q == 0.0
+        false
+      else
+        match(other)
+      end
     end
 
     def q=(value)
@@ -23,5 +35,10 @@ module AcceptHeaders
       end
       @q = q_float
     end
+
+    private
+    def match(other)
+      raise NotImplementedError.new("#match is not implemented")
+    end
   end
 end

data/lib/accept_headers/encoding.rb

@@ -7,6 +7,8 @@ module AcceptHeaders
 
     attr_reader :encoding
 
+    ENCODING_PATTERN = /^\s*(?<encoding>[\w!#$%^&*\-\+{}\\|'.`~]+)\s*$/
+
     def initialize(encoding = '*', q: 1.0)
       self.encoding = encoding
       self.q = q
@@ -32,10 +34,16 @@ module AcceptHeaders
       "#{encoding};q=#{qvalue}"
     end
 
-    def match(other)
-      if encoding == other.encoding
+    private
+    def match(encoding_string)
+      match_data = ENCODING_PATTERN.match(encoding_string)
+      if !match_data
+        false
+      elsif encoding == match_data[:encoding]
+        true
+      elsif match_data[:encoding] == 'identity'
         true
-      elsif other.encoding == '*'
+      elsif encoding == '*'
         true
       else
         false

data/lib/accept_headers/encoding/negotiator.rb

@@ -16,9 +16,9 @@ module AcceptHeaders
         header.split(',').each do |entry|
           encoding_arr = entry.split(';', 2)
           next if encoding_arr[0].nil?
-          encoding = TOKEN_PATTERN.match(encoding_arr[0])
+          encoding = Encoding::ENCODING_PATTERN.match(encoding_arr[0])
           next if encoding.nil?
-          encodings << Encoding.new(encoding[:token], q: parse_q(encoding_arr[1]))
+          encodings << Encoding.new(encoding[:encoding], q: parse_q(encoding_arr[1]))
         end
         encodings.sort! { |x,y| y <=> x }
       end

data/lib/accept_headers/language.rb

@@ -7,6 +7,8 @@ module AcceptHeaders
 
     attr_reader :primary_tag, :subtag, :params
 
+    LANGUAGE_TAG_PATTERN = /^\s*(?<primary_tag>[\w]{1,8}|\*)(?:\s*\-\s*(?<subtag>[\w]{1,8}|\*))?\s*$/
+
     def initialize(primary_tag = '*', subtag = nil, q: 1.0)
       self.primary_tag = primary_tag
       self.subtag = subtag
@@ -53,15 +55,23 @@ module AcceptHeaders
     end
 
     def language_tag
-      "#{primary_tag}-#{subtag}"
+      if primary_tag == '*' && (subtag.nil? || subtag == '*')
+        '*'
+      else
+        "#{primary_tag}-#{subtag}"
+      end
     end
 
-    def match(other)
-      if primary_tag == other.primary_tag && subtag == other.subtag
+    private
+    def match(language_tag_string)
+      match_data = LANGUAGE_TAG_PATTERN.match(language_tag_string)
+      if !match_data
+        false
+      elsif primary_tag == match_data[:primary_tag] && subtag == match_data[:subtag]
         true
-      elsif primary_tag == other.primary_tag && subtag == '*'
+      elsif primary_tag == match_data[:primary_tag] && subtag == '*'
         true
-      elsif other.primary_tag == '*'
+      elsif primary_tag == '*'
         true
       else
         false

data/lib/accept_headers/language/negotiator.rb

@@ -6,8 +6,6 @@ module AcceptHeaders
     class Negotiator
       include Negotiatable
 
-      LANGUAGE_PATTERN = /^\s*(?<primary_tag>[\w]{1,8}|\*)(?:\s*\-\s*(?<subtag>[\w]{1,8}|\*))?\s*$/
-
       private
       def parse(original_header)
         header = original_header.dup
@@ -18,7 +16,7 @@ module AcceptHeaders
         header.split(',').each do |entry|
           language_arr = entry.split(';', 2)
           next if language_arr[0].nil?
-          language_range = LANGUAGE_PATTERN.match(language_arr[0])
+          language_range = Language::LANGUAGE_TAG_PATTERN.match(language_arr[0])
           next if language_range.nil?
           begin
             languages << Language.new(

data/lib/accept_headers/media_type.rb

@@ -7,6 +7,8 @@ module AcceptHeaders
 
     attr_reader :type, :subtype, :params
 
+    MEDIA_TYPE_PATTERN = /^\s*(?<type>[\w!#$%^&*\-\+{}\\|'.`~]+)(?:\s*\/\s*(?<subtype>[\w!#$%^&*\-\+{}\\|'.`~]+))?\s*$/
+
     def initialize(type = '*', subtype = '*', q: 1.0, params: {})
       self.type = type
       self.subtype = subtype
@@ -74,12 +76,16 @@ module AcceptHeaders
       "#{type}/#{subtype}"
     end
 
-    def match(other)
-      if type == other.type && subtype == other.subtype
+    private
+    def match(media_range_string)
+      match_data = MEDIA_TYPE_PATTERN.match(media_range_string)
+      if !match_data
+        false
+      elsif type == match_data[:type] && subtype == match_data[:subtype]
         true
-      elsif type == other.type && subtype == '*'
+      elsif type == match_data[:type] && subtype == '*'
         true
-      elsif other.type == '*' && other.subtype == '*'
+      elsif type == '*' && subtype == '*'
         true
       else
         false

data/lib/accept_headers/media_type/negotiator.rb

@@ -7,7 +7,6 @@ module AcceptHeaders
       include Negotiatable
 
       private
-      MEDIA_TYPE_PATTERN = /^\s*(?<type>[\w!#$%^&*\-\+{}\\|'.`~]+)(?:\s*\/\s*(?<subtype>[\w!#$%^&*\-\+{}\\|'.`~]+))?\s*$/
       PARAM_PATTERN = /(?<attribute>[\w!#$%^&*\-\+{}\\|'.`~]+)\s*\=\s*(?:\"(?<value>[^"]*)\"|\'(?<value>[^']*)\'|(?<value>[\w!#$%^&*\-\+{}\\|\'.`~]*))/
 
       def parse(original_header)
@@ -19,7 +18,7 @@ module AcceptHeaders
         header.split(',').each do |entry|
           accept_media_range, accept_params = entry.split(';', 2)
           next if accept_media_range.nil?
-          media_range = MEDIA_TYPE_PATTERN.match(accept_media_range)
+          media_range = MediaType::MEDIA_TYPE_PATTERN.match(accept_media_range)
           next if media_range.nil?
           begin
             media_types << MediaType.new(

data/lib/accept_headers/negotiatable.rb

@@ -3,7 +3,6 @@ module AcceptHeaders
     class Error < StandardError; end
     class ParseError < Error; end
 
-    TOKEN_PATTERN = /^\s*(?<token>[\w!#$%^&*\-\+{}\\|'.`~]+)\s*$/
     Q_PATTERN = /(?:\A|;)\s*(?<exists>qs*\=)\s*(?:(?<q>0\.\d{1,3}|[01])|(?:[^;]*))\s*(?:\z|;)/
 
     attr_reader :list
@@ -12,24 +11,29 @@ module AcceptHeaders
       @list = parse(header)
     end
 
-    def negotiate(supported_string)
-      supported = parse(supported_string)
+    def negotiate(supported)
       return nil if @list.empty?
+      supported = [*supported]
       rejects, acceptable = @list.partition { |m| m.q == 0.0 }
       rejects.each do |reject|
         supported.each do |support|
-          if support.match(reject)
+          if reject.reject?(support)
             return nil
           end
         end
       end
       acceptable.sort { |x,y| y <=> x }.each do |accepted|
         supported.each do |support|
-          if support.match(accepted)
+          if accepted.accept?(support)
             return accepted
           end
         end
       end
+      nil
+    end
+
+    def accept?(other)
+      negotiate(other) ? true : false
     end
 
     private

data/lib/accept_headers/version.rb

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

data/spec/encoding/negotiator_spec.rb

@@ -22,6 +22,19 @@ module AcceptHeaders
           ]
         end
 
+        it "supports all registered IANA encodings" do
+          require 'csv'
+          # https://www.iana.org/assignments/http-parameters/http-parameters.xml#content-coding
+          CSV.foreach("spec/support/encodings/content-coding.csv", headers: true) do |row|
+            encoding = row['Name']
+
+            if encoding
+              subject.new(encoding).list.size.must_equal 1
+              subject.new(encoding).list.first.encoding.must_equal encoding.downcase
+            end
+          end
+        end
+
         it "sets encoding to * when the accept-encoding header is empty" do
           subject.new('').list.must_equal [
             Encoding.new('*')

data/spec/encoding_spec.rb

@@ -68,5 +68,73 @@ module AcceptHeaders
       s = subject.new('gzip', q: 0.9).to_s
       s.must_equal "gzip;q=0.9"
     end
+
+    describe "#accept?" do
+      it "accepted if the encoding is the same" do
+        a = subject.new('gzip')
+        a.accept?('gzip').must_equal true
+        b = subject.new('gzip', q: 0.001)
+        b.accept?('gzip').must_equal true
+      end
+
+      it "accepted if the encoding is *" do
+        a = subject.new('*')
+        a.accept?('gzip').must_equal true
+        b = subject.new('*', q: 0.1)
+        b.accept?('gzip').must_equal true
+      end
+
+      it "not accepted if the encoding doesn't match" do
+        a = subject.new('gzip')
+        a.accept?('compress').must_equal false
+        b = subject.new('gzip', q: 0.4)
+        b.accept?('compress').must_equal false
+      end
+
+      it "not accepted if q is 0" do
+        a = subject.new('gzip', q: 0)
+        a.accept?('gzip').must_equal false
+        b = subject.new('*', q: 0)
+        b.accept?('gzip').must_equal false
+      end
+
+      # TODO: test *
+      # it "not accepted if..." do
+      #   a = subject.new('gzip')
+      #   a.accept?('*').must_equal true
+      # end
+    end
+
+    describe "#reject?" do
+      describe "given q is 0" do
+        it "rejected if the encoding is the same" do
+          a = subject.new('gzip', q: 0)
+          a.reject?('gzip').must_equal true
+        end
+
+        it "rejected if the encoding is *" do
+          a = subject.new('*', q: 0)
+          a.reject?('gzip').must_equal true
+        end
+
+        it "not rejected if the encoding doesn't match" do
+          a = subject.new('gzip', q: 0)
+          a.reject?('compress').must_equal false
+        end
+
+        # TODO: test *
+        # it "not rejected if..." do
+        #   a = subject.new('gzip', q: 0)
+        #   a.reject?('*').must_equal true
+        # end
+      end
+
+      it "not rejected if q > 0" do
+        a = subject.new('gzip', q: 0.001)
+        a.reject?('gzip').must_equal false
+        b = subject.new('*', q: 0.9)
+        b.reject?('gzip').must_equal false
+      end
+    end
   end
 end

data/spec/language_spec.rb

@@ -87,8 +87,127 @@ module AcceptHeaders
       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"
+    describe "#language_tag" do
+      it "outputs the language tag" do
+        subject.new('en', 'us', q: 0.9).language_tag.must_equal "en-us"
+      end
+
+      it "if primary tag is * and subtag is * or nil, outputs *" do
+        subject.new('*', nil).language_tag.must_equal '*'
+        subject.new('*', '*').language_tag.must_equal '*'
+      end
+    end
+
+    describe "#accept?" do
+      it "accepted if the primary_tag and subtag are the same" do
+        a = subject.new('en', 'us')
+        a.accept?('en-us').must_equal true
+        b = subject.new('en', 'us', q: 0.001)
+        b.accept?('en-us').must_equal true
+      end
+
+      it "accepted if the primary_tag is the same and the other subtag is *" do
+        a = subject.new('en', '*')
+        a.accept?('en-us').must_equal true
+        b = subject.new('en', '*', q: 0.9)
+        b.accept?('en-us').must_equal true
+      end
+
+      it "accepted if the primary_tag and subtag are *" do
+        a = subject.new('*')
+        a.accept?('en-us').must_equal true
+        b = subject.new('*', q: 0.1)
+        b.accept?('en-us').must_equal true
+      end
+
+      it "not accepted if the primary_tag and subtag don't match" do
+        a = subject.new('en', 'us')
+        a.accept?('en-gb').must_equal false
+        b = subject.new('en', 'us', q: 0.2)
+        b.accept?('en-gb').must_equal false
+      end
+
+      it "not accepted if the primary_tag doesn't match" do
+        a = subject.new('en', 'us')
+        a.accept?('zh-us').must_equal false
+        b = subject.new('en', 'us', q: 0.4)
+        b.accept?('zh-us').must_equal false
+      end
+
+      it "not accepted if the subtag doesn't match" do
+        a = subject.new('en', 'us')
+        a.accept?('en-gb').must_equal false
+        b = subject.new('en', 'us', q: 0.6)
+        b.accept?('en-gb').must_equal false
+      end
+
+      it "not accepted if q is 0" do
+        a = subject.new('en', 'us', q: 0)
+        a.accept?('en-us').must_equal false
+        a.accept?('en-gb').must_equal false
+        a.accept?('zh-us').must_equal false
+        b = subject.new('en', '*', q: 0)
+        b.accept?('en-us').must_equal false
+        c = subject.new('*', q: 0)
+        c.accept?('en-us').must_equal false
+      end
+
+      # TODO: test *
+      it "not accepted if..." do
+        a = subject.new('en', 'us')
+        a.accept?('*').must_equal false
+      end
+    end
+
+    describe "#reject?" do
+      describe "given q is 0" do
+        it "rejected if the primary_tag and subtag are the same" do
+          a = subject.new('en', 'us', q: 0)
+          a.reject?('en-us').must_equal true
+        end
+
+        it "rejected if the primary_tag is the same and the other subtag is *" do
+          a = subject.new('en', '*', q: 0)
+          a.reject?('en-us').must_equal true
+        end
+
+        it "rejected if the primary_tag and subtag are *" do
+          a = subject.new('*', q: 0)
+          a.reject?('en-us').must_equal true
+        end
+
+        it "not rejected if the primary_tag and subtag don't match" do
+          a = subject.new('en', 'us', q: 0)
+          a.reject?('en-gb').must_equal false
+        end
+
+        it "not rejected if the primary_tag doesn't match" do
+          a = subject.new('en', 'us', q: 0)
+          a.reject?('zh-us').must_equal false
+        end
+
+        it "not rejected if the subtag doesn't match" do
+          a = subject.new('en', 'us', q: 0)
+          a.reject?('en-gb').must_equal false
+        end
+
+        # TODO: test *
+        it "not rejected if..." do
+          a = subject.new('en', 'us', q: 0)
+          a.reject?('*').must_equal false
+        end
+      end
+
+      it "not rejected if q > 0" do
+        a = subject.new('en', 'us', q: 0.001)
+        a.reject?('en-us').must_equal false
+        a.reject?('en-gb').must_equal false
+        a.reject?('zh-us').must_equal false
+        b = subject.new('en', '*', q: 0.9)
+        b.reject?('en-us').must_equal false
+        c = subject.new('*', q: 1)
+        c.reject?('en-us').must_equal false
+      end
     end
   end
 end

data/spec/media_type/negotiator_spec.rb

@@ -40,12 +40,9 @@ module AcceptHeaders
           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|
+            CSV.foreach("spec/support/media_types/#{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
@@ -99,12 +96,27 @@ module AcceptHeaders
         end
       end
 
-      describe "negotiate supported media types" do
+      describe "#negotiate" do
         it "returns a best matching media type" do
           n = subject.new("text/*, text/html, text/html;level=1, */*")
           n.negotiate("text/html").must_equal MediaType.new('text', 'html', params: { 'level' => '1' })
         end
       end
+
+      describe "#accept?" do
+        it "returns whether specific media type is accepted" do
+          n = subject.new("video/*, text/html, text/html;level=1;q:0.8")
+          n.accept?("text/html").must_equal true
+          n.accept?("application/json").must_equal false
+          n.accept?("video/ogg").must_equal true
+        end
+
+        it "returns false if accepted but q=0" do
+          n = subject.new("video/*, text/html;q=0")
+          n.accept?("text/html").must_equal false
+          n.accept?("video/ogg").must_equal true
+        end
+       end
     end
   end
 end

data/spec/media_type_spec.rb

@@ -99,5 +99,117 @@ module AcceptHeaders
     it "outputs the media range" do
       subject.new('text', 'html', params: { 'level' => '1' }).media_range.must_equal "text/html"
     end
+
+    describe "#accept?" do
+      it "accepted if the type and subtype are the same" do
+        a = subject.new('text', 'html')
+        a.accept?('text/html').must_equal true
+        b = subject.new('text', 'html', q: 0.001)
+        b.accept?('text/html').must_equal true
+      end
+
+      it "accepted if the type is the same and the other subtype is *" do
+        a = subject.new('text', '*')
+        a.accept?('text/html').must_equal true
+        b = subject.new('text', '*', q: 0.9)
+        b.accept?('text/html').must_equal true
+      end
+
+      it "accepted if the type and subtype are *" do
+        a = subject.new('*')
+        a.accept?('text/html').must_equal true
+        b = subject.new('*', q: 0.1)
+        b.accept?('text/html').must_equal true
+      end
+
+      it "not accepted if the type and subtype don't match" do
+        a = subject.new('text', 'html')
+        a.accept?('application/json').must_equal false
+        b = subject.new('text', 'html', q: 0.2)
+        b.accept?('application/json').must_equal false
+      end
+
+      it "not accepted if the type doesn't match" do
+        a = subject.new('text', 'plain')
+        a.accept?('application/plain').must_equal false
+        b = subject.new('text', 'plain', q: 0.4)
+        b.accept?('application/json').must_equal false
+      end
+
+      it "not accepted if the subtype doesn't match" do
+        a = subject.new('text', 'html')
+        a.accept?('text/plain').must_equal false
+        b = subject.new('text', 'html', q: 0.6)
+        b.accept?('text/plain').must_equal false
+      end
+
+      it "not accepted if q is 0" do
+        a = subject.new('text', 'html', q: 0)
+        a.accept?('text/html').must_equal false
+        a.accept?('text/plain').must_equal false
+        a.accept?('application/plain').must_equal false
+        b = subject.new('text', '*', q: 0)
+        b.accept?('text/html').must_equal false
+        c = subject.new('*', q: 0)
+        c.accept?('text/html').must_equal false
+      end
+
+      # TODO: test *
+      it "not accepted if..." do
+        a = subject.new('text', 'plain')
+        a.accept?('*').must_equal false
+      end
+    end
+
+    describe "#reject?" do
+      describe "given q is 0" do
+        it "rejected if the type and subtype are the same" do
+          a = subject.new('text', 'html', q: 0)
+          a.reject?('text/html').must_equal true
+        end
+
+        it "rejected if the type is the same and the other subtype is *" do
+          a = subject.new('text', '*', q: 0)
+          a.reject?('text/html').must_equal true
+        end
+
+        it "rejected if the type and subtype are *" do
+          a = subject.new('*', q: 0)
+          a.reject?('text/html').must_equal true
+        end
+
+        it "not rejected if the type and subtype don't match" do
+          a = subject.new('text', 'html', q: 0)
+          a.reject?('application/json').must_equal false
+        end
+
+        it "not rejected if the type doesn't match" do
+          a = subject.new('text', 'plain', q: 0)
+          a.reject?('application/plain').must_equal false
+        end
+
+        it "not rejected if the subtype doesn't match" do
+          a = subject.new('text', 'html', q: 0)
+          a.reject?('text/plain').must_equal false
+        end
+
+        # TODO: test *
+        it "not rejected if..." do
+          a = subject.new('text', 'plain', q: 0)
+          a.reject?('*').must_equal false
+        end
+      end
+
+      it "not rejected if q > 0" do
+        a = subject.new('text', 'html', q: 0.001)
+        a.reject?('text/html').must_equal false
+        a.reject?('text/plain').must_equal false
+        a.reject?('application/plain').must_equal false
+        b = subject.new('text', '*', q: 0.9)
+        b.reject?('text/html').must_equal false
+        c = subject.new('*', q: 1)
+        c.reject?('text/html').must_equal false
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,9 +1,5 @@
-require "minitest/autorun"
-require "minitest/focus"
 require "codeclimate-test-reporter"
 require "simplecov"
-require "awesome_print"
-require "pry"
 
 CodeClimate::TestReporter.configure do |config|
   config.logger.level = Logger::WARN
@@ -14,6 +10,12 @@ SimpleCov.start do
     SimpleCov::Formatter::HTMLFormatter,
     CodeClimate::TestReporter::Formatter
   ]
+  add_filter 'spec/'
 end
 
+require "minitest/autorun"
+require "minitest/focus"
+require "awesome_print"
+require "pry"
+
 require_relative "../lib/accept_headers"

data/spec/support/encodings/content-coding.csv

@@ -0,0 +1,12 @@
+Name,Description,Reference,Notes
+compress,"UNIX ""compress"" data format [Welch, T., ""A Technique 
+        for High Performance Data Compression"", IEEE Computer 17(6), June 1984.]",[RFC7230],Section 4.2.1
+deflate,"""deflate"" compressed data ([RFC1951]) 
+        inside the ""zlib"" data format ([RFC1950])",[RFC7230],Section 4.2.2
+exi,W3C Efficient XML Interchange,"[J. Schneider and T. Kamiya, Eds. ""Efficient XML Interchange (EXI) Format 1.0"", W3C
+Working Draft, 19 Sep 2008]",
+gzip,GZIP file format [RFC1952],[RFC7230],Section 4.2.3
+identity,"Reserved (synonym for ""no encoding"" in Accept-Encoding)",[RFC7231],Section 5.3.4
+pack200-gzip,Network Transfer Format for Java Archives,[JSR 200: Network Transfer Format for Java][Kumar_Srinivasan][John_Rose],
+x-compress,Deprecated (alias for compress),[RFC7230],Section 4.2.1
+x-gzip,Deprecated (alias for gzip),[RFC7230],Section 4.2.3

data/spec/support/{audio.csv → media_types/audio.csv}

@@ -6,7 +6,7 @@ Name,Template,Reference
 ac3,audio/ac3,[RFC4184]
 AMR,audio/AMR,[RFC4867]
 AMR-WB,audio/AMR-WB,[RFC4867]
-amr-wb+,amr-wb+,[RFC4352]
+amr-wb+,audio/amr-wb+,[RFC4352]
 aptx,audio/aptx,[RFC7310]
 asc,audio/asc,[RFC6295]
 ATRAC-ADVANCED-LOSSLESS,audio/ATRAC-ADVANCED-LOSSLESS,[RFC5584]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: accept_headers
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Jack Chu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-15 00:00:00.000000000 Z
+date: 2014-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,7 +80,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: a ruby library that does content negotiation and parses and sorts http
+description: A ruby library that does content negotiation and parses and sorts http
   accept headers. Adheres to RFC 2616.
 email:
 - kamuigt@gmail.com
@@ -115,14 +115,15 @@ files:
 - spec/media_type/negotiator_spec.rb
 - spec/media_type_spec.rb
 - spec/spec_helper.rb
-- spec/support/application.csv
-- spec/support/audio.csv
-- spec/support/image.csv
-- spec/support/message.csv
-- spec/support/model.csv
-- spec/support/multipart.csv
-- spec/support/text.csv
-- spec/support/video.csv
+- spec/support/encodings/content-coding.csv
+- spec/support/media_types/application.csv
+- spec/support/media_types/audio.csv
+- spec/support/media_types/image.csv
+- spec/support/media_types/message.csv
+- spec/support/media_types/model.csv
+- spec/support/media_types/multipart.csv
+- spec/support/media_types/text.csv
+- spec/support/media_types/video.csv
 - wercker.yml
 homepage: ''
 licenses:
@@ -157,11 +158,12 @@ test_files:
 - spec/media_type/negotiator_spec.rb
 - spec/media_type_spec.rb
 - spec/spec_helper.rb
-- spec/support/application.csv
-- spec/support/audio.csv
-- spec/support/image.csv
-- spec/support/message.csv
-- spec/support/model.csv
-- spec/support/multipart.csv
-- spec/support/text.csv
-- spec/support/video.csv
+- spec/support/encodings/content-coding.csv
+- spec/support/media_types/application.csv
+- spec/support/media_types/audio.csv
+- spec/support/media_types/image.csv
+- spec/support/media_types/message.csv
+- spec/support/media_types/model.csv
+- spec/support/media_types/multipart.csv
+- spec/support/media_types/text.csv
+- spec/support/media_types/video.csv