diff --git a/pythonwhois/parse.py b/pythonwhois/parse.py index 2e123b7..221eb26 100644 --- a/pythonwhois/parse.py +++ b/pythonwhois/parse.py @@ -247,7 +247,7 @@ registrant_regexes = [ " Registrant:\n (?P.+)\n (?P.+) (?P.+)\n (?P.*)\n (?P.*)\n (?P.*)\n (?P.+), (?P[^,\n]*)\n (?P.+)\n", # .com.tw (Western registrars) "Registrant:\n(?P.+)\n(?P.+)\n(?P.+?)(?:,+(?P.+?)(?:,+(?P.+?)(?:,+(?P.+?)(?:,+(?P.+?)(?:,+(?P.+?)(?:,+(?P.+?))?)?)?)?)?)?,(?P.+),(?P.+)\n\n Contact:\n (?P.+) (?P.+)\n TEL: (?P.+?)(?:(?:#|ext.?)(?P.+))?\n FAX: (?P.+)(?:(?:#|ext.?)(?P.+))?\n", # .com.tw (TWNIC/SEEDNET, Taiwanese companies only?) "Registrant Contact Information:\n\nCompany English Name \(It should be the same as the registered/corporation name on your Business Register Certificate or relevant documents\):(?P.+)\nCompany Chinese name:(?P.+)\nAddress: (?P.+)\nCountry: (?P.+)\nEmail: (?P.+)\n", # HKDNR (.hk) - "Registrant ID:(?P.+)\nRegistrant Name:(?P.*)\n(?:Registrant Organization:(?P.+)\n)?Registrant Street1:(?P.+?)\nRegistrant City:(?P.+)\nRegistrant State:(?P.*)\nRegistrant Postal Code:(?P.+)\nRegistrant Country:(?P[A-Z]+)\nRegistrant Phone:(?P.+?)\nRegistrant Fax:(?P.*)\nRegistrant Email:(?P.+)\n", # Realtime Register + "Registrant ID:(?P.+)\nRegistrant Name:(?P.*)\n(?:Registrant Organization:(?P.*)\n)?Registrant Street1:(?P.+?)\n(?:Registrant Street2:(?P.+?)\n(?:Registrant Street2:(?P.+?)\n)?)?Registrant City:(?P.+)\nRegistrant State:(?P.*)\nRegistrant Postal Code:(?P.+)\nRegistrant Country:(?P[A-Z]+)\nRegistrant Phone:(?P.*?)\nRegistrant Fax:(?P.*)\nRegistrant Email:(?P.+)\n", # Realtime Register "owner:\s+(?P.+)", # .br "person:\s+(?P.+)", # nic.ru (person) "org:\s+(?P.+)", # nic.ru (organization) @@ -285,7 +285,7 @@ tech_contact_regexes = [ "Tech Contact: (?P.+)\n(?P.+)\n(?P.+)\n(?P.+)\n(?:(?P.+)\n)?(?P.+)\n(?P.+)\n(?P[A-Z]+)\n", # .co.th, format 6 " Technical Contact:\n (?P.+) (?P.+)\n (?P.*)\n (?P.*)\n", # .com.tw (Western registrars) "Technical Contact Information:\n\n(?:Given name: (?P.+)\n)?(?:Family name: (?P.+)\n)?(?:Company name: (?P.+)\n)?Address: (?P.+)\nCountry: (?P.+)\nPhone: (?P.*)\nFax: (?P.*)\nEmail: (?P.+)\n(?:Account Name: (?P.+)\n)?", # HKDNR (.hk) - "TECH ID:(?P.+)\nTECH Name:(?P.*)\nTECH Organization:(?P.*)\nTECH Street1:(?P.+?)\nTECH City:(?P.+)\nTECH State:(?P.*)\nTECH Postal Code:(?P.+)\nTECH Country:(?P[A-Z]+)\nTECH Phone:(?P.+?)\nTECH Fax:(?P.*)\nTECH Email:(?P.+)\n", # Realtime Register + "TECH ID:(?P.+)\nTECH Name:(?P.*)\n(?:TECH Organization:(?P.*)\n)?TECH Street1:(?P.+?)\n(?:TECH Street2:(?P.+?)\n(?:TECH Street2:(?P.+?)\n)?)?TECH City:(?P.+)\nTECH State:(?P.*)\nTECH Postal Code:(?P.+)\nTECH Country:(?P[A-Z]+)\nTECH Phone:(?P.*?)\nTECH Fax:(?P.*)\nTECH Email:(?P.+)\n", # Realtime Register ] admin_contact_regexes = [ @@ -311,7 +311,7 @@ admin_contact_regexes = [ "\[Tech-C\]\nType: (?P.+)\nName: (?P.+)\n(Organisation: (?P.+)\n){0,1}(Address: (?P.+)\n){1}(Address: (?P.+)\n){0,1}(Address: (?P.+)\n){0,1}(Address: (?P.+)\n){0,1}PostalCode: (?P.+)\nCity: (?P.+)\nCountryCode: (?P[A-Za-z]{2})\nPhone: (?P.+)\nFax: (?P.+)\nEmail: (?P.+)\n(Remarks: (?P.+)\n){0,1}Changed: (?P.+)", # DeNIC " Administrative Contact:\n (?P.+) (?P.+)\n (?P.*)\n (?P.*)\n", # .com.tw (Western registrars) "Administrative Contact Information:\n\n(?:Given name: (?P.+)\n)?(?:Family name: (?P.+)\n)?(?:Company name: (?P.+)\n)?Address: (?P.+)\nCountry: (?P.+)\nPhone: (?P.*)\nFax: (?P.*)\nEmail: (?P.+)\n(?:Account Name: (?P.+)\n)?", # HKDNR (.hk) - "ADMIN ID:(?P.+)\nADMIN Name:(?P.*)\nADMIN Organization:(?P.*)\nADMIN Street1:(?P.+?)\nADMIN City:(?P.+)\nADMIN State:(?P.*)\nADMIN Postal Code:(?P.+)\nADMIN Country:(?P[A-Z]+)\nADMIN Phone:(?P.+?)\nADMIN Fax:(?P.*)\nADMIN Email:(?P.+)\n", # Realtime Register + "ADMIN ID:(?P.+)\nADMIN Name:(?P.*)\n(?:ADMIN Organization:(?P.*)\n)?ADMIN Street1:(?P.+?)\n(?:ADMIN Street2:(?P.+?)\n(?:ADMIN Street2:(?P.+?)\n)?)?ADMIN City:(?P.+)\nADMIN State:(?P.*)\nADMIN Postal Code:(?P.+)\nADMIN Country:(?P[A-Z]+)\nADMIN Phone:(?P.*?)\nADMIN Fax:(?P.*)\nADMIN Email:(?P.+)\n", # Realtime Register ] billing_contact_regexes = [ @@ -328,7 +328,7 @@ billing_contact_regexes = [ "Billing contact:\n(?: (?P.+)\n)? (?P.+)\n (?P.+)\n (?P.+)\n (?P.+), (?P.+) (?P.+) (?P.+)\n Phone: (?P.*)\n Fax: (?P.*)\n", # Fabulous.com "Billing Contact Information :[ ]*\n[ ]+(?P.*)\n[ ]+(?P.*)\n[ ]+(?P.*)\n[ ]+(?P.*)\n[ ]+(?P.*)\n[ ]+(?P.*)\n[ ]+(?P.*)\n[ ]+(?P.*)\n[ ]+(?P.*)\n\n", # GAL Communication "Billing Contact:\n Name: (?P.+)\n City: (?P.+)\n State: (?P.+)\n Country: (?P.+)\n", # Akky (.com.mx) - "BILLING ID:(?P.+)\nBILLING Name:(?P.*)\nBILLING Organization:(?P.*)\nBILLING Street1:(?P.+?)\nBILLING City:(?P.+)\nBILLING State:(?P.*)\nBILLING Postal Code:(?P.+)\nBILLING Country:(?P[A-Z]+)\nBILLING Phone:(?P.+?)\nBILLING Fax:(?P.*)\nBILLING Email:(?P.+)\n", # Realtime Register + "BILLING ID:(?P.+)\nBILLING Name:(?P.*)\n(?:BILLING Organization:(?P.*)\n)?BILLING Street1:(?P.+?)\n(?:BILLING Street2:(?P.+?)\n(?:BILLING Street2:(?P.+?)\n)?)?BILLING City:(?P.+)\nBILLING State:(?P.*)\nBILLING Postal Code:(?P.+)\nBILLING Country:(?P[A-Z]+)\nBILLING Phone:(?P.*?)\nBILLING Fax:(?P.*)\nBILLING Email:(?P.+)\n", # Realtime Register ] # Some registries use NIC handle references instead of directly listing contacts... diff --git a/test/target_default/0031fashion.com b/test/target_default/0031fashion.com index 674c2f8..2ac8395 100644 --- a/test/target_default/0031fashion.com +++ b/test/target_default/0031fashion.com @@ -1 +1 @@ -{"status": ["OK"], "updated_date": ["2014-03-27T00:00:25"], "contacts": {"admin": {"city": "Zwolle", "fax": "+31.384524734", "handle": "admin@yourhosting.nl", "name": "Valentijn Borstlap", "phone": "+31.384530752", "state": "Overijssel", "street": "Schrevenweg 5", "country": "NL", "postalcode": "8024 HB", "organization": "YourHosting BV", "email": "admin@yourhosting.nl"}, "tech": {"city": "Zwolle", "fax": "+31.384524734", "handle": "tech@yourhosting.nl", "name": "Valentijn Borstlap", "phone": "+31.384530752", "state": "Overijssel", "street": "Schrevenweg 5", "country": "NL", "postalcode": "8024 HB", "organization": "YourHosting BV", "email": "tech@yourhosting.nl"}, "registrant": null, "billing": {"city": "Zwolle", "fax": "+31.384524734", "handle": "billing@yourhosting.nl", "name": "Valentijn Borstlap", "phone": "+31.384530752", "state": "Overijssel", "street": "Schrevenweg 5", "country": "NL", "postalcode": "8024 HB", "organization": "YourHosting BV", "email": "billing@yourhosting.nl"}}, "nameservers": ["ns3.firstfind.nl", "ns4.firstfind.nl", "ns5.firstfind.net"], "expiration_date": ["2015-03-25T10:48:37"], "creation_date": ["2013-03-25T11:48:37", "2013-03-25T11:48:37", "2013-03-25T11:48:37"], "raw": ["Domain Name:0031fashion.com\nName Server:ns3.firstfind.nl\nName Server:ns4.firstfind.nl\nName Server:ns5.firstfind.net\nCreated On:2013-03-25 11:48:37.0\nLast Updated On:2014-03-27 00:00:25.0\nExpiration Date:2015-03-25 10:48:37.0\nSponsoring Registrar:REALTIME REGISTER B.V.\nReseller:Your Hosting B.V.\nStatus:OK\nRegistrant ID:ULYdHkU6vYELLiJqKUmu\nRegistrant Name:A. Blom\nRegistrant Organization:Hotshopper\nRegistrant Street1:Blankenheymstraat 13\nRegistrant City:NUMANSDORP\nRegistrant State:\nRegistrant Postal Code:3281 SB\nRegistrant Country:NL\nRegistrant Phone:+31.648265085\nRegistrant Fax:\nRegistrant Email:info@hotshopper.nl\nBILLING ID:billing@yourhosting.nl\nBILLING Name:Valentijn Borstlap\nBILLING Organization:YourHosting BV\nBILLING Street1:Schrevenweg 5\nBILLING City:Zwolle\nBILLING State:Overijssel\nBILLING Postal Code:8024 HB\nBILLING Country:NL\nBILLING Phone:+31.384530752\nBILLING Fax:+31.384524734\nBILLING Email:billing@yourhosting.nl\nTECH ID:tech@yourhosting.nl\nTECH Name:Valentijn Borstlap\nTECH Organization:YourHosting BV\nTECH Street1:Schrevenweg 5\nTECH City:Zwolle\nTECH State:Overijssel\nTECH Postal Code:8024 HB\nTECH Country:NL\nTECH Phone:+31.384530752\nTECH Fax:+31.384524734\nTECH Email:tech@yourhosting.nl\nADMIN ID:admin@yourhosting.nl\nADMIN Name:Valentijn Borstlap\nADMIN Organization:YourHosting BV\nADMIN Street1:Schrevenweg 5\nADMIN City:Zwolle\nADMIN State:Overijssel\nADMIN Postal Code:8024 HB\nADMIN Country:NL\nADMIN Phone:+31.384530752\nADMIN Fax:+31.384524734\nADMIN Email:admin@yourhosting.nl\n", " Domain Name: 0031FASHION.COM\n Registrar: REALTIME REGISTER BV\n Whois Server: whois.yoursrs.com\n Referral URL: http://www.realtimeregister.com\n Name Server: NS3.FIRSTFIND.NL\n Name Server: NS4.FIRSTFIND.NL\n Name Server: NS5.FIRSTFIND.NET\n Status: ok\n Updated Date: 26-mar-2014\n Creation Date: 25-mar-2013\n Expiration Date: 25-mar-2015\n"], "whois_server": ["whois.yoursrs.com"], "registrar": ["REALTIME REGISTER B.V."], "emails": ["info@hotshopper.nl"]} \ No newline at end of file +{"status": ["OK"], "updated_date": ["2014-03-27T00:00:25"], "contacts": {"admin": {"city": "Zwolle", "fax": "+31.384524734", "handle": "admin@yourhosting.nl", "name": "Valentijn Borstlap", "phone": "+31.384530752", "state": "Overijssel", "street": "Schrevenweg 5", "country": "NL", "postalcode": "8024 HB", "organization": "YourHosting BV", "email": "admin@yourhosting.nl"}, "tech": {"city": "Zwolle", "fax": "+31.384524734", "handle": "tech@yourhosting.nl", "name": "Valentijn Borstlap", "phone": "+31.384530752", "state": "Overijssel", "street": "Schrevenweg 5", "country": "NL", "postalcode": "8024 HB", "organization": "YourHosting BV", "email": "tech@yourhosting.nl"}, "registrant": {"city": "NUMANSDORP", "handle": "ULYdHkU6vYELLiJqKUmu", "name": "A. Blom", "phone": "+31.648265085", "street": "Blankenheymstraat 13", "country": "NL", "postalcode": "3281 SB", "organization": "Hotshopper", "email": "info@hotshopper.nl"}, "billing": {"city": "Zwolle", "fax": "+31.384524734", "handle": "billing@yourhosting.nl", "name": "Valentijn Borstlap", "phone": "+31.384530752", "state": "Overijssel", "street": "Schrevenweg 5", "country": "NL", "postalcode": "8024 HB", "organization": "YourHosting BV", "email": "billing@yourhosting.nl"}}, "nameservers": ["ns3.firstfind.nl", "ns4.firstfind.nl", "ns5.firstfind.net"], "expiration_date": ["2015-03-25T10:48:37"], "creation_date": ["2013-03-25T11:48:37", "2013-03-25T11:48:37", "2013-03-25T11:48:37"], "raw": ["Domain Name:0031fashion.com\nName Server:ns3.firstfind.nl\nName Server:ns4.firstfind.nl\nName Server:ns5.firstfind.net\nCreated On:2013-03-25 11:48:37.0\nLast Updated On:2014-03-27 00:00:25.0\nExpiration Date:2015-03-25 10:48:37.0\nSponsoring Registrar:REALTIME REGISTER B.V.\nReseller:Your Hosting B.V.\nStatus:OK\nRegistrant ID:ULYdHkU6vYELLiJqKUmu\nRegistrant Name:A. Blom\nRegistrant Organization:Hotshopper\nRegistrant Street1:Blankenheymstraat 13\nRegistrant City:NUMANSDORP\nRegistrant State:\nRegistrant Postal Code:3281 SB\nRegistrant Country:NL\nRegistrant Phone:+31.648265085\nRegistrant Fax:\nRegistrant Email:info@hotshopper.nl\nBILLING ID:billing@yourhosting.nl\nBILLING Name:Valentijn Borstlap\nBILLING Organization:YourHosting BV\nBILLING Street1:Schrevenweg 5\nBILLING City:Zwolle\nBILLING State:Overijssel\nBILLING Postal Code:8024 HB\nBILLING Country:NL\nBILLING Phone:+31.384530752\nBILLING Fax:+31.384524734\nBILLING Email:billing@yourhosting.nl\nTECH ID:tech@yourhosting.nl\nTECH Name:Valentijn Borstlap\nTECH Organization:YourHosting BV\nTECH Street1:Schrevenweg 5\nTECH City:Zwolle\nTECH State:Overijssel\nTECH Postal Code:8024 HB\nTECH Country:NL\nTECH Phone:+31.384530752\nTECH Fax:+31.384524734\nTECH Email:tech@yourhosting.nl\nADMIN ID:admin@yourhosting.nl\nADMIN Name:Valentijn Borstlap\nADMIN Organization:YourHosting BV\nADMIN Street1:Schrevenweg 5\nADMIN City:Zwolle\nADMIN State:Overijssel\nADMIN Postal Code:8024 HB\nADMIN Country:NL\nADMIN Phone:+31.384530752\nADMIN Fax:+31.384524734\nADMIN Email:admin@yourhosting.nl\n", " Domain Name: 0031FASHION.COM\n Registrar: REALTIME REGISTER BV\n Whois Server: whois.yoursrs.com\n Referral URL: http://www.realtimeregister.com\n Name Server: NS3.FIRSTFIND.NL\n Name Server: NS4.FIRSTFIND.NL\n Name Server: NS5.FIRSTFIND.NET\n Status: ok\n Updated Date: 26-mar-2014\n Creation Date: 25-mar-2013\n Expiration Date: 25-mar-2015\n"], "whois_server": ["whois.yoursrs.com"], "registrar": ["REALTIME REGISTER B.V."]} \ No newline at end of file diff --git a/test/target_default/arkeysolutions.com b/test/target_default/arkeysolutions.com index 6692d57..96359bd 100644 --- a/test/target_default/arkeysolutions.com +++ b/test/target_default/arkeysolutions.com @@ -1 +1 @@ -{"status": ["OK"], "updated_date": ["2014-04-09T14:53:04"], "contacts": {"admin": {"city": "Praha 10", "fax": "+420.241410071", "handle": "REG_AXFONE", "name": "Jakub Vlach", "phone": "+420.277277272", "state": "Praha", "street": "Pripotocni 1519/10c", "country": "CZ", "postalcode": "10100", "organization": "Axfone s.r.o.", "email": "domeny@axfone.cz"}, "tech": {"city": "Praha 10", "fax": "+420.241410071", "handle": "REG_AXFONE", "name": "Jakub Vlach", "phone": "+420.277277272", "state": "Praha", "street": "Pripotocni 1519/10c", "country": "CZ", "postalcode": "10100", "organization": "Axfone s.r.o.", "email": "domeny@axfone.cz"}, "registrant": null, "billing": {"city": "Praha 10", "fax": "+420.241410071", "handle": "REG_AXFONE", "name": "Jakub Vlach", "phone": "+420.277277272", "state": "Praha", "street": "Pripotocni 1519/10c", "country": "CZ", "postalcode": "10100", "organization": "Axfone s.r.o.", "email": "domeny@axfone.cz"}}, "nameservers": ["ns.axfone.sk", "ns.axfone.eu", "ns.axfone.cz"], "expiration_date": ["2015-01-21T16:11:03"], "creation_date": ["2013-01-21T16:11:03", "2013-01-21T16:11:03", "2013-01-21T16:11:03"], "raw": ["Domain Name:arkeysolutions.com\nName Server:ns.axfone.sk\nName Server:ns.axfone.eu\nName Server:ns.axfone.cz\nCreated On:2013-01-21 16:11:03.0\nLast Updated On:2014-04-09 14:53:04.0\nExpiration Date:2015-01-21 16:11:03.0\nSponsoring Registrar:REALTIME REGISTER B.V.\nReseller:Axfone s.r.o.\nStatus:OK\nRegistrant ID:AXC432303721\nRegistrant Name:R\u00f3bert Kri\u0161ko\nRegistrant Organization:Arkey, s.r.o.\nRegistrant Street1:Tr. SNP 74\nRegistrant City:Ko\u0161ice\nRegistrant State:\nRegistrant Postal Code:04011\nRegistrant Country:SK\nRegistrant Phone:+421.902110378\nRegistrant Fax:\nRegistrant Email:r.krisko@arkeysolutions.com\nADMIN ID:REG_AXFONE\nADMIN Name:Jakub Vlach\nADMIN Organization:Axfone s.r.o.\nADMIN Street1:Pripotocni 1519/10c\nADMIN City:Praha 10\nADMIN State:Praha\nADMIN Postal Code:10100\nADMIN Country:CZ\nADMIN Phone:+420.277277272\nADMIN Fax:+420.241410071\nADMIN Email:domeny@axfone.cz\nTECH ID:REG_AXFONE\nTECH Name:Jakub Vlach\nTECH Organization:Axfone s.r.o.\nTECH Street1:Pripotocni 1519/10c\nTECH City:Praha 10\nTECH State:Praha\nTECH Postal Code:10100\nTECH Country:CZ\nTECH Phone:+420.277277272\nTECH Fax:+420.241410071\nTECH Email:domeny@axfone.cz\nBILLING ID:REG_AXFONE\nBILLING Name:Jakub Vlach\nBILLING Organization:Axfone s.r.o.\nBILLING Street1:Pripotocni 1519/10c\nBILLING City:Praha 10\nBILLING State:Praha\nBILLING Postal Code:10100\nBILLING Country:CZ\nBILLING Phone:+420.277277272\nBILLING Fax:+420.241410071\nBILLING Email:domeny@axfone.cz\n", " Domain Name: ARKEYSOLUTIONS.COM\n Registrar: REALTIME REGISTER BV\n Whois Server: whois.yoursrs.com\n Referral URL: http://www.realtimeregister.com\n Name Server: NS.AXFONE.CZ\n Name Server: NS.AXFONE.EU\n Name Server: NS.AXFONE.SK\n Status: ok\n Updated Date: 09-apr-2014\n Creation Date: 21-jan-2013\n Expiration Date: 21-jan-2015\n"], "whois_server": ["whois.yoursrs.com"], "registrar": ["REALTIME REGISTER B.V."], "emails": ["r.krisko@arkeysolutions.com"]} \ No newline at end of file +{"status": ["OK"], "updated_date": ["2014-04-09T14:53:04"], "contacts": {"admin": {"city": "Praha 10", "fax": "+420.241410071", "handle": "REG_AXFONE", "name": "Jakub Vlach", "phone": "+420.277277272", "state": "Praha", "street": "Pripotocni 1519/10c", "country": "CZ", "postalcode": "10100", "organization": "Axfone s.r.o.", "email": "domeny@axfone.cz"}, "tech": {"city": "Praha 10", "fax": "+420.241410071", "handle": "REG_AXFONE", "name": "Jakub Vlach", "phone": "+420.277277272", "state": "Praha", "street": "Pripotocni 1519/10c", "country": "CZ", "postalcode": "10100", "organization": "Axfone s.r.o.", "email": "domeny@axfone.cz"}, "registrant": {"city": "Ko\u0161ice", "handle": "AXC432303721", "name": "R\u00f3bert Kri\u0161ko", "phone": "+421.902110378", "street": "Tr. SNP 74", "country": "SK", "postalcode": "04011", "organization": "Arkey, s.r.o.", "email": "r.krisko@arkeysolutions.com"}, "billing": {"city": "Praha 10", "fax": "+420.241410071", "handle": "REG_AXFONE", "name": "Jakub Vlach", "phone": "+420.277277272", "state": "Praha", "street": "Pripotocni 1519/10c", "country": "CZ", "postalcode": "10100", "organization": "Axfone s.r.o.", "email": "domeny@axfone.cz"}}, "nameservers": ["ns.axfone.sk", "ns.axfone.eu", "ns.axfone.cz"], "expiration_date": ["2015-01-21T16:11:03"], "creation_date": ["2013-01-21T16:11:03", "2013-01-21T16:11:03", "2013-01-21T16:11:03"], "raw": ["Domain Name:arkeysolutions.com\nName Server:ns.axfone.sk\nName Server:ns.axfone.eu\nName Server:ns.axfone.cz\nCreated On:2013-01-21 16:11:03.0\nLast Updated On:2014-04-09 14:53:04.0\nExpiration Date:2015-01-21 16:11:03.0\nSponsoring Registrar:REALTIME REGISTER B.V.\nReseller:Axfone s.r.o.\nStatus:OK\nRegistrant ID:AXC432303721\nRegistrant Name:R\u00f3bert Kri\u0161ko\nRegistrant Organization:Arkey, s.r.o.\nRegistrant Street1:Tr. SNP 74\nRegistrant City:Ko\u0161ice\nRegistrant State:\nRegistrant Postal Code:04011\nRegistrant Country:SK\nRegistrant Phone:+421.902110378\nRegistrant Fax:\nRegistrant Email:r.krisko@arkeysolutions.com\nADMIN ID:REG_AXFONE\nADMIN Name:Jakub Vlach\nADMIN Organization:Axfone s.r.o.\nADMIN Street1:Pripotocni 1519/10c\nADMIN City:Praha 10\nADMIN State:Praha\nADMIN Postal Code:10100\nADMIN Country:CZ\nADMIN Phone:+420.277277272\nADMIN Fax:+420.241410071\nADMIN Email:domeny@axfone.cz\nTECH ID:REG_AXFONE\nTECH Name:Jakub Vlach\nTECH Organization:Axfone s.r.o.\nTECH Street1:Pripotocni 1519/10c\nTECH City:Praha 10\nTECH State:Praha\nTECH Postal Code:10100\nTECH Country:CZ\nTECH Phone:+420.277277272\nTECH Fax:+420.241410071\nTECH Email:domeny@axfone.cz\nBILLING ID:REG_AXFONE\nBILLING Name:Jakub Vlach\nBILLING Organization:Axfone s.r.o.\nBILLING Street1:Pripotocni 1519/10c\nBILLING City:Praha 10\nBILLING State:Praha\nBILLING Postal Code:10100\nBILLING Country:CZ\nBILLING Phone:+420.277277272\nBILLING Fax:+420.241410071\nBILLING Email:domeny@axfone.cz\n", " Domain Name: ARKEYSOLUTIONS.COM\n Registrar: REALTIME REGISTER BV\n Whois Server: whois.yoursrs.com\n Referral URL: http://www.realtimeregister.com\n Name Server: NS.AXFONE.CZ\n Name Server: NS.AXFONE.EU\n Name Server: NS.AXFONE.SK\n Status: ok\n Updated Date: 09-apr-2014\n Creation Date: 21-jan-2013\n Expiration Date: 21-jan-2015\n"], "whois_server": ["whois.yoursrs.com"], "registrar": ["REALTIME REGISTER B.V."]} \ No newline at end of file diff --git a/test/target_normalized/0031fashion.com b/test/target_normalized/0031fashion.com index 6fc0ca3..604abe0 100644 --- a/test/target_normalized/0031fashion.com +++ b/test/target_normalized/0031fashion.com @@ -1 +1 @@ -{"status": ["OK"], "updated_date": ["2014-03-27T00:00:25"], "contacts": {"admin": {"city": "Zwolle", "fax": "+31.384524734", "handle": "admin@yourhosting.nl", "name": "Valentijn Borstlap", "phone": "+31.384530752", "state": "Overijssel", "street": "Schrevenweg 5", "country": "Netherlands", "postalcode": "8024 HB", "organization": "YourHosting BV", "email": "admin@yourhosting.nl"}, "tech": {"city": "Zwolle", "fax": "+31.384524734", "handle": "tech@yourhosting.nl", "name": "Valentijn Borstlap", "phone": "+31.384530752", "state": "Overijssel", "street": "Schrevenweg 5", "country": "Netherlands", "postalcode": "8024 HB", "organization": "YourHosting BV", "email": "tech@yourhosting.nl"}, "registrant": null, "billing": {"city": "Zwolle", "fax": "+31.384524734", "handle": "billing@yourhosting.nl", "name": "Valentijn Borstlap", "phone": "+31.384530752", "state": "Overijssel", "street": "Schrevenweg 5", "country": "Netherlands", "postalcode": "8024 HB", "organization": "YourHosting BV", "email": "billing@yourhosting.nl"}}, "nameservers": ["ns3.firstfind.nl", "ns4.firstfind.nl", "ns5.firstfind.net"], "expiration_date": ["2015-03-25T10:48:37"], "creation_date": ["2013-03-25T11:48:37", "2013-03-25T11:48:37", "2013-03-25T11:48:37"], "raw": ["Domain Name:0031fashion.com\nName Server:ns3.firstfind.nl\nName Server:ns4.firstfind.nl\nName Server:ns5.firstfind.net\nCreated On:2013-03-25 11:48:37.0\nLast Updated On:2014-03-27 00:00:25.0\nExpiration Date:2015-03-25 10:48:37.0\nSponsoring Registrar:REALTIME REGISTER B.V.\nReseller:Your Hosting B.V.\nStatus:OK\nRegistrant ID:ULYdHkU6vYELLiJqKUmu\nRegistrant Name:A. Blom\nRegistrant Organization:Hotshopper\nRegistrant Street1:Blankenheymstraat 13\nRegistrant City:NUMANSDORP\nRegistrant State:\nRegistrant Postal Code:3281 SB\nRegistrant Country:NL\nRegistrant Phone:+31.648265085\nRegistrant Fax:\nRegistrant Email:info@hotshopper.nl\nBILLING ID:billing@yourhosting.nl\nBILLING Name:Valentijn Borstlap\nBILLING Organization:YourHosting BV\nBILLING Street1:Schrevenweg 5\nBILLING City:Zwolle\nBILLING State:Overijssel\nBILLING Postal Code:8024 HB\nBILLING Country:NL\nBILLING Phone:+31.384530752\nBILLING Fax:+31.384524734\nBILLING Email:billing@yourhosting.nl\nTECH ID:tech@yourhosting.nl\nTECH Name:Valentijn Borstlap\nTECH Organization:YourHosting BV\nTECH Street1:Schrevenweg 5\nTECH City:Zwolle\nTECH State:Overijssel\nTECH Postal Code:8024 HB\nTECH Country:NL\nTECH Phone:+31.384530752\nTECH Fax:+31.384524734\nTECH Email:tech@yourhosting.nl\nADMIN ID:admin@yourhosting.nl\nADMIN Name:Valentijn Borstlap\nADMIN Organization:YourHosting BV\nADMIN Street1:Schrevenweg 5\nADMIN City:Zwolle\nADMIN State:Overijssel\nADMIN Postal Code:8024 HB\nADMIN Country:NL\nADMIN Phone:+31.384530752\nADMIN Fax:+31.384524734\nADMIN Email:admin@yourhosting.nl\n", " Domain Name: 0031FASHION.COM\n Registrar: REALTIME REGISTER BV\n Whois Server: whois.yoursrs.com\n Referral URL: http://www.realtimeregister.com\n Name Server: NS3.FIRSTFIND.NL\n Name Server: NS4.FIRSTFIND.NL\n Name Server: NS5.FIRSTFIND.NET\n Status: ok\n Updated Date: 26-mar-2014\n Creation Date: 25-mar-2013\n Expiration Date: 25-mar-2015\n"], "whois_server": ["whois.yoursrs.com"], "registrar": ["Realtime Register B.V."], "emails": ["info@hotshopper.nl"]} \ No newline at end of file +{"status": ["OK"], "updated_date": ["2014-03-27T00:00:25"], "contacts": {"admin": {"city": "Zwolle", "fax": "+31.384524734", "handle": "admin@yourhosting.nl", "name": "Valentijn Borstlap", "phone": "+31.384530752", "state": "Overijssel", "street": "Schrevenweg 5", "country": "Netherlands", "postalcode": "8024 HB", "organization": "YourHosting BV", "email": "admin@yourhosting.nl"}, "tech": {"city": "Zwolle", "fax": "+31.384524734", "handle": "tech@yourhosting.nl", "name": "Valentijn Borstlap", "phone": "+31.384530752", "state": "Overijssel", "street": "Schrevenweg 5", "country": "Netherlands", "postalcode": "8024 HB", "organization": "YourHosting BV", "email": "tech@yourhosting.nl"}, "registrant": {"city": "Numansdorp", "handle": "ULYdHkU6vYELLiJqKUmu", "name": "A. Blom", "phone": "+31.648265085", "street": "Blankenheymstraat 13", "country": "Netherlands", "postalcode": "3281 SB", "organization": "Hotshopper", "email": "info@hotshopper.nl"}, "billing": {"city": "Zwolle", "fax": "+31.384524734", "handle": "billing@yourhosting.nl", "name": "Valentijn Borstlap", "phone": "+31.384530752", "state": "Overijssel", "street": "Schrevenweg 5", "country": "Netherlands", "postalcode": "8024 HB", "organization": "YourHosting BV", "email": "billing@yourhosting.nl"}}, "nameservers": ["ns3.firstfind.nl", "ns4.firstfind.nl", "ns5.firstfind.net"], "expiration_date": ["2015-03-25T10:48:37"], "creation_date": ["2013-03-25T11:48:37", "2013-03-25T11:48:37", "2013-03-25T11:48:37"], "raw": ["Domain Name:0031fashion.com\nName Server:ns3.firstfind.nl\nName Server:ns4.firstfind.nl\nName Server:ns5.firstfind.net\nCreated On:2013-03-25 11:48:37.0\nLast Updated On:2014-03-27 00:00:25.0\nExpiration Date:2015-03-25 10:48:37.0\nSponsoring Registrar:REALTIME REGISTER B.V.\nReseller:Your Hosting B.V.\nStatus:OK\nRegistrant ID:ULYdHkU6vYELLiJqKUmu\nRegistrant Name:A. Blom\nRegistrant Organization:Hotshopper\nRegistrant Street1:Blankenheymstraat 13\nRegistrant City:NUMANSDORP\nRegistrant State:\nRegistrant Postal Code:3281 SB\nRegistrant Country:NL\nRegistrant Phone:+31.648265085\nRegistrant Fax:\nRegistrant Email:info@hotshopper.nl\nBILLING ID:billing@yourhosting.nl\nBILLING Name:Valentijn Borstlap\nBILLING Organization:YourHosting BV\nBILLING Street1:Schrevenweg 5\nBILLING City:Zwolle\nBILLING State:Overijssel\nBILLING Postal Code:8024 HB\nBILLING Country:NL\nBILLING Phone:+31.384530752\nBILLING Fax:+31.384524734\nBILLING Email:billing@yourhosting.nl\nTECH ID:tech@yourhosting.nl\nTECH Name:Valentijn Borstlap\nTECH Organization:YourHosting BV\nTECH Street1:Schrevenweg 5\nTECH City:Zwolle\nTECH State:Overijssel\nTECH Postal Code:8024 HB\nTECH Country:NL\nTECH Phone:+31.384530752\nTECH Fax:+31.384524734\nTECH Email:tech@yourhosting.nl\nADMIN ID:admin@yourhosting.nl\nADMIN Name:Valentijn Borstlap\nADMIN Organization:YourHosting BV\nADMIN Street1:Schrevenweg 5\nADMIN City:Zwolle\nADMIN State:Overijssel\nADMIN Postal Code:8024 HB\nADMIN Country:NL\nADMIN Phone:+31.384530752\nADMIN Fax:+31.384524734\nADMIN Email:admin@yourhosting.nl\n", " Domain Name: 0031FASHION.COM\n Registrar: REALTIME REGISTER BV\n Whois Server: whois.yoursrs.com\n Referral URL: http://www.realtimeregister.com\n Name Server: NS3.FIRSTFIND.NL\n Name Server: NS4.FIRSTFIND.NL\n Name Server: NS5.FIRSTFIND.NET\n Status: ok\n Updated Date: 26-mar-2014\n Creation Date: 25-mar-2013\n Expiration Date: 25-mar-2015\n"], "whois_server": ["whois.yoursrs.com"], "registrar": ["Realtime Register B.V."]} \ No newline at end of file diff --git a/test/target_normalized/arkeysolutions.com b/test/target_normalized/arkeysolutions.com index 9ffde59..36a5618 100644 --- a/test/target_normalized/arkeysolutions.com +++ b/test/target_normalized/arkeysolutions.com @@ -1 +1 @@ -{"status": ["OK"], "updated_date": ["2014-04-09T14:53:04"], "contacts": {"admin": {"city": "Praha 10", "fax": "+420.241410071", "handle": "REG_AXFONE", "name": "Jakub Vlach", "phone": "+420.277277272", "state": "Praha", "street": "Pripotocni 1519/10c", "country": "Czech Republic", "postalcode": "10100", "organization": "Axfone s.r.o.", "email": "domeny@axfone.cz"}, "tech": {"city": "Praha 10", "fax": "+420.241410071", "handle": "REG_AXFONE", "name": "Jakub Vlach", "phone": "+420.277277272", "state": "Praha", "street": "Pripotocni 1519/10c", "country": "Czech Republic", "postalcode": "10100", "organization": "Axfone s.r.o.", "email": "domeny@axfone.cz"}, "registrant": null, "billing": {"city": "Praha 10", "fax": "+420.241410071", "handle": "REG_AXFONE", "name": "Jakub Vlach", "phone": "+420.277277272", "state": "Praha", "street": "Pripotocni 1519/10c", "country": "Czech Republic", "postalcode": "10100", "organization": "Axfone s.r.o.", "email": "domeny@axfone.cz"}}, "nameservers": ["ns.axfone.sk", "ns.axfone.eu", "ns.axfone.cz"], "expiration_date": ["2015-01-21T16:11:03"], "creation_date": ["2013-01-21T16:11:03", "2013-01-21T16:11:03", "2013-01-21T16:11:03"], "raw": ["Domain Name:arkeysolutions.com\nName Server:ns.axfone.sk\nName Server:ns.axfone.eu\nName Server:ns.axfone.cz\nCreated On:2013-01-21 16:11:03.0\nLast Updated On:2014-04-09 14:53:04.0\nExpiration Date:2015-01-21 16:11:03.0\nSponsoring Registrar:REALTIME REGISTER B.V.\nReseller:Axfone s.r.o.\nStatus:OK\nRegistrant ID:AXC432303721\nRegistrant Name:R\u00f3bert Kri\u0161ko\nRegistrant Organization:Arkey, s.r.o.\nRegistrant Street1:Tr. SNP 74\nRegistrant City:Ko\u0161ice\nRegistrant State:\nRegistrant Postal Code:04011\nRegistrant Country:SK\nRegistrant Phone:+421.902110378\nRegistrant Fax:\nRegistrant Email:r.krisko@arkeysolutions.com\nADMIN ID:REG_AXFONE\nADMIN Name:Jakub Vlach\nADMIN Organization:Axfone s.r.o.\nADMIN Street1:Pripotocni 1519/10c\nADMIN City:Praha 10\nADMIN State:Praha\nADMIN Postal Code:10100\nADMIN Country:CZ\nADMIN Phone:+420.277277272\nADMIN Fax:+420.241410071\nADMIN Email:domeny@axfone.cz\nTECH ID:REG_AXFONE\nTECH Name:Jakub Vlach\nTECH Organization:Axfone s.r.o.\nTECH Street1:Pripotocni 1519/10c\nTECH City:Praha 10\nTECH State:Praha\nTECH Postal Code:10100\nTECH Country:CZ\nTECH Phone:+420.277277272\nTECH Fax:+420.241410071\nTECH Email:domeny@axfone.cz\nBILLING ID:REG_AXFONE\nBILLING Name:Jakub Vlach\nBILLING Organization:Axfone s.r.o.\nBILLING Street1:Pripotocni 1519/10c\nBILLING City:Praha 10\nBILLING State:Praha\nBILLING Postal Code:10100\nBILLING Country:CZ\nBILLING Phone:+420.277277272\nBILLING Fax:+420.241410071\nBILLING Email:domeny@axfone.cz\n", " Domain Name: ARKEYSOLUTIONS.COM\n Registrar: REALTIME REGISTER BV\n Whois Server: whois.yoursrs.com\n Referral URL: http://www.realtimeregister.com\n Name Server: NS.AXFONE.CZ\n Name Server: NS.AXFONE.EU\n Name Server: NS.AXFONE.SK\n Status: ok\n Updated Date: 09-apr-2014\n Creation Date: 21-jan-2013\n Expiration Date: 21-jan-2015\n"], "whois_server": ["whois.yoursrs.com"], "registrar": ["Realtime Register B.V."], "emails": ["r.krisko@arkeysolutions.com"]} \ No newline at end of file +{"status": ["OK"], "updated_date": ["2014-04-09T14:53:04"], "contacts": {"admin": {"city": "Praha 10", "fax": "+420.241410071", "handle": "REG_AXFONE", "name": "Jakub Vlach", "phone": "+420.277277272", "state": "Praha", "street": "Pripotocni 1519/10c", "country": "Czech Republic", "postalcode": "10100", "organization": "Axfone s.r.o.", "email": "domeny@axfone.cz"}, "tech": {"city": "Praha 10", "fax": "+420.241410071", "handle": "REG_AXFONE", "name": "Jakub Vlach", "phone": "+420.277277272", "state": "Praha", "street": "Pripotocni 1519/10c", "country": "Czech Republic", "postalcode": "10100", "organization": "Axfone s.r.o.", "email": "domeny@axfone.cz"}, "registrant": {"city": "Ko\u0161ice", "handle": "AXC432303721", "name": "R\u00f3bert Kri\u0161ko", "phone": "+421.902110378", "street": "Tr. SNP 74", "country": "Slovakia", "postalcode": "04011", "organization": "Arkey, s.r.o.", "email": "r.krisko@arkeysolutions.com"}, "billing": {"city": "Praha 10", "fax": "+420.241410071", "handle": "REG_AXFONE", "name": "Jakub Vlach", "phone": "+420.277277272", "state": "Praha", "street": "Pripotocni 1519/10c", "country": "Czech Republic", "postalcode": "10100", "organization": "Axfone s.r.o.", "email": "domeny@axfone.cz"}}, "nameservers": ["ns.axfone.sk", "ns.axfone.eu", "ns.axfone.cz"], "expiration_date": ["2015-01-21T16:11:03"], "creation_date": ["2013-01-21T16:11:03", "2013-01-21T16:11:03", "2013-01-21T16:11:03"], "raw": ["Domain Name:arkeysolutions.com\nName Server:ns.axfone.sk\nName Server:ns.axfone.eu\nName Server:ns.axfone.cz\nCreated On:2013-01-21 16:11:03.0\nLast Updated On:2014-04-09 14:53:04.0\nExpiration Date:2015-01-21 16:11:03.0\nSponsoring Registrar:REALTIME REGISTER B.V.\nReseller:Axfone s.r.o.\nStatus:OK\nRegistrant ID:AXC432303721\nRegistrant Name:R\u00f3bert Kri\u0161ko\nRegistrant Organization:Arkey, s.r.o.\nRegistrant Street1:Tr. SNP 74\nRegistrant City:Ko\u0161ice\nRegistrant State:\nRegistrant Postal Code:04011\nRegistrant Country:SK\nRegistrant Phone:+421.902110378\nRegistrant Fax:\nRegistrant Email:r.krisko@arkeysolutions.com\nADMIN ID:REG_AXFONE\nADMIN Name:Jakub Vlach\nADMIN Organization:Axfone s.r.o.\nADMIN Street1:Pripotocni 1519/10c\nADMIN City:Praha 10\nADMIN State:Praha\nADMIN Postal Code:10100\nADMIN Country:CZ\nADMIN Phone:+420.277277272\nADMIN Fax:+420.241410071\nADMIN Email:domeny@axfone.cz\nTECH ID:REG_AXFONE\nTECH Name:Jakub Vlach\nTECH Organization:Axfone s.r.o.\nTECH Street1:Pripotocni 1519/10c\nTECH City:Praha 10\nTECH State:Praha\nTECH Postal Code:10100\nTECH Country:CZ\nTECH Phone:+420.277277272\nTECH Fax:+420.241410071\nTECH Email:domeny@axfone.cz\nBILLING ID:REG_AXFONE\nBILLING Name:Jakub Vlach\nBILLING Organization:Axfone s.r.o.\nBILLING Street1:Pripotocni 1519/10c\nBILLING City:Praha 10\nBILLING State:Praha\nBILLING Postal Code:10100\nBILLING Country:CZ\nBILLING Phone:+420.277277272\nBILLING Fax:+420.241410071\nBILLING Email:domeny@axfone.cz\n", " Domain Name: ARKEYSOLUTIONS.COM\n Registrar: REALTIME REGISTER BV\n Whois Server: whois.yoursrs.com\n Referral URL: http://www.realtimeregister.com\n Name Server: NS.AXFONE.CZ\n Name Server: NS.AXFONE.EU\n Name Server: NS.AXFONE.SK\n Status: ok\n Updated Date: 09-apr-2014\n Creation Date: 21-jan-2013\n Expiration Date: 21-jan-2015\n"], "whois_server": ["whois.yoursrs.com"], "registrar": ["Realtime Register B.V."]} \ No newline at end of file