public_suffix_service 0.8.2 → 0.8.3

data/.gitignore

@@ -1,7 +1,5 @@
-.DS_Store
+.bundle
 .idea
 .yardoc
-pkg
-rdoc
+pkg/*
 yardoc
-coverage

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 # Changelog
 
 
+## Release 0.8.3
+
+* FIXED: Fixed ArgumentError: invalid byte sequence in US-ASCII with Ruby 1.9.2 (#12).
+
+* CHANGED: Updated definitions (#11).
+
+* CHANGED: Renamed definitions.txt to definitions.dat.
+
+
 ## Release 0.8.2
 
 * NEW: Added support for rubygems-test.

data/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
   remote: .
   specs:
-    public_suffix_service (0.8.1)
+    public_suffix_service (0.8.3)
 
 GEM
   remote: http://rubygems.org/
   specs:
     rr (1.0.2)
+    yard (0.7.1)
 
 PLATFORMS
   ruby
@@ -14,3 +15,4 @@ PLATFORMS
 DEPENDENCIES
   public_suffix_service!
   rr
+  yard

data/README.md

@@ -43,7 +43,7 @@ Successfully tested with the following interpreters
 
 ## Installation
 
-The best way to install Public Suffix Service is via {RubyGems}[http://www.rubygems.org].
+The best way to install Public Suffix Service is via [RubyGems](http://www.rubygems.org).
 
     $ gem install public_suffix_service
 

data/Rakefile

@@ -39,15 +39,12 @@ task :default => ["test"]
 spec = Gem::Specification.new do |s|
   s.name              = PKG_NAME
   s.version           = PKG_VERSION
-  s.summary           = "Domain Name parser based on the Public Suffix List"
+  s.summary           = "Domain name parser based in the Public Suffix List."
+  s.description       = "PublicSuffixService can parse and decompose a domain name into top level domain, domain and subdomains."
+
   s.author            = "Simone Carletti"
   s.email             = "weppos@weppos.net"
   s.homepage          = "http://www.simonecarletti.com/code/public_suffix_service"
-  s.description       = <<-EOD
-    Intelligent domain name parser based in the Public Suffix List. \
-    PublicSuffixService can parse and decompose a domain name into top level domain, \
-    domain and subdomains.
-  EOD
 
   # Add any extra files to include in the gem (like your README)
   s.files             = `git ls-files`.split("\n")
@@ -124,7 +121,7 @@ task :download_definitions do
 
   DEFINITION_URL = "http://mxr.mozilla.org/mozilla-central/source/netwerk/dns/effective_tld_names.dat?raw=1"
 
-  File.open("lib/public_suffix_service/definitions.dat", "w+") do |f|
+  File.open("lib/public_suffix_service/definitions.txt", "w+") do |f|
     response = Net::HTTP.get_response(URI.parse(DEFINITION_URL))
     f.write(response.body)
   end

data/lib/public_suffix_service/{definitions.dat → definitions.txt}

@@ -432,9 +432,8 @@ net.bo
 mil.bo
 tv.bo
 
-// br : http://en.wikipedia.org/wiki/.br
-// http://registro.br/info/dpn.html
-// Confirmed by registry <fneves@registro.br> 2008-06-24
+// br : http://registro.br/dominio/dpn.html
+// Updated by registry <fneves@registro.br> 2011-03-01
 br
 adm.br
 adv.br
@@ -443,6 +442,7 @@ am.br
 arq.br
 art.br
 ato.br
+b.br
 bio.br
 blog.br
 bmd.br
@@ -454,6 +454,7 @@ com.br
 coop.br
 ecn.br
 edu.br
+emp.br
 eng.br
 esp.br
 etc.br
@@ -488,9 +489,12 @@ pro.br
 psc.br
 psi.br
 qsl.br
+radio.br
 rec.br
 slg.br
 srv.br
+taxi.br
+teo.br
 tmp.br
 trd.br
 tur.br
@@ -774,7 +778,17 @@ edu.dm
 gov.dm
 
 // do : http://en.wikipedia.org/wiki/.do
-*.do
+do
+art.do
+com.do
+edu.do
+gob.do
+gov.do
+mil.do
+net.do
+org.do
+sld.do
+web.do
 
 // dz : http://en.wikipedia.org/wiki/.dz
 dz
@@ -820,7 +834,16 @@ org.ee
 fie.ee
 
 // eg : http://en.wikipedia.org/wiki/.eg
-*.eg
+eg  
+com.eg
+edu.eg
+eun.eg
+gov.eg
+mil.eg
+name.eg
+net.eg
+org.eg
+sci.eg
 
 // er : http://en.wikipedia.org/wiki/.er
 *.er
@@ -2657,6 +2680,9 @@ nl
 // BV.nl will be a registry for dutch BV's (besloten vennootschap)
 bv.nl
 
+// the co.nl domain is managed by CoDNS B.V. Added 2010-05-23.
+co.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
@@ -3424,6 +3450,9 @@ våler.østfold.no
 valer.hedmark.no
 våler.hedmark.no
 
+// the co.no domain is managed by CoDNS B.V. Added 2010-05-23.
+co.no
+
 // np : http://www.mos.com.np/register.html
 *.np
 
@@ -4248,7 +4277,6 @@ mil.to
 // tr : http://en.wikipedia.org/wiki/.tr
 *.tr
 !nic.tr
-!tsk.tr
 // Used by government in the TRNC
 // http://en.wikipedia.org/wiki/.nc.tr
 gov.nc.tr
@@ -4379,12 +4407,16 @@ or.ug
 !bl.uk
 !british-library.uk
 !icnet.uk
+!gov.uk
 !jet.uk
+!mod.uk
 !nel.uk
 !nhs.uk
+!nic.uk
 !nls.uk
 !national-library-scotland.uk
 !parliament.uk
+!police.uk
 
 // us : http://en.wikipedia.org/wiki/.us
 us
@@ -4709,6 +4741,9 @@ edu.ws
 //http://nic.ae/english/arabicdomain/rules.jsp
 امارات
 
+// xn--54b7fta0cc ("Bangla" Bangla) : BD  
+বাংলা
+
 // xn--fiqs8s ("China" Chinese-Han-Simplified <.Zhonggou>) : CN 
 // CNNIC
 // http://cnnic.cn/html/Dir/2005/10/11/3218.htm
@@ -4719,19 +4754,62 @@ edu.ws
 // http://cnnic.cn/html/Dir/2005/10/11/3218.htm
 中國
 
+// xn--lgbbat1ad8j ("Algeria / Al Jazair" Arabic) : DZ  
+الجزائر
+
 // xn--wgbh1c ("Egypt" Arabic .masr) : EG
 // http://www.dotmasr.eg/
 مصر
 
+// xn--node ("ge" Georgian (Mkhedruli)) : GE  
+გე
+
 // xn--j6w193g ("Hong Kong" Chinese-Han) : HK
 // https://www2.hkirc.hk/register/rules.jsp
 香港
 
+// xn--h2brj9c ("Bharat" Devanagari) : IN  
+// India
+भारत
+
+// xn--mgbbh1a71e ("Bharat" Arabic) : IN  
+// India
+بھارت
+
+// xn--fpcrj9c3d ("Bharat" Telugu) : IN  
+// India
+భారత్
+
+// xn--gecrj9c ("Bharat" Gujarati) : IN  
+// India
+ભારત
+
+// xn--s9brj9c ("Bharat" Gurmukhi) : IN  
+// India
+ਭਾਰਤ
+
+// xn--45brj9c ("Bharat" Bengali) : IN  
+// India
+ভারত
+
+// xn--xkc2dl3a5ee0h ("India" Tamil) : IN  
+// India
+இந்தியா
+
+// xn--mgba3a4f16a ("Iran" Persian) : IR  
+ایران
+
+// xn--mgba3a4fra ("Iran" Arabic) : IR  
+ايران
+
 //xn--mgbayh7gpa ("al-Ordon" Arabic) JO
 //National Information Technology Center (NITC) 
 //Royal Scientific Society, Al-Jubeiha
 الاردن
 
+// xn--3e0b707e ("Republic of Korea" Hangul) : KR  
+한국
+
 // xn--fzc2c9e2c ("Lanka" Sinhalese-Sinhala) : LK
 // http://nic.lk
 ලංකා
@@ -4740,23 +4818,47 @@ edu.ws
 // http://nic.lk
 இலங்கை
 
+// xn--mgbc0a9azcg ("Morocco / al-Maghrib" Arabic) : MA  
+المغرب
+
+// xn--mgb9awbf ("Oman" Arabic) : OM  
+عمان
+
 // xn--ygbi2ammx ("Falasteen" Arabic) : PS
 // The Palestinian National Internet Naming Authority (PNINA)
 // http://www.pnina.ps
 فلسطين
 
+// xn--90a3ac ("srb" Cyrillic) : RS  
+срб
+
 // xn--p1ai ("rf" Russian-Cyrillic) : RU
 // http://www.cctld.ru/en/docs/rulesrf.php
 рф
 
 // xn--wgbl6a ("Qatar" Arabic) : QA
 // http://www.ict.gov.qa/
-قطر 
+قطر
 
 // xn--mgberp4a5d4ar ("AlSaudiah" Arabic) : SA
 // http://www.nic.net.sa/
 السعودية
 
+// xn--mgberp4a5d4a87g ("AlSaudiah" Arabic) variant : SA  
+السعودیة
+
+// xn--mgbqly7c0a67fbc ("AlSaudiah" Arabic) variant : SA  
+السعودیۃ
+
+// xn--mgbqly7cvafr ("AlSaudiah" Arabic) variant : SA  
+السعوديه
+
+// xn--ogbpf8fl ("Syria" Arabic) : SY  
+سورية
+
+// xn--mgbtf8fl ("Syria" Arabic) variant : SY  
+سوريا
+
 // xn--yfro4i67o Singapore ("Singapore" Chinese-Han) : SG
 新加坡
 
@@ -4779,6 +4881,18 @@ edu.ws
 // http://www.twnic.net/english/dn/dn_07a.htm
 台湾
 
+// xn--nnx388a ("Taiwan") variant : TW  
+臺灣
+
+// xn--j1amh ("ukr" Cyrillic) : UA  
+укр
+
+// xn--mgb2ddes ("AlYemen" Arabic) : YE  
+اليمن
+
+// xxx : http://icmregistry.com
+xxx
+
 // ye : http://www.y.net.ye/services/domain_name.htm
 *.ye
 

data/lib/public_suffix_service/rule_list.rb

@@ -247,7 +247,7 @@ module PublicSuffixService
       #
       # @return [File]
       def default_definition
-        File.new(File.join(File.dirname(__FILE__), "definitions.dat"))
+        File.new(File.join(File.dirname(__FILE__), "definitions.txt"), "r:utf-8")
       end
 
 

data/lib/public_suffix_service/version.rb

@@ -12,7 +12,7 @@ module PublicSuffixService
   module Version
     MAJOR = 0
     MINOR = 8
-    PATCH = 2
+    PATCH = 3
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join(".")

data/public_suffix_service.gemspec

@@ -2,20 +2,19 @@
 
 Gem::Specification.new do |s|
   s.name = %q{public_suffix_service}
-  s.version = "0.8.2"
+  s.version = "0.8.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Simone Carletti"]
-  s.date = %q{2011-03-11}
-  s.description = %q{    Intelligent domain name parser based in the Public Suffix List.     PublicSuffixService can parse and decompose a domain name into top level domain,     domain and subdomains.
-}
+  s.authors = [%q{Simone Carletti}]
+  s.date = %q{2011-05-27}
+  s.description = %q{PublicSuffixService can parse and decompose a domain name into top level domain, domain and subdomains.}
   s.email = %q{weppos@weppos.net}
-  s.files = [".gemtest", ".gitignore", ".yardopts", "CHANGELOG.md", "Gemfile", "Gemfile.lock", "LICENSE", "README.md", "Rakefile", "lib/public_suffix_service.rb", "lib/public_suffix_service/definitions.dat", "lib/public_suffix_service/domain.rb", "lib/public_suffix_service/errors.rb", "lib/public_suffix_service/rule.rb", "lib/public_suffix_service/rule_list.rb", "lib/public_suffix_service/version.rb", "public_suffix_service.gemspec", "test/acceptance_test.rb", "test/public_suffix_service/domain_test.rb", "test/public_suffix_service/errors_test.rb", "test/public_suffix_service/rule_list_test.rb", "test/public_suffix_service/rule_test.rb", "test/public_suffix_service_test.rb", "test/test_helper.rb"]
+  s.files = [%q{.gemtest}, %q{.gitignore}, %q{.yardopts}, %q{CHANGELOG.md}, %q{Gemfile}, %q{Gemfile.lock}, %q{LICENSE}, %q{README.md}, %q{Rakefile}, %q{lib/public_suffix_service.rb}, %q{lib/public_suffix_service/definitions.txt}, %q{lib/public_suffix_service/domain.rb}, %q{lib/public_suffix_service/errors.rb}, %q{lib/public_suffix_service/rule.rb}, %q{lib/public_suffix_service/rule_list.rb}, %q{lib/public_suffix_service/version.rb}, %q{public_suffix_service.gemspec}, %q{test/acceptance_test.rb}, %q{test/public_suffix_service/domain_test.rb}, %q{test/public_suffix_service/errors_test.rb}, %q{test/public_suffix_service/rule_list_test.rb}, %q{test/public_suffix_service/rule_test.rb}, %q{test/public_suffix_service_test.rb}, %q{test/test_helper.rb}]
   s.homepage = %q{http://www.simonecarletti.com/code/public_suffix_service}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.1}
-  s.summary = %q{Domain Name parser based on the Public Suffix List}
-  s.test_files = ["test/acceptance_test.rb", "test/public_suffix_service/domain_test.rb", "test/public_suffix_service/errors_test.rb", "test/public_suffix_service/rule_list_test.rb", "test/public_suffix_service/rule_test.rb", "test/public_suffix_service_test.rb", "test/test_helper.rb"]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.4}
+  s.summary = %q{Domain name parser based in the Public Suffix List.}
+  s.test_files = [%q{test/acceptance_test.rb}, %q{test/public_suffix_service/domain_test.rb}, %q{test/public_suffix_service/errors_test.rb}, %q{test/public_suffix_service/rule_list_test.rb}, %q{test/public_suffix_service/rule_test.rb}, %q{test/public_suffix_service_test.rb}, %q{test/test_helper.rb}]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/test/acceptance_test.rb

@@ -24,7 +24,7 @@ class AcceptanceTest < Test::Unit::TestCase
   end
 
   InvalidCases = {
-    "nic.do" => PublicSuffixService::DomainNotAllowed,
+    "nic.ke" => PublicSuffixService::DomainNotAllowed,
   }
 
   def test_invalid

data/test/public_suffix_service/domain_test.rb

@@ -148,9 +148,9 @@ class PublicSuffixService::DomainTest < Test::Unit::TestCase
     assert !@klass.new("zip", "example", "www").valid?
 
     # not-allowed
-    assert !@klass.new("do").valid?
-    assert !@klass.new("do", "example").valid?
-    assert  @klass.new("do", "example", "www").valid?
+    assert !@klass.new("ke").valid?
+    assert !@klass.new("ke", "example").valid?
+    assert  @klass.new("ke", "example", "www").valid?
   end
 
   def test_valid_domain_question

data/test/public_suffix_service_test.rb

@@ -58,8 +58,8 @@ class PublicSuffixServiceTest < Test::Unit::TestCase
   end
 
   def test_self_parse_should_raise_with_unallowed_domain
-    error = assert_raise(PublicSuffixService::DomainNotAllowed) { PublicSuffixService.parse("example.do") }
-    assert_match %r{example\.do}, error.message
+    error = assert_raise(PublicSuffixService::DomainNotAllowed) { PublicSuffixService.parse("example.ke") }
+    assert_match %r{example\.ke}, error.message
   end
 
 

data/test/test_helper.rb

@@ -1,8 +1,8 @@
-$:.unshift(File.dirname(__FILE__) + '/../lib')
-
 require 'rubygems'
 require 'test/unit'
 require 'rr'
+
+$:.unshift File.expand_path('../../lib', __FILE__)
 require 'public_suffix_service'
 
 class Test::Unit::TestCase

metadata

@@ -2,7 +2,7 @@
 name: public_suffix_service
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors: 
 - Simone Carletti
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-11 00:00:00 +01:00
-default_executable: 
+date: 2011-05-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rr
@@ -35,7 +34,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id002
-description: "    Intelligent domain name parser based in the Public Suffix List.     PublicSuffixService can parse and decompose a domain name into top level domain,     domain and subdomains.\n"
+description: PublicSuffixService can parse and decompose a domain name into top level domain, domain and subdomains.
 email: weppos@weppos.net
 executables: []
 
@@ -54,7 +53,7 @@ files:
 - README.md
 - Rakefile
 - lib/public_suffix_service.rb
-- lib/public_suffix_service/definitions.dat
+- lib/public_suffix_service/definitions.txt
 - lib/public_suffix_service/domain.rb
 - lib/public_suffix_service/errors.rb
 - lib/public_suffix_service/rule.rb
@@ -68,7 +67,6 @@ files:
 - test/public_suffix_service/rule_test.rb
 - test/public_suffix_service_test.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://www.simonecarletti.com/code/public_suffix_service
 licenses: []
 
@@ -92,10 +90,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.8.4
 signing_key: 
 specification_version: 3
-summary: Domain Name parser based on the Public Suffix List
+summary: Domain name parser based in the Public Suffix List.
 test_files: 
 - test/acceptance_test.rb
 - test/public_suffix_service/domain_test.rb