Add org plugins

Author: lsbardel

metablock/__init__.py

@@ -4,7 +4,7 @@
 from .spaces import Extension, Service, Space, SpaceExtension
 from .user import User
 
-__version__ = "0.1.3"
+__version__ = "0.1.4"
 __all__ = [
     "Metablock",
     "MetablockError",

metablock/client.py

@@ -5,9 +5,9 @@
 
 from aiohttp import ClientSession
 
-from .components import CrudComponent, HttpComponent, MetablockResponseError
+from .components import HttpComponent, MetablockResponseError
 from .orgs import Orgs
-from .spaces import Domains, Services, Space, Spaces
+from .spaces import Domains, Extensions, Plugins, Services, Space, Spaces
 from .user import User
 
 DEFAULT_USER_AGENT = f"Python/{'.'.join(map(str, sys.version_info[:2]))} metablock"
@@ -16,8 +16,7 @@
 
 
 class Metablock(HttpComponent):
-    """Metablock client
-    """
+    """Metablock client"""
 
     url: str = os.environ.get("METABLOCK_URL", "https://api.metablock.io/v1")
     auth_key: str = os.getenv("METABLOCK_API_TOKEN", "")
@@ -42,8 +41,8 @@ def __init__(
         self.domains = Domains(self)
         self.orgs: Orgs = Orgs(self)
         self.services: Services = Services(self)
-        self.plugins: CrudComponent = CrudComponent(self, "plugins")
-        self.extensions: CrudComponent = CrudComponent(self, "extensions")
+        self.plugins: Plugins = Plugins(self)
+        self.extensions: Extensions = Extensions(self)
 
     def __repr__(self) -> str:
         return self.url

metablock/components.py

@@ -55,8 +55,7 @@ async def delete(self, url: str, **kwargs) -> Any:
 
 
 class MetablockEntity(HttpComponent):
-    """A Metablock entity
-    """
+    """A Metablock entity"""
 
     __slots__ = ("root", "data")
 

metablock/orgs.py

@@ -1,7 +1,7 @@
 from typing import Dict
 
 from .components import CrudComponent, MetablockEntity
-from .spaces import Extensions, Spaces
+from .spaces import Extensions, Plugins, Spaces
 
 
 class OrgSpaces(Spaces):
@@ -14,14 +14,26 @@ def list_create_url(self) -> str:
         return "%s/%s" % (self.root.url, self.name)
 
 
+class OrgPlugins(Plugins):
+    def list_create_url(self) -> str:
+        return "%s/%s" % (self.root.url, self.name)
+
+
 class Org(MetablockEntity):
-    """Object representing an Organization
-    """
+    """Object representing an Organization"""
+
+    @property
+    def name(self):
+        return self.data.get("short_name", "")
 
     @property
     def spaces(self) -> OrgSpaces:
         return OrgSpaces(self, "spaces")
 
+    @property
+    def plugins(self) -> OrgPlugins:
+        return OrgPlugins(self, "plugins")
+
     @property
     def extensions(self) -> OrgExtensions:
         return OrgExtensions(self, "extensions")
@@ -39,18 +51,15 @@ async def add_info(self, **data) -> Dict:
 
 
 class Member(MetablockEntity):
-    """Object representing a organization member
-    """
+    """Object representing a organization member"""
 
 
 class Role(MetablockEntity):
-    """Object representing a organization role
-    """
+    """Object representing a organization role"""
 
 
 class Members(CrudComponent):
-    """Metablock organizations
-    """
+    """Metablock organizations"""
 
     Entity = Member
 
@@ -60,8 +69,7 @@ def url(self) -> str:
 
 
 class Roles(CrudComponent):
-    """Metablock organizations
-    """
+    """Metablock organizations"""
 
     Entity = Role
 
@@ -71,7 +79,6 @@ def url(self) -> str:
 
 
 class Orgs(CrudComponent):
-    """Metablock organizations
-    """
+    """Metablock organizations"""
 
     Entity = Org

metablock/spaces.py

@@ -5,9 +5,9 @@
 from .components import Component, CrudComponent, MetablockEntity
 
 
+# Space
 class Space(MetablockEntity):
-    """Object representing a space
-    """
+    """Object representing a space"""
 
     @property
     def services(self) -> "SpaceServices":
@@ -19,15 +19,14 @@ def extensions(self) -> "SpaceExtensions":
 
 
 class Spaces(CrudComponent):
-    """Spaces
-    """
+    """Spaces"""
 
     Entity = Space
 
 
+# Service
 class Service(MetablockEntity):
-    """Object representing a service
-    """
+    """Object representing a service"""
 
     @property
     def plugins(self):
@@ -48,33 +47,31 @@ async def ship(self, name: str, bundle: str, env="stage", *, callback=None) -> D
         return await self.post(f"{self.url}/deployments", data=data, callback=callback)
 
 
-class Extension(MetablockEntity):
-    """Object representing an Extension
-    """
+class Services(CrudComponent):
+    """Services"""
 
+    Entity = Service
 
-class SpaceExtension(MetablockEntity):
-    """Object representing an SpaceExtension
-    """
 
+class SpaceServices(Services):
+    def list_create_url(self) -> str:
+        return "%s/%s" % (self.root.url, self.name)
 
-class Services(CrudComponent):
-    """Services
-    """
 
-    Entity = Service
+# Extension
+class Extension(MetablockEntity):
+    """Object representing an Extension"""
 
 
 class Extensions(CrudComponent):
-    """Extensions
-    """
+    """Extensions"""
 
     Entity = Extension
 
 
-class SpaceServices(Services):
-    def list_create_url(self) -> str:
-        return "%s/%s" % (self.root.url, self.name)
+# SpaceExtension
+class SpaceExtension(MetablockEntity):
+    """Object representing an SpaceExtension"""
 
 
 class SpaceExtensions(CrudComponent):
@@ -84,12 +81,22 @@ def list_create_url(self) -> str:
         return "%s/%s" % (self.root.url, self.name)
 
 
+# Plugin
+class Plugin(MetablockEntity):
+    """Object representing an Plugin"""
+
+
+class Plugins(CrudComponent):
+    """Plugins"""
+
+    Entity = Plugin
+
+
 # ServicePlugin
 
 
 class ServicePlugin(MetablockEntity):
-    """Object representing an ServicePlugin
-    """
+    """Object representing an ServicePlugin"""
 
 
 class ServicePlugins(CrudComponent):

metablock/user.py

@@ -5,8 +5,7 @@
 
 
 class User(MetablockEntity):
-    """Object representing a Metablock user
-    """
+    """Object representing a Metablock user"""
 
     @property
     def url(self) -> str: