public_suffix 1.5.3 → 2.0.0

data/test/unit/rule_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 class PublicSuffix::RuleTest < Minitest::Unit::TestCase
 
@@ -23,6 +23,14 @@ class PublicSuffix::RuleTest < Minitest::Unit::TestCase
     assert_instance_of PublicSuffix::Rule::Wildcard, rule
   end
 
+
+  def test_default_returns_default_wildcard
+    default = PublicSuffix::Rule.default
+    assert_equal PublicSuffix::Rule::Wildcard.new("*"), default
+    assert_equal %w( example tldnotlisted ), default.decompose("example.tldnotlisted")
+    assert_equal %w( www.example tldnotlisted ), default.decompose("www.example.tldnotlisted")
+  end
+
 end
 
 
@@ -39,40 +47,64 @@ class PublicSuffix::RuleBaseTest < Minitest::Unit::TestCase
   def test_initialize
     rule = @klass.new("verona.it")
     assert_instance_of @klass,          rule
-
-    assert_equal :base,                 rule.type
-    assert_equal "verona.it",           rule.name
     assert_equal "verona.it",           rule.value
-    assert_equal %w(verona it).reverse, rule.labels
   end
 
+
   def test_equality_with_self
     rule = PublicSuffix::Rule::Base.new("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
   end
-
+  # rubocop:enable Style/SingleLineMethods
 
   def test_match
-    assert  @klass.new("uk").match?("example.uk")
-    assert !@klass.new("gk").match?("example.uk")
-    assert !@klass.new("example").match?("example.uk")
-
-    assert  @klass.new("uk").match?("example.co.uk")
-    assert !@klass.new("gk").match?("example.co.uk")
-    assert !@klass.new("co").match?("example.co.uk")
-
-    assert  @klass.new("co.uk").match?("example.co.uk")
-    assert !@klass.new("uk.co").match?("example.co.uk")
-    assert !@klass.new("go.uk").match?("example.co.uk")
+    [
+        # 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)
+    end
   end
 
+
   def test_length
     assert_raises(NotImplementedError) { @klass.new("com").length }
   end
@@ -98,43 +130,8 @@ class PublicSuffix::RuleNormalTest < Minitest::Unit::TestCase
   def test_initialize
     rule = @klass.new("verona.it")
     assert_instance_of @klass,              rule
-    assert_equal :normal,                   rule.type
-    assert_equal "verona.it",               rule.name
     assert_equal "verona.it",               rule.value
-    assert_equal %w(verona it).reverse,     rule.labels
-  end
-
-
-  def test_match
-    assert  @klass.new("uk").match?("example.uk")
-    assert !@klass.new("gk").match?("example.uk")
-    assert !@klass.new("example").match?("example.uk")
-
-    assert  @klass.new("uk").match?("example.co.uk")
-    assert !@klass.new("gk").match?("example.co.uk")
-    assert !@klass.new("co").match?("example.co.uk")
-
-    assert  @klass.new("co.uk").match?("example.co.uk")
-    assert !@klass.new("uk.co").match?("example.co.uk")
-    assert !@klass.new("go.uk").match?("example.co.uk")
-  end
-
-  def test_match_with_fully_qualified_domain_name
-    assert  @klass.new("com").match?("com.")
-    assert  @klass.new("com").match?("example.com.")
-    assert  @klass.new("com").match?("www.example.com.")
-  end
-
-  def test_allow
-    assert !@klass.new("com").allow?("com")
-    assert  @klass.new("com").allow?("example.com")
-    assert  @klass.new("com").allow?("www.example.com")
-  end
-
-  def test_allow_with_fully_qualified_domain_name
-    assert !@klass.new("com").allow?("com.")
-    assert  @klass.new("com").allow?("example.com.")
-    assert  @klass.new("com").allow?("www.example.com.")
+    assert_equal "verona.it",               rule.rule
   end
 
 
@@ -156,12 +153,6 @@ class PublicSuffix::RuleNormalTest < Minitest::Unit::TestCase
     assert_equal %w( foo.example com ), @klass.new("com").decompose("foo.example.com")
   end
 
-  def test_decompose_with_fully_qualified_domain_name
-    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.")
-  end
-
 end
 
 
@@ -175,39 +166,8 @@ class PublicSuffix::RuleExceptionTest < Minitest::Unit::TestCase
   def test_initialize
     rule = @klass.new("!british-library.uk")
     assert_instance_of @klass,                    rule
-    assert_equal :exception,                      rule.type
-    assert_equal "!british-library.uk",           rule.name
     assert_equal "british-library.uk",            rule.value
-    assert_equal %w(british-library uk).reverse,  rule.labels
-  end
-
-
-  def test_match
-    assert  @klass.new("!uk").match?("example.co.uk")
-    assert !@klass.new("!gk").match?("example.co.uk")
-    assert  @klass.new("!co.uk").match?("example.co.uk")
-    assert !@klass.new("!go.uk").match?("example.co.uk")
-    assert  @klass.new("!british-library.uk").match?("british-library.uk")
-    assert !@klass.new("!british-library.uk").match?("example.co.uk")
-  end
-
-  def test_match_with_fully_qualified_domain_name
-    assert  @klass.new("!uk").match?("uk.")
-    assert  @klass.new("!uk").match?("co.uk.")
-    assert  @klass.new("!uk").match?("example.co.uk.")
-    assert  @klass.new("!uk").match?("www.example.co.uk.")
-  end
-
-  def test_allow
-    assert !@klass.new("!british-library.uk").allow?("uk")
-    assert  @klass.new("!british-library.uk").allow?("british-library.uk")
-    assert  @klass.new("!british-library.uk").allow?("www.british-library.uk")
-  end
-
-  def test_allow_with_fully_qualified_domain_name
-    assert !@klass.new("!british-library.uk").allow?("uk.")
-    assert  @klass.new("!british-library.uk").allow?("british-library.uk.")
-    assert  @klass.new("!british-library.uk").allow?("www.british-library.uk.")
+    assert_equal "!british-library.uk",           rule.rule
   end
 
 
@@ -227,12 +187,6 @@ class PublicSuffix::RuleExceptionTest < Minitest::Unit::TestCase
     assert_equal %w( foo.british-library uk ), @klass.new("!british-library.uk").decompose("foo.british-library.uk")
   end
 
-  def test_decompose_with_fully_qualified_domain_name
-    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.")
-  end
-
 end
 
 
@@ -246,39 +200,8 @@ class PublicSuffix::RuleWildcardTest < Minitest::Unit::TestCase
   def test_initialize
     rule = @klass.new("*.aichi.jp")
     assert_instance_of @klass,              rule
-    assert_equal :wildcard,                 rule.type
-    assert_equal "*.aichi.jp",              rule.name
     assert_equal "aichi.jp",                rule.value
-    assert_equal %w(aichi jp).reverse,      rule.labels
-  end
-
-
-  def test_match
-    assert  @klass.new("*.uk").match?("example.uk")
-    assert  @klass.new("*.uk").match?("example.co.uk")
-    assert  @klass.new("*.co.uk").match?("example.co.uk")
-    assert !@klass.new("*.go.uk").match?("example.co.uk")
-  end
-
-  def test_match_with_fully_qualified_domain_name
-    assert  @klass.new("*.uk").match?("uk.")
-    assert  @klass.new("*.uk").match?("co.uk.")
-    assert  @klass.new("*.uk").match?("example.co.uk.")
-    assert  @klass.new("*.uk").match?("www.example.co.uk.")
-  end
-
-  def test_allow
-    assert !@klass.new("*.uk").allow?("uk")
-    assert !@klass.new("*.uk").allow?("co.uk")
-    assert  @klass.new("*.uk").allow?("example.co.uk")
-    assert  @klass.new("*.uk").allow?("www.example.co.uk")
-  end
-
-  def test_allow_with_fully_qualified_domain_name
-    assert !@klass.new("*.uk").allow?("uk.")
-    assert !@klass.new("*.uk").allow?("co.uk.")
-    assert  @klass.new("*.uk").allow?("example.co.uk.")
-    assert  @klass.new("*.uk").allow?("www.example.co.uk.")
+    assert_equal "*.aichi.jp",              rule.rule
   end
 
 
@@ -298,10 +221,4 @@ class PublicSuffix::RuleWildcardTest < Minitest::Unit::TestCase
     assert_equal %w( foo.google co.uk ), @klass.new("*.uk").decompose("foo.google.co.uk")
   end
 
-  def test_decompose_with_fully_qualified_domain_name
-    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.")
-  end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: public_suffix
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 2.0.0
 platform: ruby
 authors:
 - Simone Carletti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-14 00:00:00.000000000 Z
+date: 2016-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -59,17 +59,19 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gemtest"
 - ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_defaults.yml"
 - ".ruby-gemset"
 - ".travis.yml"
 - ".yardopts"
+- 2.0-Upgrade.md
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- data/definitions.txt
+- data/list.txt
 - lib/public_suffix.rb
 - lib/public_suffix/domain.rb
 - lib/public_suffix/errors.rb
@@ -78,13 +80,19 @@ files:
 - lib/public_suffix/version.rb
 - public_suffix.gemspec
 - 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
-homepage: http://simonecarletti.com/code/publicsuffix
+homepage: https://simonecarletti.com/code/publicsuffix-ruby
 licenses:
 - MIT
 metadata: {}
@@ -104,13 +112,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.5.1
 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