public_suffix 1.1.3 → 1.2.0

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 # Changelog
 
 
+## Release 1.2.0
+
+- NEW: Allow a custom List on `PublicSuffix.parse` (GH-26). [Thanks @itspriddle]
+
+- FIXED: PublicSuffix.parse and PublicSuffix.valid? crashes when input is nil (GH-20).
+
+- CHANGED: Updated definitions.
+
+
 ## Release 1.1.3
 
 - CHANGED: Updated definitions.

data/{LICENSE → LICENSE.txt}

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

data/README.md

@@ -2,7 +2,7 @@
 
 *PublicSuffix* is a Ruby domain name parser based on the [Public Suffix List](http://publicsuffix.org/).
 
-[![Build Status](https://secure.travis-ci.org/weppos/public_suffix_service.png)](http://travis-ci.org/weppos/public_suffix_service)
+[![Build Status](https://secure.travis-ci.org/weppos/publicsuffix-ruby.png)](http://travis-ci.org/weppos/publicsuffix-ruby)
 
 
 ## What is the Public Suffix List?
@@ -35,9 +35,9 @@ Not convinced yet? Check out [this real world example](http://stackoverflow.com/
 
 - Ruby >= 1.8.7
 
-*PublicSuffix* requires Ruby 1.8.7 or greater. For older versions of Ruby, see the CHANGELOG.md file.
+*PublicSuffix* requires Ruby 1.8.7 or greater. For older versions of Ruby, see the [CHANGELOG.md](CHANGELOG.md) file.
 
-We also support several [Ruby implementations](http://www.simonecarletti.com/code/public_suffix/#implementations).
+We also support several [Ruby implementations](http://www.simonecarletti.com/code/publicsuffix/#implementations).
 
 
 ## Installation
@@ -115,13 +115,13 @@ If you use this library and find yourself missing any functionality, please [let
 
 Pull requests are very welcome! Please include tests and/or feature coverage for every patch, and create a topic branch for every separate change you make.
 
-Report issues or feature requests to [GitHub Issues](https://github.com/weppos/public_suffix_service/issues).
+Report issues or feature requests to [GitHub Issues](https://github.com/weppos/publicsuffix-ruby/issues).
 
 
 ## More
 
-* [Homepage](http://www.simonecarletti.com/code/public_suffix)
-* [Repository](https://github.com/weppos/public_suffix_service)
+* [Homepage](http://www.simonecarletti.com/code/publicsuffix)
+* [Repository](https://github.com/weppos/publicsuffix-ruby)
 * [API Documentation](http://rubydoc.info/gems/public_suffix)
 * [Introducing the Public Suffix List library for Ruby](http://www.simonecarletti.com/blog/2010/06/public-suffix-list-library-for-ruby/)
 

data/lib/public_suffix.rb

@@ -24,10 +24,10 @@ module PublicSuffix
   # Parses +domain+ and returns the
   # {PublicSuffix::Domain} instance.
   #
-  # Parsing uses the default {PublicSuffix::List}.
-  #
   # @param  [String, #to_s] domain
   #   The domain name or fully qualified domain name to parse.
+  # @param  [PublicSuffix::List] list
+  #   The rule list to search, defaults to the default {PublicSuffix::List}
   #
   # @return [PublicSuffix::Domain]
   #
@@ -61,8 +61,8 @@ module PublicSuffix
   #   If a rule for +domain+ is found, but the rule
   #   doesn't allow +domain+.
   #
-  def self.parse(domain)
-    rule = List.default.find(domain)
+  def self.parse(domain, list = List.default)
+    rule = list.find(domain)
 
     if rule.nil?
       raise DomainInvalid, "`#{domain}' is not a valid domain"

data/lib/public_suffix/definitions.txt

@@ -219,7 +219,6 @@ net.au
 org.au
 edu.au
 gov.au
-csiro.au
 asn.au
 id.au
 // Historic 2LDs (closed to new registration, but sites still exist)
@@ -950,9 +949,15 @@ gov.gr
 // gs : http://en.wikipedia.org/wiki/.gs
 gs
 
-// gt : http://www.gt/politicas.html
-*.gt
-!www.gt
+// gt : http://www.gt/politicas_de_registro.html
+gt
+com.gt
+edu.gt
+gob.gt
+ind.gt
+mil.gt
+net.gt
+org.gt
 
 // gu : http://gadao.gov.gu/registration.txt
 *.gu
@@ -4166,6 +4171,7 @@ name.my
 
 // mz : http://www.gobin.info/domainname/mz-template.doc
 *.mz
+!teledata.mz
 
 // na : http://www.na-nic.com.na/
 // http://www.info.na/domain/
@@ -5359,8 +5365,16 @@ ed.pw
 go.pw
 belau.pw
 
-// py : http://www.nic.py/faq_a.html#faq_b
-*.py
+// py : http://www.nic.py/pautas.html#seccion_9
+// Confirmed by registry 2012-10-03
+py
+com.py
+coop.py
+edu.py
+gov.py
+mil.py
+net.py
+org.py
 
 // qa : http://domains.qa/en/
 qa
@@ -5999,20 +6013,19 @@ com.ug
 org.ug
 
 // uk : http://en.wikipedia.org/wiki/.uk
+// Submitted by registry <noc@nominet.org.uk> 2012-10-02
+// and tweaked by us pending further consultation.
 *.uk
 *.sch.uk
 !bl.uk
 !british-library.uk
-!icnet.uk
 !jet.uk
 !mod.uk
+!national-library-scotland.uk
 !nel.uk
-!nhs.uk
 !nic.uk
 !nls.uk
-!national-library-scotland.uk
 !parliament.uk
-!police.uk
 
 // us : http://en.wikipedia.org/wiki/.us
 us
@@ -6288,8 +6301,19 @@ gov.vc
 mil.vc
 edu.vc
 
-// ve : http://registro.nic.ve/nicve/registro/index.html
-*.ve
+// ve : https://registro.nic.ve/
+// Confirmed by registry 2012-10-04
+ve
+co.ve
+com.ve
+e12.ve
+edu.ve
+gov.ve
+info.ve
+mil.ve
+net.ve
+org.ve
+web.ve
 
 // vg : http://en.wikipedia.org/wiki/.vg
 vg
@@ -6529,15 +6553,20 @@ priv.at
 co.ca
 
 // CentralNic : http://www.centralnic.com/names/domains
-// Confirmed by registry <gavin.brown@centralnic.com> 2008-06-09
+// Confirmed by registry <gavin.brown@centralnic.com> 2012-09-27
+ae.org
 ar.com
 br.com
 cn.com
+com.de
 de.com
 eu.com
 gb.com
+gb.net
 gr.com
 hu.com
+hu.net
+jp.net
 jpn.com
 kr.com
 no.com
@@ -6545,25 +6574,68 @@ qc.com
 ru.com
 sa.com
 se.com
+se.net
 uk.com
+uk.net
 us.com
+us.org
 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
+// Requested by Eduardo Vela <evn@google.com> 2012-10-24
 appspot.com
+blogspot.be
+blogspot.bj
+blogspot.ca
+blogspot.cf
+blogspot.ch
+blogspot.co.at
+blogspot.co.il
+blogspot.co.nz
+blogspot.co.uk
+blogspot.com
+blogspot.com.ar
+blogspot.com.au
+blogspot.com.br
+blogspot.com.es
+blogspot.cv
+blogspot.cz
+blogspot.de
+blogspot.dk
+blogspot.fi
+blogspot.fr
+blogspot.gr
+blogspot.hk
+blogspot.hu
+blogspot.ie
+blogspot.in
+blogspot.it
+blogspot.jp
+blogspot.kr
+blogspot.mr
+blogspot.mx
+blogspot.nl
+blogspot.no
+blogspot.pt
+blogspot.re
+blogspot.ro
+blogspot.se
+blogspot.sg
+blogspot.sk
+blogspot.td
+blogspot.tw
+codespot.com
+googleapis.com
+googlecode.com
+
+// DreamHost : http://www.dreamhost.com/
+// Requested by Andrew Farmer <andrew.farmer@dreamhost.com> 2012-10-02
+dreamhosters.com
 
 // iki.fi : Submitted by Hannu Aronsson <haa@iki.fi> 2009-11-05
 iki.fi
@@ -6865,4 +6937,12 @@ webhop.org
 worse-than.tv
 writesthisblog.com
 
+// BetaInABox
+// Requested by adrian@betainabox.com 2012-09-13
+betainabox.com
+
+// Red Hat, Inc. OpenShift : https://openshift.redhat.com/
+// Requested by Tim Kramer <tkramer@rhcloud.com> 2012-10-24
+rhcloud.com
+
 // ===END PRIVATE DOMAINS===

data/lib/public_suffix/list.rb

@@ -272,6 +272,8 @@ module PublicSuffix
     #
     # @return [Array<PublicSuffix::Rule::*>]
     def select(domain)
+      # raise DomainInvalid, "Blank domain"
+      return [] if domain.to_s !~ /[^[:space:]]/
       # raise DomainInvalid, "`#{domain}' is not expected to contain a scheme"
       return [] if domain.include?("://")
 

data/lib/public_suffix/version.rb

@@ -11,8 +11,8 @@ module PublicSuffix
 
   module Version
     MAJOR = 1
-    MINOR = 1
-    PATCH = 3
+    MINOR = 2
+    PATCH = 0
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join(".")

data/public_suffix.gemspec

@@ -2,14 +2,14 @@
 
 Gem::Specification.new do |s|
   s.name = "public_suffix"
-  s.version = "1.1.3"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Simone Carletti"]
-  s.date = "2012-09-17"
+  s.date = "2012-12-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", "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.files = [".gemtest", ".gitignore", ".travis.yml", ".yardopts", "CHANGELOG.md", "Gemfile", "LICENSE.txt", "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")

data/test/acceptance_test.rb

@@ -24,13 +24,16 @@ class AcceptanceTest < Test::Unit::TestCase
     end
   end
 
-  InvalidCases = {
-    "nic.ke" => PublicSuffix::DomainNotAllowed,
-    "http://www.google.com" => PublicSuffix::DomainInvalid,
-  }
+  InvalidCases = [
+    ["nic.ke",                  PublicSuffix::DomainNotAllowed],
+    ["http://www.google.com",   PublicSuffix::DomainInvalid],
+    [nil,                       PublicSuffix::DomainInvalid],
+    ["",                        PublicSuffix::DomainInvalid],
+    ["  ",                      PublicSuffix::DomainInvalid],
+  ]
 
   def test_invalid
-    InvalidCases.each do |name, error|
+    InvalidCases.each do |(name, error)|
       assert_raise(error) { PublicSuffix.parse(name) }
       assert !PublicSuffix.valid?(name)
     end

data/test/unit/list_test.rb

@@ -95,6 +95,15 @@ class PublicSuffix::ListTest < Test::Unit::TestCase
     assert_not_equal [], list.select("google.com")
   end
 
+  def test_select_returns_empty_when_domain_is_nil
+    assert_equal [], list.select(nil)
+  end
+
+  def test_select_returns_empty_when_domain_is_blank
+    assert_equal [], list.select("")
+    assert_equal [], list.select("  ")
+  end
+
 
   def test_self_default_getter
     assert_equal     nil, PublicSuffix::List.class_eval { @default }

data/test/unit/public_suffix_test.rb

@@ -52,6 +52,16 @@ class PublicSuffixTest < Test::Unit::TestCase
     assert_equal "www",     domain.trd
   end
 
+  def test_self_parse_a_domain_with_custom_list
+    list = PublicSuffix::List.new
+    list << PublicSuffix::Rule.factory("test")
+
+    domain = PublicSuffix.parse("www.example.test", list)
+    assert_equal "test",    domain.tld
+    assert_equal "example", domain.sld
+    assert_equal "www",     domain.trd
+  end
+
   def test_self_parse_raises_with_invalid_domain
     error = assert_raise(PublicSuffix::DomainInvalid) { PublicSuffix.parse("example.zip") }
     assert_match %r{example\.zip}, error.message

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: public_suffix
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-17 00:00:00.000000000 Z
+date: 2012-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -72,7 +72,7 @@ files:
 - .yardopts
 - CHANGELOG.md
 - Gemfile
-- LICENSE
+- LICENSE.txt
 - README.md
 - Rakefile
 - lib/public_suffix.rb