domain_name 0.5.10 → 0.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3449ff3002168244e07e2443aee8d76ff66aee82
-  data.tar.gz: cfcbc63f00995bcfcfd6454c6b5a2684a04c22ef
+  metadata.gz: 0eafc47a4b3dfe9f636fec6cb6705d0dec0bd44a
+  data.tar.gz: 5ffe41e86eddfcd6507808b68f61d360af8eee9f
 SHA512:
-  metadata.gz: da9ad3a5b826afcc8cdfbc2c5b1ffa0bc7c9d5f081725cefeecd47a7aa63b892f93171a0ca2d19342a43da3dc0a46929c860be093430f4cde363380e40c19039
-  data.tar.gz: f1c2ca28ce9eeafd7d3f06e176a61c47e2da60424972030f24b62f14b42e509007a8ba44da6245182a7142e841c48f51f542560cab36b7185a1bf8ec51896643
+  metadata.gz: 770918024fa90f8ea009cb899bc98386140cf2deea2be85a7172217b0e7b627647a4ca737699bdbf8ffe6a99c50c2d0ac00cad6e078094d72b13cc129e4687f0
+  data.tar.gz: f8b2089004b251798c407995e5a5539bb7f2b71a5624b22c4c77decf045eb77e71ec42ac31e8e9a5619e29c15c4ad24e42781c2fe8d43cb18a1197828bd49ece

data/Rakefile

@@ -17,6 +17,8 @@ file ETLD_DATA_RB => [
   ruby 'tool/gen_etld_data.rb'
 end
 
+task :import => :etld_data
+
 task :etld_data do
   require 'open-uri'
   require 'time'

data/data/effective_tld_names.dat

@@ -6557,19 +6557,42 @@ xxx
 // ===END ICANN DOMAINS===
 // ===BEGIN PRIVATE DOMAINS===
 
-// info.at : http://www.info.at/
-biz.at
-info.at
+// Amazon CloudFront : https://aws.amazon.com/cloudfront/
+// Requested by Donavan Miller <donavanm@amazon.com> 2013-03-22
+cloudfront.net
 
-// priv.at : http://www.nic.priv.at/
-// Submitted by registry <lendl@nic.at> 2008-06-09
-priv.at
+// Amazon Elastic Load Balancing : https://aws.amazon.com/elasticloadbalancing/
+// Requested by Scott Vidmar <svidmar@amazon.com> 2013-03-27
+elb.amazonaws.com
 
-// co.ca : http://registry.co.ca
-co.ca
+// Amazon S3 : https://aws.amazon.com/s3/
+// Requested by Courtney Eckhardt <coec@amazon.com> 2013-03-22
+s3.amazonaws.com
+s3-us-west-2.amazonaws.com
+s3-us-west-1.amazonaws.com
+s3-eu-west-1.amazonaws.com
+s3-ap-southeast-1.amazonaws.com
+s3-ap-southeast-2.amazonaws.com
+s3-ap-northeast-1.amazonaws.com
+s3-sa-east-1.amazonaws.com
+s3-us-gov-west-1.amazonaws.com
+s3-fips-us-gov-west-1.amazonaws.com
+s3-website-us-east-1.amazonaws.com
+s3-website-us-west-2.amazonaws.com
+s3-website-us-west-1.amazonaws.com
+s3-website-eu-west-1.amazonaws.com
+s3-website-ap-southeast-1.amazonaws.com
+s3-website-ap-southeast-2.amazonaws.com
+s3-website-ap-northeast-1.amazonaws.com
+s3-website-sa-east-1.amazonaws.com
+s3-website-us-gov-west-1.amazonaws.com
+
+// BetaInABox
+// Requested by adrian@betainabox.com 2012-09-13
+betainabox.com
 
 // CentralNic : http://www.centralnic.com/names/domains
-// Confirmed by registry <gavin.brown@centralnic.com> 2012-09-27
+// Requested by registry <gavin.brown@centralnic.com> 2012-09-27
 ae.org
 ar.com
 br.com
@@ -6598,79 +6621,19 @@ us.org
 uy.com
 za.com
 
-// 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> 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
-
 // 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
+// co.ca : http://registry.co.ca/
+co.ca
 
 // CoDNS B.V.
-// Added 2010-05-23.
 co.nl
 co.no
 
-// Mainseek Sp. z o.o. : http://www.co.pl/
-co.pl
+// DreamHost : http://www.dreamhost.com/
+// Requested by Andrew Farmer <andrew.farmer@dreamhost.com> 2012-10-02
+dreamhosters.com
 
 // DynDNS.com : http://www.dyndns.com/services/dns/dyndns/
 dyndns-at-home.com
@@ -6953,46 +6916,83 @@ 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
+// Google, Inc.
+// 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
 
-// Amazon Elastic Load Balancing : https://aws.amazon.com/elasticloadbalancing/
-// Requested by Scott Vidmar <svidmar@amazon.com> 2013-03-27
-elb.amazonaws.com
+// iki.fi
+// Requested by Hannu Aronsson <haa@iki.fi> 2009-11-05
+iki.fi
 
-// Amazon S3 : https://aws.amazon.com/s3/
-// Requested by Courtney Eckhardt <coec@amazon.com> 2013-03-22
-s3.amazonaws.com
-s3-us-west-2.amazonaws.com
-s3-us-west-1.amazonaws.com
-s3-eu-west-1.amazonaws.com
-s3-ap-southeast-1.amazonaws.com
-s3-ap-southeast-2.amazonaws.com
-s3-ap-northeast-1.amazonaws.com
-s3-sa-east-1.amazonaws.com
-s3-us-gov-west-1.amazonaws.com
-s3-fips-us-gov-west-1.amazonaws.com
-s3-website-us-east-1.amazonaws.com
-s3-website-us-west-2.amazonaws.com
-s3-website-us-west-1.amazonaws.com
-s3-website-eu-west-1.amazonaws.com
-s3-website-ap-southeast-1.amazonaws.com
-s3-website-ap-southeast-2.amazonaws.com
-s3-website-ap-northeast-1.amazonaws.com
-s3-website-sa-east-1.amazonaws.com
-s3-website-us-gov-west-1.amazonaws.com
+// info.at : http://www.info.at/
+biz.at
+info.at
 
-// Amazon CloudFront : https://aws.amazon.com/cloudfront/
-// Requested by Donavan Miller <donavanm@amazon.com> 2013-03-22
-cloudfront.net
+// Michau Enterprises Limited : http://www.co.pl/
+co.pl
 
 // NYC.mn : http://www.information.nyc.mn
 // Requested by Matthew Brown <mattbrown@nyc.mn> 2013-03-11
 nyc.mn
 
+// Opera Software, A.S.A.
+// Requested by Yngve Pettersen <yngve@opera.com> 2009-11-26
+operaunite.com
+
+// Red Hat, Inc. OpenShift : https://openshift.redhat.com/
+// Requested by Tim Kramer <tkramer@rhcloud.com> 2012-10-24
+rhcloud.com
+
+// priv.at : http://www.nic.priv.at/
+// Requested by registry <lendl@nic.at> 2008-06-09
+priv.at
+
+// ZaNiC : http://www.za.net/
+// Requested by registry <hostmaster@nic.za.net> 2009-10-03
+za.net
+za.org
+
 // ===END PRIVATE DOMAINS===

data/lib/domain_name.rb

@@ -21,12 +21,17 @@ class DomainName
   attr_reader :hostname
 
   # The least "universally original" domain part of this domain name.
-  # For example, "example.co.uk" for "www.sub.example.co.uk".
+  # For example, "example.co.uk" for "www.sub.example.co.uk".  This
+  # may be nil if the hostname does not have one, like when it is an
+  # IP address, an effective TLD or higher itself, or of a
+  # non-canonical domain.
   attr_reader :domain
 
   # The TLD part of this domain name.  For example, if the hostname is
   # "www.sub.example.co.uk", the TLD part is "uk".  This property is
-  # nil only if +ipaddr?+ is true.
+  # nil only if +ipaddr?+ is true.  This may be nil if the hostname
+  # does not have one, like when it is an IP address or of a
+  # non-canonical domain.
   attr_reader :tld
 
   # Returns an IPAddr object if this is an IP address.
@@ -147,6 +152,13 @@ class DomainName
     end
   end
 
+  # Returns the superdomain of this domain name.
+  def superdomain
+    return nil if ipaddr?
+    pos = @hostname.index(DOT) or return nil
+    self.class.new(@hostname[(pos + 1)..-1])
+  end
+
   def ==(other)
     other = DomainName.new(other) unless DomainName === other
     other.hostname == @hostname

data/lib/domain_name/etld_data.rb

@@ -1,5 +1,5 @@
 class DomainName
-  ETLD_DATA_DATE = '2013-03-31T03:02:39Z'
+  ETLD_DATA_DATE = '2013-04-05T23:00:49Z'
 
   ETLD_DATA = {
     "ac" => 0,
@@ -5716,10 +5716,28 @@ class DomainName
     "za" => -1,
     "zm" => -1,
     "zw" => -1,
-    "biz.at" => 0,
-    "info.at" => 0,
-    "priv.at" => 0,
-    "co.ca" => 0,
+    "cloudfront.net" => 0,
+    "elb.amazonaws.com" => 0,
+    "s3.amazonaws.com" => 0,
+    "s3-us-west-2.amazonaws.com" => 0,
+    "s3-us-west-1.amazonaws.com" => 0,
+    "s3-eu-west-1.amazonaws.com" => 0,
+    "s3-ap-southeast-1.amazonaws.com" => 0,
+    "s3-ap-southeast-2.amazonaws.com" => 0,
+    "s3-ap-northeast-1.amazonaws.com" => 0,
+    "s3-sa-east-1.amazonaws.com" => 0,
+    "s3-us-gov-west-1.amazonaws.com" => 0,
+    "s3-fips-us-gov-west-1.amazonaws.com" => 0,
+    "s3-website-us-east-1.amazonaws.com" => 0,
+    "s3-website-us-west-2.amazonaws.com" => 0,
+    "s3-website-us-west-1.amazonaws.com" => 0,
+    "s3-website-eu-west-1.amazonaws.com" => 0,
+    "s3-website-ap-southeast-1.amazonaws.com" => 0,
+    "s3-website-ap-southeast-2.amazonaws.com" => 0,
+    "s3-website-ap-northeast-1.amazonaws.com" => 0,
+    "s3-website-sa-east-1.amazonaws.com" => 0,
+    "s3-website-us-gov-west-1.amazonaws.com" => 0,
+    "betainabox.com" => 0,
     "ae.org" => 0,
     "ar.com" => 0,
     "br.com" => 0,
@@ -5747,59 +5765,11 @@ class DomainName
     "us.org" => 0,
     "uy.com" => 0,
     "za.com" => 0,
-    "operaunite.com" => 0,
-    "appspot.com" => 0,
-    "blogspot.be" => 0,
-    "blogspot.bj" => 0,
-    "blogspot.ca" => 0,
-    "blogspot.cf" => 0,
-    "blogspot.ch" => 0,
-    "blogspot.co.at" => 0,
-    "blogspot.co.il" => 0,
-    "blogspot.co.nz" => 0,
-    "blogspot.co.uk" => 0,
-    "blogspot.com" => 0,
-    "blogspot.com.ar" => 0,
-    "blogspot.com.au" => 0,
-    "blogspot.com.br" => 0,
-    "blogspot.com.es" => 0,
-    "blogspot.cv" => 0,
-    "blogspot.cz" => 0,
-    "blogspot.de" => 0,
-    "blogspot.dk" => 0,
-    "blogspot.fi" => 0,
-    "blogspot.fr" => 0,
-    "blogspot.gr" => 0,
-    "blogspot.hk" => 0,
-    "blogspot.hu" => 0,
-    "blogspot.ie" => 0,
-    "blogspot.in" => 0,
-    "blogspot.it" => 0,
-    "blogspot.jp" => 0,
-    "blogspot.kr" => 0,
-    "blogspot.mr" => 0,
-    "blogspot.mx" => 0,
-    "blogspot.nl" => 0,
-    "blogspot.no" => 0,
-    "blogspot.pt" => 0,
-    "blogspot.re" => 0,
-    "blogspot.ro" => 0,
-    "blogspot.se" => 0,
-    "blogspot.sg" => 0,
-    "blogspot.sk" => 0,
-    "blogspot.td" => 0,
-    "blogspot.tw" => 0,
-    "codespot.com" => 0,
-    "googleapis.com" => 0,
-    "googlecode.com" => 0,
-    "dreamhosters.com" => 0,
-    "iki.fi" => 0,
     "c.la" => 0,
-    "za.net" => 0,
-    "za.org" => 0,
+    "co.ca" => 0,
     "co.nl" => 0,
     "co.no" => 0,
-    "co.pl" => 0,
+    "dreamhosters.com" => 0,
     "dyndns-at-home.com" => 0,
     "dyndns-at-work.com" => 0,
     "dyndns-blog.com" => 0,
@@ -6079,30 +6049,60 @@ class DomainName
     "webhop.org" => 0,
     "worse-than.tv" => 0,
     "writesthisblog.com" => 0,
-    "betainabox.com" => 0,
-    "rhcloud.com" => 0,
-    "elb.amazonaws.com" => 0,
-    "s3.amazonaws.com" => 0,
-    "s3-us-west-2.amazonaws.com" => 0,
-    "s3-us-west-1.amazonaws.com" => 0,
-    "s3-eu-west-1.amazonaws.com" => 0,
-    "s3-ap-southeast-1.amazonaws.com" => 0,
-    "s3-ap-southeast-2.amazonaws.com" => 0,
-    "s3-ap-northeast-1.amazonaws.com" => 0,
-    "s3-sa-east-1.amazonaws.com" => 0,
-    "s3-us-gov-west-1.amazonaws.com" => 0,
-    "s3-fips-us-gov-west-1.amazonaws.com" => 0,
-    "s3-website-us-east-1.amazonaws.com" => 0,
-    "s3-website-us-west-2.amazonaws.com" => 0,
-    "s3-website-us-west-1.amazonaws.com" => 0,
-    "s3-website-eu-west-1.amazonaws.com" => 0,
-    "s3-website-ap-southeast-1.amazonaws.com" => 0,
-    "s3-website-ap-southeast-2.amazonaws.com" => 0,
-    "s3-website-ap-northeast-1.amazonaws.com" => 0,
-    "s3-website-sa-east-1.amazonaws.com" => 0,
-    "s3-website-us-gov-west-1.amazonaws.com" => 0,
-    "cloudfront.net" => 0,
+    "appspot.com" => 0,
+    "blogspot.be" => 0,
+    "blogspot.bj" => 0,
+    "blogspot.ca" => 0,
+    "blogspot.cf" => 0,
+    "blogspot.ch" => 0,
+    "blogspot.co.at" => 0,
+    "blogspot.co.il" => 0,
+    "blogspot.co.nz" => 0,
+    "blogspot.co.uk" => 0,
+    "blogspot.com" => 0,
+    "blogspot.com.ar" => 0,
+    "blogspot.com.au" => 0,
+    "blogspot.com.br" => 0,
+    "blogspot.com.es" => 0,
+    "blogspot.cv" => 0,
+    "blogspot.cz" => 0,
+    "blogspot.de" => 0,
+    "blogspot.dk" => 0,
+    "blogspot.fi" => 0,
+    "blogspot.fr" => 0,
+    "blogspot.gr" => 0,
+    "blogspot.hk" => 0,
+    "blogspot.hu" => 0,
+    "blogspot.ie" => 0,
+    "blogspot.in" => 0,
+    "blogspot.it" => 0,
+    "blogspot.jp" => 0,
+    "blogspot.kr" => 0,
+    "blogspot.mr" => 0,
+    "blogspot.mx" => 0,
+    "blogspot.nl" => 0,
+    "blogspot.no" => 0,
+    "blogspot.pt" => 0,
+    "blogspot.re" => 0,
+    "blogspot.ro" => 0,
+    "blogspot.se" => 0,
+    "blogspot.sg" => 0,
+    "blogspot.sk" => 0,
+    "blogspot.td" => 0,
+    "blogspot.tw" => 0,
+    "codespot.com" => 0,
+    "googleapis.com" => 0,
+    "googlecode.com" => 0,
+    "iki.fi" => 0,
+    "biz.at" => 0,
+    "info.at" => 0,
+    "co.pl" => 0,
     "nyc.mn" => 0,
+    "operaunite.com" => 0,
+    "rhcloud.com" => 0,
+    "priv.at" => 0,
+    "za.net" => 0,
+    "za.org" => 0,
   }
 
   def self.etld_data

data/lib/domain_name/version.rb

@@ -1,3 +1,3 @@
 class DomainName
-  VERSION = "0.5.10"
+  VERSION = "0.5.11"
 end

data/test/test_domain_name.rb

@@ -246,6 +246,7 @@ class TestDomainName < Test::Unit::TestCase
     assert_equal(true, dn.cookie_domain?(dn, true))
     assert_equal(false, dn.cookie_domain?('168.10.20'))
     assert_equal(false, dn.cookie_domain?('20'))
+    assert_equal(nil, dn.superdomain)
   end
 
   should "parse IPv6 addresseses" do
@@ -263,6 +264,22 @@ class TestDomainName < Test::Unit::TestCase
       assert_equal(true, dn.cookie_domain?(dn, true))
       assert_equal(true, dn.cookie_domain?(a))
       assert_equal(true, dn.cookie_domain?(a, true))
+      assert_equal(nil, dn.superdomain)
+    }
+  end
+
+  should "get superdomain" do
+    [
+      %w[www.sub.example.local sub.example.local example.local local],
+      %w[www.sub.example.com sub.example.com example.com com],
+    ].each { |domain, *superdomains|
+      dn = DomainName(domain)
+      superdomains.each { |superdomain|
+        sdn = DomainName(superdomain)
+        assert_equal sdn, dn.superdomain
+        dn = sdn
+      }
+      assert_equal nil, dn.superdomain
     }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: domain_name
 version: !ruby/object:Gem::Version
-  version: 0.5.10
+  version: 0.5.11
 platform: ruby
 authors:
 - Akinori MUSHA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-01 00:00:00.000000000 Z
+date: 2013-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unf
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Domain Name manipulation library for Ruby