public_suffix 1.0.0 → 1.1.0

data/.gitignore

@@ -1,4 +1,11 @@
+# Bundler
 .bundle
-.yardoc
+Gemfile.lock
 pkg/*
-yardoc
+
+# Rubinius
+*.rbc
+
+# YARD
+.yardoc
+yardoc/

data/.travis.yml

@@ -1,11 +1,12 @@
+language: ruby
 rvm:
   - 1.8.7
   - 1.9.2
-  - ruby-head
+  - 1.9.3
+  - jruby-18mode
+  - jruby-19mode
+  - rbx-18mode
   - ree
-  - jruby
-  - rbx
-  - rbx-2.0
 notifications:
   recipients:
     - weppos@weppos.net

data/CHANGELOG.md

@@ -1,9 +1,18 @@
 # Changelog
 
 
+## Release 1.1.0
+
+- FIXED: #valid? and #parse consider URIs as valid domains (GH-15)
+
+- CHANGED: Updated definitions.
+
+- CHANGED: Removed deprecatd PublicSuffixService::RuleList.
+
+
 ## Release 1.0.0
 
-* CHANGED: Updated definitions.
+- CHANGED: Updated definitions.
 
 
 ## Release 1.0.0.rc1
@@ -13,127 +22,127 @@ The library is now known as PublicSuffix.
 
 ## Release 0.9.1
 
-* CHANGED: Renamed PublicSuffixService::RuleList to PublicSuffixService::List.
+- CHANGED: Renamed PublicSuffixService::RuleList to PublicSuffixService::List.
 
-* CHANGED: Renamed PublicSuffixService::List#list to PublicSuffixService::List#rules.
+- CHANGED: Renamed PublicSuffixService::List#list to PublicSuffixService::List#rules.
 
-* CHANGED: Renamed PublicSuffixService to PublicSuffix.
+- CHANGED: Renamed PublicSuffixService to PublicSuffix.
 
-* CHANGED: Updated definitions.
+- CHANGED: Updated definitions.
 
 
 ## Release 0.9.0
 
-* CHANGED: Minimum Ruby version increased to Ruby 1.8.7.
+- CHANGED: Minimum Ruby version increased to Ruby 1.8.7.
 
-* CHANGED: rake/gempackagetask is deprecated.  Use rubygems/package_task instead.
+- CHANGED: rake/gempackagetask is deprecated.  Use rubygems/package_task instead.
 
 
 ## Release 0.8.4
 
-* FIXED: Reverted bugfix for issue #12 for Ruby 1.8.6.
+- FIXED: Reverted bugfix for issue #12 for Ruby 1.8.6.
   This is the latest version compatible with Ruby 1.8.6.
 
 
 ## Release 0.8.3
 
-* FIXED: Fixed ArgumentError: invalid byte sequence in US-ASCII with Ruby 1.9.2 (#12).
+- FIXED: Fixed ArgumentError: invalid byte sequence in US-ASCII with Ruby 1.9.2 (#12).
 
-* CHANGED: Updated definitions (#11).
+- CHANGED: Updated definitions (#11).
 
-* CHANGED: Renamed definitions.txt to definitions.dat.
+- CHANGED: Renamed definitions.txt to definitions.dat.
 
 
 ## Release 0.8.2
 
-* NEW: Added support for rubygems-test.
+- NEW: Added support for rubygems-test.
 
-* CHANGED: Integrated Bundler.
+- CHANGED: Integrated Bundler.
 
-* CHANGED: Updated definitions.
+- CHANGED: Updated definitions.
 
 
 ## Release 0.8.1
 
-* FIXED: The files in the release 0.8.0 have wrong permission 600 and can't be loaded (#10).
+- FIXED: The files in the release 0.8.0 have wrong permission 600 and can't be loaded (#10).
 
 
 ## Release 0.8.0
 
-* CHANGED: Update public suffix list to d1a5599b49fa 2010-10-25 15:10 +0100 (#9)
+- CHANGED: Update public suffix list to d1a5599b49fa 2010-10-25 15:10 +0100 (#9)
 
-* NEW: Add support for Fully Qualified Domain Names (#7)
+- NEW: Add support for Fully Qualified Domain Names (#7)
 
 
 ## Release 0.7.0
 
-* CHANGED: Using YARD to document the code instead of RDoc.
+- CHANGED: Using YARD to document the code instead of RDoc.
 
-* FIXED: RuleList cache is not recreated when a new rule is appended to the list (#6)
+- FIXED: RuleList cache is not recreated when a new rule is appended to the list (#6)
 
-* FIXED: PublicSuffixService.valid? should return false if the domain is not defined or not allowed (#4, #5)
+- FIXED: PublicSuffixService.valid? should return false if the domain is not defined or not allowed (#4, #5)
 
 
 ## Release 0.6.0
 
-* NEW:  PublicSuffixService.parse raises DomainNotAllowed when trying to parse a domain name
+- NEW:  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
+- CHANGED: Renamed PublicSuffixService::InvalidDomain to PublicSuffixService::DomainInvalid
 
 
 ## Release 0.5.2
 
-* CHANGED: Update public suffix list to 248ea690d671 2010-09-16 18:02 +0100
+- CHANGED: Update public suffix list to 248ea690d671 2010-09-16 18:02 +0100
 
 
 ## Release 0.5.1
 
-* CHANGED: Update public suffix list to 14dc66dd53c1 2010-09-15 17:09 +0100
+- CHANGED: Update public suffix list to 14dc66dd53c1 2010-09-15 17:09 +0100
 
 
 ## Release 0.5.0
 
-* CHANGED: Improve documentation for Domain#domain and Domain#subdomain (#1).
+- CHANGED: Improve documentation for Domain#domain and Domain#subdomain (#1).
 
-* CHANGED: Performance improvements (#2).
+- CHANGED: Performance improvements (#2).
 
 
 ## Release 0.4.0
 
-* CHANGED: Rename library from DomainName to PublicSuffixService to reduce the probability of name conflicts.
+- CHANGED: Rename library from DomainName to PublicSuffixService to reduce the probability of name conflicts.
 
 
 ## Release 0.3.1
 
-* Deprecated DomainName library.
+- Deprecated DomainName library.
 
 
 ## Release 0.3.0
 
-* CHANGED: DomainName#domain and DomainName#subdomain are no longer alias of Domain#sld and Domain#tld.
+- CHANGED: DomainName#domain and DomainName#subdomain are no longer alias of Domain#sld and Domain#tld.
 
-* CHANGED: Removed DomainName#labels and decoupled Rule from DomainName.
+- CHANGED: Removed DomainName#labels and decoupled Rule from DomainName.
 
-* CHANGED: DomainName#valid? no longer instantiates new DomainName objects. This means less overhead.
+- CHANGED: DomainName#valid? no longer instantiates new DomainName objects. This means less overhead.
 
-* CHANGED: Refactoring the entire DomainName API. Removed the internal on-the-fly parsing. Added a bunch of new methods to check and validate the DomainName.
+- CHANGED: Refactoring the entire DomainName API. Removed the internal on-the-fly parsing. Added a bunch of new methods to check and validate the DomainName.
 
 
 ## Release 0.2.0
 
-* NEW: DomainName#valid?
+- NEW: DomainName#valid?
 
-* NEW: DomainName#parse and DomainName#parse!
+- NEW: DomainName#parse and DomainName#parse!
 
-* NEW: DomainName#valid_domain? and DomainName#valid_subdomain?
+- NEW: DomainName#valid_domain? and DomainName#valid_subdomain?
 
-* CHANGED: Make sure RuleList lookup is only performed once.
+- CHANGED: Make sure RuleList lookup is only performed once.
 
 
 ## Release 0.1.0
 
-* Initial version
+- Initial version

data/Gemfile

@@ -1,4 +1,3 @@
 source "http://rubygems.org"
 
-# Specify your gem's dependencies in whois.gemspec
 gemspec

data/LICENSE

@@ -1,6 +1,6 @@
-Copyright (c) 2009-2011 Simone Carletti <weppos@weppos.net>
+The MIT License
 
-MIT License
+Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -41,12 +41,12 @@ For older versions of Ruby, see the CHANGELOG.md file.
 
 Successfully tested against the following interpreters:
 
-* "Ruby":http://www.ruby-lang.org/ 1.8.x MRI
-* "Ruby":http://www.ruby-lang.org/ 1.9.x MRI
-* "Ruby Enterprise Edition":http://www.rubyenterpriseedition.com/
-* "JRuby":http://jruby.org/
-* "Rubinius":http://rubini.us/
-* "MacRuby":http://www.macruby.org/
+* [Ruby](http://www.ruby-lang.org/) 1.8.x MRI
+* [Ruby](http://www.ruby-lang.org/) 1.9.x MRI
+* [Ruby Enterprise Edition](http://www.rubyenterpriseedition.com/)
+* [JRuby](http://jruby.org/)
+* [Rubinius](http://rubini.us/)
+* [MacRuby](http://www.macruby.org/)
 
 
 ## Installation
@@ -88,7 +88,7 @@ Example domain with subdomains.
     domain.domain
     # => "google.com"
     domain.subdomain
-    # => "google.com"
+    # => "www.google.com"
 
 Simple validation example.
 
@@ -120,10 +120,10 @@ This library automatically recognizes Fully Qualified Domain Names. A FQDN is a
 
 ## Credits
 
-* **Author:** [Simone Carletti](http://www.simonecarletti.com/)
+* [Simone Carletti](http://www.simonecarletti.com/) <weppos@weppos.net> - The Author
 
 
-## FeedBack and Bug reports
+## Feedback and bug reports
 
 If you use this library and find yourself missing any functionality, please [let me know](mailto:weppos@weppos.net).
 
@@ -147,5 +147,6 @@ See the CHANGELOG.md file for details.
 
 ## License
 
-*Public Suffix* is copyright (c) 2009-2011 Simone Carletti.
+Copyright (c) 2009-2012 Simone Carletti.
+
 This is Free Software distributed under the MIT license.

data/Rakefile

@@ -1,7 +1,6 @@
 require 'rubygems'
 require 'rubygems/package_task'
 require 'bundler'
-require 'rake/testtask'
 
 $:.unshift(File.dirname(__FILE__) + "/lib")
 require 'public_suffix'
@@ -10,7 +9,6 @@ require 'public_suffix'
 # Common package properties
 PKG_NAME    = ENV['PKG_NAME']    || PublicSuffix::GEM
 PKG_VERSION = ENV['PKG_VERSION'] || PublicSuffix::VERSION
-RUBYFORGE_PROJECT = nil
 
 
 # Run test by default.
@@ -29,17 +27,18 @@ spec = Gem::Specification.new do |s|
   s.email             = "weppos@weppos.net"
   s.homepage          = "http://www.simonecarletti.com/code/public_suffix"
 
-  # Add any extra files to include in the gem (like your README)
   s.files             = `git ls-files`.split("\n")
   s.test_files        = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths     = %w( lib )
 
-  # If your tests use any gems, include them here
   s.add_development_dependency("rake")
   s.add_development_dependency("mocha")
   s.add_development_dependency("yard")
 end
 
+
+require 'rubygems/package_task'
+
 Gem::PackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end
@@ -62,7 +61,8 @@ desc "Package the library and generates the gemspec"
 task :package => [:gemspec]
 
 
-# Run all the tests in the /test folder
+require 'rake/testtask'
+
 Rake::TestTask.new do |t|
   t.libs << "test"
   t.test_files = FileList["test/**/*_test.rb"]

data/lib/public_suffix.rb

@@ -3,7 +3,7 @@
 #
 # Domain name parser based on the Public Suffix List.
 #
-# Copyright (c) 2009-2011 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -21,10 +21,6 @@ module PublicSuffix
   AUTHORS         = ["Simone Carletti <weppos@weppos.net>"]
 
 
-  # Backwards compatibility
-  autoload :RuleList, 'public_suffix/rule_list'
-
-
   # Parses +domain+ and returns the
   # {PublicSuffix::Domain} instance.
   #
@@ -67,6 +63,7 @@ module PublicSuffix
   #
   def self.parse(domain)
     rule = List.default.find(domain)
+
     if rule.nil?
       raise DomainInvalid, "`#{domain}' is not a valid domain"
     end

data/lib/public_suffix/definitions.txt

@@ -40,6 +40,8 @@
 // 
 // ***** END LICENSE BLOCK *****
 
+// ===BEGIN ICANN DOMAINS===
+
 // ac : http://en.wikipedia.org/wiki/.ac
 ac
 com.ac
@@ -236,7 +238,7 @@ urn.arpa
 as
 gov.as
 
-// asia: http://en.wikipedia.org/wiki/.asia
+// asia : http://en.wikipedia.org/wiki/.asia
 asia
 
 // at : http://en.wikipedia.org/wiki/.at
@@ -247,17 +249,31 @@ co.at
 gv.at
 or.at
 
-// http://www.info.at/
-biz.at
-info.at
-
-// priv.at : http://www.nic.priv.at/
-// Submitted by registry <lendl@nic.at> 2008-06-09
-priv.at
-
 // au : http://en.wikipedia.org/wiki/.au
-*.au
-// au geographical names (vic.au etc... are covered above)
+// http://www.auda.org.au/
+// 2LDs
+com.au
+net.au
+org.au
+edu.au
+gov.au
+csiro.au
+asn.au
+id.au
+// Historic 2LDs (closed to new registration, but sites still exist)
+info.au
+conf.au
+oz.au
+// CGDNs - http://www.cgdn.org.au/
+act.au
+nsw.au
+nt.au
+qld.au
+sa.au
+tas.au
+vic.au
+wa.au
+// 3LDs
 act.edu.au
 nsw.edu.au
 nt.edu.au
@@ -275,15 +291,6 @@ sa.gov.au
 tas.gov.au
 vic.gov.au
 wa.gov.au
-// CGDNs - http://www.aucd.org.au/
-act.au
-nsw.au
-nt.au
-qld.au
-sa.au
-tas.au
-vic.au
-wa.au
 
 // aw : http://en.wikipedia.org/wiki/.aw
 aw
@@ -615,11 +622,14 @@ gouv.ci
 
 // ck : http://en.wikipedia.org/wiki/.ck
 *.ck
+!www.ck
 
 // cl : http://en.wikipedia.org/wiki/.cl
 cl
 gov.cl
 gob.cl
+co.cl
+mil.cl
 
 // cm : http://en.wikipedia.org/wiki/.cm
 cm
@@ -694,35 +704,6 @@ web.co
 // com : http://en.wikipedia.org/wiki/.com
 com
 
-// CentralNic names : http://www.centralnic.com/names/domains
-// Confirmed by registry <gavin.brown@centralnic.com> 2008-06-09
-// Updated by registry <gavin.brown@centralnic.com> 2011-05-27
-ar.com
-br.com
-cn.com
-de.com
-eu.com
-gb.com
-gr.com
-hu.com
-jpn.com
-kr.com
-no.com
-qc.com
-ru.com
-sa.com
-se.com
-uk.com
-us.com
-uy.com
-za.com
-
-// Requested by Yngve Pettersen <yngve@opera.com> 2009-11-26
-operaunite.com
-
-// Requested by Eduardo Vela <evn@google.com> 2010-09-06
-appspot.com
-
 // coop : http://en.wikipedia.org/wiki/.coop
 coop
 
@@ -764,10 +745,6 @@ cz
 // reservations) 2008-07-01
 de
 
-// CentralNic names : http://www.centralnic.com/names/domains
-// Submitted by registry <gavin.brown@centralnic.com> 2011-05-27
-com.de
-
 // dj : http://en.wikipedia.org/wiki/.dj
 dj
 
@@ -876,8 +853,6 @@ fi
 // completely removed.
 // TODO: Check for updates (expected to be phased out around Q1/2009)
 aland.fi
-// iki.fi : Submitted by Hannu Aronsson <haa@iki.fi> 2009-11-05
-iki.fi
 
 // fj : http://en.wikipedia.org/wiki/.fj
 *.fj
@@ -1014,6 +989,7 @@ gs
 
 // gt : http://www.gt/politicas.html
 *.gt
+!www.gt
 
 // gu : http://gadao.gov.gu/registration.txt
 *.gu
@@ -1799,8 +1775,6 @@ gov.la
 per.la
 com.la
 org.la
-// see http://www.c.la/
-c.la
 
 // lb : http://en.wikipedia.org/wiki/.lb
 // Submitted by registry <randy@psg.com> 2008-06-17
@@ -1840,9 +1814,6 @@ assn.lk
 grp.lk
 hotel.lk
 
-// local : http://en.wikipedia.org/wiki/.local
-local
-
 // lr : http://psg.com/dns/lr/lr.txt
 // Submitted by registry <randy@psg.com> 2008-06-17
 com.lr
@@ -2643,16 +2614,6 @@ ne
 // net : http://en.wikipedia.org/wiki/.net
 net
 
-// CentralNic names : http://www.centralnic.com/names/domains
-// Submitted by registry <gavin.brown@centralnic.com> 2008-06-17
-gb.net
-se.net
-uk.net
-
-// ZaNiC names : http://www.za.net/
-// Confirmed by registry <hostmaster@nic.za.net> 2009-10-03
-za.net
-
 // nf : http://en.wikipedia.org/wiki/.nf
 nf
 com.nf
@@ -2686,9 +2647,6 @@ nl
 // BV.nl will be a registry for dutch BV's (besloten vennootschap)
 bv.nl
 
-// the co.nl domain is managed by CoDNS B.V. Added 2010-05-23.
-co.nl
-
 // no : http://www.norid.no/regelverk/index.en.html
 // The Norwegian registry has declined to notify us of updates. The web pages
 // referenced below are the official source of the data. There is also an
@@ -3456,9 +3414,6 @@ våler.østfold.no
 valer.hedmark.no
 våler.hedmark.no
 
-// the co.no domain is managed by CoDNS B.V. Added 2010-05-23.
-co.no
-
 // np : http://www.mos.com.np/register.html
 *.np
 
@@ -3495,16 +3450,6 @@ nu
 // org : http://en.wikipedia.org/wiki/.org
 org
 
-// CentralNic names : http://www.centralnic.com/names/domains
-// Submitted by registry <gavin.brown@centralnic.com> 2008-06-17
-// Updated by registry <gavin.brown@centralnic.com> 2011-05-27
-ae.org
-us.org
-
-// ZaNiC names : http://www.za.net/
-// Confirmed by registry <hostmaster@nic.za.net> 2009-10-03
-za.org
-
 // pa : http://www.nic.pa/
 // Some additional second level "domains" resolve directly as hostnames, such as
 // pannet.pa, so we add a rule for "pa".
@@ -3758,9 +3703,6 @@ poznan.pl
 wroc.pl
 zakopane.pl
 
-// co.pl : Mainseek Sp. z o.o. http://www.co.pl
-co.pl
-
 // pn : http://www.government.pn/PnRegistry/policies.htm
 pn
 gov.pn
@@ -3830,8 +3772,16 @@ belau.pw
 // py : http://www.nic.py/faq_a.html#faq_b
 *.py
 
-// qa : http://www.qatar.net.qa/services/virtual.htm
-*.qa
+// qa : http://domains.qa/en/
+qa
+com.qa
+edu.qa
+gov.qa
+mil.qa
+name.qa
+net.qa
+org.qa
+sch.qa
 
 // re : http://www.afnic.re/obtenir/chartes/nommage-re/annexe-descriptifs
 re
@@ -4400,6 +4350,10 @@ zp.ua
 zhitomir.ua
 zt.ua
 
+// Private registries in .ua
+co.ua
+pp.ua
+
 // ug : http://www.registry.co.ug/
 ug
 co.ug
@@ -4903,9 +4857,6 @@ xxx
 // ye : http://www.y.net.ye/services/domain_name.htm
 *.ye
 
-// yu : http://www.nic.yu/pravilnik-e.html
-*.yu
-
 // za : http://www.zadna.org.za/slds.html
 *.za
 
@@ -4915,7 +4866,77 @@ xxx
 // zw : http://en.wikipedia.org/wiki/.zw
 *.zw
 
-// DynDNS.com Dynamic DNS zones : http://www.dyndns.com/services/dns/dyndns/
+// ===END ICANN DOMAINS===
+// ===BEGIN PRIVATE DOMAINS===
+
+// info.at : http://www.info.at/
+biz.at
+info.at
+
+// priv.at : http://www.nic.priv.at/
+// Submitted by registry <lendl@nic.at> 2008-06-09
+priv.at
+
+// co.ca : http://registry.co.ca
+co.ca
+
+// CentralNic : http://www.centralnic.com/names/domains
+// Confirmed by registry <gavin.brown@centralnic.com> 2008-06-09
+ar.com
+br.com
+cn.com
+de.com
+eu.com
+gb.com
+gr.com
+hu.com
+jpn.com
+kr.com
+no.com
+qc.com
+ru.com
+sa.com
+se.com
+uk.com
+us.com
+uy.com
+za.com
+gb.net
+jp.net
+se.net
+uk.net
+ae.org
+us.org
+com.de
+
+// Opera Software, A.S.A.
+// Requested by Yngve Pettersen <yngve@opera.com> 2009-11-26
+operaunite.com
+
+// Google, Inc.
+// Requested by Eduardo Vela <evn@google.com> 2010-09-06
+appspot.com
+
+// iki.fi : Submitted by Hannu Aronsson <haa@iki.fi> 2009-11-05
+iki.fi
+
+// c.la : http://www.c.la/
+c.la
+
+// ZaNiC : http://www.za.net/
+// Confirmed by registry <hostmaster@nic.za.net> 2009-10-03
+za.net
+za.org
+
+// CoDNS B.V.
+// Added 2010-05-23.
+co.nl
+co.no
+
+// Mainseek Sp. z o.o. : http://www.co.pl/
+co.pl
+
+// DynDNS.com : http://www.dyndns.com/services/dns/dyndns/
 dyndns-at-home.com
 dyndns-at-work.com
 dyndns-blog.com
@@ -5195,3 +5216,5 @@ webhop.net
 webhop.org
 worse-than.tv
 writesthisblog.com
+
+// ===END PRIVATE DOMAINS===

data/lib/public_suffix/domain.rb

@@ -3,7 +3,7 @@
 #
 # Domain name parser based on the Public Suffix List.
 #
-# Copyright (c) 2009-2011 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
 #++
 
 

data/lib/public_suffix/errors.rb

@@ -3,7 +3,7 @@
 #
 # Domain name parser based on the Public Suffix List.
 #
-# Copyright (c) 2009-2011 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
 #++
 
 

data/lib/public_suffix/list.rb

@@ -3,7 +3,7 @@
 #
 # Domain name parser based on the Public Suffix List.
 #
-# Copyright (c) 2009-2011 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -195,6 +195,9 @@ module PublicSuffix
     #
     # @return [Array<PublicSuffix::Rule::*>]
     def select(domain)
+      # raise DomainInvalid, "`#{domain}' is not expected to contain a scheme"
+      return [] if domain.include?("://")
+
       indices = (@indexes[Domain.domain_to_labels(domain).first] || [])
       @rules.values_at(*indices).select { |rule| rule.match?(domain) }
     end

data/lib/public_suffix/rule.rb

@@ -3,7 +3,7 @@
 #
 # Domain name parser based on the Public Suffix List.
 #
-# Copyright (c) 2009-2011 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
 #++
 
 

data/lib/public_suffix/version.rb

@@ -3,7 +3,7 @@
 #
 # Domain name parser based on the Public Suffix List.
 #
-# Copyright (c) 2009-2011 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -11,7 +11,7 @@ module PublicSuffix
 
   module Version
     MAJOR = 1
-    MINOR = 0
+    MINOR = 1
     PATCH = 0
     BUILD = nil
 

data/public_suffix.gemspec

@@ -2,18 +2,18 @@
 
 Gem::Specification.new do |s|
   s.name = "public_suffix"
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Simone Carletti"]
-  s.date = "2011-12-24"
+  s.date = "2012-03-16"
   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", "Gemfile.lock", "LICENSE", "README.md", "Rakefile", "lib/public_suffix.rb", "lib/public_suffix/definitions.txt", "lib/public_suffix/domain.rb", "lib/public_suffix/errors.rb", "lib/public_suffix/list.rb", "lib/public_suffix/rule.rb", "lib/public_suffix/rule_list.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", ".travis.yml", ".yardopts", "CHANGELOG.md", "Gemfile", "LICENSE", "README.md", "Rakefile", "lib/public_suffix.rb", "lib/public_suffix/definitions.txt", "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://www.simonecarletti.com/code/public_suffix"
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "1.8.15"
   s.summary = "Domain name parser based in 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

@@ -20,16 +20,19 @@ class AcceptanceTest < Test::Unit::TestCase
       assert_equal tld, domain.tld, "Invalid tld for '#{name}'"
       assert_equal sld, domain.sld, "Invalid sld for '#{name}'"
       assert_equal trd, domain.trd, "Invalid trd for '#{name}'"
+      assert PublicSuffix.valid?(name)
     end
   end
 
   InvalidCases = {
     "nic.ke" => PublicSuffix::DomainNotAllowed,
+    "http://www.google.com" => PublicSuffix::DomainInvalid,
   }
 
   def test_invalid
     InvalidCases.each do |name, error|
       assert_raise(error) { PublicSuffix.parse(name) }
+      assert !PublicSuffix.valid?(name)
     end
   end
 

data/test/unit/list_test.rb

@@ -21,21 +21,10 @@ class PublicSuffix::ListTest < Test::Unit::TestCase
   end
 
   def test_indexes
-    @list = PublicSuffix::List.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 !@list.indexes.empty?
-    assert_equal [1,2,3,4], @list.indexes.delete('uk')
-    assert_equal [0], @list.indexes.delete('com')
-    assert @list.indexes.empty?
+    assert !list.indexes.empty?
+    assert_equal [1,2,3,4], list.indexes.delete('uk')
+    assert_equal [0], list.indexes.delete('com')
+    assert list.indexes.empty?
   end
 
 
@@ -88,37 +77,22 @@ EOS
 
 
   def test_find
-    @list = PublicSuffix::List.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 PublicSuffix::Rule.factory("com"),  @list.find("google.com")
-    assert_equal PublicSuffix::Rule.factory("com"),  @list.find("foo.google.com")
-    assert_equal PublicSuffix::Rule.factory("*.uk"), @list.find("google.uk")
-    assert_equal PublicSuffix::Rule.factory("*.uk"), @list.find("google.co.uk")
-    assert_equal PublicSuffix::Rule.factory("*.uk"), @list.find("foo.google.co.uk")
-    assert_equal PublicSuffix::Rule.factory("!british-library.uk"), @list.find("british-library.uk")
-    assert_equal PublicSuffix::Rule.factory("!british-library.uk"), @list.find("foo.british-library.uk")
+    assert_equal PublicSuffix::Rule.factory("com"),  list.find("google.com")
+    assert_equal PublicSuffix::Rule.factory("com"),  list.find("foo.google.com")
+    assert_equal PublicSuffix::Rule.factory("*.uk"), list.find("google.uk")
+    assert_equal PublicSuffix::Rule.factory("*.uk"), list.find("google.co.uk")
+    assert_equal PublicSuffix::Rule.factory("*.uk"), list.find("foo.google.co.uk")
+    assert_equal PublicSuffix::Rule.factory("!british-library.uk"), list.find("british-library.uk")
+    assert_equal PublicSuffix::Rule.factory("!british-library.uk"), list.find("foo.british-library.uk")
   end
 
   def test_select
-    @list = PublicSuffix::List.parse(<<EOS)
-// com : http://en.wikipedia.org/wiki/.com
-com
+    assert_equal 2, list.select("british-library.uk").size
+  end
 
-// uk : http://en.wikipedia.org/wiki/.uk
-*.uk
-*.sch.uk
-!bl.uk
-!british-library.uk
-EOS
-    assert_equal 2, @list.select("british-library.uk").size
+  def test_select_returns_empty_when_domain_has_scheme
+    assert_equal [], list.select("http://google.com")
+    assert_not_equal [], list.select("google.com")
   end
 
 
@@ -176,7 +150,14 @@ EOS
   end
 
   def test_self_parse_should_create_cache
-    list = PublicSuffix::List.parse(<<EOS)
+    assert_equal PublicSuffix::Rule.factory("com"), list.find("google.com")
+  end
+
+
+private
+
+  def list
+    @_list ||= PublicSuffix::List.parse(<<EOS)
 // com : http://en.wikipedia.org/wiki/.com
 com
 
@@ -186,8 +167,6 @@ com
 !bl.uk
 !british-library.uk
 EOS
-
-    assert_equal PublicSuffix::Rule.factory("com"), list.find("google.com")
   end
 
 end

data/test/unit/public_suffix_test.rb

@@ -52,16 +52,21 @@ class PublicSuffixTest < Test::Unit::TestCase
     assert_equal "www",     domain.trd
   end
 
-  def test_self_parse_should_raise_with_invalid_domain
+  def test_self_parse_raises_with_invalid_domain
     error = assert_raise(PublicSuffix::DomainInvalid) { PublicSuffix.parse("example.zip") }
     assert_match %r{example\.zip}, error.message
   end
 
-  def test_self_parse_should_raise_with_unallowed_domain
+  def test_self_parse_raises_with_unallowed_domain
     error = assert_raise(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") }
+    assert_match %r{http://google\.com}, error.message
+  end
+
 
   def test_self_valid
     assert  PublicSuffix.valid?("google.com")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: public_suffix
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-24 00:00:00.000000000Z
+date: 2012-03-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70114624505340 !ruby/object:Gem::Requirement
+  requirement: &70155750523420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70114624505340
+  version_requirements: *70155750523420
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70114624504860 !ruby/object:Gem::Requirement
+  requirement: &70155750522400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70114624504860
+  version_requirements: *70155750522400
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70114624504400 !ruby/object:Gem::Requirement
+  requirement: &70155750521360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70114624504400
+  version_requirements: *70155750521360
 description: PublicSuffix can parse and decompose a domain name into top level domain,
   domain and subdomains.
 email: weppos@weppos.net
@@ -57,7 +57,6 @@ files:
 - .yardopts
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -67,7 +66,6 @@ files:
 - lib/public_suffix/errors.rb
 - lib/public_suffix/list.rb
 - lib/public_suffix/rule.rb
-- lib/public_suffix/rule_list.rb
 - lib/public_suffix/version.rb
 - public_suffix.gemspec
 - test/acceptance_test.rb
@@ -97,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Domain name parser based in the Public Suffix List.

data/Gemfile.lock

@@ -1,22 +0,0 @@
-PATH
-  remote: .
-  specs:
-    public_suffix (1.0.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    metaclass (0.0.1)
-    mocha (0.10.0)
-      metaclass (~> 0.0.1)
-    rake (0.9.2)
-    yard (0.7.4)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  mocha
-  public_suffix!
-  rake
-  yard

data/lib/public_suffix/rule_list.rb

@@ -1,14 +0,0 @@
-#--
-# Public Suffix
-#
-# Domain name parser based on the Public Suffix List.
-#
-# Copyright (c) 2009-2011 Simone Carletti <weppos@weppos.net>
-#++
-
-
-warn("The PublicSuffix::RuleList object has been deprecated and will be removed in PublicSuffix 1.1. Please use PublicSuffix::List instead.")
-
-module PublicSuffix
-  RuleList = List
-end