ryodo 0.2.4.1 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f46d8b24a8bd695cfc6f4841d3825be3a4cb417c
-  data.tar.gz: da363e80c452085a77d24b04bb06a70762477965
+  metadata.gz: 1de472c68281d0e6f6e1585d8882710fd3273df5
+  data.tar.gz: 2da982137a2656138a389153d4267eb96641f581
 SHA512:
-  metadata.gz: 761feba4fc480e250399ad83cc43497d843e6549b7edf42c374a3920b1d7b21446ea82ea203300b0a63c17ede36d2c86cc32ae6c48dbd749ef337fa2b19c3928
-  data.tar.gz: 8e87dda60e727d9e6bb0d001d14444e01854ff54399ed34eb70acf5239a5caf9ba57dd17dd5552402123eb21329c1420d0dc2cf13bc13022b9e0f818bdb4277a
+  metadata.gz: 1bf5c710c42a89abd427ad9153d491575fca25e21ad3608be1b2a0a5dc7f4fd977e2cf1ca642199988def24e404fa9d6d9c76bea83a159fc1dadf348abe884a7
+  data.tar.gz: ca85268796b2a7f42e7ec302b673e868fffca2dc2e2a38960537656914ca6e06195dfbc915d8b159922051bb8096382fbd2941b049edda629f10e079e8ff894d

data/.gitignore

@@ -3,8 +3,12 @@
 *.so
 .bundle
 .config
-coverage
+.yardoc
+Gemfile.lock
 InstalledFiles
+_yardoc
+coverage
+doc/
 lib/bundler/man
 pkg
 rdoc
@@ -12,8 +16,3 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-
-# YARD artifacts
-.yardoc
-_yardoc
-doc/

data/Gemfile.lock

@@ -1,39 +1,58 @@
 PATH
   remote: .
   specs:
-    ryodo (0.2.4.1)
+    ryodo (0.2.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    coderay (1.0.8)
-    diff-lcs (1.1.3)
+    coderay (1.0.9)
+    coveralls (0.7.0)
+      multi_json (~> 1.3)
+      rest-client
+      simplecov (>= 0.7)
+      term-ansicolor
+      thor
+    diff-lcs (1.2.4)
     fakeweb (1.3.0)
-    method_source (0.8.1)
-    pry (0.9.11.4)
+    method_source (0.8.2)
+    mime-types (1.25)
+    multi_json (1.8.1)
+    pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    pry-doc (0.4.4)
-      pry (>= 0.9.9.6)
-      yard (~> 0.8.1)
-    rake (10.0.3)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.2)
-    slop (3.4.3)
-    yard (0.8.3)
+    pry-doc (0.4.6)
+      pry (>= 0.9)
+      yard (>= 0.8)
+    rake (10.1.0)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.3)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.3)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    slop (3.4.6)
+    term-ansicolor (1.2.2)
+      tins (~> 0.8)
+    thor (0.18.1)
+    tins (0.12.0)
+    yard (0.8.7.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 1.3)
+  coveralls
   fakeweb
   pry
   pry-doc

data/README.md

@@ -1,4 +1,6 @@
-# ryodo [![](https://secure.travis-ci.org/asaaki/ryodo.png)](http://travis-ci.org/asaaki/ryodo)
+# 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)
 
 **ryōdo【領土】 りょうど — A domain name parser using public suffix list**
 
@@ -11,6 +13,8 @@ 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/)
+
 
 ## Usage
 
@@ -137,7 +141,7 @@ gem "ryodo", :require => ["ryodo", "ryodo/ext/uri"]
 
 ## Benchmark
 
-There is another gem called [public_suffix](https://github.com/weppos/public_suffix_service), which does nearly the same (maybe with more features I don't need).
+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.
 
@@ -149,63 +153,73 @@ 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).
 
-Finally 72 entries to check.
-
-Ruby: 1.9.3-p194, no special patches
-
 We only do a basic parsing and retrieve the registered/registrable domain. (Should hit the most important code of the gems.)
 
-**Test script snippet**
-
-```ruby
-# DOMAINS is the array of domain entries - shuffled on every benchmark run
+The benchmark script can be found at [checks/benchmark.rb (branch: prof)](./blob/prof/checks/benchmark.rb).
 
-LOOPS = 1_000
+**Notes**
 
-Benchmark.bmbm do |b|
+`PublicSuffix.parse(…)` will raise errors if domain input is invalid (e.g. not a registrable domain).
 
-  b.report "ryodo" do
-    LOOPS.times do
-      DOMAINS.each do |domain|
-        Ryodo.parse(domain).domain # returns nil if not valid
-      end
-    end
-  end
+`Ryodo.parse(…)` won't raise but return nil values for invalid stuff (it only raises if input is not a String, of course).
 
-  b.report "public_suffix" do
-    LOOPS.times do
-      DOMAINS.each do |domain|
-        PublicSuffix.parse(domain).domain rescue nil # it raises if not valid in any way, so we rescue it
-      end
-    end
-  end
+**Results**
 
-end
 ```
+Ruby: MRI 2.0.0-p247
+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
 
-**Caveats**
+Benchmark of domain parsing
+===========================
 
-`PublicSuffix.parse(…)` will raise errors if domain input is invalid (e.g. not a registrable domain).
+Number of loops: 1000
+Number of items per loop: 100
 
-`Ryodo.parse(…)` won't raise but return nil values for invalid stuff (it only raises if input is not a String, of course).
+Rehearsal ---------------------------------------------------
+ryodo             2.780000   0.000000   2.780000 (  2.779690)
+public_suffix    83.350000   0.000000  83.350000 ( 83.414578)
+----------------------------------------- total: 86.130000sec
 
-**Result**
+                      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.
 
 ```
-Rehearsal -------------------------------------------------
-ryodo           1.800000   0.000000   1.800000 (  1.809521)
-public_suffix  21.880000   0.020000  21.900000 ( 21.907808)
---------------------------------------- total: 23.700000sec
-
-                    user     system      total        real
-ryodo           1.770000   0.000000   1.770000 (  1.769734)
-public_suffix  22.320000   0.010000  22.330000 ( 22.346013)
+
 ```
+Ruby: MRI 1.9.3-p448
+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
 
-As you can see, Ryodo is more than **10 times faster**.
+Rehearsal ---------------------------------------------------
+ryodo             2.640000   0.000000   2.640000 (  2.642131)
+public_suffix    80.710000   0.010000  80.720000 ( 80.770868)
+----------------------------------------- total: 83.360000sec
 
-_(Funfact: My first approach was 6 times slower — improvement factor of 60!)_
+                      user     system      total        real
+ryodo             2.670000   0.000000   2.670000 (  2.664983)
+public_suffix    80.930000   0.020000  80.950000 ( 80.998667)
 
+Ryodo is 30.39 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/>).
 
 
 
@@ -226,3 +240,7 @@ Lot of specs missing, this first version of second approach was developed in pla
 MIT/X11 — see [`LICENSE`](./LICENSE)
 
 (c) 2012—2013 Christoph Grabo
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/asaaki/ryodo/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+

data/Rakefile

@@ -1,24 +1,11 @@
 # coding: utf-8
-
 require "rubygems"
 require "bundler"
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require "rake"
-require "rspec"
+Bundler.setup(:default, :development)
 require "rspec/core/rake_task"
+require "bundler/gem_tasks"
 
 
-desc "Starts IRB with gem loaded"
-task :irb do
-  sh "irb -I lib -r ryodo"
-end
-
 desc "Starts PRY with gem loaded"
 task :pry do
   sh "pry -I lib -r ryodo --no-pager"
@@ -41,31 +28,4 @@ task :fetch_data do
 end
 
 
-namespace :gem do
-  $: << "lib"
-  require "ryodo/version"
-
-  task :tag do
-    system "git tag -f v#{Ryodo::VERSION} && git push --tags -f"
-  end
-
-  task :build do
-    system "rm *.gem"
-    system "gem build ryodo.gemspec"
-  end
-
-  task :push => "gem:build" do
-    system "gem push ryodo-#{Ryodo::VERSION}.gem"
-  end
-
-  task :clean do
-    system "rm *.gem"
-  end
-
-  desc "Publish gem to rubygems.org"
-  task :publish => ["gem:tag","gem:push","gem:clean"]
-
-end
-
-
 task :default => :spec

data/checks/matching.rb

@@ -23,21 +23,16 @@ checkPublicSuffix('.com', 'NULL')
 checkPublicSuffix('.example', 'NULL')
 checkPublicSuffix('.example.com', 'NULL')
 checkPublicSuffix('.example.example', 'NULL')
-#Trailing dot (FQDN).
-checkPublicSuffix('com.', 'NULL')
-checkPublicSuffix('example.com.', 'example.com')
-checkPublicSuffix('www.example.com.', 'example.com')
-checkPublicSuffix('www.subdomain.example.com.', 'example.com')
 # Unlisted TLD.
 checkPublicSuffix('example', 'NULL')
-checkPublicSuffix('example.example', 'NULL')
-checkPublicSuffix('b.example.example', 'NULL')
-checkPublicSuffix('a.b.example.example', 'NULL')
+checkPublicSuffix('example.example', 'example.example')
+checkPublicSuffix('b.example.example', 'example.example')
+checkPublicSuffix('a.b.example.example', 'example.example')
 # Listed, but non-Internet, TLD.
-checkPublicSuffix('local', 'NULL')
-checkPublicSuffix('example.local', 'NULL')
-checkPublicSuffix('b.example.local', 'NULL')
-checkPublicSuffix('a.b.example.local', 'NULL')
+#checkPublicSuffix('local', 'NULL')
+#checkPublicSuffix('example.local', 'NULL')
+#checkPublicSuffix('b.example.local', 'NULL')
+#checkPublicSuffix('a.b.example.local', 'NULL')
 # TLD with only 1 rule.
 checkPublicSuffix('biz', 'NULL')
 checkPublicSuffix('domain.biz', 'domain.biz')
@@ -66,20 +61,22 @@ checkPublicSuffix('ac.jp', 'NULL')
 checkPublicSuffix('test.ac.jp', 'test.ac.jp')
 checkPublicSuffix('www.test.ac.jp', 'test.ac.jp')
 checkPublicSuffix('kyoto.jp', 'NULL')
-checkPublicSuffix('c.kyoto.jp', 'NULL')
-checkPublicSuffix('b.c.kyoto.jp', 'b.c.kyoto.jp')
-checkPublicSuffix('a.b.c.kyoto.jp', 'b.c.kyoto.jp')
-checkPublicSuffix('pref.kyoto.jp', 'pref.kyoto.jp')  # Exception rule.
-checkPublicSuffix('www.pref.kyoto.jp', 'pref.kyoto.jp')  # Exception rule.
-checkPublicSuffix('city.kyoto.jp', 'city.kyoto.jp')  # Exception rule.
-checkPublicSuffix('www.city.kyoto.jp', 'city.kyoto.jp')  # Exception rule.
+checkPublicSuffix('test.kyoto.jp', 'test.kyoto.jp')
+checkPublicSuffix('ide.kyoto.jp', 'NULL')
+checkPublicSuffix('b.ide.kyoto.jp', 'b.ide.kyoto.jp')
+checkPublicSuffix('a.b.ide.kyoto.jp', 'b.ide.kyoto.jp')
+checkPublicSuffix('c.kobe.jp', 'NULL')
+checkPublicSuffix('b.c.kobe.jp', 'b.c.kobe.jp')
+checkPublicSuffix('a.b.c.kobe.jp', 'b.c.kobe.jp')
+checkPublicSuffix('city.kobe.jp', 'city.kobe.jp')
+checkPublicSuffix('www.city.kobe.jp', 'city.kobe.jp')
 # TLD with a wildcard rule and exceptions.
-checkPublicSuffix('om', 'NULL')
-checkPublicSuffix('test.om', 'NULL')
-checkPublicSuffix('b.test.om', 'b.test.om')
-checkPublicSuffix('a.b.test.om', 'b.test.om')
-checkPublicSuffix('songfest.om', 'songfest.om')
-checkPublicSuffix('www.songfest.om', 'songfest.om')
+checkPublicSuffix('ck', 'NULL')
+checkPublicSuffix('test.ck', 'NULL')
+checkPublicSuffix('b.test.ck', 'b.test.ck')
+checkPublicSuffix('a.b.test.ck', 'b.test.ck')
+checkPublicSuffix('www.ck', 'www.ck')
+checkPublicSuffix('www.www.ck', 'www.ck')
 # US K12.
 checkPublicSuffix('us', 'NULL')
 checkPublicSuffix('test.us', 'test.us')
@@ -90,3 +87,23 @@ checkPublicSuffix('www.test.ak.us', 'test.ak.us')
 checkPublicSuffix('k12.ak.us', 'NULL')
 checkPublicSuffix('test.k12.ak.us', 'test.k12.ak.us')
 checkPublicSuffix('www.test.k12.ak.us', 'test.k12.ak.us')
+# IDN labels.
+checkPublicSuffix('食狮.com.cn', '食狮.com.cn')
+checkPublicSuffix('食狮.公司.cn', '食狮.公司.cn')
+checkPublicSuffix('www.食狮.公司.cn', '食狮.公司.cn')
+checkPublicSuffix('shishi.公司.cn', 'shishi.公司.cn')
+checkPublicSuffix('公司.cn', 'NULL')
+checkPublicSuffix('食狮.中国', '食狮.中国')
+checkPublicSuffix('www.食狮.中国', '食狮.中国')
+checkPublicSuffix('shishi.中国', 'shishi.中国')
+checkPublicSuffix('中国', 'NULL')
+# Same as above, but punycoded.
+# checkPublicSuffix('xn--85x722f.com.cn', 'xn--85x722f.com.cn')
+# checkPublicSuffix('xn--85x722f.xn--55qx5d.cn', 'xn--85x722f.xn--55qx5d.cn')
+# checkPublicSuffix('www.xn--85x722f.xn--55qx5d.cn', 'xn--85x722f.xn--55qx5d.cn')
+# checkPublicSuffix('shishi.xn--55qx5d.cn', 'shishi.xn--55qx5d.cn')
+# checkPublicSuffix('xn--55qx5d.cn', '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')

data/data/suffix.dat

@@ -1,3 +1,4 @@
+TOKYO
 ac
 ac.com
 ac.edu
@@ -5,6 +6,7 @@ ac.gov
 ac.mil
 ac.net
 ac.org
+academy
 ad
 ad.nom
 ae
@@ -188,7 +190,6 @@ au.edu.vic
 au.edu.wa
 au.gov
 au.gov.act
-au.gov.nt
 au.gov.qld
 au.gov.sa
 au.gov.tas
@@ -246,6 +247,7 @@ bd.*
 be
 be.ac
 be.blogspot
+berlin
 bf
 bf.gov
 bg
@@ -297,6 +299,7 @@ bi.com
 bi.edu
 bi.or
 bi.org
+bike
 biz
 biz.dyndns
 biz.for-better
@@ -310,6 +313,7 @@ bj.asso
 bj.barreau
 bj.blogspot
 bj.gouv
+blue
 bm
 bm.com
 bm.edu
@@ -410,6 +414,11 @@ bt.edu
 bt.gov
 bt.net
 bt.org
+build
+builders
+business
+buzz
+buzz
 bw
 bw.co
 bw.org
@@ -442,6 +451,13 @@ ca.pe
 ca.qc
 ca.sk
 ca.yk
+cab
+camera
+camp
+career
+career
+careers
+careers
 cat
 cc
 cc.ftpaccess
@@ -450,6 +466,8 @@ cc.myphotos
 cc.scrapping
 cd
 cd.gov
+center
+ceo
 cf
 cf.blogspot
 cg
@@ -478,6 +496,8 @@ cl.co
 cl.gob
 cl.gov
 cl.mil
+clothing
+club
 cm
 cm.gov
 cn
@@ -539,6 +559,8 @@ co.nom
 co.org
 co.rec
 co.web
+codes
+coffee
 com
 com.amazonaws.compute
 com.amazonaws.compute-1
@@ -757,6 +779,10 @@ com.us
 com.uy
 com.writesthisblog
 com.za
+company
+computer
+construction
+contractors
 coop
 cr
 cr.ac
@@ -786,6 +812,7 @@ cx.gov
 cy.*
 cz
 cz.blogspot
+dance
 de
 de.blogspot
 de.com
@@ -795,6 +822,9 @@ de.istmein
 de.lebtimnetz
 de.leitungsen
 de.traeumtgerade
+democrat
+diamonds
+directory
 dj
 dk
 dk.blogspot
@@ -815,6 +845,7 @@ do.net
 do.org
 do.sld
 do.web
+domains
 dz
 dz.art
 dz.asso
@@ -838,6 +869,7 @@ ec.net
 ec.org
 ec.pro
 edu
+education
 ee
 ee.aip
 ee.com
@@ -859,6 +891,9 @@ eg.name
 eg.net
 eg.org
 eg.sci
+email
+enterprises
+equipment
 er.*
 es
 es.com
@@ -867,14 +902,17 @@ es.edu
 es.gob
 es.nom
 es.org
+estate
 et.*
 eu
+farm
 fi
 fi.aland
 fi.blogspot
 fi.iki
 fj.*
 fk.*
+florist
 fm
 fo
 fr
@@ -902,7 +940,10 @@ fr.prd
 fr.presse
 fr.tm
 fr.veterinaire
+futbol
 ga
+gal
+gallery
 gd
 ge
 ge.com
@@ -915,10 +956,8 @@ ge.pvt
 gf
 gg
 gg.co
-gg.gov
 gg.net
 gg.org
-gg.sch
 gh
 gh.com
 gh.edu
@@ -932,7 +971,9 @@ gi.gov
 gi.ltd
 gi.mod
 gi.org
+gift
 gl
+glass
 gm
 gn.ac
 gn.com
@@ -956,6 +997,7 @@ gr.edu
 gr.gov
 gr.net
 gr.org
+graphics
 gs
 gt
 gt.com
@@ -966,6 +1008,8 @@ gt.mil
 gt.net
 gt.org
 gu.*
+guide
+guru
 gw
 gy
 gy.co
@@ -1002,6 +1046,9 @@ hn.gob
 hn.mil
 hn.net
 hn.org
+holdings
+holiday
+house
 hr
 hr.com
 hr.from
@@ -1079,10 +1126,12 @@ im.ac
 im.co
 im.co.ltd
 im.co.plc
-im.gov
+im.com
 im.net
-im.nic
 im.org
+im.tt
+im.tv
+immobilien
 in
 in.ac
 in.blogspot
@@ -1108,8 +1157,10 @@ info.here-for-more
 info.knowsitall
 info.selfip
 info.webhop
+institute
 int
 int.eu
+international
 io
 io.com
 io.github
@@ -1132,6 +1183,7 @@ ir.ايران
 ir.ایران
 is
 is.com
+is.cupcake
 is.edu
 is.gov
 is.int
@@ -1418,10 +1470,8 @@ it.vt
 it.vv
 je
 je.co
-je.gov
 je.net
 je.org
-je.sch
 jm.*
 jo
 jo.com
@@ -3184,6 +3234,7 @@ jp.yamanashi.yamanakako
 jp.yamanashi.yamanashi
 jp.yokohama.!city
 jp.yokohama.*
+kaufen
 ke.*
 kg
 kg.com
@@ -3201,6 +3252,9 @@ ki.gov
 ki.info
 ki.net
 ki.org
+kim
+kitchen
+kiwi
 km
 km.ass
 km.asso
@@ -3285,6 +3339,7 @@ la.int
 la.net
 la.org
 la.per
+land
 lb.com
 lb.edu
 lb.gov
@@ -3298,6 +3353,8 @@ lc.gov
 lc.net
 lc.org
 li
+lighting
+limo
 lk
 lk.assn
 lk.com
@@ -3324,6 +3381,7 @@ ls.org
 lt
 lt.gov
 lu
+luxury
 lv
 lv.asn
 lv.com
@@ -3351,6 +3409,9 @@ ma.gov
 ma.net
 ma.org
 ma.press
+management
+mango
+marketing
 mc
 mc.asso
 mc.tm
@@ -3364,6 +3425,7 @@ me.its
 me.net
 me.org
 me.priv
+menu
 mg
 mg.com
 mg.edu
@@ -3404,13 +3466,20 @@ mo.gov
 mo.net
 mo.org
 mobi
+moda
+moe
+monash
 mp
 mq
 mr
 mr.blogspot
 mr.gov
 ms
-mt.*
+mt
+mt.com
+mt.edu
+mt.net
+mt.org
 mu
 mu.ac
 mu.co
@@ -4030,6 +4099,7 @@ na.school
 na.tv
 na.us
 na.ws
+nagoya
 name
 name.her.forgot
 name.his.forgot
@@ -4106,6 +4176,7 @@ ng.net
 ng.org
 ng.sch
 ni.*
+ninja
 nl
 nl.blogspot
 nl.bv
@@ -4882,16 +4953,6 @@ nu.shacknet
 nz.*
 nz.co.blogspot
 om
-om.!mediaphone
-om.!nawras
-om.!nawrastelecom
-om.!omanmobile
-om.!omanpost
-om.!omantel
-om.!rakpetroleum
-om.!siemens
-om.!songfest
-om.!statecouncil
 om.co
 om.com
 om.edu
@@ -4901,6 +4962,7 @@ om.museum
 om.net
 om.org
 om.pro
+onl
 org
 org.ae
 org.blogdns
@@ -4957,6 +5019,8 @@ org.stuff-4-sale
 org.us
 org.webhop
 org.za
+otsuka
+otsuka
 pa
 pa.abo
 pa.ac
@@ -4991,6 +5055,10 @@ ph.mil
 ph.net
 ph.ngo
 ph.org
+photography
+photos
+pink
+pink
 pk
 pk.biz
 pk.com
@@ -5187,6 +5255,7 @@ pl.zakopane
 pl.zarow
 pl.zgora
 pl.zgorzelec
+plumbing
 pm
 pn
 pn.co
@@ -5264,6 +5333,10 @@ re.asso
 re.blogspot
 re.com
 re.nom
+recipes
+red
+repair
+reviews
 ro
 ro.arts
 ro.blogspot
@@ -5418,6 +5491,8 @@ ru.yaroslavl
 ru.yekaterinburg
 ru.yuzhno-sakhalinsk
 ru.zgrad
+ruhr
+ruhr
 rw
 rw.ac
 rw.co
@@ -5500,6 +5575,7 @@ se.w
 se.x
 se.y
 se.z
+sexy
 sg
 sg.blogspot
 sg.com
@@ -5514,7 +5590,10 @@ sh.gov
 sh.mil
 sh.net
 sh.org
+shoes
+shoes
 si
+singles
 sk
 sk.blogspot
 sl
@@ -5536,6 +5615,9 @@ so
 so.com
 so.net
 so.org
+social
+solar
+solutions
 sr
 st
 st.co
@@ -5551,6 +5633,7 @@ st.principe
 st.saotome
 st.store
 su
+support
 sv
 sv.com
 sv.edu
@@ -5566,13 +5649,16 @@ sy.gov
 sy.mil
 sy.net
 sy.org
+systems
 sz
 sz.ac
 sz.co
 sz.org
+tattoo
 tc
 td
 td.blogspot
+technology
 tel
 tf
 tg
@@ -5584,6 +5670,7 @@ th.in
 th.mi
 th.net
 th.or
+tips
 tj
 tj.ac
 tj.biz
@@ -5640,9 +5727,11 @@ to.gov
 to.mil
 to.net
 to.org
+today
 tr.!nic
 tr.*
 tr.nc.gov
+training
 travel
 tt
 tt.aero
@@ -5794,6 +5883,7 @@ uk.!parliament
 uk.*
 uk.co.blogspot
 uk.sch.*
+uno
 us
 us.ak
 us.ak.cc
@@ -5982,7 +6072,6 @@ us.sc.k12
 us.sc.lib
 us.sd
 us.sd.cc
-us.sd.k12
 us.sd.lib
 us.stuff-4-sale
 us.tn
@@ -6020,7 +6109,6 @@ us.wi.lib
 us.wv
 us.wv.cc
 us.wv.k12
-us.wv.lib
 us.wy
 us.wy.cc
 us.wy.k12
@@ -6056,6 +6144,7 @@ ve.mil
 ve.net
 ve.org
 ve.web
+ventures
 vg
 vi
 vi.co
@@ -6063,6 +6152,7 @@ vi.com
 vi.k12
 vi.net
 vi.org
+viajes
 vn
 vn.ac
 vn.biz
@@ -6076,8 +6166,15 @@ vn.name
 vn.net
 vn.org
 vn.pro
+voting
+voyage
 vu
+wang
+wed
+wed
 wf
+wien
+wiki
 ws
 ws.com
 ws.dyndns
@@ -6092,7 +6189,9 @@ yt
 za.*
 zm.*
 zw.*
+онлайн
 рф
+сайт
 срб
 укр
 الاردن
@@ -6106,14 +6205,18 @@ zw.*
 امارات
 ايران
 ایران
+بازار
 بھارت
 تونس
 سوريا
 سورية
+شبكة
 عمان
 فلسطين
 قطر
 مصر
+موقع
+موقع
 भारत
 বাংলা
 ভারত
@@ -6126,11 +6229,25 @@ zw.*
 ලංකා
 ไทย
 გე
+みんな
+世界
+中信
+中信
 中国
 中國
+中文网
+企业
+公益
 台湾
 台灣
+在线
+我爱你
+政务
 新加坡
+游戏
+移动
 臺灣
+集团
 香港
+삼성
 한국