addressable 2.2.3 → 2.7.0

data/lib/addressable/version.rb

@@ -1,34 +1,30 @@
+# frozen_string_literal: true
+
 # encoding:utf-8
 #--
-# Addressable, Copyright (c) 2006-2010 Bob Aman
+# Copyright (C) Bob Aman
 #
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
+#    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
 #
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
+#        http://www.apache.org/licenses/LICENSE-2.0
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#    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.
 #++
 
+
 # Used to prevent the class/module from being loaded more than once
 if !defined?(Addressable::VERSION)
   module Addressable
-    module VERSION #:nodoc:
+    module VERSION
       MAJOR = 2
-      MINOR = 2
-      TINY  = 3
+      MINOR = 7
+      TINY  = 0
 
       STRING = [MAJOR, MINOR, TINY].join('.')
     end

data/spec/addressable/idna_spec.rb

@@ -1,59 +1,63 @@
-# encoding:utf-8
-#--
-# Addressable, Copyright (c) 2006-2007 Bob Aman
+# frozen_string_literal: true
+
+# coding: utf-8
+# Copyright (C) Bob Aman
 #
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
+#    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
 #
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
+#        http://www.apache.org/licenses/LICENSE-2.0
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#++
+#    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"
+
+# Have to use RubyGems to load the idn gem.
+require "rubygems"
 
 require "addressable/idna"
 
-describe Addressable::IDNA, "when converting from unicode to ASCII" do
+shared_examples_for "converting from unicode to ASCII" do
   it "should convert 'www.google.com' correctly" do
-    Addressable::IDNA.to_ascii("www.google.com").should == "www.google.com"
+    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
-    Addressable::IDNA.to_ascii(
+    expect(Addressable::IDNA.to_ascii(
       "www.詹姆斯.com"
-    ).should == "www.xn--8ws00zhy3a.com"
+    )).to eq("www.xn--8ws00zhy3a.com")
   end
 
   it "should convert 'www.Iñtërnâtiônàlizætiøn.com' correctly" do
     "www.Iñtërnâtiônàlizætiøn.com"
-    Addressable::IDNA.to_ascii(
+    expect(Addressable::IDNA.to_ascii(
       "www.I\xC3\xB1t\xC3\xABrn\xC3\xA2ti\xC3\xB4" +
       "n\xC3\xA0liz\xC3\xA6ti\xC3\xB8n.com"
-    ).should == "www.xn--itrntinliztin-vdb0a5exd8ewcye.com"
+    )).to eq("www.xn--itrntinliztin-vdb0a5exd8ewcye.com")
   end
 
   it "should convert 'www.Iñtërnâtiônàlizætiøn.com' correctly" do
-    Addressable::IDNA.to_ascii(
+    expect(Addressable::IDNA.to_ascii(
       "www.In\xCC\x83te\xCC\x88rna\xCC\x82tio\xCC\x82n" +
       "a\xCC\x80liz\xC3\xA6ti\xC3\xB8n.com"
-    ).should == "www.xn--itrntinliztin-vdb0a5exd8ewcye.com"
+    )).to eq("www.xn--itrntinliztin-vdb0a5exd8ewcye.com")
   end
 
   it "should convert " +
       "'www.ほんとうにながいわけのわからないどめいんめいのらべるまだながくしないとたりない.w3.mag.keio.ac.jp' " +
       "correctly" do
-    Addressable::IDNA.to_ascii(
+    expect(Addressable::IDNA.to_ascii(
       "www.\343\201\273\343\202\223\343\201\250\343\201\206\343\201\253\343" +
       "\201\252\343\201\214\343\201\204\343\202\217\343\201\221\343\201\256" +
       "\343\202\217\343\201\213\343\202\211\343\201\252\343\201\204\343\201" +
@@ -62,15 +66,16 @@ describe Addressable::IDNA, "when converting from unicode to ASCII" do
       "\343\201\252\343\201\214\343\201\217\343\201\227\343\201\252\343\201" +
       "\204\343\201\250\343\201\237\343\202\212\343\201\252\343\201\204." +
       "w3.mag.keio.ac.jp"
-    ).should ==
+    )).to eq(
       "www.xn--n8jaaaaai5bhf7as8fsfk3jnknefdde3" +
       "fg11amb5gzdb4wi9bya3kc6lra.w3.mag.keio.ac.jp"
+    )
   end
 
   it "should convert " +
       "'www.ほんとうにながいわけのわからないどめいんめいのらべるまだながくしないとたりない.w3.mag.keio.ac.jp' " +
       "correctly" do
-    Addressable::IDNA.to_ascii(
+    expect(Addressable::IDNA.to_ascii(
       "www.\343\201\273\343\202\223\343\201\250\343\201\206\343\201\253\343" +
       "\201\252\343\201\213\343\202\231\343\201\204\343\202\217\343\201\221" +
       "\343\201\256\343\202\217\343\201\213\343\202\211\343\201\252\343\201" +
@@ -80,115 +85,216 @@ describe Addressable::IDNA, "when converting from unicode to ASCII" do
       "\213\343\202\231\343\201\217\343\201\227\343\201\252\343\201\204\343" +
       "\201\250\343\201\237\343\202\212\343\201\252\343\201\204." +
       "w3.mag.keio.ac.jp"
-    ).should ==
+    )).to eq(
       "www.xn--n8jaaaaai5bhf7as8fsfk3jnknefdde3" +
       "fg11amb5gzdb4wi9bya3kc6lra.w3.mag.keio.ac.jp"
+    )
   end
 
   it "should convert '点心和烤鸭.w3.mag.keio.ac.jp' correctly" do
-    Addressable::IDNA.to_ascii(
+    expect(Addressable::IDNA.to_ascii(
       "点心和烤鸭.w3.mag.keio.ac.jp"
-    ).should == "xn--0trv4xfvn8el34t.w3.mag.keio.ac.jp"
+    )).to eq("xn--0trv4xfvn8el34t.w3.mag.keio.ac.jp")
   end
 
   it "should convert '가각갂갃간갅갆갇갈갉힢힣.com' correctly" do
-    Addressable::IDNA.to_ascii(
+    expect(Addressable::IDNA.to_ascii(
       "가각갂갃간갅갆갇갈갉힢힣.com"
-    ).should == "xn--o39acdefghijk5883jma.com"
+    )).to eq("xn--o39acdefghijk5883jma.com")
   end
 
   it "should convert " +
       "'\347\242\274\346\250\231\346\272\226\350" +
       "\220\254\345\234\213\347\242\274.com' correctly" do
-    Addressable::IDNA.to_ascii(
+    expect(Addressable::IDNA.to_ascii(
       "\347\242\274\346\250\231\346\272\226\350" +
       "\220\254\345\234\213\347\242\274.com"
-    ).should == "xn--9cs565brid46mda086o.com"
+    )).to eq("xn--9cs565brid46mda086o.com")
   end
 
   it "should convert 'ﾘ宠퐱〹.com' correctly" do
-    Addressable::IDNA.to_ascii(
+    expect(Addressable::IDNA.to_ascii(
       "\357\276\230\345\256\240\355\220\261\343\200\271.com"
-    ).should == "xn--eek174hoxfpr4k.com"
+    )).to eq("xn--eek174hoxfpr4k.com")
   end
 
   it "should convert 'リ宠퐱卄.com' correctly" do
-    Addressable::IDNA.to_ascii(
+    expect(Addressable::IDNA.to_ascii(
       "\343\203\252\345\256\240\355\220\261\345\215\204.com"
-    ).should == "xn--eek174hoxfpr4k.com"
+    )).to eq("xn--eek174hoxfpr4k.com")
   end
 
   it "should convert 'ᆵ' correctly" do
-    Addressable::IDNA.to_ascii(
+    expect(Addressable::IDNA.to_ascii(
       "\341\206\265"
-    ).should == "xn--4ud"
+    )).to eq("xn--4ud")
   end
 
   it "should convert 'ﾯ' correctly" do
-    Addressable::IDNA.to_ascii(
+    expect(Addressable::IDNA.to_ascii(
       "\357\276\257"
-    ).should == "xn--4ud"
+    )).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"
+    )).to eq("example..host")
   end
 end
 
-describe Addressable::IDNA, "when converting from ASCII to unicode" do
+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
-    Addressable::IDNA.to_unicode("www.google.com").should == "www.google.com"
+    expect(Addressable::IDNA.to_unicode("www.google.com")).to eq(
+      "www.google.com")
   end
 
   it "should convert 'www.詹姆斯.com' correctly" do
-    Addressable::IDNA.to_unicode(
+    expect(Addressable::IDNA.to_unicode(
       "www.xn--8ws00zhy3a.com"
-    ).should == "www.詹姆斯.com"
+    )).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
-    Addressable::IDNA.to_unicode(
+    expect(Addressable::IDNA.to_unicode(
       "www.xn--itrntinliztin-vdb0a5exd8ewcye.com"
-    ).should == "www.iñtërnâtiônàlizætiøn.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
-    Addressable::IDNA.to_unicode(
+    expect(Addressable::IDNA.to_unicode(
       "www.xn--n8jaaaaai5bhf7as8fsfk3jnknefdde3" +
       "fg11amb5gzdb4wi9bya3kc6lra.w3.mag.keio.ac.jp"
-    ).should ==
+    )).to eq(
       "www.ほんとうにながいわけのわからないどめいんめいのらべるまだながくしないとたりない.w3.mag.keio.ac.jp"
+    )
   end
 
   it "should convert '点心和烤鸭.w3.mag.keio.ac.jp' correctly" do
-    Addressable::IDNA.to_unicode(
+    expect(Addressable::IDNA.to_unicode(
       "xn--0trv4xfvn8el34t.w3.mag.keio.ac.jp"
-    ).should == "点心和烤鸭.w3.mag.keio.ac.jp"
+    )).to eq("点心和烤鸭.w3.mag.keio.ac.jp")
   end
 
   it "should convert '가각갂갃간갅갆갇갈갉힢힣.com' correctly" do
-    Addressable::IDNA.to_unicode(
+    expect(Addressable::IDNA.to_unicode(
       "xn--o39acdefghijk5883jma.com"
-    ).should == "가각갂갃간갅갆갇갈갉힢힣.com"
+    )).to eq("가각갂갃간갅갆갇갈갉힢힣.com")
   end
 
   it "should convert " +
       "'\347\242\274\346\250\231\346\272\226\350" +
       "\220\254\345\234\213\347\242\274.com' correctly" do
-    Addressable::IDNA.to_unicode(
+    expect(Addressable::IDNA.to_unicode(
       "xn--9cs565brid46mda086o.com"
-    ).should ==
+    )).to eq(
       "\347\242\274\346\250\231\346\272\226\350" +
       "\220\254\345\234\213\347\242\274.com"
+    )
   end
 
   it "should convert 'リ宠퐱卄.com' correctly" do
-    Addressable::IDNA.to_unicode(
+    expect(Addressable::IDNA.to_unicode(
       "xn--eek174hoxfpr4k.com"
-    ).should == "\343\203\252\345\256\240\355\220\261\345\215\204.com"
+    )).to eq("\343\203\252\345\256\240\355\220\261\345\215\204.com")
   end
 
   it "should convert 'ﾯ' correctly" do
-    Addressable::IDNA.to_unicode(
+    expect(Addressable::IDNA.to_unicode(
       "xn--4ud"
-    ).should == "\341\206\265"
+    )).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"
+    )).to eq("example..host")
+  end
+
+  it "should normalize 'string' correctly" do
+    expect(Addressable::IDNA.unicode_normalize_kc(:'string')).to eq("string")
+    expect(Addressable::IDNA.unicode_normalize_kc("string")).to eq("string")
+  end
+end
+
+describe Addressable::IDNA, "when using the pure-Ruby implementation" do
+  before do
+    Addressable.send(:remove_const, :IDNA)
+    load "addressable/idna/pure.rb"
+  end
+
+  it_should_behave_like "converting from unicode to ASCII"
+  it_should_behave_like "converting from ASCII to unicode"
+
+  begin
+    require "fiber"
+
+    it "should not blow up inside fibers" do
+      f = Fiber.new do
+        Addressable.send(:remove_const, :IDNA)
+        load "addressable/idna/pure.rb"
+      end
+      f.resume
+    end
+  rescue LoadError
+    # Fibers aren't supported in this version of Ruby, skip this test.
+    warn('Fibers unsupported.')
+  end
+end
+
+begin
+  require "idn"
+
+  describe Addressable::IDNA, "when using the native-code implementation" do
+    before do
+      Addressable.send(:remove_const, :IDNA)
+      load "addressable/idna/native.rb"
+    end
+
+    it_should_behave_like "converting from unicode to ASCII"
+    it_should_behave_like "converting from ASCII to unicode"
   end
+rescue LoadError
+  # Cannot test the native implementation without libidn support.
+  warn('Could not load native IDN implementation.')
 end

data/spec/addressable/net_http_compat_spec.rb

@@ -0,0 +1,30 @@
+# 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 "net/http"
+
+describe Net::HTTP do
+  it "should be compatible with Addressable" do
+    response_body =
+      Net::HTTP.get(Addressable::URI.parse('http://www.google.com/'))
+    expect(response_body).not_to be_nil
+  end
+end

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