addressable 2.3.6 → 2.8.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  = 6
+      MINOR = 8
+      TINY  = 0
 
       STRING = [MAJOR, MINOR, TINY].join('.')
     end

data/lib/addressable.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'addressable/uri'
+require 'addressable/template'

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.
@@ -23,34 +25,39 @@ require "addressable/idna"
 
 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" +
@@ -59,15 +66,16 @@ shared_examples_for "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" +
@@ -77,121 +85,175 @@ shared_examples_for "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
 
 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
-    Addressable::IDNA.unicode_normalize_kc(:'string').should == "string"
-    Addressable::IDNA.unicode_normalize_kc("string").should == "string"
+    expect(Addressable::IDNA.unicode_normalize_kc(:'string')).to eq("string")
+    expect(Addressable::IDNA.unicode_normalize_kc("string")).to eq("string")
   end
 end
 
@@ -232,7 +294,9 @@ begin
     it_should_behave_like "converting from unicode to ASCII"
     it_should_behave_like "converting from ASCII to unicode"
   end
-rescue LoadError
+rescue LoadError => error
+  raise error if ENV["CI"] && TestHelper.native_supported?
+
   # Cannot test the native implementation without libidn support.
   warn('Could not load native IDN implementation.')
 end

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