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

ryodo 0.3.0 → 0.3.1

Files changed (27) hide show

checksums.yaml +4 -4
data/.rubocop.yml +17 -0
data/.travis.yml +7 -5
data/Gemfile +5 -0
data/LICENSE +1 -1
data/README.md +18 -101
data/Rakefile +9 -9
data/data/suffix.dat +342 -7
data/lib/ryodo/convenience.rb +2 -0
data/lib/ryodo/domain.rb +37 -13
data/lib/ryodo/ext/uri.rb +8 -4
data/lib/ryodo/methods.rb +0 -1
data/lib/ryodo/parser.rb +2 -2
data/lib/ryodo/rule.rb +3 -3
data/lib/ryodo/rule_set.rb +51 -37
data/lib/ryodo/suffix_list.rb +11 -13
data/lib/ryodo/suffix_list_fetcher.rb +1 -0
data/lib/ryodo/version.rb +1 -1
data/ryodo.gemspec +7 -7
data/spec/_files/mozilla_effective_tld_names.dat +975 -63
data/spec/ryodo/suffix_list_fetcher_spec.rb +7 -6
data/spec/ryodo/suffix_list_spec.rb +15 -16
data/spec/spec_helper.rb +16 -7
data/spec/suffix_checker.rb +130 -0
metadata +12 -26
data/checks/matching.rb +0 -107
data/spec/ryodo_spec.rb +0 -5

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2009ee066c6737848cca6059a41bace0de69cca
-  data.tar.gz: 3fc121908e3a8a576a8ab58ceadc0c86bc360c0e
+  metadata.gz: 4606d0236200c76ccbfb0c01b9d306a335c136ff
+  data.tar.gz: 23b0a797c1c08fdbb934d95d5896cc0ac5afc81c
 SHA512:
-  metadata.gz: 6898cf3e46ee281beaa5cb5ae5f9505dbc6ccc1eb197902ad7f4c7a16e27521de090aa720eff269ad4b6371d886263beaac825b67369ae146eb7d8689090afd2
-  data.tar.gz: d152e55b954da6fc210948e5ee5fcee2c59d9f03c1392eccc69949b62e324b108c8780c6ea9a3729a98bbf84b190a00c587d91e8ec63bf4b99adbd3f6d255921
+  metadata.gz: a98789c2b0a405ba99ebb937d91741c4ac3defc6e9267f919a6b77fba50bd4ae68720a5a09238f62e4b4cd61af169315cd11f91677296245304dbb59ffdc244a
+  data.tar.gz: fc4883d61f94cf3be146cb832cae5d492cfa414464ed256c368903c85a80e9f52ed13a061b567b855ae16b66317a98c84332497562cbe40004dbcbb1aab87b0d

data/.rubocop.yml ADDED

@@ -0,0 +1,17 @@
+AllCops:
+  Exclude:
+    - Rakefile
+    - ryodo.gemspec
+    - checks/matching.rb
+Documentation:
+  Enabled: false
+Metrics/LineLength:
+  Max: 120
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+  SupportedStyles:
+    - single_quotes
+    - double_quotes

data/.travis.yml CHANGED

@@ -1,14 +1,16 @@
 language: ruby
+cache: bundler
 rvm:
-  - 2.1.2
-  - 2.1.0
+  - 2.2.0
+  - 2.1.5
   - 2.0.0
-  - 1.9.3
-  - rbx-2
-  - jruby-19mode
 branches:
   only:
     - develop
     - master
+env:
+  global:
+    - secure: "D3z4RvKc32obw+Tnd92VLwpGHca5HP3oMpCrMo1AbzsZcEpTuiIlQ+8byQt0MfnPABfJy/MNnXJNefVjZr7rOkGH6NiIAR2zH0Ajb0HJytXocG5a4KIYY6BJtavwdX4PLTbOHassdfxkuOrMkF0lVcxBPeGIFUYUytahnYDw9q0="

data/Gemfile CHANGED

@@ -1,2 +1,7 @@
 source "https://rubygems.org"
 gemspec
+group :development, :test do
+  gem "coveralls"
+  gem "codeclimate-test-reporter"
+end

data/LICENSE CHANGED

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2013 Christoph Grabo
+Copyright (c) 2012-2015 Christoph Grabo
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md CHANGED

@@ -1,23 +1,33 @@
 # ryodo
-[![gem version](https://badge.fury.io/rb/ryodo.png)](http://badge.fury.io/rb/ryodo) [![build status](https://secure.travis-ci.org/asaaki/ryodo.png)](http://travis-ci.org/asaaki/ryodo) [![dev dependency status](https://gemnasium.com/asaaki/ryodo.png)](https://gemnasium.com/asaaki/ryodo) [![code climate](https://codeclimate.com/github/asaaki/ryodo.png)](https://codeclimate.com/github/asaaki/ryodo) [![coverage status](https://coveralls.io/repos/asaaki/ryodo/badge.png?branch=master)](https://coveralls.io/r/asaaki/ryodo?branch=master)
+[![gem version](https://img.shields.io/gem/v/ryodo.svg?style=flat-square)](https://rubygems.org/gems/ryodo)
+[![build status](https://img.shields.io/travis/asaaki/ryodo/master.svg?style=flat-square)](http://travis-ci.org/asaaki/ryodo)
+[![dev dependency status](https://img.shields.io/gemnasium/asaaki/ryodo.svg?style=flat-square)](https://gemnasium.com/asaaki/ryodo)
+[![code climate](https://img.shields.io/codeclimate/github/asaaki/ryodo.svg?style=flat-square)](https://codeclimate.com/github/asaaki/ryodo)
+[![coverage status](https://img.shields.io/coveralls/asaaki/ryodo/master.svg?style=flat-square)](https://coveralls.io/r/asaaki/ryodo?branch=master)
+[![Support via Gratipay](http://img.shields.io/gratipay/asaaki.svg?style=flat-square)](https://gratipay.com/asaaki)
 **ryōdo【領土】 りょうど — A domain name parser using public suffix list**
-Do you ever wanted to know if `suspicious.domain.name.blerp` is really a valid domain?
+Do you ever wanted to know if `suspicious.domain.name.blerp` is really a valid (registerable) domain?
-Do you ever wanted to know what is the domain portion of `others.guy.awesome.domain.co.jp`?
+Do you ever wanted to know what is the actual domain portion of `yet.another.awesome.domain.co.jp`?
 Then you should try `ryodo` and get the answers!
 Notice: This gem **does not** check DNS records to verify if a name was taken and registered, this is not its purpose.
 I am a big fan of the UNIX philosophy: *»Write programs that do one thing and do it well.«*
-My blog post about `ryodo`: [ryodo - domain parser (2012-06-02)](http://codecraft.io/2012/06/02/ryodo-domain-parser/)
+My blog post about `ryodo`: [ryodo - domain parser (2012-06-02)](http://markentier.de/codecraft/2012/06/02/ryodo-domain-parser/)
 ## Usage
+```ruby
+# Gemfile
+gem "ryodo"
+```
 ```ruby
 dom = Ryodo.parse("my.awesome.domain.co.jp")
 #=> Ryodo::Domain
@@ -87,14 +97,13 @@ require "ryodo/ext/string"
 In Gemfile:
 ```ruby
-gem "ryodo", :require => ["ryodo", "ryodo/ext/string"]
+gem "ryodo", require: %w[ryodo ryodo/ext/string]
 ```
 ### UTF-8 junkie?
 ```ruby
-# coding: utf-8
 require "ryodo/convenience/utf8"
 ryōdo("my.awesome.domain.co.jp")
@@ -134,99 +143,8 @@ uri.host.is_valid?
 In Gemfile:
 ```ruby
-gem "ryodo", :require => ["ryodo", "ryodo/ext/uri"]
-```
-## Benchmark
-There is another gem called [public_suffix](https://github.com/weppos/publicsuffix-ruby), which does nearly the same (maybe with more features I don't need).
-So I did a tiny benchmark.
-**Setup**
-A domain input list, taken by publicsuffix.org (checkPublicSuffix test script under [publicsuffix.org/list/](http://publicsuffix.org/list/)).
-Some of them are also invalid (to test, if you implementation works correctly).
-I added some very long domain names with many parts (for look-up time scale).
-We only do a basic parsing and retrieve the registered/registrable domain. (Should hit the most important code of the gems.)
-The benchmark script can be found at [checks/benchmark.rb (branch: prof)](./blob/prof/checks/benchmark.rb).
-**Notes**
-`PublicSuffix.parse(…)` will raise errors if domain input is invalid (e.g. not a registrable domain).
-`Ryodo.parse(…)` won't raise but return nil values for invalid stuff (it only raises if input is not a String, of course).
-**Results**
+gem "ryodo", require: %w[ryodo ryodo/ext/uri]
 ```
-Ruby: MRI 2.1.0p0
-ryodo (0.2.6)
-public_suffix (1.3.3)
-Machine: AMD Phenom(tm) II X6 1090T, 6 cores, 3.2 GHz; 8 GB RAM
-Linux 3.12.7-1-ARCH x86_64 GNU/Linux
-Benchmark of domain parsing
-===========================
-Number of loops: 1000
-Number of items per loop: 100
-Rehearsal ---------------------------------------------------
-ryodo             2.110000   0.000000   2.110000 (  2.122766)
-public_suffix    72.460000   0.020000  72.480000 ( 72.517502)
------------------------------------------ total: 74.590000sec
-                      user     system      total        real
-ryodo             2.130000   0.000000   2.130000 (  2.132354)
-public_suffix    72.000000   2.220000  74.220000 ( 74.272943)
-Ryodo is 34.83 times faster than PublicSuffix.
-```
-```
-Ruby: MRI 2.0.0p247
-ryodo (0.2.4.1)
-public_suffix (1.3.1)
-Machine: AMD Phenom(tm) II X6 1090T, 6 cores, 3.2 GHz; 8 GB RAM
-Linux 3.10.9-1-ARCH x86_64 GNU/Linux
-Benchmark of domain parsing
-===========================
-Number of loops: 1000
-Number of items per loop: 100
-Rehearsal ---------------------------------------------------
-ryodo             2.780000   0.000000   2.780000 (  2.779690)
-public_suffix    83.350000   0.000000  83.350000 ( 83.414578)
------------------------------------------ total: 86.130000sec
-                      user     system      total        real
-ryodo             2.830000   0.000000   2.830000 (  2.834630)
-public_suffix    83.450000   0.000000  83.450000 ( 83.510037)
-Ryodo vs. PublicSuffix
-Ryodo is 29.46 times faster than PublicSuffix.
-```
-Interestingly the public_suffix gem got even slower over time (and/or ruby versions)
-compared to my first benchmark (<http://codecraft.io/2012/06/02/ryodo-domain-parser/>).
-## TODO
-Lot of specs missing, this first version of second approach was developed in playground mode. ;o)
 ## Foo …
@@ -234,9 +152,8 @@ Lot of specs missing, this first version of second approach was developed in pla
 "Uh, excuse me Sir … just one more question." — Columbo (Peter Falk †)
 ## License
-MIT/X11 — see [`LICENSE`](./LICENSE)
+[MIT/X11](./LICENSE)
-(c) 2012—2014 Christoph Grabo
+2012—2015 Christoph Grabo

data/Rakefile CHANGED

@@ -1,36 +1,36 @@
-# coding: utf-8
 require "rspec/core/rake_task"
 require "bundler/gem_tasks"
 desc "Starts PRY with gem loaded"
 task :pry do
   sh "pry -I lib -r ryodo --no-pager"
 end
 desc "Run all specs"
 task RSpec::Core::RakeTask.new(:spec) do |t|
-  t.pattern = 'spec/**/*_spec.rb'
+  t.pattern = "spec/**/*_spec.rb"
   t.verbose = false
 end
 namespace :spec do
   desc "Fetch mozilla_effective_tld_names.dat for specs"
   task :fetch_data do
     system "wget http://mxr.mozilla.org/mozilla-central/source/netwerk/dns/effective_tld_names.dat\?raw\=1 -O spec/_files/mozilla_effective_tld_names.dat"
   end
-end
+  desc "Run match check script"
+  task :check do
+    success = system("bundle exec spec/suffix_checker.rb")
+    exit(success)
+  end
+end
 desc "Fetch and save public suffix data (task for updates)"
 task :fetch_data do
-  $: << "lib"
+  $LOAD_PATH << "lib"
   require "ryodo"
   require "ryodo/suffix_list_fetcher"
   Ryodo::SuffixListFetcher.fetch_and_save!
 end
-task :default => :spec
+task default: [:spec, "spec:check"]

data/data/suffix.dat CHANGED

@@ -1,3 +1,4 @@
+abb
 abbott
 abogado
 ac
@@ -9,13 +10,18 @@ ac.net
 ac.org
 academy
 accenture
+accountant
 accountants
+aco
 active
 actor
 ad
 ad.nom
+ads
+adult
 ae
 ae.ac
+ae.blogspot
 ae.co
 ae.gov
 ae.mil
@@ -118,6 +124,7 @@ af.edu
 af.gov
 af.net
 af.org
+afl
 africa
 ag
 ag.co
@@ -131,7 +138,9 @@ ai.com
 ai.net
 ai.off
 ai.org
+aig
 airforce
+airtel
 al
 al.com
 al.edu
@@ -139,6 +148,8 @@ al.gov
 al.mil
 al.net
 al.org
+alibaba
+alipay
 allfinanz
 alsace
 am
@@ -148,7 +159,9 @@ an.com
 an.edu
 an.net
 an.org
+analytics
 android
+anquan
 ao
 ao.co
 ao.ed
@@ -156,6 +169,7 @@ ao.gv
 ao.it
 ao.og
 ao.pb
+apartments
 aq
 aquarelle
 ar
@@ -169,6 +183,7 @@ ar.mil
 ar.net
 ar.org
 ar.tur
+aramco
 archi
 army
 arpa
@@ -178,6 +193,7 @@ arpa.ip6
 arpa.iris
 arpa.uri
 arpa.urn
+arte
 as
 as.gov
 asia
@@ -227,7 +243,10 @@ au.vic
 au.wa
 auction
 audio
+author
+auto
 autos
+avianca
 aw
 aw.com
 ax
@@ -245,6 +264,7 @@ az.net
 az.org
 az.pp
 az.pro
+azure
 ba
 ba.co
 ba.com
@@ -256,9 +276,13 @@ ba.org
 ba.rs
 ba.unbi
 ba.unsa
+baidu
 band
+bank
 bar
 barcelona
+barclaycard
+barclays
 bargains
 bauhaus
 bayern
@@ -273,12 +297,15 @@ bb.net
 bb.org
 bb.store
 bb.tv
+bbc
+bbva
 bcn
 bd.*
 be
 be.ac
 be.blogspot
 beer
+bentley
 berlin
 best
 bf
@@ -336,6 +363,8 @@ bi.org
 bible
 bid
 bike
+bing
+bingo
 bio
 biz
 biz.dyndns
@@ -360,6 +389,7 @@ bm.edu
 bm.gov
 bm.net
 bm.org
+bms
 bmw
 bn.*
 bnl
@@ -374,8 +404,12 @@ bo.mil
 bo.net
 bo.org
 bo.tv
+boats
+bom
 bond
 boo
+boots
+bot
 boutique
 br
 br.adm
@@ -449,6 +483,10 @@ br.vet
 br.vlog
 br.wiki
 br.zlg
+bradesco
+bridgestone
+broadway
+broker
 brussels
 bs
 bs.com
@@ -466,6 +504,7 @@ budapest
 build
 builders
 business
+buy
 buzz
 bv
 bw
@@ -504,19 +543,24 @@ ca.sk
 ca.yk
 cab
 cal
+call
 camera
 camp
 cancerresearch
+canon
 capetown
 capital
+car
 caravan
 cards
 care
 career
 careers
+cars
 cartier
 casa
 cash
+casino
 cat
 catering
 cba
@@ -534,11 +578,14 @@ cern
 cf
 cf.blogspot
 cfa
+cfd
 cg
 ch
 ch.blogspot
 channel
+chat
 cheap
+chloe
 christmas
 chrome
 church
@@ -558,8 +605,11 @@ ci.net
 ci.or
 ci.org
 ci.presse
+circle
+cisco
 citic
 city
+cityeats
 ck.!www
 ck.*
 cl
@@ -639,11 +689,13 @@ co.nom
 co.org
 co.rec
 co.web
+coach
 codes
 coffee
 college
 cologne
 com
+com.1kapp
 com.africa
 com.amazonaws.compute
 com.amazonaws.compute-1
@@ -652,6 +704,7 @@ com.amazonaws.compute-1.z-2
 com.amazonaws.compute.ap-northeast-1
 com.amazonaws.compute.ap-southeast-1
 com.amazonaws.compute.ap-southeast-2
+com.amazonaws.compute.eu-central-1
 com.amazonaws.compute.eu-west-1
 com.amazonaws.compute.sa-east-1
 com.amazonaws.compute.us-gov-west-1
@@ -777,6 +830,7 @@ com.gotdns
 com.gr
 com.herokuapp
 com.herokussl
+com.hk
 com.hobby-site
 com.homelinux
 com.homeunix
@@ -850,6 +904,7 @@ com.nfshost
 com.no
 com.operaunite
 com.outsystemscloud
+com.pagespeedmobilizer
 com.qc
 com.rhcloud
 com.ro
@@ -862,11 +917,13 @@ com.sells-for-less
 com.sells-for-u
 com.servebbs
 com.simple-url
+com.sinaapp
 com.space-to-rent
 com.teaches-yoga
 com.uk
 com.us
 com.uy
+com.vipsinaapp
 com.withgoogle
 com.writesthisblog
 com.yolasite
@@ -875,14 +932,18 @@ commbank
 community
 company
 computer
+comsec
 condos
 construction
 consulting
+contact
 contractors
 cooking
 cool
 coop
+corsica
 country
+courses
 cr
 cr.ac
 cr.co
@@ -893,8 +954,12 @@ cr.or
 cr.sa
 credit
 creditcard
+creditunion
+cricket
+crown
 crs
 cruises
+csc
 cu
 cu.com
 cu.edu
@@ -915,14 +980,17 @@ cx.ath
 cx.gov
 cy.*
 cymru
+cyou
 cz
 cz.blogspot
 dabur
 dad
 dance
+date
 dating
 datsun
 day
+dclk
 de
 de.blogspot
 de.com
@@ -932,12 +1000,17 @@ de.istmein
 de.lebtimnetz
 de.leitungsen
 de.traeumtgerade
+dealer
 deals
 degree
+delivery
+dell
 democrat
 dental
 dentist
 desi
+design
+dev
 diamonds
 diet
 digital
@@ -965,8 +1038,13 @@ do.net
 do.org
 do.sld
 do.web
+docs
+dog
+doha
 domains
 doosan
+download
+dubai
 durban
 dvag
 dz
@@ -978,6 +1056,7 @@ dz.gov
 dz.net
 dz.org
 dz.pol
+earth
 eat
 ec
 ec.com
@@ -992,6 +1071,7 @@ ec.mil
 ec.net
 ec.org
 ec.pro
+edeka
 edu
 education
 ee
@@ -1017,9 +1097,11 @@ eg.org
 eg.sci
 email
 emerck
+energy
 engineer
 engineering
 enterprises
+epson
 equipment
 er.*
 erni
@@ -1048,30 +1130,44 @@ everbank
 exchange
 expert
 exposed
+fage
 fail
+fairwinds
+faith
 fan
+fans
 farm
 fashion
+fast
 feedback
+ferrero
 fi
 fi.aland
 fi.blogspot
 fi.iki
+film
+final
 finance
 financial
+firestone
 firmdale
 fish
 fishing
+fit
 fitness
 fj.*
 fk.*
 flights
 florist
+flowers
 flsmidth
 fly
 fm
 fo
 foo
+football
+ford
+forex
 forsale
 foundation
 fr
@@ -1120,6 +1216,7 @@ ge.mil
 ge.net
 ge.org
 ge.pvt
+gea
 gent
 gf
 gg
@@ -1143,6 +1240,7 @@ gi.org
 gift
 gifts
 gives
+giving
 gl
 glass
 gle
@@ -1159,8 +1257,14 @@ gn.edu
 gn.gov
 gn.net
 gn.org
+gold
+goldpoint
+golf
+goo
+goog
 google
 gop
+got
 gov
 gp
 gp.asso
@@ -1192,6 +1296,7 @@ gt.mil
 gt.net
 gt.org
 gu.*
+gucci
 guge
 guide
 guitars
@@ -1202,12 +1307,14 @@ gy.co
 gy.com
 gy.net
 hamburg
+hangout
 haus
 healthcare
 help
 here
 hermes
 hiphop
+hitachi
 hiv
 hk
 hk.blogspot
@@ -1215,6 +1322,8 @@ hk.com
 hk.edu
 hk.gov
 hk.idv
+hk.inc
+hk.ltd
 hk.net
 hk.org
 hk.个人
@@ -1243,9 +1352,11 @@ hn.org
 holdings
 holiday
 homes
+honda
 horse
 host
 hosting
+hotmail
 house
 how
 hr
@@ -1253,6 +1364,7 @@ hr.com
 hr.from
 hr.iz
 hr.name
+hsbc
 ht
 ht.adult
 ht.art
@@ -1305,6 +1417,8 @@ hu.tozsde
 hu.utazas
 hu.video
 ibm
+ice
+icu
 id
 id.ac
 id.biz
@@ -1774,13 +1888,17 @@ it.vr
 it.vs
 it.vt
 it.vv
+itau
 iwc
+jaguar
 java
+jcb
 je
 je.co
 je.net
 je.org
 jetzt
+jlc
 jm.*
 jo
 jo.com
@@ -1793,6 +1911,8 @@ jo.org
 jo.sch
 jobs
 joburg
+jot
+joy
 jp
 jp.ac
 jp.ad
@@ -3542,9 +3662,59 @@ jp.yamanashi.yamanakako
 jp.yamanashi.yamanashi
 jp.yokohama.!city
 jp.yokohama.*
+jp.三重
+jp.京都
+jp.佐賀
+jp.兵庫
+jp.北海道
+jp.千葉
+jp.和歌山
+jp.埼玉
+jp.大分
+jp.大阪
+jp.奈良
+jp.宮城
+jp.宮崎
+jp.富山
+jp.山口
+jp.山形
+jp.山梨
+jp.岐阜
+jp.岡山
+jp.岩手
+jp.島根
+jp.広島
+jp.徳島
+jp.愛媛
+jp.愛知
+jp.新潟
+jp.東京
+jp.栃木
+jp.沖縄
+jp.滋賀
+jp.熊本
+jp.石川
+jp.神奈川
+jp.福井
+jp.福岡
+jp.福島
+jp.秋田
+jp.群馬
+jp.茨城
+jp.長崎
+jp.長野
+jp.青森
+jp.静岡
+jp.香川
+jp.高知
+jp.鳥取
+jp.鹿児島
+jprs
 juegos
 kaufen
+kddi
 ke.*
+kfh
 kg
 kg.com
 kg.edu
@@ -3562,6 +3732,7 @@ ki.info
 ki.net
 ki.org
 kim
+kinder
 kitchen
 kiwi
 km
@@ -3588,6 +3759,7 @@ kn.gov
 kn.net
 kn.org
 koeln
+komatsu
 kp
 kp.com
 kp.edu
@@ -3595,6 +3767,7 @@ kp.gov
 kp.org
 kp.rep
 kp.tra
+kpn
 kr
 kr.ac
 kr.blogspot
@@ -3635,6 +3808,7 @@ ky.edu
 ky.gov
 ky.net
 ky.org
+kyoto
 kz
 kz.com
 kz.edu
@@ -3654,7 +3828,10 @@ la.org
 la.per
 lacaixa
 land
+landrover
+lat
 latrobe
+law
 lawyer
 lb
 lb.com
@@ -3672,13 +3849,22 @@ lc.org
 lds
 lease
 leclerc
+legal
 lgbt
 li
+liaison
+lidl
 life
+lifeinsurance
+lifestyle
 lighting
+like
 limited
 limo
+lincoln
+linde
 link
+live
 lk
 lk.assn
 lk.com
@@ -3694,9 +3880,12 @@ lk.org
 lk.sch
 lk.soc
 lk.web
+loan
 loans
 london
+lotte
 lotto
+love
 lr
 lr.com
 lr.edu
@@ -3708,8 +3897,10 @@ ls.co
 ls.org
 lt
 lt.gov
+ltd
 ltda
 lu
+lupin
 luxe
 luxury
 lv
@@ -3740,11 +3931,16 @@ ma.net
 ma.org
 ma.press
 madrid
+maif
 maison
+makeup
+man
 management
 mango
 market
 marketing
+markets
+marriott
 mc
 mc.asso
 mc.tm
@@ -3762,7 +3958,9 @@ media
 meet
 melbourne
 meme
+memorial
 menu
+meo
 mg
 mg.com
 mg.edu
@@ -3774,6 +3972,7 @@ mg.prd
 mg.tm
 mh
 miami
+microsoft
 mil
 mini
 mk
@@ -3793,6 +3992,7 @@ ml.net
 ml.org
 ml.presse
 mm.*
+mma
 mn
 mn.edu
 mn.gov
@@ -3805,15 +4005,19 @@ mo.gov
 mo.net
 mo.org
 mobi
+mobily
 moda
 moe
+moi
 monash
+money
 montblanc
 mormon
 mortgage
 moscow
 motorcycles
 mov
+movistar
 mp
 mq
 mr
@@ -3830,6 +4034,8 @@ mt.com
 mt.edu
 mt.net
 mt.org
+mtn
+mtpc
 mu
 mu.ac
 mu.co
@@ -4449,6 +4655,7 @@ na.school
 na.tv
 na.us
 na.ws
+nadex
 nagoya
 name
 name.her.forgot
@@ -4457,6 +4664,7 @@ navy
 nc
 nc.asso
 ne
+nec
 net
 net.at-band-camp
 net.azure-mobile
@@ -4513,6 +4721,7 @@ netbank
 network
 neustar
 new
+news
 nexus
 nf
 nf.arts
@@ -4538,6 +4747,7 @@ ng.sch
 ngo
 nhk
 ni.*
+nico
 ninja
 nissan
 nl
@@ -5300,6 +5510,9 @@ no.øyer
 no.øygarden
 no.øystre-slidre
 no.čáhcesuolo
+nokia
+norton
+nowruz
 np.*
 nr
 nr.biz
@@ -5311,6 +5524,7 @@ nr.net
 nr.org
 nra
 nrw
+ntt
 nu
 nu.merseine
 nu.mine
@@ -5334,6 +5548,7 @@ nz.net
 nz.org
 nz.parliament
 nz.school
+obi
 okinawa
 om
 om.co
@@ -5345,8 +5560,11 @@ om.museum
 om.net
 om.org
 om.pro
+omega
+one
 ong
 onl
+online
 ooo
 oracle
 org
@@ -5369,6 +5587,7 @@ org.endoftheinternet
 org.from-me
 org.game-host
 org.gotdns
+org.hk
 org.hobby-site
 org.homedns
 org.homeftp
@@ -5406,6 +5625,7 @@ org.us
 org.webhop
 org.za
 organic
+osaka
 otsuka
 ovh
 pa
@@ -5420,9 +5640,13 @@ pa.net
 pa.nom
 pa.org
 pa.sld
+page
+panerai
 paris
+pars
 partners
 parts
+party
 pe
 pe.com
 pe.edu
@@ -5446,13 +5670,17 @@ ph.net
 ph.ngo
 ph.org
 pharmacy
+philips
 photo
 photography
 photos
 physio
+piaget
 pics
 pictet
 pictures
+pid
+pin
 pink
 pizza
 pk
@@ -5471,7 +5699,6 @@ pk.net
 pk.org
 pk.web
 pl
-pl.6bone
 pl.agro
 pl.aid
 pl.art
@@ -5520,7 +5747,6 @@ pl.grajewo
 pl.gsm
 pl.ilawa
 pl.info
-pl.irc
 pl.jaworzno
 pl.jelenia-gora
 pl.jgora
@@ -5553,7 +5779,6 @@ pl.malbork
 pl.malopolska
 pl.mazowsze
 pl.mazury
-pl.mbone
 pl.med
 pl.media
 pl.miasta
@@ -5563,7 +5788,6 @@ pl.mil
 pl.mragowo
 pl.naklo
 pl.net
-pl.ngo
 pl.nieruchomosci
 pl.nom
 pl.nowaruda
@@ -5604,7 +5828,6 @@ pl.sanok
 pl.sejny
 pl.sex
 pl.shop
-pl.siedlce
 pl.sklep
 pl.skoczow
 pl.slask
@@ -5631,7 +5854,6 @@ pl.travel
 pl.turek
 pl.turystyka
 pl.tychy
-pl.usenet
 pl.ustka
 pl.walbrzych
 pl.warmia
@@ -5662,6 +5884,7 @@ pn.net
 pn.org
 pohl
 poker
+porn
 post
 pr
 pr.ac
@@ -5690,6 +5913,7 @@ pro.med
 prod
 productions
 prof
+promo
 properties
 property
 ps
@@ -5737,26 +5961,33 @@ qa.org
 qa.sch
 qpon
 quebec
+racing
 re
 re.asso
 re.blogspot
 re.com
 re.nom
+read
 realtor
 recipes
 red
+redstone
 rehab
 reise
 reisen
+reit
 ren
+rent
 rentals
 repair
 report
 republican
 rest
 restaurant
+review
 reviews
 rich
+ricoh
 rio
 rip
 ro
@@ -5772,8 +6003,10 @@ ro.rec
 ro.store
 ro.tm
 ro.www
+rocher
 rocks
 rodeo
+room
 rs
 rs.ac
 rs.co
@@ -5794,6 +6027,7 @@ ru.baikal
 ru.bashkiria
 ru.belgorod
 ru.bir
+ru.blogspot
 ru.bryansk
 ru.buryatia
 ru.cbg
@@ -5848,7 +6082,6 @@ ru.mari-el
 ru.marine
 ru.mil
 ru.mordovia
-ru.mosreg
 ru.msk
 ru.murmansk
 ru.mytis
@@ -5937,15 +6170,26 @@ sa.org
 sa.pub
 sa.sch
 saarland
+safe
+safety
+sakura
+sale
+salon
 samsung
+sandvik
+sandvikcoromant
+sanofi
 sap
+sapo
 sarl
+saxo
 sb
 sb.com
 sb.edu
 sb.gov
 sb.net
 sb.org
+sbs
 sc
 sc.com
 sc.edu
@@ -5956,7 +6200,11 @@ sca
 scb
 schmidt
 scholarships
+school
 schule
+schwarz
+science
+scor
 scot
 sd
 sd.com
@@ -6010,8 +6258,11 @@ se.x
 se.y
 se.z
 seat
+seek
+sener
 services
 sew
+sex
 sexy
 sg
 sg.blogspot
@@ -6027,16 +6278,22 @@ sh.gov
 sh.mil
 sh.net
 sh.org
+sh.platform.*
 sharp
+shia
 shiksha
 shoes
+shouji
 shriram
 si
 singles
+site
 sj
 sk
 sk.blogspot
+skin
 sky
+skype
 sl
 sl.com
 sl.edu
@@ -6044,6 +6301,7 @@ sl.gov
 sl.net
 sl.org
 sm
+smile
 sn
 sn.art
 sn.com
@@ -6061,9 +6319,11 @@ software
 sohu
 solar
 solutions
+sony
 soy
 space
 spiegel
+spreadbetting
 sr
 st
 st.co
@@ -6078,7 +6338,17 @@ st.org
 st.principe
 st.saotome
 st.store
+stada
+star
+statoil
+stc
+stcgroup
+stockholm
+storage
+study
+style
 su
+sucks
 supplies
 supply
 support
@@ -6091,6 +6361,8 @@ sv.edu
 sv.gob
 sv.org
 sv.red
+swatch
+swiss
 sx
 sx.gov
 sy
@@ -6100,21 +6372,28 @@ sy.gov
 sy.mil
 sy.net
 sy.org
+sydney
+symantec
 systems
 sz
 sz.ac
 sz.co
 sz.org
+tab
 taipei
+taobao
 tatar
 tattoo
 tax
 tc
+tci
 td
 td.blogspot
 technology
 tel
+telefonica
 temasek
+tennis
 tf
 tg
 th
@@ -6127,6 +6406,7 @@ th.net
 th.or
 tienda
 tips
+tires
 tirol
 tj
 tj.ac
@@ -6156,6 +6436,7 @@ tm.mil
 tm.net
 tm.nom
 tm.org
+tmall
 tn
 tn.agrinet
 tn.com
@@ -6188,7 +6469,9 @@ today
 tokyo
 tools
 top
+toray
 toshiba
+tours
 town
 toys
 tp
@@ -6198,6 +6481,7 @@ tr.bbs
 tr.bel
 tr.biz
 tr.com
+tr.com.blogspot
 tr.dr
 tr.edu
 tr.gen
@@ -6216,8 +6500,10 @@ tr.tel
 tr.tv
 tr.web
 trade
+trading
 training
 travel
+trust
 tt
 tt.aero
 tt.biz
@@ -6237,6 +6523,7 @@ tt.org
 tt.pro
 tt.travel
 tui
+tushu
 tv
 tv.better-than
 tv.dyndns
@@ -6349,6 +6636,7 @@ ua.zhitomir
 ua.zhytomyr
 ua.zp
 ua.zt
+ubs
 ug
 ug.ac
 ug.co
@@ -6616,6 +6904,7 @@ uz.net
 uz.org
 va
 vacations
+vana
 vc
 vc.com
 vc.edu
@@ -6655,8 +6944,14 @@ vi.k12
 vi.net
 vi.org
 viajes
+video
 villas
+vip
+virgin
 vision
+vista
+vistaprint
+viva
 vlaanderen
 vn
 vn.ac
@@ -6682,8 +6977,12 @@ vu.edu
 vu.net
 vu.org
 wales
+walter
 wang
+wanggou
 watch
+watches
+weather
 webcam
 website
 wed
@@ -6693,6 +6992,8 @@ whoswho
 wien
 wiki
 williamhill
+win
+windows
 wme
 work
 works
@@ -6707,21 +7008,32 @@ ws.net
 ws.org
 wtc
 wtf
+xbox
+xerox
+xihuan
+xin
 xxx
 xyz
 yachts
+yamaxun
 yandex
 ye.*
+yodobashi
 yoga
 yokohama
 youtube
 yt
+yun
 za.*
+zara
+zero
 zip
 zm.*
 zone
+zuerich
 zw.*
 дети
+ком
 мон
 москва
 онлайн
@@ -6738,6 +7050,8 @@ zw.*
 срб.упр
 укр
 қаз
+קום
+ارامكو
 الاردن
 الجزائر
 السعودية
@@ -6750,6 +7064,7 @@ zw.*
 ايران
 ایران
 بازار
+بيتك
 بھارت
 تونس
 سوريا
@@ -6758,9 +7073,14 @@ zw.*
 عمان
 فلسطين
 قطر
+كوم
 مصر
 مليسيا
+موبايلي
 موقع
+همراه
+कॉम
+नेट
 भारत
 संगठन
 বাংলা
@@ -6772,10 +7092,13 @@ zw.*
 சிங்கப்பூர்
 భారత్
 ලංකා
+คอม
 ไทย
 გე
 みんな
 グーグル
+コム
+ポイント
 世界
 中信
 中国
@@ -6783,6 +7106,8 @@ zw.*
 中文网
 企业
 佛山
+信息
+健康
 八卦
 公司
 公益
@@ -6792,11 +7117,13 @@ zw.*
 商店
 商标
 在线
+大拿
 娱乐
 广东
 慈善
 我爱你
 手机
+手表
 政务
 政府
 新加坡
@@ -6805,14 +7132,22 @@ zw.*
 机构
 淡马锡
 游戏
+点看
+珠宝
 移动
 组织机构
 网址
 网店
+网站
 网络
 臺灣
+诺基亚
 谷歌
 集团
+飞利浦
+餐厅
 香港
+닷넷
+닷컴
 삼성
 한국