Merge pull request #4 from ninoseki/v0.1.1

V0.1.1

abuse_whois/__init__.py

@@ -4,8 +4,8 @@
 from abuse_whois.matchers.shared_hosting import get_shared_hosting_provider
 from abuse_whois.matchers.whois import get_contact_from_whois
 
-from .dataclasses import Contact, Contacts
 from .errors import InvalidAddressError
+from .schemas import Contact, Contacts
 from .utils import get_hostname, is_domain, is_ip_address, is_supported_address
 
 try:

abuse_whois/api/endpoints/whois.py

@@ -9,8 +9,6 @@
 @router.post("/", response_model=schemas.Contacts)
 def whois(query: schemas.Query):
     try:
-        contacts = get_abuse_contacts(query.address)
+        return get_abuse_contacts(query.address)
     except InvalidAddressError as e:
         raise HTTPException(400, detail=str(e))
-
-    return schemas.Contacts.from_orm(contacts)

abuse_whois/cli.py

@@ -4,7 +4,6 @@
 
 from . import get_abuse_contacts
 from .errors import InvalidAddressError
-from .schemas.contact import Contacts
 
 app = typer.Typer()
 
@@ -15,8 +14,7 @@ def whois(
 ):
     try:
         contacts = get_abuse_contacts(address)
-        schema = Contacts.from_orm(contacts)
-        print(schema.json(by_alias=True))  # noqa: T001
+        print(contacts.json(by_alias=True))  # noqa: T001
     except InvalidAddressError as e:
         print(json.dumps({"error": str(e)}))  # noqa: T001
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "abuse_whois"
-version = "0.1.0"
+version = "0.1.1"
 description = "Find where to report a domain for abuse"
 authors = ["Manabu Niseki <manabu.niseki@gmail.com>"]
 license = "MIT"

tests/matchers/shared_hosting/test_rule.py

@@ -2,8 +2,8 @@
 
 import pytest
 
-from abuse_whois.dataclasses import Contact
 from abuse_whois.matchers.shared_hosting.rule import SharedHostingRule
+from abuse_whois.schemas import Contact
 
 
 @pytest.mark.parametrize(
@@ -17,7 +17,7 @@
     ],
 )
 def test_match(hostname: str, base_domains: List[str], expected: bool):
-    contact = Contact("test", "test")
+    contact = Contact(provider="test", address="test")
     base = SharedHostingRule(contact=contact, base_domains=base_domains)
 
     assert base.match(hostname) is expected