RubyGems - ryodo - Versions diffs - 0.2.7 → 0.3.0 - Mend

ryodo 0.2.7 → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (24) hide show

checksums.yaml +4 -4
data/.travis.yml +2 -1
data/checks/matching.rb +6 -8
data/data/suffix.dat +455 -22
data/lib/ryodo.rb +4 -6
data/lib/ryodo/convenience.rb +0 -4
data/lib/ryodo/convenience/utf8.rb +6 -11
data/lib/ryodo/domain.rb +21 -26
data/lib/ryodo/ext/string.rb +1 -3
data/lib/ryodo/ext/uri.rb +2 -5
data/lib/ryodo/methods.rb +4 -7
data/lib/ryodo/parser.rb +3 -10
data/lib/ryodo/rule.rb +6 -8
data/lib/ryodo/rule_set.rb +3 -12
data/lib/ryodo/suffix_list.rb +6 -13
data/lib/ryodo/suffix_list_fetcher.rb +27 -27
data/lib/ryodo/version.rb +1 -1
data/ryodo.gemspec +6 -7
data/spec/_files/mozilla_effective_tld_names.dat +1672 -678
data/spec/ryodo/suffix_list_fetcher_spec.rb +19 -31
data/spec/ryodo/suffix_list_spec.rb +14 -18
data/spec/ryodo_spec.rb +2 -3
data/spec/spec_helper.rb +2 -19
metadata +33 -33

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f935db0625a0780ae766f3533a65a8dfc2ed30e1
-  data.tar.gz: aa2cd8e9a8c2d9b0b085e61f1412c0761d2a6d49
+  metadata.gz: a2009ee066c6737848cca6059a41bace0de69cca
+  data.tar.gz: 3fc121908e3a8a576a8ab58ceadc0c86bc360c0e
 SHA512:
-  metadata.gz: f80b9f7b5eefe019ccee946cef8309d0f9237b93bb252cdea9881af3830777c7272ea1e03c0fc08ea9936d99fbc8977ff89a43db63d7001c42c9d6b175ec9b3e
-  data.tar.gz: bac6a90f9cb2c9f28c465ad82cc3e67dcffd4def11a50587d153e05a0770930d2a2b688eca500f7fe6e43f9f375fe117d97172eae8eddbf8c5f034188f521210
+  metadata.gz: 6898cf3e46ee281beaa5cb5ae5f9505dbc6ccc1eb197902ad7f4c7a16e27521de090aa720eff269ad4b6371d886263beaac825b67369ae146eb7d8689090afd2
+  data.tar.gz: d152e55b954da6fc210948e5ee5fcee2c59d9f03c1392eccc69949b62e324b108c8780c6ea9a3729a98bbf84b190a00c587d91e8ec63bf4b99adbd3f6d255921

data/.travis.yml CHANGED Viewed

@@ -1,10 +1,11 @@
 language: ruby
 rvm:
+  - 2.1.2
   - 2.1.0
   - 2.0.0
   - 1.9.3
-  - 1.9.2
+  - rbx-2
   - jruby-19mode
 branches:

data/checks/matching.rb CHANGED Viewed

@@ -1,13 +1,11 @@
 #!/usr/bin/env ruby
-# coding: utf-8
-$: << "lib"
+$LOAD_PATH << "lib"
 require "ryodo"
-def checkPublicSuffix query, expectation
-  q          = Ryodo[query]
-  calculated =  q.domain.nil? ? "NULL" : q.domain
-  passed     = (calculated==expectation) ? "  OK" : "FAIL"
+def checkPublicSuffix(query, expectation)
+  query      = Ryodo[query]
+  calculated = query.domain.nil? ? "NULL" : query.domain
+  passed     = calculated == expectation ? "  OK" : "FAIL"
   puts "#{passed} === Q: #{query.ljust(26)} | #{expectation.rjust(16)} <=> #{calculated.ljust(16)}"
 end
@@ -106,4 +104,4 @@ checkPublicSuffix('中国', 'NULL')
 # checkPublicSuffix('xn--85x722f.xn--fiqs8s', 'xn--85x722f.xn--fiqs8s')
 # checkPublicSuffix('www.xn--85x722f.xn--fiqs8s', 'xn--85x722f.xn--fiqs8s')
 # checkPublicSuffix('shishi.xn--fiqs8s', 'shishi.xn--fiqs8s')
-# checkPublicSuffix('xn--fiqs8s', 'NULL')
+# checkPublicSuffix('xn--fiqs8s', 'NULL')

data/data/suffix.dat CHANGED Viewed

@@ -1,3 +1,5 @@
+abbott
+abogado
 ac
 ac.com
 ac.edu
@@ -6,6 +8,9 @@ ac.mil
 ac.net
 ac.org
 academy
+accenture
+accountants
+active
 actor
 ad
 ad.nom
@@ -113,6 +118,7 @@ af.edu
 af.gov
 af.net
 af.org
+africa
 ag
 ag.co
 ag.com
@@ -125,6 +131,7 @@ ai.com
 ai.net
 ai.off
 ai.org
+airforce
 al
 al.com
 al.edu
@@ -132,12 +139,16 @@ al.gov
 al.mil
 al.net
 al.org
+allfinanz
+alsace
 am
+amsterdam
 an
 an.com
 an.edu
 an.net
 an.org
+android
 ao
 ao.co
 ao.ed
@@ -146,16 +157,20 @@ ao.it
 ao.og
 ao.pb
 aq
+aquarelle
 ar
 ar.com
 ar.com.blogspot
 ar.edu
 ar.gob
+ar.gov
 ar.int
 ar.mil
 ar.net
 ar.org
 ar.tur
+archi
+army
 arpa
 arpa.e164
 arpa.in-addr
@@ -166,6 +181,7 @@ arpa.urn
 as
 as.gov
 asia
+associates
 at
 at.ac
 at.biz
@@ -175,13 +191,13 @@ at.gv
 at.info
 at.or
 at.priv
+attorney
 au
 au.act
 au.asn
 au.com
 au.com.blogspot
 au.conf
-au.csiro
 au.edu
 au.edu.act
 au.edu.nsw
@@ -192,7 +208,6 @@ au.edu.tas
 au.edu.vic
 au.edu.wa
 au.gov
-au.gov.act
 au.gov.qld
 au.gov.sa
 au.gov.tas
@@ -210,6 +225,8 @@ au.sa
 au.tas
 au.vic
 au.wa
+auction
+audio
 autos
 aw
 aw.com
@@ -239,10 +256,15 @@ ba.org
 ba.rs
 ba.unbi
 ba.unsa
+band
 bar
+barcelona
 bargains
+bauhaus
+bayern
 bb
 bb.biz
+bb.co
 bb.com
 bb.edu
 bb.gov
@@ -250,6 +272,8 @@ bb.info
 bb.net
 bb.org
 bb.store
+bb.tv
+bcn
 bd.*
 be
 be.ac
@@ -302,14 +326,17 @@ bh.edu
 bh.gov
 bh.net
 bh.org
+bharti
 bi
 bi.co
 bi.com
 bi.edu
 bi.or
 bi.org
+bible
 bid
 bike
+bio
 biz
 biz.dyndns
 biz.for-better
@@ -325,6 +352,7 @@ bj.blogspot
 bj.gouv
 black
 blackfriday
+bloomberg
 blue
 bm
 bm.com
@@ -332,7 +360,10 @@ bm.edu
 bm.gov
 bm.net
 bm.org
+bmw
 bn.*
+bnl
+bnpparibas
 bo
 bo.com
 bo.edu
@@ -343,6 +374,8 @@ bo.mil
 bo.net
 bo.org
 bo.tv
+bond
+boo
 boutique
 br
 br.adm
@@ -389,9 +422,10 @@ br.lel
 br.mat
 br.med
 br.mil
+br.mp
 br.mus
 br.net
-br.nom
+br.nom.*
 br.not
 br.ntr
 br.odo
@@ -415,6 +449,7 @@ br.vet
 br.vlog
 br.wiki
 br.zlg
+brussels
 bs
 bs.com
 bs.edu
@@ -447,6 +482,8 @@ bz.edu
 bz.gov
 bz.net
 bz.org
+bz.za
+bzh
 ca
 ca.ab
 ca.bc
@@ -466,15 +503,24 @@ ca.qc
 ca.sk
 ca.yk
 cab
+cal
 camera
 camp
+cancerresearch
+capetown
+capital
 caravan
 cards
+care
 career
 careers
+cartier
 casa
+cash
 cat
 catering
+cba
+cbn
 cc
 cc.ftpaccess
 cc.game-server
@@ -484,13 +530,18 @@ cd
 cd.gov
 center
 ceo
+cern
 cf
 cf.blogspot
+cfa
 cg
 ch
 ch.blogspot
+channel
 cheap
 christmas
+chrome
+church
 ci
 ci.ac
 ci.asso
@@ -507,6 +558,8 @@ ci.net
 ci.or
 ci.org
 ci.presse
+citic
+city
 ck.!www
 ck.*
 cl
@@ -514,14 +567,22 @@ cl.co
 cl.gob
 cl.gov
 cl.mil
+claims
 cleaning
+click
+clinic
 clothing
 club
 cm
+cm.co
+cm.com
 cm.gov
+cm.net
 cn
 cn.ac
 cn.ah
+cn.amazonaws.compute
+cn.amazonaws.compute.cn-north-1
 cn.bj
 cn.com
 cn.cq
@@ -581,7 +642,9 @@ co.web
 codes
 coffee
 college
+cologne
 com
+com.africa
 com.amazonaws.compute
 com.amazonaws.compute-1
 com.amazonaws.compute-1.z-1
@@ -625,6 +688,7 @@ com.cechire
 com.cloudcontrolapp
 com.cloudcontrolled
 com.cn
+com.co
 com.codespot
 com.de
 com.dnsalias
@@ -655,6 +719,8 @@ com.est-a-la-masion
 com.est-le-patron
 com.est-mon-blogueur
 com.eu
+com.firebaseapp
+com.flynnhub
 com.from-ak
 com.from-al
 com.from-ar
@@ -704,6 +770,7 @@ com.from-wv
 com.from-wy
 com.gb
 com.getmyip
+com.githubusercontent
 com.googleapis
 com.googlecode
 com.gotdns
@@ -777,9 +844,12 @@ com.jpn
 com.kr
 com.likes-pie
 com.likescandy
+com.mex
 com.neat-url
+com.nfshost
 com.no
 com.operaunite
+com.outsystemscloud
 com.qc
 com.rhcloud
 com.ro
@@ -799,7 +869,9 @@ com.us
 com.uy
 com.withgoogle
 com.writesthisblog
+com.yolasite
 com.za
+commbank
 community
 company
 computer
@@ -819,6 +891,9 @@ cr.fi
 cr.go
 cr.or
 cr.sa
+credit
+creditcard
+crs
 cruises
 cu
 cu.com
@@ -827,6 +902,7 @@ cu.gov
 cu.inf
 cu.net
 cu.org
+cuisinella
 cv
 cv.blogspot
 cw
@@ -838,10 +914,15 @@ cx
 cx.ath
 cx.gov
 cy.*
+cymru
 cz
 cz.blogspot
+dabur
+dad
 dance
 dating
+datsun
+day
 de
 de.blogspot
 de.com
@@ -851,10 +932,18 @@ de.istmein
 de.lebtimnetz
 de.leitungsen
 de.traeumtgerade
+deals
+degree
 democrat
+dental
+dentist
 desi
 diamonds
+diet
+digital
+direct
 directory
+discount
 dj
 dk
 dk.blogspot
@@ -877,6 +966,9 @@ do.org
 do.sld
 do.web
 domains
+doosan
+durban
+dvag
 dz
 dz.art
 dz.asso
@@ -886,6 +978,7 @@ dz.gov
 dz.net
 dz.org
 dz.pol
+eat
 ec
 ec.com
 ec.edu
@@ -923,9 +1016,13 @@ eg.net
 eg.org
 eg.sci
 email
+emerck
+engineer
+engineering
 enterprises
 equipment
 er.*
+erni
 es
 es.com
 es.com.blogspot
@@ -933,27 +1030,49 @@ es.edu
 es.gob
 es.nom
 es.org
+esq
 estate
-et.*
+et
+et.biz
+et.com
+et.edu
+et.gov
+et.info
+et.name
+et.org
 eu
+eurovision
 eus
 events
+everbank
+exchange
 expert
 exposed
+fail
+fan
 farm
+fashion
 feedback
 fi
 fi.aland
 fi.blogspot
 fi.iki
+finance
+financial
+firmdale
 fish
 fishing
+fitness
 fj.*
 fk.*
 flights
 florist
+flsmidth
+fly
 fm
 fo
+foo
+forsale
 foundation
 fr
 fr.aeroport
@@ -980,13 +1099,19 @@ fr.prd
 fr.presse
 fr.tm
 fr.veterinaire
+frl
 frogans
+fund
+furniture
 futbol
 ga
 gal
 gallery
+garden
 gb
+gbiz
 gd
+gdn
 ge
 ge.com
 ge.edu
@@ -995,6 +1120,7 @@ ge.mil
 ge.net
 ge.org
 ge.pvt
+gent
 gf
 gg
 gg.co
@@ -1015,10 +1141,17 @@ gi.ltd
 gi.mod
 gi.org
 gift
+gifts
+gives
 gl
 glass
+gle
+global
 globo
 gm
+gmail
+gmo
+gmx
 gn
 gn.ac
 gn.com
@@ -1026,6 +1159,7 @@ gn.edu
 gn.gov
 gn.net
 gn.org
+google
 gop
 gov
 gp
@@ -1044,6 +1178,10 @@ gr.gov
 gr.net
 gr.org
 graphics
+gratis
+green
+gripe
+group
 gs
 gt
 gt.com
@@ -1054,6 +1192,7 @@ gt.mil
 gt.net
 gt.org
 gu.*
+guge
 guide
 guitars
 guru
@@ -1062,7 +1201,14 @@ gy
 gy.co
 gy.com
 gy.net
+hamburg
 haus
+healthcare
+help
+here
+hermes
+hiphop
+hiv
 hk
 hk.blogspot
 hk.com
@@ -1098,7 +1244,10 @@ holdings
 holiday
 homes
 horse
+host
+hosting
 house
+how
 hr
 hr.com
 hr.from
@@ -1155,10 +1304,12 @@ hu.tm
 hu.tozsde
 hu.utazas
 hu.video
+ibm
 id
 id.ac
 id.biz
 id.co
+id.desa
 id.go
 id.mil
 id.my
@@ -1169,6 +1320,8 @@ id.web
 ie
 ie.blogspot
 ie.gov
+ifm
+iinet
 il.*
 il.co.blogspot
 im
@@ -1181,6 +1334,7 @@ im.net
 im.org
 im.tt
 im.tv
+immo
 immobilien
 in
 in.ac
@@ -1197,6 +1351,7 @@ in.nic
 in.org
 in.res
 industries
+infiniti
 info
 info.barrel-of-knowledge
 info.barrell-of-knowledge
@@ -1208,14 +1363,19 @@ info.here-for-more
 info.knowsitall
 info.selfip
 info.webhop
+ing
 ink
 institute
+insure
 int
 int.eu
 international
+investments
 io
 io.com
 io.github
+io.nid
+ipiranga
 iq
 iq.com
 iq.edu
@@ -1233,6 +1393,7 @@ ir.org
 ir.sch
 ir.ايران
 ir.ایران
+irish
 is
 is.com
 is.cupcake
@@ -1241,7 +1402,11 @@ is.gov
 is.int
 is.net
 is.org
+ist
+istanbul
 it
+it.abr
+it.abruzzo
 it.ag
 it.agrigento
 it.al
@@ -1256,6 +1421,8 @@ it.andriabarlettatrani
 it.andriatranibarletta
 it.ao
 it.aosta
+it.aosta-valley
+it.aostavalley
 it.aoste
 it.ap
 it.aq
@@ -1273,6 +1440,8 @@ it.balsan
 it.bari
 it.barletta-trani-andria
 it.barlettatraniandria
+it.bas
+it.basilicata
 it.belluno
 it.benevento
 it.bergamo
@@ -1294,7 +1463,11 @@ it.bt
 it.bz
 it.ca
 it.cagliari
+it.cal
+it.calabria
 it.caltanissetta
+it.cam
+it.campania
 it.campidano-medio
 it.campidanomedio
 it.campobasso
@@ -1327,6 +1500,9 @@ it.cz
 it.dell-ogliastra
 it.dellogliastra
 it.edu
+it.emilia-romagna
+it.emiliaromagna
+it.emr
 it.en
 it.enna
 it.fc
@@ -1342,7 +1518,20 @@ it.foggia
 it.forli-cesena
 it.forlicesena
 it.fr
+it.friuli-v-giulia
+it.friuli-ve-giulia
+it.friuli-vegiulia
+it.friuli-venezia-giulia
+it.friuli-veneziagiulia
+it.friuli-vgiulia
+it.friuliv-giulia
+it.friulive-giulia
+it.friulivegiulia
+it.friulivenezia-giulia
+it.friuliveneziagiulia
+it.friulivgiulia
 it.frosinone
+it.fvg
 it.ge
 it.genoa
 it.genova
@@ -1362,19 +1551,29 @@ it.la-spezia
 it.laquila
 it.laspezia
 it.latina
+it.laz
+it.lazio
 it.lc
 it.le
 it.lecce
 it.lecco
 it.li
+it.lig
+it.liguria
 it.livorno
 it.lo
 it.lodi
+it.lom
+it.lombardia
+it.lombardy
 it.lt
 it.lu
+it.lucania
 it.lucca
 it.macerata
 it.mantova
+it.mar
+it.marche
 it.massa-carrara
 it.massacarrara
 it.matera
@@ -1390,6 +1589,8 @@ it.milano
 it.mn
 it.mo
 it.modena
+it.mol
+it.molise
 it.monza
 it.monza-brianza
 it.monza-e-della-brianza
@@ -1428,8 +1629,11 @@ it.pescara
 it.pg
 it.pi
 it.piacenza
+it.piedmont
+it.piemonte
 it.pisa
 it.pistoia
+it.pmn
 it.pn
 it.po
 it.pordenone
@@ -1438,6 +1642,8 @@ it.pr
 it.prato
 it.pt
 it.pu
+it.pug
+it.puglia
 it.pv
 it.pz
 it.ra
@@ -1461,9 +1667,15 @@ it.rome
 it.rovigo
 it.sa
 it.salerno
+it.sar
+it.sardegna
+it.sardinia
 it.sassari
 it.savona
 it.si
+it.sic
+it.sicilia
+it.sicily
 it.siena
 it.siracusa
 it.so
@@ -1474,6 +1686,7 @@ it.ss
 it.suedtirol
 it.sv
 it.ta
+it.taa
 it.taranto
 it.te
 it.tempio-olbia
@@ -1483,6 +1696,8 @@ it.terni
 it.tn
 it.to
 it.torino
+it.tos
+it.toscana
 it.tp
 it.tr
 it.trani-andria-barletta
@@ -1491,21 +1706,60 @@ it.traniandriabarletta
 it.tranibarlettaandria
 it.trapani
 it.trentino
+it.trentino-a-adige
+it.trentino-aadige
+it.trentino-alto-adige
+it.trentino-altoadige
+it.trentino-s-tirol
+it.trentino-stirol
+it.trentino-sud-tirol
+it.trentino-sudtirol
+it.trentino-sued-tirol
+it.trentino-suedtirol
+it.trentinoa-adige
+it.trentinoaadige
+it.trentinoalto-adige
+it.trentinoaltoadige
+it.trentinos-tirol
+it.trentinostirol
+it.trentinosud-tirol
+it.trentinosudtirol
+it.trentinosued-tirol
+it.trentinosuedtirol
 it.trento
 it.treviso
 it.trieste
 it.ts
 it.turin
+it.tuscany
 it.tv
 it.ud
 it.udine
+it.umb
+it.umbria
 it.urbino-pesaro
 it.urbinopesaro
 it.va
+it.val-d-aosta
+it.val-daosta
+it.vald-aosta
+it.valdaosta
+it.valle-aosta
+it.valle-d-aosta
+it.valle-daosta
+it.valleaosta
+it.valled-aosta
+it.valledaosta
+it.vallee-aoste
+it.valleeaoste
+it.vao
 it.varese
 it.vb
 it.vc
+it.vda
 it.ve
+it.ven
+it.veneto
 it.venezia
 it.venice
 it.verbania
@@ -1520,6 +1774,8 @@ it.vr
 it.vs
 it.vt
 it.vv
+iwc
+java
 je
 je.co
 je.net
@@ -1536,6 +1792,7 @@ jo.net
 jo.org
 jo.sch
 jobs
+joburg
 jp
 jp.ac
 jp.ad
@@ -1567,7 +1824,6 @@ jp.aichi.konan
 jp.aichi.kota
 jp.aichi.mihama
 jp.aichi.miyoshi
-jp.aichi.nagakute
 jp.aichi.nishio
 jp.aichi.nisshin
 jp.aichi.obu
@@ -2259,7 +2515,6 @@ jp.iwate.rikuzentakata
 jp.iwate.shiwa
 jp.iwate.shizukuishi
 jp.iwate.sumita
-jp.iwate.takizawa
 jp.iwate.tanohata
 jp.iwate.tono
 jp.iwate.yahaba
@@ -3287,6 +3542,7 @@ jp.yamanashi.yamanakako
 jp.yamanashi.yamanashi
 jp.yokohama.!city
 jp.yokohama.*
+juegos
 kaufen
 ke.*
 kg
@@ -3331,6 +3587,7 @@ kn.edu
 kn.gov
 kn.net
 kn.org
+koeln
 kp
 kp.com
 kp.edu
@@ -3397,6 +3654,8 @@ la.org
 la.per
 lacaixa
 land
+latrobe
+lawyer
 lb
 lb.com
 lb.edu
@@ -3410,8 +3669,14 @@ lc.edu
 lc.gov
 lc.net
 lc.org
+lds
+lease
+leclerc
+lgbt
 li
+life
 lighting
+limited
 limo
 link
 lk
@@ -3429,7 +3694,9 @@ lk.org
 lk.sch
 lk.soc
 lk.web
+loans
 london
+lotto
 lr
 lr.com
 lr.edu
@@ -3441,6 +3708,7 @@ ls.co
 ls.org
 lt
 lt.gov
+ltda
 lu
 luxe
 luxury
@@ -3471,9 +3739,11 @@ ma.gov
 ma.net
 ma.org
 ma.press
+madrid
 maison
 management
 mango
+market
 marketing
 mc
 mc.asso
@@ -3488,7 +3758,10 @@ me.its
 me.net
 me.org
 me.priv
+media
 meet
+melbourne
+meme
 menu
 mg
 mg.com
@@ -3535,15 +3808,23 @@ mobi
 moda
 moe
 monash
+montblanc
 mormon
+mortgage
 moscow
 motorcycles
+mov
 mp
 mq
 mr
 mr.blogspot
 mr.gov
 ms
+ms.com
+ms.edu
+ms.gov
+ms.net
+ms.org
 mt
 mt.com
 mt.edu
@@ -4172,6 +4453,7 @@ nagoya
 name
 name.her.forgot
 name.his.forgot
+navy
 nc
 nc.asso
 ne
@@ -4208,6 +4490,7 @@ net.homeip
 net.homelinux
 net.homeunix
 net.hu
+net.in
 net.in-the-band
 net.is-a-chef
 net.is-a-geek
@@ -4226,8 +4509,11 @@ net.thruhere
 net.uk
 net.webhop
 net.za
+netbank
 network
 neustar
+new
+nexus
 nf
 nf.arts
 nf.com
@@ -4249,8 +4535,11 @@ ng.name
 ng.net
 ng.org
 ng.sch
+ngo
+nhk
 ni.*
 ninja
+nissan
 nl
 nl.blogspot
 nl.bv
@@ -5020,13 +5309,31 @@ nr.gov
 nr.info
 nr.net
 nr.org
+nra
 nrw
 nu
 nu.merseine
 nu.mine
 nu.shacknet
-nz.*
+nyc
+nz
+nz.ac
+nz.co
 nz.co.blogspot
+nz.cri
+nz.geek
+nz.gen
+nz.govt
+nz.health
+nz.iwi
+nz.kiwi
+nz.maori
+nz.mil
+nz.māori
+nz.net
+nz.org
+nz.parliament
+nz.school
 okinawa
 om
 om.co
@@ -5038,7 +5345,10 @@ om.museum
 om.net
 om.org
 om.pro
+ong
 onl
+ooo
+oracle
 org
 org.ae
 org.blogdns
@@ -5095,6 +5405,7 @@ org.stuff-4-sale
 org.us
 org.webhop
 org.za
+organic
 otsuka
 ovh
 pa
@@ -5109,6 +5420,7 @@ pa.net
 pa.nom
 pa.org
 pa.sld
+paris
 partners
 parts
 pe
@@ -5133,11 +5445,16 @@ ph.mil
 ph.net
 ph.ngo
 ph.org
+pharmacy
 photo
 photography
 photos
+physio
 pics
+pictet
+pictures
 pink
+pizza
 pk
 pk.biz
 pk.com
@@ -5334,6 +5651,7 @@ pl.zakopane
 pl.zarow
 pl.zgora
 pl.zgorzelec
+place
 plumbing
 pm
 pn
@@ -5342,6 +5660,8 @@ pn.edu
 pn.gov
 pn.net
 pn.org
+pohl
+poker
 post
 pr
 pr.ac
@@ -5358,6 +5678,7 @@ pr.org
 pr.pro
 pr.prof
 praxi
+press
 pro
 pro.aca
 pro.bar
@@ -5366,8 +5687,11 @@ pro.eng
 pro.jur
 pro.law
 pro.med
+prod
 productions
+prof
 properties
+property
 ps
 ps.com
 ps.edu
@@ -5418,15 +5742,23 @@ re.asso
 re.blogspot
 re.com
 re.nom
+realtor
 recipes
 red
+rehab
+reise
+reisen
 ren
 rentals
 repair
 report
+republican
 rest
+restaurant
 reviews
 rich
+rio
+rip
 ro
 ro.arts
 ro.blogspot
@@ -5449,6 +5781,7 @@ rs.edu
 rs.gov
 rs.in
 rs.org
+rsvp
 ru
 ru.ac
 ru.adygeya
@@ -5537,7 +5870,6 @@ ru.palana
 ru.penza
 ru.perm
 ru.pp
-ru.pskov
 ru.ptz
 ru.pyatigorsk
 ru.rnd
@@ -5605,6 +5937,9 @@ sa.org
 sa.pub
 sa.sch
 saarland
+samsung
+sap
+sarl
 sb
 sb.com
 sb.edu
@@ -5617,6 +5952,12 @@ sc.edu
 sc.gov
 sc.net
 sc.org
+sca
+scb
+schmidt
+scholarships
+schule
+scot
 sd
 sd.com
 sd.edu
@@ -5634,6 +5975,7 @@ se.bd
 se.blogspot
 se.brand
 se.c
+se.com
 se.d
 se.e
 se.f
@@ -5660,7 +6002,6 @@ se.pp
 se.press
 se.r
 se.s
-se.sshn
 se.t
 se.tm
 se.u
@@ -5668,6 +6009,9 @@ se.w
 se.x
 se.y
 se.z
+seat
+services
+sew
 sexy
 sg
 sg.blogspot
@@ -5683,13 +6027,16 @@ sh.gov
 sh.mil
 sh.net
 sh.org
+sharp
 shiksha
 shoes
+shriram
 si
 singles
 sj
 sk
 sk.blogspot
+sky
 sl
 sl.com
 sl.edu
@@ -5710,9 +6057,13 @@ so.com
 so.net
 so.org
 social
+software
 sohu
 solar
 solutions
+soy
+space
+spiegel
 sr
 st
 st.co
@@ -5731,6 +6082,9 @@ su
 supplies
 supply
 support
+surf
+surgery
+suzuki
 sv
 sv.com
 sv.edu
@@ -5751,12 +6105,16 @@ sz
 sz.ac
 sz.co
 sz.org
+taipei
+tatar
 tattoo
+tax
 tc
 td
 td.blogspot
 technology
 tel
+temasek
 tf
 tg
 th
@@ -5769,6 +6127,7 @@ th.net
 th.or
 tienda
 tips
+tirol
 tj
 tj.ac
 tj.biz
@@ -5828,10 +6187,35 @@ to.org
 today
 tokyo
 tools
+top
+toshiba
+town
+toys
 tp
-tr.!nic
-tr.*
+tr
+tr.av
+tr.bbs
+tr.bel
+tr.biz
+tr.com
+tr.dr
+tr.edu
+tr.gen
+tr.gov
+tr.info
+tr.k12
+tr.kep
+tr.mil
+tr.name
+tr.nc
 tr.nc.gov
+tr.net
+tr.org
+tr.pol
+tr.tel
+tr.tv
+tr.web
+trade
 training
 travel
 tt
@@ -5852,6 +6236,7 @@ tt.net
 tt.org
 tt.pro
 tt.travel
+tui
 tv
 tv.better-than
 tv.dyndns
@@ -5973,19 +6358,23 @@ ug.ne
 ug.or
 ug.org
 ug.sc
-uk.!bl
-uk.!british-library
-uk.!jet
-uk.!mod
-uk.!national-library-scotland
-uk.!nel
-uk.!nic
-uk.!nls
-uk.!parliament
-uk.*
+uk
+uk.ac
+uk.co
 uk.co.blogspot
+uk.gov
+uk.gov.service
+uk.ltd
+uk.me
+uk.net
+uk.nhs
+uk.org
+uk.plc
+uk.police
 uk.sch.*
+university
 uno
+uol
 us
 us.ak
 us.ak.cc
@@ -6117,7 +6506,6 @@ us.nc.k12
 us.nc.lib
 us.nd
 us.nd.cc
-us.nd.k12
 us.nd.lib
 us.ne
 us.ne.cc
@@ -6236,18 +6624,29 @@ vc.mil
 vc.net
 vc.org
 ve
+ve.arts
 ve.co
 ve.com
 ve.e12
 ve.edu
+ve.firm
+ve.gob
 ve.gov
 ve.info
+ve.int
 ve.mil
 ve.net
 ve.org
+ve.rec
+ve.store
+ve.tec
 ve.web
 vegas
 ventures
+vermögensberater
+vermögensberatung
+versicherung
+vet
 vg
 vi
 vi.co
@@ -6258,6 +6657,7 @@ vi.org
 viajes
 villas
 vision
+vlaanderen
 vn
 vn.ac
 vn.biz
@@ -6277,14 +6677,26 @@ voting
 voto
 voyage
 vu
+vu.com
+vu.edu
+vu.net
+vu.org
+wales
 wang
 watch
+webcam
+website
 wed
+wedding
 wf
+whoswho
 wien
 wiki
+williamhill
+wme
 work
 works
+world
 ws
 ws.com
 ws.dyndns
@@ -6294,13 +6706,18 @@ ws.mypets
 ws.net
 ws.org
 wtc
+wtf
 xxx
 xyz
 yachts
+yandex
 ye.*
+yoga
 yokohama
+youtube
 yt
 za.*
+zip
 zm.*
 zone
 zw.*
@@ -6313,6 +6730,12 @@ zw.*
 рф
 сайт
 срб
+срб.ак
+срб.обр
+срб.од
+срб.орг
+срб.пр
+срб.упр
 укр
 қаз
 الاردن
@@ -6352,6 +6775,7 @@ zw.*
 ไทย
 გე
 みんな
+グーグル
 世界
 中信
 中国
@@ -6368,17 +6792,26 @@ zw.*
 商店
 商标
 在线
+娱乐
 广东
+慈善
 我爱你
+手机
 政务
+政府
 新加坡
+新闻
+时尚
 机构
+淡马锡
 游戏
 移动
 组织机构
 网址
+网店
 网络
 臺灣
+谷歌
 集团
 香港
 삼성