public_suffix 4.0.7 → 5.0.1

data/lib/public_suffix/list.rb

@@ -87,7 +87,7 @@ module PublicSuffix
             section = 2
 
           # skip comments
-          when line.start_with?(comment_token)
+          when line.start_with?(comment_token) # rubocop:disable Lint/DuplicateBranch
             next
 
           else

data/lib/public_suffix/rule.rb

@@ -125,7 +125,7 @@ module PublicSuffix
       # @param  private [Boolean]
       def initialize(value:, length: nil, private: false)
         @value    = value.to_s
-        @length   = length || @value.count(DOT) + 1
+        @length   = length || (@value.count(DOT) + 1)
         @private  = private
       end
 
@@ -161,7 +161,7 @@ module PublicSuffix
       # @param  name [String] the domain name to check
       # @return [Boolean]
       def match?(name)
-        # Note: it works because of the assumption there are no
+        # NOTE: it works because of the assumption there are no
         # rules like foo.*.com. If the assumption is incorrect,
         # we need to properly walk the input and skip parts according
         # to wildcard component.
@@ -221,7 +221,7 @@ module PublicSuffix
       # @param  content [String] the content of the rule
       # @param  private [Boolean]
       def self.build(content, private: false)
-        new(value: content.to_s[2..-1], private: private)
+        new(value: content.to_s[2..], private: private)
       end
 
       # Initializes a new rule.
@@ -269,7 +269,7 @@ module PublicSuffix
       # @param  content [#to_s] the content of the rule
       # @param  private [Boolean]
       def self.build(content, private: false)
-        new(value: content.to_s[1..-1], private: private)
+        new(value: content.to_s[1..], private: private)
       end
 
       # Gets the original rule definition.
@@ -299,7 +299,7 @@ module PublicSuffix
       #
       # @return [Array<String>]
       def parts
-        @value.split(DOT)[1..-1]
+        @value.split(DOT)[1..]
       end
 
     end

data/lib/public_suffix/version.rb

@@ -10,6 +10,6 @@
 module PublicSuffix
 
   # @return [String] The current library version.
-  VERSION = "4.0.7"
+  VERSION = "5.0.1"
 
 end

data/lib/public_suffix.rb

@@ -169,7 +169,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?("://")
+    return DomainInvalid.new(format("%s is not expected to contain a scheme", name)) if name.include?("://")
 
     name
   end

data/public_suffix.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
     "source_code_uri" => "https://github.com/weppos/publicsuffix-ruby/tree/v#{s.version}",
   }
 
-  s.required_ruby_version = ">= 2.3"
+  s.required_ruby_version = ">= 2.6"
 
   s.require_paths    = ["lib"]
   s.files            = `git ls-files`.split("\n")

data/test/acceptance_test.rb

@@ -64,7 +64,7 @@ class AcceptanceTest < Minitest::Test
   def test_rejected
     REJECTED_CASES.each do |name, expected|
       assert_equal expected, PublicSuffix.valid?(name),
-                   "Expected %s to be %s" % [name.inspect, expected.inspect]
+                   format("Expected %s to be %s", name.inspect, expected.inspect)
       assert !valid_domain?(name),
              "#{name} expected to be invalid"
     end
@@ -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

data/test/psl_test.rb

@@ -45,7 +45,7 @@ class PslTest < Minitest::Test
     end
 
     message = "The following #{failures.size} tests fail:\n"
-    failures.each { |i, o, d| message += "Expected %s to be %s, got %s\n" % [i.inspect, o.inspect, d.inspect] }
+    failures.each { |i, o, d| message += format("Expected %s to be %s, got %s\n", i.inspect, o.inspect, d.inspect) }
     assert_equal 0, failures.size, message
   end
 

data/test/unit/domain_test.rb

@@ -10,15 +10,15 @@ class PublicSuffix::DomainTest < Minitest::Test
 
   # Tokenizes given input into labels.
   def test_self_name_to_labels
-    assert_equal  %w( someone spaces live com ),
+    assert_equal  %w[someone spaces live com],
                   PublicSuffix::Domain.name_to_labels("someone.spaces.live.com")
-    assert_equal  %w( leontina23samiko wiki zoho com ),
+    assert_equal  %w[leontina23samiko wiki zoho com],
                   PublicSuffix::Domain.name_to_labels("leontina23samiko.wiki.zoho.com")
   end
 
   # Converts input into String.
   def test_self_name_to_labels_converts_input_to_string
-    assert_equal  %w( someone spaces live com ),
+    assert_equal  %w[someone spaces live com],
                   PublicSuffix::Domain.name_to_labels(:"someone.spaces.live.com")
   end
 

data/test/unit/list_test.rb

@@ -214,7 +214,7 @@ LIST
     assert_instance_of PublicSuffix::List, list
     assert_equal 4, list.size
 
-    rules = %w( com *.uk !british-library.uk blogspot.com ).map { |name| PublicSuffix::Rule.factory(name) }
+    rules = %w[com *.uk !british-library.uk blogspot.com].map { |name| PublicSuffix::Rule.factory(name) }
     assert_equal rules, list.each.to_a
 
     # private domains

data/test/unit/rule_test.rb

@@ -29,8 +29,8 @@ class PublicSuffix::RuleTest < Minitest::Test
   def test_default_returns_default_wildcard
     default = PublicSuffix::Rule.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")
+    assert_equal %w[example tldnotlisted], default.decompose("example.tldnotlisted")
+    assert_equal %w[www.example tldnotlisted], default.decompose("www.example.tldnotlisted")
   end
 
 end
@@ -140,15 +140,15 @@ class PublicSuffix::RuleNormalTest < Minitest::Test
   end
 
   def test_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
+    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.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")
+    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
@@ -175,14 +175,14 @@ class PublicSuffix::RuleExceptionTest < Minitest::Test
   end
 
   def test_parts
-    assert_equal %w( uk ), @klass.build("!british-library.uk").parts
-    assert_equal %w( tokyo jp ), @klass.build("!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.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")
+    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
@@ -209,14 +209,14 @@ class PublicSuffix::RuleWildcardTest < Minitest::Test
   end
 
   def test_parts
-    assert_equal %w( uk ), @klass.build("*.uk").parts
-    assert_equal %w( co uk ), @klass.build("*.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.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")
+    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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: public_suffix
 version: !ruby/object:Gem::Version
-  version: 4.0.7
+  version: 5.0.1
 platform: ruby
 authors:
 - Simone Carletti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-12 00:00:00.000000000 Z
+date: 2022-12-07 00:00:00.000000000 Z
 dependencies: []
 description: PublicSuffix can parse and decompose a domain name into top level domain,
   domain and subdomains.
@@ -21,6 +21,7 @@ extra_rdoc_files:
 files:
 - ".github/FUNDING.yml"
 - ".github/dependabot.yml"
+- ".github/workflows/psl-update.yml"
 - ".github/workflows/release.yml"
 - ".github/workflows/tests.yml"
 - ".gitignore"
@@ -71,9 +72,9 @@ licenses:
 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
+  documentation_uri: https://rubydoc.info/gems/public_suffix/5.0.1
   homepage_uri: https://simonecarletti.com/code/publicsuffix-ruby
-  source_code_uri: https://github.com/weppos/publicsuffix-ruby/tree/v4.0.7
+  source_code_uri: https://github.com/weppos/publicsuffix-ruby/tree/v5.0.1
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -82,14 +83,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Domain name parser based on the Public Suffix List.