public_suffix 3.0.3 → 4.0.6

data/lib/public_suffix.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 # = Public Suffix
 #
 # Domain name parser based on the Public Suffix List.
 #
-# Copyright (c) 2009-2018 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2020 Simone Carletti <weppos@weppos.net>
 
 require_relative "public_suffix/domain"
 require_relative "public_suffix/version"
@@ -20,9 +22,9 @@ require_relative "public_suffix/list"
 # but was originally created to meet the needs of browser manufacturers.
 module PublicSuffix
 
-  DOT   = ".".freeze
-  BANG  = "!".freeze
-  STAR  = "*".freeze
+  DOT   = "."
+  BANG  = "!"
+  STAR  = "*"
 
   # Parses +name+ and returns the {PublicSuffix::Domain} instance.
   #
@@ -77,6 +79,7 @@ module PublicSuffix
     if rule.decompose(what).last.nil?
       raise DomainNotAllowed, "`#{what}` is not allowed according to Registry policy"
     end
+
     # rubocop:enable Style/IfUnlessModifier
 
     decompose(what, rule)
@@ -169,6 +172,7 @@ module PublicSuffix
     return DomainInvalid.new("Name is blank") if name.empty?
     return DomainInvalid.new("Name starts with a dot") if name.start_with?(DOT)
     return DomainInvalid.new("%s is not expected to contain a scheme" % name) if name.include?("://")
+
     name
   end
 

data/lib/public_suffix/domain.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 # = Public Suffix
 #
 # Domain name parser based on the Public Suffix List.
 #
-# Copyright (c) 2009-2018 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2020 Simone Carletti <weppos@weppos.net>
 
 module PublicSuffix
 
@@ -43,7 +45,7 @@ module PublicSuffix
     #   Initializes with a +tld+, +sld+ and +trd+.
     #   @param [String] tld The TLD (extension)
     #   @param [String] sld The SLD (domain)
-    #   @param [String] tld The TRD (subdomain)
+    #   @param [String] trd The TRD (subdomain)
     #
     # @yield [self] Yields on self.
     # @yieldparam [PublicSuffix::Domain] self The newly creates instance

data/lib/public_suffix/errors.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 # = Public Suffix
 #
 # Domain name parser based on the Public Suffix List.
 #
-# Copyright (c) 2009-2018 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2020 Simone Carletti <weppos@weppos.net>
 
 module PublicSuffix
 

data/lib/public_suffix/list.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 # = Public Suffix
 #
 # Domain name parser based on the Public Suffix List.
 #
-# Copyright (c) 2009-2018 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2020 Simone Carletti <weppos@weppos.net>
 
 module PublicSuffix
 
@@ -46,7 +48,7 @@ module PublicSuffix
     #
     # @return [PublicSuffix::List]
     def self.default(**options)
-      @default ||= parse(File.read(DEFAULT_LIST_PATH), options)
+      @default ||= parse(File.read(DEFAULT_LIST_PATH), **options)
     end
 
     # Sets the default rule list to +value+.
@@ -65,8 +67,8 @@ module PublicSuffix
     # @param  private_domains [Boolean] whether to ignore the private domains section
     # @return [PublicSuffix::List]
     def self.parse(input, private_domains: true)
-      comment_token = "//".freeze
-      private_token = "===BEGIN PRIVATE DOMAINS===".freeze
+      comment_token = "//"
+      private_token = "===BEGIN PRIVATE DOMAINS==="
       section = nil # 1 == ICANN, 2 == PRIVATE
 
       new do |list|
@@ -81,6 +83,7 @@ module PublicSuffix
           # include private domains or stop scanner
           when line.include?(private_token)
             break if !private_domains
+
             section = 2
 
           # skip comments
@@ -116,6 +119,7 @@ module PublicSuffix
     # @return [Boolean]
     def ==(other)
       return false unless other.is_a?(List)
+
       equal?(other) || @rules == other.rules
     end
     alias eql? ==
@@ -170,6 +174,7 @@ module PublicSuffix
     def find(name, default: default_rule, **options)
       rule = select(name, **options).inject do |l, r|
         return r if r.class == Rule::Exception
+
         l.length > r.length ? l : r
       end
       rule || default
@@ -201,18 +206,17 @@ module PublicSuffix
 
       loop do
         match = @rules[query]
-        if !match.nil? && (ignore_private == false || match.private == false)
-          rules << entry_to_rule(match, query)
-        end
+        rules << entry_to_rule(match, query) if !match.nil? && (ignore_private == false || match.private == false)
 
         index += 1
         break if index >= parts.size
+
         query = parts[index] + DOT + query
       end
 
       rules
     end
-    private :select # rubocop:disable Style/AccessModifierDeclarations
+    private :select
 
     # Gets the default rule.
     #

data/lib/public_suffix/rule.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 # = Public Suffix
 #
 # Domain name parser based on the Public Suffix List.
 #
-# Copyright (c) 2009-2018 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2020 Simone Carletti <weppos@weppos.net>
 
 module PublicSuffix
 
@@ -20,7 +22,7 @@ module PublicSuffix
   module Rule
 
     # @api internal
-    Entry = Struct.new(:type, :length, :private)
+    Entry = Struct.new(:type, :length, :private) # rubocop:disable Lint/StructNewOverride
 
     # = Abstract rule class
     #

data/lib/public_suffix/version.rb

@@ -1,10 +1,13 @@
+# frozen_string_literal: true
+
+#
 # = Public Suffix
 #
 # Domain name parser based on the Public Suffix List.
 #
-# Copyright (c) 2009-2018 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2020 Simone Carletti <weppos@weppos.net>
 
 module PublicSuffix
   # The current library version.
-  VERSION = "3.0.3".freeze
+  VERSION = "4.0.6"
 end

data/public_suffix.gemspec

@@ -12,14 +12,18 @@ Gem::Specification.new do |s|
   s.description = "PublicSuffix can parse and decompose a domain name into top level domain, domain and subdomains."
   s.licenses    = ["MIT"]
 
-  s.required_ruby_version = ">= 2.1"
+  s.metadata = {
+    "bug_tracker_uri" => "https://github.com/weppos/publicsuffix-ruby/issues",
+    "changelog_uri" => "https://github.com/weppos/publicsuffix-ruby/blob/master/CHANGELOG.md",
+    "documentation_uri" => "https://rubydoc.info/gems/#{s.name}/#{s.version}",
+    "homepage_uri" => s.homepage,
+    "source_code_uri" => "https://github.com/weppos/publicsuffix-ruby/tree/v#{s.version}",
+  }
+
+  s.required_ruby_version = ">= 2.3"
 
   s.require_paths    = ["lib"]
   s.files            = `git ls-files`.split("\n")
   s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.extra_rdoc_files = %w( LICENSE.txt )
-
-  s.add_development_dependency "rake"
-  s.add_development_dependency "mocha"
-  s.add_development_dependency "yard"
 end

data/test/acceptance_test.rb

@@ -1,16 +1,18 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 class AcceptanceTest < Minitest::Test
 
   VALID_CASES = [
-      ["example.com",             "example.com",        [nil, "example", "com"]],
-      ["foo.example.com",         "example.com",        ["foo", "example", "com"]],
+    ["example.com",             "example.com", [nil, "example", "com"]],
+    ["foo.example.com",         "example.com",        ["foo", "example", "com"]],
 
-      ["verybritish.co.uk",       "verybritish.co.uk",  [nil, "verybritish", "co.uk"]],
-      ["foo.verybritish.co.uk",   "verybritish.co.uk",  ["foo", "verybritish", "co.uk"]],
+    ["verybritish.co.uk",       "verybritish.co.uk",  [nil, "verybritish", "co.uk"]],
+    ["foo.verybritish.co.uk",   "verybritish.co.uk",  ["foo", "verybritish", "co.uk"]],
 
-      ["parliament.uk",           "parliament.uk",      [nil, "parliament", "uk"]],
-      ["foo.parliament.uk",       "parliament.uk",      ["foo", "parliament", "uk"]],
+    ["parliament.uk",           "parliament.uk",      [nil, "parliament", "uk"]],
+    ["foo.parliament.uk",       "parliament.uk",      ["foo", "parliament", "uk"]],
   ].freeze
 
   def test_valid
@@ -32,10 +34,10 @@ class AcceptanceTest < Minitest::Test
 
 
   INVALID_CASES = [
-      ["nic.bd",                  PublicSuffix::DomainNotAllowed],
-      [nil,                       PublicSuffix::DomainInvalid],
-      ["",                        PublicSuffix::DomainInvalid],
-      ["  ",                      PublicSuffix::DomainInvalid],
+    ["nic.bd", PublicSuffix::DomainNotAllowed],
+    [nil,                       PublicSuffix::DomainInvalid],
+    ["",                        PublicSuffix::DomainInvalid],
+    ["  ",                      PublicSuffix::DomainInvalid],
   ].freeze
 
   def test_invalid
@@ -47,16 +49,16 @@ class AcceptanceTest < Minitest::Test
 
 
   REJECTED_CASES = [
-      ["www. .com",           true],
-      ["foo.co..uk",          true],
-      ["goo,gle.com",         true],
-      ["-google.com",         true],
-      ["google-.com",         true],
-
-      # This case was covered in GH-15.
-      # I decided to cover this case because it's not easily reproducible with URI.parse
-      # and can lead to several false positives.
-      ["http://google.com",   false],
+    ["www. .com", true],
+    ["foo.co..uk",          true],
+    ["goo,gle.com",         true],
+    ["-google.com",         true],
+    ["google-.com",         true],
+
+    # This case was covered in GH-15.
+    # I decided to cover this case because it's not easily reproducible with URI.parse
+    # and can lead to several false positives.
+    ["http://google.com",   false],
   ].freeze
 
   def test_rejected
@@ -70,9 +72,9 @@ class AcceptanceTest < Minitest::Test
 
 
   CASE_CASES = [
-      ["Www.google.com", %w( www google com )],
-      ["www.Google.com", %w( www google com )],
-      ["www.google.Com", %w( www google com )],
+    ["Www.google.com", %w( www google com )],
+    ["www.Google.com", %w( www google com )],
+    ["www.google.Com", %w( www google com )],
   ].freeze
 
   def test_ignore_case
@@ -88,12 +90,13 @@ class AcceptanceTest < Minitest::Test
 
 
   INCLUDE_PRIVATE_CASES = [
-      ["blogspot.com", true, "blogspot.com"],
-      ["blogspot.com", false, nil],
-      ["subdomain.blogspot.com", true, "blogspot.com"],
-      ["subdomain.blogspot.com", false, "subdomain.blogspot.com"],
+    ["blogspot.com", true, "blogspot.com"],
+    ["blogspot.com", false, nil],
+    ["subdomain.blogspot.com", true, "blogspot.com"],
+    ["subdomain.blogspot.com", false, "subdomain.blogspot.com"],
   ].freeze
 
+  # rubocop:disable Style/CombinableLoops
   def test_ignore_private
     # test domain and parse
     INCLUDE_PRIVATE_CASES.each do |given, ignore_private, expected|
@@ -108,19 +111,20 @@ class AcceptanceTest < Minitest::Test
       assert_equal !expected.nil?, PublicSuffix.valid?(given, ignore_private: ignore_private)
     end
   end
+  # rubocop:enable Style/CombinableLoops
 
 
   def valid_uri?(name)
     uri = URI.parse(name)
     !uri.host.nil?
-  rescue
+  rescue StandardError
     false
   end
 
   def valid_domain?(name)
     uri = URI.parse(name)
     !uri.host.nil? && uri.scheme.nil?
-  rescue
+  rescue StandardError
     false
   end
 

data/test/psl_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 require "public_suffix"
 
@@ -13,6 +15,7 @@ class PslTest < Minitest::Test
       line = line.strip
       next if line.empty?
       next if line.start_with?("//")
+
       input, output = line.split(", ")
 
       # handle the case of eval("null"), it must be eval("nil")
@@ -35,7 +38,7 @@ class PslTest < Minitest::Test
     failures = []
     self.class.tests.each do |input, output|
       # Punycode domains are not supported ATM
-      next if input =~ /xn\-\-/
+      next if input =~ /xn--/
 
       domain = PublicSuffix.domain(input) rescue nil
       failures << [input, output, domain] if output != domain

data/test/test_helper.rb

@@ -1,11 +1,16 @@
-if ENV["COVERALL"]
-  require "coveralls"
-  Coveralls.wear!
+# frozen_string_literal: true
+
+if ENV["COVERAGE"]
+  require "simplecov"
+  SimpleCov.start
+
+  require "codecov"
+  SimpleCov.formatter = SimpleCov::Formatter::Codecov
 end
 
 require "minitest/autorun"
 require "minitest/reporters"
-require "mocha/setup"
+require "mocha/minitest"
 
 Minitest::Reporters.use! Minitest::Reporters::DefaultReporter.new(color: true)
 

data/test/unit/domain_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 class PublicSuffix::DomainTest < Minitest::Test

data/test/unit/errors_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 class ErrorsTest < Minitest::Test

data/test/unit/list_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 class PublicSuffix::ListTest < Minitest::Test

data/test/unit/public_suffix_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 class PublicSuffixTest < Minitest::Test
@@ -139,13 +141,13 @@ class PublicSuffixTest < Minitest::Test
 
   def test_self_normalize
     [
-        ["com", "com"],
-        ["example.com", "example.com"],
-        ["www.example.com", "www.example.com"],
+      ["com", "com"],
+      ["example.com", "example.com"],
+      ["www.example.com", "www.example.com"],
 
-        ["example.com.",  "example.com"],     # strip FQDN
-        [" example.com ", "example.com"],     # strip spaces
-        ["Example.COM",   "example.com"],     # downcase
+      ["example.com.",  "example.com"],     # strip FQDN
+      [" example.com ", "example.com"],     # strip spaces
+      ["Example.COM",   "example.com"],     # downcase
     ].each do |input, output|
       assert_equal output, PublicSuffix.normalize(input)
     end
@@ -153,9 +155,9 @@ class PublicSuffixTest < Minitest::Test
 
   def test_normalize_blank
     [
-        nil,
-        "",
-        " ",
+      nil,
+      "",
+      " ",
     ].each do |input|
       error = PublicSuffix.normalize(input)
       assert_instance_of PublicSuffix::DomainInvalid, error
@@ -165,7 +167,7 @@ class PublicSuffixTest < Minitest::Test
 
   def test_normalize_scheme
     [
-        "https://google.com",
+      "https://google.com",
     ].each do |input|
       error = PublicSuffix.normalize(input)
       assert_instance_of PublicSuffix::DomainInvalid, error
@@ -175,7 +177,7 @@ class PublicSuffixTest < Minitest::Test
 
   def test_normalize_leading_dot
     [
-        ".google.com",
+      ".google.com",
     ].each do |input|
       error = PublicSuffix.normalize(input)
       assert_instance_of PublicSuffix::DomainInvalid, error