public_suffix 3.1.1 → 4.0.6

data/lib/public_suffix.rb

@@ -4,7 +4,7 @@
 #
 # Domain name parser based on the Public Suffix List.
 #
-# Copyright (c) 2009-2019 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2020 Simone Carletti <weppos@weppos.net>
 
 require_relative "public_suffix/domain"
 require_relative "public_suffix/version"

data/lib/public_suffix/domain.rb

@@ -4,7 +4,7 @@
 #
 # Domain name parser based on the Public Suffix List.
 #
-# Copyright (c) 2009-2019 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2020 Simone Carletti <weppos@weppos.net>
 
 module PublicSuffix
 

data/lib/public_suffix/errors.rb

@@ -4,7 +4,7 @@
 #
 # Domain name parser based on the Public Suffix List.
 #
-# Copyright (c) 2009-2019 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2020 Simone Carletti <weppos@weppos.net>
 
 module PublicSuffix
 

data/lib/public_suffix/list.rb

@@ -4,7 +4,7 @@
 #
 # Domain name parser based on the Public Suffix List.
 #
-# Copyright (c) 2009-2019 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2020 Simone Carletti <weppos@weppos.net>
 
 module PublicSuffix
 
@@ -48,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+.
@@ -216,7 +216,7 @@ module PublicSuffix
 
       rules
     end
-    private :select # rubocop:disable Style/AccessModifierDeclarations
+    private :select
 
     # Gets the default rule.
     #

data/lib/public_suffix/rule.rb

@@ -4,7 +4,7 @@
 #
 # Domain name parser based on the Public Suffix List.
 #
-# Copyright (c) 2009-2019 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2020 Simone Carletti <weppos@weppos.net>
 
 module PublicSuffix
 
@@ -22,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

@@ -5,9 +5,9 @@
 #
 # Domain name parser based on the Public Suffix List.
 #
-# Copyright (c) 2009-2019 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2020 Simone Carletti <weppos@weppos.net>
 
 module PublicSuffix
   # The current library version.
-  VERSION = "3.1.1"
+  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

@@ -5,14 +5,14 @@ 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
@@ -34,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
@@ -49,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
@@ -72,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
@@ -90,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|
@@ -110,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

@@ -38,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

@@ -10,7 +10,7 @@ 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/public_suffix_test.rb

@@ -141,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
@@ -155,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
@@ -167,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
@@ -177,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

data/test/unit/rule_test.rb

@@ -70,36 +70,36 @@ class PublicSuffix::RuleBaseTest < Minitest::Test
 
   def test_match
     [
-        # standard match
-        [PublicSuffix::Rule.factory("uk"), "uk", true],
-        [PublicSuffix::Rule.factory("uk"), "example.uk", true],
-        [PublicSuffix::Rule.factory("uk"), "example.co.uk", true],
-        [PublicSuffix::Rule.factory("co.uk"), "example.co.uk", true],
-
-        # FIXME
-        # [PublicSuffix::Rule.factory("*.com"), "com", false],
-        [PublicSuffix::Rule.factory("*.com"), "example.com", true],
-        [PublicSuffix::Rule.factory("*.com"), "foo.example.com", true],
-        [PublicSuffix::Rule.factory("!example.com"), "com", false],
-        [PublicSuffix::Rule.factory("!example.com"), "example.com", true],
-        [PublicSuffix::Rule.factory("!example.com"), "foo.example.com", true],
-
-        # TLD mismatch
-        [PublicSuffix::Rule.factory("gk"), "example.uk", false],
-        [PublicSuffix::Rule.factory("gk"), "example.co.uk", false],
-        [PublicSuffix::Rule.factory("co.uk"), "uk", false],
-
-        # general mismatch
-        [PublicSuffix::Rule.factory("uk.co"), "example.co.uk", false],
-        [PublicSuffix::Rule.factory("go.uk"), "example.co.uk", false],
-        [PublicSuffix::Rule.factory("co.uk"), "uk", false],
-
-        # partial matches/mismatches
-        [PublicSuffix::Rule.factory("co"), "example.co.uk", false],
-        [PublicSuffix::Rule.factory("example"), "example.uk", false],
-        [PublicSuffix::Rule.factory("le.it"), "example.it", false],
-        [PublicSuffix::Rule.factory("le.it"), "le.it", true],
-        [PublicSuffix::Rule.factory("le.it"), "foo.le.it", true],
+      # standard match
+      [PublicSuffix::Rule.factory("uk"), "uk", true],
+      [PublicSuffix::Rule.factory("uk"), "example.uk", true],
+      [PublicSuffix::Rule.factory("uk"), "example.co.uk", true],
+      [PublicSuffix::Rule.factory("co.uk"), "example.co.uk", true],
+
+      # FIXME
+      # [PublicSuffix::Rule.factory("*.com"), "com", false],
+      [PublicSuffix::Rule.factory("*.com"), "example.com", true],
+      [PublicSuffix::Rule.factory("*.com"), "foo.example.com", true],
+      [PublicSuffix::Rule.factory("!example.com"), "com", false],
+      [PublicSuffix::Rule.factory("!example.com"), "example.com", true],
+      [PublicSuffix::Rule.factory("!example.com"), "foo.example.com", true],
+
+      # TLD mismatch
+      [PublicSuffix::Rule.factory("gk"), "example.uk", false],
+      [PublicSuffix::Rule.factory("gk"), "example.co.uk", false],
+      [PublicSuffix::Rule.factory("co.uk"), "uk", false],
+
+      # general mismatch
+      [PublicSuffix::Rule.factory("uk.co"), "example.co.uk", false],
+      [PublicSuffix::Rule.factory("go.uk"), "example.co.uk", false],
+      [PublicSuffix::Rule.factory("co.uk"), "uk", false],
+
+      # partial matches/mismatches
+      [PublicSuffix::Rule.factory("co"), "example.co.uk", false],
+      [PublicSuffix::Rule.factory("example"), "example.uk", false],
+      [PublicSuffix::Rule.factory("le.it"), "example.it", false],
+      [PublicSuffix::Rule.factory("le.it"), "le.it", true],
+      [PublicSuffix::Rule.factory("le.it"), "foo.le.it", true],
 
     ].each do |rule, input, expected|
       assert_equal expected, rule.match?(input)

metadata

@@ -1,57 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: public_suffix
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 4.0.6
 platform: ruby
 authors:
 - Simone Carletti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-25 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2020-09-02 00:00:00.000000000 Z
+dependencies: []
 description: PublicSuffix can parse and decompose a domain name into top level domain,
   domain and subdomains.
 email:
@@ -61,10 +19,11 @@ extensions: []
 extra_rdoc_files:
 - LICENSE.txt
 files:
+- ".github/FUNDING.yml"
+- ".github/workflows/tests.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".rubocop_defaults.yml"
-- ".ruby-gemset"
+- ".rubocop_opinionated.yml"
 - ".travis.yml"
 - ".yardopts"
 - 2.0-Upgrade.md
@@ -73,7 +32,9 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- SECURITY.md
 - bin/console
+- codecov.yml
 - data/list.txt
 - lib/public_suffix.rb
 - lib/public_suffix/domain.rb
@@ -107,7 +68,12 @@ files:
 homepage: https://simonecarletti.com/code/publicsuffix-ruby
 licenses:
 - MIT
-metadata: {}
+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/public_suffix/4.0.6
+  homepage_uri: https://simonecarletti.com/code/publicsuffix-ruby
+  source_code_uri: https://github.com/weppos/publicsuffix-ruby/tree/v4.0.6
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -116,14 +82,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Domain name parser based on the Public Suffix List.