public_suffix_service 0.6.0 → 0.7.0

data/lib/public_suffix_service/version.rb

@@ -18,7 +18,7 @@ module PublicSuffixService
 
   module Version
     MAJOR = 0
-    MINOR = 6
+    MINOR = 7
     PATCH = 0
     BUILD = nil
 

data/public_suffix_service.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{public_suffix_service}
-  s.version = "0.5.2"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Simone Carletti"]
-  s.date = %q{2010-09-17}
+  s.date = %q{2010-09-18}
   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/public_suffix_service/domain_test.rb

@@ -121,12 +121,19 @@ class PublicSuffixService::DomainTest < Test::Unit::TestCase
   end
 
   def test_valid_question
-    assert  @klass.new("com").valid?
-    assert  @klass.new("com", "google").valid?
-    assert  @klass.new("com", "google", "www").valid?
+    assert !@klass.new("com").valid?
+    assert  @klass.new("com", "example").valid?
+    assert  @klass.new("com", "example", "www").valid?
+
+    # not-assigned
     assert !@klass.new("zip").valid?
-    assert !@klass.new("zip", "google").valid?
-    assert !@klass.new("zip", "google", "www").valid?
+    assert !@klass.new("zip", "example").valid?
+    assert !@klass.new("zip", "example", "www").valid?
+
+    # not-allowed
+    assert !@klass.new("do").valid?
+    assert !@klass.new("do", "example").valid?
+    assert  @klass.new("do", "example", "www").valid?
   end
 
   def test_valid_domain_question

data/test/public_suffix_service/rule_list_test.rb

@@ -20,7 +20,7 @@ class PublicSuffixService::RuleListTest < Test::Unit::TestCase
     assert_equal({}, @list.indexes)
   end
 
-  def test_find__with_index
+  def test_indexes
     @list = PublicSuffixService::RuleList.parse(<<EOS)
 // com : http://en.wikipedia.org/wiki/.com
 com
@@ -56,6 +56,16 @@ EOS
     assert_equal 2, @list.length
   end
 
+  def test_add_should_recreate_index
+    @list = PublicSuffixService::RuleList.parse("com")
+    assert_equal PublicSuffixService::Rule.factory("com"), @list.find("google.com")
+    assert_equal nil, @list.find("google.net")
+
+    @list << PublicSuffixService::Rule.factory("net")
+    assert_equal PublicSuffixService::Rule.factory("com"), @list.find("google.com")
+    assert_equal PublicSuffixService::Rule.factory("net"), @list.find("google.net")
+  end
+
   def test_empty?
     assert  @list.empty?
     @list.add(PublicSuffixService::Rule.factory(""))
@@ -134,52 +144,18 @@ EOS
 
   def test_self_reload
     PublicSuffixService::RuleList.default
-    PublicSuffixService::RuleList.expects(:default_definition).returns("")
+    mock(PublicSuffixService::RuleList).default_definition { "" }
+
     PublicSuffixService::RuleList.reload
     assert_equal PublicSuffixService::RuleList.new, PublicSuffixService::RuleList.default
   end
 
+
   def test_self_parse
-    input = <<EOS
+    list = PublicSuffixService::RuleList.parse(<<EOS)
 // ***** BEGIN LICENSE BLOCK *****
 // Version: MPL 1.1/GPL 2.0/LGPL 2.1
 //
-// The contents of this file are subject to the Mozilla Public License Version
-// 1.1 (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-// http://www.mozilla.org/MPL/
-//
-// Software distributed under the License is distributed on an "AS IS" basis,
-// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-// for the specific language governing rights and limitations under the
-// License.
-//
-// The Original Code is the Public Suffix List.
-//
-// The Initial Developer of the Original Code is
-// Jo Hermans <jo.hermans@gmail.com>.
-// Portions created by the Initial Developer are Copyright (C) 2007
-// the Initial Developer. All Rights Reserved.
-//
-// Contributor(s):
-//   Ruben Arakelyan <ruben@wackomenace.co.uk>
-//   Gervase Markham <gerv@gerv.net>
-//   Pamela Greene <pamg.bugs@gmail.com>
-//   David Triendl <david@triendl.name>
-//   The kind representatives of many TLD registries
-//
-// Alternatively, the contents of this file may be used under the terms of
-// either the GNU General Public License Version 2 or later (the "GPL"), or
-// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-// in which case the provisions of the GPL or the LGPL are applicable instead
-// of those above. If you wish to allow use of your version of this file only
-// under the terms of either the GPL or the LGPL, and not to allow others to
-// use your version of this file under the terms of the MPL, indicate your
-// decision by deleting the provisions above and replace them with the notice
-// and other provisions required by the GPL or the LGPL. If you do not delete
-// the provisions above, a recipient may use your version of this file under
-// the terms of any one of the MPL, the GPL or the LGPL.
-//
 // ***** END LICENSE BLOCK *****
 
 // ac : http://en.wikipedia.org/wiki/.ac
@@ -193,12 +169,25 @@ ad
 *.ar
 !congresodelalengua3.ar
 EOS
-    expected = []
-    list = PublicSuffixService::RuleList.parse(input)
 
     assert_instance_of PublicSuffixService::RuleList, list
     assert_equal 5, list.length
     assert_equal %w(ac com.ac ad *.ar !congresodelalengua3.ar).map { |name| PublicSuffixService::Rule.factory(name) }, list.to_a
   end
 
+  def test_self_parse_should_create_cache
+    list = PublicSuffixService::RuleList.parse(<<EOS)
+// com : http://en.wikipedia.org/wiki/.com
+com
+
+// uk : http://en.wikipedia.org/wiki/.uk
+*.uk
+*.sch.uk
+!bl.uk
+!british-library.uk
+EOS
+
+    assert_equal PublicSuffixService::Rule.factory("com"), list.find("google.com")
+  end
+
 end

data/test/public_suffix_service/rule_test.rb

@@ -60,15 +60,15 @@ class PublicSuffixService::RuleBaseTest < Test::Unit::TestCase
 
 
   def test_match
-    assert  @klass.new("uk").match?("google.uk")
-    assert !@klass.new("gk").match?("google.uk")
-    assert !@klass.new("google").match?("google.uk")
-    assert  @klass.new("uk").match?("google.co.uk")
-    assert !@klass.new("gk").match?("google.co.uk")
-    assert !@klass.new("co").match?("google.co.uk")
-    assert  @klass.new("co.uk").match?("google.co.uk")
-    assert !@klass.new("uk.co").match?("google.co.uk")
-    assert !@klass.new("go.uk").match?("google.co.uk")
+    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_length
@@ -104,17 +104,24 @@ class PublicSuffixService::RuleNormalTest < Test::Unit::TestCase
 
 
   def test_match
-    assert  @klass.new("uk").match?("google.uk")
-    assert !@klass.new("gk").match?("google.uk")
-    assert !@klass.new("google").match?("google.uk")
-    assert  @klass.new("uk").match?("google.co.uk")
-    assert !@klass.new("gk").match?("google.co.uk")
-    assert !@klass.new("co").match?("google.co.uk")
-    assert  @klass.new("co.uk").match?("google.co.uk")
-    assert !@klass.new("uk.co").match?("google.co.uk")
-    assert !@klass.new("go.uk").match?("google.co.uk")
+    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_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_length
     assert_equal 1, @klass.new("com").length
     assert_equal 2, @klass.new("co.com").length
@@ -128,8 +135,8 @@ class PublicSuffixService::RuleNormalTest < Test::Unit::TestCase
   end
 
   def test_decompose
-    assert_equal %w(google com), @klass.new("com").decompose("google.com")
-    assert_equal %w(foo.google com), @klass.new("com").decompose("foo.google.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
@@ -153,14 +160,15 @@ class PublicSuffixService::RuleExceptionTest < Test::Unit::TestCase
 
 
   def test_match
-    assert  @klass.new("!uk").match?("google.co.uk")
-    assert !@klass.new("!gk").match?("google.co.uk")
-    assert  @klass.new("!co.uk").match?("google.co.uk")
-    assert !@klass.new("!go.uk").match?("google.co.uk")
+    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?("google.co.uk")
+    assert !@klass.new("!british-library.uk").match?("example.co.uk")
   end
 
+
   def test_length
     assert_equal 1, @klass.new("!british-library.uk").length
     assert_equal 2, @klass.new("!foo.british-library.uk").length
@@ -197,12 +205,19 @@ class PublicSuffixService::RuleWildcardTest < Test::Unit::TestCase
 
 
   def test_match
-    assert  @klass.new("*.uk").match?("google.uk")
-    assert  @klass.new("*.uk").match?("google.co.uk")
-    assert  @klass.new("*.co.uk").match?("google.co.uk")
-    assert !@klass.new("*.go.uk").match?("google.co.uk")
+    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_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_length
     assert_equal 2, @klass.new("*.uk").length
     assert_equal 3, @klass.new("*.co.uk").length

data/test/public_suffix_service_test.rb

@@ -3,50 +3,55 @@ require 'test_helper'
 class PublicSuffixServiceTest < Test::Unit::TestCase
 
   def test_self_parse_a_domain_with_tld_and_sld
-    domain = PublicSuffixService.parse("google.com")
+    domain = PublicSuffixService.parse("example.com")
     assert_instance_of PublicSuffixService::Domain, domain
     assert_equal "com",     domain.tld
-    assert_equal "google",  domain.sld
+    assert_equal "example", domain.sld
     assert_equal nil,       domain.trd
 
-    domain = PublicSuffixService.parse("google.co.uk")
+    domain = PublicSuffixService.parse("example.co.uk")
     assert_instance_of PublicSuffixService::Domain, domain
     assert_equal "co.uk",   domain.tld
-    assert_equal "google",  domain.sld
+    assert_equal "example", domain.sld
     assert_equal nil,       domain.trd
   end
 
   def test_self_parse_a_domain_with_tld_and_sld_and_trd
-    domain = PublicSuffixService.parse("alpha.google.com")
+    domain = PublicSuffixService.parse("alpha.example.com")
     assert_instance_of PublicSuffixService::Domain, domain
     assert_equal "com",     domain.tld
-    assert_equal "google",  domain.sld
+    assert_equal "example", domain.sld
     assert_equal "alpha",   domain.trd
 
-    domain = PublicSuffixService.parse("alpha.google.co.uk")
+    domain = PublicSuffixService.parse("alpha.example.co.uk")
     assert_instance_of PublicSuffixService::Domain, domain
     assert_equal "co.uk",   domain.tld
-    assert_equal "google",  domain.sld
+    assert_equal "example", domain.sld
     assert_equal "alpha",   domain.trd
   end
 
   def test_self_parse_a_domain_with_tld_and_sld_and_4rd
-    domain = PublicSuffixService.parse("one.two.google.com")
+    domain = PublicSuffixService.parse("one.two.example.com")
     assert_instance_of PublicSuffixService::Domain, domain
     assert_equal "com",     domain.tld
-    assert_equal "google",  domain.sld
+    assert_equal "example", domain.sld
     assert_equal "one.two", domain.trd
 
-    domain = PublicSuffixService.parse("one.two.google.co.uk")
+    domain = PublicSuffixService.parse("one.two.example.co.uk")
     assert_instance_of PublicSuffixService::Domain, domain
     assert_equal "co.uk",   domain.tld
-    assert_equal "google",  domain.sld
+    assert_equal "example", domain.sld
     assert_equal "one.two", domain.trd
   end
 
   def test_self_parse_should_raise_with_invalid_domain
-    error = assert_raise(PublicSuffixService::DomainInvalid) { PublicSuffixService.parse("google.zip") }
-    assert_match %r{google\.zip}, error.message
+    error = assert_raise(PublicSuffixService::DomainInvalid) { PublicSuffixService.parse("example.zip") }
+    assert_match %r{example\.zip}, error.message
+  end
+
+  def test_self_parse_should_raise_with_unallowed_domain
+    error = assert_raise(PublicSuffixService::DomainNotAllowed) { PublicSuffixService.parse("example.do") }
+    assert_match %r{example\.do}, error.message
   end
 
 

data/test/test_helper.rb

@@ -2,8 +2,9 @@ $:.unshift(File.dirname(__FILE__) + '/../lib')
 
 require 'rubygems'
 require 'test/unit'
-require 'mocha'
+require 'rr'
 require 'public_suffix_service'
 
 class Test::Unit::TestCase
+  include RR::Adapters::TestUnit
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: public_suffix_service
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 3
   prerelease: false
   segments: 
   - 0
-  - 6
+  - 7
   - 0
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Simone Carletti
@@ -15,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-18 00:00:00 +02:00
+date: 2010-10-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: rr
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false