From a157c3d7f27f99f6662907ba26baa8c233d79b4b Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Fri, 4 Aug 2017 15:03:10 +0200 Subject: [PATCH 01/76] Update Travis config --- .travis.yml | 21 ++++++++++----------- README.md | 2 +- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index f63ea840..30d827b7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,26 +1,25 @@ language: ruby rvm: + - 2.0 - 2.1 - 2.2 - - 2.3.3 - - 2.4.0 + - 2.3 + - 2.4 + - jruby-9.1.5.0 - ruby-head - - jruby-9.0.5.0 - - jruby-9.1.0.0 -before_install: - - gem update --system - - gem install bundler +env: + - COVERALL=1 cache: - bundler -env: - - COVERALL=1 - matrix: allow_failures: - rvm: ruby-head - - rvm: jruby-9.0.5.0 - rvm: jruby-9.1.0.0 + +before_install: + - rvm get latest + - gem install bundler \ No newline at end of file diff --git a/README.md b/README.md index c2d9b5d2..1e066822 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ ## Requirements -- Ruby >= 2.0 +- Ruby >= 2.1 For an older versions of Ruby use a previous release. From dc7702db0a8a84ed272b3b900da33812029b43c1 Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Fri, 4 Aug 2017 18:27:54 +0200 Subject: [PATCH 02/76] 2.0 is no longer supported --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 30d827b7..3542f984 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: ruby rvm: - - 2.0 - 2.1 - 2.2 - 2.3 @@ -22,4 +21,4 @@ matrix: before_install: - rvm get latest - - gem install bundler \ No newline at end of file + - gem install bundler From 03436a8da1d9dfa53f4bfc27d9398dfaab44ea9e Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Tue, 31 Oct 2017 10:34:28 -0700 Subject: [PATCH 03/76] Fix wrong docs Closes GH-145 --- lib/public_suffix/list.rb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/public_suffix/list.rb b/lib/public_suffix/list.rb index 04e53a98..4bd432f8 100644 --- a/lib/public_suffix/list.rb +++ b/lib/public_suffix/list.rb @@ -51,9 +51,7 @@ def self.default(**options) # Sets the default rule list to +value+. # - # @param [PublicSuffix::List] value - # The new rule list. - # + # @param value [PublicSuffix::List] the new list # @return [PublicSuffix::List] def self.default=(value) @default = value @@ -63,9 +61,9 @@ def self.default=(value) # # See http://publicsuffix.org/format/ for more details about input format. # - # @param string [#each_line] The list to parse. - # @param private_domains [Boolean] whether to ignore the private domains section. - # @return [Array] + # @param string [#each_line] the list to parse + # @param private_domains [Boolean] whether to ignore the private domains section + # @return [PublicSuffix::List] def self.parse(input, private_domains: true) comment_token = "//".freeze private_token = "===BEGIN PRIVATE DOMAINS===".freeze From f1b3142078406a7480d2817f5657ac6b6e126d38 Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Tue, 31 Oct 2017 10:56:05 -0700 Subject: [PATCH 04/76] Fix Rubocop offenses --- .rubocop_defaults.yml | 3 +++ test/unit/list_test.rb | 20 ++++++++++---------- test/unit/public_suffix_test.rb | 6 +++--- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/.rubocop_defaults.yml b/.rubocop_defaults.yml index 86a8e810..1e73daac 100644 --- a/.rubocop_defaults.yml +++ b/.rubocop_defaults.yml @@ -6,6 +6,9 @@ AllCops: - 'tmp/**/*' - 'vendor/**/*' +Lint/RescueWithoutErrorClass: + Enabled: false + # [codesmell] Metrics/AbcSize: Enabled: false diff --git a/test/unit/list_test.rb b/test/unit/list_test.rb index 874c5ccc..693945d1 100644 --- a/test/unit/list_test.rb +++ b/test/unit/list_test.rb @@ -28,10 +28,10 @@ def test_equality_with_internals end def test_each_without_block - list = PublicSuffix::List.parse(< Date: Wed, 8 Nov 2017 16:52:20 +0000 Subject: [PATCH 05/76] Improve performance and avoid allocation. --- lib/public_suffix/rule.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/public_suffix/rule.rb b/lib/public_suffix/rule.rb index f5d8169f..735ad725 100644 --- a/lib/public_suffix/rule.rb +++ b/lib/public_suffix/rule.rb @@ -165,7 +165,7 @@ def match?(name) # we need to properly walk the input and skip parts according # to wildcard component. diff = name.chomp(value) - diff.empty? || diff[-1] == DOT + diff.empty? || diff.end_with?(DOT) end # @abstract From 8a2baf19bbfe33e72b9db4a60cad9682da3310e6 Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Wed, 8 Nov 2017 12:02:18 -0500 Subject: [PATCH 06/76] Updated definitions --- CHANGELOG.md | 5 +++ data/list.txt | 103 ++++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 88 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ab62ddc1..1419f731 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ # Changelog +#### master + +- CHANGED: Updated definitions. + + #### Release 3.0.0 This new version includes a major redesign of the library internals, with the goal to drastically diff --git a/data/list.txt b/data/list.txt index 1258bdd8..ebd88d4c 100644 --- a/data/list.txt +++ b/data/list.txt @@ -399,24 +399,34 @@ tv.bo // br : http://registro.br/dominio/categoria.html // Submitted by registry br +abc.br adm.br adv.br agr.br +aju.br am.br +aparecida.br arq.br art.br ato.br b.br belem.br +bhz.br bio.br blog.br bmd.br +boavista.br +bsb.br +campinas.br +caxias.br cim.br cng.br cnt.br com.br +contagem.br coop.br cri.br +cuiaba.br def.br ecn.br eco.br @@ -427,14 +437,17 @@ esp.br etc.br eti.br far.br +feira.br flog.br floripa.br fm.br fnd.br +fortal.br fot.br fst.br g12.br ggf.br +goiania.br gov.br // gov.br 26 states + df https://en.wikipedia.org/wiki/States_of_Brazil ac.gov.br @@ -464,42 +477,65 @@ sc.gov.br se.gov.br sp.gov.br to.gov.br +gru.br imb.br ind.br inf.br +jab.br jampa.br +jdf.br +joinville.br jor.br jus.br leg.br lel.br +londrina.br +macapa.br +maceio.br mat.br med.br mil.br +morena.br mp.br mus.br +natal.br net.br +niteroi.br *.nom.br not.br ntr.br odo.br org.br +osasco.br +palmas.br poa.br ppg.br pro.br psc.br psi.br +pvh.br qsl.br radio.br rec.br recife.br +ribeirao.br +rio.br +riobranco.br +salvador.br +sampa.br +sjc.br slg.br +slz.br +sorocaba.br srv.br taxi.br teo.br +the.br tmp.br trd.br tur.br tv.br +udi.br vet.br vix.br vlog.br @@ -6472,6 +6508,17 @@ lib.wy.us pvt.k12.ma.us chtr.k12.ma.us paroch.k12.ma.us +// Merit Network, Inc. maintains the registry for =~ /(k12|cc|lib).mi.us/ and the following +// see also: http://domreg.merit.edu +// see also: whois -h whois.domreg.merit.edu help +ann-arbor.mi.us +cog.mi.us +dst.mi.us +eaton.mi.us +gen.mi.us +mus.mi.us +tec.mi.us +washtenaw.mi.us // uy : http://www.nic.org.uy/ uy @@ -7473,9 +7520,6 @@ cheap // chintai : 2015-06-11 CHINTAI Corporation chintai -// chloe : 2014-10-16 Richemont DNS Inc. -chloe - // christmas : 2013-11-21 Uniregistry, Corp. christmas @@ -8346,9 +8390,6 @@ how // hsbc : 2014-10-24 HSBC Holdings PLC hsbc -// htc : 2015-04-02 HTC corporation -htc - // hughes : 2015-07-30 Hughes Satellite Systems Corporation hughes @@ -8802,12 +8843,6 @@ mattel // mba : 2015-04-02 Lone Hollow, LLC mba -// mcd : 2015-07-30 McDonald’s Corporation -mcd - -// mcdonalds : 2015-07-30 McDonald’s Corporation -mcdonalds - // mckinsey : 2015-07-31 McKinsey Holdings, Inc. mckinsey @@ -8898,9 +8933,6 @@ money // monster : 2015-09-11 Monster Worldwide, Inc. monster -// montblanc : 2014-06-23 Richemont DNS Inc. -montblanc - // mopar : 2015-07-30 FCA US LLC. mopar @@ -9132,9 +9164,6 @@ ovh // page : 2014-12-04 Charleston Road Registry Inc. page -// pamperedchef : 2015-02-05 The Pampered Chef, Ltd. -pamperedchef - // panasonic : 2015-07-30 Panasonic Corporation panasonic @@ -10582,8 +10611,23 @@ us-east-1.amazonaws.com // Amazon Elastic Beanstalk : https://aws.amazon.com/elasticbeanstalk/ // Submitted by Luke Wells -elasticbeanstalk.cn-north-1.amazonaws.com.cn -*.elasticbeanstalk.com +cn-north-1.eb.amazonaws.com.cn +elasticbeanstalk.com +ap-northeast-1.elasticbeanstalk.com +ap-northeast-2.elasticbeanstalk.com +ap-south-1.elasticbeanstalk.com +ap-southeast-1.elasticbeanstalk.com +ap-southeast-2.elasticbeanstalk.com +ca-central-1.elasticbeanstalk.com +eu-central-1.elasticbeanstalk.com +eu-west-1.elasticbeanstalk.com +eu-west-2.elasticbeanstalk.com +sa-east-1.elasticbeanstalk.com +us-east-1.elasticbeanstalk.com +us-east-2.elasticbeanstalk.com +us-gov-west-1.elasticbeanstalk.com +us-west-1.elasticbeanstalk.com +us-west-2.elasticbeanstalk.com // Amazon Elastic Load Balancing : https://aws.amazon.com/elasticloadbalancing/ // Submitted by Luke Wells @@ -10871,6 +10915,10 @@ firm.dk reg.dk store.dk +// Debian : https://www.debian.org/ +// Submitted by Peter Palfrader / Debian Sysadmin Team +debian.net + // deSEC : https://desec.io/ // Submitted by Peter Thomassen dedyn.io @@ -11398,6 +11446,10 @@ vladikavkaz.su vladimir.su vologda.su +// Fancy Bits, LLC : http://getchannels.com +// Submitted by Aman Gupta +channelsdvr.net + // Fastly Inc. : http://www.fastly.com/ // Submitted by Fastly Security fastlylb.net @@ -11448,6 +11500,7 @@ myfusion.cloud // Futureweb OG : http://www.futureweb.at // Submitted by Andreas Schnederle-Wagner +*.futurecms.at futurehosting.at futuremailing.at *.ex.ortsinfo.at @@ -11630,6 +11683,10 @@ se.leg.br sp.leg.br to.leg.br +// intermetrics GmbH : https://pixolino.com/ +// Submitted by Wolfgang Schwarz +pixolino.com + // IPiFony Systems, Inc. : https://www.ipifony.com/ // Submitted by Matthew Hardeman ipifony.net @@ -11953,6 +12010,7 @@ protonet.io // Publication Presse Communication SARL : https://ppcom.fr // Submitted by Yaacov Akiba Slama chirurgiens-dentistes-en-france.fr +byen.site // QA2 // Submitted by Daniel Dent (https://www.danieldent.com/) @@ -12180,10 +12238,15 @@ lib.de.us // Submitted by Simon Kissel router.management +// Virtual-Info : https://www.virtual-info.info/ +// Submitted by Adnan RIHAN +v-info.info + // WeDeploy by Liferay, Inc. : https://www.wedeploy.com // Submitted by Henrique Vicente wedeploy.io wedeploy.me +wedeploy.sh // Western Digital Technologies, Inc : https://www.wdc.com // Submitted by Jung Jin From d63f20c6ea6f8f3e80df679a820e8b6d1ae6d164 Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Wed, 8 Nov 2017 12:03:01 -0500 Subject: [PATCH 07/76] Changelog for GH-146 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1419f731..a12ae918 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ #### master - CHANGED: Updated definitions. +- CHANGED: Improve performance and avoid allocation (GH-146). [Thanks @robholland] #### Release 3.0.0 From 0c0561d0fe0c8e1c5cd78c9b97e01595455103e3 Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Wed, 8 Nov 2017 15:43:15 -0500 Subject: [PATCH 08/76] Release 3.0.1 --- CHANGELOG.md | 2 +- lib/public_suffix/version.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a12ae918..57cf3909 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Changelog -#### master +#### Release 3.0.1 - CHANGED: Updated definitions. - CHANGED: Improve performance and avoid allocation (GH-146). [Thanks @robholland] diff --git a/lib/public_suffix/version.rb b/lib/public_suffix/version.rb index b422ab1a..252da920 100644 --- a/lib/public_suffix/version.rb +++ b/lib/public_suffix/version.rb @@ -6,5 +6,5 @@ module PublicSuffix # The current library version. - VERSION = "3.0.0".freeze + VERSION = "3.0.1".freeze end From 844f8989e744c9aafa41506b75848fb4bd985d13 Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Mon, 12 Feb 2018 10:08:19 +0100 Subject: [PATCH 09/76] Update Rubocop --- .rubocop_defaults.yml | 11 ++++++++--- test/psl_test.rb | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.rubocop_defaults.yml b/.rubocop_defaults.yml index 1e73daac..a93d9e4e 100644 --- a/.rubocop_defaults.yml +++ b/.rubocop_defaults.yml @@ -6,9 +6,6 @@ AllCops: - 'tmp/**/*' - 'vendor/**/*' -Lint/RescueWithoutErrorClass: - Enabled: false - # [codesmell] Metrics/AbcSize: Enabled: false @@ -108,6 +105,11 @@ Layout/EmptyLineBetweenDefs: Style/FormatString: Enabled: false +# Annotated tokens (like %s) are a good thing, but in most cases we don't need them. +# %s is a simpler and straightforward version that works in almost all cases. So don't complain. +Style/FormatStringToken: + Enabled: false + # Prefer the latest Hash syntax Style/HashSyntax: Exclude: @@ -116,6 +118,9 @@ Style/HashSyntax: # that looks nicer with the old rocket syntax. - 'Rakefile' +Style/RescueStandardError: + Enabled: false + # Array indentation should be considered like MultilineMethodCallIndentation indentation # and use 4 spaces instead of 2. Layout/IndentArray: diff --git a/test/psl_test.rb b/test/psl_test.rb index 81d3f9eb..0ccc2fa8 100644 --- a/test/psl_test.rb +++ b/test/psl_test.rb @@ -24,7 +24,7 @@ def self.tests [input, output] end end - # rubocop:enable + # rubocop:enable Security/Eval def test_valid From 15d17398f26e4f867f470ab4cd599adc63e9be2e Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Mon, 12 Feb 2018 10:09:18 +0100 Subject: [PATCH 10/76] Test against 2.5 (closes GH-148) --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 3542f984..e023d2eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ rvm: - 2.2 - 2.3 - 2.4 + - 2.5 - jruby-9.1.5.0 - ruby-head From da7b20b0d145838d92b9ea2b1c99a7aa5e6af7ae Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Mon, 12 Feb 2018 10:10:21 +0100 Subject: [PATCH 11/76] Update definitions --- CHANGELOG.md | 5 +++ data/list.txt | 100 +++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 96 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 57cf3909..e9b4f4f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ # Changelog +#### master + +- CHANGED: Updated definitions. + + #### Release 3.0.1 - CHANGED: Updated definitions. diff --git a/data/list.txt b/data/list.txt index ebd88d4c..b2d261ec 100644 --- a/data/list.txt +++ b/data/list.txt @@ -384,27 +384,62 @@ org.bm // bn : https://en.wikipedia.org/wiki/.bn *.bn -// bo : http://www.nic.bo/ +// bo : https://nic.bo/delegacion2015.php#h-1.10 bo com.bo edu.bo -gov.bo gob.bo int.bo org.bo net.bo mil.bo tv.bo +web.bo +// Social Domains +academia.bo +agro.bo +arte.bo +blog.bo +bolivia.bo +ciencia.bo +cooperativa.bo +democracia.bo +deporte.bo +ecologia.bo +economia.bo +empresa.bo +indigena.bo +industria.bo +info.bo +medicina.bo +movimiento.bo +musica.bo +natural.bo +nombre.bo +noticias.bo +patria.bo +politica.bo +profesional.bo +plurinacional.bo +pueblo.bo +revista.bo +salud.bo +tecnologia.bo +tksat.bo +transporte.bo +wiki.bo // br : http://registro.br/dominio/categoria.html // Submitted by registry br +9guacu.br abc.br adm.br adv.br agr.br aju.br am.br +anani.br aparecida.br arq.br art.br @@ -417,6 +452,7 @@ blog.br bmd.br boavista.br bsb.br +campinagrande.br campinas.br caxias.br cim.br @@ -427,6 +463,7 @@ contagem.br coop.br cri.br cuiaba.br +curitiba.br def.br ecn.br eco.br @@ -444,6 +481,7 @@ fm.br fnd.br fortal.br fot.br +foz.br fst.br g12.br ggf.br @@ -492,6 +530,8 @@ lel.br londrina.br macapa.br maceio.br +manaus.br +maringa.br mat.br med.br mil.br @@ -521,8 +561,13 @@ recife.br ribeirao.br rio.br riobranco.br +riopreto.br salvador.br sampa.br +santamaria.br +santoandre.br +saobernardo.br +saogonca.br sjc.br slg.br slz.br @@ -3492,8 +3537,17 @@ uenohara.yamanashi.jp yamanakako.yamanashi.jp yamanashi.yamanashi.jp -// ke : http://www.kenic.or.ke/index.php?option=com_content&task=view&id=117&Itemid=145 -*.ke +// ke : http://www.kenic.or.ke/index.php/en/ke-domains/ke-domains +ke +ac.ke +co.ke +go.ke +info.ke +me.ke +mobi.ke +ne.ke +or.ke +sc.ke // kg : http://www.domain.kg/dmn_n.html kg @@ -10585,6 +10639,12 @@ cc.ua inf.ua ltd.ua +// AgileBits Inc : https://agilebits.com +// Submitted by Roustem Karimov +1password.ca +1password.com +1password.eu + // Agnat sp. z o.o. : https://domena.pl // Submitted by Przemyslaw Plewa beep.pl @@ -10596,7 +10656,7 @@ beep.pl // alwaysdata : https://www.alwaysdata.com // Submitted by Cyril -*.alwaysdata.net +alwaysdata.net // Amazon CloudFront : https://aws.amazon.com/cloudfront/ // Submitted by Donavan Miller @@ -10622,6 +10682,7 @@ ca-central-1.elasticbeanstalk.com eu-central-1.elasticbeanstalk.com eu-west-1.elasticbeanstalk.com eu-west-2.elasticbeanstalk.com +eu-west-3.elasticbeanstalk.com sa-east-1.elasticbeanstalk.com us-east-1.elasticbeanstalk.com us-east-2.elasticbeanstalk.com @@ -10646,6 +10707,7 @@ s3-ca-central-1.amazonaws.com s3-eu-central-1.amazonaws.com s3-eu-west-1.amazonaws.com s3-eu-west-2.amazonaws.com +s3-eu-west-3.amazonaws.com s3-external-1.amazonaws.com s3-fips-us-gov-west-1.amazonaws.com s3-sa-east-1.amazonaws.com @@ -10659,6 +10721,7 @@ s3.cn-north-1.amazonaws.com.cn s3.ca-central-1.amazonaws.com s3.eu-central-1.amazonaws.com s3.eu-west-2.amazonaws.com +s3.eu-west-3.amazonaws.com s3.us-east-2.amazonaws.com s3.dualstack.ap-northeast-1.amazonaws.com s3.dualstack.ap-northeast-2.amazonaws.com @@ -10669,6 +10732,7 @@ s3.dualstack.ca-central-1.amazonaws.com s3.dualstack.eu-central-1.amazonaws.com s3.dualstack.eu-west-1.amazonaws.com s3.dualstack.eu-west-2.amazonaws.com +s3.dualstack.eu-west-3.amazonaws.com s3.dualstack.sa-east-1.amazonaws.com s3.dualstack.us-east-1.amazonaws.com s3.dualstack.us-east-2.amazonaws.com @@ -10685,6 +10749,7 @@ s3-website.ap-south-1.amazonaws.com s3-website.ca-central-1.amazonaws.com s3-website.eu-central-1.amazonaws.com s3-website.eu-west-2.amazonaws.com +s3-website.eu-west-3.amazonaws.com s3-website.us-east-2.amazonaws.com // Amune : https://amune.org/ @@ -10873,6 +10938,11 @@ cloudns.us co.nl co.no +// Combell.com : https://www.combell.com +// Submitted by Thomas Wouters +webhosting.be +hosting-cluster.nl + // COSIMO GmbH : http://www.cosimo.de // Submitted by Rene Marticke dyn.cosidns.de @@ -11471,6 +11541,8 @@ fhapp.xyz fedorainfracloud.org fedorapeople.org cloud.fedoraproject.org +app.os.fedoraproject.org +app.os.stg.fedoraproject.org // Filegear Inc. : https://www.filegear.com // Submitted by Jason Zhu @@ -11494,10 +11566,6 @@ fbxos.fr freebox-os.fr freeboxos.fr -// Fusion Intranet : https://www.fusion-intranet.com -// Submitted by Matthias Burtscher -myfusion.cloud - // Futureweb OG : http://www.futureweb.at // Submitted by Andreas Schnederle-Wagner *.futurecms.at @@ -11783,6 +11851,10 @@ netlify.com // Submitted by Alan Shreve ngrok.io +// Nimbus Hosting Ltd. : https://www.nimbushosting.co.uk/ +// Submitted by Nicholas Ford +nh-serv.co.uk + // NFSN, Inc. : https://www.NearlyFreeSpeech.NET/ // Submitted by Jeff Wheelhouse nfshost.com @@ -12040,6 +12112,11 @@ rackmaze.net // Submitted by Tim Kramer rhcloud.com +// Resin.io : https://resin.io +// Submitted by Tim Perry +resindevice.io +devices.resinstaging.io + // RethinkDB : https://www.rethinkdb.com/ // Submitted by Chris Kastorff hzc.io @@ -12059,6 +12136,10 @@ sandcats.io logoip.de logoip.com +// Scry Security : http://www.scrysec.com +// Submitted by Shante Adam +scrysec.com + // Securepoint GmbH : https://www.securepoint.de // Submitted by Erik Anders firewall-gateway.com @@ -12074,6 +12155,7 @@ spdns.org // SensioLabs, SAS : https://sensiolabs.com/ // Submitted by Fabien Potencier +*.s5y.io *.sensiosite.cloud // Service Online LLC : http://drs.ua/ From 65ab7c92624bf868094f56b70d58f8a1bcd28d88 Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Mon, 12 Feb 2018 10:11:39 +0100 Subject: [PATCH 12/76] Release 3.0.2 --- CHANGELOG.md | 2 +- LICENSE.txt | 2 +- README.md | 2 +- lib/public_suffix.rb | 2 +- lib/public_suffix/domain.rb | 2 +- lib/public_suffix/errors.rb | 2 +- lib/public_suffix/list.rb | 2 +- lib/public_suffix/rule.rb | 2 +- lib/public_suffix/version.rb | 4 ++-- test/acceptance_test.rb | 2 +- test/unit/public_suffix_test.rb | 6 +++--- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e9b4f4f2..ccfeb32b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Changelog -#### master +#### Release 3.0.2 - CHANGED: Updated definitions. diff --git a/LICENSE.txt b/LICENSE.txt index 81fe94d9..69e44dac 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,4 @@ -Copyright (c) 2009-2017 Simone Carletti +Copyright (c) 2009-2018 Simone Carletti MIT License diff --git a/README.md b/README.md index 1e066822..a82c95a1 100644 --- a/README.md +++ b/README.md @@ -197,6 +197,6 @@ See the [CHANGELOG.md](CHANGELOG.md) file for details. ## License -Copyright (c) 2009-2017 Simone Carletti. This is Free Software distributed under the MIT license. +Copyright (c) 2009-2018 Simone Carletti. This is Free Software distributed under the MIT license. The [Public Suffix List source](https://publicsuffix.org/list/) is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/lib/public_suffix.rb b/lib/public_suffix.rb index 7b79dd3b..c94eb66f 100644 --- a/lib/public_suffix.rb +++ b/lib/public_suffix.rb @@ -2,7 +2,7 @@ # # Domain name parser based on the Public Suffix List. # -# Copyright (c) 2009-2017 Simone Carletti +# Copyright (c) 2009-2018 Simone Carletti require_relative "public_suffix/domain" require_relative "public_suffix/version" diff --git a/lib/public_suffix/domain.rb b/lib/public_suffix/domain.rb index 4c4edd44..147b88f3 100644 --- a/lib/public_suffix/domain.rb +++ b/lib/public_suffix/domain.rb @@ -2,7 +2,7 @@ # # Domain name parser based on the Public Suffix List. # -# Copyright (c) 2009-2017 Simone Carletti +# Copyright (c) 2009-2018 Simone Carletti module PublicSuffix diff --git a/lib/public_suffix/errors.rb b/lib/public_suffix/errors.rb index a636e76b..687befb4 100644 --- a/lib/public_suffix/errors.rb +++ b/lib/public_suffix/errors.rb @@ -2,7 +2,7 @@ # # Domain name parser based on the Public Suffix List. # -# Copyright (c) 2009-2017 Simone Carletti +# Copyright (c) 2009-2018 Simone Carletti module PublicSuffix diff --git a/lib/public_suffix/list.rb b/lib/public_suffix/list.rb index 4bd432f8..697a213c 100644 --- a/lib/public_suffix/list.rb +++ b/lib/public_suffix/list.rb @@ -2,7 +2,7 @@ # # Domain name parser based on the Public Suffix List. # -# Copyright (c) 2009-2017 Simone Carletti +# Copyright (c) 2009-2018 Simone Carletti module PublicSuffix diff --git a/lib/public_suffix/rule.rb b/lib/public_suffix/rule.rb index 735ad725..ec2ecd0c 100644 --- a/lib/public_suffix/rule.rb +++ b/lib/public_suffix/rule.rb @@ -2,7 +2,7 @@ # # Domain name parser based on the Public Suffix List. # -# Copyright (c) 2009-2017 Simone Carletti +# Copyright (c) 2009-2018 Simone Carletti module PublicSuffix diff --git a/lib/public_suffix/version.rb b/lib/public_suffix/version.rb index 252da920..3866d960 100644 --- a/lib/public_suffix/version.rb +++ b/lib/public_suffix/version.rb @@ -2,9 +2,9 @@ # # Domain name parser based on the Public Suffix List. # -# Copyright (c) 2009-2017 Simone Carletti +# Copyright (c) 2009-2018 Simone Carletti module PublicSuffix # The current library version. - VERSION = "3.0.1".freeze + VERSION = "3.0.2".freeze end diff --git a/test/acceptance_test.rb b/test/acceptance_test.rb index 147f41f0..ce53bb8f 100644 --- a/test/acceptance_test.rb +++ b/test/acceptance_test.rb @@ -32,7 +32,7 @@ def test_valid INVALID_CASES = [ - ["nic.ke", PublicSuffix::DomainNotAllowed], + ["nic.bd", PublicSuffix::DomainNotAllowed], [nil, PublicSuffix::DomainInvalid], ["", PublicSuffix::DomainInvalid], [" ", PublicSuffix::DomainInvalid], diff --git a/test/unit/public_suffix_test.rb b/test/unit/public_suffix_test.rb index a56cd0dc..a505ce1d 100644 --- a/test/unit/public_suffix_test.rb +++ b/test/unit/public_suffix_test.rb @@ -87,8 +87,8 @@ def test_self_parse_with_notlisted_name end def test_self_parse_with_unallowed_domain - error = assert_raises(PublicSuffix::DomainNotAllowed) { PublicSuffix.parse("example.ke") } - assert_match(/example\.ke/, error.message) + error = assert_raises(PublicSuffix::DomainNotAllowed) { PublicSuffix.parse("example.bd") } + assert_match(/example\.bd/, error.message) end def test_self_parse_with_uri @@ -128,7 +128,7 @@ def test_self_domain_with_notlisted_name end def test_self_domain_with_unallowed_name - assert_nil PublicSuffix.domain("example.ke") + assert_nil PublicSuffix.domain("example.bd") end def test_self_domain_with_blank_sld From 8bbd236f0ca8ec137cb071c7ecf6a52198d1c497 Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Mon, 11 Jun 2018 07:51:30 +0200 Subject: [PATCH 13/76] Update docblock Closes GH-151 --- lib/public_suffix/domain.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/public_suffix/domain.rb b/lib/public_suffix/domain.rb index 147b88f3..07ca8894 100644 --- a/lib/public_suffix/domain.rb +++ b/lib/public_suffix/domain.rb @@ -173,8 +173,6 @@ def subdomain # This method doesn't actually validate the domain. # It only checks whether the instance contains # a value for the {#tld} and {#sld} attributes. - # If you also want to validate the domain, - # use {#valid_domain?} instead. # # @example # From 8841e493dd5155e8416657e42e9a8504cad41887 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20H=C3=BCbotter?= Date: Tue, 26 Jun 2018 11:41:27 +0200 Subject: [PATCH 14/76] Update .rubocop_defaults.yml (#153) Fix error "Error: The `Style/TrailingCommaInLiteral` cop no longer exists. Please use `Style/TrailingCommaInArrayLiteral` and/or `Style/TrailingCommaInHashLiteral` instead." --- .rubocop_defaults.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.rubocop_defaults.yml b/.rubocop_defaults.yml index a93d9e4e..4d07840d 100644 --- a/.rubocop_defaults.yml +++ b/.rubocop_defaults.yml @@ -168,7 +168,9 @@ Style/StringLiterals: # It's nice to be consistent. The trailing comma also allows easy reordering, # and doesn't cause a diff in Git when you add a line to the bottom. -Style/TrailingCommaInLiteral: +Style/TrailingCommaInArrayLiteral: + EnforcedStyleForMultiline: consistent_comma +Style/TrailingCommaInHashLiteral: EnforcedStyleForMultiline: consistent_comma Style/TrivialAccessors: From 4556aa4e660ff9e7b222bf0e7fe040bf2384a79a Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Tue, 26 Jun 2018 11:44:46 +0200 Subject: [PATCH 15/76] Fix Rubocop new warnings --- .rubocop.yml | 4 ++++ lib/public_suffix/list.rb | 2 +- test/psl_test.rb | 2 +- test/test_helper.rb | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 38af0d32..5283089c 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -14,6 +14,10 @@ AllCops: - 'test/benchmarks/**/*' - 'test/profilers/**/*' +# I often use @_variable to avoid clashing. +Naming/MemoizedInstanceVariableName: + Enabled: false + Style/ClassAndModuleChildren: Exclude: - 'spec/**/*_spec.rb' diff --git a/lib/public_suffix/list.rb b/lib/public_suffix/list.rb index 697a213c..605a9186 100644 --- a/lib/public_suffix/list.rb +++ b/lib/public_suffix/list.rb @@ -212,7 +212,7 @@ def select(name, ignore_private: false) rules end - private :select + private :select # rubocop:disable Style/AccessModifierDeclarations # Gets the default rule. # diff --git a/test/psl_test.rb b/test/psl_test.rb index 0ccc2fa8..004eb26e 100644 --- a/test/psl_test.rb +++ b/test/psl_test.rb @@ -5,7 +5,7 @@ # the definitions satisfies the test suite. class PslTest < Minitest::Test - ROOT = File.expand_path("../../", __FILE__) + ROOT = File.expand_path("..", __dir__) # rubocop:disable Security/Eval def self.tests diff --git a/test/test_helper.rb b/test/test_helper.rb index 943e7c79..55a9643b 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -9,5 +9,5 @@ Minitest::Reporters.use! Minitest::Reporters::DefaultReporter.new(color: true) -$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__) +$LOAD_PATH.unshift File.expand_path("../lib", __dir__) require "public_suffix" From a9feb702b8ca79d363e86651c30cecd14f0167a2 Mon Sep 17 00:00:00 2001 From: William Montgomery Date: Wed, 15 Aug 2018 13:53:09 -0400 Subject: [PATCH 16/76] Update definitions (#154) --- data/list.txt | 1141 +++++++++++++++++++++++++++++++------------------ 1 file changed, 715 insertions(+), 426 deletions(-) diff --git a/data/list.txt b/data/list.txt index b2d261ec..f671831a 100644 --- a/data/list.txt +++ b/data/list.txt @@ -381,8 +381,13 @@ gov.bm net.bm org.bm -// bn : https://en.wikipedia.org/wiki/.bn -*.bn +// bn : http://www.bnnic.bn/faqs +bn +com.bn +edu.bn +gov.bn +net.bn +org.bn // bo : https://nic.bo/delegacion2015.php#h-1.10 bo @@ -395,7 +400,7 @@ net.bo mil.bo tv.bo web.bo -// Social Domains +// Social Domains academia.bo agro.bo arte.bo @@ -445,6 +450,7 @@ arq.br art.br ato.br b.br +barueri.br belem.br bhz.br bio.br @@ -1113,8 +1119,18 @@ mil.gt net.gt org.gt -// gu : http://gadao.gov.gu/registration.txt -*.gu +// gu : http://gadao.gov.gu/register.html +// University of Guam : https://www.uog.edu +// Submitted by uognoc@triton.uog.edu +gu +com.gu +edu.gu +gov.gu +guam.gu +info.gu +net.gu +org.gu +web.gu // gw : https://en.wikipedia.org/wiki/.gw gw @@ -1129,7 +1145,7 @@ gov.gy net.gy org.gy -// hk : https://www.hkdnr.hk +// hk : https://www.hkirc.hk // Submitted by registry hk com.hk @@ -1228,7 +1244,7 @@ tozsde.hu utazas.hu video.hu -// id : https://register.pandi.or.id/ +// id : https://pandi.id/en/domain/registration-requirements/ id ac.id biz.id @@ -1239,6 +1255,7 @@ mil.id my.id net.id or.id +ponpes.id sch.id web.id @@ -1340,10 +1357,8 @@ int.is it gov.it edu.it -// Reserved geo-names: -// http://www.nic.it/documenti/regolamenti-e-linee-guida/regolamento-assegnazione-versione-6.0.pdf -// There is also a list of reserved geo-names corresponding to Italian municipalities -// http://www.nic.it/documenti/appendice-c.pdf, but it is not included here. +// Reserved geo-names (regions and provinces): +// http://www.nic.it/sites/default/files/docs/Regulation_assignation_v7.1.pdf // Regions abr.it abruzzo.it @@ -1397,6 +1412,12 @@ sicily.it taa.it tos.it toscana.it +trentin-sud-tirol.it +trentin-süd-tirol.it +trentin-sudtirol.it +trentin-südtirol.it +trentin-sued-tirol.it +trentin-suedtirol.it trentino-a-adige.it trentino-aadige.it trentino-alto-adige.it @@ -1404,9 +1425,12 @@ trentino-altoadige.it trentino-s-tirol.it trentino-stirol.it trentino-sud-tirol.it +trentino-süd-tirol.it trentino-sudtirol.it +trentino-südtirol.it trentino-sued-tirol.it trentino-suedtirol.it +trentino.it trentinoa-adige.it trentinoaadige.it trentinoalto-adige.it @@ -1414,9 +1438,17 @@ trentinoaltoadige.it trentinos-tirol.it trentinostirol.it trentinosud-tirol.it +trentinosüd-tirol.it trentinosudtirol.it +trentinosüdtirol.it trentinosued-tirol.it trentinosuedtirol.it +trentinsud-tirol.it +trentinsüd-tirol.it +trentinsudtirol.it +trentinsüdtirol.it +trentinsued-tirol.it +trentinsuedtirol.it tuscany.it umb.it umbria.it @@ -1431,7 +1463,13 @@ valleaosta.it valled-aosta.it valledaosta.it vallee-aoste.it +vallée-aoste.it +vallee-d-aoste.it +vallée-d-aoste.it valleeaoste.it +valléeaoste.it +valleedaoste.it +valléedaoste.it vao.it vda.it ven.it @@ -1464,6 +1502,9 @@ at.it av.it avellino.it ba.it +balsan-sudtirol.it +balsan-südtirol.it +balsan-suedtirol.it balsan.it bari.it barletta-trani-andria.it @@ -1478,13 +1519,21 @@ bl.it bn.it bo.it bologna.it +bolzano-altoadige.it bolzano.it +bozen-sudtirol.it +bozen-südtirol.it +bozen-suedtirol.it bozen.it br.it brescia.it brindisi.it bs.it bt.it +bulsan-sudtirol.it +bulsan-südtirol.it +bulsan-suedtirol.it +bulsan.it bz.it ca.it cagliari.it @@ -1502,7 +1551,9 @@ catanzaro.it cb.it ce.it cesena-forli.it +cesena-forlì.it cesenaforli.it +cesenaforlì.it ch.it chieti.it ci.it @@ -1533,7 +1584,9 @@ florence.it fm.it foggia.it forli-cesena.it +forlì-cesena.it forlicesena.it +forlìcesena.it fr.it frosinone.it ge.it @@ -1664,6 +1717,7 @@ sp.it sr.it ss.it suedtirol.it +südtirol.it sv.it ta.it taranto.it @@ -1682,7 +1736,6 @@ trani-barletta-andria.it traniandriabarletta.it tranibarlettaandria.it trapani.it -trentino.it trento.it treviso.it trieste.it @@ -3645,8 +3698,16 @@ jeonnam.kr seoul.kr ulsan.kr -// kw : https://en.wikipedia.org/wiki/.kw -*.kw +// kw : https://www.nic.kw/policies/ +// Confirmed by registry +kw +com.kw +edu.kw +emb.kw +gov.kw +ind.kw +net.kw +org.kw // ky : http://www.icta.ky/da_ky_reg_dom.php // Confirmed by registry 2008-06-17 @@ -6152,9 +6213,6 @@ nc.tr // Used by government agencies of Northern Cyprus gov.nc.tr -// travel : https://en.wikipedia.org/wiki/.travel -travel - // tt : http://www.nic.tt/ tt co.tt @@ -6729,8 +6787,16 @@ yt ελ // xn--j6w193g ("Hong Kong", Chinese) : HK -// https://www2.hkirc.hk/register/rules.jsp +// https://www.hkirc.hk +// Submitted by registry +// https://www.hkirc.hk/content.jsp?id=30#!/34 香港 +公司.香港 +教育.香港 +政府.香港 +個人.香港 +網絡.香港 +組織.香港 // xn--2scrj9c ("Bharat", Kannada) : IN // India @@ -6764,6 +6830,10 @@ yt // India भारत +// xn--mgbbh1a ("Bharat", Kashmiri) : IN +// India +بارت + // xn--mgbbh1a71e ("Bharat", Arabic) : IN // India بھارت @@ -6978,7 +7048,10 @@ gov.zw mil.zw org.zw -// List of new gTLDs imported from https://newgtlds.icann.org/newgtlds.csv on 2017-02-23T00:46:09Z + +// newGTLDs +// List of new gTLDs imported from https://newgtlds.icann.org/newgtlds.csv on 2018-05-08T19:40:37Z +// This list is auto-generated, don't edit it manually. // aaa : 2015-02-26 American Automobile Association, Inc. aaa @@ -7004,13 +7077,13 @@ abc // able : 2015-06-25 Able Inc. able -// abogado : 2014-04-24 Top Level Domain Holdings Limited +// abogado : 2014-04-24 Minds + Machines Group Limited abogado // abudhabi : 2015-07-30 Abu Dhabi Systems and Information Centre abudhabi -// academy : 2013-11-07 Half Oaks, LLC +// academy : 2013-11-07 Binky Moon, LLC academy // accenture : 2014-08-15 Accenture plc @@ -7019,13 +7092,13 @@ accenture // accountant : 2014-11-20 dot Accountant Limited accountant -// accountants : 2014-03-20 Knob Town, LLC +// accountants : 2014-03-20 Binky Moon, LLC accountants // aco : 2015-01-08 ACO Severin Ahlmann GmbH & Co. KG aco -// active : 2014-05-01 The Active Network, Inc +// active : 2014-05-01 Active Network, LLC active // actor : 2013-12-12 United TLD Holdco Ltd. @@ -7058,7 +7131,7 @@ africa // agakhan : 2015-04-23 Fondation Aga Khan (Aga Khan Foundation) agakhan -// agency : 2013-11-14 Steel Falls, LLC +// agency : 2013-11-14 Binky Moon, LLC agency // aig : 2014-12-18 American International Group, Inc. @@ -7097,7 +7170,7 @@ allstate // ally : 2015-06-18 Ally Financial Inc. ally -// alsace : 2014-07-02 REGION D ALSACE +// alsace : 2014-07-02 Region Grand Est alsace // alstom : 2015-07-30 ALSTOM @@ -7133,10 +7206,10 @@ anquan // anz : 2015-07-31 Australia and New Zealand Banking Group Limited anz -// aol : 2015-09-17 AOL Inc. +// aol : 2015-09-17 Oath Inc. aol -// apartments : 2014-12-11 June Maple, LLC +// apartments : 2014-12-11 Binky Moon, LLC apartments // app : 2015-05-14 Charleston Road Registry Inc. @@ -7154,7 +7227,7 @@ arab // aramco : 2014-11-20 Aramco Services Company aramco -// archi : 2014-02-06 STARTING DOT LIMITED +// archi : 2014-02-06 Afilias plc archi // army : 2014-03-06 United TLD Holdco Ltd. @@ -7169,22 +7242,22 @@ arte // asda : 2015-07-31 Wal-Mart Stores, Inc. asda -// associates : 2014-03-06 Baxter Hill, LLC +// associates : 2014-03-06 Binky Moon, LLC associates // athleta : 2015-07-30 The Gap, Inc. athleta -// attorney : 2014-03-20 +// attorney : 2014-03-20 United TLD Holdco Ltd. attorney -// auction : 2014-03-20 +// auction : 2014-03-20 United TLD Holdco Ltd. auction // audi : 2015-05-21 AUDI Aktiengesellschaft audi -// audible : 2015-06-25 Amazon EU S.à r.l. +// audible : 2015-06-25 Amazon Registry Services, Inc. audible // audio : 2014-03-20 Uniregistry, Corp. @@ -7193,10 +7266,10 @@ audio // auspost : 2015-08-13 Australian Postal Corporation auspost -// author : 2014-12-18 Amazon EU S.à r.l. +// author : 2014-12-18 Amazon Registry Services, Inc. author -// auto : 2014-11-13 +// auto : 2014-11-13 Cars Registry Limited auto // autos : 2014-01-09 DERAutos, LLC @@ -7205,7 +7278,7 @@ autos // avianca : 2015-01-08 Aerovias del Continente Americano S.A. Avianca avianca -// aws : 2015-06-25 Amazon EU S.à r.l. +// aws : 2015-06-25 Amazon Registry Services, Inc. aws // axa : 2013-12-19 AXA SA @@ -7226,7 +7299,7 @@ banamex // bananarepublic : 2015-07-31 The Gap, Inc. bananarepublic -// band : 2014-06-12 +// band : 2014-06-12 United TLD Holdco Ltd. band // bank : 2014-09-25 fTLD Registry Services LLC @@ -7247,7 +7320,7 @@ barclays // barefoot : 2015-06-11 Gallo Vineyards, Inc. barefoot -// bargains : 2013-11-14 Half Hallow, LLC +// bargains : 2013-11-14 Binky Moon, LLC bargains // baseball : 2015-10-29 MLB Advanced Media DH, LLC @@ -7283,7 +7356,7 @@ beats // beauty : 2015-12-03 L'Oréal beauty -// beer : 2014-01-09 Top Level Domain Holdings Limited +// beer : 2014-01-09 Minds + Machines Group Limited beer // bentley : 2014-12-18 Bentley Motors Limited @@ -7310,19 +7383,19 @@ bible // bid : 2013-12-19 dot Bid Limited bid -// bike : 2013-08-27 Grand Hollow, LLC +// bike : 2013-08-27 Binky Moon, LLC bike // bing : 2014-12-18 Microsoft Corporation bing -// bingo : 2014-12-04 Sand Cedar, LLC +// bingo : 2014-12-04 Binky Moon, LLC bingo -// bio : 2014-03-06 STARTING DOT LIMITED +// bio : 2014-03-06 Afilias plc bio -// black : 2014-01-16 Afilias Limited +// black : 2014-01-16 Afilias plc black // blackfriday : 2014-01-16 Uniregistry, Corp. @@ -7334,13 +7407,13 @@ blanco // blockbuster : 2015-07-30 Dish DBS Corporation blockbuster -// blog : 2015-05-14 +// blog : 2015-05-14 Knock Knock WHOIS There, LLC blog // bloomberg : 2014-07-17 Bloomberg IP Holdings LLC bloomberg -// blue : 2013-11-07 Afilias Limited +// blue : 2013-11-07 Afilias plc blue // bms : 2014-10-30 Bristol-Myers Squibb Company @@ -7361,7 +7434,7 @@ boats // boehringer : 2015-07-09 Boehringer Ingelheim International GmbH boehringer -// bofa : 2015-07-31 NMS Services, Inc. +// bofa : 2015-07-31 Bank of America Corporation bofa // bom : 2014-10-16 Núcleo de Informação e Coordenação do Ponto BR - NIC.br @@ -7373,28 +7446,25 @@ bond // boo : 2014-01-30 Charleston Road Registry Inc. boo -// book : 2015-08-27 Amazon EU S.à r.l. +// book : 2015-08-27 Amazon Registry Services, Inc. book // booking : 2015-07-16 Booking.com B.V. booking -// boots : 2015-01-08 THE BOOTS COMPANY PLC -boots - // bosch : 2015-06-18 Robert Bosch GMBH bosch // bostik : 2015-05-28 Bostik SA bostik -// boston : 2015-12-10 +// boston : 2015-12-10 Boston TLD Management, LLC boston -// bot : 2014-12-18 Amazon EU S.à r.l. +// bot : 2014-12-18 Amazon Registry Services, Inc. bot -// boutique : 2013-11-14 Over Galley, LLC +// boutique : 2013-11-14 Binky Moon, LLC boutique // box : 2015-11-12 NS1 Limited @@ -7409,7 +7479,7 @@ bridgestone // broadway : 2014-12-22 Celebrate Broadway, Inc. broadway -// broker : 2014-12-11 IG Group Holdings PLC +// broker : 2014-12-11 Dotbroker Registry Limited broker // brother : 2015-01-29 Brother Industries, Ltd. @@ -7418,7 +7488,7 @@ brother // brussels : 2014-02-06 DNS.be vzw brussels -// budapest : 2013-11-21 Top Level Domain Holdings Limited +// budapest : 2013-11-21 Minds + Machines Group Limited budapest // bugatti : 2015-07-23 Bugatti International SA @@ -7427,13 +7497,13 @@ bugatti // build : 2013-11-07 Plan Bee LLC build -// builders : 2013-11-07 Atomic Madison, LLC +// builders : 2013-11-07 Binky Moon, LLC builders -// business : 2013-11-07 Spring Cross, LLC +// business : 2013-11-07 Binky Moon, LLC business -// buy : 2014-12-18 Amazon EU S.à r.l. +// buy : 2014-12-18 Amazon Registry Services, Inc. buy // buzz : 2013-10-02 DOTSTRATEGY CO. @@ -7442,16 +7512,16 @@ buzz // bzh : 2014-02-27 Association www.bzh bzh -// cab : 2013-10-24 Half Sunset, LLC +// cab : 2013-10-24 Binky Moon, LLC cab -// cafe : 2015-02-11 Pioneer Canyon, LLC +// cafe : 2015-02-11 Binky Moon, LLC cafe // cal : 2014-07-24 Charleston Road Registry Inc. cal -// call : 2014-12-18 Amazon EU S.à r.l. +// call : 2014-12-18 Amazon Registry Services, Inc. call // calvinklein : 2015-07-30 PVH gTLD Holdings LLC @@ -7460,10 +7530,10 @@ calvinklein // cam : 2016-04-21 AC Webconnecting Holding B.V. cam -// camera : 2013-08-27 Atomic Maple, LLC +// camera : 2013-08-27 Binky Moon, LLC camera -// camp : 2013-11-07 Delta Dynamite, LLC +// camp : 2013-11-07 Binky Moon, LLC camp // cancerresearch : 2014-05-15 Australian Cancer Research Foundation @@ -7475,37 +7545,37 @@ canon // capetown : 2014-03-24 ZA Central Registry NPC trading as ZA Central Registry capetown -// capital : 2014-03-06 Delta Mill, LLC +// capital : 2014-03-06 Binky Moon, LLC capital // capitalone : 2015-08-06 Capital One Financial Corporation capitalone -// car : 2015-01-22 +// car : 2015-01-22 Cars Registry Limited car // caravan : 2013-12-12 Caravan International, Inc. caravan -// cards : 2013-12-05 Foggy Hollow, LLC +// cards : 2013-12-05 Binky Moon, LLC cards -// care : 2014-03-06 Goose Cross +// care : 2014-03-06 Binky Moon, LLC care // career : 2013-10-09 dotCareer LLC career -// careers : 2013-10-02 Wild Corner, LLC +// careers : 2013-10-02 Binky Moon, LLC careers -// cars : 2014-11-13 +// cars : 2014-11-13 Cars Registry Limited cars // cartier : 2014-06-23 Richemont DNS Inc. cartier -// casa : 2013-11-21 Top Level Domain Holdings Limited +// casa : 2013-11-21 Minds + Machines Group Limited casa // case : 2015-09-03 CNH Industrial N.V. @@ -7514,13 +7584,13 @@ case // caseih : 2015-09-03 CNH Industrial N.V. caseih -// cash : 2014-03-06 Delta Lake, LLC +// cash : 2014-03-06 Binky Moon, LLC cash -// casino : 2014-12-18 Binky Sky, LLC +// casino : 2014-12-18 Binky Moon, LLC casino -// catering : 2013-12-05 New Falls. LLC +// catering : 2013-12-05 Binky Moon, LLC catering // catholic : 2015-10-21 Pontificium Consilium de Comunicationibus Socialibus (PCCS) (Pontifical Council for Social Communication) @@ -7541,7 +7611,7 @@ cbs // ceb : 2015-04-09 The Corporate Executive Board Company ceb -// center : 2013-11-07 Tin Mill, LLC +// center : 2013-11-07 Binky Moon, LLC center // ceo : 2013-11-07 CEOTLD Pty Ltd @@ -7553,7 +7623,7 @@ cern // cfa : 2014-08-28 CFA Institute cfa -// cfd : 2014-12-11 IG Group Holdings PLC +// cfd : 2014-12-11 DotCFD Registry Limited cfd // chanel : 2015-04-09 Chanel International B.V. @@ -7562,13 +7632,16 @@ chanel // channel : 2014-05-08 Charleston Road Registry Inc. channel -// chase : 2015-04-30 JPMorgan Chase & Co. +// charity : 2018-04-11 Corn Lake, LLC +charity + +// chase : 2015-04-30 JPMorgan Chase Bank, National Association chase -// chat : 2014-12-04 Sand Fields, LLC +// chat : 2014-12-04 Binky Moon, LLC chat -// cheap : 2013-11-14 Sand Cover, LLC +// cheap : 2013-11-14 Binky Moon, LLC cheap // chintai : 2015-06-11 CHINTAI Corporation @@ -7583,13 +7656,13 @@ chrome // chrysler : 2015-07-30 FCA US LLC. chrysler -// church : 2014-02-06 Holly Fields, LLC +// church : 2014-02-06 Binky Moon, LLC church // cipriani : 2015-02-19 Hotel Cipriani Srl cipriani -// circle : 2014-12-18 Amazon EU S.à r.l. +// circle : 2014-12-18 Amazon Registry Services, Inc. circle // cisco : 2014-12-22 Cisco Technology, Inc. @@ -7604,31 +7677,31 @@ citi // citic : 2014-01-09 CITIC Group Corporation citic -// city : 2014-05-29 Snow Sky, LLC +// city : 2014-05-29 Binky Moon, LLC city // cityeats : 2014-12-11 Lifestyle Domain Holdings, Inc. cityeats -// claims : 2014-03-20 Black Corner, LLC +// claims : 2014-03-20 Binky Moon, LLC claims -// cleaning : 2013-12-05 Fox Shadow, LLC +// cleaning : 2013-12-05 Binky Moon, LLC cleaning // click : 2014-06-05 Uniregistry, Corp. click -// clinic : 2014-03-20 Goose Park, LLC +// clinic : 2014-03-20 Binky Moon, LLC clinic // clinique : 2015-10-01 The Estée Lauder Companies Inc. clinique -// clothing : 2013-08-27 Steel Lake, LLC +// clothing : 2013-08-27 Binky Moon, LLC clothing -// cloud : 2015-04-16 ARUBA S.p.A. +// cloud : 2015-04-16 Aruba PEC S.p.A. cloud // club : 2013-11-08 .CLUB DOMAINS, LLC @@ -7637,19 +7710,19 @@ club // clubmed : 2015-06-25 Club Méditerranée S.A. clubmed -// coach : 2014-10-09 Koko Island, LLC +// coach : 2014-10-09 Binky Moon, LLC coach -// codes : 2013-10-31 Puff Willow, LLC +// codes : 2013-10-31 Binky Moon, LLC codes -// coffee : 2013-10-17 Trixy Cover, LLC +// coffee : 2013-10-17 Binky Moon, LLC coffee // college : 2014-01-16 XYZ.COM LLC college -// cologne : 2014-02-05 NetCologne Gesellschaft für Telekommunikation mbH +// cologne : 2014-02-05 punkt.wien GmbH cologne // comcast : 2015-07-23 Comcast IP Holdings I, LLC @@ -7658,64 +7731,64 @@ comcast // commbank : 2014-06-26 COMMONWEALTH BANK OF AUSTRALIA commbank -// community : 2013-12-05 Fox Orchard, LLC +// community : 2013-12-05 Binky Moon, LLC community -// company : 2013-11-07 Silver Avenue, LLC +// company : 2013-11-07 Binky Moon, LLC company // compare : 2015-10-08 iSelect Ltd compare -// computer : 2013-10-24 Pine Mill, LLC +// computer : 2013-10-24 Binky Moon, LLC computer // comsec : 2015-01-08 VeriSign, Inc. comsec -// condos : 2013-12-05 Pine House, LLC +// condos : 2013-12-05 Binky Moon, LLC condos -// construction : 2013-09-16 Fox Dynamite, LLC +// construction : 2013-09-16 Binky Moon, LLC construction -// consulting : 2013-12-05 +// consulting : 2013-12-05 United TLD Holdco Ltd. consulting // contact : 2015-01-08 Top Level Spectrum, Inc. contact -// contractors : 2013-09-10 Magic Woods, LLC +// contractors : 2013-09-10 Binky Moon, LLC contractors -// cooking : 2013-11-21 Top Level Domain Holdings Limited +// cooking : 2013-11-21 Minds + Machines Group Limited cooking // cookingchannel : 2015-07-02 Lifestyle Domain Holdings, Inc. cookingchannel -// cool : 2013-11-14 Koko Lake, LLC +// cool : 2013-11-14 Binky Moon, LLC cool -// corsica : 2014-09-25 Collectivité Territoriale de Corse +// corsica : 2014-09-25 Collectivité de Corse corsica -// country : 2013-12-19 Top Level Domain Holdings Limited +// country : 2013-12-19 DotCountry LLC country -// coupon : 2015-02-26 Amazon EU S.à r.l. +// coupon : 2015-02-26 Amazon Registry Services, Inc. coupon -// coupons : 2015-03-26 Black Island, LLC +// coupons : 2015-03-26 Binky Moon, LLC coupons // courses : 2014-12-04 OPEN UNIVERSITIES AUSTRALIA PTY LTD courses -// credit : 2014-03-20 Snow Shadow, LLC +// credit : 2014-03-20 Binky Moon, LLC credit -// creditcard : 2014-03-20 Binky Frostbite, LLC +// creditcard : 2014-03-20 Binky Moon, LLC creditcard // creditunion : 2015-01-22 CUNA Performance Resources, LLC @@ -7733,7 +7806,7 @@ crs // cruise : 2015-12-10 Viking River Cruises (Bermuda) Ltd. cruise -// cruises : 2013-12-05 Spring Way, LLC +// cruises : 2013-12-05 Binky Moon, LLC cruises // csc : 2014-09-25 Alliance-One Services, Inc. @@ -7763,7 +7836,7 @@ data // date : 2014-11-20 dot Date Limited date -// dating : 2013-12-05 Pine Fest, LLC +// dating : 2013-12-05 Binky Moon, LLC dating // datsun : 2014-03-27 NISSAN MOTOR CO., LTD. @@ -7775,22 +7848,22 @@ day // dclk : 2014-11-20 Charleston Road Registry Inc. dclk -// dds : 2015-05-07 Top Level Domain Holdings Limited +// dds : 2015-05-07 Minds + Machines Group Limited dds -// deal : 2015-06-25 Amazon EU S.à r.l. +// deal : 2015-06-25 Amazon Registry Services, Inc. deal // dealer : 2014-12-22 Dealer Dot Com, Inc. dealer -// deals : 2014-05-22 Sand Sunset, LLC +// deals : 2014-05-22 Binky Moon, LLC deals -// degree : 2014-03-06 +// degree : 2014-03-06 United TLD Holdco Ltd. degree -// delivery : 2014-09-11 Steel Station, LLC +// delivery : 2014-09-11 Binky Moon, LLC delivery // dell : 2014-10-24 Dell Inc. @@ -7805,10 +7878,10 @@ delta // democrat : 2013-10-24 United TLD Holdco Ltd. democrat -// dental : 2014-03-20 Tin Birch, LLC +// dental : 2014-03-20 Binky Moon, LLC dental -// dentist : 2014-03-20 +// dentist : 2014-03-20 United TLD Holdco Ltd. dentist // desi : 2013-11-14 Desi Networks LLC @@ -7823,22 +7896,22 @@ dev // dhl : 2015-07-23 Deutsche Post AG dhl -// diamonds : 2013-09-22 John Edge, LLC +// diamonds : 2013-09-22 Binky Moon, LLC diamonds // diet : 2014-06-26 Uniregistry, Corp. diet -// digital : 2014-03-06 Dash Park, LLC +// digital : 2014-03-06 Binky Moon, LLC digital -// direct : 2014-04-10 Half Trail, LLC +// direct : 2014-04-10 Binky Moon, LLC direct -// directory : 2013-09-20 Extra Madison, LLC +// directory : 2013-09-20 Binky Moon, LLC directory -// discount : 2014-03-06 Holly Hill, LLC +// discount : 2014-03-06 Binky Moon, LLC discount // discover : 2015-07-23 Discover Financial Services @@ -7856,19 +7929,19 @@ dnp // docs : 2014-10-16 Charleston Road Registry Inc. docs -// doctor : 2016-06-02 Brice Trail, LLC +// doctor : 2016-06-02 Binky Moon, LLC doctor // dodge : 2015-07-30 FCA US LLC. dodge -// dog : 2014-12-04 Koko Mill, LLC +// dog : 2014-12-04 Binky Moon, LLC dog // doha : 2014-09-18 Communications Regulatory Authority (CRA) doha -// domains : 2013-10-17 Sugar Cross, LLC +// domains : 2013-10-17 Binky Moon, LLC domains // dot : 2015-05-21 Dish DBS Corporation @@ -7919,25 +7992,25 @@ eco // edeka : 2014-12-18 EDEKA Verband kaufmännischer Genossenschaften e.V. edeka -// education : 2013-11-07 Brice Way, LLC +// education : 2013-11-07 Binky Moon, LLC education -// email : 2013-10-31 Spring Madison, LLC +// email : 2013-10-31 Binky Moon, LLC email // emerck : 2014-04-03 Merck KGaA emerck -// energy : 2014-09-11 Binky Birch, LLC +// energy : 2014-09-11 Binky Moon, LLC energy // engineer : 2014-03-06 United TLD Holdco Ltd. engineer -// engineering : 2014-03-06 Romeo Canyon +// engineering : 2014-03-06 Binky Moon, LLC engineering -// enterprises : 2013-09-20 Snow Oaks, LLC +// enterprises : 2013-09-20 Binky Moon, LLC enterprises // epost : 2015-07-23 Deutsche Post AG @@ -7946,7 +8019,7 @@ epost // epson : 2014-12-04 Seiko Epson Corporation epson -// equipment : 2013-08-27 Corn Station, LLC +// equipment : 2013-08-27 Binky Moon, LLC equipment // ericsson : 2015-07-09 Telefonaktiebolaget L M Ericsson @@ -7958,7 +8031,7 @@ erni // esq : 2014-05-08 Charleston Road Registry Inc. esq -// estate : 2013-08-27 Trixy Park, LLC +// estate : 2013-08-27 Binky Moon, LLC estate // esurance : 2015-07-23 Esurance Insurance Company @@ -7973,22 +8046,22 @@ eurovision // eus : 2013-12-12 Puntueus Fundazioa eus -// events : 2013-12-05 Pioneer Maple, LLC +// events : 2013-12-05 Binky Moon, LLC events // everbank : 2014-05-15 EverBank everbank -// exchange : 2014-03-06 Spring Falls, LLC +// exchange : 2014-03-06 Binky Moon, LLC exchange -// expert : 2013-11-21 Magic Pass, LLC +// expert : 2013-11-21 Binky Moon, LLC expert -// exposed : 2013-12-05 Victor Beach, LLC +// exposed : 2013-12-05 Binky Moon, LLC exposed -// express : 2015-02-11 Sea Sunset, LLC +// express : 2015-02-11 Binky Moon, LLC express // extraspace : 2015-05-14 Extra Space Storage LLC @@ -7997,7 +8070,7 @@ extraspace // fage : 2014-12-18 Fage International S.A. fage -// fail : 2014-03-06 Atomic Pipe, LLC +// fail : 2014-03-06 Binky Moon, LLC fail // fairwinds : 2014-11-13 FairWinds Partners, LLC @@ -8006,25 +8079,25 @@ fairwinds // faith : 2014-11-20 dot Faith Limited faith -// family : 2015-04-02 +// family : 2015-04-02 United TLD Holdco Ltd. family -// fan : 2014-03-06 +// fan : 2014-03-06 Asiamix Digital Limited fan // fans : 2014-11-07 Asiamix Digital Limited fans -// farm : 2013-11-07 Just Maple, LLC +// farm : 2013-11-07 Binky Moon, LLC farm // farmers : 2015-07-09 Farmers Insurance Exchange farmers -// fashion : 2014-07-03 Top Level Domain Holdings Limited +// fashion : 2014-07-03 Minds + Machines Group Limited fashion -// fast : 2014-12-18 Amazon EU S.à r.l. +// fast : 2014-12-18 Amazon Registry Services, Inc. fast // fedex : 2015-08-06 Federal Express Corporation @@ -8045,7 +8118,7 @@ fiat // fidelity : 2015-07-30 Fidelity Brokerage Services LLC fidelity -// fido : 2015-08-06 Rogers Communications Partnership +// fido : 2015-08-06 Rogers Communications Canada Inc. fido // film : 2015-01-08 Motion Picture Domain Registry Pty Ltd @@ -8054,43 +8127,43 @@ film // final : 2014-10-16 Núcleo de Informação e Coordenação do Ponto BR - NIC.br final -// finance : 2014-03-20 Cotton Cypress, LLC +// finance : 2014-03-20 Binky Moon, LLC finance -// financial : 2014-03-06 Just Cover, LLC +// financial : 2014-03-06 Binky Moon, LLC financial -// fire : 2015-06-25 Amazon EU S.à r.l. +// fire : 2015-06-25 Amazon Registry Services, Inc. fire -// firestone : 2014-12-18 Bridgestone Corporation +// firestone : 2014-12-18 Bridgestone Licensing Services, Inc firestone // firmdale : 2014-03-27 Firmdale Holdings Limited firmdale -// fish : 2013-12-12 Fox Woods, LLC +// fish : 2013-12-12 Binky Moon, LLC fish -// fishing : 2013-11-21 Top Level Domain Holdings Limited +// fishing : 2013-11-21 Minds + Machines Group Limited fishing -// fit : 2014-11-07 Top Level Domain Holdings Limited +// fit : 2014-11-07 Minds + Machines Group Limited fit -// fitness : 2014-03-06 Brice Orchard, LLC +// fitness : 2014-03-06 Binky Moon, LLC fitness // flickr : 2015-04-02 Yahoo! Domain Services Inc. flickr -// flights : 2013-12-05 Fox Station, LLC +// flights : 2013-12-05 Binky Moon, LLC flights // flir : 2015-07-23 FLIR Systems, Inc. flir -// florist : 2013-11-07 Half Cypress, LLC +// florist : 2013-11-07 Binky Moon, LLC florist // flowers : 2014-10-09 Uniregistry, Corp. @@ -8108,28 +8181,28 @@ food // foodnetwork : 2015-07-02 Lifestyle Domain Holdings, Inc. foodnetwork -// football : 2014-12-18 Foggy Farms, LLC +// football : 2014-12-18 Binky Moon, LLC football // ford : 2014-11-13 Ford Motor Company ford -// forex : 2014-12-11 IG Group Holdings PLC +// forex : 2014-12-11 Dotforex Registry Limited forex -// forsale : 2014-05-22 +// forsale : 2014-05-22 United TLD Holdco Ltd. forsale // forum : 2015-04-02 Fegistry, LLC forum -// foundation : 2013-12-05 John Dale, LLC +// foundation : 2013-12-05 Binky Moon, LLC foundation // fox : 2015-09-11 FOX Registry, LLC fox -// free : 2015-12-10 Amazon EU S.à r.l. +// free : 2015-12-10 Amazon Registry Services, Inc. free // fresenius : 2015-07-30 Fresenius Immobilien-Verwaltungs-GmbH @@ -8156,25 +8229,25 @@ fujitsu // fujixerox : 2015-07-23 Xerox DNHC LLC fujixerox -// fun : 2016-01-14 +// fun : 2016-01-14 DotSpace Inc. fun -// fund : 2014-03-20 John Castle, LLC +// fund : 2014-03-20 Binky Moon, LLC fund -// furniture : 2014-03-20 Lone Fields, LLC +// furniture : 2014-03-20 Binky Moon, LLC furniture -// futbol : 2013-09-20 +// futbol : 2013-09-20 United TLD Holdco Ltd. futbol -// fyi : 2015-04-02 Silver Tigers, LLC +// fyi : 2015-04-02 Binky Moon, LLC fyi // gal : 2013-11-07 Asociación puntoGAL gal -// gallery : 2013-09-13 Sugar House, LLC +// gallery : 2013-09-13 Binky Moon, LLC gallery // gallo : 2015-06-11 Gallo Vineyards, Inc. @@ -8186,13 +8259,13 @@ gallup // game : 2015-05-28 Uniregistry, Corp. game -// games : 2015-05-28 +// games : 2015-05-28 United TLD Holdco Ltd. games // gap : 2015-07-31 The Gap, Inc. gap -// garden : 2014-06-26 Top Level Domain Holdings Limited +// garden : 2014-06-26 Minds + Machines Group Limited garden // gbiz : 2014-07-17 Charleston Road Registry Inc. @@ -8204,7 +8277,7 @@ gdn // gea : 2014-12-04 GEA Group Aktiengesellschaft gea -// gent : 2014-01-23 COMBELL GROUP NV/SA +// gent : 2014-01-23 COMBELL NV gent // genting : 2015-03-12 Resorts World Inc Pte. Ltd. @@ -8216,10 +8289,10 @@ george // ggee : 2014-01-09 GMO Internet, Inc. ggee -// gift : 2013-10-17 Uniregistry, Corp. +// gift : 2013-10-17 DotGift, LLC gift -// gifts : 2014-07-03 Goose Sky, LLC +// gifts : 2014-07-03 Binky Moon, LLC gifts // gives : 2014-03-06 United TLD Holdco Ltd. @@ -8231,13 +8304,13 @@ giving // glade : 2015-07-23 Johnson Shareholdings, Inc. glade -// glass : 2013-11-07 Black Cover, LLC +// glass : 2013-11-07 Binky Moon, LLC glass // gle : 2014-07-24 Charleston Road Registry Inc. gle -// global : 2014-04-17 Dot GLOBAL AS +// global : 2014-04-17 Dot Global Domain Registry Limited global // globo : 2013-12-19 Globo Comunicação e Participações S.A @@ -8246,10 +8319,10 @@ globo // gmail : 2014-05-01 Charleston Road Registry Inc. gmail -// gmbh : 2016-01-29 Extra Dynamite, LLC +// gmbh : 2016-01-29 Binky Moon, LLC gmbh -// gmo : 2014-01-09 GMO Internet, Inc. +// gmo : 2014-01-09 GMO Internet Pte. Ltd. gmo // gmx : 2014-04-24 1&1 Mail & Media GmbH @@ -8258,13 +8331,13 @@ gmx // godaddy : 2015-07-23 Go Daddy East, LLC godaddy -// gold : 2015-01-22 June Edge, LLC +// gold : 2015-01-22 Binky Moon, LLC gold // goldpoint : 2014-11-20 YODOBASHI CAMERA CO.,LTD. goldpoint -// golf : 2014-12-18 Lone falls, LLC +// golf : 2014-12-18 Binky Moon, LLC golf // goo : 2014-12-18 NTT Resonant Inc. @@ -8285,28 +8358,28 @@ google // gop : 2014-01-16 Republican State Leadership Committee, Inc. gop -// got : 2014-12-18 Amazon EU S.à r.l. +// got : 2014-12-18 Amazon Registry Services, Inc. got // grainger : 2015-05-07 Grainger Registry Services, LLC grainger -// graphics : 2013-09-13 Over Madison, LLC +// graphics : 2013-09-13 Binky Moon, LLC graphics -// gratis : 2014-03-20 Pioneer Tigers, LLC +// gratis : 2014-03-20 Binky Moon, LLC gratis -// green : 2014-05-08 Afilias Limited +// green : 2014-05-08 Afilias plc green -// gripe : 2014-03-06 Corn Sunset, LLC +// gripe : 2014-03-06 Binky Moon, LLC gripe // grocery : 2016-06-16 Wal-Mart Stores, Inc. grocery -// group : 2014-08-15 Romeo Town, LLC +// group : 2014-08-15 Binky Moon, LLC group // guardian : 2015-07-30 The Guardian Life Insurance Company of America @@ -8318,13 +8391,13 @@ gucci // guge : 2014-08-28 Charleston Road Registry Inc. guge -// guide : 2013-09-13 Snow Moon, LLC +// guide : 2013-09-13 Binky Moon, LLC guide // guitars : 2013-11-14 Uniregistry, Corp. guitars -// guru : 2013-08-27 Pioneer Cypress, LLC +// guru : 2013-08-27 Binky Moon, LLC guru // hair : 2015-12-03 L'Oréal @@ -8336,7 +8409,7 @@ hamburg // hangout : 2014-11-13 Charleston Road Registry Inc. hangout -// haus : 2013-12-05 +// haus : 2013-12-05 United TLD Holdco Ltd. haus // hbo : 2015-07-30 HBO Registry Services, Inc. @@ -8351,7 +8424,7 @@ hdfcbank // health : 2015-02-11 DotHealth, LLC health -// healthcare : 2014-06-12 Silver Glen, LLC +// healthcare : 2014-06-12 Binky Moon, LLC healthcare // help : 2014-06-26 Uniregistry, Corp. @@ -8378,22 +8451,22 @@ hisamitsu // hitachi : 2014-10-31 Hitachi, Ltd. hitachi -// hiv : 2014-03-13 +// hiv : 2014-03-13 Uniregistry, Corp. hiv // hkt : 2015-05-14 PCCW-HKT DataCom Services Limited hkt -// hockey : 2015-03-19 Half Willow, LLC +// hockey : 2015-03-19 Binky Moon, LLC hockey -// holdings : 2013-08-27 John Madison, LLC +// holdings : 2013-08-27 Binky Moon, LLC holdings -// holiday : 2013-11-07 Goose Woods, LLC +// holiday : 2013-11-07 Binky Moon, LLC holiday -// homedepot : 2015-04-02 Homer TLC, Inc. +// homedepot : 2015-04-02 Home Depot Product Authority, LLC homedepot // homegoods : 2015-07-16 The TJX Companies, Inc. @@ -8411,10 +8484,10 @@ honda // honeywell : 2015-07-23 Honeywell GTLD LLC honeywell -// horse : 2013-11-21 Top Level Domain Holdings Limited +// horse : 2013-11-21 Minds + Machines Group Limited horse -// hospital : 2016-10-20 Ruby Pike, LLC +// hospital : 2016-10-20 Binky Moon, LLC hospital // host : 2014-04-17 DotHost Inc. @@ -8423,7 +8496,7 @@ host // hosting : 2014-05-29 Uniregistry, Corp. hosting -// hot : 2015-08-27 Amazon EU S.à r.l. +// hot : 2015-08-27 Amazon Registry Services, Inc. hot // hoteles : 2015-03-05 Travel Reservations SRL @@ -8435,13 +8508,13 @@ hotels // hotmail : 2014-12-18 Microsoft Corporation hotmail -// house : 2013-11-07 Sugar Park, LLC +// house : 2013-11-07 Binky Moon, LLC house // how : 2014-01-23 Charleston Road Registry Inc. how -// hsbc : 2014-10-24 HSBC Holdings PLC +// hsbc : 2014-10-24 HSBC Global Services (UK) Limited hsbc // hughes : 2015-07-30 Hughes Satellite Systems Corporation @@ -8462,7 +8535,7 @@ icbc // ice : 2014-10-30 IntercontinentalExchange, Inc. ice -// icu : 2015-01-08 One.com A/S +// icu : 2015-01-08 ShortDot SA icu // ieee : 2015-07-23 IEEE Global LLC @@ -8477,16 +8550,19 @@ ikano // imamat : 2015-08-06 Fondation Aga Khan (Aga Khan Foundation) imamat -// imdb : 2015-06-25 Amazon EU S.à r.l. +// imdb : 2015-06-25 Amazon Registry Services, Inc. imdb -// immo : 2014-07-10 Auburn Bloom, LLC +// immo : 2014-07-10 Binky Moon, LLC immo // immobilien : 2013-11-07 United TLD Holdco Ltd. immobilien -// industries : 2013-12-05 Outer House, LLC +// inc : 2018-03-10 GTLD Limited +inc + +// industries : 2013-12-05 Binky Moon, LLC industries // infiniti : 2014-03-27 NISSAN MOTOR CO., LTD. @@ -8498,31 +8574,31 @@ ing // ink : 2013-12-05 Top Level Design, LLC ink -// institute : 2013-11-07 Outer Maple, LLC +// institute : 2013-11-07 Binky Moon, LLC institute // insurance : 2015-02-19 fTLD Registry Services LLC insurance -// insure : 2014-03-20 Pioneer Willow, LLC +// insure : 2014-03-20 Binky Moon, LLC insure // intel : 2015-08-06 Intel Corporation intel -// international : 2013-11-07 Wild Way, LLC +// international : 2013-11-07 Binky Moon, LLC international // intuit : 2015-07-30 Intuit Administrative Services, Inc. intuit -// investments : 2014-03-20 Holly Glen, LLC +// investments : 2014-03-20 Binky Moon, LLC investments // ipiranga : 2014-08-28 Ipiranga Produtos de Petroleo S.A. ipiranga -// irish : 2014-08-07 Dot-Irish LLC +// irish : 2014-08-07 Binky Moon, LLC irish // iselect : 2015-02-11 iSelect Ltd @@ -8546,9 +8622,6 @@ itv // iveco : 2015-09-03 CNH Industrial N.V. iveco -// iwc : 2014-06-23 Richemont DNS Inc. -iwc - // jaguar : 2014-11-13 Jaguar Land Rover Ltd jaguar @@ -8564,13 +8637,13 @@ jcp // jeep : 2015-07-30 FCA US LLC. jeep -// jetzt : 2014-01-09 +// jetzt : 2014-01-09 Binky Moon, LLC jetzt -// jewelry : 2015-03-05 Wild Bloom, LLC +// jewelry : 2015-03-05 Binky Moon, LLC jewelry -// jio : 2015-04-02 Affinity Names, Inc. +// jio : 2015-04-02 Reliance Industries Limited jio // jlc : 2014-12-04 Richemont DNS Inc. @@ -8588,13 +8661,13 @@ jnj // joburg : 2014-03-24 ZA Central Registry NPC trading as ZA Central Registry joburg -// jot : 2014-12-18 Amazon EU S.à r.l. +// jot : 2014-12-18 Amazon Registry Services, Inc. jot -// joy : 2014-12-18 Amazon EU S.à r.l. +// joy : 2014-12-18 Amazon Registry Services, Inc. joy -// jpmorgan : 2015-04-30 JPMorgan Chase & Co. +// jpmorgan : 2015-04-30 JPMorgan Chase Bank, National Association jpmorgan // jprs : 2014-09-18 Japan Registry Services Co., Ltd. @@ -8627,22 +8700,22 @@ kfh // kia : 2015-07-09 KIA MOTORS CORPORATION kia -// kim : 2013-09-23 Afilias Limited +// kim : 2013-09-23 Afilias plc kim // kinder : 2014-11-07 Ferrero Trading Lux S.A. kinder -// kindle : 2015-06-25 Amazon EU S.à r.l. +// kindle : 2015-06-25 Amazon Registry Services, Inc. kindle -// kitchen : 2013-09-20 Just Goodbye, LLC +// kitchen : 2013-09-20 Binky Moon, LLC kitchen // kiwi : 2013-09-20 DOT KIWI LIMITED kiwi -// koeln : 2014-01-09 NetCologne Gesellschaft für Telekommunikation mbH +// koeln : 2014-01-09 punkt.wien GmbH koeln // komatsu : 2015-01-08 Komatsu Ltd. @@ -8669,7 +8742,7 @@ kuokgroup // kyoto : 2014-11-07 Academic Institution: Kyoto Jyoho Gakuen kyoto -// lacaixa : 2014-01-09 CAIXA D'ESTALVIS I PENSIONS DE BARCELONA +// lacaixa : 2014-01-09 Fundación Bancaria Caixa d’Estalvis i Pensions de Barcelona, “la Caixa” lacaixa // ladbrokes : 2015-08-06 LADBROKES INTERNATIONAL PLC @@ -8690,7 +8763,7 @@ lancia // lancome : 2015-07-23 L'Oréal lancome -// land : 2013-09-10 Pine Moon, LLC +// land : 2013-09-10 Binky Moon, LLC land // landrover : 2014-11-13 Jaguar Land Rover Ltd @@ -8714,13 +8787,13 @@ latrobe // law : 2015-01-22 Minds + Machines Group Limited law -// lawyer : 2014-03-20 +// lawyer : 2014-03-20 United TLD Holdco Ltd. lawyer // lds : 2014-03-20 IRI Domain Management, LLC ("Applicant") lds -// lease : 2014-03-06 Victor Trail, LLC +// lease : 2014-03-06 Binky Moon, LLC lease // leclerc : 2014-08-07 A.C.D. LEC Association des Centres Distributeurs Edouard Leclerc @@ -8729,7 +8802,7 @@ leclerc // lefrak : 2015-07-16 LeFrak Organization, Inc. lefrak -// legal : 2014-10-16 Blue Falls, LLC +// legal : 2014-10-16 Binky Moon, LLC legal // lego : 2015-07-16 LEGO Juris A/S @@ -8738,7 +8811,7 @@ lego // lexus : 2015-04-23 TOYOTA MOTOR CORPORATION lexus -// lgbt : 2014-05-08 Afilias Limited +// lgbt : 2014-05-08 Afilias plc lgbt // liaison : 2014-10-02 Liaison Technologies, Incorporated @@ -8747,7 +8820,7 @@ liaison // lidl : 2014-09-18 Schwarz Domains und Services GmbH & Co. KG lidl -// life : 2014-02-06 Trixy Oaks, LLC +// life : 2014-02-06 Binky Moon, LLC life // lifeinsurance : 2015-01-15 American Council of Life Insurers @@ -8756,19 +8829,19 @@ lifeinsurance // lifestyle : 2014-12-11 Lifestyle Domain Holdings, Inc. lifestyle -// lighting : 2013-08-27 John McCook, LLC +// lighting : 2013-08-27 Binky Moon, LLC lighting -// like : 2014-12-18 Amazon EU S.à r.l. +// like : 2014-12-18 Amazon Registry Services, Inc. like // lilly : 2015-07-31 Eli Lilly and Company lilly -// limited : 2014-03-06 Big Fest, LLC +// limited : 2014-03-06 Binky Moon, LLC limited -// limo : 2013-10-17 Hidden Frostbite, LLC +// limo : 2013-10-17 Binky Moon, LLC limo // lincoln : 2014-11-13 Ford Motor Company @@ -8783,7 +8856,7 @@ link // lipsy : 2015-06-25 Lipsy Ltd lipsy -// live : 2014-12-04 +// live : 2014-12-04 United TLD Holdco Ltd. live // living : 2015-07-30 Lifestyle Domain Holdings, Inc. @@ -8792,10 +8865,13 @@ living // lixil : 2015-03-19 LIXIL Group Corporation lixil +// llc : 2017-12-14 Afilias plc +llc + // loan : 2014-11-20 dot Loan Limited loan -// loans : 2014-03-20 June Woods, LLC +// loans : 2014-03-20 Binky Moon, LLC loans // locker : 2015-06-04 Dish DBS Corporation @@ -8816,7 +8892,7 @@ london // lotte : 2014-11-07 Lotte Holdings Co., Ltd. lotte -// lotto : 2014-04-10 Afilias Limited +// lotto : 2014-04-10 Afilias plc lotto // love : 2014-12-22 Merchant Law Group LLP @@ -8828,10 +8904,10 @@ lpl // lplfinancial : 2015-07-30 LPL Holdings, Inc. lplfinancial -// ltd : 2014-09-25 Over Corner, LLC +// ltd : 2014-09-25 Binky Moon, LLC ltd -// ltda : 2014-04-17 DOMAIN ROBOT SERVICOS DE HOSPEDAGEM NA INTERNET LTDA +// ltda : 2014-04-17 InterNetX, Corp ltda // lundbeck : 2015-08-06 H. Lundbeck A/S @@ -8840,7 +8916,7 @@ lundbeck // lupin : 2014-11-07 LUPIN LIMITED lupin -// luxe : 2014-01-09 Top Level Domain Holdings Limited +// luxe : 2014-01-09 Minds + Machines Group Limited luxe // luxury : 2013-10-17 Luxury Partners, LLC @@ -8855,7 +8931,7 @@ madrid // maif : 2014-10-02 Mutuelle Assurance Instituteur France (MAIF) maif -// maison : 2013-12-05 Victor Frostbite, LLC +// maison : 2013-12-05 Binky Moon, LLC maison // makeup : 2015-01-15 L'Oréal @@ -8864,7 +8940,7 @@ makeup // man : 2014-12-04 MAN SE man -// management : 2013-11-07 John Goodbye, LLC +// management : 2013-11-07 Binky Moon, LLC management // mango : 2013-10-24 PUNTO FA S.L. @@ -8873,13 +8949,13 @@ mango // map : 2016-06-09 Charleston Road Registry Inc. map -// market : 2014-03-06 +// market : 2014-03-06 United TLD Holdco Ltd. market -// marketing : 2013-11-07 Fern Pass, LLC +// marketing : 2013-11-07 Binky Moon, LLC marketing -// markets : 2014-12-11 IG Group Holdings PLC +// markets : 2014-12-11 Dotmarkets Registry Limited markets // marriott : 2014-10-09 Marriott Worldwide Corporation @@ -8894,7 +8970,7 @@ maserati // mattel : 2015-08-06 Mattel Sites, Inc. mattel -// mba : 2015-04-02 Lone Hollow, LLC +// mba : 2015-04-02 Binky Moon, LLC mba // mckinsey : 2015-07-31 McKinsey Holdings, Inc. @@ -8903,10 +8979,10 @@ mckinsey // med : 2015-08-06 Medistry LLC med -// media : 2014-03-06 Grand Glen, LLC +// media : 2014-03-06 Binky Moon, LLC media -// meet : 2014-01-16 +// meet : 2014-01-16 Charleston Road Registry Inc. meet // melbourne : 2014-05-29 The Crown in right of the State of Victoria, represented by its Department of State Development, Business and Innovation @@ -8924,16 +9000,13 @@ men // menu : 2013-09-11 Wedding TLD2, LLC menu -// meo : 2014-11-07 PT Comunicacoes S.A. -meo - // merckmsd : 2016-07-14 MSD Registry Holdings, Inc. merckmsd // metlife : 2015-05-07 MetLife Services and Solutions, LLC metlife -// miami : 2013-12-19 Top Level Domain Holdings Limited +// miami : 2013-12-19 Minds + Machines Group Limited miami // microsoft : 2014-12-18 Microsoft Corporation @@ -8972,7 +9045,7 @@ moda // moe : 2013-11-13 Interlink Co., Ltd. moe -// moi : 2014-12-18 Amazon EU S.à r.l. +// moi : 2014-12-18 Amazon Registry Services, Inc. moi // mom : 2015-04-16 Uniregistry, Corp. @@ -8981,7 +9054,7 @@ mom // monash : 2013-09-30 Monash University monash -// money : 2014-10-16 Outer McCook, LLC +// money : 2014-10-16 Binky Moon, LLC money // monster : 2015-09-11 Monster Worldwide, Inc. @@ -8993,13 +9066,13 @@ mopar // mormon : 2013-12-05 IRI Domain Management, LLC ("Applicant") mormon -// mortgage : 2014-03-20 +// mortgage : 2014-03-20 United TLD Holdco Ltd. mortgage // moscow : 2013-12-19 Foundation for Assistance for Internet Technologies and Infrastructure Development (FAITID) moscow -// moto : 2015-06-04 +// moto : 2015-06-04 Motorola Trademark Holdings, LLC moto // motorcycles : 2014-01-09 DERMotorcycles, LLC @@ -9008,7 +9081,7 @@ motorcycles // mov : 2014-01-30 Charleston Road Registry Inc. mov -// movie : 2015-02-05 New Frostbite, LLC +// movie : 2015-02-05 Binky Moon, LLC movie // movistar : 2014-10-16 Telefónica S.A. @@ -9020,9 +9093,6 @@ msd // mtn : 2014-12-04 MTN Dubai Limited mtn -// mtpc : 2014-11-20 Mitsubishi Tanabe Pharma Corporation -mtpc - // mtr : 2015-03-12 MTR Corporation Limited mtr @@ -9032,7 +9102,7 @@ mutual // nab : 2015-08-20 National Australia Bank Limited nab -// nadex : 2014-12-11 IG Group Holdings PLC +// nadex : 2014-12-11 Nadex Domains, Inc. nadex // nagoya : 2013-10-24 GMO Registry, Inc. @@ -9059,10 +9129,10 @@ netbank // netflix : 2015-06-18 Netflix, Inc. netflix -// network : 2013-11-14 Trixy Manor, LLC +// network : 2013-11-14 Binky Moon, LLC network -// neustar : 2013-12-05 NeuStar, Inc. +// neustar : 2013-12-05 Registry Services, LLC neustar // new : 2014-01-30 Charleston Road Registry Inc. @@ -9071,7 +9141,7 @@ new // newholland : 2015-09-03 CNH Industrial N.V. newholland -// news : 2014-12-18 +// news : 2014-12-18 United TLD Holdco Ltd. news // next : 2015-06-18 Next plc @@ -9119,7 +9189,7 @@ northwesternmutual // norton : 2014-12-04 Symantec Corporation norton -// now : 2015-06-25 Amazon EU S.à r.l. +// now : 2015-06-25 Amazon Registry Services, Inc. now // nowruz : 2014-09-04 Asia Green IT System Bilgisayar San. ve Tic. Ltd. Sti. @@ -9143,7 +9213,7 @@ nyc // obi : 2014-09-25 OBI Group Holding SE & Co. KGaA obi -// observer : 2015-04-30 +// observer : 2015-04-30 Top Level Spectrum, Inc. observer // off : 2015-07-23 Johnson Shareholdings, Inc. @@ -9152,7 +9222,7 @@ off // office : 2015-03-12 Microsoft Corporation office -// okinawa : 2013-12-05 BusinessRalliart Inc. +// okinawa : 2013-12-05 BRregistry, Inc. okinawa // olayan : 2015-05-14 Crescent Holding GmbH @@ -9197,13 +9267,13 @@ oracle // orange : 2015-03-12 Orange Brand Services Limited orange -// organic : 2014-03-27 Afilias Limited +// organic : 2014-03-27 Afilias plc organic // origins : 2015-10-01 The Estée Lauder Companies Inc. origins -// osaka : 2014-09-04 Interlink Co., Ltd. +// osaka : 2014-09-04 Osaka Registry Co., Ltd. osaka // otsuka : 2013-10-11 Otsuka Holdings Co., Ltd. @@ -9230,10 +9300,10 @@ paris // pars : 2014-09-04 Asia Green IT System Bilgisayar San. ve Tic. Ltd. Sti. pars -// partners : 2013-12-05 Magic Glen, LLC +// partners : 2013-12-05 Binky Moon, LLC partners -// parts : 2013-12-05 Sea Goodbye, LLC +// parts : 2013-12-05 Binky Moon, LLC parts // party : 2014-09-11 Blue Sky Registry Limited @@ -9242,7 +9312,7 @@ party // passagens : 2015-03-05 Travel Reservations SRL passagens -// pay : 2015-08-27 Amazon EU S.à r.l. +// pay : 2015-08-27 Amazon Registry Services, Inc. pay // pccw : 2015-05-14 PCCW Enterprises Limited @@ -9269,10 +9339,10 @@ phone // photo : 2013-11-14 Uniregistry, Corp. photo -// photography : 2013-09-20 Sugar Glen, LLC +// photography : 2013-09-20 Binky Moon, LLC photography -// photos : 2013-10-17 Sea Corner, LLC +// photos : 2013-10-17 Binky Moon, LLC photos // physio : 2014-05-01 PhysBiz Pty Ltd @@ -9287,28 +9357,28 @@ pics // pictet : 2014-06-26 Pictet Europe S.A. pictet -// pictures : 2014-03-06 Foggy Sky, LLC +// pictures : 2014-03-06 Binky Moon, LLC pictures // pid : 2015-01-08 Top Level Spectrum, Inc. pid -// pin : 2014-12-18 Amazon EU S.à r.l. +// pin : 2014-12-18 Amazon Registry Services, Inc. pin // ping : 2015-06-11 Ping Registry Provider, Inc. ping -// pink : 2013-10-01 Afilias Limited +// pink : 2013-10-01 Afilias plc pink // pioneer : 2015-07-16 Pioneer Corporation pioneer -// pizza : 2014-06-26 Foggy Moon, LLC +// pizza : 2014-06-26 Binky Moon, LLC pizza -// place : 2014-04-24 Snow Galley, LLC +// place : 2014-04-24 Binky Moon, LLC place // play : 2015-03-05 Charleston Road Registry Inc. @@ -9317,10 +9387,10 @@ play // playstation : 2015-07-02 Sony Computer Entertainment Inc. playstation -// plumbing : 2013-09-10 Spring Tigers, LLC +// plumbing : 2013-09-10 Binky Moon, LLC plumbing -// plus : 2015-02-05 Sugar Mill, LLC +// plus : 2015-02-05 Binky Moon, LLC plus // pnc : 2015-07-02 PNC Domain Co., LLC @@ -9329,7 +9399,7 @@ pnc // pohl : 2014-06-23 Deutsche Vermögensberatung Aktiengesellschaft DVAG pohl -// poker : 2014-07-03 Afilias Domains No. 5 Limited +// poker : 2014-07-03 Afilias plc poker // politie : 2015-08-20 Politie Nederland @@ -9347,13 +9417,13 @@ praxi // press : 2014-04-03 DotPress Inc. press -// prime : 2015-06-25 Amazon EU S.à r.l. +// prime : 2015-06-25 Amazon Registry Services, Inc. prime // prod : 2014-01-23 Charleston Road Registry Inc. prod -// productions : 2013-12-05 Magic Birch, LLC +// productions : 2013-12-05 Binky Moon, LLC productions // prof : 2014-07-24 Charleston Road Registry Inc. @@ -9362,16 +9432,16 @@ prof // progressive : 2015-07-23 Progressive Casualty Insurance Company progressive -// promo : 2014-12-18 +// promo : 2014-12-18 Afilias plc promo -// properties : 2013-12-05 Big Pass, LLC +// properties : 2013-12-05 Binky Moon, LLC properties // property : 2014-05-22 Uniregistry, Corp. property -// protection : 2015-04-23 +// protection : 2015-04-23 XYZ.COM LLC protection // pru : 2015-07-30 Prudential Financial, Inc. @@ -9407,7 +9477,7 @@ radio // raid : 2015-07-23 Johnson Shareholdings, Inc. raid -// read : 2014-12-18 Amazon EU S.à r.l. +// read : 2014-12-18 Amazon Registry Services, Inc. read // realestate : 2015-09-11 dotRealEstate LLC @@ -9419,10 +9489,10 @@ realtor // realty : 2015-03-19 Fegistry, LLC realty -// recipes : 2013-10-17 Grand Island, LLC +// recipes : 2013-10-17 Binky Moon, LLC recipes -// red : 2013-11-07 Afilias Limited +// red : 2013-11-07 Afilias plc red // redstone : 2014-10-31 Redstone Haute Couture Co., Ltd. @@ -9434,10 +9504,10 @@ redumbrella // rehab : 2014-03-06 United TLD Holdco Ltd. rehab -// reise : 2014-03-13 +// reise : 2014-03-13 Binky Moon, LLC reise -// reisen : 2014-03-06 New Cypress, LLC +// reisen : 2014-03-06 Binky Moon, LLC reisen // reit : 2014-09-04 National Association of Real Estate Investment Trusts, Inc. @@ -9449,16 +9519,16 @@ reliance // ren : 2013-12-12 Beijing Qianxiang Wangjing Technology Development Co., Ltd. ren -// rent : 2014-12-04 DERRent, LLC +// rent : 2014-12-04 XYZ.COM LLC rent -// rentals : 2013-12-05 Big Hollow,LLC +// rentals : 2013-12-05 Binky Moon, LLC rentals -// repair : 2013-11-07 Lone Sunset, LLC +// repair : 2013-11-07 Binky Moon, LLC repair -// report : 2013-12-05 Binky Glen, LLC +// report : 2013-12-05 Binky Moon, LLC report // republican : 2014-03-20 United TLD Holdco Ltd. @@ -9467,13 +9537,13 @@ republican // rest : 2013-12-19 Punto 2012 Sociedad Anonima Promotora de Inversion de Capital Variable rest -// restaurant : 2014-07-03 Snow Avenue, LLC +// restaurant : 2014-07-03 Binky Moon, LLC restaurant // review : 2014-11-20 dot Review Limited review -// reviews : 2013-09-13 +// reviews : 2013-09-13 United TLD Holdco Ltd. reviews // rexroth : 2015-06-18 Robert Bosch GMBH @@ -9506,16 +9576,16 @@ rmit // rocher : 2014-12-18 Ferrero Trading Lux S.A. rocher -// rocks : 2013-11-14 +// rocks : 2013-11-14 United TLD Holdco Ltd. rocks -// rodeo : 2013-12-19 Top Level Domain Holdings Limited +// rodeo : 2013-12-19 Minds + Machines Group Limited rodeo -// rogers : 2015-08-06 Rogers Communications Partnership +// rogers : 2015-08-06 Rogers Communications Canada Inc. rogers -// room : 2014-12-18 Amazon EU S.à r.l. +// room : 2014-12-18 Amazon Registry Services, Inc. room // rsvp : 2014-05-08 Charleston Road Registry Inc. @@ -9527,19 +9597,19 @@ rugby // ruhr : 2013-10-02 regiodot GmbH & Co. KG ruhr -// run : 2015-03-19 Snow Park, LLC +// run : 2015-03-19 Binky Moon, LLC run // rwe : 2015-04-02 RWE AG rwe -// ryukyu : 2014-01-09 BusinessRalliart Inc. +// ryukyu : 2014-01-09 BRregistry, Inc. ryukyu // saarland : 2013-12-12 dotSaarland GmbH saarland -// safe : 2014-12-18 Amazon EU S.à r.l. +// safe : 2014-12-18 Amazon Registry Services, Inc. safe // safety : 2015-01-08 Safety Registry Services, LLC. @@ -9548,10 +9618,10 @@ safety // sakura : 2014-12-18 SAKURA Internet Inc. sakura -// sale : 2014-10-16 +// sale : 2014-10-16 United TLD Holdco Ltd. sale -// salon : 2014-12-11 Outer Orchard, LLC +// salon : 2014-12-11 Binky Moon, LLC salon // samsclub : 2015-07-31 Wal-Mart Stores, Inc. @@ -9572,16 +9642,13 @@ sanofi // sap : 2014-03-27 SAP AG sap -// sapo : 2014-11-07 PT Comunicacoes S.A. -sapo - -// sarl : 2014-07-03 Delta Orchard, LLC +// sarl : 2014-07-03 Binky Moon, LLC sarl // sas : 2015-04-02 Research IP LLC sas -// save : 2015-06-25 Amazon EU S.à r.l. +// save : 2015-06-25 Amazon Registry Services, Inc. save // saxo : 2014-10-31 Saxo Bank A/S @@ -9608,10 +9675,10 @@ schmidt // scholarships : 2014-04-24 Scholarships.com, LLC scholarships -// school : 2014-12-18 Little Galley, LLC +// school : 2014-12-18 Binky Moon, LLC school -// schule : 2014-03-06 Outer Moon, LLC +// schule : 2014-03-06 Binky Moon, LLC schule // schwarz : 2014-09-18 Schwarz Domains und Services GmbH & Co. KG @@ -9635,10 +9702,10 @@ search // seat : 2014-05-22 SEAT, S.A. (Sociedad Unipersonal) seat -// secure : 2015-08-27 Amazon EU S.à r.l. +// secure : 2015-08-27 Amazon Registry Services, Inc. secure -// security : 2015-05-14 +// security : 2015-05-14 XYZ.COM LLC security // seek : 2014-12-04 Seek Limited @@ -9650,7 +9717,7 @@ select // sener : 2014-10-24 Sener Ingeniería y Sistemas, S.A. sener -// services : 2014-02-27 Fox Castle, LLC +// services : 2014-02-27 Binky Moon, LLC services // ses : 2015-07-23 SES @@ -9686,22 +9753,22 @@ shell // shia : 2014-09-04 Asia Green IT System Bilgisayar San. ve Tic. Ltd. Sti. shia -// shiksha : 2013-11-14 Afilias Limited +// shiksha : 2013-11-14 Afilias plc shiksha -// shoes : 2013-10-02 Binky Galley, LLC +// shoes : 2013-10-02 Binky Moon, LLC shoes // shop : 2016-04-08 GMO Registry, Inc. shop -// shopping : 2016-03-31 +// shopping : 2016-03-31 Binky Moon, LLC shopping // shouji : 2015-01-08 QIHOO 360 TECHNOLOGY CO. LTD. shouji -// show : 2015-03-05 Snow Beach, LLC +// show : 2015-03-05 Binky Moon, LLC show // showtime : 2015-08-06 CBS Domains Inc. @@ -9710,25 +9777,25 @@ showtime // shriram : 2014-01-23 Shriram Capital Ltd. shriram -// silk : 2015-06-25 Amazon EU S.à r.l. +// silk : 2015-06-25 Amazon Registry Services, Inc. silk // sina : 2015-03-12 Sina Corporation sina -// singles : 2013-08-27 Fern Madison, LLC +// singles : 2013-08-27 Binky Moon, LLC singles // site : 2015-01-15 DotSite Inc. site -// ski : 2015-04-09 STARTING DOT LIMITED +// ski : 2015-04-09 Afilias plc ski // skin : 2015-01-15 L'Oréal skin -// sky : 2014-06-19 Sky IP International Ltd, a company incorporated in England and Wales, operating via its registered Swiss branch +// sky : 2014-06-19 Sky International AG sky // skype : 2014-12-18 Microsoft Corporation @@ -9740,13 +9807,13 @@ sling // smart : 2015-07-09 Smart Communications, Inc. (SMART) smart -// smile : 2014-12-18 Amazon EU S.à r.l. +// smile : 2014-12-18 Amazon Registry Services, Inc. smile // sncf : 2015-02-19 Société Nationale des Chemins de fer Francais S N C F sncf -// soccer : 2015-03-26 Foggy Shadow, LLC +// soccer : 2015-03-26 Binky Moon, LLC soccer // social : 2013-11-07 United TLD Holdco Ltd. @@ -9755,19 +9822,19 @@ social // softbank : 2015-07-02 SoftBank Corp. softbank -// software : 2014-03-20 +// software : 2014-03-20 United TLD Holdco Ltd. software // sohu : 2013-12-19 Sohu.com Limited sohu -// solar : 2013-11-07 Ruby Town, LLC +// solar : 2013-11-07 Binky Moon, LLC solar -// solutions : 2013-11-07 Silver Cover, LLC +// solutions : 2013-11-07 Binky Moon, LLC solutions -// song : 2015-02-26 Amazon EU S.à r.l. +// song : 2015-02-26 Amazon Registry Services, Inc. song // sony : 2015-01-08 Sony Corporation @@ -9782,13 +9849,16 @@ space // spiegel : 2014-02-05 SPIEGEL-Verlag Rudolf Augstein GmbH & Co. KG spiegel -// spot : 2015-02-26 Amazon EU S.à r.l. +// sport : 2017-11-16 Global Association of International Sports Federations (GAISF) +sport + +// spot : 2015-02-26 Amazon Registry Services, Inc. spot -// spreadbetting : 2014-12-11 IG Group Holdings PLC +// spreadbetting : 2014-12-11 Dotspreadbetting Registry Limited spreadbetting -// srl : 2015-05-07 mySRL GmbH +// srl : 2015-05-07 InterNetX, Corp srl // srt : 2015-07-30 FCA US LLC. @@ -9824,7 +9894,7 @@ stcgroup // stockholm : 2014-12-18 Stockholms kommun stockholm -// storage : 2014-12-22 Self Storage Company LLC +// storage : 2014-12-22 XYZ.COM LLC storage // store : 2015-04-09 DotStore Inc. @@ -9833,7 +9903,7 @@ store // stream : 2016-01-08 dot Stream Limited stream -// studio : 2015-02-11 +// studio : 2015-02-11 United TLD Holdco Ltd. studio // study : 2014-12-11 OPEN UNIVERSITIES AUSTRALIA PTY LTD @@ -9842,22 +9912,22 @@ study // style : 2014-12-04 Binky Moon, LLC style -// sucks : 2014-12-22 Vox Populi Registry Inc. +// sucks : 2014-12-22 Vox Populi Registry Ltd. sucks -// supplies : 2013-12-19 Atomic Fields, LLC +// supplies : 2013-12-19 Binky Moon, LLC supplies -// supply : 2013-12-19 Half Falls, LLC +// supply : 2013-12-19 Binky Moon, LLC supply -// support : 2013-10-24 Grand Orchard, LLC +// support : 2013-10-24 Binky Moon, LLC support -// surf : 2014-01-09 Top Level Domain Holdings Limited +// surf : 2014-01-09 Minds + Machines Group Limited surf -// surgery : 2014-03-20 Tin Avenue, LLC +// surgery : 2014-03-20 Binky Moon, LLC surgery // suzuki : 2014-02-20 SUZUKI MOTOR CORPORATION @@ -9878,7 +9948,7 @@ sydney // symantec : 2014-12-04 Symantec Corporation symantec -// systems : 2013-11-07 Dash Cypress, LLC +// systems : 2013-11-07 Binky Moon, LLC systems // tab : 2014-12-04 Tabcorp Holdings Limited @@ -9887,7 +9957,7 @@ tab // taipei : 2014-07-10 Taipei City Government taipei -// talk : 2015-04-09 Amazon EU S.à r.l. +// talk : 2015-04-09 Amazon Registry Services, Inc. talk // taobao : 2015-01-15 Alibaba Group Holding Limited @@ -9905,10 +9975,10 @@ tatar // tattoo : 2013-08-30 Uniregistry, Corp. tattoo -// tax : 2014-03-20 Storm Orchard, LLC +// tax : 2014-03-20 Binky Moon, LLC tax -// taxi : 2015-03-19 Pine Falls, LLC +// taxi : 2015-03-19 Binky Moon, LLC taxi // tci : 2014-09-12 Asia Green IT System Bilgisayar San. ve Tic. Ltd. Sti. @@ -9917,13 +9987,13 @@ tci // tdk : 2015-06-11 TDK Corporation tdk -// team : 2015-03-05 Atomic Lake, LLC +// team : 2015-03-05 Binky Moon, LLC team -// tech : 2015-01-30 Dot Tech LLC +// tech : 2015-01-30 Personals TLD Inc. tech -// technology : 2013-09-13 Auburn Falls +// technology : 2013-09-13 Binky Moon, LLC technology // telecity : 2015-02-19 TelecityGroup International Limited @@ -9935,19 +10005,19 @@ telefonica // temasek : 2014-08-07 Temasek Holdings (Private) Limited temasek -// tennis : 2014-12-04 Cotton Bloom, LLC +// tennis : 2014-12-04 Binky Moon, LLC tennis // teva : 2015-07-02 Teva Pharmaceutical Industries Limited teva -// thd : 2015-04-02 Homer TLC, Inc. +// thd : 2015-04-02 Home Depot Product Authority, LLC thd -// theater : 2015-03-19 Blue Tigers, LLC +// theater : 2015-03-19 Binky Moon, LLC theater -// theatre : 2015-05-07 +// theatre : 2015-05-07 XYZ.COM LLC theatre // tiaa : 2015-07-23 Teachers Insurance and Annuity Association of America @@ -9956,16 +10026,16 @@ tiaa // tickets : 2015-02-05 Accent Media Limited tickets -// tienda : 2013-11-14 Victor Manor, LLC +// tienda : 2013-11-14 Binky Moon, LLC tienda // tiffany : 2015-01-30 Tiffany and Company tiffany -// tips : 2013-09-20 Corn Willow, LLC +// tips : 2013-09-20 Binky Moon, LLC tips -// tires : 2014-11-07 Dog Edge, LLC +// tires : 2014-11-07 Binky Moon, LLC tires // tirol : 2014-04-24 punkt Tirol GmbH @@ -9983,16 +10053,16 @@ tkmaxx // tmall : 2015-01-15 Alibaba Group Holding Limited tmall -// today : 2013-09-20 Pearl Woods, LLC +// today : 2013-09-20 Binky Moon, LLC today // tokyo : 2013-11-13 GMO Registry, Inc. tokyo -// tools : 2013-11-21 Pioneer North, LLC +// tools : 2013-11-21 Binky Moon, LLC tools -// top : 2014-03-20 Jiangsu Bangning Science & Technology Co.,Ltd. +// top : 2014-03-20 .TOP Registry top // toray : 2014-12-18 Toray Industries, Inc. @@ -10004,27 +10074,30 @@ toshiba // total : 2015-08-06 Total SA total -// tours : 2015-01-22 Sugar Station, LLC +// tours : 2015-01-22 Binky Moon, LLC tours -// town : 2014-03-06 Koko Moon, LLC +// town : 2014-03-06 Binky Moon, LLC town // toyota : 2015-04-23 TOYOTA MOTOR CORPORATION toyota -// toys : 2014-03-06 Pioneer Orchard, LLC +// toys : 2014-03-06 Binky Moon, LLC toys // trade : 2014-01-23 Elite Registry Limited trade -// trading : 2014-12-11 IG Group Holdings PLC +// trading : 2014-12-11 Dottrading Registry Limited trading -// training : 2013-11-07 Wild Willow, LLC +// training : 2013-11-07 Binky Moon, LLC training +// travel : Dog Beach, LLC +travel + // travelchannel : 2015-07-02 Lifestyle Domain Holdings, Inc. travelchannel @@ -10034,7 +10107,7 @@ travelers // travelersinsurance : 2015-03-26 Travelers TLD, LLC travelersinsurance -// trust : 2014-10-16 +// trust : 2014-10-16 NCC Group Inc. trust // trv : 2015-03-26 Travelers TLD, LLC @@ -10046,10 +10119,10 @@ tube // tui : 2014-07-03 TUI AG tui -// tunes : 2015-02-26 Amazon EU S.à r.l. +// tunes : 2015-02-26 Amazon Registry Services, Inc. tunes -// tushu : 2014-12-18 Amazon EU S.à r.l. +// tushu : 2014-12-18 Amazon Registry Services, Inc. tushu // tvs : 2015-02-19 T V SUNDRAM IYENGAR & SONS LIMITED @@ -10067,7 +10140,7 @@ uconnect // unicom : 2015-10-15 China United Network Communications Corporation Limited unicom -// university : 2014-03-06 Little Station, LLC +// university : 2014-03-06 Binky Moon, LLC university // uno : 2013-09-11 Dot Latin LLC @@ -10079,7 +10152,7 @@ uol // ups : 2015-06-25 UPS Market Driver, Inc. ups -// vacations : 2013-12-05 Atomic Tigers, LLC +// vacations : 2013-12-05 Binky Moon, LLC vacations // vana : 2014-12-11 Lifestyle Domain Holdings, Inc. @@ -10091,22 +10164,22 @@ vanguard // vegas : 2014-01-16 Dot Vegas, Inc. vegas -// ventures : 2013-08-27 Binky Lake, LLC +// ventures : 2013-08-27 Binky Moon, LLC ventures // verisign : 2015-08-13 VeriSign, Inc. verisign -// versicherung : 2014-03-20 +// versicherung : 2014-03-20 TLD-BOX Registrydienstleistungen GmbH versicherung -// vet : 2014-03-06 +// vet : 2014-03-06 United TLD Holdco Ltd. vet -// viajes : 2013-10-17 Black Madison, LLC +// viajes : 2013-10-17 Binky Moon, LLC viajes -// video : 2014-10-16 +// video : 2014-10-16 United TLD Holdco Ltd. video // vig : 2015-05-14 VIENNA INSURANCE GROUP AG Wiener Versicherung Gruppe @@ -10115,10 +10188,10 @@ vig // viking : 2015-04-02 Viking River Cruises (Bermuda) Ltd. viking -// villas : 2013-12-05 New Sky, LLC +// villas : 2013-12-05 Binky Moon, LLC villas -// vin : 2015-06-18 Holly Shadow, LLC +// vin : 2015-06-18 Binky Moon, LLC vin // vip : 2015-01-22 Minds + Machines Group Limited @@ -10130,7 +10203,7 @@ virgin // visa : 2015-07-30 Visa Worldwide Pte. Limited visa -// vision : 2013-12-05 Koko Station, LLC +// vision : 2013-12-05 Binky Moon, LLC vision // vista : 2014-09-18 Vistaprint Limited @@ -10148,7 +10221,7 @@ vivo // vlaanderen : 2014-02-06 DNS.be vzw vlaanderen -// vodka : 2013-12-19 Top Level Domain Holdings Limited +// vodka : 2013-12-19 Minds + Machines Group Limited vodka // volkswagen : 2015-05-14 Volkswagen Group of America Inc. @@ -10166,7 +10239,7 @@ voting // voto : 2013-11-21 Monolith Registry LLC voto -// voyage : 2013-08-27 Ruby House, LLC +// voyage : 2013-08-27 Binky Moon, LLC voyage // vuelos : 2015-03-05 Travel Reservations SRL @@ -10181,25 +10254,25 @@ walmart // walter : 2014-11-13 Sandvik AB walter -// wang : 2013-10-24 Zodiac Leo Limited +// wang : 2013-10-24 Zodiac Wang Limited wang -// wanggou : 2014-12-18 Amazon EU S.à r.l. +// wanggou : 2014-12-18 Amazon Registry Services, Inc. wanggou // warman : 2015-06-18 Weir Group IP Limited warman -// watch : 2013-11-14 Sand Shadow, LLC +// watch : 2013-11-14 Binky Moon, LLC watch // watches : 2014-12-22 Richemont DNS Inc. watches -// weather : 2015-01-08 The Weather Channel, LLC +// weather : 2015-01-08 International Business Machines Corporation weather -// weatherchannel : 2015-03-12 The Weather Channel, LLC +// weatherchannel : 2015-03-12 International Business Machines Corporation weatherchannel // webcam : 2014-01-23 dot Webcam Limited @@ -10214,7 +10287,7 @@ website // wed : 2013-10-01 Atgron, Inc. wed -// wedding : 2014-04-24 Top Level Domain Holdings Limited +// wedding : 2014-04-24 Minds + Machines Group Limited wedding // weibo : 2015-03-05 Sina Corporation @@ -10241,7 +10314,7 @@ win // windows : 2014-12-18 Microsoft Corporation windows -// wine : 2015-06-18 June Station, LLC +// wine : 2015-06-18 Binky Moon, LLC wine // winners : 2015-07-16 The TJX Companies, Inc. @@ -10256,22 +10329,22 @@ wolterskluwer // woodside : 2015-07-09 Woodside Petroleum Limited woodside -// work : 2013-12-19 Top Level Domain Holdings Limited +// work : 2013-12-19 Minds + Machines Group Limited work -// works : 2013-11-14 Little Dynamite, LLC +// works : 2013-11-14 Binky Moon, LLC works -// world : 2014-06-12 Bitter Fields, LLC +// world : 2014-06-12 Binky Moon, LLC world -// wow : 2015-10-08 Amazon EU S.à r.l. +// wow : 2015-10-08 Amazon Registry Services, Inc. wow // wtc : 2013-12-19 World Trade Centers Association, Inc. wtc -// wtf : 2014-03-06 Hidden Way, LLC +// wtf : 2014-03-06 Binky Moon, LLC wtf // xbox : 2014-12-18 Microsoft Corporation @@ -10292,7 +10365,7 @@ xin // xn--11b4c3d : 2015-01-15 VeriSign Sarl कॉम -// xn--1ck2e1b : 2015-02-26 Amazon EU S.à r.l. +// xn--1ck2e1b : 2015-02-26 Amazon Registry Services, Inc. セール // xn--1qqw23a : 2014-01-09 Guangzhou YU Wei Information Technology Co., Ltd. @@ -10316,7 +10389,7 @@ xin // xn--42c2d9a : 2015-01-15 VeriSign Sarl คอม -// xn--45q11c : 2013-11-21 Zodiac Scorpio Limited +// xn--45q11c : 2013-11-21 Zodiac Gemini Ltd 八卦 // xn--4gbrim : 2013-10-04 Suhub Electronic Establishment @@ -10325,7 +10398,7 @@ xin // xn--55qw42g : 2013-11-08 China Organizational Name Administration Center 公益 -// xn--55qx5d : 2013-11-14 Computer Network Information Center of Chinese Academy of Sciences （China Internet Network Information Center） +// xn--55qx5d : 2013-11-14 China Internet Network Information Center (CNNIC) 公司 // xn--5su34j936bgsg : 2015-09-03 Shangri‐La International Hotel Management Limited @@ -10334,7 +10407,7 @@ xin // xn--5tzm5g : 2014-12-22 Global Website TLD Asia Limited 网站 -// xn--6frz82g : 2013-09-23 Afilias Limited +// xn--6frz82g : 2013-09-23 Afilias plc 移动 // xn--6qq986b3xl : 2013-09-13 Tycoon Treasure Limited @@ -10367,7 +10440,7 @@ xin // xn--b4w605ferd : 2014-08-07 Temasek Holdings (Private) Limited 淡马锡 -// xn--bck1b9a5dre4c : 2015-02-26 Amazon EU S.à r.l. +// xn--bck1b9a5dre4c : 2015-02-26 Amazon Registry Services, Inc. ファッション // xn--c1avg : 2013-11-14 Public Interest Registry @@ -10376,7 +10449,7 @@ xin // xn--c2br7g : 2015-01-15 VeriSign Sarl नेट -// xn--cck2b3b : 2015-02-26 Amazon EU S.à r.l. +// xn--cck2b3b : 2015-02-26 Amazon Registry Services, Inc. ストア // xn--cg4bki : 2013-09-27 SAMSUNG SDS CO., LTD @@ -10385,25 +10458,25 @@ xin // xn--czr694b : 2014-01-16 Dot Trademark TLD Holding Company Limited 商标 -// xn--czrs0t : 2013-12-19 Wild Island, LLC +// xn--czrs0t : 2013-12-19 Binky Moon, LLC 商店 -// xn--czru2d : 2013-11-21 Zodiac Capricorn Limited +// xn--czru2d : 2013-11-21 Zodiac Aquarius Limited 商城 // xn--d1acj3b : 2013-11-20 The Foundation for Network Initiatives “The Smart Internet” дети -// xn--eckvdtc9d : 2014-12-18 Amazon EU S.à r.l. +// xn--eckvdtc9d : 2014-12-18 Amazon Registry Services, Inc. ポイント -// xn--efvy88h : 2014-08-22 Xinhua News Agency Guangdong Branch 新华通讯社广东分社 +// xn--efvy88h : 2014-08-22 Guangzhou YU Wei Information Technology Co., Ltd. 新闻 // xn--estv75g : 2015-02-19 Industrial and Commercial Bank of China Limited 工行 -// xn--fct429k : 2015-04-09 Amazon EU S.à r.l. +// xn--fct429k : 2015-04-09 Amazon Registry Services, Inc. 家電 // xn--fhbei : 2015-01-15 VeriSign Sarl @@ -10415,7 +10488,7 @@ xin // xn--fiq64b : 2013-10-14 CITIC Group Corporation 中信 -// xn--fjq720a : 2014-05-22 Will Bloom, LLC +// xn--fjq720a : 2014-05-22 Binky Moon, LLC 娱乐 // xn--flw351e : 2014-07-31 Charleston Road Registry Inc. @@ -10427,13 +10500,13 @@ xin // xn--g2xx48c : 2015-01-30 Minds + Machines Group Limited 购物 -// xn--gckr3f0f : 2015-02-26 Amazon EU S.à r.l. +// xn--gckr3f0f : 2015-02-26 Amazon Registry Services, Inc. クラウド -// xn--gk3at1e : 2015-10-08 Amazon EU S.à r.l. +// xn--gk3at1e : 2015-10-08 Amazon Registry Services, Inc. 通販 -// xn--hxt814e : 2014-05-15 Zodiac Libra Limited +// xn--hxt814e : 2014-05-15 Zodiac Taurus Limited 网店 // xn--i1b6b1a6a2e : 2013-11-14 Public Interest Registry @@ -10442,7 +10515,7 @@ xin // xn--imr513n : 2014-12-11 Dot Trademark TLD Holding Company Limited 餐厅 -// xn--io0a7i : 2013-11-14 Computer Network Information Center of Chinese Academy of Sciences （China Internet Network Information Center） +// xn--io0a7i : 2013-11-14 China Internet Network Information Center (CNNIC) 网络 // xn--j1aef : 2015-01-15 VeriSign Sarl @@ -10451,7 +10524,7 @@ xin // xn--jlq61u9w7b : 2015-01-08 Nokia Corporation 诺基亚 -// xn--jvr189m : 2015-02-26 Amazon EU S.à r.l. +// xn--jvr189m : 2015-02-26 Amazon Registry Services, Inc. 食品 // xn--kcrx77d1x4a : 2014-11-07 Koninklijke Philips N.V. @@ -10511,6 +10584,9 @@ xin // xn--nyqy26a : 2014-11-07 Stable Tone Limited 健康 +// xn--otu796d : 2017-08-06 Dot Trademark TLD Holding Company Limited +招聘 + // xn--p1acf : 2013-12-12 Rusnames Limited рус @@ -10529,10 +10605,10 @@ xin // xn--rhqv96g : 2013-09-11 Stable Tone Limited 世界 -// xn--rovu88b : 2015-02-26 Amazon EU S.à r.l. +// xn--rovu88b : 2015-02-26 Amazon Registry Services, Inc. 書籍 -// xn--ses554g : 2014-01-16 +// xn--ses554g : 2014-01-16 KNET Co., Ltd. 网址 // xn--t60b56a : 2015-01-15 VeriSign Sarl @@ -10544,7 +10620,7 @@ xin // xn--tiq49xqyj : 2015-10-21 Pontificium Consilium de Comunicationibus Socialibus (PCCS) (Pontifical Council for Social Communication) 天主教 -// xn--unup4y : 2013-07-14 Spring Fields, LLC +// xn--unup4y : 2013-07-14 Binky Moon, LLC 游戏 // xn--vermgensberater-ctb : 2014-06-23 Deutsche Vermögensberatung Aktiengesellschaft DVAG @@ -10553,7 +10629,7 @@ vermögensberater // xn--vermgensberatung-pwb : 2014-06-23 Deutsche Vermögensberatung Aktiengesellschaft DVAG vermögensberatung -// xn--vhquv : 2013-08-27 Dash McCook, LLC +// xn--vhquv : 2013-08-27 Binky Moon, LLC 企业 // xn--vuq861b : 2014-10-16 Beijing Tele-info Network Technology Co., Ltd. @@ -10571,9 +10647,6 @@ vermögensberatung // xn--zfr164b : 2013-11-08 China Organizational Name Administration Center 政务 -// xperia : 2015-05-14 Sony Mobile Communications AB -xperia - // xyz : 2013-12-05 XYZ.COM LLC xyz @@ -10583,7 +10656,7 @@ yachts // yahoo : 2015-04-02 Yahoo! Domain Services Inc. yahoo -// yamaxun : 2014-12-18 Amazon EU S.à r.l. +// yamaxun : 2014-12-18 Amazon Registry Services, Inc. yamaxun // yandex : 2014-04-10 YANDEX, LLC @@ -10592,13 +10665,13 @@ yandex // yodobashi : 2014-11-20 YODOBASHI CAMERA CO.,LTD. yodobashi -// yoga : 2014-05-29 Top Level Domain Holdings Limited +// yoga : 2014-05-29 Minds + Machines Group Limited yoga // yokohama : 2013-12-12 GMO Registry, Inc. yokohama -// you : 2015-04-09 Amazon EU S.à r.l. +// you : 2015-04-09 Amazon Registry Services, Inc. you // youtube : 2014-05-01 Charleston Road Registry Inc. @@ -10607,13 +10680,13 @@ youtube // yun : 2015-01-08 QIHOO 360 TECHNOLOGY CO. LTD. yun -// zappos : 2015-06-25 Amazon EU S.à r.l. +// zappos : 2015-06-25 Amazon Registry Services, Inc. zappos // zara : 2014-11-07 Industria de Diseño Textil, S.A. (INDITEX, S.A.) zara -// zero : 2014-12-18 Amazon EU S.à r.l. +// zero : 2014-12-18 Amazon Registry Services, Inc. zero // zip : 2014-05-08 Charleston Road Registry Inc. @@ -10622,7 +10695,7 @@ zip // zippo : 2015-07-02 Zadco Company zippo -// zone : 2013-11-14 Outer Falls, LLC +// zone : 2013-11-14 Binky Moon, LLC zone // zuerich : 2014-11-07 Kanton Zürich (Canton of Zurich) @@ -10639,12 +10712,6 @@ cc.ua inf.ua ltd.ua -// AgileBits Inc : https://agilebits.com -// Submitted by Roustem Karimov -1password.ca -1password.com -1password.eu - // Agnat sp. z o.o. : https://domena.pl // Submitted by Przemyslaw Plewa beep.pl @@ -10675,6 +10742,7 @@ cn-north-1.eb.amazonaws.com.cn elasticbeanstalk.com ap-northeast-1.elasticbeanstalk.com ap-northeast-2.elasticbeanstalk.com +ap-northeast-3.elasticbeanstalk.com ap-south-1.elasticbeanstalk.com ap-southeast-1.elasticbeanstalk.com ap-southeast-2.elasticbeanstalk.com @@ -10797,6 +10865,10 @@ betainabox.com // Submitted by Nathan O'Sullivan bnr.la +// Blackbaud, Inc. : https://www.blackbaud.com +// Submitted by Paul Crowder +blackbaudcdn.net + // Boomla : https://boomla.com // Submitted by Tibor Halter boomla.net @@ -10844,7 +10916,6 @@ no.com qc.com ru.com sa.com -se.com se.net uk.com uk.net @@ -10888,9 +10959,14 @@ xenapponazure.com // Submitted by Leon Rowland virtueeldomein.nl +// Clever Cloud : https://www.clever-cloud.com/ +// Submitted by Quentin Adam +cleverapps.io + // Cloud66 : https://www.cloud66.com/ // Submitted by Khash Sajadi c66.me +cloud66.ws // CloudAccess.net : https://www.cloudaccess.net/ // Submitted by Pawel Panek @@ -10908,6 +10984,10 @@ cloudcontrolapp.com // co.ca : http://registry.co.ca/ co.ca +// Co & Co : https://co-co.nl/ +// Submitted by Govert Versluis +*.otap.co + // i-registry s.r.o. : http://www.i-registry.cz/ // Submitted by Martin Semrad co.cz @@ -10934,6 +11014,14 @@ cloudns.pro cloudns.pw cloudns.us +// Cloudeity Inc : https://cloudeity.com +// Submitted by Stefan Dimitrov +cloudeity.net + +// CNPY : https://cnpy.gdn +// Submitted by Angelo Gladding +cnpy.gdn + // CoDNS B.V. co.nl co.no @@ -10977,6 +11065,15 @@ cyon.site daplie.me localhost.daplie.me +// Datto, Inc. : https://www.datto.com/ +// Submitted by Philipp Heckel +dattolocal.com +dattorelay.com +dattoweb.com +mydatto.com +dattolocal.net +mydatto.net + // Dansk.net : http://www.dansk.net/ // Submitted by Anani Voule biz.dk @@ -11321,6 +11418,10 @@ ddnss.org definima.net definima.io +// dnstrace.pro : https://dnstrace.pro/ +// Submitted by Chris Partridge +bci.dnstrace.pro + // Dynu.com : https://www.dynu.com/ // Submitted by Sue Ye ddnsfree.com @@ -11532,6 +11633,11 @@ a.ssl.fastly.net b.ssl.fastly.net global.ssl.fastly.net +// FASTVPS EESTI OU : https://fastvps.ru/ +// Submitted by Likhachev Vasiliy +fastpanel.direct +fastvps-server.com + // Featherhead : https://featherhead.xyz/ // Submitted by Simon Menke fhapp.xyz @@ -11566,9 +11672,15 @@ fbxos.fr freebox-os.fr freeboxos.fr +// freedesktop.org : https://www.freedesktop.org +// Submitted by Daniel Stone +freedesktop.org + // Futureweb OG : http://www.futureweb.at // Submitted by Andreas Schnederle-Wagner *.futurecms.at +*.ex.futurecms.at +*.in.futurecms.at futurehosting.at futuremailing.at *.ex.ortsinfo.at @@ -11694,6 +11806,7 @@ hashbang.sh // Hasura : https://hasura.io // Submitted by Shahidh K Muhammed +hasura.app hasura-app.io // Hepforge : https://www.hepforge.org @@ -11705,6 +11818,14 @@ hepforge.org herokuapp.com herokussl.com +// Hibernating Rhinos +// Submitted by Oren Eini +myravendb.com +ravendb.community +ravendb.me +development.run +ravendb.run + // Ici la Lune : http://www.icilalune.com/ // Submitted by Simon Morvan moonscale.net @@ -11759,6 +11880,19 @@ pixolino.com // Submitted by Matthew Hardeman ipifony.net +// IServ GmbH : https://iserv.eu +// Submitted by Kim-Alexander Brodowski +mein-iserv.de +test-iserv.de + +// Jino : https://www.jino.ru +// Submitted by Sergey Ulyashin +myjino.ru +*.hosting.myjino.ru +*.landing.myjino.ru +*.spectrum.myjino.ru +*.vps.myjino.ru + // Joyent : https://www.joyent.com/ // Submitted by Brian Bennett *.triton.zone @@ -11786,34 +11920,84 @@ git-repos.de lcube-server.de svn-repos.de +// Lightmaker Property Manager, Inc. : https://app.lmpm.com/ +// Submitted by Greg Holland +app.lmpm.com + +// Linki Tools UG : https://linki.tools +// Submitted by Paulo Matos +linkitools.space + +// linkyard ldt: https://www.linkyard.ch/ +// Submitted by Mario Siegenthaler +linkyard.cloud +linkyard-cloud.ch + // LiquidNet Ltd : http://www.liquidnetlimited.com/ // Submitted by Victor Velchev we.bs +// Lug.org.uk : https://lug.org.uk +// Submitted by Jon Spriggs +uklugs.org +glug.org.uk +lug.org.uk +lugs.org.uk + // Lukanet Ltd : https://lukanet.com // Submitted by Anton Avramov barsy.bg +barsy.co.uk +barsyonline.co.uk +barsycenter.com barsyonline.com +barsy.club barsy.de barsy.eu barsy.in +barsy.info +barsy.io +barsy.me +barsy.menu +barsy.mobi barsy.net barsy.online +barsy.org +barsy.pro +barsy.pub +barsy.shop +barsy.site barsy.support +barsy.uk // Magento Commerce // Submitted by Damien Tournoud *.magentosite.cloud +// May First - People Link : https://mayfirst.org/ +// Submitted by Jamie McClelland +mayfirst.info +mayfirst.org + // Mail.Ru Group : https://hb.cldmail.ru // Submitted by Ilya Zaretskiy hb.cldmail.ru +// Memset hosting : https://www.memset.com +// Submitted by Tom Whitwell +miniserver.com +memset.net + // MetaCentrum, CESNET z.s.p.o. : https://www.metacentrum.cz/en/ // Submitted by Zdeněk Šustr cloud.metacentrum.cz custom.metacentrum.cz +// MetaCentrum, CESNET z.s.p.o. : https://www.metacentrum.cz/en/ +// Submitted by Radim Janča +flt.cloud.muni.cz +usr.cloud.muni.cz + // Meteor Development Group : https://www.meteor.com/hosting // Submitted by Pierre Carrier meteorapp.com @@ -11822,12 +12006,17 @@ eu.meteorapp.com // Michau Enterprises Limited : http://www.co.pl/ co.pl -// Microsoft : http://microsoft.com -// Submitted by Barry Dorrans +// Microsoft Corporation : http://microsoft.com +// Submitted by Justin Luk +azurecontainer.io azurewebsites.net azure-mobile.net cloudapp.net +// Mozilla Corporation : https://mozilla.com +// Submitted by Ben Francis +mozilla-iot.org + // Mozilla Foundation : https://mozilla.org/ // Submitted by glob bmoattachments.org @@ -11859,6 +12048,34 @@ nh-serv.co.uk // Submitted by Jeff Wheelhouse nfshost.com +// Now-DNS : https://now-dns.com +// Submitted by Steve Russell +dnsking.ch +mypi.co +n4t.co +001www.com +ddnslive.com +myiphost.com +forumz.info +16-b.it +32-b.it +64-b.it +soundcast.me +tcp4.me +dnsup.net +hicam.net +now-dns.net +ownip.net +vpndns.net +dynserv.org +now-dns.org +x443.pw +now-dns.top +ntdll.top +freeddns.us +crafting.xyz +zapto.xyz + // nsupdate.info : https://www.nsupdate.info/ // Submitted by Thomas Waldmann nsupdate.info @@ -11961,6 +12178,10 @@ stage.nodeart.io nodum.co nodum.io +// Nucleos Inc. : https://nucleos.com +// Submitted by Piotr Zduniak +pcloud.host + // NYC.mn : http://www.information.nyc.mn // Submitted by Matthew Brown nyc.mn @@ -11968,25 +12189,32 @@ nyc.mn // NymNom : https://nymnom.com/ // Submitted by Dave McCormack nom.ae +nom.af nom.ai nom.al nym.by nym.bz nom.cl nom.gd +nom.ge nom.gl nym.gr nom.gt +nym.gy nom.hn +nym.ie nom.im +nom.ke nym.kz nym.la +nym.lc nom.li nym.li nym.lt nym.lu nym.me nom.mk +nym.mn nym.mx nom.nu nym.nz @@ -11994,11 +12222,14 @@ nym.pe nym.pt nom.pw nom.qa +nym.ro nom.rs nom.si nym.sk +nom.st nym.su nym.sx +nom.tj nym.tw nom.ug nom.uy @@ -12009,6 +12240,10 @@ nom.vg // Submitted by Andrew Sampson cya.gg +// Omnibond Systems, LLC. : https://www.omnibond.com +// Submitted by Cole Estep +cloudycluster.net + // One Fold Media : http://www.onefoldmedia.com/ // Submitted by Eddie Jones nid.io @@ -12025,9 +12260,14 @@ operaunite.com // Submitted by Duarte Santos outsystemscloud.com -// OwnProvider : http://www.ownprovider.com +// OwnProvider GmbH: http://www.ownprovider.com // Submitted by Jan Moennich ownprovider.com +own.pm + +// OX : http://www.ox.rs +// Submitted by Adam Grand +ox.rs // oy.lc // Submitted by Charly Coste @@ -12084,6 +12324,10 @@ protonet.io chirurgiens-dentistes-en-france.fr byen.site +// Russian Academy of Sciences +// Submitted by Tech Support +ras.ru + // QA2 // Submitted by Daniel Dent (https://www.danieldent.com/) qa2.com @@ -12136,6 +12380,10 @@ sandcats.io logoip.de logoip.com +// schokokeks.org GbR : https://schokokeks.org/ +// Submitted by Hanno Böck +schokokeks.net + // Scry Security : http://www.scrysec.com // Submitted by Shante Adam scrysec.com @@ -12201,14 +12449,18 @@ apps.lair.io // Submitted by Reza Akhavan spacekit.io -// Stackspace : https://www.stackspace.io/ -// Submitted by Lina He -stackspace.space +// SpeedPartner GmbH: https://www.speedpartner.de/ +// Submitted by Stefan Neufeind +customer.speedpartner.de // Storj Labs Inc. : https://storj.io/ // Submitted by Philip Hutchins storj.farm +// Studenten Net Twente : http://www.snt.utwente.nl/ +// Submitted by Silke Hofstra +utwente.io + // Sub 6 Limited: http://www.sub6.com // Submitted by Dan Miller temp-dns.com @@ -12241,6 +12493,10 @@ gdynia.pl med.pl sopot.pl +// The Gwiddle Foundation : https://gwiddlefoundation.org.uk +// Submitted by Joshua Bayfield +gwiddle.co.uk + // Thingdust AG : https://thingdust.com/ // Submitted by Adrian Imboden cust.dev.thingdust.io @@ -12275,7 +12531,7 @@ lima-city.rocks webspace.rocks lima.zone -// TransIP : htts://www.transip.nl +// TransIP : https://www.transip.nl // Submitted by Rory Breuk *.transurl.be *.transurl.eu @@ -12304,6 +12560,7 @@ synology-ds.de // Uberspace : https://uberspace.de // Submitted by Moritz Werner uber.space +*.uberspace.de // UDR Limited : http://www.udr.hk.com // Submitted by registry @@ -12312,10 +12569,19 @@ hk.org ltd.hk inc.hk +// United Gameserver GmbH : https://united-gameserver.de +// Submitted by Stefan Schwarz +virtualuser.de +virtual-user.de + // .US // Submitted by Ed Moore lib.de.us +// VeryPositive SIA : http://very.lv +// Submitted by Danko Aleksejevs +2038.io + // Viprinet Europe GmbH : http://www.viprinet.com // Submitted by Simon Kissel router.management @@ -12338,12 +12604,26 @@ remotewd.com // Submitted by Yuvi Panda wmflabs.org +// XenonCloud GbR: https://xenoncloud.net +// Submitted by Julian Uphoff +half.host + +// XnBay Technology : http://www.xnbay.com/ +// Submitted by XnBay Developer +xnbay.com +u2.xnbay.com +u2-local.xnbay.com + // XS4ALL Internet bv : https://www.xs4all.nl/ // Submitted by Daniel Mostertman cistron.nl demon.nl xs4all.space +// YesCourse Pty Ltd : https://yescourse.com +// Submitted by Atul Bhouraskar +official.academy + // Yola : https://www.yola.com/ // Submitted by Stefano Rivera yolasite.com @@ -12358,6 +12638,11 @@ ybo.review ybo.science ybo.trade +// Yunohost : https://yunohost.org +// Submitted by Valentin Grimaud +nohost.me +noho.st + // ZaNiC : http://www.za.net/ // Submitted by registry za.net @@ -12367,4 +12652,8 @@ za.org // Submitted by Olli Vanhoja now.sh +// Zone.id : https://zone.id/ +// Submitted by Su Hendro +zone.id + // ===END PRIVATE DOMAINS=== From 93aad6add34658f8c8609eb914443e7d17378068 Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Wed, 15 Aug 2018 19:55:31 +0200 Subject: [PATCH 17/76] Release 3.0.3 --- CHANGELOG.md | 5 +++++ lib/public_suffix/version.rb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ccfeb32b..5df36bfc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ # Changelog +#### Release 3.0.3 + +- CHANGED: Updated definitions. + + #### Release 3.0.2 - CHANGED: Updated definitions. diff --git a/lib/public_suffix/version.rb b/lib/public_suffix/version.rb index 3866d960..85fc0e6e 100644 --- a/lib/public_suffix/version.rb +++ b/lib/public_suffix/version.rb @@ -6,5 +6,5 @@ module PublicSuffix # The current library version. - VERSION = "3.0.2".freeze + VERSION = "3.0.3".freeze end From 65e7b5fd3deb6dd46771c05b8c91da2d4d76f74f Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Mon, 29 Oct 2018 16:06:33 +0100 Subject: [PATCH 18/76] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e023d2eb..8c0cdca6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ rvm: - ruby-head env: - - COVERALL=1 + - COVERAGE=1 cache: - bundler From 38b89a9fbb053090f509b89ea8ff69d6b28a79dd Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Mon, 29 Oct 2018 16:09:21 +0100 Subject: [PATCH 19/76] Switch to CodeCov --- Gemfile | 2 +- test/test_helper.rb | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index db22b745..4face3d3 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" gemspec -gem "coveralls", require: false +gem "codecov", require: false gem "minitest" gem "minitest-reporters" gem "rubocop", require: false diff --git a/test/test_helper.rb b/test/test_helper.rb index 55a9643b..1b389687 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,6 +1,9 @@ -if ENV["COVERALL"] - require "coveralls" - Coveralls.wear! +if ENV["COVERAGE"] + require 'simplecov' + SimpleCov.start + + require 'codecov' + SimpleCov.formatter = SimpleCov::Formatter::Codecov end require "minitest/autorun" From f749c1ac7670828162f50770a9c0887e0366001a Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Mon, 29 Oct 2018 16:13:17 +0100 Subject: [PATCH 20/76] Fix offenses --- lib/public_suffix.rb | 2 ++ lib/public_suffix/list.rb | 8 +++++--- test/psl_test.rb | 1 + test/test_helper.rb | 4 ++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/public_suffix.rb b/lib/public_suffix.rb index c94eb66f..4bdecb11 100644 --- a/lib/public_suffix.rb +++ b/lib/public_suffix.rb @@ -77,6 +77,7 @@ def self.parse(name, list: List.default, default_rule: list.default_rule, ignore if rule.decompose(what).last.nil? raise DomainNotAllowed, "`#{what}` is not allowed according to Registry policy" end + # rubocop:enable Style/IfUnlessModifier decompose(what, rule) @@ -169,6 +170,7 @@ def self.normalize(name) return DomainInvalid.new("Name is blank") if name.empty? return DomainInvalid.new("Name starts with a dot") if name.start_with?(DOT) return DomainInvalid.new("%s is not expected to contain a scheme" % name) if name.include?("://") + name end diff --git a/lib/public_suffix/list.rb b/lib/public_suffix/list.rb index 605a9186..69173f7e 100644 --- a/lib/public_suffix/list.rb +++ b/lib/public_suffix/list.rb @@ -81,6 +81,7 @@ def self.parse(input, private_domains: true) # include private domains or stop scanner when line.include?(private_token) break if !private_domains + section = 2 # skip comments @@ -116,6 +117,7 @@ def initialize # @return [Boolean] def ==(other) return false unless other.is_a?(List) + equal?(other) || @rules == other.rules end alias eql? == @@ -170,6 +172,7 @@ def clear def find(name, default: default_rule, **options) rule = select(name, **options).inject do |l, r| return r if r.class == Rule::Exception + l.length > r.length ? l : r end rule || default @@ -201,12 +204,11 @@ def select(name, ignore_private: false) loop do match = @rules[query] - if !match.nil? && (ignore_private == false || match.private == false) - rules << entry_to_rule(match, query) - end + rules << entry_to_rule(match, query) if !match.nil? && (ignore_private == false || match.private == false) index += 1 break if index >= parts.size + query = parts[index] + DOT + query end diff --git a/test/psl_test.rb b/test/psl_test.rb index 004eb26e..b1b2e5e6 100644 --- a/test/psl_test.rb +++ b/test/psl_test.rb @@ -13,6 +13,7 @@ def self.tests line = line.strip next if line.empty? next if line.start_with?("//") + input, output = line.split(", ") # handle the case of eval("null"), it must be eval("nil") diff --git a/test/test_helper.rb b/test/test_helper.rb index 1b389687..25bea200 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,8 +1,8 @@ if ENV["COVERAGE"] - require 'simplecov' + require "simplecov" SimpleCov.start - require 'codecov' + require "codecov" SimpleCov.formatter = SimpleCov::Formatter::Codecov end From 916d0133eb78619c99eef82b88d649cb5885d2bb Mon Sep 17 00:00:00 2001 From: Peter Cai <222655+pcai@users.noreply.github.com> Date: Thu, 25 Apr 2019 05:02:53 -0400 Subject: [PATCH 21/76] Fix typo in comment (#159) --- lib/public_suffix/domain.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/public_suffix/domain.rb b/lib/public_suffix/domain.rb index 07ca8894..3f84bfac 100644 --- a/lib/public_suffix/domain.rb +++ b/lib/public_suffix/domain.rb @@ -43,7 +43,7 @@ def self.name_to_labels(name) # Initializes with a +tld+, +sld+ and +trd+. # @param [String] tld The TLD (extension) # @param [String] sld The SLD (domain) - # @param [String] tld The TRD (subdomain) + # @param [String] trd The TRD (subdomain) # # @yield [self] Yields on self. # @yieldparam [PublicSuffix::Domain] self The newly creates instance From f05f1565a0df49bbeea818008a57f966f20b95cf Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Thu, 25 Apr 2019 11:04:16 +0200 Subject: [PATCH 22/76] Make Travis happy --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8c0cdca6..da6e83cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ rvm: - 2.3 - 2.4 - 2.5 + - 2.6 - jruby-9.1.5.0 - ruby-head @@ -21,5 +22,5 @@ matrix: - rvm: jruby-9.1.0.0 before_install: - - rvm get latest + - gem update --system - gem install bundler From 1fb5578723ce41f8b21cd82818f5106fdfd2c0a9 Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Thu, 25 Apr 2019 11:09:52 +0200 Subject: [PATCH 23/76] Upgrade Bundler --- .ruby-gemset | 2 +- lib/public_suffix/version.rb | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.ruby-gemset b/.ruby-gemset index 06070ae9..4dcdb08b 100644 --- a/.ruby-gemset +++ b/.ruby-gemset @@ -1 +1 @@ -publicsuffix \ No newline at end of file +-global \ No newline at end of file diff --git a/lib/public_suffix/version.rb b/lib/public_suffix/version.rb index 85fc0e6e..c88cc01c 100644 --- a/lib/public_suffix/version.rb +++ b/lib/public_suffix/version.rb @@ -1,3 +1,6 @@ +# frozen_string_literal: true + +# # = Public Suffix # # Domain name parser based on the Public Suffix List. From 1f10154794530bf4a28f5213ed0dfc0e55b6eefc Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Thu, 25 Apr 2019 11:13:15 +0200 Subject: [PATCH 24/76] Minimum Ruby version is 2.3 --- .travis.yml | 2 -- CHANGELOG.md | 6 ++++++ public_suffix.gemspec | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index da6e83cd..e65f4f65 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,6 @@ language: ruby rvm: - - 2.1 - - 2.2 - 2.3 - 2.4 - 2.5 diff --git a/CHANGELOG.md b/CHANGELOG.md index 5df36bfc..42207cae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ # Changelog +#### master + +- CHANGED: Minimum Ruby version is 2.3 +- CHANGED: Upgraded to Bundler 2.x + + #### Release 3.0.3 - CHANGED: Updated definitions. diff --git a/public_suffix.gemspec b/public_suffix.gemspec index 44bfccf1..e4a6cd37 100644 --- a/public_suffix.gemspec +++ b/public_suffix.gemspec @@ -12,7 +12,7 @@ Gem::Specification.new do |s| s.description = "PublicSuffix can parse and decompose a domain name into top level domain, domain and subdomains." s.licenses = ["MIT"] - s.required_ruby_version = ">= 2.1" + s.required_ruby_version = ">= 2.3" s.require_paths = ["lib"] s.files = `git ls-files`.split("\n") From 2803479f5a1eceec0f1416ea538aa0ca301b64e9 Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Thu, 25 Apr 2019 11:20:07 +0200 Subject: [PATCH 25/76] Fix version mismatch --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e65f4f65..b676a52b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ cache: matrix: allow_failures: - rvm: ruby-head - - rvm: jruby-9.1.0.0 + - rvm: jruby-9.1.5.0 before_install: - gem update --system From d3ea96c432b0f0f59c6ca9170c610f97af3cc6f5 Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Mon, 27 May 2019 10:00:28 +0200 Subject: [PATCH 26/76] Upgrade to Rubocop 0.70 --- .rubocop_defaults.yml | 9 ++------- Gemfile | 2 ++ Rakefile | 4 +++- bin/console | 1 + lib/public_suffix.rb | 8 +++++--- lib/public_suffix/domain.rb | 2 ++ lib/public_suffix/errors.rb | 2 ++ lib/public_suffix/list.rb | 6 ++++-- lib/public_suffix/rule.rb | 2 ++ lib/public_suffix/version.rb | 2 +- test/acceptance_test.rb | 2 ++ test/psl_test.rb | 2 ++ test/test_helper.rb | 2 ++ test/unit/domain_test.rb | 2 ++ test/unit/errors_test.rb | 2 ++ test/unit/list_test.rb | 2 ++ test/unit/public_suffix_test.rb | 2 ++ test/unit/rule_test.rb | 2 ++ 18 files changed, 40 insertions(+), 14 deletions(-) diff --git a/.rubocop_defaults.yml b/.rubocop_defaults.yml index 4d07840d..fa91f00b 100644 --- a/.rubocop_defaults.yml +++ b/.rubocop_defaults.yml @@ -63,11 +63,6 @@ Metrics/ParameterLists: Metrics/PerceivedComplexity: Enabled: false -# [codesmell] -# I don't really get the point of this cop. -Performance/RedundantMerge: - Enabled: false - # Do not use "and" or "or" in conditionals, but for readability we can use it # to chain executions. Just beware of operator order. Style/AndOr: @@ -123,12 +118,12 @@ Style/RescueStandardError: # Array indentation should be considered like MultilineMethodCallIndentation indentation # and use 4 spaces instead of 2. -Layout/IndentArray: +Layout/IndentFirstArrayElement: IndentationWidth: 4 # Hash indentation should be considered like MultilineMethodCallIndentation indentation # and use 4 spaces instead of 2. -Layout/IndentHash: +Layout/IndentFirstHashElement: IndentationWidth: 4 # Multi-line differs from standard indentation, they are indented twice. diff --git a/Gemfile b/Gemfile index 4face3d3..1339c9f9 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,5 @@ +# frozen_string_literal: true + source "https://rubygems.org" gemspec diff --git a/Rakefile b/Rakefile index d304b662..502270a4 100644 --- a/Rakefile +++ b/Rakefile @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "bundler/gem_tasks" # By default, run tests and linter. @@ -39,7 +41,7 @@ desc "Downloads the Public Suffix List file from the repository and stores it lo task :"update-list" do require "net/http" - DEFINITION_URL = "https://raw.githubusercontent.com/publicsuffix/list/master/public_suffix_list.dat".freeze + DEFINITION_URL = "https://raw.githubusercontent.com/publicsuffix/list/master/public_suffix_list.dat" File.open("data/list.txt", "w+") do |f| response = Net::HTTP.get_response(URI.parse(DEFINITION_URL)) diff --git a/bin/console b/bin/console index fd0f7392..c638bb43 100755 --- a/bin/console +++ b/bin/console @@ -1,4 +1,5 @@ #!/usr/bin/env ruby +# frozen_string_literal: true require "bundler/setup" require "public_suffix" diff --git a/lib/public_suffix.rb b/lib/public_suffix.rb index 4bdecb11..b607cd31 100644 --- a/lib/public_suffix.rb +++ b/lib/public_suffix.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # = Public Suffix # # Domain name parser based on the Public Suffix List. @@ -20,9 +22,9 @@ # but was originally created to meet the needs of browser manufacturers. module PublicSuffix - DOT = ".".freeze - BANG = "!".freeze - STAR = "*".freeze + DOT = "." + BANG = "!" + STAR = "*" # Parses +name+ and returns the {PublicSuffix::Domain} instance. # diff --git a/lib/public_suffix/domain.rb b/lib/public_suffix/domain.rb index 3f84bfac..352d110e 100644 --- a/lib/public_suffix/domain.rb +++ b/lib/public_suffix/domain.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # = Public Suffix # # Domain name parser based on the Public Suffix List. diff --git a/lib/public_suffix/errors.rb b/lib/public_suffix/errors.rb index 687befb4..244164b6 100644 --- a/lib/public_suffix/errors.rb +++ b/lib/public_suffix/errors.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # = Public Suffix # # Domain name parser based on the Public Suffix List. diff --git a/lib/public_suffix/list.rb b/lib/public_suffix/list.rb index 69173f7e..c5077e35 100644 --- a/lib/public_suffix/list.rb +++ b/lib/public_suffix/list.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # = Public Suffix # # Domain name parser based on the Public Suffix List. @@ -65,8 +67,8 @@ def self.default=(value) # @param private_domains [Boolean] whether to ignore the private domains section # @return [PublicSuffix::List] def self.parse(input, private_domains: true) - comment_token = "//".freeze - private_token = "===BEGIN PRIVATE DOMAINS===".freeze + comment_token = "//" + private_token = "===BEGIN PRIVATE DOMAINS===" section = nil # 1 == ICANN, 2 == PRIVATE new do |list| diff --git a/lib/public_suffix/rule.rb b/lib/public_suffix/rule.rb index ec2ecd0c..93540210 100644 --- a/lib/public_suffix/rule.rb +++ b/lib/public_suffix/rule.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # = Public Suffix # # Domain name parser based on the Public Suffix List. diff --git a/lib/public_suffix/version.rb b/lib/public_suffix/version.rb index c88cc01c..03a08cce 100644 --- a/lib/public_suffix/version.rb +++ b/lib/public_suffix/version.rb @@ -9,5 +9,5 @@ module PublicSuffix # The current library version. - VERSION = "3.0.3".freeze + VERSION = "3.0.3" end diff --git a/test/acceptance_test.rb b/test/acceptance_test.rb index ce53bb8f..660bdbc0 100644 --- a/test/acceptance_test.rb +++ b/test/acceptance_test.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "test_helper" class AcceptanceTest < Minitest::Test diff --git a/test/psl_test.rb b/test/psl_test.rb index b1b2e5e6..20dc79a9 100644 --- a/test/psl_test.rb +++ b/test/psl_test.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "test_helper" require "public_suffix" diff --git a/test/test_helper.rb b/test/test_helper.rb index 25bea200..1d5468c3 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + if ENV["COVERAGE"] require "simplecov" SimpleCov.start diff --git a/test/unit/domain_test.rb b/test/unit/domain_test.rb index 509ce1b5..968462d9 100644 --- a/test/unit/domain_test.rb +++ b/test/unit/domain_test.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "test_helper" class PublicSuffix::DomainTest < Minitest::Test diff --git a/test/unit/errors_test.rb b/test/unit/errors_test.rb index 47ac592e..75099ba9 100644 --- a/test/unit/errors_test.rb +++ b/test/unit/errors_test.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "test_helper" class ErrorsTest < Minitest::Test diff --git a/test/unit/list_test.rb b/test/unit/list_test.rb index 693945d1..98529352 100644 --- a/test/unit/list_test.rb +++ b/test/unit/list_test.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "test_helper" class PublicSuffix::ListTest < Minitest::Test diff --git a/test/unit/public_suffix_test.rb b/test/unit/public_suffix_test.rb index a505ce1d..48a85e0f 100644 --- a/test/unit/public_suffix_test.rb +++ b/test/unit/public_suffix_test.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "test_helper" class PublicSuffixTest < Minitest::Test diff --git a/test/unit/rule_test.rb b/test/unit/rule_test.rb index ed1c1320..ea5ec8c0 100644 --- a/test/unit/rule_test.rb +++ b/test/unit/rule_test.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "test_helper" class PublicSuffix::RuleTest < Minitest::Test From 245836e3c1e5f82bf23d35579479ee8d6c2fcaca Mon Sep 17 00:00:00 2001 From: Guilherme Quirino Date: Mon, 27 May 2019 05:01:10 -0300 Subject: [PATCH 27/76] Update definitions list (#160) --- data/list.txt | 469 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 376 insertions(+), 93 deletions(-) diff --git a/data/list.txt b/data/list.txt index f671831a..c6d33bc8 100644 --- a/data/list.txt +++ b/data/list.txt @@ -155,8 +155,13 @@ mil.al net.al org.al -// am : https://en.wikipedia.org/wiki/.am +// am : https://www.amnic.net/policy/en/Policy_EN.pdf am +co.am +com.am +commune.am +net.am +org.am // ao : https://en.wikipedia.org/wiki/.ao // http://www.dns.ao/REGISTR.DOC @@ -551,6 +556,7 @@ niteroi.br not.br ntr.br odo.br +ong.br org.br osasco.br palmas.br @@ -580,6 +586,7 @@ slz.br sorocaba.br srv.br taxi.br +tc.br teo.br the.br tmp.br @@ -983,17 +990,16 @@ fm fo // fr : http://www.afnic.fr/ -// domaines descriptifs : http://www.afnic.fr/obtenir/chartes/nommage-fr/annexe-descriptifs +// domaines descriptifs : https://www.afnic.fr/medias/documents/Cadre_legal/Afnic_Naming_Policy_12122016_VEN.pdf fr -com.fr asso.fr +com.fr +gouv.fr nom.fr prd.fr -presse.fr tm.fr -// domaines sectoriels : http://www.afnic.fr/obtenir/chartes/nommage-fr/annexe-sectoriels +// domaines sectoriels : https://www.afnic.fr/en/products-and-services/the-fr-tld/sector-based-fr-domains-4.html aeroport.fr -assedic.fr avocat.fr avoues.fr cci.fr @@ -1001,7 +1007,6 @@ chambagri.fr chirurgiens-dentistes.fr experts-comptables.fr geometre-expert.fr -gouv.fr greta.fr huissier-justice.fr medecin.fr @@ -1413,9 +1418,9 @@ taa.it tos.it toscana.it trentin-sud-tirol.it -trentin-süd-tirol.it +trentin-süd-tirol.it trentin-sudtirol.it -trentin-südtirol.it +trentin-südtirol.it trentin-sued-tirol.it trentin-suedtirol.it trentino-a-adige.it @@ -1425,9 +1430,9 @@ trentino-altoadige.it trentino-s-tirol.it trentino-stirol.it trentino-sud-tirol.it -trentino-süd-tirol.it +trentino-süd-tirol.it trentino-sudtirol.it -trentino-südtirol.it +trentino-südtirol.it trentino-sued-tirol.it trentino-suedtirol.it trentino.it @@ -1438,15 +1443,15 @@ trentinoaltoadige.it trentinos-tirol.it trentinostirol.it trentinosud-tirol.it -trentinosüd-tirol.it +trentinosüd-tirol.it trentinosudtirol.it -trentinosüdtirol.it +trentinosüdtirol.it trentinosued-tirol.it trentinosuedtirol.it trentinsud-tirol.it -trentinsüd-tirol.it +trentinsüd-tirol.it trentinsudtirol.it -trentinsüdtirol.it +trentinsüdtirol.it trentinsued-tirol.it trentinsuedtirol.it tuscany.it @@ -1463,13 +1468,13 @@ valleaosta.it valled-aosta.it valledaosta.it vallee-aoste.it -vallée-aoste.it +vallée-aoste.it vallee-d-aoste.it -vallée-d-aoste.it +vallée-d-aoste.it valleeaoste.it -valléeaoste.it +valléeaoste.it valleedaoste.it -valléedaoste.it +valléedaoste.it vao.it vda.it ven.it @@ -1503,7 +1508,7 @@ av.it avellino.it ba.it balsan-sudtirol.it -balsan-südtirol.it +balsan-südtirol.it balsan-suedtirol.it balsan.it bari.it @@ -1522,7 +1527,7 @@ bologna.it bolzano-altoadige.it bolzano.it bozen-sudtirol.it -bozen-südtirol.it +bozen-südtirol.it bozen-suedtirol.it bozen.it br.it @@ -1531,7 +1536,7 @@ brindisi.it bs.it bt.it bulsan-sudtirol.it -bulsan-südtirol.it +bulsan-südtirol.it bulsan-suedtirol.it bulsan.it bz.it @@ -1551,9 +1556,9 @@ catanzaro.it cb.it ce.it cesena-forli.it -cesena-forlì.it +cesena-forlì.it cesenaforli.it -cesenaforlì.it +cesenaforlì.it ch.it chieti.it ci.it @@ -1584,9 +1589,9 @@ florence.it fm.it foggia.it forli-cesena.it -forlì-cesena.it +forlì-cesena.it forlicesena.it -forlìcesena.it +forlìcesena.it fr.it frosinone.it ge.it @@ -1717,7 +1722,7 @@ sp.it sr.it ss.it suedtirol.it -südtirol.it +südtirol.it sv.it ta.it taranto.it @@ -3789,10 +3794,18 @@ gov.lr org.lr net.lr -// ls : https://en.wikipedia.org/wiki/.ls +// ls : http://www.nic.ls/ +// Confirmed by registry ls +ac.ls +biz.ls co.ls +edu.ls +gov.ls +info.ls +net.ls org.ls +sc.ls // lt : https://en.wikipedia.org/wiki/.lt lt @@ -4650,9 +4663,6 @@ web.ni // ccTLD for the Netherlands nl -// BV.nl will be a registry for dutch BV's (besloten vennootschap) -bv.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 @@ -5882,17 +5892,15 @@ int.ru mil.ru test.ru -// rw : http://www.nic.rw/cgi-bin/policy.pl +// rw : https://www.ricta.org.rw/sites/default/files/resources/registry_registrar_contract_0.pdf rw -gov.rw -net.rw -edu.rw ac.rw -com.rw co.rw -int.rw +coop.rw +gov.rw mil.rw -gouv.rw +net.rw +org.rw // sa : http://www.nic.net.sa/ sa @@ -6182,34 +6190,33 @@ org.to edu.to mil.to -// subTLDs: https://www.nic.tr/forms/eng/policies.pdf -// and: https://www.nic.tr/forms/politikalar.pdf -// Submitted by +// tr : https://nic.tr/ +// https://nic.tr/forms/eng/policies.pdf +// https://nic.tr/index.php?USRACTN=PRICELST tr -com.tr -info.tr -biz.tr -net.tr -org.tr -web.tr -gen.tr -tv.tr av.tr -dr.tr bbs.tr -name.tr -tel.tr -gov.tr bel.tr -pol.tr +biz.tr +com.tr +dr.tr +edu.tr +gen.tr +gov.tr +info.tr mil.tr k12.tr -edu.tr kep.tr - +name.tr +net.tr +org.tr +pol.tr +tel.tr +tsk.tr +tv.tr +web.tr // Used by Northern Cyprus nc.tr - // Used by government agencies of Northern Cyprus gov.nc.tr @@ -7098,9 +7105,6 @@ accountants // aco : 2015-01-08 ACO Severin Ahlmann GmbH & Co. KG aco -// active : 2014-05-01 Active Network, LLC -active - // actor : 2013-12-12 United TLD Holdco Ltd. actor @@ -7401,9 +7405,6 @@ black // blackfriday : 2014-01-16 Uniregistry, Corp. blackfriday -// blanco : 2015-07-16 BLANCO GmbH + Co KG -blanco - // blockbuster : 2015-07-30 Dish DBS Corporation blockbuster @@ -7938,9 +7939,6 @@ dodge // dog : 2014-12-04 Binky Moon, LLC dog -// doha : 2014-09-18 Communications Regulatory Authority (CRA) -doha - // domains : 2013-10-17 Binky Moon, LLC domains @@ -8013,9 +8011,6 @@ engineering // enterprises : 2013-09-20 Binky Moon, LLC enterprises -// epost : 2015-07-23 Deutsche Post AG -epost - // epson : 2014-12-04 Seiko Epson Corporation epson @@ -8343,9 +8338,6 @@ golf // goo : 2014-12-18 NTT Resonant Inc. goo -// goodhands : 2015-07-31 Allstate Fire and Casualty Insurance Company -goodhands - // goodyear : 2015-07-02 The Goodyear Tire & Rubber Company goodyear @@ -8646,9 +8638,6 @@ jewelry // jio : 2015-04-02 Reliance Industries Limited jio -// jlc : 2014-12-04 Richemont DNS Inc. -jlc - // jll : 2015-04-02 Jones Lang LaSalle Incorporated jll @@ -9291,9 +9280,6 @@ page // panasonic : 2015-07-30 Panasonic Corporation panasonic -// panerai : 2014-11-07 Richemont DNS Inc. -panerai - // paris : 2014-01-30 City of Paris paris @@ -9846,9 +9832,6 @@ soy // space : 2014-04-03 DotSpace Inc. space -// spiegel : 2014-02-05 SPIEGEL-Verlag Rudolf Augstein GmbH & Co. KG -spiegel - // sport : 2017-11-16 Global Association of International Sports Federations (GAISF) sport @@ -9882,9 +9865,6 @@ statebank // statefarm : 2015-07-30 State Farm Mutual Automobile Insurance Company statefarm -// statoil : 2014-12-04 Statoil ASA -statoil - // stc : 2014-10-09 Saudi Telecom Company stc @@ -9996,9 +9976,6 @@ tech // technology : 2013-09-13 Binky Moon, LLC technology -// telecity : 2015-02-19 TelecityGroup International Limited -telecity - // telefonica : 2014-10-16 Telefónica S.A. telefonica @@ -10206,9 +10183,6 @@ visa // vision : 2013-12-05 Binky Moon, LLC vision -// vista : 2014-09-18 Vistaprint Limited -vista - // vistaprint : 2014-09-18 Vistaprint Limited vistaprint @@ -10692,9 +10666,6 @@ zero // zip : 2014-05-08 Charleston Road Registry Inc. zip -// zippo : 2015-07-02 Zadco Company -zippo - // zone : 2013-11-14 Binky Moon, LLC zone @@ -10716,6 +10687,10 @@ ltd.ua // Submitted by Przemyslaw Plewa beep.pl +// alboto.ca : http://alboto.ca +// Submitted by Anton Avramov +barsy.ca + // Alces Software Ltd : http://alces-software.com // Submitted by Mark J. Titorenko *.compute.estate @@ -10739,6 +10714,7 @@ us-east-1.amazonaws.com // Amazon Elastic Beanstalk : https://aws.amazon.com/elasticbeanstalk/ // Submitted by Luke Wells cn-north-1.eb.amazonaws.com.cn +cn-northwest-1.eb.amazonaws.com.cn elasticbeanstalk.com ap-northeast-1.elasticbeanstalk.com ap-northeast-2.elasticbeanstalk.com @@ -10825,6 +10801,10 @@ s3-website.us-east-2.amazonaws.com t3l3p0rt.net tele.amune.org +// Apigee : https://apigee.com/ +// Submitted by Apigee Security Team +apigee.io + // Aptible : https://www.aptible.com/ // Submitted by Thomas Orozco on-aptible.com @@ -10844,6 +10824,12 @@ sweetpepper.org // Submitted by Vincent Tseng myasustor.com +// Automattic Inc. : https://automattic.com/ +// Submitted by Alex Concha +go-vip.co +go-vip.net +wpcomstaging.com + // AVM : https://avm.de // Submitted by Andreas Weise myfritz.net @@ -10853,10 +10839,18 @@ myfritz.net *.awdev.ca *.advisor.ws +// b-data GmbH : https://www.b-data.io +// Submitted by Olivier Benz +b-data.io + // backplane : https://www.backplane.io // Submitted by Anthony Voutas backplaneapp.io +// Banzai Cloud +// Submitted by Gabor Kozma +app.banzaicloud.io + // BetaInABox // Submitted by Adrian betainabox.com @@ -10890,10 +10884,22 @@ square7.net // Submitted by Dave Tharp browsersafetymark.io +// Bytemark Hosting : https://www.bytemark.co.uk +// Submitted by Paul Cammish +uk0.bigv.io +dh.bytemark.co.uk +vm.bytemark.co.uk + // callidomus : https://www.callidomus.com/ // Submitted by Marcus Popp mycd.eu +// Carrd : https://carrd.co +// Submitted by AJ +carrd.co +crd.co +uwu.ai + // CentralNic : http://www.centralnic.com/names/domains // Submitted by registry ae.org @@ -10955,6 +10961,10 @@ certmgr.org // Submitted by Alex Stoddard xenapponazure.com +// Civilized Discourse Construction Kit, Inc. : https://www.discourse.org/ +// Submitted by Rishabh Nambiar +discourse.group + // ClearVox : http://www.clearvox.nl/ // Submitted by Leon Rowland virtueeldomein.nl @@ -10963,10 +10973,16 @@ virtueeldomein.nl // Submitted by Quentin Adam cleverapps.io +// Clerk : https://www.clerk.dev +// Submitted by Colin Sidoti +*.lcl.dev +*.stg.dev + // Cloud66 : https://www.cloud66.com/ // Submitted by Khash Sajadi c66.me cloud66.ws +cloud66.zone // CloudAccess.net : https://www.cloudaccess.net/ // Submitted by Pawel Panek @@ -10981,6 +10997,14 @@ cloudaccess.net cloudcontrolled.com cloudcontrolapp.com +// Cloudflare, Inc. : https://www.cloudflare.com/ +// Submitted by Jake Riesterer +workers.dev + +// Clovyr : https://clovyr.io +// Submitted by Patrick Nielsen +wnext.app + // co.ca : http://registry.co.ca/ co.ca @@ -11082,6 +11106,11 @@ firm.dk reg.dk store.dk +// dapps.earth : https://dapps.earth/ +// Submitted by Daniil Burdakov +*.dapps.earth +*.bzz.dapps.earth + // Debian : https://www.debian.org/ // Submitted by Peter Palfrader / Debian Sysadmin Team debian.net @@ -11094,6 +11123,11 @@ dedyn.io // Submitted by Norbert Auler dnshome.de +// DotArai : https://www.dotarai.com/ +// Submitted by Atsadawat Netcharadsang +online.th +shop.th + // DrayTek Corp. : https://www.draytek.com/ // Submitted by Paul Fang drayddns.com @@ -11454,6 +11488,11 @@ e4.cz // Submitted by Thomas Cottier mytuleap.com +// ECG Robotics, Inc: https://ecgrobotics.org +// Submitted by +onred.one +staging.onred.one + // Enonic : http://enonic.com/ // Submitted by Erik Kaareng-Sunde enonic.io @@ -11623,6 +11662,7 @@ channelsdvr.net // Fastly Inc. : http://www.fastly.com/ // Submitted by Fastly Security +fastly-terrarium.com fastlylb.net map.fastlylb.net freetls.fastly.net @@ -11650,9 +11690,19 @@ cloud.fedoraproject.org app.os.fedoraproject.org app.os.stg.fedoraproject.org +// Fermax : https://fermax.com/ +// submitted by Koen Van Isterdael +mydobiss.com + // Filegear Inc. : https://www.filegear.com // Submitted by Jason Zhu filegear.me +filegear-au.me +filegear-de.me +filegear-gb.me +filegear-ie.me +filegear-jp.me +filegear-sg.me // Firebase, Inc. // Submitted by Chris Raynor @@ -11691,6 +11741,15 @@ futuremailing.at // Submitted by David Illsley service.gov.uk +// Gehirn Inc. : https://www.gehirn.co.jp/ +// Submitted by Kohei YOSHIDA +gehirn.ne.jp +usercontent.jp + +// Gentlent, Limited : https://www.gentlent.com +// Submitted by Tom Klein +lab.ms + // GitHub, Inc. // Submitted by Patrick Toomey github.io @@ -11700,6 +11759,15 @@ githubusercontent.com // Submitted by Alex Hanselka gitlab.io +// Glitch, Inc : https://glitch.com +// Submitted by Mads Hartmann +glitch.me + +// GOV.UK Platform as a Service : https://www.cloud.service.gov.uk/ +// Submitted by Tom Whitwell +cloudapps.digital +london.cloudapps.digital + // UKHomeOffice : https://www.gov.uk/government/organisations/home-office // Submitted by Jon Shanks homeoffice.gov.uk @@ -11715,6 +11783,8 @@ goip.de // Google, Inc. // Submitted by Eduardo Vela +run.app +a.run.app *.0emm.com appspot.com blogspot.ae @@ -11801,6 +11871,14 @@ publishproxy.com withgoogle.com withyoutube.com +// Hakaran group: http://hakaran.cz +// Submited by Arseniy Sokolov +fin.ci +free.hr +caa.li +ua.rs +conf.se + // Hashbang : https://hashbang.sh hashbang.sh @@ -11826,14 +11904,44 @@ ravendb.me development.run ravendb.run +// HOSTBIP REGISTRY : https://www.hostbip.com/ +// Submitted by Atanunu Igbunuroghene +bpl.biz +orx.biz +ng.city +ng.ink +biz.gl +col.ng +gen.ng +ltd.ng +sch.so + +// Häkkinen.fi +// Submitted by Eero Häkkinen +häkkinen.fi + // Ici la Lune : http://www.icilalune.com/ // Submitted by Simon Morvan +*.moonscale.io moonscale.net // iki.fi // Submitted by Hannu Aronsson iki.fi +// Individual Network Berlin e.V. : https://www.in-berlin.de/ +// Submitted by Christian Seitz +dyn-berlin.de +in-berlin.de +in-brb.de +in-butter.de +in-dsl.de +in-dsl.net +in-dsl.org +in-vpn.de +in-vpn.net +in-vpn.org + // info.at : http://www.info.at/ biz.at info.at @@ -11902,6 +12010,11 @@ myjino.ru // Submitted by Stefan Keim js.org +// KaasHosting : http://www.kaashosting.nl/ +// Submitted by Wouter Bakker +kaas.gg +khplay.nl + // Keyweb AG : https://www.keyweb.de // Submitted by Martin Dannehl keymachine.de @@ -11920,6 +12033,22 @@ git-repos.de lcube-server.de svn-repos.de +// Leadpages : https://www.leadpages.net +// Submitted by Greg Dallavalle +leadpages.co +lpages.co +lpusercontent.com + +// Lifetime Hosting : https://Lifetime.Hosting/ +// Submitted by Mike Fillator +co.business +co.education +co.events +co.financial +co.network +co.place +co.technology + // Lightmaker Property Manager, Inc. : https://app.lmpm.com/ // Submitted by Greg Holland app.lmpm.com @@ -11933,10 +12062,32 @@ linkitools.space linkyard.cloud linkyard-cloud.ch +// Linode : https://linode.com +// Submitted by +members.linode.com +nodebalancer.linode.com + // LiquidNet Ltd : http://www.liquidnetlimited.com/ // Submitted by Victor Velchev we.bs +// Log'in Line : https://www.loginline.com/ +// Submitted by Rémi Mach +loginline.app +loginline.dev +loginline.io +loginline.services +loginline.site + +// LubMAN UMCS Sp. z o.o : https://lubman.pl/ +// Submitted by Ireneusz Maliszewski +krasnik.pl +leczna.pl +lubartow.pl +lublin.pl +poniatowa.pl +swidnik.pl + // Lug.org.uk : https://lug.org.uk // Submitted by Jon Spriggs uklugs.org @@ -12027,6 +12178,30 @@ net.ru org.ru pp.ru +// Nabu Casa : https://www.nabucasa.com +// Submitted by Paulus Schoutsen +ui.nabu.casa + +// Names.of.London : https://names.of.london/ +// Submitted by James Stevens or +pony.club +of.fashion +on.fashion +of.football +in.london +of.london +for.men +and.mom +for.mom +for.one +for.sale +of.work +to.work + +// NCTU.ME : https://nctu.me/ +// Submitted by Tocknicsu +nctu.me + // Netlify : https://www.netlify.com // Submitted by Jessica Parsons bitballoon.com @@ -12307,6 +12482,14 @@ on-web.fr *.platform.sh *.platformsh.site +// Port53 : https://port53.io/ +// Submitted by Maximilian Schieder +dyn53.io + +// Positive Codes Technology Company : http://co.bn/faq.html +// Submitted by Zulfais +co.bn + // prgmr.com : https://prgmr.com/ // Submitted by Sarah Newman xen.prgmr.com @@ -12315,6 +12498,14 @@ xen.prgmr.com // Submitted by registry priv.at +// privacytools.io : https://www.privacytools.io/ +// Submitted by Jonah Aragon +prvcy.page + +// Protocol Labs : https://protocol.ai/ +// Submitted by Michael Burns +*.dweb.link + // Protonet GmbH : http://protonet.io // Submitted by Martin Meier protonet.io @@ -12324,6 +12515,10 @@ protonet.io chirurgiens-dentistes-en-france.fr byen.site +// Redstar Consultants : https://www.redstarconsultants.com/ +// Submitted by Jons Slemmer +instantcloud.cn + // Russian Academy of Sciences // Submitted by Tech Support ras.ru @@ -12352,10 +12547,29 @@ vaporcloud.io rackmaze.com rackmaze.net +// Rancher Labs, Inc : https://rancher.com +// Submitted by Vincent Fiduccia +*.on-rancher.cloud +*.on-rio.io + +// Read The Docs, Inc : https://www.readthedocs.org +// Submitted by David Fischer +readthedocs.io + // Red Hat, Inc. OpenShift : https://openshift.redhat.com/ // Submitted by Tim Kramer rhcloud.com +// Render : https://render.com +// Submitted by Anurag Goel +app.render.com +onrender.com + +// Repl.it : https://repl.it +// Submitted by Mason Clayton +repl.co +repl.run + // Resin.io : https://resin.io // Submitted by Tim Perry resindevice.io @@ -12371,6 +12585,10 @@ wellbeingzone.eu ptplus.fit wellbeingzone.co.uk +// Rochester Institute of Technology : http://www.rit.edu/ +// Submitted by Jennifer Herting +git-pages.rit.edu + // Sandstorm Development Group, Inc. : https://sandcats.io/ // Submitted by Asheesh Laroia sandcats.io @@ -12420,6 +12638,10 @@ shiftedit.io // Submitted by Alex Bowers myshopblocks.com +// Siemens Mobility GmbH +// Submitted by Oliver Graebner +mo-siemens.io + // SinaAppEngine : http://sae.sina.com.cn/ // Submitted by SinaAppEngine 1kapp.com @@ -12428,12 +12650,20 @@ applinzi.com sinaapp.com vipsinaapp.com +// Siteleaf : https://www.siteleaf.com/ +// Submitted by Skylar Challand +siteleaf.net + // Skyhat : http://www.skyhat.io // Submitted by Shante Adam bounty-full.com alpha.bounty-full.com beta.bounty-full.com +// Stackhero : https://www.stackhero.io +// Submitted by Adrien Gillon +stackhero-network.com + // staticland : https://static.land // Submitted by Seth Vincent static.land @@ -12453,6 +12683,10 @@ spacekit.io // Submitted by Stefan Neufeind customer.speedpartner.de +// Standard Library : https://stdlib.com +// Submitted by Jacob Lee +api.stdlib.com + // Storj Labs Inc. : https://storj.io/ // Submitted by Philip Hutchins storj.farm @@ -12461,10 +12695,24 @@ storj.farm // Submitted by Silke Hofstra utwente.io +// Student-Run Computing Facility : https://www.srcf.net/ +// Submitted by Edwin Balani +soc.srcf.net +user.srcf.net + // Sub 6 Limited: http://www.sub6.com // Submitted by Dan Miller temp-dns.com +// Swisscom Application Cloud: https://developer.swisscom.com +// Submitted by Matthias.Winzeler +applicationcloud.io +scapp.io + +// Syncloud : https://syncloud.org +// Submitted by Boris Rybalkin +syncloud.it + // Synology, Inc. : https://www.synology.com/ // Submitted by Rony Weng diskstation.me @@ -12493,17 +12741,33 @@ gdynia.pl med.pl sopot.pl +// Teckids e.V. : https://www.teckids.org +// Submitted by Dominik George +edugit.org + +// Telebit : https://telebit.cloud +// Submitted by AJ ONeal +telebit.app +telebit.io +*.telebit.xyz + // The Gwiddle Foundation : https://gwiddlefoundation.org.uk // Submitted by Joshua Bayfield gwiddle.co.uk // Thingdust AG : https://thingdust.com/ // Submitted by Adrian Imboden +thingdustdata.com cust.dev.thingdust.io cust.disrec.thingdust.io cust.prod.thingdust.io cust.testing.thingdust.io +// Tlon.io : https://tlon.io +// Submitted by Mark Staarink +arvo.network +azimuth.network + // TownNews.com : http://www.townnews.com // Submitted by Dustin Ward bloxcms.com @@ -12590,6 +12854,14 @@ router.management // Submitted by Adnan RIHAN v-info.info +// Voorloper.com: https://voorloper.com +// Submitted by Nathan van Bakel +voorloper.cloud + +// Waffle Computer Inc., Ltd. : https://docs.waffleinfo.com +// Submitted by Masayuki Note +wafflecell.com + // WeDeploy by Liferay, Inc. : https://www.wedeploy.com // Submitted by Henrique Vicente wedeploy.io @@ -12652,6 +12924,17 @@ za.org // Submitted by Olli Vanhoja now.sh +// Zine EOOD : https://zine.bg/ +// Submitted by Martin Angelov +bss.design + +// Zitcom A/S : https://www.zitcom.dk +// Submitted by Emil Stahl +basicserver.io +virtualserver.io +site.builder.nu +enterprisecloud.nu + // Zone.id : https://zone.id/ // Submitted by Su Hendro zone.id From 22ce7d53267819984ada3dc5898b7f9dc4ba085c Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Mon, 27 May 2019 10:07:20 +0200 Subject: [PATCH 28/76] Release 3.1.0 --- CHANGELOG.md | 3 ++- LICENSE.txt | 2 +- README.md | 2 +- lib/public_suffix.rb | 2 +- lib/public_suffix/domain.rb | 2 +- lib/public_suffix/errors.rb | 2 +- lib/public_suffix/list.rb | 2 +- lib/public_suffix/rule.rb | 2 +- lib/public_suffix/version.rb | 4 ++-- 9 files changed, 11 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 42207cae..198c9a29 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,9 @@ # Changelog -#### master +#### Release 3.1.0 +- CHANGED: Updated definitions. - CHANGED: Minimum Ruby version is 2.3 - CHANGED: Upgraded to Bundler 2.x diff --git a/LICENSE.txt b/LICENSE.txt index 69e44dac..561dc171 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,4 @@ -Copyright (c) 2009-2018 Simone Carletti +Copyright (c) 2009-2019 Simone Carletti MIT License diff --git a/README.md b/README.md index a82c95a1..18ab0098 100644 --- a/README.md +++ b/README.md @@ -197,6 +197,6 @@ See the [CHANGELOG.md](CHANGELOG.md) file for details. ## License -Copyright (c) 2009-2018 Simone Carletti. This is Free Software distributed under the MIT license. +Copyright (c) 2009-2019 Simone Carletti. This is Free Software distributed under the MIT license. The [Public Suffix List source](https://publicsuffix.org/list/) is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/lib/public_suffix.rb b/lib/public_suffix.rb index b607cd31..2fe83b59 100644 --- a/lib/public_suffix.rb +++ b/lib/public_suffix.rb @@ -4,7 +4,7 @@ # # Domain name parser based on the Public Suffix List. # -# Copyright (c) 2009-2018 Simone Carletti +# Copyright (c) 2009-2019 Simone Carletti require_relative "public_suffix/domain" require_relative "public_suffix/version" diff --git a/lib/public_suffix/domain.rb b/lib/public_suffix/domain.rb index 352d110e..8ccac5ca 100644 --- a/lib/public_suffix/domain.rb +++ b/lib/public_suffix/domain.rb @@ -4,7 +4,7 @@ # # Domain name parser based on the Public Suffix List. # -# Copyright (c) 2009-2018 Simone Carletti +# Copyright (c) 2009-2019 Simone Carletti module PublicSuffix diff --git a/lib/public_suffix/errors.rb b/lib/public_suffix/errors.rb index 244164b6..0d3c6441 100644 --- a/lib/public_suffix/errors.rb +++ b/lib/public_suffix/errors.rb @@ -4,7 +4,7 @@ # # Domain name parser based on the Public Suffix List. # -# Copyright (c) 2009-2018 Simone Carletti +# Copyright (c) 2009-2019 Simone Carletti module PublicSuffix diff --git a/lib/public_suffix/list.rb b/lib/public_suffix/list.rb index c5077e35..c573b4cf 100644 --- a/lib/public_suffix/list.rb +++ b/lib/public_suffix/list.rb @@ -4,7 +4,7 @@ # # Domain name parser based on the Public Suffix List. # -# Copyright (c) 2009-2018 Simone Carletti +# Copyright (c) 2009-2019 Simone Carletti module PublicSuffix diff --git a/lib/public_suffix/rule.rb b/lib/public_suffix/rule.rb index 93540210..525d337f 100644 --- a/lib/public_suffix/rule.rb +++ b/lib/public_suffix/rule.rb @@ -4,7 +4,7 @@ # # Domain name parser based on the Public Suffix List. # -# Copyright (c) 2009-2018 Simone Carletti +# Copyright (c) 2009-2019 Simone Carletti module PublicSuffix diff --git a/lib/public_suffix/version.rb b/lib/public_suffix/version.rb index 03a08cce..1d649a3a 100644 --- a/lib/public_suffix/version.rb +++ b/lib/public_suffix/version.rb @@ -5,9 +5,9 @@ # # Domain name parser based on the Public Suffix List. # -# Copyright (c) 2009-2018 Simone Carletti +# Copyright (c) 2009-2019 Simone Carletti module PublicSuffix # The current library version. - VERSION = "3.0.3" + VERSION = "3.1.0" end From 732a65132cfda3abd65a2f82f2d9fc8916821003 Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Mon, 27 May 2019 10:09:17 +0200 Subject: [PATCH 29/76] Fix version in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 18ab0098..5d417ded 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ ## Requirements -- Ruby >= 2.1 +- Ruby >= 2.3 For an older versions of Ruby use a previous release. From 34046e30a7c4829ba6854b21fe1c62626598ec72 Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Tue, 25 Jun 2019 21:19:35 +0200 Subject: [PATCH 30/76] Update PSL --- CHANGELOG.md | 5 ++ data/list.txt | 192 ++++++++++++++++++++++++++++---------------------- 2 files changed, 113 insertions(+), 84 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 198c9a29..97b247da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ # Changelog +#### master + +- CHANGED: Updated definitions. + + #### Release 3.1.0 - CHANGED: Updated definitions. diff --git a/data/list.txt b/data/list.txt index c6d33bc8..38288008 100644 --- a/data/list.txt +++ b/data/list.txt @@ -7057,9 +7057,9 @@ org.zw // newGTLDs -// List of new gTLDs imported from https://newgtlds.icann.org/newgtlds.csv on 2018-05-08T19:40:37Z -// This list is auto-generated, don't edit it manually. +// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2019-06-14T10:00:50-04:00 +// This list is auto-generated, don't edit it manually. // aaa : 2015-02-26 American Automobile Association, Inc. aaa @@ -7105,7 +7105,7 @@ accountants // aco : 2015-01-08 ACO Severin Ahlmann GmbH & Co. KG aco -// actor : 2013-12-12 United TLD Holdco Ltd. +// actor : 2013-12-12 Dog Beach, LLC actor // adac : 2015-07-16 Allgemeiner Deutscher Automobil-Club e.V. (ADAC) @@ -7147,7 +7147,7 @@ aigo // airbus : 2015-07-30 Airbus S.A.S. airbus -// airforce : 2014-03-06 United TLD Holdco Ltd. +// airforce : 2014-03-06 Dog Beach, LLC airforce // airtel : 2014-10-24 Bharti Airtel Limited @@ -7231,10 +7231,10 @@ arab // aramco : 2014-11-20 Aramco Services Company aramco -// archi : 2014-02-06 Afilias plc +// archi : 2014-02-06 Afilias Limited archi -// army : 2014-03-06 United TLD Holdco Ltd. +// army : 2014-03-06 Dog Beach, LLC army // art : 2016-03-24 UK Creative Ideas Limited @@ -7252,10 +7252,10 @@ associates // athleta : 2015-07-30 The Gap, Inc. athleta -// attorney : 2014-03-20 United TLD Holdco Ltd. +// attorney : 2014-03-20 Dog Beach, LLC attorney -// auction : 2014-03-20 United TLD Holdco Ltd. +// auction : 2014-03-20 Dog Beach, LLC auction // audi : 2015-05-21 AUDI Aktiengesellschaft @@ -7291,7 +7291,7 @@ axa // azure : 2014-12-18 Microsoft Corporation azure -// baby : 2015-04-09 Johnson & Johnson Services, Inc. +// baby : 2015-04-09 XYZ.COM LLC baby // baidu : 2015-01-08 Baidu, Inc. @@ -7303,7 +7303,7 @@ banamex // bananarepublic : 2015-07-31 The Gap, Inc. bananarepublic -// band : 2014-06-12 United TLD Holdco Ltd. +// band : 2014-06-12 Dog Beach, LLC band // bank : 2014-09-25 fTLD Registry Services LLC @@ -7375,7 +7375,7 @@ best // bestbuy : 2015-07-31 BBY Solutions, Inc. bestbuy -// bet : 2015-05-07 Afilias plc +// bet : 2015-05-07 Afilias Limited bet // bharti : 2014-01-09 Bharti Enterprises (Holding) Private Limited @@ -7396,10 +7396,10 @@ bing // bingo : 2014-12-04 Binky Moon, LLC bingo -// bio : 2014-03-06 Afilias plc +// bio : 2014-03-06 Afilias Limited bio -// black : 2014-01-16 Afilias plc +// black : 2014-01-16 Afilias Limited black // blackfriday : 2014-01-16 Uniregistry, Corp. @@ -7414,7 +7414,7 @@ blog // bloomberg : 2014-07-17 Bloomberg IP Holdings LLC bloomberg -// blue : 2013-11-07 Afilias plc +// blue : 2013-11-07 Afilias Limited blue // bms : 2014-10-30 Bristol-Myers Squibb Company @@ -7441,7 +7441,7 @@ bofa // bom : 2014-10-16 Núcleo de Informação e Coordenação do Ponto BR - NIC.br bom -// bond : 2014-06-05 Bond University Limited +// bond : 2014-06-05 ShortDot SA bond // boo : 2014-01-30 Charleston Road Registry Inc. @@ -7468,7 +7468,7 @@ bot // boutique : 2013-11-14 Binky Moon, LLC boutique -// box : 2015-11-12 NS1 Limited +// box : 2015-11-12 .BOX INC. box // bradesco : 2014-12-18 Banco Bradesco S.A. @@ -7633,7 +7633,7 @@ chanel // channel : 2014-05-08 Charleston Road Registry Inc. channel -// charity : 2018-04-11 Corn Lake, LLC +// charity : 2018-04-11 Binky Moon, LLC charity // chase : 2015-04-30 JPMorgan Chase Bank, National Association @@ -7723,7 +7723,7 @@ coffee // college : 2014-01-16 XYZ.COM LLC college -// cologne : 2014-02-05 punkt.wien GmbH +// cologne : 2014-02-05 dotKoeln GmbH cologne // comcast : 2015-07-23 Comcast IP Holdings I, LLC @@ -7753,10 +7753,10 @@ condos // construction : 2013-09-16 Binky Moon, LLC construction -// consulting : 2013-12-05 United TLD Holdco Ltd. +// consulting : 2013-12-05 Dog Beach, LLC consulting -// contact : 2015-01-08 Top Level Spectrum, Inc. +// contact : 2015-01-08 Dog Beach, LLC contact // contractors : 2013-09-10 Binky Moon, LLC @@ -7786,6 +7786,9 @@ coupons // courses : 2014-12-04 OPEN UNIVERSITIES AUSTRALIA PTY LTD courses +// cpa : 2019-06-10 American Institute of Certified Public Accountants +cpa + // credit : 2014-03-20 Binky Moon, LLC credit @@ -7813,7 +7816,7 @@ cruises // csc : 2014-09-25 Alliance-One Services, Inc. csc -// cuisinella : 2014-04-03 SALM S.A.S. +// cuisinella : 2014-04-03 SCHMIDT GROUPE S.A.S. cuisinella // cymru : 2014-05-08 Nominet UK @@ -7828,7 +7831,7 @@ dabur // dad : 2014-01-23 Charleston Road Registry Inc. dad -// dance : 2013-10-24 United TLD Holdco Ltd. +// dance : 2013-10-24 Dog Beach, LLC dance // data : 2016-06-02 Dish DBS Corporation @@ -7855,13 +7858,13 @@ dds // deal : 2015-06-25 Amazon Registry Services, Inc. deal -// dealer : 2014-12-22 Dealer Dot Com, Inc. +// dealer : 2014-12-22 Intercap Registry Inc. dealer // deals : 2014-05-22 Binky Moon, LLC deals -// degree : 2014-03-06 United TLD Holdco Ltd. +// degree : 2014-03-06 Dog Beach, LLC degree // delivery : 2014-09-11 Binky Moon, LLC @@ -7876,13 +7879,13 @@ deloitte // delta : 2015-02-19 Delta Air Lines, Inc. delta -// democrat : 2013-10-24 United TLD Holdco Ltd. +// democrat : 2013-10-24 Dog Beach, LLC democrat // dental : 2014-03-20 Binky Moon, LLC dental -// dentist : 2014-03-20 United TLD Holdco Ltd. +// dentist : 2014-03-20 Dog Beach, LLC dentist // desi : 2013-11-14 Desi Networks LLC @@ -7975,7 +7978,7 @@ durban // dvag : 2014-06-23 Deutsche Vermögensberatung Aktiengesellschaft DVAG dvag -// dvr : 2016-05-26 Hughes Satellite Systems Corporation +// dvr : 2016-05-26 DISH Technologies L.L.C. dvr // earth : 2014-12-04 Interlink Co., Ltd. @@ -8002,7 +8005,7 @@ emerck // energy : 2014-09-11 Binky Moon, LLC energy -// engineer : 2014-03-06 United TLD Holdco Ltd. +// engineer : 2014-03-06 Dog Beach, LLC engineer // engineering : 2014-03-06 Binky Moon, LLC @@ -8074,13 +8077,13 @@ fairwinds // faith : 2014-11-20 dot Faith Limited faith -// family : 2015-04-02 United TLD Holdco Ltd. +// family : 2015-04-02 Dog Beach, LLC family -// fan : 2014-03-06 Asiamix Digital Limited +// fan : 2014-03-06 Dog Beach, LLC fan -// fans : 2014-11-07 Asiamix Digital Limited +// fans : 2014-11-07 Fans TLD Limited fans // farm : 2013-11-07 Binky Moon, LLC @@ -8185,7 +8188,7 @@ ford // forex : 2014-12-11 Dotforex Registry Limited forex -// forsale : 2014-05-22 United TLD Holdco Ltd. +// forsale : 2014-05-22 Dog Beach, LLC forsale // forum : 2015-04-02 Fegistry, LLC @@ -8233,7 +8236,7 @@ fund // furniture : 2014-03-20 Binky Moon, LLC furniture -// futbol : 2013-09-20 United TLD Holdco Ltd. +// futbol : 2013-09-20 Dog Beach, LLC futbol // fyi : 2015-04-02 Binky Moon, LLC @@ -8254,7 +8257,7 @@ gallup // game : 2015-05-28 Uniregistry, Corp. game -// games : 2015-05-28 United TLD Holdco Ltd. +// games : 2015-05-28 Dog Beach, LLC games // gap : 2015-07-31 The Gap, Inc. @@ -8263,6 +8266,9 @@ gap // garden : 2014-06-26 Minds + Machines Group Limited garden +// gay : 2019-05-23 Top Level Design, LLC +gay + // gbiz : 2014-07-17 Charleston Road Registry Inc. gbiz @@ -8290,7 +8296,7 @@ gift // gifts : 2014-07-03 Binky Moon, LLC gifts -// gives : 2014-03-06 United TLD Holdco Ltd. +// gives : 2014-03-06 Dog Beach, LLC gives // giving : 2014-11-13 Giving Limited @@ -8362,7 +8368,7 @@ graphics // gratis : 2014-03-20 Binky Moon, LLC gratis -// green : 2014-05-08 Afilias plc +// green : 2014-05-08 Afilias Limited green // gripe : 2014-03-06 Binky Moon, LLC @@ -8401,7 +8407,7 @@ hamburg // hangout : 2014-11-13 Charleston Road Registry Inc. hangout -// haus : 2013-12-05 United TLD Holdco Ltd. +// haus : 2013-12-05 Dog Beach, LLC haus // hbo : 2015-07-30 HBO Registry Services, Inc. @@ -8548,10 +8554,10 @@ imdb // immo : 2014-07-10 Binky Moon, LLC immo -// immobilien : 2013-11-07 United TLD Holdco Ltd. +// immobilien : 2013-11-07 Dog Beach, LLC immobilien -// inc : 2018-03-10 GTLD Limited +// inc : 2018-03-10 Intercap Registry Inc. inc // industries : 2013-12-05 Binky Moon, LLC @@ -8668,7 +8674,7 @@ juegos // juniper : 2015-07-30 JUNIPER NETWORKS, INC. juniper -// kaufen : 2013-11-07 United TLD Holdco Ltd. +// kaufen : 2013-11-07 Dog Beach, LLC kaufen // kddi : 2014-09-12 KDDI CORPORATION @@ -8689,7 +8695,7 @@ kfh // kia : 2015-07-09 KIA MOTORS CORPORATION kia -// kim : 2013-09-23 Afilias plc +// kim : 2013-09-23 Afilias Limited kim // kinder : 2014-11-07 Ferrero Trading Lux S.A. @@ -8704,7 +8710,7 @@ kitchen // kiwi : 2013-09-20 DOT KIWI LIMITED kiwi -// koeln : 2014-01-09 punkt.wien GmbH +// koeln : 2014-01-09 dotKoeln GmbH koeln // komatsu : 2015-01-08 Komatsu Ltd. @@ -8773,10 +8779,10 @@ latino // latrobe : 2014-06-16 La Trobe University latrobe -// law : 2015-01-22 Minds + Machines Group Limited +// law : 2015-01-22 LW TLD Limited law -// lawyer : 2014-03-20 United TLD Holdco Ltd. +// lawyer : 2014-03-20 Dog Beach, LLC lawyer // lds : 2014-03-20 IRI Domain Management, LLC ("Applicant") @@ -8800,7 +8806,7 @@ lego // lexus : 2015-04-23 TOYOTA MOTOR CORPORATION lexus -// lgbt : 2014-05-08 Afilias plc +// lgbt : 2014-05-08 Afilias Limited lgbt // liaison : 2014-10-02 Liaison Technologies, Incorporated @@ -8845,7 +8851,7 @@ link // lipsy : 2015-06-25 Lipsy Ltd lipsy -// live : 2014-12-04 United TLD Holdco Ltd. +// live : 2014-12-04 Dog Beach, LLC live // living : 2015-07-30 Lifestyle Domain Holdings, Inc. @@ -8854,7 +8860,7 @@ living // lixil : 2015-03-19 LIXIL Group Corporation lixil -// llc : 2017-12-14 Afilias plc +// llc : 2017-12-14 Afilias Limited llc // loan : 2014-11-20 dot Loan Limited @@ -8881,7 +8887,7 @@ london // lotte : 2014-11-07 Lotte Holdings Co., Ltd. lotte -// lotto : 2014-04-10 Afilias plc +// lotto : 2014-04-10 Afilias Limited lotto // love : 2014-12-22 Merchant Law Group LLP @@ -8938,7 +8944,7 @@ mango // map : 2016-06-09 Charleston Road Registry Inc. map -// market : 2014-03-06 United TLD Holdco Ltd. +// market : 2014-03-06 Dog Beach, LLC market // marketing : 2013-11-07 Binky Moon, LLC @@ -8986,7 +8992,7 @@ memorial // men : 2015-02-26 Exclusive Registry Limited men -// menu : 2013-09-11 Wedding TLD2, LLC +// menu : 2013-09-11 Dot Menu Registry, LLC menu // merckmsd : 2016-07-14 MSD Registry Holdings, Inc. @@ -9028,7 +9034,7 @@ mobile // mobily : 2014-12-18 GreenTech Consultancy Company W.L.L. mobily -// moda : 2013-11-07 United TLD Holdco Ltd. +// moda : 2013-11-07 Dog Beach, LLC moda // moe : 2013-11-13 Interlink Co., Ltd. @@ -9046,7 +9052,7 @@ monash // money : 2014-10-16 Binky Moon, LLC money -// monster : 2015-09-11 Monster Worldwide, Inc. +// monster : 2015-09-11 XYZ.COM LLC monster // mopar : 2015-07-30 FCA US LLC. @@ -9055,7 +9061,7 @@ mopar // mormon : 2013-12-05 IRI Domain Management, LLC ("Applicant") mormon -// mortgage : 2014-03-20 United TLD Holdco Ltd. +// mortgage : 2014-03-20 Dog Beach, LLC mortgage // moscow : 2013-12-19 Foundation for Assistance for Internet Technologies and Infrastructure Development (FAITID) @@ -9103,7 +9109,7 @@ nationwide // natura : 2015-03-12 NATURA COSMÉTICOS S.A. natura -// navy : 2014-03-06 United TLD Holdco Ltd. +// navy : 2014-03-06 Dog Beach, LLC navy // nba : 2015-07-31 NBA REGISTRY, LLC @@ -9130,7 +9136,7 @@ new // newholland : 2015-09-03 CNH Industrial N.V. newholland -// news : 2014-12-18 United TLD Holdco Ltd. +// news : 2014-12-18 Dog Beach, LLC news // next : 2015-06-18 Next plc @@ -9160,7 +9166,7 @@ nike // nikon : 2015-05-21 NIKON CORPORATION nikon -// ninja : 2013-11-07 United TLD Holdco Ltd. +// ninja : 2013-11-07 Dog Beach, LLC ninja // nissan : 2014-03-27 NISSAN MOTOR CO., LTD. @@ -9244,7 +9250,7 @@ online // onyourside : 2015-07-23 Nationwide Mutual Insurance Company onyourside -// ooo : 2014-01-09 INFIBEAM INCORPORATION LIMITED +// ooo : 2014-01-09 INFIBEAM AVENUES LIMITED ooo // open : 2015-07-31 American Express Travel Related Services Company, Inc. @@ -9256,7 +9262,7 @@ oracle // orange : 2015-03-12 Orange Brand Services Limited orange -// organic : 2014-03-27 Afilias plc +// organic : 2014-03-27 Afilias Limited organic // origins : 2015-10-01 The Estée Lauder Companies Inc. @@ -9271,7 +9277,7 @@ otsuka // ott : 2015-06-04 Dish DBS Corporation ott -// ovh : 2014-01-16 OVH SAS +// ovh : 2014-01-16 MédiaBC ovh // page : 2014-12-04 Charleston Road Registry Inc. @@ -9304,7 +9310,7 @@ pay // pccw : 2015-05-14 PCCW Enterprises Limited pccw -// pet : 2015-05-07 Afilias plc +// pet : 2015-05-07 Afilias Limited pet // pfizer : 2015-09-11 Pfizer Inc. @@ -9355,7 +9361,7 @@ pin // ping : 2015-06-11 Ping Registry Provider, Inc. ping -// pink : 2013-10-01 Afilias plc +// pink : 2013-10-01 Afilias Limited pink // pioneer : 2015-07-16 Pioneer Corporation @@ -9370,7 +9376,7 @@ place // play : 2015-03-05 Charleston Road Registry Inc. play -// playstation : 2015-07-02 Sony Computer Entertainment Inc. +// playstation : 2015-07-02 Sony Interactive Entertainment Inc. playstation // plumbing : 2013-09-10 Binky Moon, LLC @@ -9385,7 +9391,7 @@ pnc // pohl : 2014-06-23 Deutsche Vermögensberatung Aktiengesellschaft DVAG pohl -// poker : 2014-07-03 Afilias plc +// poker : 2014-07-03 Afilias Limited poker // politie : 2015-08-20 Politie Nederland @@ -9418,7 +9424,7 @@ prof // progressive : 2015-07-23 Progressive Casualty Insurance Company progressive -// promo : 2014-12-18 Afilias plc +// promo : 2014-12-18 Afilias Limited promo // properties : 2013-12-05 Binky Moon, LLC @@ -9436,7 +9442,7 @@ pru // prudential : 2015-07-30 Prudential Financial, Inc. prudential -// pub : 2013-12-12 United TLD Holdco Ltd. +// pub : 2013-12-12 Dog Beach, LLC pub // pwc : 2015-10-29 PricewaterhouseCoopers LLP @@ -9478,7 +9484,7 @@ realty // recipes : 2013-10-17 Binky Moon, LLC recipes -// red : 2013-11-07 Afilias plc +// red : 2013-11-07 Afilias Limited red // redstone : 2014-10-31 Redstone Haute Couture Co., Ltd. @@ -9487,7 +9493,7 @@ redstone // redumbrella : 2015-03-26 Travelers TLD, LLC redumbrella -// rehab : 2014-03-06 United TLD Holdco Ltd. +// rehab : 2014-03-06 Dog Beach, LLC rehab // reise : 2014-03-13 Binky Moon, LLC @@ -9517,7 +9523,7 @@ repair // report : 2013-12-05 Binky Moon, LLC report -// republican : 2014-03-20 United TLD Holdco Ltd. +// republican : 2014-03-20 Dog Beach, LLC republican // rest : 2013-12-19 Punto 2012 Sociedad Anonima Promotora de Inversion de Capital Variable @@ -9529,7 +9535,7 @@ restaurant // review : 2014-11-20 dot Review Limited review -// reviews : 2013-09-13 United TLD Holdco Ltd. +// reviews : 2013-09-13 Dog Beach, LLC reviews // rexroth : 2015-06-18 Robert Bosch GMBH @@ -9553,7 +9559,7 @@ ril // rio : 2014-02-27 Empresa Municipal de Informática SA - IPLANRIO rio -// rip : 2014-07-10 United TLD Holdco Ltd. +// rip : 2014-07-10 Dog Beach, LLC rip // rmit : 2015-11-19 Royal Melbourne Institute of Technology @@ -9562,7 +9568,7 @@ rmit // rocher : 2014-12-18 Ferrero Trading Lux S.A. rocher -// rocks : 2013-11-14 United TLD Holdco Ltd. +// rocks : 2013-11-14 Dog Beach, LLC rocks // rodeo : 2013-12-19 Minds + Machines Group Limited @@ -9604,7 +9610,7 @@ safety // sakura : 2014-12-18 SAKURA Internet Inc. sakura -// sale : 2014-10-16 United TLD Holdco Ltd. +// sale : 2014-10-16 Dog Beach, LLC sale // salon : 2014-12-11 Binky Moon, LLC @@ -9655,7 +9661,7 @@ scb // schaeffler : 2015-08-06 Schaeffler Technologies AG & Co. KG schaeffler -// schmidt : 2014-04-03 SALM S.A.S. +// schmidt : 2014-04-03 SCHMIDT GROUPE S.A.S. schmidt // scholarships : 2014-04-24 Scholarships.com, LLC @@ -9739,7 +9745,7 @@ shell // shia : 2014-09-04 Asia Green IT System Bilgisayar San. ve Tic. Ltd. Sti. shia -// shiksha : 2013-11-14 Afilias plc +// shiksha : 2013-11-14 Afilias Limited shiksha // shoes : 2013-10-02 Binky Moon, LLC @@ -9775,7 +9781,7 @@ singles // site : 2015-01-15 DotSite Inc. site -// ski : 2015-04-09 Afilias plc +// ski : 2015-04-09 Afilias Limited ski // skin : 2015-01-15 L'Oréal @@ -9787,7 +9793,7 @@ sky // skype : 2014-12-18 Microsoft Corporation skype -// sling : 2015-07-30 Hughes Satellite Systems Corporation +// sling : 2015-07-30 DISH Technologies L.L.C. sling // smart : 2015-07-09 Smart Communications, Inc. (SMART) @@ -9802,13 +9808,13 @@ sncf // soccer : 2015-03-26 Binky Moon, LLC soccer -// social : 2013-11-07 United TLD Holdco Ltd. +// social : 2013-11-07 Dog Beach, LLC social -// softbank : 2015-07-02 SoftBank Corp. +// softbank : 2015-07-02 SoftBank Group Corp. softbank -// software : 2014-03-20 United TLD Holdco Ltd. +// software : 2014-03-20 Dog Beach, LLC software // sohu : 2013-12-19 Sohu.com Limited @@ -9883,7 +9889,7 @@ store // stream : 2016-01-08 dot Stream Limited stream -// studio : 2015-02-11 United TLD Holdco Ltd. +// studio : 2015-02-11 Dog Beach, LLC studio // study : 2014-12-11 OPEN UNIVERSITIES AUSTRALIA PTY LTD @@ -10147,16 +10153,16 @@ ventures // verisign : 2015-08-13 VeriSign, Inc. verisign -// versicherung : 2014-03-20 TLD-BOX Registrydienstleistungen GmbH +// versicherung : 2014-03-20 tldbox GmbH versicherung -// vet : 2014-03-06 United TLD Holdco Ltd. +// vet : 2014-03-06 Dog Beach, LLC vet // viajes : 2013-10-17 Binky Moon, LLC viajes -// video : 2014-10-16 United TLD Holdco Ltd. +// video : 2014-10-16 Dog Beach, LLC video // vig : 2015-05-14 VIENNA INSURANCE GROUP AG Wiener Versicherung Gruppe @@ -10381,7 +10387,7 @@ xin // xn--5tzm5g : 2014-12-22 Global Website TLD Asia Limited 网站 -// xn--6frz82g : 2013-09-23 Afilias plc +// xn--6frz82g : 2013-09-23 Afilias Limited 移动 // xn--6qq986b3xl : 2013-09-13 Tycoon Treasure Limited @@ -10847,6 +10853,10 @@ b-data.io // Submitted by Anthony Voutas backplaneapp.io +// Balena : https://www.balena.io +// Submitted by Petros Angelatos +balena-devices.com + // Banzai Cloud // Submitted by Gabor Kozma app.banzaicloud.io @@ -10997,6 +11007,10 @@ cloudaccess.net cloudcontrolled.com cloudcontrolapp.com +// Cloudera, Inc. : https://www.cloudera.com/ +// Submitted by Philip Langdale +cloudera.site + // Cloudflare, Inc. : https://www.cloudflare.com/ // Submitted by Jake Riesterer workers.dev @@ -11785,6 +11799,7 @@ goip.de // Submitted by Eduardo Vela run.app a.run.app +web.app *.0emm.com appspot.com blogspot.ae @@ -11993,6 +12008,10 @@ ipifony.net mein-iserv.de test-iserv.de +// I-O DATA DEVICE, INC. : http://www.iodata.com/ +// Submitted by Yuji Minagawa +iobb.net + // Jino : https://www.jino.ru // Submitted by Sergey Ulyashin myjino.ru @@ -12019,6 +12038,11 @@ khplay.nl // Submitted by Martin Dannehl keymachine.de +// KingHost : https://king.host +// Submitted by Felipe Keller Braz +kinghost.net +uni5.net + // KnightPoint Systems, LLC : http://www.knightpoint.com/ // Submitted by Roy Keene knightpoint.systems From ae7cf82a6f962739e696daacdf365a094e903fe8 Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Tue, 25 Jun 2019 21:25:30 +0200 Subject: [PATCH 31/76] Reinstate support to Ruby 2.1 and 2.2 Closes GH-161, Closes GH-162 --- .travis.yml | 7 +++++++ CHANGELOG.md | 3 ++- lib/public_suffix/version.rb | 2 +- public_suffix.gemspec | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index b676a52b..89eec321 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,13 @@ cache: - bundler matrix: + include: + - rvm: 2.1 + before_install: + - gem install bundler -v '< 2.0' + - rvm: 2.2 + before_install: + - gem install bundler -v '< 2.0' allow_failures: - rvm: ruby-head - rvm: jruby-9.1.5.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 97b247da..aea88f78 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,10 @@ # Changelog -#### master +#### Release 3.1.1 - CHANGED: Updated definitions. +- CHANGED: Rolled back support for Ruby 2.3 (GH-161, GH-162) #### Release 3.1.0 diff --git a/lib/public_suffix/version.rb b/lib/public_suffix/version.rb index 1d649a3a..e3130b90 100644 --- a/lib/public_suffix/version.rb +++ b/lib/public_suffix/version.rb @@ -9,5 +9,5 @@ module PublicSuffix # The current library version. - VERSION = "3.1.0" + VERSION = "3.1.1" end diff --git a/public_suffix.gemspec b/public_suffix.gemspec index e4a6cd37..44bfccf1 100644 --- a/public_suffix.gemspec +++ b/public_suffix.gemspec @@ -12,7 +12,7 @@ Gem::Specification.new do |s| s.description = "PublicSuffix can parse and decompose a domain name into top level domain, domain and subdomains." s.licenses = ["MIT"] - s.required_ruby_version = ">= 2.3" + s.required_ruby_version = ">= 2.1" s.require_paths = ["lib"] s.files = `git ls-files`.split("\n") From ed7c414746167c8d019b772fe82ae54d0c583608 Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Tue, 25 Jun 2019 21:36:15 +0200 Subject: [PATCH 32/76] Release 3.1.1 From d6e4914a22d32bf2457def425eb97421c8812279 Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Tue, 25 Jun 2019 21:38:11 +0200 Subject: [PATCH 33/76] Remove support for Ruby < 2.3 in major version --- .travis.yml | 7 ------- CHANGELOG.md | 7 +++++++ public_suffix.gemspec | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 89eec321..b676a52b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,13 +15,6 @@ cache: - bundler matrix: - include: - - rvm: 2.1 - before_install: - - gem install bundler -v '< 2.0' - - rvm: 2.2 - before_install: - - gem install bundler -v '< 2.0' allow_failures: - rvm: ruby-head - rvm: jruby-9.1.5.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index aea88f78..fcdfc3e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,18 @@ # Changelog +#### master + +- CHANGED: Minimum Ruby version is 2.3 + + #### Release 3.1.1 - CHANGED: Updated definitions. - CHANGED: Rolled back support for Ruby 2.3 (GH-161, GH-162) +IMPORTANT: 3.x is the latest version compatible with Ruby 2.1 and Ruby 2.2. + #### Release 3.1.0 diff --git a/public_suffix.gemspec b/public_suffix.gemspec index 44bfccf1..e4a6cd37 100644 --- a/public_suffix.gemspec +++ b/public_suffix.gemspec @@ -12,7 +12,7 @@ Gem::Specification.new do |s| s.description = "PublicSuffix can parse and decompose a domain name into top level domain, domain and subdomains." s.licenses = ["MIT"] - s.required_ruby_version = ">= 2.1" + s.required_ruby_version = ">= 2.3" s.require_paths = ["lib"] s.files = `git ls-files`.split("\n") From 87343b898e0a836cfd51c5bd017ed4237d132bea Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Tue, 25 Jun 2019 21:40:14 +0200 Subject: [PATCH 34/76] Release 4.0.0 --- CHANGELOG.md | 2 +- lib/public_suffix/version.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fcdfc3e5..7d87918a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Changelog -#### master +#### Release 4.0.0 - CHANGED: Minimum Ruby version is 2.3 diff --git a/lib/public_suffix/version.rb b/lib/public_suffix/version.rb index e3130b90..60524757 100644 --- a/lib/public_suffix/version.rb +++ b/lib/public_suffix/version.rb @@ -9,5 +9,5 @@ module PublicSuffix # The current library version. - VERSION = "3.1.1" + VERSION = "4.0.0" end From 27d9ff95e8d2f9646b7d89a61a68eff7abea95a3 Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Tue, 25 Jun 2019 21:45:57 +0200 Subject: [PATCH 35/76] Test Ruby 2.7 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index b676a52b..e5d76ec2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ rvm: - 2.4 - 2.5 - 2.6 + - 2.7 - jruby-9.1.5.0 - ruby-head From 3648a1c5bb15cd29f6aa9cf76f892e2b93067cae Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Wed, 26 Jun 2019 09:50:49 +0200 Subject: [PATCH 36/76] Create FUNDING.yml --- .github/FUNDING.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 00000000..085e1ac2 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,12 @@ +# These are supported funding model platforms + +github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] +patreon: # Replace with a single Patreon username +open_collective: # Replace with a single Open Collective username +ko_fi: # Replace with a single Ko-fi username +tidelift: "rubygems/public_suffix" +community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry +liberapay: # Replace with a single Liberapay username +issuehunt: # Replace with a single IssueHunt username +otechie: # Replace with a single Otechie username +custom: # Replace with a single custom sponsorship URL From da7f5a86fb4245a7d9d565984422d19d7ce74327 Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Fri, 9 Aug 2019 22:09:21 +0200 Subject: [PATCH 37/76] Add Tidelift link --- README.md | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 5d417ded..9dbb2fb8 100644 --- a/README.md +++ b/README.md @@ -3,13 +3,20 @@ PublicSuffix is a Ruby domain name parser based on the [Public Suffix List](https://publicsuffix.org/). [![Build Status](https://travis-ci.org/weppos/publicsuffix-ruby.svg?branch=master)](https://travis-ci.org/weppos/publicsuffix-ruby) +[![Tidelift dependencies](https://tidelift.com/badges/github/weppos/publicsuffix-ruby)](https://tidelift.com/subscription/pkg/rubygems-public-suffix?utm_source=rubygems-public-suffix&utm_medium=referral&utm_campaign=readme) -## Requirements +## Links -- Ruby >= 2.3 +- [Homepage](https://simonecarletti.com/code/publicsuffix-ruby) +- [Repository](https://github.com/weppos/publicsuffix-ruby) +- [API Documentation](https://rubydoc.info/gems/public_suffix) +- [Introducing the Public Suffix List library for Ruby](https://simonecarletti.com/blog/2010/06/public-suffix-list-library-for-ruby/) + + +## Requirements -For an older versions of Ruby use a previous release. +PublicSuffix requires **Ruby >= 2.3**. For an older versions of Ruby use a previous release. ## Installation @@ -17,7 +24,7 @@ For an older versions of Ruby use a previous release. You can install the gem manually: ```shell -$ gem install public_suffix +gem install public_suffix ``` Or use Bundler and define it as a dependency in your `Gemfile`: @@ -173,21 +180,14 @@ Not convinced yet? Check out [this real world example](https://stackoverflow.com No. PublicSuffix comes with a bundled list. It does not make any HTTP requests to parse or validate a domain. -## Feedback and bug reports +## Support -If you use this library and find yourself missing any functionality, please [let me know](mailto:weppos@weppos.net). +Library documentation is auto-generated from the [README](https://github.com/weppos/publicsuffix-ruby/blob/master/README.md) and the source code, and it's available at https://rubydoc.info/gems/public_suffix. -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. +- The PublicSuffix bug tracker is here: https://github.com/weppos/publicsuffix-ruby/issues +- The PublicSuffix code repository is here: https://github.com/weppos/publicsuffix-ruby. Contributions are 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/publicsuffix-ruby/issues). - - -## More - -- [Homepage](https://simonecarletti.com/code/publicsuffix-ruby) -- [Repository](https://github.com/weppos/publicsuffix-ruby) -- [API Documentation](http://rubydoc.info/gems/public_suffix) -- [Introducing the Public Suffix List library for Ruby](https://simonecarletti.com/blog/2010/06/public-suffix-list-library-for-ruby/) +[Consider subscribing to Tidelift which provides Enterprise support for this project](https://tidelift.com/subscription/pkg/rubygems-public-suffix?utm_source=rubygems-public-suffix&utm_medium=referral&utm_campaign=readme) as part of the Tidelift Subscription. Tidelift subscriptions also help the maintainers by funding the project, which in turn allows us to ship releases, bugfixes, and security updates more often. ## Changelog From 76bb080b95fc36f8b60efb7b26d5c03f2f638db8 Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Fri, 9 Aug 2019 22:14:39 +0200 Subject: [PATCH 38/76] Updated definitions --- CHANGELOG.md | 5 +++ data/list.txt | 85 ++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 65 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d87918a..fc6bcd99 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ # Changelog +#### Release 4.0.1 + +- CHANGED: Updated definitions. + + #### Release 4.0.0 - CHANGED: Minimum Ruby version is 2.3 diff --git a/data/list.txt b/data/list.txt index 38288008..5dbde2b0 100644 --- a/data/list.txt +++ b/data/list.txt @@ -240,6 +240,8 @@ vic.au wa.au // 3LDs act.edu.au +catholic.edu.au +eq.edu.au nsw.edu.au nt.edu.au qld.edu.au @@ -255,6 +257,9 @@ sa.gov.au tas.gov.au vic.gov.au wa.gov.au +// 4LDs +education.tas.edu.au +schools.nsw.edu.au // aw : https://en.wikipedia.org/wiki/.aw aw @@ -4334,8 +4339,6 @@ niepce.museum norfolk.museum north.museum nrw.museum -nuernberg.museum -nuremberg.museum nyc.museum nyny.museum oceanographic.museum @@ -7012,7 +7015,7 @@ xxx // ye : http://www.y.net.ye/services/domain_name.htm *.ye -// za : http://www.zadna.org.za/content/page/domain-information +// za : https://www.zadna.org.za/content/page/domain-information/ ac.za agric.za alt.za @@ -7024,6 +7027,7 @@ law.za mil.za net.za ngo.za +nic.za nis.za nom.za org.za @@ -7058,7 +7062,7 @@ org.zw // newGTLDs -// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2019-06-14T10:00:50-04:00 +// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2019-08-08T16:16:58Z // This list is auto-generated, don't edit it manually. // aaa : 2015-02-26 American Automobile Association, Inc. aaa @@ -7423,9 +7427,6 @@ bms // bmw : 2014-01-09 Bayerische Motoren Werke Aktiengesellschaft bmw -// bnl : 2014-07-24 Banca Nazionale del Lavoro -bnl - // bnpparibas : 2014-05-29 BNP Paribas bnpparibas @@ -7738,7 +7739,7 @@ community // company : 2013-11-07 Binky Moon, LLC company -// compare : 2015-10-08 iSelect Ltd +// compare : 2015-10-08 Registry Services, LLC compare // computer : 2013-10-24 Binky Moon, LLC @@ -8083,7 +8084,7 @@ family // fan : 2014-03-06 Dog Beach, LLC fan -// fans : 2014-11-07 Fans TLD Limited +// fans : 2014-11-07 ZDNS International Limited fans // farm : 2013-11-07 Binky Moon, LLC @@ -8479,9 +8480,6 @@ homesense // honda : 2014-12-18 Honda Motor Co., Ltd. honda -// honeywell : 2015-07-23 Honeywell GTLD LLC -honeywell - // horse : 2013-11-21 Minds + Machines Group Limited horse @@ -8599,9 +8597,6 @@ ipiranga // irish : 2014-08-07 Binky Moon, LLC irish -// iselect : 2015-02-11 iSelect Ltd -iselect - // ismaili : 2015-08-06 Fondation Aga Khan (Aga Khan Foundation) ismaili @@ -9703,7 +9698,7 @@ security // seek : 2014-12-04 Seek Limited seek -// select : 2015-10-08 iSelect Ltd +// select : 2015-10-08 Registry Services, LLC select // sener : 2014-10-24 Sener Ingeniería y Sistemas, S.A. @@ -9862,9 +9857,6 @@ staples // star : 2015-01-08 Star India Private Limited star -// starhub : 2015-02-05 StarHub Ltd -starhub - // statebank : 2015-03-12 STATE BANK OF INDIA statebank @@ -10815,6 +10807,12 @@ apigee.io // Submitted by Thomas Orozco on-aptible.com +// ASEINet : https://www.aseinet.com/ +// Submitted by Asei SEKIGUCHI +user.aseinet.ne.jp +gv.vc +d.gv.vc + // Asociación Amigos de la Informática "Euskalamiga" : http://encounter.eus/ // Submitted by Hector Martin user.party.eus @@ -11013,6 +11011,7 @@ cloudera.site // Cloudflare, Inc. : https://www.cloudflare.com/ // Submitted by Jake Riesterer +trycloudflare.com workers.dev // Clovyr : https://clovyr.io @@ -11894,6 +11893,11 @@ caa.li ua.rs conf.se +// Handshake : https://handshake.org +// Submitted by Mike Damm +hs.zone +hs.run + // Hashbang : https://hashbang.sh hashbang.sh @@ -11924,11 +11928,13 @@ ravendb.run bpl.biz orx.biz ng.city -ng.ink biz.gl +ng.ink col.ng +firm.ng gen.ng ltd.ng +ng.school sch.so // Häkkinen.fi @@ -12007,6 +12013,7 @@ ipifony.net // Submitted by Kim-Alexander Brodowski mein-iserv.de test-iserv.de +iserv.dev // I-O DATA DEVICE, INC. : http://www.iodata.com/ // Submitted by Yuji Minagawa @@ -12063,6 +12070,10 @@ leadpages.co lpages.co lpusercontent.com +// Lelux.fi : https://lelux.fi/ +// Submitted by Lelux Admin +lelux.site + // Lifetime Hosting : https://Lifetime.Hosting/ // Submitted by Mike Fillator co.business @@ -12394,12 +12405,14 @@ nom.al nym.by nym.bz nom.cl +nym.ec nom.gd nom.ge nom.gl nym.gr nom.gt nym.gy +nym.hk nom.hn nym.ie nom.im @@ -12539,6 +12552,14 @@ protonet.io chirurgiens-dentistes-en-france.fr byen.site +// pubtls.org: https://www.pubtls.org +// Submitted by Kor Nielsen +pubtls.org + +// Qualifio : https://qualifio.com/ +// Submitted by Xavier De Cock +qualifioapp.com + // Redstar Consultants : https://www.redstarconsultants.com/ // Submitted by Jons Slemmer instantcloud.cn @@ -12643,11 +12664,6 @@ my-firewall.org myfirewall.org spdns.org -// SensioLabs, SAS : https://sensiolabs.com/ -// Submitted by Fabien Potencier -*.s5y.io -*.sensiosite.cloud - // Service Online LLC : http://drs.ua/ // Submitted by Serhii Bulakh biz.ua @@ -12662,6 +12678,10 @@ shiftedit.io // Submitted by Alex Bowers myshopblocks.com +// Shopit : https://www.shopitcommerce.com/ +// Submitted by Craig McMahon +shopitsite.com + // Siemens Mobility GmbH // Submitted by Oliver Graebner mo-siemens.io @@ -12733,6 +12753,11 @@ temp-dns.com applicationcloud.io scapp.io +// Symfony, SAS : https://symfony.com/ +// Submitted by Fabien Potencier +*.s5y.io +*.sensiosite.cloud + // Syncloud : https://syncloud.org // Submitted by Boris Rybalkin syncloud.it @@ -12886,6 +12911,10 @@ voorloper.cloud // Submitted by Masayuki Note wafflecell.com +// WebHare bv: https://www.webhare.com/ +// Submitted by Arnold Hendriks +*.webhare.dev + // WeDeploy by Liferay, Inc. : https://www.wedeploy.com // Submitted by Henrique Vicente wedeploy.io @@ -12916,6 +12945,12 @@ cistron.nl demon.nl xs4all.space +// Yandex.Cloud LLC: https://cloud.yandex.com +// Submitted by Alexander Lodin +yandexcloud.net +storage.yandexcloud.net +website.yandexcloud.net + // YesCourse Pty Ltd : https://yescourse.com // Submitted by Atul Bhouraskar official.academy From 1a17386d79be5a98041e85315f43f080046c8d9f Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Fri, 9 Aug 2019 22:14:55 +0200 Subject: [PATCH 39/76] Release 4.0.1 --- lib/public_suffix/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/public_suffix/version.rb b/lib/public_suffix/version.rb index 60524757..dee6386a 100644 --- a/lib/public_suffix/version.rb +++ b/lib/public_suffix/version.rb @@ -9,5 +9,5 @@ module PublicSuffix # The current library version. - VERSION = "4.0.0" + VERSION = "4.0.1" end From e03a267b79929588fba7749b219c3c9ad8274971 Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Fri, 23 Aug 2019 10:26:18 +0200 Subject: [PATCH 40/76] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fc6bcd99..8b587eee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +This project uses [Semantic Versioning 2.0.0](https://semver.org/). + #### Release 4.0.1 From 894cceb654a9c6c9deabdde2d1b598336e970649 Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Fri, 23 Aug 2019 10:45:16 +0200 Subject: [PATCH 41/76] Create SECURITY.md --- SECURITY.md | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 SECURITY.md diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 00000000..25c27fed --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,101 @@ +# Security Policy + +## Supported Versions + +Security updates are provided only for the current minor version. + +If you are using a previous minor version, we recommend to upgrade to the current minor version. +This project uses [semantic versioning](https://semver.org/), therefore you can upgrade to a more recent minor version without incurring into breaking changes. + +Exceptionally, we may support previous minor versions upon request if there are significant reasons preventing to immediately switch the latest minor version. + +Older major versions are no longer supported. + + +## Reporting a Vulnerability + +To make a report, please email weppos@weppos.net. + +Please consider encrypting your report with GPG using the key (0x420da82a989398df)[https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x420da82a989398df] + +``` +-----BEGIN PGP PUBLIC KEY BLOCK----- + +xsBNBE/QiI0BCACtBbjJnJIzaLb4NfjaljzT/+dvodst+wyDRE8Vwc6ujwboZjr2 +0QwXScNzObPazyvkSZVh3g6PveneeSD0dSw2XDqKbbtLMg/Ss12yqXJfjavH/zjk +6Xq+nnbSnxBPzwFAAEaEFIc6H6BygJ7zHPP5WEY5QIMqifEAX//aBqHi4GXHJiHE +237Zqufdry23jBYjY7wGXAa11VsU9Iwqh6LPB9/hc1KtzjAuvvm5ufeT/iVjxGQX +te1OZZk6n8xSVYeLsn97PfgYs0yauhexwD9dG7FbRCB379JxPRn5akr391qXcVOG +ZA3yBXUSPOL6D1+TS1S0su5zbw2AEp4+z3SpABEBAAHNIlNpbW9uZSBDYXJsZXR0 +aSA8d2VwcG9zQGdtYWlsLmNvbT7CwHcEEwEKACEFAlXH0UQCGy8FCwkIBwMFFQoJ +CAsFFgIDAQACHgECF4AACgkQQg2oKpiTmN9BOQf/UHd+bmww71MkbS38KkowDu+0 +1VH35aL8sFcAMUSEA4I5oPWZoBtYYPGpALLxtrSNW+SCnmmeCQVfVmLedUVHwDZo +TS4qiynpqnz+Cnq4KRC8VMIyaFoiT5Vg6MLtau8hJtqZn1Wv68g0nXuprsCuf9vs +z7DDZ36z8em6OJQJQ/FQ4BGogzyYHa90cJnIM6BeLiRUUpFTl1tHLlw4JFUNi8sx +6VQ1/nhcr3OyskAix5TytRnJ8uIn22m25GGdTF2WQPNfkWJQVT4ZDbCxT20acRp0 +l3x1DAk3Eel8gOKzgOboB3bkI5/l1XZvNL0YWGZeyfp8I7ZqpXg/m4qLDkYU2cLA +egQTAQoAJAIbLwULCQgHAwUVCgkICwUWAgMBAAIeAQIXgAUCVf6KvAIZAQAKCRBC +DagqmJOY34ABB/9WbNAh0l07UN1ePfVm6Brg2Yt8k6Q2lIRUG2xAeQj/+Kx/4lAL +oY6F0jJ44kIDZqZdNA0QIqYzZRBV4iW+cQrsBUUyM+chiA3RuOsDG18sfvkyPvRy +ecOVubHCN+nK2GKy1oHQkCpVFIeetr0ugB/j+xNDKJ3Oa5dGBKF29ZH5Pxg7cqwH +cdkhBGMpPbBYq5pJtYGggqypELzFTG292StbtV837Eze+clWRTKtMBOHke/oKBCr +YYic2fmipGC9XUiqvMEMAKYq5WWWXIlcSVSnBDdxq41tXjKK4XMVgoOboZCcNFvh +0NxuDQATk1YruRZOS4SpBPXykEA1pK/zm3WmzSNTaW1vbmUgQ2FybGV0dGkgPHdl +cHBvc0B3ZXBwb3MubmV0PsLAeQQTAQIAIwUCT9CIjQIbLwcLCQgHAwIBBhUIAgkK +CwQWAgMBAh4BAheAAAoJEEINqCqYk5jfGWcH/Ax3EhAckGeCqNYE5BTx94bKB1LL +vUjeUoImMtGGFxQu2jNOAjtpuyjihm9uHBZ+dxaxHHrhE11f+0sDcwvW8qtKEzOs +GESr01VqTaVFS2JOEHhLphXseaLXJe32Osz0kHCZmrz1fCwv3b8QuWBifn8oVzcV +vrE7lGC6pGwaiUvMsvA++RUquTlNVlh8uRrqcQCU8Ne9lSoDWHlUJes5s4FoCh3R +oVBcKPsx3m/P9+GlEgTDqYP+WU3sfSfJYERH0r0NAYP96m2e7UQrqdgvMTVVDkPB +UB9efZzgkL7u9IAqmLU2klSGdEZnJ8t1AsjEyHXMztC7ICUhRFCeXHdTNhHCwHwE +EwEKACYCGy8HCwkIBwMCAQYVCAIJCgsEFgIDAQIeAQIXgAUCVcfRaQIZAQAKCRBC +DagqmJOY31y1B/41I/SsWwDqJP/Y3LzzatGmIv/gy+LkJBBTr/NV0NYzKV2XJ1BG +ese2ZE4tKKdG4HDwF+IwFLBHcPZRv358IwwTRPnzeO23mxpTYAnRCdg/pcaYIJ9r +OxIOP+R52YbgGrNKcezVA+7TY9za072P7Bk85jTM2FNfqevaf/YQ4GRcGLQ3JI8N +tBUdvrOEETDpR0QFTr22Wv1C7UfPDsSf7ZUM7zJ38CmDji8JSlr6y75/LYSY50BB +8EHb03QxyePe98A3WzvOoqamiCIe9bRzH5IqRAtJYDX8cK4PZmp43bQhrjdjawCc +AU/OY9iz+zCw00+b6CNiRb59N+OwpNJh5iNNwsB5BBMBCgAjAhsvBwsJCAcDAgEG +FQgCCQoLBBYCAwECHgECF4AFAlX+iq0ACgkQQg2oKpiTmN/z2gf/VbcQHgTlXFYa +Sq/dE7S54uGFrdzHOV3IJyl+ByMwVoKn6zdpksRoyt7jPV3RonrUO7jEcrt7VKCU +2KC7/MZMDoUsn9BXXTtUk+uTCNh8qllR0Fo/FvWM9RJKmcDMKwAJwcKIgbfUBJGx +1N6pP2DUc+YCnEerRbnQ1DWJUM7BaOEN6bvPxuGblPst1l6S5VktFj3gZGYItHrs +pit5pesILP8K6B6VCNP2WXXYvYQo7yyYcG8WBWXin8/SdNwU68lUbfhhQVIKv6LU +h0wvgG97NsBPrFbij0K6O63FufnNr9WLMZhAzi0h6gNK2HKAyw9AZNKpPccwg+mX +Huc/4CPRlM0uU2ltb25lIENhcmxldHRpIDxzaW1vbmUuY2FybGV0dGlAZG5zaW1w +bGUuY29tPsLAdwQTAQoAIQUCVh4ipAIbLwULCQgHAwUVCgkICwUWAgMBAAIeAQIX +gAAKCRBCDagqmJOY329iCACpOY5SV7hwOZ8VqmRfxRoHQFQe9Owr+hD3eL0AKZaJ +V918dCPrrxbAmwwMAC8pS8J4CmrrTR27kxcUgVwcfyydFPrgST5pg+H7UTrBR045 +4Npw1+m99I2Pyyl3oaym4lKJFbp2c2DGODEzTg8kKfjk0cb8bd+MJrXqFyod1z5r +0pfexwaLVt1Hz+ZsmFIPO1ISHYBPV8OkpL8Kgb8WtY6REntgNjfcmtHNi0VWQ7+N +vgeYqdhscX8c9ROe26BiiiGXphRlAsCU/VLHOJkzoW3f9QLy4z01Xj/7OaD0JkHS +HrES1ye3ZDxnjnTRdh4U8ntJ+L+xnePcFQA2t0eCbPwIzSZTaW1vbmUgQ2FybGV0 +dGkgPHNpbW9uZUBjYXJsZXR0aS5uYW1lPsLAdwQTAQoAIQUCVf7gmwIbLwULCQgH +AwUVCgkICwUWAgMBAAIeAQIXgAAKCRBCDagqmJOY37L+B/45pWT3wgm43+kzHVOT +j63m4zmRb53TGZToRSxz3acyuVSuqU9Tv010F0ZV9ccb0NDeN+88s9tEisuoO0Rz +5vhC8AtwRUyR3ADE9pBtvvxT+4R9y8yYNTCIX45VPG9ZPp9+7i+XCdKtz30KIV7r +smktd2FrK16r/KUN8+03iZSgzQ9lsTmXK5L7zH/f3Tqhbfvybr4+M71KGnSoP+iP +vwfsoBb5rhijQLOykTb+VzdDpHQbupwxwm/3S4nsA4U6tonIywlJgBDSjgDjQj0i +Ez+Db2Wt59y6LoksRQogvJqm0nuxFUWMZc47zdhsRnqmxUYTNpKaJPWc6pfxsQPK +ZvTjzsBNBE/QiI0BCACsaNbG6kyKJBWL5jPhebsijk8PCfSHte1jNCA5l/NvaImZ +6ORq9f8S9MWlYxmzyUkVJaWrv+9p5zmjwcaegjerj6ggjPDEXlZG41Z4YE1/R8pf +wkSvrkLziBxZDB1aYplg8kgXkaIf2yi2FrMPSi04sjvQbBSCcIJeh6+vGK8tIJTn +e0tQbEvRorTwBAPAFlpx/bdk1wZYu11vFKbckhKWou7f8XSdn9ng9cY5uK+xBlFU +2ORgL1ygeIoY9uRvNZG2ncvCvxUPgOqbo31R8KPyvV4rNNvGBOfxQER9LbieBF2I +5I1gpyboGWKcXu1eV7tOpjtW6LHt+6NHhE6L1Lw1ABEBAAHCwX4EGAECAAkFAk/Q +iI0CGy4BKQkQQg2oKpiTmN/AXSAEGQECAAYFAk/QiI0ACgkQcBROh493BN9hdwf9 +GjiF1GcQN+3TZkXdr2WY0AlbcA/wBp6+ShnqcoU5XLuA0RY3+rWGuaSc2buLke6Y +2MhMAYcgmPdG+WTBoW5dWQGXBZ1IHYVR8HLGaF+Vate1MofE1BNHXhnilIMMfH4G +Tcr3Z3/FaSk9OdHlyiE/Jo7++8PQ+auHVyjtqry+/ysAnyr+lnCn+K4E0PQ1fYpP +fiawKtfSqk9h6HjjMyx9Adrz+ljXh+NyVqYZUfRytjgO+v+dAQmMczT1EawLTdX+ +trx1tHR549pEey7in5QKsje3GLH4zq4mCdWBlivQxmmmlvR07DysLADMbcpjKK2g +utfzygZHCU9hWGR3wbWZ7lXjB/0ZzutNaNYzSCkiC8PIWH1bG+TJO9pslHwP+aBJ +NGAmcwyOH9Bub2CSXikQFZNUmVRwtl7mN4bVAHI8zbMd6xdlX22yDgQei54dPXDw +UYsvGE4zmrD97he1EYcIOKMFHzlJNcWK+uR7lEq6mv7SFGnBr8qTYZRi1bySRgwd +UORuDV12GKTen9WectKtepW0fgYSz+udbDKQyyRef+7xGtCErWRL7f1qr8xm60da ++gSwyD/WkPTY8SP2mdq4u+6m4dWS26kKoENwuL7jUktl/C/EG7NmUKURbXG8lmeu +q59MIs/Fb3SgaO+zN2FZTYp6dyRJHbeEz55JdOu6F+6ihZYH +=j6Xr +-----END PGP PUBLIC KEY BLOCK----- +``` + + From 3d6b74cead4f72fbf980450ecb55ed33137bca21 Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Fri, 23 Aug 2019 10:46:57 +0200 Subject: [PATCH 42/76] Update README.md --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 9dbb2fb8..edd3e377 100644 --- a/README.md +++ b/README.md @@ -190,6 +190,11 @@ Library documentation is auto-generated from the [README](https://github.com/wep [Consider subscribing to Tidelift which provides Enterprise support for this project](https://tidelift.com/subscription/pkg/rubygems-public-suffix?utm_source=rubygems-public-suffix&utm_medium=referral&utm_campaign=readme) as part of the Tidelift Subscription. Tidelift subscriptions also help the maintainers by funding the project, which in turn allows us to ship releases, bugfixes, and security updates more often. +## Security and Vulnerability Reporting + +Full information and description of our security policy please visit [`SECURITY.md`](SECURITY.md) + + ## Changelog See the [CHANGELOG.md](CHANGELOG.md) file for details. From 626883d914ad6a06d2fb3c9e0faa5e97426b718a Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Fri, 27 Dec 2019 11:43:37 +0100 Subject: [PATCH 43/76] Release 4.0.2 --- .ruby-gemset | 1 - CHANGELOG.md | 5 + data/list.txt | 224 ++++++++++++++++++++++------------- lib/public_suffix/version.rb | 2 +- 4 files changed, 147 insertions(+), 85 deletions(-) delete mode 100644 .ruby-gemset diff --git a/.ruby-gemset b/.ruby-gemset deleted file mode 100644 index 4dcdb08b..00000000 --- a/.ruby-gemset +++ /dev/null @@ -1 +0,0 @@ --global \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b587eee..2b0e71b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ This project uses [Semantic Versioning 2.0.0](https://semver.org/). +#### Release 4.0.2 + +- CHANGED: Updated definitions. + + #### Release 4.0.1 - CHANGED: Updated definitions. diff --git a/data/list.txt b/data/list.txt index 5dbde2b0..7f1854d8 100644 --- a/data/list.txt +++ b/data/list.txt @@ -241,7 +241,7 @@ wa.au // 3LDs act.edu.au catholic.edu.au -eq.edu.au +// eq.edu.au - Removed at the request of the Queensland Department of Education nsw.edu.au nt.edu.au qld.edu.au @@ -1368,7 +1368,7 @@ it gov.it edu.it // Reserved geo-names (regions and provinces): -// http://www.nic.it/sites/default/files/docs/Regulation_assignation_v7.1.pdf +// https://www.nic.it/sites/default/files/archivio/docs/Regulation_assignation_v7.1.pdf // Regions abr.it abruzzo.it @@ -5886,14 +5886,9 @@ gov.rs in.rs org.rs -// ru : https://cctld.ru/en/domains/domens_ru/reserved/ +// ru : https://cctld.ru/files/pdf/docs/en/rules_ru-rf.pdf +// Submitted by George Georgievsky ru -ac.ru -edu.ru -gov.ru -int.ru -mil.ru -test.ru // rw : https://www.ricta.org.rw/sites/default/files/resources/registry_registrar_contract_0.pdf rw @@ -6038,15 +6033,28 @@ org.sn perso.sn univ.sn -// so : http://www.soregistry.com/ +// so : http://sonic.so/policies/ so com.so +edu.so +gov.so +me.so net.so org.so // sr : https://en.wikipedia.org/wiki/.sr sr +// ss : https://registry.nic.ss/ +// Submitted by registry +ss +biz.ss +com.ss +edu.ss +gov.ss +net.ss +org.ss + // st : http://www.nic.st/html/policyrules/ st co.st @@ -6789,6 +6797,9 @@ yt // xn--e1a4c ("eu", Cyrillic) : EU ею +// xn--mgbah1a3hjkrd ("Mauritania", Arabic) : MR +موريتانيا + // xn--node ("ge", Georgian Mkhedruli) : GE გე @@ -6942,7 +6953,8 @@ yt ак.срб // xn--p1ai ("rf", Russian-Cyrillic) : RU -// http://www.cctld.ru/en/docs/rulesrf.php +// https://cctld.ru/files/pdf/docs/en/rules_ru-rf.pdf +// Submitted by George Georgievsky рф // xn--wgbl6a ("Qatar", Arabic) : QA @@ -7062,7 +7074,7 @@ org.zw // newGTLDs -// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2019-08-08T16:16:58Z +// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2019-12-25T17:26:24Z // This list is auto-generated, don't edit it manually. // aaa : 2015-02-26 American Automobile Association, Inc. aaa @@ -7184,6 +7196,9 @@ alsace // alstom : 2015-07-30 ALSTOM alstom +// amazon : 2019-12-19 Amazon EU S.à r.l. +amazon + // americanexpress : 2015-07-31 American Express Travel Related Services Company, Inc. americanexpress @@ -7283,7 +7298,7 @@ auto // autos : 2014-01-09 DERAutos, LLC autos -// avianca : 2015-01-08 Aerovias del Continente Americano S.A. Avianca +// avianca : 2015-01-08 Avianca Holdings S.A. avianca // aws : 2015-06-25 Amazon Registry Services, Inc. @@ -7574,9 +7589,6 @@ careers // cars : 2014-11-13 Cars Registry Limited cars -// cartier : 2014-06-23 Richemont DNS Inc. -cartier - // casa : 2013-11-21 Minds + Machines Group Limited casa @@ -7655,9 +7667,6 @@ christmas // chrome : 2014-07-24 Charleston Road Registry Inc. chrome -// chrysler : 2015-07-30 FCA US LLC. -chrysler - // church : 2014-02-06 Binky Moon, LLC church @@ -7937,9 +7946,6 @@ docs // doctor : 2016-06-02 Binky Moon, LLC doctor -// dodge : 2015-07-30 FCA US LLC. -dodge - // dog : 2014-12-04 Binky Moon, LLC dog @@ -7967,9 +7973,6 @@ duck // dunlop : 2015-07-02 The Goodyear Tire & Rubber Company dunlop -// duns : 2015-08-06 The Dun & Bradstreet Corporation -duns - // dupont : 2015-06-25 E. I. du Pont de Nemours and Company dupont @@ -8048,9 +8051,6 @@ eus // events : 2013-12-05 Binky Moon, LLC events -// everbank : 2014-05-15 EverBank -everbank - // exchange : 2014-03-06 Binky Moon, LLC exchange @@ -8324,7 +8324,7 @@ gmail // gmbh : 2016-01-29 Binky Moon, LLC gmbh -// gmo : 2014-01-09 GMO Internet Pte. Ltd. +// gmo : 2014-01-09 GMO Internet, Inc. gmo // gmx : 2014-04-24 1&1 Mail & Media GmbH @@ -8735,9 +8735,6 @@ kyoto // lacaixa : 2014-01-09 Fundación Bancaria Caixa d’Estalvis i Pensions de Barcelona, “la Caixa” lacaixa -// ladbrokes : 2015-08-06 LADBROKES INTERNATIONAL PLC -ladbrokes - // lamborghini : 2015-06-04 Automobili Lamborghini S.p.A. lamborghini @@ -8750,9 +8747,6 @@ lancaster // lancia : 2015-07-31 Fiat Chrysler Automobiles N.V. lancia -// lancome : 2015-07-23 L'Oréal -lancome - // land : 2013-09-10 Binky Moon, LLC land @@ -8858,6 +8852,9 @@ lixil // llc : 2017-12-14 Afilias Limited llc +// llp : 2019-08-26 Dot Registry LLC +llp + // loan : 2014-11-20 dot Loan Limited loan @@ -9026,9 +9023,6 @@ mma // mobile : 2016-06-02 Dish DBS Corporation mobile -// mobily : 2014-12-18 GreenTech Consultancy Company W.L.L. -mobily - // moda : 2013-11-07 Dog Beach, LLC moda @@ -9050,9 +9044,6 @@ money // monster : 2015-09-11 XYZ.COM LLC monster -// mopar : 2015-07-30 FCA US LLC. -mopar - // mormon : 2013-12-05 IRI Domain Management, LLC ("Applicant") mormon @@ -9074,9 +9065,6 @@ mov // movie : 2015-02-05 Binky Moon, LLC movie -// movistar : 2014-10-16 Telefónica S.A. -movistar - // msd : 2015-07-23 MSD Registry Holdings, Inc. msd @@ -9335,9 +9323,6 @@ photos // physio : 2014-05-01 PhysBiz Pty Ltd physio -// piaget : 2014-10-16 Richemont DNS Inc. -piaget - // pics : 2013-11-14 Uniregistry, Corp. pics @@ -9449,7 +9434,7 @@ qpon // quebec : 2013-12-19 PointQuébec Inc quebec -// quest : 2015-03-26 Quest ION Limited +// quest : 2015-03-26 XYZ.COM LLC quest // qvc : 2015-07-30 QVC, Inc. @@ -9503,7 +9488,7 @@ reit // reliance : 2015-04-02 Reliance Industries Limited reliance -// ren : 2013-12-12 Beijing Qianxiang Wangjing Technology Development Co., Ltd. +// ren : 2013-12-12 ZDNS International Limited ren // rent : 2014-12-04 XYZ.COM LLC @@ -9830,6 +9815,9 @@ sony // soy : 2014-01-23 Charleston Road Registry Inc. soy +// spa : 2019-09-19 Asia Spa and Wellness Promotion Council Limited +spa + // space : 2014-04-03 DotSpace Inc. space @@ -9845,9 +9833,6 @@ spreadbetting // srl : 2015-05-07 InterNetX, Corp srl -// srt : 2015-07-30 FCA US LLC. -srt - // stada : 2014-11-13 STADA Arzneimittel AG stada @@ -9974,9 +9959,6 @@ tech // technology : 2013-09-13 Binky Moon, LLC technology -// telefonica : 2014-10-16 Telefónica S.A. -telefonica - // temasek : 2014-08-07 Temasek Holdings (Private) Limited temasek @@ -10109,16 +10091,13 @@ ubank // ubs : 2014-12-11 UBS AG ubs -// uconnect : 2015-07-30 FCA US LLC. -uconnect - // unicom : 2015-10-15 China United Network Communications Corporation Limited unicom // university : 2014-03-06 Binky Moon, LLC university -// uno : 2013-09-11 Dot Latin LLC +// uno : 2013-09-11 DotSite Inc. uno // uol : 2014-05-01 UBN INTERNET LTDA. @@ -10232,9 +10211,6 @@ wang // wanggou : 2014-12-18 Amazon Registry Services, Inc. wanggou -// warman : 2015-06-18 Weir Group IP Limited -warman - // watch : 2013-11-14 Binky Moon, LLC watch @@ -10349,7 +10325,7 @@ xin // xn--3bst00m : 2013-09-13 Eagle Horizon Limited 集团 -// xn--3ds443g : 2013-09-08 TLD REGISTRY LIMITED +// xn--3ds443g : 2013-09-08 TLD REGISTRY LIMITED OY 在线 // xn--3oq18vl8pn36a : 2015-07-02 Volkswagen (China) Investment Co., Ltd. @@ -10424,10 +10400,13 @@ xin // xn--cck2b3b : 2015-02-26 Amazon Registry Services, Inc. ストア +// xn--cckwcxetd : 2019-12-19 Amazon EU S.à r.l. +アマゾン + // xn--cg4bki : 2013-09-27 SAMSUNG SDS CO., LTD 삼성 -// xn--czr694b : 2014-01-16 Dot Trademark TLD Holding Company Limited +// xn--czr694b : 2014-01-16 Internet DotTrademark Organisation Limited 商标 // xn--czrs0t : 2013-12-19 Binky Moon, LLC @@ -10454,7 +10433,7 @@ xin // xn--fhbei : 2015-01-15 VeriSign Sarl كوم -// xn--fiq228c5hs : 2013-09-08 TLD REGISTRY LIMITED +// xn--fiq228c5hs : 2013-09-08 TLD REGISTRY LIMITED OY 中文网 // xn--fiq64b : 2013-10-14 CITIC Group Corporation @@ -10484,7 +10463,7 @@ xin // xn--i1b6b1a6a2e : 2013-11-14 Public Interest Registry संगठन -// xn--imr513n : 2014-12-11 Dot Trademark TLD Holding Company Limited +// xn--imr513n : 2014-12-11 Internet DotTrademark Organisation Limited 餐厅 // xn--io0a7i : 2013-11-14 China Internet Network Information Center (CNNIC) @@ -10493,6 +10472,9 @@ xin // xn--j1aef : 2015-01-15 VeriSign Sarl ком +// xn--jlq480n2rg : 2019-12-19 Amazon EU S.à r.l. +亚马逊 + // xn--jlq61u9w7b : 2015-01-08 Nokia Corporation 诺基亚 @@ -10520,9 +10502,6 @@ xin // xn--mgbab2bd : 2013-10-31 CORE Association بازار -// xn--mgbb9fbpob : 2014-12-18 GreenTech Consultancy Company W.L.L. -موبايلي - // xn--mgbca7dzdo : 2015-07-30 Abu Dhabi Systems and Information Centre ابوظبي @@ -10556,7 +10535,7 @@ xin // xn--nyqy26a : 2014-11-07 Stable Tone Limited 健康 -// xn--otu796d : 2017-08-06 Dot Trademark TLD Holding Company Limited +// xn--otu796d : 2017-08-06 Internet DotTrademark Organisation Limited 招聘 // xn--p1acf : 2013-12-12 Rusnames Limited @@ -10631,7 +10610,7 @@ yahoo // yamaxun : 2014-12-18 Amazon Registry Services, Inc. yamaxun -// yandex : 2014-04-10 YANDEX, LLC +// yandex : 2014-04-10 Yandex Europe B.V. yandex // yodobashi : 2014-11-20 YODOBASHI CAMERA CO.,LTD. @@ -10681,6 +10660,12 @@ cc.ua inf.ua ltd.ua +// Adobe : https://www.adobe.com/ +// Submitted by Ian Boston +adobeaemcloud.com +adobeaemcloud.net +*.dev.adobeaemcloud.com + // Agnat sp. z o.o. : https://domena.pl // Submitted by Przemyslaw Plewa beep.pl @@ -10694,6 +10679,10 @@ barsy.ca *.compute.estate *.alces.network +// Altervista: https://www.altervista.org +// Submitted by Carlo Cannas +altervista.org + // alwaysdata : https://www.alwaysdata.com // Submitted by Cyril alwaysdata.net @@ -10794,6 +10783,10 @@ s3-website.eu-west-2.amazonaws.com s3-website.eu-west-3.amazonaws.com s3-website.us-east-2.amazonaws.com +// Amsterdam Wireless: https://www.amsterdamwireless.nl/ +// Submitted by Imre Jonk +amsw.nl + // Amune : https://amune.org/ // Submitted by Team Amune t3l3p0rt.net @@ -10828,12 +10821,6 @@ sweetpepper.org // Submitted by Vincent Tseng myasustor.com -// Automattic Inc. : https://automattic.com/ -// Submitted by Alex Concha -go-vip.co -go-vip.net -wpcomstaging.com - // AVM : https://avm.de // Submitted by Andreas Weise myfritz.net @@ -11068,6 +11055,15 @@ co.no webhosting.be hosting-cluster.nl +// Coordination Center for TLD RU and XN--P1AI : https://cctld.ru/en/domains/domens_ru/reserved/ +// Submitted by George Georgievsky +ac.ru +edu.ru +gov.ru +int.ru +mil.ru +test.ru + // COSIMO GmbH : http://www.cosimo.de // Submitted by Rene Marticke dyn.cosidns.de @@ -11092,6 +11088,14 @@ realm.cz // Submitted by Jonathan Rudenberg cupcake.is +// Customer OCI - Oracle Dyn https://cloud.oracle.com/home https://dyn.com/dns/ +// Submitted by Gregory Drake +// Note: This is intended to also include customer-oci.com due to wildcards implicitly including the current label +*.customer-oci.com +*.oci.customer-oci.com +*.ocp.customer-oci.com +*.ocs.customer-oci.com + // cyon GmbH : https://www.cyon.ch/ // Submitted by Dominic Luechinger cyon.link @@ -11124,6 +11128,14 @@ store.dk *.dapps.earth *.bzz.dapps.earth +// Dark, Inc. : https://darklang.com +// Submitted by Paul Biggar +builtwithdark.com + +// Datawire, Inc : https://www.datawire.io +// Submitted by Richard Li +edgestack.me + // Debian : https://www.debian.org/ // Submitted by Peter Palfrader / Debian Sysadmin Team debian.net @@ -11497,6 +11509,10 @@ dynv6.net // Submitted by Vladimir Dudr e4.cz +// En root‽ : https://en-root.org +// Submitted by Emmanuel Raviart +en-root.fr + // Enalean SAS: https://www.enalean.com // Submitted by Thomas Cottier mytuleap.com @@ -11726,6 +11742,10 @@ firebaseapp.com flynnhub.com flynnhosting.net +// Frederik Braun https://frederik-braun.com +// Submitted by Frederik Braun +0e.vc + // Freebox : http://www.freebox.fr // Submitted by Romain Fliedel freebox-os.com @@ -11759,8 +11779,9 @@ service.gov.uk gehirn.ne.jp usercontent.jp -// Gentlent, Limited : https://www.gentlent.com -// Submitted by Tom Klein +// Gentlent, Inc. : https://www.gentlent.com +// Submitted by Tom Klein +gentapps.com lab.ms // GitHub, Inc. @@ -11776,6 +11797,10 @@ gitlab.io // Submitted by Mads Hartmann glitch.me +// GMO Pepabo, Inc. : https://pepabo.com/ +// Submitted by dojineko +lolipop.io + // GOV.UK Platform as a Service : https://www.cloud.service.gov.uk/ // Submitted by Tom Whitwell cloudapps.digital @@ -11801,6 +11826,7 @@ a.run.app web.app *.0emm.com appspot.com +*.r.appspot.com blogspot.ae blogspot.al blogspot.am @@ -11885,6 +11911,10 @@ publishproxy.com withgoogle.com withyoutube.com +// Group 53, LLC : https://www.group53.com +// Submitted by Tyler Todd +awsmppl.com + // Hakaran group: http://hakaran.cz // Submited by Arseniy Sokolov fin.ci @@ -11934,6 +11964,7 @@ col.ng firm.ng gen.ng ltd.ng +ngo.ng ng.school sch.so @@ -12054,6 +12085,10 @@ uni5.net // Submitted by Roy Keene knightpoint.systems +// KUROKU LTD : https://kuroku.ltd/ +// Submitted by DisposaBoy +oya.to + // .KRD : http://nic.krd/data/krd/Registration%20Policy.pdf co.krd edu.krd @@ -12448,6 +12483,10 @@ nom.uy nom.vc nom.vg +// Observable, Inc. : https://observablehq.com +// Submitted by Mike Bostock +static.observableusercontent.com + // Octopodal Solutions, LLC. : https://ulterius.io/ // Submitted by Andrew Sampson cya.gg @@ -12468,6 +12507,10 @@ opencraft.hosting // Submitted by Yngve Pettersen operaunite.com +// Oursky Limited : https://skygear.io/ +// Submited by Skygear Developer +skygearapp.com + // OutSystems // Submitted by Duarte Santos outsystemscloud.com @@ -12510,6 +12553,10 @@ gotpantheon.com // Submitted by Steve Leung mypep.link +// Perspecta : https://perspecta.com/ +// Submitted by Kenneth Van Alstyne +perspecta.cloud + // Planet-Work : https://www.planet-work.com/ // Submitted by Frédéric VANNIÈRE on-web.fr @@ -12572,6 +12619,11 @@ ras.ru // Submitted by Daniel Dent (https://www.danieldent.com/) qa2.com +// QCX +// Submitted by Cassandra Beelen +qcx.io +*.sys.qcx.io + // QNAP System Inc : https://www.qnap.com // Submitted by Nick Chang dev-myqnapcloud.com @@ -12594,6 +12646,7 @@ rackmaze.net // Rancher Labs, Inc : https://rancher.com // Submitted by Vincent Fiduccia +*.on-k3s.io *.on-rancher.cloud *.on-rio.io @@ -12647,6 +12700,10 @@ logoip.com // Submitted by Hanno Böck schokokeks.net +// Scottish Government: https://www.gov.scot +// Submitted by Martin Ellis +gov.scot + // Scry Security : http://www.scrysec.com // Submitted by Shante Adam scrysec.com @@ -12778,6 +12835,7 @@ i234.me myds.me synology.me vpnplus.to +direct.quickconnect.to // TAIFUN Software AG : http://taifun-software.de // Submitted by Bjoern Henke @@ -12907,6 +12965,10 @@ v-info.info // Submitted by Nathan van Bakel voorloper.cloud +// V.UA Domain Administrator : https://domain.v.ua/ +// Submitted by Serhii Rostilo +v.ua + // Waffle Computer Inc., Ltd. : https://docs.waffleinfo.com // Submitted by Masayuki Note wafflecell.com @@ -12994,8 +13056,4 @@ virtualserver.io site.builder.nu enterprisecloud.nu -// Zone.id : https://zone.id/ -// Submitted by Su Hendro -zone.id - // ===END PRIVATE DOMAINS=== diff --git a/lib/public_suffix/version.rb b/lib/public_suffix/version.rb index dee6386a..058f77c7 100644 --- a/lib/public_suffix/version.rb +++ b/lib/public_suffix/version.rb @@ -9,5 +9,5 @@ module PublicSuffix # The current library version. - VERSION = "4.0.1" + VERSION = "4.0.2" end From af3244f9cf1c558a4c6afd3e39a8ac46c7495c77 Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Fri, 27 Dec 2019 11:49:54 +0100 Subject: [PATCH 44/76] Update rubocop --- .rubocop.yml | 2 +- .rubocop_defaults.yml | 46 +++++++++++++++++++++---------------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 5283089c..05d702fc 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -24,7 +24,7 @@ Style/ClassAndModuleChildren: - 'test/**/*_test.rb' # Dear Rubocop, I don't want to use String#strip_heredoc -Layout/IndentHeredoc: +Layout/HeredocIndentation: Enabled: false Style/WordArray: diff --git a/.rubocop_defaults.yml b/.rubocop_defaults.yml index fa91f00b..a33b4da1 100644 --- a/.rubocop_defaults.yml +++ b/.rubocop_defaults.yml @@ -7,37 +7,52 @@ AllCops: - 'vendor/**/*' # [codesmell] -Metrics/AbcSize: +Layout/LineLength: Enabled: false Exclude: - 'spec/**/*_spec.rb' - 'test/**/*_test.rb' + Max: 100 -# [codesmell] -Metrics/BlockLength: - Enabled: false +# Array indentation should be considered like MultilineMethodCallIndentation indentation +# and use 4 spaces instead of 2. +Layout/FirstArrayElementIndentation: + IndentationWidth: 4 + +# Hash indentation should be considered like MultilineMethodCallIndentation indentation +# and use 4 spaces instead of 2. +Layout/FirstHashElementIndentation: + IndentationWidth: 4 + +# Multi-line differs from standard indentation, they are indented twice. +Layout/MultilineMethodCallIndentation: + EnforcedStyle: indented + IndentationWidth: 4 # [codesmell] -Metrics/CyclomaticComplexity: +Metrics/AbcSize: Enabled: false Exclude: - 'spec/**/*_spec.rb' - 'test/**/*_test.rb' # [codesmell] -Metrics/ClassLength: +Metrics/BlockLength: + Enabled: false + +# [codesmell] +Metrics/CyclomaticComplexity: Enabled: false Exclude: - 'spec/**/*_spec.rb' - 'test/**/*_test.rb' # [codesmell] -Metrics/LineLength: +Metrics/ClassLength: Enabled: false Exclude: - 'spec/**/*_spec.rb' - 'test/**/*_test.rb' - Max: 100 # [codesmell] Metrics/MethodLength: @@ -116,21 +131,6 @@ Style/HashSyntax: Style/RescueStandardError: Enabled: false -# Array indentation should be considered like MultilineMethodCallIndentation indentation -# and use 4 spaces instead of 2. -Layout/IndentFirstArrayElement: - IndentationWidth: 4 - -# Hash indentation should be considered like MultilineMethodCallIndentation indentation -# and use 4 spaces instead of 2. -Layout/IndentFirstHashElement: - IndentationWidth: 4 - -# Multi-line differs from standard indentation, they are indented twice. -Layout/MultilineMethodCallIndentation: - EnforcedStyle: indented - IndentationWidth: 4 - # unless is not always cool. Style/NegatedIf: Enabled: false From ec6bc1dc040cd1517fa2e5012eca658a3c908eb6 Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Fri, 27 Dec 2019 11:53:20 +0100 Subject: [PATCH 45/76] Experiment with https://keepachangelog.com/ --- CHANGELOG.md | 122 +++++++++++++++++++++++++++------------------------ 1 file changed, 64 insertions(+), 58 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b0e71b2..b36ceef0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,22 +3,28 @@ This project uses [Semantic Versioning 2.0.0](https://semver.org/). -#### Release 4.0.2 +## 4.0.2 -- CHANGED: Updated definitions. +### Changed +- Updated definitions. -#### Release 4.0.1 -- CHANGED: Updated definitions. +## 4.0.1 +### Changed -#### Release 4.0.0 +- Updated definitions. -- CHANGED: Minimum Ruby version is 2.3 + +## 4.0.0 + +### Changed + +- Minimum Ruby version is 2.3 -#### Release 3.1.1 +## Release 3.1.1 - CHANGED: Updated definitions. - CHANGED: Rolled back support for Ruby 2.3 (GH-161, GH-162) @@ -26,30 +32,30 @@ This project uses [Semantic Versioning 2.0.0](https://semver.org/). IMPORTANT: 3.x is the latest version compatible with Ruby 2.1 and Ruby 2.2. -#### Release 3.1.0 +## Release 3.1.0 - CHANGED: Updated definitions. - CHANGED: Minimum Ruby version is 2.3 - CHANGED: Upgraded to Bundler 2.x -#### Release 3.0.3 +## Release 3.0.3 - CHANGED: Updated definitions. -#### Release 3.0.2 +## Release 3.0.2 - CHANGED: Updated definitions. -#### Release 3.0.1 +## Release 3.0.1 - CHANGED: Updated definitions. - CHANGED: Improve performance and avoid allocation (GH-146). [Thanks @robholland] -#### Release 3.0.0 +## Release 3.0.0 This new version includes a major redesign of the library internals, with the goal to drastically improve the lookup time while reducing storage space. @@ -66,35 +72,35 @@ and/or removed. You can find more information at GH-133. - CHANGED: Redesigned internal list storage and lookup algorithm to achieve O(1) lookup time (see GH-133). -#### Release 2.0.5 +## Release 2.0.5 - CHANGED: Updated definitions. - CHANGED: Initialization performance improvements (GH-128). [Thanks @casperisfine] -#### Release 2.0.4 +## Release 2.0.4 - FIXED: Fix a bug that caused the GEM to be published with the wrong version number in the gemspec (GH-121). - CHANGED: Updated definitions. -#### Release 2.0.3 +## Release 2.0.3 - CHANGED: Updated definitions. -#### Release 2.0.2 +## Release 2.0.2 - CHANGED: Updated definitions. -#### Release 2.0.1 +## Release 2.0.1 - FIXED: Fix bug that prevented .valid? to reset the default rule -#### Release 2.0.0 +## Release 2.0.0 - NEW: Added PublicSuffix.domain # => sld.tld - NEW: Added the ability to disable the use of private domains either at runtime, in addition to the ability to not load the private domains section when reading the list (`private_domains: false`). This feature also superseded the `private_domains` class-level attribute, that is no longer available. @@ -111,97 +117,97 @@ and/or removed. You can find more information at GH-133. - REMOVED: Removed futile utility helpers such as `Domain#rule`, `Domain#is_a_domain?`, `Domain#is_a_subdomain?`, `Domain#valid?`. You can easily obtain the same result by having a custom method that reconstructs the logic, and/or calling `PublicSuffix.{domain|parse}(domain.to_s)`. -#### Release 1.5.3 +## Release 1.5.3 - FIXED: Don't duplicate rule indices when creating index (GH-77). [Thanks @ags] - CHANGED: Updated definitions. -#### Release 1.5.2 +## Release 1.5.2 - CHANGED: Updated definitions. -#### Release 1.5.1 +## Release 1.5.1 - FIXED: Ignore case for parsing and validating (GH-62) - CHANGED: Updated definitions. -#### Release 1.5.0 +## Release 1.5.0 - CHANGED: Dropped support for Ruby < 2.0 - CHANGED: Updated definitions. -#### Release 1.4.6 +## Release 1.4.6 - CHANGED: Updated definitions. -#### Release 1.4.5 +## Release 1.4.5 - CHANGED: Updated definitions. -#### Release 1.4.4 +## Release 1.4.4 - CHANGED: Updated definitions. -#### Release 1.4.3 +## Release 1.4.3 - CHANGED: Updated definitions. -#### Release 1.4.2 +## Release 1.4.2 - CHANGED: Updated definitions. -#### Release 1.4.1 +## Release 1.4.1 - CHANGED: Updated definitions. -#### Release 1.4.0 +## Release 1.4.0 - CHANGED: Moved the definitions in the lib folder. - CHANGED: Updated definitions. -#### Release 1.3.3 +## Release 1.3.3 - CHANGED: Updated definitions. -#### Release 1.3.2 +## Release 1.3.2 - CHANGED: Updated definitions. -#### Release 1.3.1 +## Release 1.3.1 - CHANGED: Updated definitions. -#### Release 1.3.0 +## Release 1.3.0 - NEW: Ability to skip Private Domains (GH-28). [Thanks @rb2k] - CHANGED: Updated definitions. -#### Release 1.2.1 +## Release 1.2.1 - CHANGED: Updated definitions. -#### Release 1.2.0 +## Release 1.2.0 - NEW: Allow a custom List on `PublicSuffix.parse` (GH-26). [Thanks @itspriddle] @@ -210,22 +216,22 @@ and/or removed. You can find more information at GH-133. - CHANGED: Updated definitions. -#### Release 1.1.3 +## Release 1.1.3 - CHANGED: Updated definitions. -#### Release 1.1.2 +## Release 1.1.2 - CHANGED: Updated definitions. -#### Release 1.1.1 +## Release 1.1.1 - CHANGED: Updated definitions. -#### Release 1.1.0 +## Release 1.1.0 - FIXED: #valid? and #parse consider URIs as valid domains (GH-15) @@ -234,17 +240,17 @@ and/or removed. You can find more information at GH-133. - CHANGED: Removed deprecatd PublicSuffixService::RuleList. -#### Release 1.0.0 +## Release 1.0.0 - CHANGED: Updated definitions. -#### Release 1.0.0.rc1 +## Release 1.0.0.rc1 The library is now known as PublicSuffix. -#### Release 0.9.1 +## Release 0.9.1 - CHANGED: Renamed PublicSuffixService::RuleList to PublicSuffixService::List. @@ -255,20 +261,20 @@ The library is now known as PublicSuffix. - CHANGED: Updated definitions. -#### Release 0.9.0 +## Release 0.9.0 - CHANGED: Minimum Ruby version increased to Ruby 1.8.7. - CHANGED: rake/gempackagetask is deprecated. Use rubygems/package_task instead. -#### Release 0.8.4 +## Release 0.8.4 - 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 +## Release 0.8.3 - FIXED: Fixed ArgumentError: invalid byte sequence in US-ASCII with Ruby 1.9.2 (#12). @@ -277,7 +283,7 @@ The library is now known as PublicSuffix. - CHANGED: Renamed definitions.txt to definitions.dat. -#### Release 0.8.2 +## Release 0.8.2 - NEW: Added support for rubygems-test. @@ -286,19 +292,19 @@ The library is now known as PublicSuffix. - CHANGED: Updated definitions. -#### Release 0.8.1 +## Release 0.8.1 - FIXED: The files in the release 0.8.0 have wrong permission 600 and can't be loaded (#10). -#### Release 0.8.0 +## Release 0.8.0 - CHANGED: Update public suffix list to d1a5599b49fa 2010-10-25 15:10 +0100 (#9) - NEW: Add support for Fully Qualified Domain Names (#7) -#### Release 0.7.0 +## Release 0.7.0 - CHANGED: Using YARD to document the code instead of RDoc. @@ -307,7 +313,7 @@ The library is now known as PublicSuffix. - FIXED: PublicSuffixService.valid? should return false if the domain is not defined or not allowed (#4, #5) -#### Release 0.6.0 +## Release 0.6.0 - NEW: PublicSuffixService.parse raises DomainNotAllowed when trying to parse a domain name which exists, but is not allowed by the current definition list (#3) @@ -318,34 +324,34 @@ The library is now known as PublicSuffix. - CHANGED: Renamed PublicSuffixService::InvalidDomain to PublicSuffixService::DomainInvalid -#### Release 0.5.2 +## Release 0.5.2 - CHANGED: Update public suffix list to 248ea690d671 2010-09-16 18:02 +0100 -#### Release 0.5.1 +## Release 0.5.1 - CHANGED: Update public suffix list to 14dc66dd53c1 2010-09-15 17:09 +0100 -#### Release 0.5.0 +## Release 0.5.0 - CHANGED: Improve documentation for Domain#domain and Domain#subdomain (#1). - CHANGED: Performance improvements (#2). -#### Release 0.4.0 +## Release 0.4.0 - CHANGED: Rename library from DomainName to PublicSuffixService to reduce the probability of name conflicts. -#### Release 0.3.1 +## Release 0.3.1 - Deprecated DomainName library. -#### Release 0.3.0 +## Release 0.3.0 - CHANGED: DomainName#domain and DomainName#subdomain are no longer alias of Domain#sld and Domain#tld. @@ -356,7 +362,7 @@ The library is now known as PublicSuffix. - 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 +## Release 0.2.0 - NEW: DomainName#valid? @@ -367,6 +373,6 @@ The library is now known as PublicSuffix. - CHANGED: Make sure RuleList lookup is only performed once. -#### Release 0.1.0 +## Release 0.1.0 - Initial version From d076009df0160292dab73eadf13021f5da55761d Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Sun, 5 Jan 2020 12:34:33 +0100 Subject: [PATCH 46/76] Update .travis.yml --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e5d76ec2..7a0526a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,6 @@ rvm: - 2.5 - 2.6 - 2.7 - - jruby-9.1.5.0 - ruby-head env: @@ -18,7 +17,6 @@ cache: matrix: allow_failures: - rvm: ruby-head - - rvm: jruby-9.1.5.0 before_install: - gem update --system From bac3a1d05c26e5fc1a8dd7919fad4d8a4ca39163 Mon Sep 17 00:00:00 2001 From: Brian Hawley Date: Sun, 5 Jan 2020 10:36:01 -0800 Subject: [PATCH 47/76] Fix 2.7 deprecations and warnings (#168) Fixes GH-167 --- lib/public_suffix/list.rb | 2 +- test/test_helper.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/public_suffix/list.rb b/lib/public_suffix/list.rb index c573b4cf..f281d1d3 100644 --- a/lib/public_suffix/list.rb +++ b/lib/public_suffix/list.rb @@ -48,7 +48,7 @@ class List # # @return [PublicSuffix::List] def self.default(**options) - @default ||= parse(File.read(DEFAULT_LIST_PATH), options) + @default ||= parse(File.read(DEFAULT_LIST_PATH), **options) end # Sets the default rule list to +value+. diff --git a/test/test_helper.rb b/test/test_helper.rb index 1d5468c3..4f8a4477 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -10,7 +10,7 @@ require "minitest/autorun" require "minitest/reporters" -require "mocha/setup" +require "mocha/minitest" Minitest::Reporters.use! Minitest::Reporters::DefaultReporter.new(color: true) From 41f54eab90e2c7088ed1cdce2eebb900e0197f15 Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Sun, 5 Jan 2020 19:37:35 +0100 Subject: [PATCH 48/76] CHANGELOG for GH-167 See GH-167, GH-168 Thanks @BrianHawley --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b36ceef0..838de96c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ This project uses [Semantic Versioning 2.0.0](https://semver.org/). +## master + +### Fixed + +- Fixed 2.7 deprecations and warnings (GH-167). [Thanks @BrianHawley] + + ## 4.0.2 ### Changed From da650c860a552336113d73d77b25b724feb8e9c8 Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Sun, 5 Jan 2020 19:40:14 +0100 Subject: [PATCH 49/76] Welcome 2020 --- LICENSE.txt | 2 +- README.md | 2 +- lib/public_suffix.rb | 2 +- lib/public_suffix/domain.rb | 2 +- lib/public_suffix/errors.rb | 2 +- lib/public_suffix/list.rb | 2 +- lib/public_suffix/rule.rb | 2 +- lib/public_suffix/version.rb | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 561dc171..3bbd1121 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,4 @@ -Copyright (c) 2009-2019 Simone Carletti +Copyright (c) 2009-2020 Simone Carletti MIT License diff --git a/README.md b/README.md index edd3e377..372a0192 100644 --- a/README.md +++ b/README.md @@ -202,6 +202,6 @@ See the [CHANGELOG.md](CHANGELOG.md) file for details. ## License -Copyright (c) 2009-2019 Simone Carletti. This is Free Software distributed under the MIT license. +Copyright (c) 2009-2020 Simone Carletti. This is Free Software distributed under the MIT license. The [Public Suffix List source](https://publicsuffix.org/list/) is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/lib/public_suffix.rb b/lib/public_suffix.rb index 2fe83b59..01f880e3 100644 --- a/lib/public_suffix.rb +++ b/lib/public_suffix.rb @@ -4,7 +4,7 @@ # # Domain name parser based on the Public Suffix List. # -# Copyright (c) 2009-2019 Simone Carletti +# Copyright (c) 2009-2020 Simone Carletti require_relative "public_suffix/domain" require_relative "public_suffix/version" diff --git a/lib/public_suffix/domain.rb b/lib/public_suffix/domain.rb index 8ccac5ca..3d65eac7 100644 --- a/lib/public_suffix/domain.rb +++ b/lib/public_suffix/domain.rb @@ -4,7 +4,7 @@ # # Domain name parser based on the Public Suffix List. # -# Copyright (c) 2009-2019 Simone Carletti +# Copyright (c) 2009-2020 Simone Carletti module PublicSuffix diff --git a/lib/public_suffix/errors.rb b/lib/public_suffix/errors.rb index 0d3c6441..2d5798de 100644 --- a/lib/public_suffix/errors.rb +++ b/lib/public_suffix/errors.rb @@ -4,7 +4,7 @@ # # Domain name parser based on the Public Suffix List. # -# Copyright (c) 2009-2019 Simone Carletti +# Copyright (c) 2009-2020 Simone Carletti module PublicSuffix diff --git a/lib/public_suffix/list.rb b/lib/public_suffix/list.rb index f281d1d3..1c7df366 100644 --- a/lib/public_suffix/list.rb +++ b/lib/public_suffix/list.rb @@ -4,7 +4,7 @@ # # Domain name parser based on the Public Suffix List. # -# Copyright (c) 2009-2019 Simone Carletti +# Copyright (c) 2009-2020 Simone Carletti module PublicSuffix diff --git a/lib/public_suffix/rule.rb b/lib/public_suffix/rule.rb index 525d337f..b5a08f52 100644 --- a/lib/public_suffix/rule.rb +++ b/lib/public_suffix/rule.rb @@ -4,7 +4,7 @@ # # Domain name parser based on the Public Suffix List. # -# Copyright (c) 2009-2019 Simone Carletti +# Copyright (c) 2009-2020 Simone Carletti module PublicSuffix diff --git a/lib/public_suffix/version.rb b/lib/public_suffix/version.rb index 058f77c7..1d31f62c 100644 --- a/lib/public_suffix/version.rb +++ b/lib/public_suffix/version.rb @@ -5,7 +5,7 @@ # # Domain name parser based on the Public Suffix List. # -# Copyright (c) 2009-2019 Simone Carletti +# Copyright (c) 2009-2020 Simone Carletti module PublicSuffix # The current library version. From 84fc0d1895178aea481d00529697322f87a82fba Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Sun, 5 Jan 2020 19:41:20 +0100 Subject: [PATCH 50/76] Release 4.0.3 --- CHANGELOG.md | 2 +- lib/public_suffix/version.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 838de96c..5e337842 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ This project uses [Semantic Versioning 2.0.0](https://semver.org/). -## master +## 4.0.3 ### Fixed diff --git a/lib/public_suffix/version.rb b/lib/public_suffix/version.rb index 1d31f62c..8f460a82 100644 --- a/lib/public_suffix/version.rb +++ b/lib/public_suffix/version.rb @@ -9,5 +9,5 @@ module PublicSuffix # The current library version. - VERSION = "4.0.2" + VERSION = "4.0.3" end From c65e0e412cf7f1fb5fd66be5f9ce074c2428e30b Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Fri, 31 Jan 2020 21:29:42 +0100 Subject: [PATCH 51/76] Move development dependencies from gemspec to Bundle --- Gemfile | 9 ++++++--- public_suffix.gemspec | 4 ---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index 1339c9f9..fc390fc7 100644 --- a/Gemfile +++ b/Gemfile @@ -4,9 +4,12 @@ source "https://rubygems.org" gemspec +gem "rake" + gem "codecov", require: false +gem "memory_profiler", require: false gem "minitest" gem "minitest-reporters" -gem "rubocop", require: false - -gem "memory_profiler", require: false +gem "mocha" +gem "rubocop", "0.79.0", require: false +gem "yard" diff --git a/public_suffix.gemspec b/public_suffix.gemspec index e4a6cd37..6a490861 100644 --- a/public_suffix.gemspec +++ b/public_suffix.gemspec @@ -18,8 +18,4 @@ Gem::Specification.new do |s| s.files = `git ls-files`.split("\n") s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n") s.extra_rdoc_files = %w( LICENSE.txt ) - - s.add_development_dependency "rake" - s.add_development_dependency "mocha" - s.add_development_dependency "yard" end From c14c3ed5acf6045f9e616c6ece2569c0e8e345e1 Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Fri, 31 Jan 2020 21:31:17 +0100 Subject: [PATCH 52/76] Sync up my Rubocop default file --- .rubocop.yml | 2 +- ...p_defaults.yml => .rubocop_opinionated.yml | 29 +-------- test/acceptance_test.rb | 58 +++++++++--------- test/unit/public_suffix_test.rb | 22 +++---- test/unit/rule_test.rb | 60 +++++++++---------- 5 files changed, 74 insertions(+), 97 deletions(-) rename .rubocop_defaults.yml => .rubocop_opinionated.yml (83%) diff --git a/.rubocop.yml b/.rubocop.yml index 05d702fc..af922f52 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,5 +1,5 @@ inherit_from: - - .rubocop_defaults.yml + - .rubocop_opinionated.yml AllCops: Exclude: diff --git a/.rubocop_defaults.yml b/.rubocop_opinionated.yml similarity index 83% rename from .rubocop_defaults.yml rename to .rubocop_opinionated.yml index a33b4da1..b5b63253 100644 --- a/.rubocop_defaults.yml +++ b/.rubocop_opinionated.yml @@ -14,21 +14,6 @@ Layout/LineLength: - 'test/**/*_test.rb' Max: 100 -# Array indentation should be considered like MultilineMethodCallIndentation indentation -# and use 4 spaces instead of 2. -Layout/FirstArrayElementIndentation: - IndentationWidth: 4 - -# Hash indentation should be considered like MultilineMethodCallIndentation indentation -# and use 4 spaces instead of 2. -Layout/FirstHashElementIndentation: - IndentationWidth: 4 - -# Multi-line differs from standard indentation, they are indented twice. -Layout/MultilineMethodCallIndentation: - EnforcedStyle: indented - IndentationWidth: 4 - # [codesmell] Metrics/AbcSize: Enabled: false @@ -120,17 +105,6 @@ Style/FormatString: Style/FormatStringToken: Enabled: false -# Prefer the latest Hash syntax -Style/HashSyntax: - Exclude: - # But Rakefiles generally have some definition like - # :default => :test - # that looks nicer with the old rocket syntax. - - 'Rakefile' - -Style/RescueStandardError: - Enabled: false - # unless is not always cool. Style/NegatedIf: Enabled: false @@ -145,6 +119,9 @@ Style/PercentLiteralDelimiters: Style/RescueModifier: Enabled: false +Style/SymbolArray: + EnforcedStyle: brackets + # Sorry, but using trailing spaces helps readability. # # %w( foo bar ) diff --git a/test/acceptance_test.rb b/test/acceptance_test.rb index 660bdbc0..2be719d7 100644 --- a/test/acceptance_test.rb +++ b/test/acceptance_test.rb @@ -5,14 +5,14 @@ class AcceptanceTest < Minitest::Test VALID_CASES = [ - ["example.com", "example.com", [nil, "example", "com"]], - ["foo.example.com", "example.com", ["foo", "example", "com"]], + ["example.com", "example.com", [nil, "example", "com"]], + ["foo.example.com", "example.com", ["foo", "example", "com"]], - ["verybritish.co.uk", "verybritish.co.uk", [nil, "verybritish", "co.uk"]], - ["foo.verybritish.co.uk", "verybritish.co.uk", ["foo", "verybritish", "co.uk"]], + ["verybritish.co.uk", "verybritish.co.uk", [nil, "verybritish", "co.uk"]], + ["foo.verybritish.co.uk", "verybritish.co.uk", ["foo", "verybritish", "co.uk"]], - ["parliament.uk", "parliament.uk", [nil, "parliament", "uk"]], - ["foo.parliament.uk", "parliament.uk", ["foo", "parliament", "uk"]], + ["parliament.uk", "parliament.uk", [nil, "parliament", "uk"]], + ["foo.parliament.uk", "parliament.uk", ["foo", "parliament", "uk"]], ].freeze def test_valid @@ -34,10 +34,10 @@ def test_valid INVALID_CASES = [ - ["nic.bd", PublicSuffix::DomainNotAllowed], - [nil, PublicSuffix::DomainInvalid], - ["", PublicSuffix::DomainInvalid], - [" ", PublicSuffix::DomainInvalid], + ["nic.bd", PublicSuffix::DomainNotAllowed], + [nil, PublicSuffix::DomainInvalid], + ["", PublicSuffix::DomainInvalid], + [" ", PublicSuffix::DomainInvalid], ].freeze def test_invalid @@ -49,16 +49,16 @@ def test_invalid REJECTED_CASES = [ - ["www. .com", true], - ["foo.co..uk", true], - ["goo,gle.com", true], - ["-google.com", true], - ["google-.com", true], - - # This case was covered in GH-15. - # I decided to cover this case because it's not easily reproducible with URI.parse - # and can lead to several false positives. - ["http://google.com", false], + ["www. .com", true], + ["foo.co..uk", true], + ["goo,gle.com", true], + ["-google.com", true], + ["google-.com", true], + + # This case was covered in GH-15. + # I decided to cover this case because it's not easily reproducible with URI.parse + # and can lead to several false positives. + ["http://google.com", false], ].freeze def test_rejected @@ -72,9 +72,9 @@ def test_rejected CASE_CASES = [ - ["Www.google.com", %w( www google com )], - ["www.Google.com", %w( www google com )], - ["www.google.Com", %w( www google com )], + ["Www.google.com", %w( www google com )], + ["www.Google.com", %w( www google com )], + ["www.google.Com", %w( www google com )], ].freeze def test_ignore_case @@ -90,10 +90,10 @@ def test_ignore_case INCLUDE_PRIVATE_CASES = [ - ["blogspot.com", true, "blogspot.com"], - ["blogspot.com", false, nil], - ["subdomain.blogspot.com", true, "blogspot.com"], - ["subdomain.blogspot.com", false, "subdomain.blogspot.com"], + ["blogspot.com", true, "blogspot.com"], + ["blogspot.com", false, nil], + ["subdomain.blogspot.com", true, "blogspot.com"], + ["subdomain.blogspot.com", false, "subdomain.blogspot.com"], ].freeze def test_ignore_private @@ -115,14 +115,14 @@ def test_ignore_private def valid_uri?(name) uri = URI.parse(name) !uri.host.nil? - rescue + rescue StandardError false end def valid_domain?(name) uri = URI.parse(name) !uri.host.nil? && uri.scheme.nil? - rescue + rescue StandardError false end diff --git a/test/unit/public_suffix_test.rb b/test/unit/public_suffix_test.rb index 48a85e0f..ba51e138 100644 --- a/test/unit/public_suffix_test.rb +++ b/test/unit/public_suffix_test.rb @@ -141,13 +141,13 @@ def test_self_domain_with_blank_sld def test_self_normalize [ - ["com", "com"], - ["example.com", "example.com"], - ["www.example.com", "www.example.com"], + ["com", "com"], + ["example.com", "example.com"], + ["www.example.com", "www.example.com"], - ["example.com.", "example.com"], # strip FQDN - [" example.com ", "example.com"], # strip spaces - ["Example.COM", "example.com"], # downcase + ["example.com.", "example.com"], # strip FQDN + [" example.com ", "example.com"], # strip spaces + ["Example.COM", "example.com"], # downcase ].each do |input, output| assert_equal output, PublicSuffix.normalize(input) end @@ -155,9 +155,9 @@ def test_self_normalize def test_normalize_blank [ - nil, - "", - " ", + nil, + "", + " ", ].each do |input| error = PublicSuffix.normalize(input) assert_instance_of PublicSuffix::DomainInvalid, error @@ -167,7 +167,7 @@ def test_normalize_blank def test_normalize_scheme [ - "https://google.com", + "https://google.com", ].each do |input| error = PublicSuffix.normalize(input) assert_instance_of PublicSuffix::DomainInvalid, error @@ -177,7 +177,7 @@ def test_normalize_scheme def test_normalize_leading_dot [ - ".google.com", + ".google.com", ].each do |input| error = PublicSuffix.normalize(input) assert_instance_of PublicSuffix::DomainInvalid, error diff --git a/test/unit/rule_test.rb b/test/unit/rule_test.rb index ea5ec8c0..d1cc6094 100644 --- a/test/unit/rule_test.rb +++ b/test/unit/rule_test.rb @@ -70,36 +70,36 @@ def test_equality_with_internals def test_match [ - # standard match - [PublicSuffix::Rule.factory("uk"), "uk", true], - [PublicSuffix::Rule.factory("uk"), "example.uk", true], - [PublicSuffix::Rule.factory("uk"), "example.co.uk", true], - [PublicSuffix::Rule.factory("co.uk"), "example.co.uk", true], - - # FIXME - # [PublicSuffix::Rule.factory("*.com"), "com", false], - [PublicSuffix::Rule.factory("*.com"), "example.com", true], - [PublicSuffix::Rule.factory("*.com"), "foo.example.com", true], - [PublicSuffix::Rule.factory("!example.com"), "com", false], - [PublicSuffix::Rule.factory("!example.com"), "example.com", true], - [PublicSuffix::Rule.factory("!example.com"), "foo.example.com", true], - - # TLD mismatch - [PublicSuffix::Rule.factory("gk"), "example.uk", false], - [PublicSuffix::Rule.factory("gk"), "example.co.uk", false], - [PublicSuffix::Rule.factory("co.uk"), "uk", false], - - # general mismatch - [PublicSuffix::Rule.factory("uk.co"), "example.co.uk", false], - [PublicSuffix::Rule.factory("go.uk"), "example.co.uk", false], - [PublicSuffix::Rule.factory("co.uk"), "uk", false], - - # partial matches/mismatches - [PublicSuffix::Rule.factory("co"), "example.co.uk", false], - [PublicSuffix::Rule.factory("example"), "example.uk", false], - [PublicSuffix::Rule.factory("le.it"), "example.it", false], - [PublicSuffix::Rule.factory("le.it"), "le.it", true], - [PublicSuffix::Rule.factory("le.it"), "foo.le.it", true], + # standard match + [PublicSuffix::Rule.factory("uk"), "uk", true], + [PublicSuffix::Rule.factory("uk"), "example.uk", true], + [PublicSuffix::Rule.factory("uk"), "example.co.uk", true], + [PublicSuffix::Rule.factory("co.uk"), "example.co.uk", true], + + # FIXME + # [PublicSuffix::Rule.factory("*.com"), "com", false], + [PublicSuffix::Rule.factory("*.com"), "example.com", true], + [PublicSuffix::Rule.factory("*.com"), "foo.example.com", true], + [PublicSuffix::Rule.factory("!example.com"), "com", false], + [PublicSuffix::Rule.factory("!example.com"), "example.com", true], + [PublicSuffix::Rule.factory("!example.com"), "foo.example.com", true], + + # TLD mismatch + [PublicSuffix::Rule.factory("gk"), "example.uk", false], + [PublicSuffix::Rule.factory("gk"), "example.co.uk", false], + [PublicSuffix::Rule.factory("co.uk"), "uk", false], + + # general mismatch + [PublicSuffix::Rule.factory("uk.co"), "example.co.uk", false], + [PublicSuffix::Rule.factory("go.uk"), "example.co.uk", false], + [PublicSuffix::Rule.factory("co.uk"), "uk", false], + + # partial matches/mismatches + [PublicSuffix::Rule.factory("co"), "example.co.uk", false], + [PublicSuffix::Rule.factory("example"), "example.uk", false], + [PublicSuffix::Rule.factory("le.it"), "example.it", false], + [PublicSuffix::Rule.factory("le.it"), "le.it", true], + [PublicSuffix::Rule.factory("le.it"), "foo.le.it", true], ].each do |rule, input, expected| assert_equal expected, rule.match?(input) From 9947cca9d84ff51e1c43af17c6127574490160a6 Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Fri, 31 Jan 2020 21:32:13 +0100 Subject: [PATCH 53/76] Update definitions --- CHANGELOG.md | 7 +++++++ data/list.txt | 25 ++++++++++++++++++++----- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e337842..24053ac2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ This project uses [Semantic Versioning 2.0.0](https://semver.org/). +## master + +### Changed + +- Updated definitions. + + ## 4.0.3 ### Fixed diff --git a/data/list.txt b/data/list.txt index 7f1854d8..6830093f 100644 --- a/data/list.txt +++ b/data/list.txt @@ -7074,7 +7074,7 @@ org.zw // newGTLDs -// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2019-12-25T17:26:24Z +// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2020-01-06T17:33:31Z // This list is auto-generated, don't edit it manually. // aaa : 2015-02-26 American Automobile Association, Inc. aaa @@ -8798,9 +8798,6 @@ lexus // lgbt : 2014-05-08 Afilias Limited lgbt -// liaison : 2014-10-02 Liaison Technologies, Incorporated -liaison - // lidl : 2014-09-18 Schwarz Domains und Services GmbH & Co. KG lidl @@ -10957,8 +10954,9 @@ certmgr.org xenapponazure.com // Civilized Discourse Construction Kit, Inc. : https://www.discourse.org/ -// Submitted by Rishabh Nambiar +// Submitted by Rishabh Nambiar & Michael Brown discourse.group +discourse.team // ClearVox : http://www.clearvox.nl/ // Submitted by Leon Rowland @@ -11688,6 +11686,7 @@ vologda.su // Fancy Bits, LLC : http://getchannels.com // Submitted by Aman Gupta channelsdvr.net +u.channelsdvr.net // Fastly Inc. : http://www.fastly.com/ // Submitted by Fastly Security @@ -12607,6 +12606,10 @@ pubtls.org // Submitted by Xavier De Cock qualifioapp.com +// QuickBackend: https://www.quickbackend.com +// Submitted by Dani Biro +qbuser.com + // Redstar Consultants : https://www.redstarconsultants.com/ // Submitted by Jons Slemmer instantcloud.cn @@ -12721,6 +12724,10 @@ my-firewall.org myfirewall.org spdns.org +// Senseering GmbH : https://www.senseering.de +// Submitted by Felix Mönckemeyer +senseering.net + // Service Online LLC : http://drs.ua/ // Submitted by Serhii Bulakh biz.ua @@ -12991,6 +12998,14 @@ remotewd.com // Submitted by Yuvi Panda wmflabs.org +// WoltLab GmbH : https://www.woltlab.com +// Submitted by Tim Düsterhus +myforum.community +community-pro.de +diskussionsbereich.de +community-pro.net +meinforum.net + // XenonCloud GbR: https://xenoncloud.net // Submitted by Julian Uphoff half.host From 369b1770a2309888c2827c3ae58932a236ff046f Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Fri, 31 Jan 2020 21:36:39 +0100 Subject: [PATCH 54/76] Update .gitignore --- .gitignore | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 9e5a30ab..85062928 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,8 @@ # Bundler -.bundle -Gemfile.lock -pkg/* - -# Rubinius -*.rbc +/.bundle +/Gemfile.lock +/pkg/* # YARD -.yardoc -yardoc/ +/.yardoc +/yardoc/ From b8f814579876a2f1c0a1a50e8f39121310a2f5e8 Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Sat, 15 Feb 2020 19:37:08 +0100 Subject: [PATCH 55/76] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 372a0192..7e30ee61 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ PublicSuffix is a Ruby domain name parser based on the [Public Suffix List](https://publicsuffix.org/). [![Build Status](https://travis-ci.org/weppos/publicsuffix-ruby.svg?branch=master)](https://travis-ci.org/weppos/publicsuffix-ruby) -[![Tidelift dependencies](https://tidelift.com/badges/github/weppos/publicsuffix-ruby)](https://tidelift.com/subscription/pkg/rubygems-public-suffix?utm_source=rubygems-public-suffix&utm_medium=referral&utm_campaign=readme) +[![Tidelift dependencies](https://tidelift.com/badges/package/rubygems/public_suffix)](https://tidelift.com/subscription/pkg/rubygems-public-suffix?utm_source=rubygems-public-suffix&utm_medium=referral&utm_campaign=readme) ## Links From 929532dcc1e3aa546c3ee4c55d113e7501ed34ae Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Sat, 15 Feb 2020 19:37:54 +0100 Subject: [PATCH 56/76] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7e30ee61..d250d945 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ PublicSuffix is a Ruby domain name parser based on the [Public Suffix List](https://publicsuffix.org/). [![Build Status](https://travis-ci.org/weppos/publicsuffix-ruby.svg?branch=master)](https://travis-ci.org/weppos/publicsuffix-ruby) -[![Tidelift dependencies](https://tidelift.com/badges/package/rubygems/public_suffix)](https://tidelift.com/subscription/pkg/rubygems-public-suffix?utm_source=rubygems-public-suffix&utm_medium=referral&utm_campaign=readme) +[![Tidelift dependencies](https://tidelift.com/badges/package/rubygems/public_suffix)](https://tidelift.com/subscription/pkg/rubygems-public-suffix?utm_source=rubygems-public-suffix&utm_medium=referral&utm_campaign=enterprise) ## Links From 16695da90b02220b41a6e88eac9d43e987692383 Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Sun, 16 Feb 2020 15:46:35 +0100 Subject: [PATCH 57/76] Update SECURITY.md --- SECURITY.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/SECURITY.md b/SECURITY.md index 25c27fed..f3291287 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -16,7 +16,7 @@ Older major versions are no longer supported. To make a report, please email weppos@weppos.net. -Please consider encrypting your report with GPG using the key (0x420da82a989398df)[https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x420da82a989398df] +Please consider encrypting your report with GPG using the key [0x420da82a989398df](https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x420da82a989398df). ``` -----BEGIN PGP PUBLIC KEY BLOCK----- @@ -99,3 +99,6 @@ q59MIs/Fb3SgaO+zN2FZTYp6dyRJHbeEz55JdOu6F+6ihZYH ``` +## Tracking Security Updates + +Information about security vulnerabilities are published in the [Security Advisories](https://github.com/weppos/publicsuffix-ruby/security/advisories) page. From ee03cb44103b87e2f0db33bc3e98603c08b7a362 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 19 Feb 2020 08:46:17 +0100 Subject: [PATCH 58/76] Update rubocop requirement from 0.79.0 to 0.80.0 (#169) Updates the requirements on [rubocop](https://github.com/rubocop-hq/rubocop) to permit the latest version. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.79.0...v0.80.0) Signed-off-by: dependabot-preview[bot] --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index fc390fc7..c52e1bc3 100644 --- a/Gemfile +++ b/Gemfile @@ -11,5 +11,5 @@ gem "memory_profiler", require: false gem "minitest" gem "minitest-reporters" gem "mocha" -gem "rubocop", "0.79.0", require: false +gem "rubocop", "0.80.0", require: false gem "yard" From c6dcdf6b276920bcbde5dbfaff4d6e93ae1bea82 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 3 Mar 2020 09:52:32 +0100 Subject: [PATCH 59/76] Update rubocop requirement from 0.80.0 to 0.80.1 (#170) Updates the requirements on [rubocop](https://github.com/rubocop-hq/rubocop) to permit the latest version. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.80.0...v0.80.1) Signed-off-by: dependabot-preview[bot] --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index c52e1bc3..afa9a2cb 100644 --- a/Gemfile +++ b/Gemfile @@ -11,5 +11,5 @@ gem "memory_profiler", require: false gem "minitest" gem "minitest-reporters" gem "mocha" -gem "rubocop", "0.80.0", require: false +gem "rubocop", "0.80.1", require: false gem "yard" From da6e504132fdff07c6e1851406ae6fbdfb895fbd Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Sun, 5 Apr 2020 14:44:52 +0200 Subject: [PATCH 60/76] Update to Rubocop 0.81.0 --- .rubocop_opinionated.yml | 18 ++++++++++++++++++ Gemfile | 2 +- lib/public_suffix/list.rb | 2 +- lib/public_suffix/rule.rb | 2 +- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.rubocop_opinionated.yml b/.rubocop_opinionated.yml index b5b63253..f80a439b 100644 --- a/.rubocop_opinionated.yml +++ b/.rubocop_opinionated.yml @@ -154,3 +154,21 @@ Style/TrivialAccessors: # end # IgnoreClassMethods: true + +# New cops +# See https://docs.rubocop.org/en/latest/versioning/ + +Lint/RaiseException: + Enabled: true + +Lint/StructNewOverride: + Enabled: true + +Style/HashEachMethods: + Enabled: true + +Style/HashTransformKeys: + Enabled: true + +Style/HashTransformValues: + Enabled: true diff --git a/Gemfile b/Gemfile index afa9a2cb..b1b7333b 100644 --- a/Gemfile +++ b/Gemfile @@ -11,5 +11,5 @@ gem "memory_profiler", require: false gem "minitest" gem "minitest-reporters" gem "mocha" -gem "rubocop", "0.80.1", require: false +gem "rubocop", "0.81.0", require: false gem "yard" diff --git a/lib/public_suffix/list.rb b/lib/public_suffix/list.rb index 1c7df366..321b59a7 100644 --- a/lib/public_suffix/list.rb +++ b/lib/public_suffix/list.rb @@ -216,7 +216,7 @@ def select(name, ignore_private: false) rules end - private :select # rubocop:disable Style/AccessModifierDeclarations + private :select # Gets the default rule. # diff --git a/lib/public_suffix/rule.rb b/lib/public_suffix/rule.rb index b5a08f52..d4c32ca1 100644 --- a/lib/public_suffix/rule.rb +++ b/lib/public_suffix/rule.rb @@ -22,7 +22,7 @@ module PublicSuffix module Rule # @api internal - Entry = Struct.new(:type, :length, :private) + Entry = Struct.new(:type, :length, :private) # rubocop:disable Lint/StructNewOverride # = Abstract rule class # From 167552c0b5871f1453b322810448cbc9feea58cf Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Sun, 5 Apr 2020 14:45:18 +0200 Subject: [PATCH 61/76] Update definitions --- data/list.txt | 108 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 74 insertions(+), 34 deletions(-) diff --git a/data/list.txt b/data/list.txt index 6830093f..f02a2de1 100644 --- a/data/list.txt +++ b/data/list.txt @@ -79,7 +79,6 @@ exchange.aero express.aero federation.aero flight.aero -freight.aero fuel.aero gliding.aero government.aero @@ -719,11 +718,13 @@ gouv.ci *.ck !www.ck -// cl : https://en.wikipedia.org/wiki/.cl +// cl : https://www.nic.cl +// Confirmed by .CL registry cl -gov.cl -gob.cl +aprendemas.cl co.cl +gob.cl +gov.cl mil.cl // cm : https://en.wikipedia.org/wiki/.cm plus bug 981927 @@ -982,8 +983,19 @@ fi // TODO: Check for updates (expected to be phased out around Q1/2009) aland.fi -// fj : https://en.wikipedia.org/wiki/.fj -*.fj +// fj : http://domains.fj/ +// Submitted by registry 2020-02-11 +fj +ac.fj +biz.fj +com.fj +gov.fj +info.fj +mil.fj +name.fj +net.fj +org.fj +pro.fj // fk : https://en.wikipedia.org/wiki/.fk *.fk @@ -6508,7 +6520,7 @@ k12.ok.us k12.or.us k12.pa.us k12.pr.us -k12.ri.us +// k12.ri.us Removed at request of Kim Cournoyer k12.sc.us // k12.sd.us Bug 934131 - Removed at request of James Booze k12.tn.us @@ -6795,8 +6807,13 @@ yt مصر // xn--e1a4c ("eu", Cyrillic) : EU +// https://eurid.eu ею +// xn--qxa6a ("eu", Greek) : EU +// https://eurid.eu +ευ + // xn--mgbah1a3hjkrd ("Mauritania", Arabic) : MR موريتانيا @@ -7074,7 +7091,7 @@ org.zw // newGTLDs -// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2020-01-06T17:33:31Z +// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2020-04-02T18:20:31Z // This list is auto-generated, don't edit it manually. // aaa : 2015-02-26 American Automobile Association, Inc. aaa @@ -7196,7 +7213,7 @@ alsace // alstom : 2015-07-30 ALSTOM alstom -// amazon : 2019-12-19 Amazon EU S.à r.l. +// amazon : 2019-12-19 Amazon Registry Services, Inc. amazon // americanexpress : 2015-07-31 American Express Travel Related Services Company, Inc. @@ -7376,7 +7393,7 @@ bcn // beats : 2015-05-14 Beats Electronics, LLC beats -// beauty : 2015-12-03 L'Oréal +// beauty : 2015-12-03 XYZ.COM LLC beauty // beer : 2014-01-09 Minds + Machines Group Limited @@ -7832,7 +7849,7 @@ cuisinella // cymru : 2014-05-08 Nominet UK cymru -// cyou : 2015-01-22 Beijing Gamease Age Digital Technology Co., Ltd. +// cyou : 2015-01-22 ShortDot SA cyou // dabur : 2014-02-06 Dabur India Limited @@ -8399,7 +8416,7 @@ guitars // guru : 2013-08-27 Binky Moon, LLC guru -// hair : 2015-12-03 L'Oréal +// hair : 2015-12-03 XYZ.COM LLC hair // hamburg : 2014-02-20 Hamburg Top-Level-Domain GmbH @@ -8918,7 +8935,7 @@ maif // maison : 2013-12-05 Binky Moon, LLC maison -// makeup : 2015-01-15 L'Oréal +// makeup : 2015-01-15 XYZ.COM LLC makeup // man : 2014-12-04 MAN SE @@ -9077,9 +9094,6 @@ mutual // nab : 2015-08-20 National Australia Bank Limited nab -// nadex : 2014-12-11 Nadex Domains, Inc. -nadex - // nagoya : 2013-10-24 GMO Registry, Inc. nagoya @@ -9761,7 +9775,7 @@ site // ski : 2015-04-09 Afilias Limited ski -// skin : 2015-01-15 L'Oréal +// skin : 2015-01-15 XYZ.COM LLC skin // sky : 2014-06-19 Sky International AG @@ -10049,7 +10063,7 @@ trading // training : 2013-11-07 Binky Moon, LLC training -// travel : Dog Beach, LLC +// travel : 2015-10-09 Dog Beach, LLC travel // travelchannel : 2015-07-02 Lifestyle Domain Holdings, Inc. @@ -10157,9 +10171,6 @@ visa // vision : 2013-12-05 Binky Moon, LLC vision -// vistaprint : 2014-09-18 Vistaprint Limited -vistaprint - // viva : 2014-11-07 Saudi Telecom Company viva @@ -10337,7 +10348,7 @@ xin // xn--45q11c : 2013-11-21 Zodiac Gemini Ltd 八卦 -// xn--4gbrim : 2013-10-04 Suhub Electronic Establishment +// xn--4gbrim : 2013-10-04 Fans TLD Limited موقع // xn--55qw42g : 2013-11-08 China Organizational Name Administration Center @@ -10397,7 +10408,7 @@ xin // xn--cck2b3b : 2015-02-26 Amazon Registry Services, Inc. ストア -// xn--cckwcxetd : 2019-12-19 Amazon EU S.à r.l. +// xn--cckwcxetd : 2019-12-19 Amazon Registry Services, Inc. アマゾン // xn--cg4bki : 2013-09-27 SAMSUNG SDS CO., LTD @@ -10421,9 +10432,6 @@ xin // xn--efvy88h : 2014-08-22 Guangzhou YU Wei Information Technology Co., Ltd. 新闻 -// xn--estv75g : 2015-02-19 Industrial and Commercial Bank of China Limited -工行 - // xn--fct429k : 2015-04-09 Amazon Registry Services, Inc. 家電 @@ -10469,7 +10477,7 @@ xin // xn--j1aef : 2015-01-15 VeriSign Sarl ком -// xn--jlq480n2rg : 2019-12-19 Amazon EU S.à r.l. +// xn--jlq480n2rg : 2019-12-19 Amazon Registry Services, Inc. 亚马逊 // xn--jlq61u9w7b : 2015-01-08 Nokia Corporation @@ -10532,7 +10540,7 @@ xin // xn--nyqy26a : 2014-11-07 Stable Tone Limited 健康 -// xn--otu796d : 2017-08-06 Internet DotTrademark Organisation Limited +// xn--otu796d : 2017-08-06 Jiang Yu Liang Cai Technology Company Limited 招聘 // xn--p1acf : 2013-12-12 Rusnames Limited @@ -11705,6 +11713,10 @@ global.ssl.fastly.net // Submitted by Likhachev Vasiliy fastpanel.direct fastvps-server.com +myfast.space +myfast.host +fastvps.site +fastvps.host // Featherhead : https://featherhead.xyz/ // Submitted by Simon Menke @@ -11718,6 +11730,13 @@ cloud.fedoraproject.org app.os.fedoraproject.org app.os.stg.fedoraproject.org +// FearWorks Media Ltd. : https://fearworksmedia.co.uk +// submitted by Keith Fairley +conn.uk +copro.uk +couk.me +ukco.me + // Fermax : https://fermax.com/ // submitted by Koen Van Isterdael mydobiss.com @@ -11738,7 +11757,6 @@ firebaseapp.com // Flynn : https://flynn.io // Submitted by Jonathan Rudenberg -flynnhub.com flynnhosting.net // Frederik Braun https://frederik-braun.com @@ -11910,6 +11928,10 @@ publishproxy.com withgoogle.com withyoutube.com +// Aaron Marais' Gitlab pages: https://lab.aaronleem.co.za +// Submitted by Aaron Marais +graphox.us + // Group 53, LLC : https://www.group53.com // Submitted by Tyler Todd awsmppl.com @@ -12227,8 +12249,8 @@ eu.meteorapp.com co.pl // Microsoft Corporation : http://microsoft.com -// Submitted by Justin Luk -azurecontainer.io +// Submitted by Mostafa Elzeiny +*.azurecontainer.io azurewebsites.net azure-mobile.net cloudapp.net @@ -12431,12 +12453,13 @@ pcloud.host nyc.mn // NymNom : https://nymnom.com/ -// Submitted by Dave McCormack +// Submitted by NymNom nom.ae nom.af nom.ai nom.al nym.by +nom.bz nym.bz nom.cl nym.ec @@ -12458,6 +12481,7 @@ nom.li nym.li nym.lt nym.lu +nom.lv nym.me nom.mk nym.mn @@ -12565,6 +12589,12 @@ on-web.fr *.platform.sh *.platformsh.site +// Platter: https://platter.dev +// Submitted by Patrick Flor +platter-app.com +platter-app.dev +platterp.us + // Port53 : https://port53.io/ // Submitted by Maximilian Schieder dyn53.io @@ -12778,6 +12808,10 @@ static.land dev.static.land sites.static.land +// Sony Interactive Entertainment LLC : https://sie.com/ +// Submitted by David Coles +playstation-cloud.com + // SourceLair PC : https://www.sourcelair.com // Submitted by Antonis Kalipetis apps.lair.io @@ -12952,6 +12986,11 @@ inc.hk virtualuser.de virtual-user.de +// urown.net : https://urown.net +// Submitted by Hostmaster +urown.cloud +dnsupdate.info + // .US // Submitted by Ed Moore lib.de.us @@ -12995,8 +13034,10 @@ wedeploy.sh remotewd.com // Wikimedia Labs : https://wikitech.wikimedia.org -// Submitted by Yuvi Panda +// Submitted by Arturo Borrero Gonzalez wmflabs.org +toolforge.org +wmcloud.org // WoltLab GmbH : https://www.woltlab.com // Submitted by Tim Düsterhus @@ -13068,7 +13109,6 @@ bss.design // Submitted by Emil Stahl basicserver.io virtualserver.io -site.builder.nu enterprisecloud.nu // ===END PRIVATE DOMAINS=== From a98db48faf84bc011f36c0f5ca022f6e0fa11a16 Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Sun, 5 Apr 2020 14:45:55 +0200 Subject: [PATCH 62/76] Release 4.0.3 --- CHANGELOG.md | 2 +- lib/public_suffix/version.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 24053ac2..6e79a2e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ This project uses [Semantic Versioning 2.0.0](https://semver.org/). -## master +## 4.0.4 ### Changed diff --git a/lib/public_suffix/version.rb b/lib/public_suffix/version.rb index 8f460a82..a8ed9030 100644 --- a/lib/public_suffix/version.rb +++ b/lib/public_suffix/version.rb @@ -9,5 +9,5 @@ module PublicSuffix # The current library version. - VERSION = "4.0.3" + VERSION = "4.0.4" end From 8d034e34d77cbdbd5f0cc96c4f6a01331045f4e3 Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Sun, 5 Apr 2020 14:48:49 +0200 Subject: [PATCH 63/76] Update Travis badge link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d250d945..12ec7a01 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ PublicSuffix is a Ruby domain name parser based on the [Public Suffix List](https://publicsuffix.org/). -[![Build Status](https://travis-ci.org/weppos/publicsuffix-ruby.svg?branch=master)](https://travis-ci.org/weppos/publicsuffix-ruby) +[![Build Status](https://travis-ci.com/weppos/publicsuffix-ruby.svg?branch=master)](https://travis-ci.com/weppos/publicsuffix-ruby) [![Tidelift dependencies](https://tidelift.com/badges/package/rubygems/public_suffix)](https://tidelift.com/subscription/pkg/rubygems-public-suffix?utm_source=rubygems-public-suffix&utm_medium=referral&utm_campaign=enterprise) From 6f650dad3dc69ac2e97578a182d20bba467ee4ff Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Tue, 7 Apr 2020 11:06:57 +0200 Subject: [PATCH 64/76] Create codecov.yml --- codecov.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 codecov.yml diff --git a/codecov.yml b/codecov.yml new file mode 100644 index 00000000..7ed2cca5 --- /dev/null +++ b/codecov.yml @@ -0,0 +1,14 @@ +# https://docs.codecov.io/docs/coverage-configuration +coverage: + precision: 1 + round: down + +coverage: + status: + project: + default: false + patch: + default: false + +# https://docs.codecov.io/docs/pull-request-comments#section-requiring-changes +comment: off From 6465387297fb001b27a680fb5dd73d1d6b46281d Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Sat, 9 May 2020 12:14:00 +0200 Subject: [PATCH 65/76] Update definitions --- CHANGELOG.md | 7 +++++++ data/list.txt | 44 ++++++++++++++++++++++++++++++++++++++------ 2 files changed, 45 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e79a2e1..95244e80 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ This project uses [Semantic Versioning 2.0.0](https://semver.org/). +## master + +### Changed + +- Updated definitions. + + ## 4.0.4 ### Changed diff --git a/data/list.txt b/data/list.txt index f02a2de1..9b3c983d 100644 --- a/data/list.txt +++ b/data/list.txt @@ -212,6 +212,7 @@ ac.at co.at gv.at or.at +sth.ac.at // au : https://en.wikipedia.org/wiki/.au // http://www.auda.org.au/ @@ -7091,7 +7092,7 @@ org.zw // newGTLDs -// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2020-04-02T18:20:31Z +// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2020-05-06T16:23:34Z // This list is auto-generated, don't edit it manually. // aaa : 2015-02-26 American Automobile Association, Inc. aaa @@ -7240,7 +7241,7 @@ analytics // android : 2014-08-07 Charleston Road Registry Inc. android -// anquan : 2015-01-08 QIHOO 360 TECHNOLOGY CO. LTD. +// anquan : 2015-01-08 Beijing Qihu Keji Co., Ltd. anquan // anz : 2015-07-31 Australia and New Zealand Banking Group Limited @@ -9748,7 +9749,7 @@ shop // shopping : 2016-03-31 Binky Moon, LLC shopping -// shouji : 2015-01-08 QIHOO 360 TECHNOLOGY CO. LTD. +// shouji : 2015-01-08 Beijing Qihu Keji Co., Ltd. shouji // show : 2015-03-05 Binky Moon, LLC @@ -10312,7 +10313,7 @@ xerox // xfinity : 2015-07-09 Comcast IP Holdings I, LLC xfinity -// xihuan : 2015-01-08 QIHOO 360 TECHNOLOGY CO. LTD. +// xihuan : 2015-01-08 Beijing Qihu Keji Co., Ltd. xihuan // xin : 2014-12-11 Elegant Leader Limited @@ -10633,7 +10634,7 @@ you // youtube : 2014-05-01 Charleston Road Registry Inc. youtube -// yun : 2015-01-08 QIHOO 360 TECHNOLOGY CO. LTD. +// yun : 2015-01-08 Beijing Qihu Keji Co., Ltd. yun // zappos : 2015-06-25 Amazon Registry Services, Inc. @@ -10979,6 +10980,10 @@ cleverapps.io *.lcl.dev *.stg.dev +// Clic2000 : https://clic2000.fr +// Submitted by Mathilde Blanchemanche +clic2000.net + // Cloud66 : https://www.cloud66.com/ // Submitted by Khash Sajadi c66.me @@ -11094,6 +11099,10 @@ realm.cz // Submitted by Jonathan Rudenberg cupcake.is +// Curv UG : https://curv-labs.de/ +// Submitted by Marvin Wiesner +curv.dev + // Customer OCI - Oracle Dyn https://cloud.oracle.com/home https://dyn.com/dns/ // Submitted by Gregory Drake // Note: This is intended to also include customer-oci.com due to wildcards implicitly including the current label @@ -11129,6 +11138,10 @@ firm.dk reg.dk store.dk +// dappnode.io : https://dappnode.io/ +// Submitted by Abel Boldu / DAppNode Team +dyndns.dappnode.io + // dapps.earth : https://dapps.earth/ // Submitted by Daniil Burdakov *.dapps.earth @@ -11611,6 +11624,10 @@ twmail.org mymailer.com.tw url.tw +// Fabrica Technologies, Inc. : https://www.fabrica.dev/ +// Submitted by Eric Jiang +onfabrica.com + // Facebook, Inc. // Submitted by Peter Ruibal apps.fbsbx.com @@ -12062,8 +12079,9 @@ pixolino.com ipifony.net // IServ GmbH : https://iserv.eu -// Submitted by Kim-Alexander Brodowski +// Submitted by Kim-Alexander Brodowski mein-iserv.de +schulserver.de test-iserv.de iserv.dev @@ -12296,6 +12314,7 @@ nctu.me // Netlify : https://www.netlify.com // Submitted by Jessica Parsons bitballoon.com +netlify.app netlify.com // Neustar Inc. @@ -12776,6 +12795,10 @@ myshopblocks.com // Submitted by Craig McMahon shopitsite.com +// shopware AG : https://shopware.com +// Submitted by Jens Küper +shopware.store + // Siemens Mobility GmbH // Submitted by Oliver Graebner mo-siemens.io @@ -13039,6 +13062,11 @@ wmflabs.org toolforge.org wmcloud.org +// WISP : https://wisp.gg +// Submitted by Stepan Fedotov +panel.gg +daemon.panel.gg + // WoltLab GmbH : https://www.woltlab.com // Submitted by Tim Düsterhus myforum.community @@ -13111,4 +13139,8 @@ basicserver.io virtualserver.io enterprisecloud.nu +// Mintere : https://mintere.com/ +// Submitted by Ben Aubin +mintere.site + // ===END PRIVATE DOMAINS=== From db463e5f4285a0e7ff60637f3bbc10e9a7f7bbce Mon Sep 17 00:00:00 2001 From: Orien Madgwick <_@orien.io> Date: Sat, 9 May 2020 20:14:45 +1000 Subject: [PATCH 66/76] Add project metadata to the gemspec (#172) As per https://guides.rubygems.org/specification-reference/#metadata, add metadata to the gemspec file. This'll allow people to more easily access the source code, raise issues and read the changelog. These bug_tracker_uri, changelog_uri, documentation_uri, homepage_uri and source_code_uri links will appear on the rubygems page at https://rubygems.org/gems/public_suffix and be available via the rubygems API after the next release. --- public_suffix.gemspec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/public_suffix.gemspec b/public_suffix.gemspec index 6a490861..ae552fc9 100644 --- a/public_suffix.gemspec +++ b/public_suffix.gemspec @@ -12,6 +12,14 @@ Gem::Specification.new do |s| s.description = "PublicSuffix can parse and decompose a domain name into top level domain, domain and subdomains." s.licenses = ["MIT"] + s.metadata = { + "bug_tracker_uri" => "https://github.com/weppos/publicsuffix-ruby/issues", + "changelog_uri" => "https://github.com/weppos/publicsuffix-ruby/blob/master/CHANGELOG.md", + "documentation_uri" => "https://rubydoc.info/gems/#{s.name}/#{s.version}", + "homepage_uri" => s.homepage, + "source_code_uri" => "https://github.com/weppos/publicsuffix-ruby/tree/v#{s.version}", + } + s.required_ruby_version = ">= 2.3" s.require_paths = ["lib"] From 8eb07f733a8965235c9c04f10408a5a0beacaae7 Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Sat, 9 May 2020 12:24:04 +0200 Subject: [PATCH 67/76] Add CI workflow --- .github/workflows/tests.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/tests.yml diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml new file mode 100644 index 00000000..a995e871 --- /dev/null +++ b/.github/workflows/tests.yml @@ -0,0 +1,26 @@ +name: Tests + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + + build: + runs-on: ubuntu-latest + steps: + + - uses: actions/checkout@v2 + + - name: Set up Ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: 2.6 + + - name: Install dependencies + run: bundle install + + - name: Run tests + run: bundle exec rake From 8ce9f8ca2899424280746cedada3b5dacb4ac8df Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Sat, 9 May 2020 12:31:00 +0200 Subject: [PATCH 68/76] Update tests.yml --- .github/workflows/tests.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a995e871..be6716b6 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -9,7 +9,16 @@ on: jobs: build: - runs-on: ubuntu-latest + strategy: + matrix: + ruby-version: + - "2.4" + - "2.5" + - "2.6" + - "2.7" + platform: [ubuntu-latest] + + runs-on: ${{ matrix.platform }} steps: - uses: actions/checkout@v2 @@ -17,7 +26,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 2.6 + ruby-version: ${{ matrix.ruby-version }} - name: Install dependencies run: bundle install From 4fc6126de51eefd62027803fcc843877bdd90beb Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Sat, 9 May 2020 12:32:34 +0200 Subject: [PATCH 69/76] Update tests.yml --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index be6716b6..9515000d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,6 +12,7 @@ jobs: strategy: matrix: ruby-version: + - "2.3" - "2.4" - "2.5" - "2.6" From f0cc99e90a4ccfe2682e4f05d5888665c34d0b84 Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Sat, 9 May 2020 12:46:01 +0200 Subject: [PATCH 70/76] Release 4.0.5 --- CHANGELOG.md | 2 +- lib/public_suffix/version.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 95244e80..96585863 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ This project uses [Semantic Versioning 2.0.0](https://semver.org/). -## master +## 4.0.5 ### Changed diff --git a/lib/public_suffix/version.rb b/lib/public_suffix/version.rb index a8ed9030..2d2003d9 100644 --- a/lib/public_suffix/version.rb +++ b/lib/public_suffix/version.rb @@ -9,5 +9,5 @@ module PublicSuffix # The current library version. - VERSION = "4.0.4" + VERSION = "4.0.5" end From c101bd5ef6da1d400e7995ba09372291c73ae203 Mon Sep 17 00:00:00 2001 From: Douglas Eichelberger Date: Tue, 4 Aug 2020 05:49:46 -0700 Subject: [PATCH 71/76] Fix key duplication in codecov.yml (#175) --- codecov.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/codecov.yml b/codecov.yml index 7ed2cca5..b6959370 100644 --- a/codecov.yml +++ b/codecov.yml @@ -2,8 +2,6 @@ coverage: precision: 1 round: down - -coverage: status: project: default: false From 89c74b0446e2d267750b2c58307547fed6ff94c9 Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Wed, 2 Sep 2020 11:21:34 +0200 Subject: [PATCH 72/76] Updated definitions --- data/list.txt | 390 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 312 insertions(+), 78 deletions(-) diff --git a/data/list.txt b/data/list.txt index 9b3c983d..9ca00ee5 100644 --- a/data/list.txt +++ b/data/list.txt @@ -258,7 +258,7 @@ tas.gov.au vic.gov.au wa.gov.au // 4LDs -education.tas.edu.au +// education.tas.edu.au - Removed at the request of the Department of Education Tasmania schools.nsw.edu.au // aw : https://en.wikipedia.org/wiki/.aw @@ -456,6 +456,7 @@ aju.br am.br anani.br aparecida.br +app.br arq.br art.br ato.br @@ -463,6 +464,7 @@ b.br barueri.br belem.br bhz.br +bib.br bio.br blog.br bmd.br @@ -477,14 +479,19 @@ cnt.br com.br contagem.br coop.br +coz.br cri.br cuiaba.br curitiba.br def.br +des.br +det.br +dev.br ecn.br eco.br edu.br emp.br +enf.br eng.br esp.br etc.br @@ -500,6 +507,7 @@ fot.br foz.br fst.br g12.br +geo.br ggf.br goiania.br gov.br @@ -543,6 +551,7 @@ jor.br jus.br leg.br lel.br +log.br londrina.br macapa.br maceio.br @@ -575,6 +584,7 @@ qsl.br radio.br rec.br recife.br +rep.br ribeirao.br rio.br riobranco.br @@ -585,6 +595,7 @@ santamaria.br santoandre.br saobernardo.br saogonca.br +seg.br sjc.br slg.br slz.br @@ -592,6 +603,7 @@ sorocaba.br srv.br taxi.br tc.br +tec.br teo.br the.br tmp.br @@ -1002,6 +1014,10 @@ pro.fj *.fk // fm : https://en.wikipedia.org/wiki/.fm +com.fm +edu.fm +net.fm +org.fm fm // fo : https://en.wikipedia.org/wiki/.fo @@ -1041,6 +1057,8 @@ ga gb // gd : https://en.wikipedia.org/wiki/.gd +edu.gd +gov.gd gd // ge : http://www.nic.net.ge/policy_en.pdf @@ -3785,7 +3803,7 @@ gov.lc // li : https://en.wikipedia.org/wiki/.li li -// lk : http://www.nic.lk/seclevpr.html +// lk : https://www.nic.lk/index.php/domain-registration/lk-domain-naming-structure lk gov.lk sch.lk @@ -6327,7 +6345,6 @@ cv.ua dn.ua dnepropetrovsk.ua dnipropetrovsk.ua -dominic.ua donetsk.ua dp.ua if.ua @@ -6919,11 +6936,11 @@ yt қаз // xn--fzc2c9e2c ("Lanka", Sinhalese-Sinhala) : LK -// http://nic.lk +// https://nic.lk ලංකා // xn--xkc2al3hye2a ("Ilangai", Tamil) : LK -// http://nic.lk +// https://nic.lk இலங்கை // xn--mgbc0a9azcg ("Morocco/al-Maghrib", Arabic) : MA @@ -7092,7 +7109,7 @@ org.zw // newGTLDs -// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2020-05-06T16:23:34Z +// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2020-08-07T17:16:50Z // This list is auto-generated, don't edit it manually. // aaa : 2015-02-26 American Automobile Association, Inc. aaa @@ -7175,9 +7192,6 @@ agency // aig : 2014-12-18 American International Group, Inc. aig -// aigo : 2015-08-06 aigo Digital Technology Co,Ltd. -aigo - // airbus : 2015-07-30 Airbus S.A.S. airbus @@ -7301,7 +7315,7 @@ audi // audible : 2015-06-25 Amazon Registry Services, Inc. audible -// audio : 2014-03-20 Uniregistry, Corp. +// audio : 2014-03-20 UNR Corp. audio // auspost : 2015-08-13 Australian Postal Corporation @@ -7310,7 +7324,7 @@ auspost // author : 2014-12-18 Amazon Registry Services, Inc. author -// auto : 2014-11-13 Cars Registry Limited +// auto : 2014-11-13 XYZ.COM LLC auto // autos : 2014-01-09 DERAutos, LLC @@ -7439,7 +7453,7 @@ bio // black : 2014-01-16 Afilias Limited black -// blackfriday : 2014-01-16 Uniregistry, Corp. +// blackfriday : 2014-01-16 UNR Corp. blackfriday // blockbuster : 2015-07-30 Dish DBS Corporation @@ -7586,7 +7600,7 @@ capital // capitalone : 2015-08-06 Capital One Financial Corporation capitalone -// car : 2015-01-22 Cars Registry Limited +// car : 2015-01-22 XYZ.COM LLC car // caravan : 2013-12-12 Caravan International, Inc. @@ -7604,7 +7618,7 @@ career // careers : 2013-10-02 Binky Moon, LLC careers -// cars : 2014-11-13 Cars Registry Limited +// cars : 2014-11-13 XYZ.COM LLC cars // casa : 2013-11-21 Minds + Machines Group Limited @@ -7679,7 +7693,7 @@ cheap // chintai : 2015-06-11 CHINTAI Corporation chintai -// christmas : 2013-11-21 Uniregistry, Corp. +// christmas : 2013-11-21 UNR Corp. christmas // chrome : 2014-07-24 Charleston Road Registry Inc. @@ -7718,7 +7732,7 @@ claims // cleaning : 2013-12-05 Binky Moon, LLC cleaning -// click : 2014-06-05 Uniregistry, Corp. +// click : 2014-06-05 UNR Corp. click // clinic : 2014-03-20 Binky Moon, LLC @@ -7931,7 +7945,7 @@ dhl // diamonds : 2013-09-22 Binky Moon, LLC diamonds -// diet : 2014-06-26 Uniregistry, Corp. +// diet : 2014-06-26 UNR Corp. diet // digital : 2014-03-06 Binky Moon, LLC @@ -8054,9 +8068,6 @@ esq // estate : 2013-08-27 Binky Moon, LLC estate -// esurance : 2015-07-23 Esurance Insurance Company -esurance - // etisalat : 2015-09-03 Emirates Telecommunications Corporation (trading as Etisalat) etisalat @@ -8171,7 +8182,7 @@ fit // fitness : 2014-03-06 Binky Moon, LLC fitness -// flickr : 2015-04-02 Yahoo! Domain Services Inc. +// flickr : 2015-04-02 Flickr, Inc. flickr // flights : 2013-12-05 Binky Moon, LLC @@ -8183,7 +8194,7 @@ flir // florist : 2013-11-07 Binky Moon, LLC florist -// flowers : 2014-10-09 Uniregistry, Corp. +// flowers : 2014-10-09 UNR Corp. flowers // fly : 2014-05-08 Charleston Road Registry Inc. @@ -8273,7 +8284,7 @@ gallo // gallup : 2015-02-19 Gallup, Inc. gallup -// game : 2015-05-28 Uniregistry, Corp. +// game : 2015-05-28 UNR Corp. game // games : 2015-05-28 Dog Beach, LLC @@ -8411,7 +8422,7 @@ guge // guide : 2013-09-13 Binky Moon, LLC guide -// guitars : 2013-11-14 Uniregistry, Corp. +// guitars : 2013-11-14 UNR Corp. guitars // guru : 2013-08-27 Binky Moon, LLC @@ -8444,7 +8455,7 @@ health // healthcare : 2014-06-12 Binky Moon, LLC healthcare -// help : 2014-06-26 Uniregistry, Corp. +// help : 2014-06-26 UNR Corp. help // helsinki : 2015-02-05 City of Helsinki @@ -8459,7 +8470,7 @@ hermes // hgtv : 2015-07-02 Lifestyle Domain Holdings, Inc. hgtv -// hiphop : 2014-03-06 Uniregistry, Corp. +// hiphop : 2014-03-06 UNR Corp. hiphop // hisamitsu : 2015-07-16 Hisamitsu Pharmaceutical Co.,Inc. @@ -8468,7 +8479,7 @@ hisamitsu // hitachi : 2014-10-31 Hitachi, Ltd. hitachi -// hiv : 2014-03-13 Uniregistry, Corp. +// hiv : 2014-03-13 UNR Corp. hiv // hkt : 2015-05-14 PCCW-HKT DataCom Services Limited @@ -8507,7 +8518,7 @@ hospital // host : 2014-04-17 DotHost Inc. host -// hosting : 2014-05-29 Uniregistry, Corp. +// hosting : 2014-05-29 UNR Corp. hosting // hot : 2015-08-27 Amazon Registry Services, Inc. @@ -8681,7 +8692,7 @@ jpmorgan // jprs : 2014-09-18 Japan Registry Services Co., Ltd. jprs -// juegos : 2014-03-20 Uniregistry, Corp. +// juegos : 2014-03-20 UNR Corp. juegos // juniper : 2015-07-30 JUNIPER NETWORKS, INC. @@ -8792,7 +8803,7 @@ law // lawyer : 2014-03-20 Dog Beach, LLC lawyer -// lds : 2014-03-20 IRI Domain Management, LLC ("Applicant") +// lds : 2014-03-20 IRI Domain Management, LLC lds // lease : 2014-03-06 Binky Moon, LLC @@ -8849,7 +8860,7 @@ lincoln // linde : 2014-12-04 Linde Aktiengesellschaft linde -// link : 2013-11-14 Uniregistry, Corp. +// link : 2013-11-14 UNR Corp. link // lipsy : 2015-06-25 Lipsy Ltd @@ -8867,7 +8878,7 @@ lixil // llc : 2017-12-14 Afilias Limited llc -// llp : 2019-08-26 Dot Registry LLC +// llp : 2019-08-26 UNR Corp. llp // loan : 2014-11-20 dot Loan Limited @@ -8885,7 +8896,7 @@ locus // loft : 2015-07-30 Annco, Inc. loft -// lol : 2015-01-30 Uniregistry, Corp. +// lol : 2015-01-30 UNR Corp. lol // london : 2013-11-14 Dot London Domains Limited @@ -9047,7 +9058,7 @@ moe // moi : 2014-12-18 Amazon Registry Services, Inc. moi -// mom : 2015-04-16 Uniregistry, Corp. +// mom : 2015-04-16 UNR Corp. mom // monash : 2013-09-30 Monash University @@ -9059,7 +9070,7 @@ money // monster : 2015-09-11 XYZ.COM LLC monster -// mormon : 2013-12-05 IRI Domain Management, LLC ("Applicant") +// mormon : 2013-12-05 IRI Domain Management, LLC mormon // mortgage : 2014-03-20 Dog Beach, LLC @@ -9122,7 +9133,7 @@ netflix // network : 2013-11-14 Binky Moon, LLC network -// neustar : 2013-12-05 Registry Services, LLC +// neustar : 2013-12-05 NeuStar, Inc. neustar // new : 2014-01-30 Charleston Road Registry Inc. @@ -9323,7 +9334,7 @@ philips // phone : 2016-06-02 Dish DBS Corporation phone -// photo : 2013-11-14 Uniregistry, Corp. +// photo : 2013-11-14 UNR Corp. photo // photography : 2013-09-20 Binky Moon, LLC @@ -9335,7 +9346,7 @@ photos // physio : 2014-05-01 PhysBiz Pty Ltd physio -// pics : 2013-11-14 Uniregistry, Corp. +// pics : 2013-11-14 UNR Corp. pics // pictet : 2014-06-26 Pictet Europe S.A. @@ -9422,7 +9433,7 @@ promo // properties : 2013-12-05 Binky Moon, LLC properties -// property : 2014-05-22 Uniregistry, Corp. +// property : 2014-05-22 UNR Corp. property // protection : 2015-04-23 XYZ.COM LLC @@ -9542,9 +9553,6 @@ richardli // ricoh : 2014-11-20 Ricoh Company, Ltd. ricoh -// rightathome : 2015-07-23 Johnson Shareholdings, Inc. -rightathome - // ril : 2015-04-02 Reliance Industries Limited ril @@ -9674,9 +9682,6 @@ science // scjohnson : 2015-07-23 Johnson Shareholdings, Inc. scjohnson -// scor : 2014-10-31 SCOR SE -scor - // scot : 2014-01-23 Dot Scot Registry Limited scot @@ -9716,7 +9721,7 @@ sew // sex : 2014-11-13 ICM Registry SX LLC sex -// sexy : 2013-09-11 Uniregistry, Corp. +// sexy : 2013-09-11 UNR Corp. sexy // sfr : 2015-08-13 Societe Francaise du Radiotelephone - SFR @@ -9920,9 +9925,6 @@ swiss // sydney : 2014-09-18 State of New South Wales, Department of Premier and Cabinet sydney -// symantec : 2014-12-04 Symantec Corporation -symantec - // systems : 2013-11-07 Binky Moon, LLC systems @@ -9947,7 +9949,7 @@ tatamotors // tatar : 2014-04-24 Limited Liability Company "Coordination Center of Regional Domain of Tatarstan Republic" tatar -// tattoo : 2013-08-30 Uniregistry, Corp. +// tattoo : 2013-08-30 UNR Corp. tattoo // tax : 2014-03-20 Binky Moon, LLC @@ -10076,7 +10078,7 @@ travelers // travelersinsurance : 2015-03-26 Travelers TLD, LLC travelersinsurance -// trust : 2014-10-16 NCC Group Inc. +// trust : 2014-10-16 NCC Group Domain Services, Inc. trust // trv : 2015-03-26 Travelers TLD, LLC @@ -10490,9 +10492,6 @@ xin // xn--kcrx77d1x4a : 2014-11-07 Koninklijke Philips N.V. 飞利浦 -// xn--kpu716f : 2014-12-22 Richemont DNS Inc. -手表 - // xn--kput3i : 2014-02-13 Beijing RITT-Net Technology Development Co., Ltd 手机 @@ -10547,9 +10546,6 @@ xin // xn--p1acf : 2013-12-12 Rusnames Limited рус -// xn--pbt977c : 2014-12-22 Richemont DNS Inc. -珠宝 - // xn--pssy2u : 2015-01-15 VeriSign Sarl 大拿 @@ -10666,6 +10662,9 @@ cc.ua inf.ua ltd.ua +// 611coin : https://611project.org/ +611.to + // Adobe : https://www.adobe.com/ // Submitted by Ian Boston adobeaemcloud.com @@ -10685,6 +10684,16 @@ barsy.ca *.compute.estate *.alces.network +// all-inkl.com : https://all-inkl.com +// Submitted by Werner Kaltofen +kasserver.com + +// Algorithmia, Inc. : algorithmia.com +// Submitted by Eli Perelman +*.algorithmia.com +!teams.algorithmia.com +!test.algorithmia.com + // Altervista: https://www.altervista.org // Submitted by Carlo Cannas altervista.org @@ -10849,8 +10858,11 @@ backplaneapp.io balena-devices.com // Banzai Cloud -// Submitted by Gabor Kozma +// Submitted by Janos Matyas +*.banzai.cloud app.banzaicloud.io +*.backyards.banzaicloud.io + // BetaInABox // Submitted by Adrian @@ -10904,33 +10916,36 @@ uwu.ai // CentralNic : http://www.centralnic.com/names/domains // Submitted by registry ae.org -ar.com br.com cn.com com.de com.se de.com eu.com -gb.com gb.net -hu.com hu.net jp.net jpn.com -kr.com mex.com -no.com -qc.com ru.com sa.com se.net uk.com uk.net us.com -uy.com za.bz za.com +// No longer operated by CentralNic, these entries should be adopted and/or removed by current operators +// Submitted by Gavin Brown +ar.com +gb.com +hu.com +kr.com +no.com +qc.com +uy.com + // Africa.com Web Solutions Ltd : https://registry.africa.com // Submitted by Gavin Brown africa.com @@ -10942,6 +10957,7 @@ gr.com // Radix FZC : http://domains.in.net // Submitted by Gavin Brown in.net +web.in // US REGISTRY LLC : http://us.org // Submitted by Gavin Brown @@ -10951,6 +10967,21 @@ us.org // Submitted by Gavin Brown co.com +// Roar Domains LLC : https://roar.basketball/ +// Submitted by Gavin Brown +aus.basketball +nz.basketball + +// BRS Media : https://brsmedia.com/ +// Submitted by Gavin Brown +radio.am +radio.fm + +// Globe Hosting SRL : https://www.globehosting.com/ +// Submitted by Gavin Brown +co.ro +shop.ro + // c.la : http://www.c.la/ c.la @@ -11116,6 +11147,12 @@ curv.dev cyon.link cyon.site +// Danger Science Group: https://dangerscience.com/ +// Submitted by Skylar MacDonald +fnwk.site +folionetwork.site +platform0.app + // Daplie, Inc : https://daplie.com // Submitted by AJ ONeal daplie.me @@ -11163,6 +11200,10 @@ debian.net // Submitted by Peter Thomassen dedyn.io +// DNS Africa Ltd https://dns.business +// Submitted by Calvin Browne +jozi.biz + // DNShome : https://www.dnshome.de/ // Submitted by Norbert Auler dnshome.de @@ -11193,6 +11234,9 @@ drud.us // Submitted by Richard Harper duckdns.org +// bitbridge.net : Submitted by Craig Welch, abeliidev@gmail.com +bitbridge.net + // dy.fi : http://dy.fi/ // Submitted by Heikki Hannikainen dy.fi @@ -11728,12 +11772,11 @@ global.ssl.fastly.net // FASTVPS EESTI OU : https://fastvps.ru/ // Submitted by Likhachev Vasiliy -fastpanel.direct fastvps-server.com -myfast.space +fastvps.host myfast.host fastvps.site -fastvps.host +myfast.space // Featherhead : https://featherhead.xyz/ // Submitted by Simon Menke @@ -11772,6 +11815,12 @@ filegear-sg.me // Submitted by Chris Raynor firebaseapp.com +// fly.io: https://fly.io +// Submitted by Kurt Mackey +fly.dev +edgeapp.net +shw.io + // Flynn : https://flynn.io // Submitted by Jonathan Rudenberg flynnhosting.net @@ -11793,6 +11842,10 @@ freeboxos.fr // Submitted by Daniel Stone freedesktop.org +// FunkFeuer - Verein zur Förderung freier Netze : https://www.funkfeuer.at +// Submitted by Daniel A. Maierhofer +wien.funkfeuer.at + // Futureweb OG : http://www.futureweb.at // Submitted by Andreas Schnederle-Wagner *.futurecms.at @@ -11816,6 +11869,7 @@ usercontent.jp // Gentlent, Inc. : https://www.gentlent.com // Submitted by Tom Klein gentapps.com +gentlentapis.com lab.ms // GitHub, Inc. @@ -11827,6 +11881,10 @@ githubusercontent.com // Submitted by Alex Hanselka gitlab.io +// Gitplac.si - https://gitplac.si +// Submitted by Aljaž Starc +gitpage.si + // Glitch, Inc : https://glitch.com // Submitted by Mads Hartmann glitch.me @@ -11840,6 +11898,10 @@ lolipop.io cloudapps.digital london.cloudapps.digital +// GOV.UK Pay : https://www.payments.service.gov.uk/ +// Submitted by Richard Baker +pymnt.uk + // UKHomeOffice : https://www.gov.uk/government/organisations/home-office // Submitted by Jon Shanks homeoffice.gov.uk @@ -11847,7 +11909,6 @@ homeoffice.gov.uk // GlobeHosting, Inc. // Submitted by Zoltan Egresi ro.im -shop.ro // GoIP DNS Services : http://www.goip.de // Submitted by Christian Poulter @@ -12006,6 +12067,9 @@ ngo.ng ng.school sch.so +// HostyHosting (hostyhosting.com) +hostyhosting.io + // Häkkinen.fi // Submitted by Eero Häkkinen häkkinen.fi @@ -12074,6 +12138,10 @@ to.leg.br // Submitted by Wolfgang Schwarz pixolino.com +// Internet-Pro, LLP: https://netangels.ru/ +// Submited by Vasiliy Sheredeko +na4u.ru + // IPiFony Systems, Inc. : https://www.ipifony.com/ // Submitted by Matthew Hardeman ipifony.net @@ -12089,6 +12157,32 @@ iserv.dev // Submitted by Yuji Minagawa iobb.net +//Jelastic, Inc. : https://jelastic.com/ +// Submited by Ihor Kolodyuk +appengine.flow.ch +vip.jelastic.cloud +jele.cloud +jele.club +dopaas.com +hidora.com +jcloud.ik-server.com +demo.jelastic.com +paas.massivegrid.com +j.scaleforce.com.cy +jelastic.dogado.eu +fi.cloudplatform.fi +paas.datacenter.fi +jele.host +mircloud.host +jele.io +cloudjiffy.net +jls-sto1.elastx.net +jelastic.saveincloud.net +jelastic.regruhosting.ru +jele.site +jelastic.team +j.layershift.co.uk + // Jino : https://www.jino.ru // Submitted by Sergey Ulyashin myjino.ru @@ -12174,7 +12268,8 @@ linkyard-cloud.ch // Linode : https://linode.com // Submitted by members.linode.com -nodebalancer.linode.com +*.nodebalancer.linode.com +*.linodeobjects.com // LiquidNet Ltd : http://www.liquidnetlimited.com/ // Submitted by Victor Velchev @@ -12243,6 +12338,15 @@ mayfirst.org // Submitted by Ilya Zaretskiy hb.cldmail.ru +// mcpe.me : https://mcpe.me +// Submitted by Noa Heyl +mcpe.me + +// McHost : https://mchost.ru +// Submitted by Evgeniy Subbotin +mcdir.ru +vps.mcdir.ru + // Memset hosting : https://www.memset.com // Submitted by Tom Whitwell miniserver.com @@ -12250,7 +12354,7 @@ memset.net // MetaCentrum, CESNET z.s.p.o. : https://www.metacentrum.cz/en/ // Submitted by Zdeněk Šustr -cloud.metacentrum.cz +*.cloud.metacentrum.cz custom.metacentrum.cz // MetaCentrum, CESNET z.s.p.o. : https://www.metacentrum.cz/en/ @@ -12273,6 +12377,14 @@ azurewebsites.net azure-mobile.net cloudapp.net +// minion.systems : http://minion.systems +// Submitted by Robert Böttinger +csx.cc + +// MobileEducation, LLC : https://joinforte.com +// Submitted by Grayson Martin +forte.id + // Mozilla Corporation : https://mozilla.com // Submitted by Ben Francis mozilla-iot.org @@ -12287,6 +12399,19 @@ net.ru org.ru pp.ru +// Mythic Beasts : https://www.mythic-beasts.com +// Submitted by Paul Cammish +hostedpi.com +customer.mythic-beasts.com +lynx.mythic-beasts.com +ocelot.mythic-beasts.com +onza.mythic-beasts.com +sphinx.mythic-beasts.com +vs.mythic-beasts.com +x.mythic-beasts.com +yali.mythic-beasts.com +cust.retrosnub.co.uk + // Nabu Casa : https://www.nabucasa.com // Submitted by Paulus Schoutsen ui.nabu.casa @@ -12313,9 +12438,7 @@ nctu.me // Netlify : https://www.netlify.com // Submitted by Jessica Parsons -bitballoon.com netlify.app -netlify.com // Neustar Inc. // Submitted by Trung Tran @@ -12533,14 +12656,26 @@ static.observableusercontent.com // Submitted by Andrew Sampson cya.gg +// OMG.LOL : +// Submitted by Adam Newbold +omg.lol + // Omnibond Systems, LLC. : https://www.omnibond.com // Submitted by Cole Estep cloudycluster.net +// OmniWe Limited: https://omniwe.com +// Submitted by Vicary Archangel +omniwe.site + // One Fold Media : http://www.onefoldmedia.com/ // Submitted by Eddie Jones nid.io +// Open Social : https://www.getopensocial.com/ +// Submitted by Alexander Varwijk +opensocial.site + // OpenCraft GmbH : http://opencraft.com/ // Submitted by Sven Marnach opencraft.hosting @@ -12562,6 +12697,10 @@ outsystemscloud.com ownprovider.com own.pm +// OwO : https://whats-th.is/ +// Submitted by Dean Sheather +*.owo.codes + // OX : http://www.ox.rs // Submitted by Adam Grand ox.rs @@ -12578,6 +12717,17 @@ pgfog.com // Submitted by Jason Kriss pagefrontapp.com +// PageXL : https://pagexl.com +// Submitted by Yann Guichard +pagexl.com + +// pcarrier.ca Software Inc: https://pcarrier.ca/ +// Submitted by Pierre Carrier +bar0.net +bar1.net +bar2.net +rdv.to + // .pl domains (grandfathered) art.pl gliwice.pl @@ -12605,7 +12755,10 @@ on-web.fr // Platform.sh : https://platform.sh // Submitted by Nikola Kotur -*.platform.sh +bc.platform.sh +ent.platform.sh +eu.platform.sh +us.platform.sh *.platformsh.site // Platter: https://platter.dev @@ -12614,6 +12767,12 @@ platter-app.com platter-app.dev platterp.us +// Plesk : https://www.plesk.com/ +// Submitted by Anton Akhtyamov +pdns.page +plesk.page +pleskns.com + // Port53 : https://port53.io/ // Submitted by Maximilian Schieder dyn53.io @@ -12696,6 +12855,10 @@ vaporcloud.io rackmaze.com rackmaze.net +// Rakuten Games, Inc : https://dev.viberplay.io +// Submitted by Joshua Zhang +g.vbrplsbx.io + // Rancher Labs, Inc : https://rancher.com // Submitted by Vincent Fiduccia *.on-k3s.io @@ -12773,6 +12936,10 @@ my-firewall.org myfirewall.org spdns.org +// Seidat : https://www.seidat.com +// Submitted by Artem Kondratev +seidat.net + // Senseering GmbH : https://www.senseering.de // Submitted by Felix Mönckemeyer senseering.net @@ -12821,6 +12988,10 @@ bounty-full.com alpha.bounty-full.com beta.bounty-full.com +// Small Technology Foundation : https://small-tech.org +// Submitted by Aral Balkan +small-web.org + // Stackhero : https://www.stackhero.io // Submitted by Adrien Gillon stackhero-network.com @@ -12933,6 +13104,8 @@ cust.dev.thingdust.io cust.disrec.thingdust.io cust.prod.thingdust.io cust.testing.thingdust.io +*.firenet.ch +*.svc.firenet.ch // Tlon.io : https://tlon.io // Submitted by Mark Staarink @@ -13022,6 +13195,12 @@ lib.de.us // Submitted by Danko Aleksejevs 2038.io +// Vercel, Inc : https://vercel.com/ +// Submitted by Connor Davis +vercel.app +vercel.dev +now.sh + // Viprinet Europe GmbH : http://www.viprinet.com // Submitted by Simon Kissel router.management @@ -13034,6 +13213,49 @@ v-info.info // Submitted by Nathan van Bakel voorloper.cloud +// Voxel.sh DNS : https://voxel.sh/dns/ +// Submitted by Mia Rehlinger +neko.am +nyaa.am +be.ax +cat.ax +es.ax +eu.ax +gg.ax +mc.ax +us.ax +xy.ax +nl.ci +xx.gl +app.gp +blog.gt +de.gt +to.gt +be.gy +cc.hn +blog.kg +io.kg +jp.kg +tv.kg +uk.kg +us.kg +de.ls +at.md +de.md +jp.md +to.md +uwu.nu +indie.porn +vxl.sh +ch.tc +me.tc +we.tc +nyan.to +at.vg +blog.vu +dev.vu +me.vu + // V.UA Domain Administrator : https://domain.v.ua/ // Submitted by Serhii Rostilo v.ua @@ -13056,6 +13278,10 @@ wedeploy.sh // Submitted by Jung Jin remotewd.com +// WIARD Enterprises : https://wiardweb.com +// Submitted by Kidd Hustle +pages.wiardweb.com + // Wikimedia Labs : https://wikitech.wikimedia.org // Submitted by Arturo Borrero Gonzalez wmflabs.org @@ -13075,6 +13301,10 @@ diskussionsbereich.de community-pro.net meinforum.net +// www.com.vc : http://www.com.vc +// Submitted by Li Hui +cn.vu + // XenonCloud GbR: https://xenoncloud.net // Submitted by Julian Uphoff half.host @@ -13125,10 +13355,6 @@ noho.st za.net za.org -// Zeit, Inc. : https://zeit.domains/ -// Submitted by Olli Vanhoja -now.sh - // Zine EOOD : https://zine.bg/ // Submitted by Martin Angelov bss.design @@ -13143,4 +13369,12 @@ enterprisecloud.nu // Submitted by Ben Aubin mintere.site +// WP Engine : https://wpengine.com/ +// Submitted by Michael Smith +wpenginepowered.com + +// Impertrix Solutions : +// Submitted by Zhixiang Zhao +impertrixcdn.com +impertrix.com // ===END PRIVATE DOMAINS=== From c61d25e6e3155a879a0536706e7a7e62806ba1f9 Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Wed, 2 Sep 2020 11:24:44 +0200 Subject: [PATCH 73/76] Update rubocop --- .rubocop_opinionated.yml | 19 +------------------ Gemfile | 2 +- test/psl_test.rb | 2 +- 3 files changed, 3 insertions(+), 20 deletions(-) diff --git a/.rubocop_opinionated.yml b/.rubocop_opinionated.yml index f80a439b..401e684d 100644 --- a/.rubocop_opinionated.yml +++ b/.rubocop_opinionated.yml @@ -5,6 +5,7 @@ AllCops: # Exclude vendored folders - 'tmp/**/*' - 'vendor/**/*' + NewCops: enable # [codesmell] Layout/LineLength: @@ -154,21 +155,3 @@ Style/TrivialAccessors: # end # IgnoreClassMethods: true - -# New cops -# See https://docs.rubocop.org/en/latest/versioning/ - -Lint/RaiseException: - Enabled: true - -Lint/StructNewOverride: - Enabled: true - -Style/HashEachMethods: - Enabled: true - -Style/HashTransformKeys: - Enabled: true - -Style/HashTransformValues: - Enabled: true diff --git a/Gemfile b/Gemfile index b1b7333b..6ae68163 100644 --- a/Gemfile +++ b/Gemfile @@ -11,5 +11,5 @@ gem "memory_profiler", require: false gem "minitest" gem "minitest-reporters" gem "mocha" -gem "rubocop", "0.81.0", require: false +gem "rubocop", "~>0.90", require: false gem "yard" diff --git a/test/psl_test.rb b/test/psl_test.rb index 20dc79a9..fae398f7 100644 --- a/test/psl_test.rb +++ b/test/psl_test.rb @@ -38,7 +38,7 @@ def test_valid failures = [] self.class.tests.each do |input, output| # Punycode domains are not supported ATM - next if input =~ /xn\-\-/ + next if input =~ /xn--/ domain = PublicSuffix.domain(input) rescue nil failures << [input, output, domain] if output != domain From e3eedfd7cc06573ae85d8597dd4bd46c893d851d Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Wed, 2 Sep 2020 11:26:17 +0200 Subject: [PATCH 74/76] Ignore rubocop cop --- test/acceptance_test.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/acceptance_test.rb b/test/acceptance_test.rb index 2be719d7..371bfe13 100644 --- a/test/acceptance_test.rb +++ b/test/acceptance_test.rb @@ -96,6 +96,7 @@ def test_ignore_case ["subdomain.blogspot.com", false, "subdomain.blogspot.com"], ].freeze + # rubocop:disable Style/CombinableLoops def test_ignore_private # test domain and parse INCLUDE_PRIVATE_CASES.each do |given, ignore_private, expected| @@ -110,6 +111,7 @@ def test_ignore_private assert_equal !expected.nil?, PublicSuffix.valid?(given, ignore_private: ignore_private) end end + # rubocop:enable Style/CombinableLoops def valid_uri?(name) From a302119cd731ab490f321abfa7a2f9b168ad55cf Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Wed, 2 Sep 2020 11:29:33 +0200 Subject: [PATCH 75/76] Last release with 2.3 Prepare to remove 2.3. Some depds already no longer support it. This version will support it (without tests), then I'll prepare for a major bump and 2.3 removal. --- .github/workflows/tests.yml | 2 +- .travis.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9515000d..2de90583 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: ruby-version: - - "2.3" + # - "2.3" - "2.4" - "2.5" - "2.6" diff --git a/.travis.yml b/.travis.yml index 7a0526a7..30f78e82 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: ruby rvm: - - 2.3 + # - 2.3 - 2.4 - 2.5 - 2.6 From 2e0bee34176f902b416796d6dbc5a03c670e0a98 Mon Sep 17 00:00:00 2001 From: Simone Carletti Date: Wed, 2 Sep 2020 11:26:40 +0200 Subject: [PATCH 76/76] Release 4.0.6 --- CHANGELOG.md | 7 +++++++ lib/public_suffix/version.rb | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 96585863..4861d623 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ This project uses [Semantic Versioning 2.0.0](https://semver.org/). +## 4.0.6 + +### Changed + +- Updated definitions. + + ## 4.0.5 ### Changed diff --git a/lib/public_suffix/version.rb b/lib/public_suffix/version.rb index 2d2003d9..c9f93f10 100644 --- a/lib/public_suffix/version.rb +++ b/lib/public_suffix/version.rb @@ -9,5 +9,5 @@ module PublicSuffix # The current library version. - VERSION = "4.0.5" + VERSION = "4.0.6" end