public_suffix 2.0.5 → 4.0.7

data/test/unit/public_suffix_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 class PublicSuffixTest < Minitest::Test
@@ -13,7 +15,7 @@ class PublicSuffixTest < Minitest::Test
     domain = PublicSuffix.parse("www.example.blogspot.com")
     assert_equal "com", domain.tld
   ensure
-    PublicSuffix::List.clear
+    PublicSuffix::List.default = nil
   end
 
 
@@ -22,13 +24,13 @@ class PublicSuffixTest < Minitest::Test
     assert_instance_of PublicSuffix::Domain, domain
     assert_equal "com",     domain.tld
     assert_equal "example", domain.sld
-    assert_equal nil,       domain.trd
+    assert_nil              domain.trd
 
     domain = PublicSuffix.parse("example.co.uk")
     assert_instance_of PublicSuffix::Domain, domain
     assert_equal "co.uk",   domain.tld
     assert_equal "example", domain.sld
-    assert_equal nil,       domain.trd
+    assert_nil              domain.trd
   end
 
   def test_self_parse_a_domain_with_tld_and_sld_and_trd
@@ -83,12 +85,12 @@ class PublicSuffixTest < Minitest::Test
     assert_instance_of PublicSuffix::Domain, domain
     assert_equal "tldnotlisted",    domain.tld
     assert_equal "example",         domain.sld
-    assert_equal nil,               domain.trd
+    assert_nil                      domain.trd
   end
 
   def test_self_parse_with_unallowed_domain
-    error = assert_raises(PublicSuffix::DomainNotAllowed) { PublicSuffix.parse("example.ke") }
-    assert_match(/example\.ke/, error.message)
+    error = assert_raises(PublicSuffix::DomainNotAllowed) { PublicSuffix.parse("example.bd") }
+    assert_match(/example\.bd/, error.message)
   end
 
   def test_self_parse_with_uri
@@ -128,7 +130,7 @@ class PublicSuffixTest < Minitest::Test
   end
 
   def test_self_domain_with_unallowed_name
-    assert_nil PublicSuffix.domain("example.ke")
+    assert_nil PublicSuffix.domain("example.bd")
   end
 
   def test_self_domain_with_blank_sld
@@ -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,10 +155,10 @@ class PublicSuffixTest < Minitest::Test
 
   def test_normalize_blank
     [
-        nil,
-        "",
-        " ",
-    ].each do |input, _|
+      nil,
+      "",
+      " ",
+    ].each do |input|
       error = PublicSuffix.normalize(input)
       assert_instance_of PublicSuffix::DomainInvalid, error
       assert_equal "Name is blank", error.message
@@ -165,18 +167,18 @@ class PublicSuffixTest < Minitest::Test
 
   def test_normalize_scheme
     [
-        "https://google.com",
-    ].each do |input, _|
+      "https://google.com",
+    ].each do |input|
       error = PublicSuffix.normalize(input)
       assert_instance_of PublicSuffix::DomainInvalid, error
-      assert_match /scheme/, error.message
+      assert_match(/scheme/, error.message)
     end
   end
 
   def test_normalize_leading_dot
     [
-        ".google.com",
-    ].each do |input, _|
+      ".google.com",
+    ].each do |input|
       error = PublicSuffix.normalize(input)
       assert_instance_of PublicSuffix::DomainInvalid, error
       assert_match "Name starts with a dot", error.message

data/test/unit/rule_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 class PublicSuffix::RuleTest < Minitest::Test
@@ -26,7 +28,7 @@ class PublicSuffix::RuleTest < Minitest::Test
 
   def test_default_returns_default_wildcard
     default = PublicSuffix::Rule.default
-    assert_equal PublicSuffix::Rule::Wildcard.new("*"), default
+    assert_equal PublicSuffix::Rule::Wildcard.build("*"), default
     assert_equal %w( example tldnotlisted ), default.decompose("example.tldnotlisted")
     assert_equal %w( www.example tldnotlisted ), default.decompose("www.example.tldnotlisted")
   end
@@ -45,59 +47,59 @@ class PublicSuffix::RuleBaseTest < Minitest::Test
 
 
   def test_initialize
-    rule = @klass.new("verona.it")
-    assert_instance_of @klass,          rule
-    assert_equal "verona.it",           rule.value
+    rule = @klass.new(value: "verona.it")
+    assert_instance_of @klass,  rule
+    assert_equal "verona.it",   rule.value
   end
 
 
   def test_equality_with_self
-    rule = PublicSuffix::Rule::Base.new("foo")
+    rule = PublicSuffix::Rule::Base.new(value: "foo")
     assert_equal rule, rule
   end
 
   # rubocop:disable Style/SingleLineMethods
   def test_equality_with_internals
-    assert_equal      @klass.new("foo"), @klass.new("foo")
-    assert_not_equal  @klass.new("foo"), @klass.new("bar")
-    assert_not_equal  @klass.new("foo"), PublicSuffix::Rule::Test.new("foo")
-    assert_not_equal  @klass.new("foo"), PublicSuffix::Rule::Test.new("bar")
-    assert_not_equal  @klass.new("foo"), Class.new { def name; foo; end }.new
+    assert_equal @klass.new(value: "foo"), @klass.new(value: "foo")
+    refute_equal @klass.new(value: "foo"), @klass.new(value: "bar")
+    refute_equal @klass.new(value: "foo"), PublicSuffix::Rule::Test.new(value: "foo")
+    refute_equal @klass.new(value: "foo"), PublicSuffix::Rule::Test.new(value: "bar")
+    refute_equal @klass.new(value: "foo"), Class.new { def name; foo; end }.new
   end
   # rubocop:enable Style/SingleLineMethods
 
   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)
@@ -105,16 +107,12 @@ class PublicSuffix::RuleBaseTest < Minitest::Test
   end
 
 
-  def test_length
-    assert_raises(NotImplementedError) { @klass.new("com").length }
-  end
-
   def test_parts
-    assert_raises(NotImplementedError) { @klass.new("com").parts }
+    assert_raises(NotImplementedError) { @klass.new(value: "com").parts }
   end
 
   def test_decompose
-    assert_raises(NotImplementedError) { @klass.new("com").decompose("google.com") }
+    assert_raises(NotImplementedError) { @klass.new(value: "com").decompose("google.com") }
   end
 
 end
@@ -127,8 +125,8 @@ class PublicSuffix::RuleNormalTest < Minitest::Test
   end
 
 
-  def test_initialize
-    rule = @klass.new("verona.it")
+  def test_build
+    rule = @klass.build("verona.it")
     assert_instance_of @klass,              rule
     assert_equal "verona.it",               rule.value
     assert_equal "verona.it",               rule.rule
@@ -136,21 +134,21 @@ class PublicSuffix::RuleNormalTest < Minitest::Test
 
 
   def test_length
-    assert_equal 1, @klass.new("com").length
-    assert_equal 2, @klass.new("co.com").length
-    assert_equal 3, @klass.new("mx.co.com").length
+    assert_equal 1, @klass.build("com").length
+    assert_equal 2, @klass.build("co.com").length
+    assert_equal 3, @klass.build("mx.co.com").length
   end
 
   def test_parts
-    assert_equal %w(com), @klass.new("com").parts
-    assert_equal %w(co com), @klass.new("co.com").parts
-    assert_equal %w(mx co com), @klass.new("mx.co.com").parts
+    assert_equal %w(com), @klass.build("com").parts
+    assert_equal %w(co com), @klass.build("co.com").parts
+    assert_equal %w(mx co com), @klass.build("mx.co.com").parts
   end
 
   def test_decompose
-    assert_equal [nil, nil], @klass.new("com").decompose("com")
-    assert_equal %w( example com ), @klass.new("com").decompose("example.com")
-    assert_equal %w( foo.example com ), @klass.new("com").decompose("foo.example.com")
+    assert_equal [nil, nil], @klass.build("com").decompose("com")
+    assert_equal %w( example com ), @klass.build("com").decompose("example.com")
+    assert_equal %w( foo.example com ), @klass.build("com").decompose("foo.example.com")
   end
 
 end
@@ -164,27 +162,27 @@ class PublicSuffix::RuleExceptionTest < Minitest::Test
 
 
   def test_initialize
-    rule = @klass.new("!british-library.uk")
-    assert_instance_of @klass,                    rule
-    assert_equal "british-library.uk",            rule.value
-    assert_equal "!british-library.uk",           rule.rule
+    rule = @klass.build("!british-library.uk")
+    assert_instance_of @klass, rule
+    assert_equal "british-library.uk", rule.value
+    assert_equal "!british-library.uk", rule.rule
   end
 
 
   def test_length
-    assert_equal 1, @klass.new("!british-library.uk").length
-    assert_equal 2, @klass.new("!foo.british-library.uk").length
+    assert_equal 2, @klass.build("!british-library.uk").length
+    assert_equal 3, @klass.build("!foo.british-library.uk").length
   end
 
   def test_parts
-    assert_equal %w( uk ), @klass.new("!british-library.uk").parts
-    assert_equal %w( tokyo jp ), @klass.new("!metro.tokyo.jp").parts
+    assert_equal %w( uk ), @klass.build("!british-library.uk").parts
+    assert_equal %w( tokyo jp ), @klass.build("!metro.tokyo.jp").parts
   end
 
   def test_decompose
-    assert_equal [nil, nil], @klass.new("!british-library.uk").decompose("uk")
-    assert_equal %w( british-library uk ), @klass.new("!british-library.uk").decompose("british-library.uk")
-    assert_equal %w( foo.british-library uk ), @klass.new("!british-library.uk").decompose("foo.british-library.uk")
+    assert_equal [nil, nil], @klass.build("!british-library.uk").decompose("uk")
+    assert_equal %w( british-library uk ), @klass.build("!british-library.uk").decompose("british-library.uk")
+    assert_equal %w( foo.british-library uk ), @klass.build("!british-library.uk").decompose("foo.british-library.uk")
   end
 
 end
@@ -198,27 +196,27 @@ class PublicSuffix::RuleWildcardTest < Minitest::Test
 
 
   def test_initialize
-    rule = @klass.new("*.aichi.jp")
-    assert_instance_of @klass,              rule
-    assert_equal "aichi.jp",                rule.value
-    assert_equal "*.aichi.jp",              rule.rule
+    rule = @klass.build("*.aichi.jp")
+    assert_instance_of @klass, rule
+    assert_equal "aichi.jp", rule.value
+    assert_equal "*.aichi.jp", rule.rule
   end
 
 
   def test_length
-    assert_equal 2, @klass.new("*.uk").length
-    assert_equal 3, @klass.new("*.co.uk").length
+    assert_equal 2, @klass.build("*.uk").length
+    assert_equal 3, @klass.build("*.co.uk").length
   end
 
   def test_parts
-    assert_equal %w( uk ), @klass.new("*.uk").parts
-    assert_equal %w( co uk ), @klass.new("*.co.uk").parts
+    assert_equal %w( uk ), @klass.build("*.uk").parts
+    assert_equal %w( co uk ), @klass.build("*.co.uk").parts
   end
 
   def test_decompose
-    assert_equal [nil, nil], @klass.new("*.do").decompose("nic.do")
-    assert_equal %w( google co.uk ), @klass.new("*.uk").decompose("google.co.uk")
-    assert_equal %w( foo.google co.uk ), @klass.new("*.uk").decompose("foo.google.co.uk")
+    assert_equal [nil, nil], @klass.build("*.do").decompose("nic.do")
+    assert_equal %w( google co.uk ), @klass.build("*.uk").decompose("google.co.uk")
+    assert_equal %w( foo.google co.uk ), @klass.build("*.uk").decompose("foo.google.co.uk")
   end
 
 end

metadata

@@ -1,57 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: public_suffix
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 4.0.7
 platform: ruby
 authors:
 - Simone Carletti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-02 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: 2022-04-12 00:00:00.000000000 Z
+dependencies: []
 description: PublicSuffix can parse and decompose a domain name into top level domain,
   domain and subdomains.
 email:
@@ -61,11 +19,13 @@ extensions: []
 extra_rdoc_files:
 - LICENSE.txt
 files:
+- ".github/FUNDING.yml"
+- ".github/dependabot.yml"
+- ".github/workflows/release.yml"
+- ".github/workflows/tests.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".rubocop_defaults.yml"
-- ".ruby-gemset"
-- ".travis.yml"
+- ".rubocop_opinionated.yml"
 - ".yardopts"
 - 2.0-Upgrade.md
 - CHANGELOG.md
@@ -73,6 +33,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- SECURITY.md
+- bin/console
 - data/list.txt
 - lib/public_suffix.rb
 - lib/public_suffix/domain.rb
@@ -81,11 +43,20 @@ files:
 - lib/public_suffix/rule.rb
 - lib/public_suffix/version.rb
 - public_suffix.gemspec
+- test/.empty
 - test/acceptance_test.rb
-- test/benchmark_helper.rb
-- test/execution_profiler.rb
-- test/initialization_profiler.rb
-- test/performance_benchmark.rb
+- test/benchmarks/bm_find.rb
+- test/benchmarks/bm_find_all.rb
+- test/benchmarks/bm_names.rb
+- test/benchmarks/bm_select.rb
+- test/benchmarks/bm_select_incremental.rb
+- test/benchmarks/bm_valid.rb
+- test/profilers/domain_profiler.rb
+- test/profilers/find_profiler.rb
+- test/profilers/find_profiler_jp.rb
+- test/profilers/initialization_profiler.rb
+- test/profilers/list_profsize.rb
+- test/profilers/object_binsize.rb
 - test/psl_test.rb
 - test/test_helper.rb
 - test/tests.txt
@@ -97,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.7
+  homepage_uri: https://simonecarletti.com/code/publicsuffix-ruby
+  source_code_uri: https://github.com/weppos/publicsuffix-ruby/tree/v4.0.7
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -106,29 +82,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Domain name parser based on the Public Suffix List.
-test_files:
-- test/acceptance_test.rb
-- test/benchmark_helper.rb
-- test/execution_profiler.rb
-- test/initialization_profiler.rb
-- test/performance_benchmark.rb
-- test/psl_test.rb
-- test/test_helper.rb
-- test/tests.txt
-- test/unit/domain_test.rb
-- test/unit/errors_test.rb
-- test/unit/list_test.rb
-- test/unit/public_suffix_test.rb
-- test/unit/rule_test.rb
+test_files: []

data/.ruby-gemset

@@ -1 +0,0 @@
-publicsuffix

data/.travis.yml

@@ -1,23 +0,0 @@
-language: ruby
-
-rvm:
-  - 2.0
-  - 2.1
-  - 2.2
-  - 2.3.0
-  - jruby-9.0.5.0
-  - ruby-head
-
-before_install:
-  - gem install bundler
-
-cache:
-  - bundler
-
-env:
-  - COVERALL=1
-
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-9.0.5.0

data/test/benchmark_helper.rb

@@ -1,4 +0,0 @@
-require "benchmark"
-
-$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
-require "public_suffix"

data/test/execution_profiler.rb

@@ -1,14 +0,0 @@
-$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
-
-require "memory_profiler"
-require "public_suffix"
-
-PublicSuffix::List.default
-
-report = MemoryProfiler.report do
-  PublicSuffix.domain("www.example.com")
-  PublicSuffix.domain("a.b.ide.kyoto.jp")
-end
-
-report.pretty_print
-# report.pretty_print(to_file: 'profiler-%s-%d.txt' % [ARGV[0], Time.now.to_i])

data/test/performance_benchmark.rb

@@ -1,38 +0,0 @@
-require_relative "benchmark_helper"
-
-iterations = 100_000
-
-# force load
-list = PublicSuffix::List.default
-
-Benchmark.bmbm do |bm|
-  bm.report "Top level TLD" do
-    iterations.times do
-      PublicSuffix.domain("example.com", list)
-    end
-  end
-
-  bm.report "Top level TLD (subdomain)" do
-    iterations.times do
-      PublicSuffix.domain("www.example.com", list)
-    end
-  end
-
-  bm.report "Unlisted TLD" do
-    iterations.times do
-      PublicSuffix.domain("example.example", list)
-    end
-  end
-
-  bm.report "Unlisted TLD (subdomain)" do
-    iterations.times do
-      PublicSuffix.domain("www.example.example", list)
-    end
-  end
-
-  bm.report "Crazy suffix" do
-    iterations.times do
-      PublicSuffix.domain("a.b.ide.kyoto.jp", list)
-    end
-  end
-end