public_suffix 1.4.6 → 1.5.0

data/public_suffix.gemspec

@@ -1,21 +1,21 @@
 # -*- encoding: utf-8 -*-
-# stub: public_suffix 1.4.5 ruby lib
+# stub: public_suffix 1.4.6 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "public_suffix"
-  s.version = "1.4.5"
+  s.version = "1.4.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Simone Carletti"]
-  s.date = "2014-08-18"
+  s.date = "2015-03-24"
   s.description = "PublicSuffix can parse and decompose a domain name into top level domain, domain and subdomains."
   s.email = "weppos@weppos.net"
-  s.files = [".gemtest", ".gitignore", ".travis.yml", ".yardopts", "CHANGELOG.md", "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "lib/definitions.txt", "lib/public_suffix.rb", "lib/public_suffix/domain.rb", "lib/public_suffix/errors.rb", "lib/public_suffix/list.rb", "lib/public_suffix/rule.rb", "lib/public_suffix/version.rb", "public_suffix.gemspec", "test/acceptance_test.rb", "test/test_helper.rb", "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"]
+  s.files = [".gemtest", ".gitignore", ".ruby-gemset", ".travis.yml", ".yardopts", "CHANGELOG.md", "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "data/definitions.txt", "lib/public_suffix.rb", "lib/public_suffix/domain.rb", "lib/public_suffix/errors.rb", "lib/public_suffix/list.rb", "lib/public_suffix/rule.rb", "lib/public_suffix/version.rb", "public_suffix.gemspec", "test/acceptance_test.rb", "test/test_helper.rb", "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"]
   s.homepage = "http://simonecarletti.com/code/publicsuffix"
   s.licenses = ["MIT"]
-  s.required_ruby_version = Gem::Requirement.new(">= 1.9.3")
-  s.rubygems_version = "2.2.2"
+  s.required_ruby_version = Gem::Requirement.new(">= 2.0")
+  s.rubygems_version = "2.4.5"
   s.summary = "Domain name parser based on the Public Suffix List."
   s.test_files = ["test/acceptance_test.rb", "test/test_helper.rb", "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"]
 

data/test/acceptance_test.rb

@@ -2,16 +2,16 @@ require 'test_helper'
 
 class AcceptanceTest < Test::Unit::TestCase
 
-  ValidCases = {
-    "google.com" => [nil, "google", "com"],
-    "foo.google.com" => ["foo", "google", "com"],
+  ValidCases = [
+      ["google.com",              [nil, "google", "com"]],
+      ["foo.google.com",          ["foo", "google", "com"]],
 
-    "verybritish.co.uk" => [nil, "verybritish", "co.uk"],
-    "foo.verybritish.co.uk" => ["foo", "verybritish", "co.uk"],
+      ["verybritish.co.uk",       [nil, "verybritish", "co.uk"]],
+      ["foo.verybritish.co.uk",   ["foo", "verybritish", "co.uk"]],
 
-    "parliament.uk" => [nil, "parliament", "uk"],
-    "foo.parliament.uk" => ["foo", "parliament", "uk"],
-  }
+      ["parliament.uk",           [nil, "parliament", "uk"]],
+      ["foo.parliament.uk",       ["foo", "parliament", "uk"]],
+  ]
 
   def test_valid
     ValidCases.each do |name, results|
@@ -24,19 +24,55 @@ class AcceptanceTest < Test::Unit::TestCase
     end
   end
 
+
   InvalidCases = [
-    ["nic.ke",                  PublicSuffix::DomainNotAllowed],
-    ["http://www.google.com",   PublicSuffix::DomainInvalid],
-    [nil,                       PublicSuffix::DomainInvalid],
-    ["",                        PublicSuffix::DomainInvalid],
-    ["  ",                      PublicSuffix::DomainInvalid],
+      ["nic.ke",                  PublicSuffix::DomainNotAllowed],
+      [nil,                       PublicSuffix::DomainInvalid],
+      ["",                        PublicSuffix::DomainInvalid],
+      ["  ",                      PublicSuffix::DomainInvalid],
   ]
 
   def test_invalid
     InvalidCases.each do |(name, error)|
-      assert_raise(error) { PublicSuffix.parse(name) }
+      assert_raises(error) { PublicSuffix.parse(name) }
       assert !PublicSuffix.valid?(name)
     end
   end
 
+
+  RejectedCases = [
+      ["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 decide to cover this case because it's not easily reproducible with URI.parse
+      # and can lead to several false positives.
+      ["http://google.com",   false],
+  ]
+
+  def test_rejected
+    RejectedCases.each do |name, expected|
+      assert_equal expected, PublicSuffix.valid?(name)
+      assert !valid_domain?(name), "#{name} expected to be invalid"
+    end
+  end
+
+
+  def valid_uri?(name)
+    uri = URI.parse(name)
+    uri.host != nil
+  rescue
+    false
+  end
+
+  def valid_domain?(name)
+    uri = URI.parse(name)
+    uri.host != nil && uri.scheme.nil?
+  rescue
+    false
+  end
+
 end

data/test/unit/list_test.rb

@@ -89,11 +89,6 @@ class PublicSuffix::ListTest < Test::Unit::TestCase
     assert_equal 2, list.select("british-library.uk").size
   end
 
-  def test_select_returns_empty_when_domain_has_scheme
-    assert_equal [], list.select("http://google.com")
-    assert_not_equal [], list.select("google.com")
-  end
-
   def test_select_returns_empty_when_domain_is_nil
     assert_equal [], list.select(nil)
   end
@@ -103,6 +98,11 @@ class PublicSuffix::ListTest < Test::Unit::TestCase
     assert_equal [], list.select("  ")
   end
 
+  def test_select_returns_empty_when_domain_has_scheme
+    assert_equal [], list.select("http://google.com")
+    assert_not_equal [], list.select("google.com")
+  end
+
 
   def test_self_default_getter
     assert_equal     nil, PublicSuffix::List.class_eval { @default }

data/test/unit/public_suffix_test.rb

@@ -78,17 +78,17 @@ class PublicSuffixTest < Test::Unit::TestCase
   end
 
   def test_self_parse_raises_with_invalid_domain
-    error = assert_raise(PublicSuffix::DomainInvalid) { PublicSuffix.parse("example.qqq") }
+    error = assert_raises(PublicSuffix::DomainInvalid) { PublicSuffix.parse("example.qqq") }
     assert_match %r{example\.qqq}, error.message
   end
 
   def test_self_parse_raises_with_unallowed_domain
-    error = assert_raise(PublicSuffix::DomainNotAllowed) { PublicSuffix.parse("example.ke") }
+    error = assert_raises(PublicSuffix::DomainNotAllowed) { PublicSuffix.parse("example.ke") }
     assert_match %r{example\.ke}, error.message
   end
 
   def test_self_raises_with_uri
-    error = assert_raise(PublicSuffix::DomainInvalid) { PublicSuffix.parse("http://google.com") }
+    error = assert_raises(PublicSuffix::DomainInvalid) { PublicSuffix.parse("http://google.com") }
     assert_match %r{http://google\.com}, error.message
   end
 

data/test/unit/rule_test.rb

@@ -74,15 +74,15 @@ class PublicSuffix::RuleBaseTest < Test::Unit::TestCase
   end
 
   def test_length
-    assert_raise(NotImplementedError) { @klass.new("com").length }
+    assert_raises(NotImplementedError) { @klass.new("com").length }
   end
 
   def test_parts
-    assert_raise(NotImplementedError) { @klass.new("com").parts }
+    assert_raises(NotImplementedError) { @klass.new("com").parts }
   end
 
   def test_decompose
-    assert_raise(NotImplementedError) { @klass.new("com").decompose("google.com") }
+    assert_raises(NotImplementedError) { @klass.new("com").decompose("google.com") }
   end
 
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: public_suffix
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.5.0
 platform: ruby
 authors:
 - Simone Carletti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-10 00:00:00.000000000 Z
+date: 2015-03-24 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'
 description: PublicSuffix can parse and decompose a domain name into top level domain,
@@ -59,16 +59,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gemtest
-- .gitignore
-- .travis.yml
-- .yardopts
+- ".gemtest"
+- ".gitignore"
+- ".ruby-gemset"
+- ".travis.yml"
+- ".yardopts"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- lib/definitions.txt
+- data/definitions.txt
 - lib/public_suffix.rb
 - lib/public_suffix/domain.rb
 - lib/public_suffix/errors.rb
@@ -93,17 +94,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Domain name parser based on the Public Suffix List.