addressable 2.3.7 → 2.7.0

data/lib/addressable/version.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 # encoding:utf-8
 #--
-# Copyright (C) 2006-2013 Bob Aman
+# Copyright (C) Bob Aman
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -21,8 +23,8 @@ if !defined?(Addressable::VERSION)
   module Addressable
     module VERSION
       MAJOR = 2
-      MINOR = 3
-      TINY  = 7
+      MINOR = 7
+      TINY  = 0
 
       STRING = [MAJOR, MINOR, TINY].join('.')
     end

data/spec/addressable/idna_spec.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 # coding: utf-8
-# Copyright (C) 2006-2013 Bob Aman
+# Copyright (C) Bob Aman
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -26,6 +28,11 @@ shared_examples_for "converting from unicode to ASCII" do
     expect(Addressable::IDNA.to_ascii("www.google.com")).to eq("www.google.com")
   end
 
+  long = 'AcinusFallumTrompetumNullunCreditumVisumEstAtCuadLongumEtCefallum.com'
+  it "should convert '#{long}' correctly" do
+    expect(Addressable::IDNA.to_ascii(long)).to eq(long)
+  end
+
   it "should convert 'www.詹姆斯.com' correctly" do
     expect(Addressable::IDNA.to_ascii(
       "www.詹姆斯.com"
@@ -129,6 +136,12 @@ shared_examples_for "converting from unicode to ASCII" do
     )).to eq("xn--4ud")
   end
 
+  it "should convert '🌹🌹🌹.ws' correctly" do
+    expect(Addressable::IDNA.to_ascii(
+      "\360\237\214\271\360\237\214\271\360\237\214\271.ws"
+    )).to eq("xn--2h8haa.ws")
+  end
+
   it "should handle two adjacent '.'s correctly" do
     expect(Addressable::IDNA.to_ascii(
       "example..host"
@@ -137,8 +150,23 @@ shared_examples_for "converting from unicode to ASCII" do
 end
 
 shared_examples_for "converting from ASCII to unicode" do
+  long = 'AcinusFallumTrompetumNullunCreditumVisumEstAtCuadLongumEtCefallum.com'
+  it "should convert '#{long}' correctly" do
+    expect(Addressable::IDNA.to_unicode(long)).to eq(long)
+  end
+
+  it "should return the identity conversion when punycode decode fails" do
+    expect(Addressable::IDNA.to_unicode("xn--zckp1cyg1.sblo.jp")).to eq(
+      "xn--zckp1cyg1.sblo.jp")
+  end
+
+  it "should return the identity conversion when the ACE prefix has no suffix" do
+    expect(Addressable::IDNA.to_unicode("xn--...-")).to eq("xn--...-")
+  end
+
   it "should convert 'www.google.com' correctly" do
-    expect(Addressable::IDNA.to_unicode("www.google.com")).to eq("www.google.com")
+    expect(Addressable::IDNA.to_unicode("www.google.com")).to eq(
+      "www.google.com")
   end
 
   it "should convert 'www.詹姆斯.com' correctly" do
@@ -147,12 +175,24 @@ shared_examples_for "converting from ASCII to unicode" do
     )).to eq("www.詹姆斯.com")
   end
 
+  it "should convert '詹姆斯.com' correctly" do
+    expect(Addressable::IDNA.to_unicode(
+      "xn--8ws00zhy3a.com"
+    )).to eq("詹姆斯.com")
+  end
+
   it "should convert 'www.iñtërnâtiônàlizætiøn.com' correctly" do
     expect(Addressable::IDNA.to_unicode(
       "www.xn--itrntinliztin-vdb0a5exd8ewcye.com"
     )).to eq("www.iñtërnâtiônàlizætiøn.com")
   end
 
+  it "should convert 'iñtërnâtiônàlizætiøn.com' correctly" do
+    expect(Addressable::IDNA.to_unicode(
+      "xn--itrntinliztin-vdb0a5exd8ewcye.com"
+    )).to eq("iñtërnâtiônàlizætiøn.com")
+  end
+
   it "should convert " +
       "'www.ほんとうにながいわけのわからないどめいんめいのらべるまだながくしないとたりない.w3.mag.keio.ac.jp' " +
       "correctly" do
@@ -199,6 +239,12 @@ shared_examples_for "converting from ASCII to unicode" do
     )).to eq("\341\206\265")
   end
 
+  it "should convert '🌹🌹🌹.ws' correctly" do
+    expect(Addressable::IDNA.to_unicode(
+      "xn--2h8haa.ws"
+    )).to eq("\360\237\214\271\360\237\214\271\360\237\214\271.ws")
+  end
+
   it "should handle two adjacent '.'s correctly" do
     expect(Addressable::IDNA.to_unicode(
       "example..host"

data/spec/addressable/net_http_compat_spec.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 # coding: utf-8
-# Copyright (C) 2006-2013 Bob Aman
+# Copyright (C) Bob Aman
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.

data/spec/addressable/rack_mount_compat_spec.rb

@@ -0,0 +1,106 @@
+# frozen_string_literal: true
+
+# coding: utf-8
+# Copyright (C) Bob Aman
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+
+require "spec_helper"
+
+require "addressable/uri"
+require "addressable/template"
+require "rack/mount"
+
+describe Rack::Mount do
+  let(:app_one) do
+    proc { |env| [200, {'Content-Type' => 'text/plain'}, 'Route 1'] }
+  end
+  let(:app_two) do
+    proc { |env| [200, {'Content-Type' => 'text/plain'}, 'Route 2'] }
+  end
+  let(:app_three) do
+    proc { |env| [200, {'Content-Type' => 'text/plain'}, 'Route 3'] }
+  end
+  let(:routes) do
+    s = Rack::Mount::RouteSet.new do |set|
+      set.add_route(app_one, {
+        :request_method => 'GET',
+        :path_info => Addressable::Template.new('/one/{id}/')
+      }, {:id => 'unidentified'}, :one)
+      set.add_route(app_two, {
+        :request_method => 'GET',
+        :path_info => Addressable::Template.new('/two/')
+      }, {:id => 'unidentified'}, :two)
+      set.add_route(app_three, {
+        :request_method => 'GET',
+        :path_info => Addressable::Template.new('/three/{id}/').to_regexp
+      }, {:id => 'unidentified'}, :three)
+    end
+    s.rehash
+    s
+  end
+
+  it "should generate from routes with Addressable::Template" do
+    path, _ = routes.generate(:path_info, :one, {:id => '123'})
+    expect(path).to eq '/one/123/'
+  end
+
+  it "should generate from routes with Addressable::Template using defaults" do
+    path, _ = routes.generate(:path_info, :one, {})
+    expect(path).to eq '/one/unidentified/'
+  end
+
+  it "should recognize routes with Addressable::Template" do
+    request = Rack::Request.new(
+      'REQUEST_METHOD' => 'GET',
+      'PATH_INFO' => '/one/123/'
+    )
+    route, _, params = routes.recognize(request)
+    expect(route).not_to be_nil
+    expect(route.app).to eq app_one
+    expect(params).to eq({id: '123'})
+  end
+
+  it "should generate from routes with Addressable::Template" do
+    path, _ = routes.generate(:path_info, :two, {:id => '654'})
+    expect(path).to eq '/two/'
+  end
+
+  it "should generate from routes with Addressable::Template using defaults" do
+    path, _ = routes.generate(:path_info, :two, {})
+    expect(path).to eq '/two/'
+  end
+
+  it "should recognize routes with Addressable::Template" do
+    request = Rack::Request.new(
+      'REQUEST_METHOD' => 'GET',
+      'PATH_INFO' => '/two/'
+    )
+    route, _, params = routes.recognize(request)
+    expect(route).not_to be_nil
+    expect(route.app).to eq app_two
+    expect(params).to eq({id: 'unidentified'})
+  end
+
+  it "should recognize routes with derived Regexp" do
+    request = Rack::Request.new(
+      'REQUEST_METHOD' => 'GET',
+      'PATH_INFO' => '/three/789/'
+    )
+    route, _, params = routes.recognize(request)
+    expect(route).not_to be_nil
+    expect(route.app).to eq app_three
+    expect(params).to eq({id: '789'})
+  end
+end

data/spec/addressable/security_spec.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+# coding: utf-8
+# Copyright (C) Bob Aman
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+
+require "spec_helper"
+
+require "addressable/uri"
+
+describe Addressable::URI, "when created with a URI known to cause crashes " +
+    "in certain browsers" do
+  it "should parse correctly" do
+    uri = Addressable::URI.parse('%%30%30')
+    expect(uri.path).to eq('%%30%30')
+    expect(uri.normalize.path).to eq('%2500')
+  end
+
+  it "should parse correctly as a full URI" do
+    uri = Addressable::URI.parse('http://www.example.com/%%30%30')
+    expect(uri.path).to eq('/%%30%30')
+    expect(uri.normalize.path).to eq('/%2500')
+  end
+end
+
+describe Addressable::URI, "when created with a URI known to cause crashes " +
+    "in certain browsers" do
+  it "should parse correctly" do
+    uri = Addressable::URI.parse('لُصّبُلُلصّبُررً ॣ ॣh ॣ ॣ 冗')
+    expect(uri.path).to eq('لُصّبُلُلصّبُررً ॣ ॣh ॣ ॣ 冗')
+    expect(uri.normalize.path).to eq(
+      '%D9%84%D9%8F%D8%B5%D9%91%D8%A8%D9%8F%D9%84%D9%8F%D9%84%D8%B5%D9%91' +
+      '%D8%A8%D9%8F%D8%B1%D8%B1%D9%8B%20%E0%A5%A3%20%E0%A5%A3h%20%E0%A5' +
+      '%A3%20%E0%A5%A3%20%E5%86%97'
+    )
+  end
+
+  it "should parse correctly as a full URI" do
+    uri = Addressable::URI.parse('http://www.example.com/لُصّبُلُلصّبُررً ॣ ॣh ॣ ॣ 冗')
+    expect(uri.path).to eq('/لُصّبُلُلصّبُررً ॣ ॣh ॣ ॣ 冗')
+    expect(uri.normalize.path).to eq(
+      '/%D9%84%D9%8F%D8%B5%D9%91%D8%A8%D9%8F%D9%84%D9%8F%D9%84%D8%B5%D9%91' +
+      '%D8%A8%D9%8F%D8%B1%D8%B1%D9%8B%20%E0%A5%A3%20%E0%A5%A3h%20%E0%A5' +
+      '%A3%20%E0%A5%A3%20%E5%86%97'
+    )
+  end
+end

data/spec/addressable/template_spec.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 # coding: utf-8
-# Copyright (C) 2006-2013 Bob Aman
+# Copyright (C) Bob Aman
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -16,6 +18,7 @@
 
 require "spec_helper"
 
+require "bigdecimal"
 require "addressable/template"
 
 shared_examples_for 'expands' do |tests|
@@ -75,15 +78,13 @@ describe "==" do
 end
 
 describe "Type conversion" do
-  require "bigdecimal"
-
   subject {
     {
       :var => true,
       :hello => 1234,
       :nothing => nil,
       :sym => :symbolic,
-      :decimal => BigDecimal.new('1')
+      :decimal => BigDecimal('1')
     }
   }
 
@@ -92,7 +93,7 @@ describe "Type conversion" do
     '{hello}' => '1234',
     '{nothing}' => '',
     '{sym}' => 'symbolic',
-    '{decimal}' => '0.1E1'
+    '{decimal}' => RUBY_VERSION < '2.4.0' ? '0.1E1' : '0.1e1'
   }
 end
 
@@ -699,6 +700,13 @@ describe "Expansion" do
       ]
     }
   end
+  context "non-string key in match data" do
+    subject {Addressable::Template.new("http://example.com/{one}")}
+
+    it "raises TypeError" do
+      expect { subject.expand(Object.new => "1") }.to raise_error TypeError
+    end
+  end
 end
 
 class ExampleTwoProcessor
@@ -729,6 +737,21 @@ class DumbProcessor
 end
 
 describe Addressable::Template do
+  describe 'initialize' do
+    context 'with a non-string' do
+      it 'raises a TypeError' do
+        expect { Addressable::Template.new(nil) }.to raise_error(TypeError)
+      end
+    end
+  end
+
+  describe 'freeze' do
+    subject { Addressable::Template.new("http://example.com/{first}/{+second}/") }
+    it 'freezes the template' do
+      expect(subject.freeze).to be_frozen
+    end
+  end
+
   describe "Matching" do
     let(:uri){
       Addressable::URI.parse(
@@ -749,7 +772,7 @@ describe Addressable::Template do
     }
     context "first uri with ExampleTwoProcessor" do
       subject {
-        match = Addressable::Template.new(
+        Addressable::Template.new(
           "http://example.com/search/{query}/"
         ).match(uri, ExampleTwoProcessor)
       }
@@ -759,7 +782,7 @@ describe Addressable::Template do
 
     context "second uri with ExampleTwoProcessor" do
       subject {
-        match = Addressable::Template.new(
+        Addressable::Template.new(
           "http://example.com/{first}/{+second}/"
         ).match(uri2, ExampleTwoProcessor)
       }
@@ -769,7 +792,7 @@ describe Addressable::Template do
 
     context "second uri with DumbProcessor" do
       subject {
-        match = Addressable::Template.new(
+        Addressable::Template.new(
           "http://example.com/{first}/{+second}/"
         ).match(uri2, DumbProcessor)
       }
@@ -779,7 +802,7 @@ describe Addressable::Template do
 
     context "second uri" do
       subject {
-        match = Addressable::Template.new(
+        Addressable::Template.new(
           "http://example.com/{first}{/second*}/"
         ).match(uri2)
       }
@@ -788,7 +811,7 @@ describe Addressable::Template do
     end
     context "third uri" do
       subject {
-        match = Addressable::Template.new(
+        Addressable::Template.new(
           "http://example.com/{;hash*,first}"
         ).match(uri3)
       }
@@ -801,7 +824,7 @@ describe Addressable::Template do
     # Semantically, a separate key is more likely, but both are possible.
     context "fourth uri" do
       subject {
-        match = Addressable::Template.new(
+        Addressable::Template.new(
           "http://example.com/{?hash*,first}"
         ).match(uri4)
       }
@@ -811,7 +834,7 @@ describe Addressable::Template do
     end
     context "fifth uri" do
       subject {
-        match = Addressable::Template.new(
+        Addressable::Template.new(
           "http://example.com/{path}{?hash*,first}"
         ).match(uri5)
       }
@@ -819,6 +842,22 @@ describe Addressable::Template do
       its(:captures){ should == ["foo", nil, nil] }
     end
   end
+
+  describe 'match' do
+    subject { Addressable::Template.new('http://example.com/first/second/') }
+    context 'when the URI is the same as the template' do
+      it 'returns the match data itself with an empty mapping' do
+        uri = Addressable::URI.parse('http://example.com/first/second/')
+        match_data = subject.match(uri)
+        expect(match_data).to be_an Addressable::Template::MatchData
+        expect(match_data.uri).to eq(uri)
+        expect(match_data.template).to eq(subject)
+        expect(match_data.mapping).to be_empty
+        expect(match_data.inspect).to be_an String
+      end
+    end
+  end
+
   describe "extract" do
     let(:template) {
       Addressable::Template.new(
@@ -902,13 +941,53 @@ describe Addressable::Template do
         )
       end
     end
+    context "partial_expand form style query with missing param at beginning" do
+      subject {
+        Addressable::Template.new("http://example.com/{?one,two}/")
+      }
+      it "builds a new pattern" do
+        expect(subject.partial_expand(:two => "2").pattern).to eq(
+          "http://example.com/?two=2{&one}/"
+        )
+      end
+    end
+    context "issue #307 - partial_expand form query with nil params" do
+      subject do
+        Addressable::Template.new("http://example.com/{?one,two,three}/")
+      end
+      it "builds a new pattern with two=nil" do
+        expect(subject.partial_expand(two: nil).pattern).to eq(
+          "http://example.com/{?one}{&three}/"
+        )
+      end
+      it "builds a new pattern with one=nil and two=nil" do
+        expect(subject.partial_expand(one: nil, two: nil).pattern).to eq(
+          "http://example.com/{?three}/"
+        )
+      end
+      it "builds a new pattern with one=1 and two=nil" do
+        expect(subject.partial_expand(one: 1, two: nil).pattern).to eq(
+          "http://example.com/?one=1{&three}/"
+        )
+      end
+      it "builds a new pattern with one=nil and two=2" do
+        expect(subject.partial_expand(one: nil, two: 2).pattern).to eq(
+          "http://example.com/?two=2{&three}/"
+        )
+      end
+      it "builds a new pattern with one=nil" do
+        expect(subject.partial_expand(one: nil).pattern).to eq(
+          "http://example.com/{?two}{&three}/"
+        )
+      end
+    end
     context "partial_expand with query string" do
       subject {
         Addressable::Template.new("http://example.com/{?two,one}/")
       }
       it "builds a new pattern" do
         expect(subject.partial_expand(:one => "1").pattern).to eq(
-          "http://example.com/{?two}&one=1/"
+          "http://example.com/?one=1{&two}/"
         )
       end
     end
@@ -922,6 +1001,24 @@ describe Addressable::Template do
         )
       end
     end
+    context "partial expand with unicode values" do
+      subject do
+        Addressable::Template.new("http://example.com/{resource}/{query}/")
+      end
+      it "normalizes unicode by default" do
+        template = subject.partial_expand("query" => "Cafe\u0301")
+        expect(template.pattern).to eq(
+          "http://example.com/{resource}/Caf%C3%A9/"
+        )
+      end
+
+      it "does not normalize unicode when byte semantics requested" do
+        template = subject.partial_expand({"query" => "Cafe\u0301"}, nil, false)
+        expect(template.pattern).to eq(
+          "http://example.com/{resource}/Cafe%CC%81/"
+        )
+      end
+    end
   end
   describe "Partial expand with strings" do
     context "partial_expand with two simple values" do
@@ -950,7 +1047,7 @@ describe Addressable::Template do
       }
       it "builds a new pattern" do
         expect(subject.partial_expand("one" => "1").pattern).to eq(
-          "http://example.com/{?two}&one=1/"
+          "http://example.com/?one=1{&two}/"
         )
       end
     end
@@ -966,6 +1063,20 @@ describe Addressable::Template do
     end
   end
   describe "Expand" do
+    context "expand with unicode values" do
+      subject do
+        Addressable::Template.new("http://example.com/search/{query}/")
+      end
+      it "normalizes unicode by default" do
+        uri = subject.expand("query" => "Cafe\u0301").to_str
+        expect(uri).to eq("http://example.com/search/Caf%C3%A9/")
+      end
+
+      it "does not normalize unicode when byte semantics requested" do
+        uri = subject.expand({ "query" => "Cafe\u0301" }, nil, false).to_str
+        expect(uri).to eq("http://example.com/search/Cafe%CC%81/")
+      end
+    end
     context "expand with a processor" do
       subject {
         Addressable::Template.new("http://example.com/search/{query}/")
@@ -999,7 +1110,7 @@ describe Addressable::Template do
       }
       it "builds a new pattern" do
         expect(subject.partial_expand("one" => "1").pattern).to eq(
-          "http://example.com/{?two}&one=1/"
+          "http://example.com/?one=1{&two}/"
         )
       end
     end