whois.tld.ee must support :expired status

weppos · Jan 20, 2011 · e2d15a8 · e2d15a8
1 parent f3d60f2
commit e2d15a8
Show file tree

Hide file tree

Showing 7 changed files with 118 additions and 2 deletions.
diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
@@ -39,6 +39,8 @@
 
 * FIXED: whois.cat must support multiple statuses.
 
+* FIXED: whois.tld.ee must support :expired status.
+
 
 == Release 1.6.6
 

diff --git a/lib/whois/answer/parser/whois.tld.ee.rb b/lib/whois/answer/parser/whois.tld.ee.rb
@@ -39,6 +39,8 @@ class WhoisTldEe < Base
           @status ||= if content_for_scanner =~ /status:\s+(.+)\n/
             case $1.downcase
               when "paid and in zone" then :registered
+              # NEWSTATUS
+              when "expired" then :expired
               else
                 Whois.bug!(ParserError, "Unknown status `#{$1}'.")
             end

diff --git a/spec/fixtures/responses/whois.tld.ee/property_status_expired.txt b/spec/fixtures/responses/whois.tld.ee/property_status_expired.txt
@@ -0,0 +1,27 @@
+%  This Whois Server contains information on 
+% Estonian Top Level Domain ee TLD
+
+domain:       tenerife.ee
+registrant:   CID:EEDIRECT:410154
+admin-c:      CID:EEDIRECT:410154
+nsset:        NSSID:EEDIRECT:405838
+registrar:    eedirect
+status:       Expired
+registered:   04.07.2010 05:05:30
+expire:       05.01.2011
+
+contact:      CID:EEDIRECT:410154
+org:          ARUMÄE MAJA OÜ
+name:         Marko Põlluäär
+e-mail:       Not Disclosed - Visit www.eestiinternet.ee for webbased WHOIS
+registrar:    eedirect
+created:      04.07.2010 05:05:30
+
+nsset:        NSSID:EEDIRECT:405838
+nserver:      ns1550.hostgator.com (174.132.145.195)
+nserver:      ns1549.hostgator.com (174.132.145.194)
+tech-c:       CID:EEDIRECT:410154
+registrar:    eedirect
+created:      04.07.2010 05:05:30
+
+
diff --git a/spec/fixtures/responses/whois.tld.ee/property_status_missing.txt b/spec/fixtures/responses/whois.tld.ee/property_status_missing.txt
@@ -0,0 +1,8 @@
+%  This Whois Server contains information on
+% Estonian Top Level Domain ee TLD
+
+%ERROR:101: no entries found
+%
+% No entries found.
+
+
diff --git a/spec/fixtures/responses/whois.tld.ee/property_status_paid.txt b/spec/fixtures/responses/whois.tld.ee/property_status_paid.txt
@@ -0,0 +1,34 @@
+%  This Whois Server contains information on
+% Estonian Top Level Domain ee TLD
+
+domain:       edicy.ee
+registrant:   CID:FRAKTAL:1
+admin-c:      CID:FRAKTAL:7
+nsset:        NSSID:FRAKTAL:1
+registrar:    fraktal
+status:       paid and in zone
+registered:   04.07.2010 07:10:32
+changed:      10.12.2010 13:37:11
+expire:       10.12.2011
+
+contact:      CID:FRAKTAL:1
+name:         Priit Haamer
+e-mail:       Not Disclosed - Visit www.eestiinternet.ee for webbased WHOIS
+registrar:    fraktal
+created:      09.12.2010 16:08:33
+
+contact:      CID:FRAKTAL:7
+org:          Fraktal OÜ
+name:         Tõnu Runnel
+e-mail:       Not Disclosed - Visit www.eestiinternet.ee for webbased WHOIS
+registrar:    fraktal
+created:      10.12.2010 13:35:38
+
+nsset:        NSSID:FRAKTAL:1
+nserver:      ns3.edicy.net (82.129.24.69)
+nserver:      ns4.edicy.net (82.199.86.42)
+tech-c:       CID:FRAKTAL:1
+registrar:    fraktal
+created:      09.12.2010 16:09:31
+
+
diff --git a/spec/fixtures/responses/whois.tld.ee/status_expired.txt b/spec/fixtures/responses/whois.tld.ee/status_expired.txt
@@ -0,0 +1,27 @@
+%  This Whois Server contains information on 
+% Estonian Top Level Domain ee TLD
+
+domain:       tenerife.ee
+registrant:   CID:EEDIRECT:410154
+admin-c:      CID:EEDIRECT:410154
+nsset:        NSSID:EEDIRECT:405838
+registrar:    eedirect
+status:       Expired
+registered:   04.07.2010 05:05:30
+expire:       05.01.2011
+
+contact:      CID:EEDIRECT:410154
+org:          ARUMÄE MAJA OÜ
+name:         Marko Põlluäär
+e-mail:       Not Disclosed - Visit www.eestiinternet.ee for webbased WHOIS
+registrar:    eedirect
+created:      04.07.2010 05:05:30
+
+nsset:        NSSID:EEDIRECT:405838
+nserver:      ns1550.hostgator.com (174.132.145.195)
+nserver:      ns1549.hostgator.com (174.132.145.194)
+tech-c:       CID:EEDIRECT:410154
+registrar:    eedirect
+created:      04.07.2010 05:05:30
+
+
diff --git a/test/whois/answer/parser/whois.tld.ee_test.rb b/test/whois/answer/parser/whois.tld.ee_test.rb
@@ -10,15 +10,21 @@ def setup
 
 
   def test_status
-    parser    = @klass.new(load_part('status_registered.txt'))
+    parser    = @klass.new(load_part('property_status_paid.txt'))
     expected  = :registered
     assert_equal  expected, parser.status
     assert_equal  expected, parser.instance_eval { @status }
 
-    parser    = @klass.new(load_part('status_available.txt'))
+    parser    = @klass.new(load_part('property_status_missing.txt'))
     expected  = :available
     assert_equal  expected, parser.status
     assert_equal  expected, parser.instance_eval { @status }
+
+    parser    = @klass.new(load_part('property_status_expired.txt'))
+    # NEWSTATUS
+    expected  = :expired
+    assert_equal  expected, parser.status
+    assert_equal  expected, parser.instance_eval { @status }
   end
 
   def test_available?
@@ -31,6 +37,11 @@ def test_available?
     expected  = true
     assert_equal  expected, parser.available?
     assert_equal  expected, parser.instance_eval { @available }
+
+    parser    = @klass.new(load_part('status_expired.txt'))
+    expected  = false
+    assert_equal  expected, parser.available?
+    assert_equal  expected, parser.instance_eval { @available }
   end
 
   def test_registered?
@@ -43,6 +54,11 @@ def test_registered?
     expected  = false
     assert_equal  expected, parser.registered?
     assert_equal  expected, parser.instance_eval { @registered }
+
+    parser    = @klass.new(load_part('status_expired.txt'))
+    expected  = true
+    assert_equal  expected, parser.registered?
+    assert_equal  expected, parser.instance_eval { @registered }
   end
 
   def test_created_on