public_suffix_service 0.5.2 → 0.6.0

data/CHANGELOG.rdoc

@@ -1,5 +1,15 @@
 = Changelog
 
+== Release 0.6.0
+
+* ADDED: PublicSuffixService.parse raises DomainNotAllowed when trying to parse a domain name
+         which exists, but is not allowed by the current definition list (#3)
+
+         PublicSuffixService.parse("nic.do")
+         # => PublicSuffixService::DomainNotAllowed
+
+* CHANGED: Renamed PublicSuffixService::InvalidDomain to PublicSuffixService::DomainInvalid
+
 
 == Release 0.5.2
 

data/lib/public_suffix_service.rb

@@ -42,20 +42,23 @@ module PublicSuffixService
   #   # => #<PubliSuffixService::Domain ...>
   #   
   #   PublicSuffixService.parse("http://www.google.com")
-  #   # => PublicSuffixService::InvalidDomain
+  #   # => PublicSuffixService::DomainInvalid
   #   
   #   PublicSuffixService.parse("x.yz")
-  #   # => PublicSuffixService::InvalidDomain
+  #   # => PublicSuffixService::DomainInvalid
   #
   # Raises PublicSuffixService::Error if domain is not a valid domain
   #
   # Returns the PubliSuffixService::Domain domain.
   def self.parse(domain)
-    rule = RuleList.default.find(domain) || raise(InvalidDomain, "`#{domain}' is not a valid domain")
+    rule = RuleList.default.find(domain) || raise(DomainInvalid, "`#{domain}' is not a valid domain")
 
     left, right = rule.decompose(domain)
-    parts       = left.split(".")
+    if right.nil?
+      raise DomainNotAllowed, "Rule `#{rule.name}' doesn't allow `#{domain}'"
+    end
 
+    parts = left.split(".")
     # If we have 0 parts left, there is just a tld and no domain or subdomain
     # If we have 1 part  left, there is just a tld, domain and not subdomain
     # If we have 2 parts left, the last part is the domain, the other parts (combined) are the subdomain

data/lib/public_suffix_service/errors.rb

@@ -19,7 +19,34 @@ module PublicSuffixService
   class Error < StandardError
   end
 
-  class InvalidDomain < Error
+  # Raised when trying to parse an invalid domain.
+  # A domain is considered invalid when no rule is found
+  # in the definition list.
+  #
+  # Since 0.6.0
+  class DomainInvalid < Error
   end
 
+  # Raised when trying to parse a domain
+  # which is formally defined by a rule,
+  # but the rules set a requirement which is not satisfied
+  # by the input you are trying to parse.
+  #
+  # Since 0.6.0
+  #
+  # Examples
+  #
+  #   PublicSuffixService.parse("nic.do")
+  #   # => PublicSuffixService::DomainNotAllowed
+  #
+  #   PublicSuffixService.parse("www.nic.do")
+  #   # => PublicSuffixService::Domain
+  #
+  class DomainNotAllowed < DomainInvalid
+  end
+
+
+  # Backward Compatibility
+  InvalidDomain = DomainInvalid
+
 end

data/lib/public_suffix_service/version.rb

@@ -18,8 +18,8 @@ module PublicSuffixService
 
   module Version
     MAJOR = 0
-    MINOR = 5
-    PATCH = 2
+    MINOR = 6
+    PATCH = 0
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join(".")

data/public_suffix_service.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{public_suffix_service}
-  s.version = "0.5.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Simone Carletti"]
-  s.date = %q{2010-09-15}
+  s.date = %q{2010-09-17}
   s.description = %q{    Intelligent domain name parser based in the Public Suffic List.     PublicSuffixService can parse and decompose a domain name into top level domain,     domain and subdomains.
 }
   s.email = %q{weppos@weppos.net}

data/test/acceptance_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class AcceptanceTest < Test::Unit::TestCase
 
-  CASES = {
+  ValidCases = {
     "google.com" => [nil, "google", "com"],
     "foo.google.com" => ["foo", "google", "com"],
 
@@ -13,8 +13,8 @@ class AcceptanceTest < Test::Unit::TestCase
     "foo.parliament.uk" => ["foo", "parliament", "uk"],
   }
 
-  def test_all
-    CASES.each do |name, results|
+  def test_valid
+    ValidCases.each do |name, results|
       domain = PublicSuffixService.parse(name)
       trd, sld, tld = results
       assert_equal tld, domain.tld, "Invalid tld for '#{name}'"
@@ -23,4 +23,14 @@ class AcceptanceTest < Test::Unit::TestCase
     end
   end
 
+  InvalidCases = {
+    "nic.do" => PublicSuffixService::DomainNotAllowed,
+  }
+
+  def test_invalid
+    InvalidCases.each do |name, error|
+      assert_raise(error) { PublicSuffixService.parse(name) }
+    end
+  end
+
 end

data/test/public_suffix_service/rule_test.rb

@@ -3,6 +3,9 @@ require 'test_helper'
 class PublicSuffixService::RuleTest < Test::Unit::TestCase
 
   def test_factory_should_return_rule_normal
+    rule = PublicSuffixService::Rule.factory("com")
+    assert_instance_of PublicSuffixService::Rule::Normal, rule
+
     rule = PublicSuffixService::Rule.factory("verona.it")
     assert_instance_of PublicSuffixService::Rule::Normal, rule
   end
@@ -13,7 +16,10 @@ class PublicSuffixService::RuleTest < Test::Unit::TestCase
   end
 
   def test_factory_should_return_rule_wildcard
-    rule = PublicSuffixService::Rule.factory("*.aichi.jp")
+    rule = PublicSuffixService::Rule.factory("*.do")
+    assert_instance_of PublicSuffixService::Rule::Wildcard, rule
+
+    rule = PublicSuffixService::Rule.factory("*.sch.uk")
     assert_instance_of PublicSuffixService::Rule::Wildcard, rule
   end
 
@@ -208,6 +214,7 @@ class PublicSuffixService::RuleWildcardTest < Test::Unit::TestCase
   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")
   end

data/test/public_suffix_service_test.rb

@@ -45,7 +45,7 @@ class PublicSuffixServiceTest < Test::Unit::TestCase
   end
 
   def test_self_parse_should_raise_with_invalid_domain
-    error = assert_raise(PublicSuffixService::InvalidDomain) { PublicSuffixService.parse("google.zip") }
+    error = assert_raise(PublicSuffixService::DomainInvalid) { PublicSuffixService.parse("google.zip") }
     assert_match %r{google\.zip}, error.message
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: public_suffix_service
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 2
-  version: 0.5.2
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Simone Carletti
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-17 00:00:00 +02:00
+date: 2010-09-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency