addressable 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77783a5c4c07f7a0862f0efaeb2619a278e32391
-  data.tar.gz: 8edbb65fa242ce03cf2403c192d2358da64a095b
+  metadata.gz: 7327067f0dbb5a74d2da6ddff4227408af2f91aa
+  data.tar.gz: a2d86db5e9be6a83ba2e17c825fe4d30bfbac28f
 SHA512:
-  metadata.gz: b3345827151e1d04e5c532cca1e8e63337b0ce9d9f0e276861ed6be95b114827f68d5f74e5bea857db1faaf7a70a928159436f5e51cbbecc4a6db64145d28ea2
-  data.tar.gz: 86e4d5c946972502c8ac79bf2582d0d6894db23fa2e285c69b8dae0d1e16fcad447e7f8f393eeb9e9891f0a30e0971f864449b6dfaf4104bee080cfb3dfe4af4
+  metadata.gz: afd48eec1e6c38e64f34834cbac4af4f59464f66c9616a95ec74fc0f2c005d2c1c27046d6eccbdafb81d4e0bd974d9cd9fc40beb534911f2943f56c9bcc4da7b
+  data.tar.gz: 6a4de13abead387b0f31861e16887181a8fd686dcdb37f82f04a2fe69be91bdde5b34436269677b47477061d66d98192fbb31c67c1114b10e205c8f23b542d2b

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+# Addressable 2.5.0
+- dropping support for Ruby 1.9
+- adding support for Ruby 2.4 preview
+- add support for public suffixes and tld; first runtime dependency
+- hostname escaping should match RFC; underscores in hostnames no longer escaped
+- paths beginning with // and missing an authority are now considered invalid
+- validation now also takes place after setting a path
+- handle backslashes in authority more like a browser for `heuristic_parse`
+- unescaped backslashes in host now raise an `InvalidURIError`
+- `merge!`, `join!`, `omit!` and `normalize!` don't disable deferred validation
+- `heuristic_parse` now trims whitespace before parsing
+- host parts longer than 63 bytes will be ignored and not passed to libidn
+- normalized values always encoded as UTF-8
+
 # Addressable 2.4.0
 - support for 1.8.x dropped
 - double quotes in a host now raises an error

data/Gemfile

@@ -2,8 +2,6 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'rake', '~> 10.4', '>= 10.4.2'
-
 group :test do
   gem 'rspec', '~> 3.0'
   gem 'rspec-its', '~> 1.1'
@@ -16,12 +14,19 @@ group :development do
 end
 
 group :test, :development do
+  gem 'rake', '> 10.0', '< 12'
   gem 'simplecov', :require => false
   gem 'coveralls', :require => false, :platforms => [
-    :ruby_19, :ruby_20, :ruby_21, :rbx, :jruby
+    :ruby_20, :ruby_21, :ruby_22, :ruby_23
   ]
   # Used to test compatibility.
   gem 'rack-mount', git: 'https://github.com/sporkmonger/rack-mount.git', require: 'rack/mount'
+
+  if RUBY_VERSION.start_with?('2.0', '2.1')
+    gem 'rack', '< 2', :require => false
+  else
+    gem 'rack', :require => false
+  end
 end
 
-gem 'idn-ruby', :platform => [:mri_19, :mri_20, :mri_21, :mri_22]
+gem 'idn-ruby', :platform => [:mri_20, :mri_21, :mri_22]

data/README.md

@@ -3,7 +3,7 @@
 <dl>
   <dt>Homepage</dt><dd><a href="https://github.com/sporkmonger/addressable">github.com/sporkmonger/addressable</a></dd>
   <dt>Author</dt><dd><a href="mailto:bob@sporkmonger.com">Bob Aman</a></dd>
-  <dt>Copyright</dt><dd>Copyright © 2006-2015 Bob Aman</dd>
+  <dt>Copyright</dt><dd>Copyright © Bob Aman</dd>
   <dt>License</dt><dd>Apache 2.0</dd>
 </dl>
 
@@ -92,7 +92,7 @@ template.extract(uri)
 # Install
 
 ```console
-$ sudo gem install addressable
+$ gem install addressable
 ```
 
 You may optionally turn on native IDN support by installing libidn and the
@@ -103,3 +103,20 @@ $ sudo apt-get install idn # Debian/Ubuntu
 $ brew install libidn # OS X
 $ gem install idn-ruby
 ```
+
+# Semantic Versioning
+
+This project uses sementic versioning. You can (and should) specify your
+dependency using a pessimistic version constraint covering the major and minor
+values:
+
+```ruby
+spec.add_dependency 'addressable', '~> 2.5'
+```
+
+If you need a specific bug fix, you can also specify minimum tiny versions
+without preventing updates to the latest minor release:
+
+```ruby
+spec.add_dependency 'addressable', '~> 2.3', '>= 2.3.7'
+```

data/lib/addressable/idna.rb

@@ -1,6 +1,6 @@
 # encoding:utf-8
 #--
-# Copyright (C) 2006-2015 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/lib/addressable/idna/native.rb

@@ -1,6 +1,6 @@
 # encoding:utf-8
 #--
-# Copyright (C) 2006-2015 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.
@@ -34,8 +34,10 @@ module Addressable
 
     def self.to_ascii(value)
       value.to_s.split('.', -1).map do |segment|
-        if segment.size > 0
+        if segment.size > 0 && segment.size < 64
           IDN::Idna.toASCII(segment)
+        elsif segment.size >= 64
+          segment
         else
           ''
         end
@@ -44,8 +46,10 @@ module Addressable
 
     def self.to_unicode(value)
       value.to_s.split('.', -1).map do |segment|
-        if segment.size > 0
+        if segment.size > 0 && segment.size < 64
           IDN::Idna.toUnicode(segment)
+        elsif segment.size >= 64
+          segment
         else
           ''
         end

data/lib/addressable/idna/pure.rb

@@ -1,6 +1,6 @@
 # encoding:utf-8
 #--
-# Copyright (C) 2006-2015 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.
@@ -94,7 +94,12 @@ module Addressable
       parts = input.split('.')
       parts.map! do |part|
         if part =~ /^#{ACE_PREFIX}(.+)/
-          punycode_decode(part[/^#{ACE_PREFIX}(.+)/, 1])
+          begin
+            punycode_decode(part[/^#{ACE_PREFIX}(.+)/, 1])
+          rescue Addressable::IDNA::PunycodeBadInput
+            # toUnicode is explicitly defined as never-fails by the spec
+            part
+          end
         else
           part
         end

data/lib/addressable/template.rb

@@ -1,6 +1,6 @@
 # encoding:utf-8
 #--
-# Copyright (C) 2006-2015 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/lib/addressable/uri.rb

@@ -1,6 +1,6 @@
 # encoding:utf-8
 #--
-# Copyright (C) 2006-2015 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.
@@ -18,6 +18,7 @@
 
 require "addressable/version"
 require "addressable/idna"
+require "public_suffix"
 
 ##
 # Addressable is a library for processing links and URIs.
@@ -44,7 +45,7 @@ module Addressable
       UNRESERVED = ALPHA + DIGIT + "\\-\\.\\_\\~"
       PCHAR = UNRESERVED + SUB_DELIMS + "\\:\\@"
       SCHEME = ALPHA + DIGIT + "\\-\\+\\."
-      HOST = ALPHA + DIGIT + "\\-\\.\\[\\:\\]"
+      HOST = UNRESERVED + SUB_DELIMS + "\\[\\:\\]"
       AUTHORITY = PCHAR
       PATH = PCHAR + "\\/"
       QUERY = PCHAR + "\\/\\?"
@@ -176,7 +177,7 @@ module Addressable
         raise TypeError, "Can't convert #{uri.class} into String."
       end
       # Otherwise, convert to a String
-      uri = uri.to_str.dup
+      uri = uri.to_str.dup.strip
       hints = {
         :scheme => "http"
       }.merge(hints)
@@ -194,6 +195,15 @@ module Addressable
       when /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/
         uri.gsub!(/^/, hints[:scheme] + "://")
       end
+      match = uri.match(URIREGEX)
+      fragments = match.captures
+      authority = fragments[3]
+      if authority && authority.length > 0
+        new_authority = authority.gsub(/\\/, '/').gsub(/ /, '%20')
+        # NOTE: We want offset 4, not 3!
+        offset = match.offset(4)
+        uri[offset[0]...offset[1]] = new_authority
+      end
       parsed = self.parse(uri)
       if parsed.scheme =~ /^[^\/?#\.]+\.[^\/?#]+$/
         parsed = self.parse(hints[:scheme] + "://" + uri)
@@ -367,12 +377,10 @@ module Addressable
       if character_class.kind_of?(String)
         character_class = /[^#{character_class}]/
       end
-      if component.respond_to?(:force_encoding)
-        # We can't perform regexps on invalid UTF sequences, but
-        # here we need to, so switch to ASCII.
-        component = component.dup
-        component.force_encoding(Encoding::ASCII_8BIT)
-      end
+      # We can't perform regexps on invalid UTF sequences, but
+      # here we need to, so switch to ASCII.
+      component = component.dup
+      component.force_encoding(Encoding::ASCII_8BIT)
       # Avoiding gsub! because there are edge cases with frozen strings
       component = component.gsub(character_class) do |sequence|
         (sequence.unpack('C*').map { |c| "%" + ("%02x" % c).upcase }).join
@@ -427,14 +435,14 @@ module Addressable
       end
       uri = uri.dup
       # Seriously, only use UTF-8. I'm really not kidding!
-      uri.force_encoding("utf-8") if uri.respond_to?(:force_encoding)
-      leave_encoded.force_encoding("utf-8") if leave_encoded.respond_to?(:force_encoding)
+      uri.force_encoding("utf-8")
+      leave_encoded.force_encoding("utf-8")
       result = uri.gsub(/%[0-9a-f]{2}/iu) do |sequence|
         c = sequence[1..3].to_i(16).chr
-        c.force_encoding("utf-8") if c.respond_to?(:force_encoding)
+        c.force_encoding("utf-8")
         leave_encoded.include?(c) ? sequence : c
       end
-      result.force_encoding("utf-8") if result.respond_to?(:force_encoding)
+      result.force_encoding("utf-8")
       if return_type == String
         return result
       elsif return_type == ::Addressable::URI
@@ -521,12 +529,10 @@ module Addressable
 
         character_class = /[^#{character_class}]#{leave_re}/
       end
-      if component.respond_to?(:force_encoding)
-        # We can't perform regexps on invalid UTF sequences, but
-        # here we need to, so switch to ASCII.
-        component = component.dup
-        component.force_encoding(Encoding::ASCII_8BIT)
-      end
+      # We can't perform regexps on invalid UTF sequences, but
+      # here we need to, so switch to ASCII.
+      component = component.dup
+      component.force_encoding(Encoding::ASCII_8BIT)
       unencoded = self.unencode_component(component, String, leave_encoded)
       begin
         encoded = self.encode_component(
@@ -537,9 +543,7 @@ module Addressable
       rescue ArgumentError
         encoded = self.encode_component(unencoded)
       end
-      if encoded.respond_to?(:force_encoding)
-        encoded.force_encoding(Encoding::UTF_8)
-      end
+      encoded.force_encoding(Encoding::UTF_8)
       return encoded
     end
 
@@ -851,6 +855,9 @@ module Addressable
           )
         end
       end
+      # All normalized values should be UTF-8
+      @normalized_scheme.force_encoding(Encoding::UTF_8) if @normalized_scheme
+      @normalized_scheme
     end
 
     ##
@@ -903,6 +910,9 @@ module Addressable
           )
         end
       end
+      # All normalized values should be UTF-8
+      @normalized_user.force_encoding(Encoding::UTF_8) if @normalized_user
+      @normalized_user
     end
 
     ##
@@ -957,6 +967,11 @@ module Addressable
           )
         end
       end
+      # All normalized values should be UTF-8
+      if @normalized_password
+        @normalized_password.force_encoding(Encoding::UTF_8)
+      end
+      @normalized_password
     end
 
     ##
@@ -1022,6 +1037,11 @@ module Addressable
           "#{current_user}"
         end
       end
+      # All normalized values should be UTF-8
+      if @normalized_userinfo
+        @normalized_userinfo.force_encoding(Encoding::UTF_8)
+      end
+      @normalized_userinfo
     end
 
     ##
@@ -1084,6 +1104,9 @@ module Addressable
           EMPTY_STR
         end
       end
+      # All normalized values should be UTF-8
+      @normalized_host.force_encoding(Encoding::UTF_8) if @normalized_host
+      @normalized_host
     end
 
     ##
@@ -1096,14 +1119,6 @@ module Addressable
       end
       @host = new_host ? new_host.to_str : nil
 
-      unreserved = CharacterClasses::UNRESERVED
-      sub_delims = CharacterClasses::SUB_DELIMS
-      if !@host.nil? && (@host =~ /[<>{}\/\?\#\@"[[:space:]]]/ ||
-          (@host[/^\[(.*)\]$/, 1] != nil && @host[/^\[(.*)\]$/, 1] !~
-          Regexp.new("^[#{unreserved}#{sub_delims}:]*$")))
-        raise InvalidURIError, "Invalid character in host: '#{@host.to_s}'"
-      end
-
       # Reset dependent values
       remove_instance_variable(:@authority) if defined?(@authority)
       remove_instance_variable(:@normalized_host) if defined?(@normalized_host)
@@ -1144,6 +1159,24 @@ module Addressable
       self.host = v
     end
 
+    ##
+    # Returns the top-level domain for this host.
+    #
+    # @example
+    #   Addressable::URI.parse("www.example.co.uk").tld # => "co.uk"
+    def tld
+      PublicSuffix.parse(self.host, ignore_private: true).tld
+    end
+
+    ##
+    # Returns the public suffix domain for this host.
+    #
+    # @example
+    #   Addressable::URI.parse("www.example.co.uk").domain # => "example.co.uk"
+    def domain
+      PublicSuffix.domain(self.host, ignore_private: true)
+    end
+
     ##
     # The authority component for this URI.
     # Combines the user, password, host, and port components.
@@ -1151,7 +1184,7 @@ module Addressable
     # @return [String] The authority component.
     def authority
       self.host && @authority ||= begin
-        authority = ""
+        authority = String.new
         if self.userinfo != nil
           authority << "#{self.userinfo}@"
         end
@@ -1170,7 +1203,7 @@ module Addressable
     def normalized_authority
       return nil unless self.authority
       @normalized_authority ||= begin
-        authority = ""
+        authority = String.new
         if self.normalized_userinfo != nil
           authority << "#{self.normalized_userinfo}@"
         end
@@ -1180,6 +1213,11 @@ module Addressable
         end
         authority
       end
+      # All normalized values should be UTF-8
+      if @normalized_authority
+        @normalized_authority.force_encoding(Encoding::UTF_8)
+      end
+      @normalized_authority
     end
 
     ##
@@ -1411,6 +1449,9 @@ module Addressable
         end
         site_string
       end
+      # All normalized values should be UTF-8
+      @normalized_site.force_encoding(Encoding::UTF_8) if @normalized_site
+      @normalized_site
     end
 
     ##
@@ -1471,6 +1512,9 @@ module Addressable
         end
         result
       end
+      # All normalized values should be UTF-8
+      @normalized_path.force_encoding(Encoding::UTF_8) if @normalized_path
+      @normalized_path
     end
 
     ##
@@ -1489,6 +1533,9 @@ module Addressable
       # Reset dependent values
       remove_instance_variable(:@normalized_path) if defined?(@normalized_path)
       remove_composite_values
+
+      # Ensure we haven't created an invalid URI
+      validate()
     end
 
     ##
@@ -1536,6 +1583,9 @@ module Addressable
         end.join("&")
         component == "" ? nil : component
       end
+      # All normalized values should be UTF-8
+      @normalized_query.force_encoding(Encoding::UTF_8) if @normalized_query
+      @normalized_query
     end
 
     ##
@@ -1727,6 +1777,11 @@ module Addressable
         )
         component == "" ? nil : component
       end
+      # All normalized values should be UTF-8
+      if @normalized_fragment
+        @normalized_fragment.force_encoding(Encoding::UTF_8)
+      end
+      @normalized_fragment
     end
 
     ##
@@ -2246,15 +2301,13 @@ module Addressable
           "Cannot assemble URI string with ambiguous path: '#{self.path}'"
       end
       @uri_string ||= begin
-        uri_string = ""
+        uri_string = String.new
         uri_string << "#{self.scheme}:" if self.scheme != nil
         uri_string << "//#{self.authority}" if self.authority != nil
         uri_string << self.path.to_s
         uri_string << "?#{self.query}" if self.query != nil
         uri_string << "##{self.fragment}" if self.fragment != nil
-        if uri_string.respond_to?(:force_encoding)
-          uri_string.force_encoding(Encoding::UTF_8)
-        end
+        uri_string.force_encoding(Encoding::UTF_8)
         uri_string
       end
     end
@@ -2371,6 +2424,19 @@ module Addressable
         raise InvalidURIError,
           "Cannot have a relative path with an authority set: '#{self.to_s}'"
       end
+      if self.path != nil && !self.path.empty? &&
+          self.path[0..1] == SLASH + SLASH && self.authority == nil
+        raise InvalidURIError,
+          "Cannot have a path with two leading slashes " +
+          "without an authority set: '#{self.to_s}'"
+      end
+      unreserved = CharacterClasses::UNRESERVED
+      sub_delims = CharacterClasses::SUB_DELIMS
+      if !self.host.nil? && (self.host =~ /[<>{}\/\\\?\#\@"[[:space:]]]/ ||
+          (self.host[/^\[(.*)\]$/, 1] != nil && self.host[/^\[(.*)\]$/, 1] !~
+          Regexp.new("^[#{unreserved}#{sub_delims}:]*$")))
+        raise InvalidURIError, "Invalid character in host: '#{self.host.to_s}'"
+      end
       return nil
     end
 
@@ -2384,7 +2450,9 @@ module Addressable
     def replace_self(uri)
       # Reset dependent values
       instance_variables.each do |var|
-        remove_instance_variable(var) if instance_variable_defined?(var)
+        if instance_variable_defined?(var) && var != :@validation_deferred
+          remove_instance_variable(var)
+        end
       end
 
       @scheme = uri.scheme

data/lib/addressable/version.rb

@@ -1,6 +1,6 @@
 # encoding:utf-8
 #--
-# Copyright (C) 2006-2015 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,7 +21,7 @@ if !defined?(Addressable::VERSION)
   module Addressable
     module VERSION
       MAJOR = 2
-      MINOR = 4
+      MINOR = 5
       TINY  = 0
 
       STRING = [MAJOR, MINOR, TINY].join('.')

data/spec/addressable/idna_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-# Copyright (C) 2006-2015 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 +26,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"
@@ -137,12 +142,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

data/spec/addressable/net_http_compat_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-# Copyright (C) 2006-2015 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

@@ -1,5 +1,5 @@
 # coding: utf-8
-# Copyright (C) 2006-2015 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/security_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-# Copyright (C) 2006-2015 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/template_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-# Copyright (C) 2006-2015 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.
@@ -851,6 +851,7 @@ describe Addressable::Template do
         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

data/spec/addressable/uri_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-# Copyright (C) 2006-2015 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.
@@ -409,6 +409,10 @@ describe Addressable::URI, "when initialized from individual components" do
     expect(@uri.normalized_host).to eq("example.com")
   end
 
+  it "returns 'com' for #tld" do
+    expect(@uri.tld).to eq("com")
+  end
+
   it "returns 'user:password@example.com:8080' for #authority" do
     expect(@uri.authority).to eq("user:password@example.com:8080")
   end
@@ -1073,6 +1077,30 @@ describe Addressable::URI, "when created with a host with trailing dots" do
   end
 end
 
+describe Addressable::URI, "when created with a host with a backslash" do
+  it "should raise an error" do
+    expect(lambda do
+      Addressable::URI.new(:authority => "example\\example")
+    end).to raise_error(Addressable::URI::InvalidURIError)
+  end
+end
+
+describe Addressable::URI, "when created with a host with a slash" do
+  it "should raise an error" do
+    expect(lambda do
+      Addressable::URI.new(:authority => "example/example")
+    end).to raise_error(Addressable::URI::InvalidURIError)
+  end
+end
+
+describe Addressable::URI, "when created with a host with a space" do
+  it "should raise an error" do
+    expect(lambda do
+      Addressable::URI.new(:authority => "example example")
+    end).to raise_error(Addressable::URI::InvalidURIError)
+  end
+end
+
 describe Addressable::URI, "when created with both a userinfo and a user" do
   it "should raise an error" do
     expect(lambda do
@@ -1775,7 +1803,7 @@ describe Addressable::URI, "when parsed from " +
   end
 
   it "should have the same hash as http://EXAMPLE.com after assignment" do
-    @uri.host = "EXAMPLE.com"
+    @uri.origin = "http://EXAMPLE.com"
     expect(@uri.hash).to eq(Addressable::URI.parse("http://EXAMPLE.com").hash)
   end
 
@@ -1783,6 +1811,24 @@ describe Addressable::URI, "when parsed from " +
     expect(@uri.hash).not_to eq(Addressable::URI.parse("http://EXAMPLE.com").hash)
   end
 
+  it "should not allow origin assignment without scheme" do
+    expect(lambda do
+      @uri.origin = "example.com"
+    end).to raise_error(Addressable::URI::InvalidURIError)
+  end
+
+  it "should not allow origin assignment without host" do
+    expect(lambda do
+      @uri.origin = "http://"
+    end).to raise_error(Addressable::URI::InvalidURIError)
+  end
+
+  it "should not allow origin assignment with bogus type" do
+    expect(lambda do
+      @uri.origin = :bogus
+    end).to raise_error(TypeError)
+  end
+
   # Section 6.2.3 of RFC 3986
   it "should be equivalent to http://example.com/" do
     expect(@uri).to eq(Addressable::URI.parse("http://example.com/"))
@@ -2320,6 +2366,80 @@ describe Addressable::URI, "when parsed from " +
   end
 end
 
+describe Addressable::URI, "when parsed from " +
+    "'HTTP://EXAMPLE.COM/'" do
+  before do
+    @uri = Addressable::URI.parse("HTTP://EXAMPLE.COM/")
+  end
+
+  it "should be equivalent to http://example.com" do
+    expect(@uri).to eq(Addressable::URI.parse("http://example.com"))
+  end
+
+  it "should correctly convert to a hash" do
+    expect(@uri.to_hash).to eq({
+      :scheme => "HTTP",
+      :user => nil,
+      :password => nil,
+      :host => "EXAMPLE.COM",
+      :port => nil,
+      :path => "/",
+      :query => nil,
+      :fragment => nil
+    })
+  end
+
+  it "should be identical to its duplicate" do
+    expect(@uri).to eq(@uri.dup)
+  end
+
+  it "should have an origin of 'http://example.com'" do
+    expect(@uri.origin).to eq('http://example.com')
+  end
+
+  it "should have a tld of 'com'" do
+    expect(@uri.tld).to eq('com')
+  end
+end
+
+describe Addressable::URI, "when parsed from " +
+    "'http://www.example.co.uk/'" do
+  before do
+    @uri = Addressable::URI.parse("http://www.example.co.uk/")
+  end
+
+  it "should have an origin of 'http://www.example.co.uk'" do
+    expect(@uri.origin).to eq('http://www.example.co.uk')
+  end
+
+  it "should have a tld of 'co.uk'" do
+    expect(@uri.tld).to eq('co.uk')
+  end
+
+  it "should have a domain of 'example.co.uk'" do
+    expect(@uri.domain).to eq('example.co.uk')
+  end
+end
+
+describe Addressable::URI, "when parsed from " +
+    "'http://sub_domain.blogspot.com/'" do
+  before do
+    @uri = Addressable::URI.parse("http://sub_domain.blogspot.com/")
+  end
+
+  it "should have an origin of 'http://sub_domain.blogspot.com'" do
+    expect(@uri.origin).to eq('http://sub_domain.blogspot.com')
+  end
+
+  it "should have a tld of 'com'" do
+    expect(@uri.tld).to eq('com')
+  end
+
+  it "should have a domain of 'blogspot.com'" do
+    expect(@uri.domain).to eq('blogspot.com')
+  end
+end
+
 describe Addressable::URI, "when parsed from " +
     "'http://example.com/~smith/'" do
   before do
@@ -2961,6 +3081,23 @@ describe Addressable::URI, "when parsed from " +
   end
 end
 
+describe Addressable::URI, "when parsed from " +
+    "'/..//example.com'" do
+  before do
+    @uri = Addressable::URI.parse("/..//example.com")
+  end
+
+  it "should become invalid when normalized" do
+    expect(lambda do
+      @uri.normalize
+    end).to raise_error(Addressable::URI::InvalidURIError, /authority/)
+  end
+
+  it "should have a path of '/..//example.com'" do
+    expect(@uri.path).to eq("/..//example.com")
+  end
+end
+
 describe Addressable::URI, "when parsed from '/a/b/c/./../../g'" do
   before do
     @uri = Addressable::URI.parse("/a/b/c/./../../g")
@@ -5476,7 +5613,7 @@ describe Addressable::URI, "when parsing a non-String object" do
   it "should raise a TypeError for objects than cannot be converted" do
     expect(lambda do
       Addressable::URI.parse(42)
-    end).to raise_error(TypeError, "Can't convert Fixnum into String.")
+    end).to raise_error(TypeError)
   end
 
   it "should correctly parse heuristically anything with a 'to_str' method" do
@@ -5486,7 +5623,7 @@ describe Addressable::URI, "when parsing a non-String object" do
   it "should raise a TypeError for objects than cannot be converted" do
     expect(lambda do
       Addressable::URI.heuristic_parse(42)
-    end).to raise_error(TypeError, "Can't convert Fixnum into String.")
+    end).to raise_error(TypeError)
   end
 end
 
@@ -5532,7 +5669,7 @@ describe Addressable::URI, "when form encoding a non-Array object" do
   it "should raise a TypeError for objects than cannot be converted" do
     expect(lambda do
       Addressable::URI.form_encode(42)
-    end).to raise_error(TypeError, "Can't convert Fixnum into Array.")
+    end).to raise_error(TypeError)
   end
 end
 
@@ -5600,7 +5737,7 @@ describe Addressable::URI, "when form unencoding a non-String object" do
   it "should raise a TypeError for objects than cannot be converted" do
     expect(lambda do
       Addressable::URI.form_unencode(42)
-    end).to raise_error(TypeError, "Can't convert Fixnum into String.")
+    end).to raise_error(TypeError)
   end
 end
 
@@ -5612,7 +5749,7 @@ describe Addressable::URI, "when normalizing a non-String object" do
   it "should raise a TypeError for objects than cannot be converted" do
     expect(lambda do
       Addressable::URI.normalize_component(42)
-    end).to raise_error(TypeError, "Can't convert Fixnum into String.")
+    end).to raise_error(TypeError)
   end
 
   it "should raise a TypeError for objects than cannot be converted" do
@@ -5878,6 +6015,136 @@ describe Addressable::URI, "when given the input " +
   end
 end
 
+describe Addressable::URI, "when given the input " +
+    "'http://prefix\\.example.com/'" do
+  before do
+    @input = "http://prefix\\.example.com/"
+  end
+
+  it "should heuristically parse to 'http://prefix/.example.com/'" do
+    @uri = Addressable::URI.heuristic_parse(@input)
+    expect(@uri.authority).to eq("prefix")
+    expect(@uri.to_s).to eq("http://prefix/.example.com/")
+  end
+
+  it "should heuristically parse to 'http://prefix/.example.com/' " +
+      "even with a scheme hint of 'ftp'" do
+    @uri = Addressable::URI.heuristic_parse(@input, {:scheme => 'ftp'})
+    expect(@uri.to_s).to eq("http://prefix/.example.com/")
+  end
+end
+
+describe Addressable::URI, "when given the input " +
+    "'http://p:\\/'" do
+  before do
+    @input = "http://p:\\/"
+  end
+
+  it "should heuristically parse to 'http://p//'" do
+    @uri = Addressable::URI.heuristic_parse(@input)
+    expect(@uri.authority).to eq("p")
+    expect(@uri.to_s).to eq("http://p//")
+  end
+
+  it "should heuristically parse to 'http://p//' " +
+      "even with a scheme hint of 'ftp'" do
+    @uri = Addressable::URI.heuristic_parse(@input, {:scheme => 'ftp'})
+    expect(@uri.to_s).to eq("http://p//")
+  end
+end
+
+describe Addressable::URI, "when given the input " +
+    "'http://p://'" do
+  before do
+    @input = "http://p://"
+  end
+
+  it "should heuristically parse to 'http://p//'" do
+    @uri = Addressable::URI.heuristic_parse(@input)
+    expect(@uri.authority).to eq("p")
+    expect(@uri.to_s).to eq("http://p//")
+  end
+
+  it "should heuristically parse to 'http://p//' " +
+      "even with a scheme hint of 'ftp'" do
+    @uri = Addressable::URI.heuristic_parse(@input, {:scheme => 'ftp'})
+    expect(@uri.to_s).to eq("http://p//")
+  end
+end
+
+describe Addressable::URI, "when given the input " +
+    "'http://p://p'" do
+  before do
+    @input = "http://p://p"
+  end
+
+  it "should heuristically parse to 'http://p//p'" do
+    @uri = Addressable::URI.heuristic_parse(@input)
+    expect(@uri.authority).to eq("p")
+    expect(@uri.to_s).to eq("http://p//p")
+  end
+
+  it "should heuristically parse to 'http://p//p' " +
+      "even with a scheme hint of 'ftp'" do
+    @uri = Addressable::URI.heuristic_parse(@input, {:scheme => 'ftp'})
+    expect(@uri.to_s).to eq("http://p//p")
+  end
+end
+
+describe Addressable::URI, "when given the input " +
+    "'http://prefix .example.com/'" do
+  before do
+    @input = "http://prefix .example.com/"
+  end
+
+  # Justification here being that no browser actually tries to resolve this.
+  # They all treat this as a web search.
+  it "should heuristically parse to 'http://prefix%20.example.com/'" do
+    @uri = Addressable::URI.heuristic_parse(@input)
+    expect(@uri.authority).to eq("prefix%20.example.com")
+    expect(@uri.to_s).to eq("http://prefix%20.example.com/")
+  end
+
+  it "should heuristically parse to 'http://prefix%20.example.com/' " +
+      "even with a scheme hint of 'ftp'" do
+    @uri = Addressable::URI.heuristic_parse(@input, {:scheme => 'ftp'})
+    expect(@uri.to_s).to eq("http://prefix%20.example.com/")
+  end
+end
+
+describe Addressable::URI, "when given the input " +
+    "'  http://www.example.com/  '" do
+  before do
+    @input = "  http://www.example.com/  "
+  end
+
+  it "should heuristically parse to 'http://prefix%20.example.com/'" do
+    @uri = Addressable::URI.heuristic_parse(@input)
+    expect(@uri.scheme).to eq("http")
+    expect(@uri.path).to eq("/")
+    expect(@uri.to_s).to eq("http://www.example.com/")
+  end
+end
+
+describe Addressable::URI, "when given the input " +
+    "'http://prefix%2F.example.com/'" do
+  before do
+    @input = "http://prefix%2F.example.com/"
+  end
+
+  it "should heuristically parse to 'http://prefix%2F.example.com/'" do
+    @uri = Addressable::URI.heuristic_parse(@input)
+    expect(@uri.authority).to eq("prefix%2F.example.com")
+    expect(@uri.to_s).to eq("http://prefix%2F.example.com/")
+  end
+
+  it "should heuristically parse to 'http://prefix%2F.example.com/' " +
+      "even with a scheme hint of 'ftp'" do
+    @uri = Addressable::URI.heuristic_parse(@input, {:scheme => 'ftp'})
+    expect(@uri.to_s).to eq("http://prefix%2F.example.com/")
+  end
+end
+
 describe Addressable::URI, "when given the input " +
     "'/path/to/resource'" do
   before do

data/tasks/gem.rake

@@ -18,8 +18,9 @@ namespace :gem do
       exit(1)
     end
 
-    s.required_ruby_version = '>= 1.9.0'
+    s.required_ruby_version = '>= 2.0'
 
+    s.add_runtime_dependency 'public_suffix', '~> 2.0', '>= 2.0.2'
     s.add_development_dependency 'bundler', '~> 1.0'
 
     s.require_path = "lib"
@@ -39,15 +40,8 @@ namespace :gem do
   desc "Generates .gemspec file"
   task :gemspec do
     spec_string = GEM_SPEC.to_ruby
-
-    begin
-      Thread.new { eval("$SAFE = 3\n#{spec_string}", binding) }.join
-    rescue
-      abort "unsafe gemspec: #{$!}"
-    else
-      File.open("#{GEM_SPEC.name}.gemspec", 'w') do |file|
-        file.write spec_string
-      end
+    File.open("#{GEM_SPEC.name}.gemspec", 'w') do |file|
+      file.write spec_string
     end
   end
 

metadata

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: addressable
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Bob Aman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-07 00:00:00.000000000 Z
+date: 2016-11-04 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: public_suffix
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +59,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- addressable.gemspec
 - data/unicode.data
 - lib/addressable.rb
 - lib/addressable/idna.rb
@@ -75,7 +94,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.0
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -83,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: URI Implementation

data/addressable.gemspec

@@ -1,34 +0,0 @@
-# -*- encoding: utf-8 -*-
-# stub: addressable 2.4.0 ruby lib
-
-Gem::Specification.new do |s|
-  s.name = "addressable"
-  s.version = "2.4.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Bob Aman"]
-  s.date = "2015-12-07"
-  s.description = "Addressable is a replacement for the URI implementation that is part of\nRuby's standard library. It more closely conforms to the relevant RFCs and\nadds support for IRIs and URI templates.\n"
-  s.email = "bob@sporkmonger.com"
-  s.extra_rdoc_files = ["README.md"]
-  s.files = ["CHANGELOG.md", "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "addressable.gemspec", "data/unicode.data", "lib/addressable.rb", "lib/addressable/idna.rb", "lib/addressable/idna/native.rb", "lib/addressable/idna/pure.rb", "lib/addressable/template.rb", "lib/addressable/uri.rb", "lib/addressable/version.rb", "spec/addressable/idna_spec.rb", "spec/addressable/net_http_compat_spec.rb", "spec/addressable/rack_mount_compat_spec.rb", "spec/addressable/security_spec.rb", "spec/addressable/template_spec.rb", "spec/addressable/uri_spec.rb", "spec/spec_helper.rb", "tasks/clobber.rake", "tasks/gem.rake", "tasks/git.rake", "tasks/metrics.rake", "tasks/rspec.rake", "tasks/yard.rake"]
-  s.homepage = "https://github.com/sporkmonger/addressable"
-  s.licenses = ["Apache-2.0"]
-  s.rdoc_options = ["--main", "README.md"]
-  s.required_ruby_version = Gem::Requirement.new(">= 1.9.0")
-  s.rubygems_version = "2.5.0"
-  s.summary = "URI Implementation"
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<bundler>, ["~> 1.0"])
-    else
-      s.add_dependency(%q<bundler>, ["~> 1.0"])
-    end
-  else
-    s.add_dependency(%q<bundler>, ["~> 1.0"])
-  end
-end