Skip to content

Commit

Permalink
Restricted \n+ matches to \n
Browse files Browse the repository at this point in the history
  • Loading branch information
@weppos
weppos committed Apr 18, 2010
1 parent 57e64d9 commit 817e3b6
Show file tree
Hide file tree
Showing 13 changed files with 164 additions and 86 deletions.
10 changes: 5 additions & 5 deletions lib/whois/answer/parser/whois.aero.rb
View file
Expand Up @@ -35,8 +35,8 @@ class Parser
class WhoisAero < Base

property_supported :status do
@status ||= if content_for_scanner =~ /Domain Status:(.*?)\n+/
$1.downcase.to_sym
@status ||= if content_for_scanner =~ /Domain Status:(.*?)\n/
$1
end
end

Expand All @@ -50,19 +50,19 @@ class WhoisAero < Base


property_supported :created_on do
@created_on ||= if content_for_scanner =~ /Created On:(.*?)\n+/
@created_on ||= if content_for_scanner =~ /Created On:(.*?)\n/
Time.parse($1)
end
end

property_supported :updated_on do
@updated_on ||= if content_for_scanner =~ /Updated On:(.*?)\n+/
@updated_on ||= if content_for_scanner =~ /Updated On:(.*?)\n/
Time.parse($1)
end
end

property_supported :expires_on do
@expires_on ||= if content_for_scanner =~ /Expires On:(.*?)\n+/
@expires_on ||= if content_for_scanner =~ /Expires On:(.*?)\n/
Time.parse($1)
end
end
Expand Down
10 changes: 5 additions & 5 deletions lib/whois/answer/parser/whois.afilias-grs.info.rb
View file
Expand Up @@ -48,19 +48,19 @@ class WhoisAfiliasGrsInfo < Base


property_supported :created_on do
@created_on ||= if content_for_scanner =~ /Created On:(.*?)\n+/
@created_on ||= if content_for_scanner =~ /Created On:(.*?)\n/
Time.parse($1)
end
end

property_supported :updated_on do
@updated_on ||= if content_for_scanner =~ /Last Updated On:(.*?)\n+/
@updated_on ||= if content_for_scanner =~ /Last Updated On:(.*?)\n/
Time.parse($1)
end
end

property_supported :expires_on do
@expires_on ||= if content_for_scanner =~ /Expiration Date:(.*?)\n+/
@expires_on ||= if content_for_scanner =~ /Expiration Date:(.*?)\n/
Time.parse($1)
end
end
Expand Down
6 changes: 3 additions & 3 deletions lib/whois/answer/parser/whois.nic.ag.rb
View file
Expand Up @@ -48,19 +48,19 @@ class WhoisNicAg < Base


property_supported :created_on do
@created_on ||= if content_for_scanner =~ /Created On:(.*?)\n+/
@created_on ||= if content_for_scanner =~ /Created On:(.*?)\n/
Time.parse($1)
end
end

property_supported :updated_on do
@updated_on ||= if content_for_scanner =~ /Last Updated On:(.*?)\n+/
@updated_on ||= if content_for_scanner =~ /Last Updated On:(.*?)\n/
Time.parse($1)
end
end

property_supported :expires_on do
@expires_on ||= if content_for_scanner =~ /Expiration Date:(.*?)\n+/
@expires_on ||= if content_for_scanner =~ /Expiration Date:(.*?)\n/
Time.parse($1)
end
end
Expand Down
2 changes: 1 addition & 1 deletion lib/whois/answer/parser/whois.nic.asia.rb
View file
Expand Up @@ -36,7 +36,7 @@ class WhoisNicAsia < Base

property_supported :status do
@status ||= if content_for_scanner =~ /Domain Status:(.*?)\n/
$1.downcase.to_sym
$1
end
end

Expand Down
4 changes: 2 additions & 2 deletions lib/whois/answer/parser/whois.nic.ve.rb
View file
Expand Up @@ -50,13 +50,13 @@ class WhoisNicVe < Base


property_supported :created_on do
@created_on ||= if content_for_scanner =~ /Fecha de Creacion: (.*?)\n+/
@created_on ||= if content_for_scanner =~ /Fecha de Creacion: (.*?)\n/
Time.parse($1)
end
end

property_supported :updated_on do
@updated_on ||= if content_for_scanner =~ /Ultima Actualizacion: (.*?)\n+/
@updated_on ||= if content_for_scanner =~ /Ultima Actualizacion: (.*?)\n/
Time.parse($1)
end
end
Expand Down
6 changes: 2 additions & 4 deletions lib/whois/answer/parser/whois.rotld.ro.rb
View file
Expand Up @@ -35,10 +35,8 @@ class Parser
class WhoisRotldRo < Base

property_supported :status do
if available?
:available
else
:registered
@status ||= if content_for_scanner =~ /Domain Status:\s(.*?)\n/
$1
end
end

Expand Down
54 changes: 37 additions & 17 deletions test/answer/parser/whois.aero_test.rb
View file
Expand Up @@ -10,10 +10,15 @@ def setup


def test_status
assert_equal :ok,
@klass.new(load_part('/registered.txt')).status
assert_equal nil,
@klass.new(load_part('/available.txt')).status
parser = @klass.new(load_part('/registered.txt'))
expected = "OK"
assert_equal expected, parser.status
assert_equal expected, parser.instance_eval { @status }

parser = @klass.new(load_part('/available.txt'))
expected = nil
assert_equal expected, parser.status
assert_equal expected, parser.instance_eval { @status }
end

def test_available?
Expand All @@ -28,24 +33,39 @@ def test_registered?


def test_created_on
assert_equal Time.parse("2002-03-26 06:48:27 UTC"),
@klass.new(load_part('/registered.txt')).created_on
assert_equal nil,
@klass.new(load_part('/available.txt')).created_on
parser = @klass.new(load_part('/registered.txt'))
expected = Time.parse("2002-03-26 06:48:27 UTC")
assert_equal expected, parser.created_on
assert_equal expected, parser.instance_eval { @created_on }

parser = @klass.new(load_part('/available.txt'))
expected = nil
assert_equal expected, parser.created_on
assert_equal expected, parser.instance_eval { @created_on }
end

def test_updated_on
assert_equal Time.parse("2008-03-05 14:32:18 UTC"),
@klass.new(load_part('/registered.txt')).updated_on
assert_equal nil,
@klass.new(load_part('/available.txt')).updated_on
parser = @klass.new(load_part('/registered.txt'))
expected = Time.parse("2008-03-05 14:32:18 UTC")
assert_equal expected, parser.updated_on
assert_equal expected, parser.instance_eval { @updated_on }

parser = @klass.new(load_part('/available.txt'))
expected = nil
assert_equal expected, parser.updated_on
assert_equal expected, parser.instance_eval { @updated_on }
end

def test_expires_on
assert_equal Time.parse("2010-03-26 06:48:27 UTC"),
@klass.new(load_part('/registered.txt')).expires_on
assert_equal nil,
@klass.new(load_part('/available.txt')).expires_on
parser = @klass.new(load_part('/registered.txt'))
expected = Time.parse("2010-03-26 06:48:27 UTC")
assert_equal expected, parser.expires_on
assert_equal expected, parser.instance_eval { @expires_on }

parser = @klass.new(load_part('/available.txt'))
expected = nil
assert_equal expected, parser.expires_on
assert_equal expected, parser.instance_eval { @expires_on }
end


Expand All @@ -61,4 +81,4 @@ def test_nameservers
assert_equal expected, parser.instance_eval { @nameservers }
end

end
end
91 changes: 63 additions & 28 deletions test/answer/parser/whois.afilias-grs.info_test.rb
View file
Expand Up @@ -13,10 +13,15 @@ def setup
class AnswerParserWhoisAfiliasGrsInfoBzTest < AnswerParserWhoisAfiliasGrsInfoTest

def test_status
assert_equal ["CLIENT DELETE PROHIBITED", "CLIENT TRANSFER PROHIBITED", "CLIENT UPDATE PROHIBITED"],
@klass.new(load_part('/bz/registered.txt')).status
assert_equal [],
@klass.new(load_part('/bz/available.txt')).status
parser = @klass.new(load_part('/bz/registered.txt'))
expected = ["CLIENT DELETE PROHIBITED", "CLIENT TRANSFER PROHIBITED", "CLIENT UPDATE PROHIBITED"]
assert_equal expected, parser.status
assert_equal expected, parser.instance_eval { @status }

parser = @klass.new(load_part('/bz/available.txt'))
expected = []
assert_equal expected, parser.status
assert_equal expected, parser.instance_eval { @status }
end

def test_available?
Expand Down Expand Up @@ -69,10 +74,15 @@ def test_nameservers
class AnswerParserWhoisAfiliasGrsInfoGiTest < AnswerParserWhoisAfiliasGrsInfoTest

def test_status
assert_equal ["OK"],
@klass.new(load_part('/gi/registered.txt')).status
assert_equal [],
@klass.new(load_part('/gi/available.txt')).status
parser = @klass.new(load_part('/gi/registered.txt'))
expected = ["OK"]
assert_equal expected, parser.status
assert_equal expected, parser.instance_eval { @status }

parser = @klass.new(load_part('/gi/available.txt'))
expected = []
assert_equal expected, parser.status
assert_equal expected, parser.instance_eval { @status }
end

def test_available?
Expand Down Expand Up @@ -125,10 +135,15 @@ def test_nameservers
class AnswerParserWhoisAfiliasGrsInfoHnTest < AnswerParserWhoisAfiliasGrsInfoTest

def test_status
assert_equal ["CLIENT DELETE PROHIBITED", "CLIENT TRANSFER PROHIBITED", "CLIENT UPDATE PROHIBITED"],
@klass.new(load_part('/hn/registered.txt')).status
assert_equal [],
@klass.new(load_part('/hn/available.txt')).status
parser = @klass.new(load_part('/hn/registered.txt'))
expected = ["CLIENT DELETE PROHIBITED", "CLIENT TRANSFER PROHIBITED", "CLIENT UPDATE PROHIBITED"]
assert_equal expected, parser.status
assert_equal expected, parser.instance_eval { @status }

parser = @klass.new(load_part('/hn/available.txt'))
expected = []
assert_equal expected, parser.status
assert_equal expected, parser.instance_eval { @status }
end

def test_available?
Expand Down Expand Up @@ -181,10 +196,15 @@ def test_nameservers
class AnswerParserWhoisAfiliasGrsInfoLcTest < AnswerParserWhoisAfiliasGrsInfoTest

def test_status
assert_equal ["OK"],
@klass.new(load_part('/lc/registered.txt')).status
assert_equal [],
@klass.new(load_part('/lc/available.txt')).status
parser = @klass.new(load_part('/lc/registered.txt'))
expected = ["OK"]
assert_equal expected, parser.status
assert_equal expected, parser.instance_eval { @status }

parser = @klass.new(load_part('/lc/available.txt'))
expected = []
assert_equal expected, parser.status
assert_equal expected, parser.instance_eval { @status }
end

def test_available?
Expand Down Expand Up @@ -237,10 +257,15 @@ def test_nameservers
class AnswerParserWhoisAfiliasGrsInfoMnTest < AnswerParserWhoisAfiliasGrsInfoTest

def test_status
assert_equal ["CLIENT DELETE PROHIBITED", "CLIENT TRANSFER PROHIBITED", "CLIENT UPDATE PROHIBITED"],
@klass.new(load_part('/mn/registered.txt')).status
assert_equal [],
@klass.new(load_part('/mn/available.txt')).status
parser = @klass.new(load_part('/mn/registered.txt'))
expected = ["CLIENT DELETE PROHIBITED", "CLIENT TRANSFER PROHIBITED", "CLIENT UPDATE PROHIBITED"]
assert_equal expected, parser.status
assert_equal expected, parser.instance_eval { @status }

parser = @klass.new(load_part('/mn/available.txt'))
expected = []
assert_equal expected, parser.status
assert_equal expected, parser.instance_eval { @status }
end

def test_available?
Expand Down Expand Up @@ -293,10 +318,15 @@ def test_nameservers
class AnswerParserWhoisAfiliasGrsInfoScTest < AnswerParserWhoisAfiliasGrsInfoTest

def test_status
assert_equal ["CLIENT DELETE PROHIBITED", "CLIENT TRANSFER PROHIBITED", "CLIENT UPDATE PROHIBITED"],
@klass.new(load_part('/sc/registered.txt')).status
assert_equal [],
@klass.new(load_part('/sc/available.txt')).status
parser = @klass.new(load_part('/sc/registered.txt'))
expected = ["CLIENT DELETE PROHIBITED", "CLIENT TRANSFER PROHIBITED", "CLIENT UPDATE PROHIBITED"]
assert_equal expected, parser.status
assert_equal expected, parser.instance_eval { @status }

parser = @klass.new(load_part('/sc/available.txt'))
expected = []
assert_equal expected, parser.status
assert_equal expected, parser.instance_eval { @status }
end

def test_available?
Expand Down Expand Up @@ -349,10 +379,15 @@ def test_nameservers
class AnswerParserWhoisAfiliasGrsInfoVcTest < AnswerParserWhoisAfiliasGrsInfoTest

def test_status
assert_equal ["CLIENT DELETE PROHIBITED", "CLIENT TRANSFER PROHIBITED", "CLIENT UPDATE PROHIBITED"],
@klass.new(load_part('/vc/registered.txt')).status
assert_equal [],
@klass.new(load_part('/vc/available.txt')).status
parser = @klass.new(load_part('/vc/registered.txt'))
expected = ["CLIENT DELETE PROHIBITED", "CLIENT TRANSFER PROHIBITED", "CLIENT UPDATE PROHIBITED"]
assert_equal expected, parser.status
assert_equal expected, parser.instance_eval { @status }

parser = @klass.new(load_part('/vc/available.txt'))
expected = []
assert_equal expected, parser.status
assert_equal expected, parser.instance_eval { @status }
end

def test_available?
Expand Down
13 changes: 9 additions & 4 deletions test/answer/parser/whois.nic.af_test.rb
View file
Expand Up @@ -10,10 +10,15 @@ def setup


def test_status
assert_equal "Active",
@klass.new(load_part('/registered.txt')).status
assert_equal "Not Registered",
@klass.new(load_part('/available.txt')).status
parser = @klass.new(load_part('/registered.txt'))
expected = "Active"
assert_equal expected, parser.status
assert_equal expected, parser.instance_eval { @status }

parser = @klass.new(load_part('/available.txt'))
expected = "Not Registered"
assert_equal expected, parser.status
assert_equal expected, parser.instance_eval { @status }
end

def test_available?
Expand Down
13 changes: 9 additions & 4 deletions test/answer/parser/whois.nic.ag_test.rb
View file
Expand Up @@ -10,10 +10,15 @@ def setup


def test_status
assert_equal ["CLIENT DELETE PROHIBITED", "CLIENT TRANSFER PROHIBITED", "CLIENT UPDATE PROHIBITED"],
@klass.new(load_part('/registered.txt')).status
assert_equal [],
@klass.new(load_part('/available.txt')).status
parser = @klass.new(load_part('/registered.txt'))
expected = ["CLIENT DELETE PROHIBITED", "CLIENT TRANSFER PROHIBITED", "CLIENT UPDATE PROHIBITED"]
assert_equal expected, parser.status
assert_equal expected, parser.instance_eval { @status }

parser = @klass.new(load_part('/available.txt'))
expected = []
assert_equal expected, parser.status
assert_equal expected, parser.instance_eval { @status }
end

def test_available?
Expand Down
13 changes: 9 additions & 4 deletions test/answer/parser/whois.nic.asia_test.rb
View file
Expand Up @@ -10,10 +10,15 @@ def setup


def test_status
assert_equal :ok,
@klass.new(load_part('/registered.txt')).status
assert_equal nil,
@klass.new(load_part('/available.txt')).status
parser = @klass.new(load_part('/registered.txt'))
expected = "OK"
assert_equal expected, parser.status
assert_equal expected, parser.instance_eval { @status }

parser = @klass.new(load_part('/available.txt'))
expected = nil
assert_equal expected, parser.status
assert_equal expected, parser.instance_eval { @status }
end

def test_available?
Expand Down

0 comments on commit 817e3b6

Please sign in to comment.