accept_headers 0.0.6 → 0.0.7

data/spec/language_spec.rb

@@ -1,201 +1,204 @@
 require_relative "spec_helper"
 
-module AcceptHeaders
-  describe Language do
-    subject do
-      AcceptHeaders::Language
-    end
+describe AcceptHeaders::Language do
+  subject do
+    AcceptHeaders::Language
+  end
 
-    it "defaults primary tag to *" do
-      subject.new.primary_tag.must_equal '*'
-    end
+  it "defaults primary tag to *" do
+    subject.new.primary_tag.must_equal '*'
+  end
 
-    it "defaults subtag to *" do
-      subject.new('en').subtag.must_equal '*'
-    end
+  it "defaults subtag to *" do
+    subject.new('en').subtag.must_equal '*'
+  end
 
-    it "strips and downcases the primary tag" do
-      subject.new("\t\nEN\s\r", '*').primary_tag.must_equal "en"
-    end
+  it "strips and downcases the primary tag" do
+    subject.new("\t\nEN\s\r", '*').primary_tag.must_equal "en"
+  end
 
-    it "strips and downcases the subtag" do
-      subject.new("en", "\s\nUS\r\t").subtag.must_equal "us"
-    end
+  it "strips and downcases the subtag" do
+    subject.new("en", "\s\nUS\r\t").subtag.must_equal "us"
+  end
 
-    it "sets subtag to * if value passed in is nil and primary tag is *" do
-      subject.new('*', nil).subtag.must_equal '*'
-    end
+  it "sets subtag to * if value passed in is nil and primary tag is *" do
+    subject.new('*', nil).subtag.must_equal '*'
+  end
 
-    it "optionally supports a q argument" do
-      subject.new('en', 'us', q: 0.8).q.must_equal 0.8
-    end
+  it "optionally supports a q argument" do
+    subject.new('en', 'us', q: 0.8).q.must_equal 0.8
+  end
 
-    it "compares on q value all other values remaining equal" do
-      subject.new(q: 0.514).must_be :>, subject.new(q: 0.1)
-      subject.new(q: 0).must_be :<, subject.new(q: 1)
-      subject.new(q: 0.9).must_equal subject.new(q: 0.9)
-    end
+  it "compares on q value all other values remaining equal" do
+    subject.new(q: 0.514).must_be :>, subject.new(q: 0.1)
+    subject.new(q: 0).must_be :<, subject.new(q: 1)
+    subject.new(q: 0.9).must_equal subject.new(q: 0.9)
+  end
 
-    it "compares on subtag then primary tag all other values remaining equal" do
-      subject.new('en', 'us').must_be :>, subject.new('en', '*')
-      subject.new('*', '*').must_be :<, subject.new('en', '*')
-    end
+  it "compares on subtag then primary tag all other values remaining equal" do
+    subject.new('en', 'us').must_be :>, subject.new('en', '*')
+    subject.new('*', '*').must_be :<, subject.new('en', '*')
+  end
 
-    it "raises an InvalidQError if q can't be converted to a float" do
-      e = -> do
-        subject.new('en', 'us', q: 'a')
-      end.must_raise Language::InvalidQError
+  it "raises an InvalidQError if q can't be converted to a float" do
+    e = -> do
+      subject.new('en', 'us', q: 'a')
+    end.must_raise AcceptHeaders::Language::InvalidQError
+
+    e.message.must_match INVALID_FLOAT_PATTERN
+
+    subject.new('en', 'us', q: '1')
+  end
 
-      e.message.must_equal 'invalid value for Float(): "a"'
+  it "raises an InvalidQError unless q value is between 0 and 1" do
+    [-1.0, -0.1, 1.1].each do |q|
+      e = -> do
+        subject.new('en', 'us', q: q)
+      end.must_raise AcceptHeaders::Language::InvalidQError
 
-      subject.new('en', 'us', q: '1')
+      e.message.must_equal "q must be between 0 and 1"
     end
 
-    it "raises an InvalidQError unless q value is between 0 and 1" do
-      [-1.0, -0.1, 1.1].each do |q|
-        e = -> do
-          subject.new('en', 'us', q: q)
-        end.must_raise Language::InvalidQError
+    subject.new('en', 'us', q: 1)
+    subject.new('en', 'gb', q: 0)
+  end
 
-        e.message.must_equal "q must be between 0 and 1"
-      end
+  it "raises an InvalidQError if q has more than a precision of 3" do
+    e = -> do
+      subject.new('en', 'us', q: 0.1234)
+    end.must_raise AcceptHeaders::Language::InvalidQError
 
-      subject.new('en', 'us', q: 1)
-      subject.new('en', 'gb', q: 0)
+    e.message.must_equal "q must be at most 3 decimal places"
+
+    subject.new('en', 'us', q: 0.123)
+  end
+
+  it "converts to hash" do
+    subject.new('en', 'us').to_h.must_equal({
+      primary_tag: 'en',
+      subtag: 'us',
+      q: 1.0
+    })
+  end
+
+  it "converts to string" do
+    s = subject.new('en', 'us', q: 0.9).to_s
+    s.must_equal "en-us;q=0.9"
+  end
+
+  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 "raises an InvalidQError if q has more than a precision of 3" do
-      e = -> do
-        subject.new('en', 'us', q: 0.1234)
-      end.must_raise Language::InvalidQError
+    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
 
-      e.message.must_equal "q must be at most 3 decimal places"
+  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
 
-      subject.new('en', 'us', q: 0.123)
+    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 "converts to hash" do
-      subject.new('en', 'us').to_h.must_equal({
-        primary_tag: 'en',
-        subtag: 'us',
-        q: 1.0
-      })
+    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 "converts to string" do
-      s = subject.new('en', 'us', q: 0.9).to_s
-      s.must_equal "en-us;q=0.9"
+    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
 
-    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 "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 "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
+    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
 
-    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 "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
 
-      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 "not accepted compared against nil" do
+      a = subject.new('en', 'us')
+      a.accept?(nil).must_equal false
+    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
+    # 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 "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
+      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 "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
+      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 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
+      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 accepted if q is 0" do
+      it "not rejected if the primary_tag doesn't match" 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
+        a.reject?('zh-us').must_equal false
       end
 
-      # TODO: test *
-      it "not accepted if..." do
-        a = subject.new('en', 'us')
-        a.accept?('*').must_equal false
+      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
-    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
+      # TODO: test *
+      it "not rejected if..." do
+        a = subject.new('en', 'us', q: 0)
+        a.reject?('*').must_equal false
       end
 
       it "not rejected if q > 0" do
@@ -208,6 +211,11 @@ module AcceptHeaders
         c = subject.new('*', q: 1)
         c.reject?('en-us').must_equal false
       end
+
+      it "not rejected compared against nil" do
+        a = subject.new('en', 'us')
+        a.reject?(nil).must_equal false
+      end
     end
   end
 end

data/spec/media_type/negotiator_spec.rb

@@ -18,17 +18,17 @@ describe AcceptHeaders::MediaType::Negotiator do
       ]
 
       subject.new("text/*, text/html, text/html;level=1, */*").list.must_equal [
-        media_type.new('text', 'html', params: { 'level' => '1' }),
+        media_type.new('text', 'html', extensions: { 'level' => '1' }),
         media_type.new('text', 'html'),
         media_type.new('text', '*'),
         media_type.new('*', '*')
       ]
 
       subject.new("text/*;q=0.3, text/html;q=0.7, text/html;level=1, text/html;level=2;q=0.4, */*;q=0.5").list.must_equal [
-        media_type.new('text', 'html', params: { 'level' => '1' }),
+        media_type.new('text', 'html', extensions: { 'level' => '1' }),
         media_type.new('text', 'html', q: 0.7),
         media_type.new('*', '*', q: 0.5),
-        media_type.new('text', 'html', q: 0.4, params: { 'level' => '2' }),
+        media_type.new('text', 'html', q: 0.4, extensions: { 'level' => '2' }),
         media_type.new('text', '*', q: 0.3)
       ]
     end
@@ -79,10 +79,10 @@ describe AcceptHeaders::MediaType::Negotiator do
       ]
     end
 
-    it "strips whitespace around q and params" do
+    it "strips whitespace around q and extensions" do
       subject.new("text/plain;\tq\r=\n1, application/json;q=0.8;\slevel\t\t=\r\n1\n").list.must_equal [
         media_type.new('text', 'plain'),
-        media_type.new('application', 'json', q: 0.8, params: { "level" => "1" })
+        media_type.new('application', 'json', q: 0.8, extensions: { "level" => "1" })
       ]
     end
 
@@ -92,10 +92,10 @@ describe AcceptHeaders::MediaType::Negotiator do
       ]
     end
 
-    it "parses params with quoted values" do
+    it "parses extensions with quoted values" do
       subject.new('text/html;q=1;version="2";level="a;b;cc\'cd", text/html;version=\'1\';level=\'\blah;x;1;;\'').list.must_equal [
-        media_type.new('text', 'html', params: { 'version' => '2', 'level' => 'a;b;cc\'cd'}),
-        media_type.new('text', 'html', params: { 'version' => '1', 'level' => '\'\blah;x;1;;\''})
+        media_type.new('text', 'html', extensions: { 'version' => '2', 'level' => 'a;b;cc\'cd'}),
+        media_type.new('text', 'html', extensions: { 'version' => '1', 'level' => '\'\blah;x;1;;\''})
       ]
     end
 
@@ -146,7 +146,7 @@ describe AcceptHeaders::MediaType::Negotiator do
       api.negotiate('application/xml').must_be_nil
       api.negotiate(['application/xml', 'application/json']).must_equal({
         supported: 'application/json',
-        matched: media_type.new('application', 'json', params: { 'version' => '2' })
+        matched: media_type.new('application', 'json', extensions: { 'version' => '2' })
       })
 
       q0 = subject.new('application/json,application/xml;q=0')