Initial stable version

Author: Manuel HUEZ

.gitignore

@@ -98,3 +98,4 @@ target/
 .env
 
 deploy.sh
+*.pyc

README.md

@@ -19,4 +19,4 @@ pip install processOut
 ```
 
 If you don't want to use pip to install this package, you may simply do a git clone
-of this repository.
+of this repository.

processout/__init__.py

@@ -0,0 +1,32 @@
+# Import client file
+from processout.client import ProcessOut
+
+# Import resources
+from processout.activity import Activity
+from processout.authorizationrequest import AuthorizationRequest
+from processout.card import Card
+from processout.coupon import Coupon
+from processout.customer import Customer
+from processout.token import Token
+from processout.discount import Discount
+from processout.event import Event
+from processout.gateway import Gateway
+from processout.gatewayconfiguration import GatewayConfiguration
+from processout.invoice import Invoice
+from processout.customeraction import CustomerAction
+from processout.plan import Plan
+from processout.product import Product
+from processout.project import Project
+from processout.refund import Refund
+from processout.subscription import Subscription
+from processout.transaction import Transaction
+from processout.webhook import Webhook
+
+from processout.gatewayrequest import GatewayRequest
+
+# Import errors
+from processout.errors.authenticationerror import AuthenticationError
+from processout.errors.genericerror        import GenericError
+from processout.errors.internalerror       import InternalError
+from processout.errors.notfounderror       import NotFoundError
+from processout.errors.validationerror     import ValidationError

processout/activity.py

@@ -3,120 +3,27 @@
 except ImportError:
     from urllib import quote_plus
 
-from .processout import ProcessOut
-from .networking.response import Response
-
-try:
-    from .authorizationrequest import AuthorizationRequest
-except ImportError:
-    import sys
-    AuthorizationRequest = sys.modules[__package__ + '.authorizationrequest']
-try:
-    from .card import Card
-except ImportError:
-    import sys
-    Card = sys.modules[__package__ + '.card']
-try:
-    from .coupon import Coupon
-except ImportError:
-    import sys
-    Coupon = sys.modules[__package__ + '.coupon']
-try:
-    from .customer import Customer
-except ImportError:
-    import sys
-    Customer = sys.modules[__package__ + '.customer']
-try:
-    from .token import Token
-except ImportError:
-    import sys
-    Token = sys.modules[__package__ + '.token']
-try:
-    from .discount import Discount
-except ImportError:
-    import sys
-    Discount = sys.modules[__package__ + '.discount']
-try:
-    from .event import Event
-except ImportError:
-    import sys
-    Event = sys.modules[__package__ + '.event']
-try:
-    from .gateway import Gateway
-except ImportError:
-    import sys
-    Gateway = sys.modules[__package__ + '.gateway']
-try:
-    from .gatewayconfiguration import GatewayConfiguration
-except ImportError:
-    import sys
-    GatewayConfiguration = sys.modules[__package__ + '.gatewayconfiguration']
-try:
-    from .invoice import Invoice
-except ImportError:
-    import sys
-    Invoice = sys.modules[__package__ + '.invoice']
-try:
-    from .customeraction import CustomerAction
-except ImportError:
-    import sys
-    CustomerAction = sys.modules[__package__ + '.customeraction']
-try:
-    from .plan import Plan
-except ImportError:
-    import sys
-    Plan = sys.modules[__package__ + '.plan']
-try:
-    from .product import Product
-except ImportError:
-    import sys
-    Product = sys.modules[__package__ + '.product']
-try:
-    from .project import Project
-except ImportError:
-    import sys
-    Project = sys.modules[__package__ + '.project']
-try:
-    from .refund import Refund
-except ImportError:
-    import sys
-    Refund = sys.modules[__package__ + '.refund']
-try:
-    from .subscription import Subscription
-except ImportError:
-    import sys
-    Subscription = sys.modules[__package__ + '.subscription']
-try:
-    from .transaction import Transaction
-except ImportError:
-    import sys
-    Transaction = sys.modules[__package__ + '.transaction']
-try:
-    from .webhook import Webhook
-except ImportError:
-    import sys
-    Webhook = sys.modules[__package__ + '.webhook']
-
-from .networking.requestprocessoutprivate import RequestProcessoutPrivate
+import processout
 
+from processout.networking.request  import Request
+from processout.networking.response import Response
 
 # The content of this file was automatically generated
 
 class Activity:
-
-    def __init__(self, instance = None):
-        if instance == None:
-            instance = ProcessOut.getDefault()
-
-        self._instance = instance
+    def __init__(self, client, prefill = None):
+        self._client = client
 
         self._id = ""
         self._project = None
         self._title = ""
         self._content = ""
         self._level = 0
         self._createdAt = ""
-        
+        if prefill != None:
+            self.fillWithData(prefill)
+
+    
     @property
     def id(self):
         """Get id"""
@@ -143,7 +50,7 @@ def project(self, val):
         if isinstance(val, Project):
             self._project = val
         else:
-            obj = Project(self._instance)
+            obj = processout.Project(self._client)
             obj.fillWithData(val)
             self._project = obj
         return self
@@ -220,14 +127,12 @@ def fillWithData(self, data):
 
         return self
 
-    @staticmethod
-    def all(options = None):
+    def all(self, options = None):
         """Get all the project activities.
         Keyword argument:
         
         options -- Options for the request"""
-        instance = ProcessOut.getDefault()
-        request = RequestProcessoutPrivate(instance)
+        request = Request(self._client)
         path    = "/activities"
         data    = {
 
@@ -239,23 +144,22 @@ def all(options = None):
         a    = []
         body = response.body
         for v in body['activities']:
-            tmp = Activity(instance)
+            tmp = Activity(self._client)
             tmp.fillWithData(v)
             a.append(tmp)
 
         returnValues.append(a)
 
 
-        return tuple(returnValues)
+        
+        return returnValues[0];
 
-    @staticmethod
-    def find(activityId, options = None):
+    def find(self, activityId, options = None):
         """Find a specific activity and fetch its data.
         Keyword argument:
         activityId -- ID of the activity
         options -- Options for the request"""
-        instance = ProcessOut.getDefault()
-        request = RequestProcessoutPrivate(instance)
+        request = Request(self._client)
         path    = "/activities/" + quote_plus(activityId) + ""
         data    = {
 
@@ -268,10 +172,11 @@ def find(activityId, options = None):
         body = body["activity"]
 
 
-        obj = Activity()
+        obj = processout.Activity(self._client)
         returnValues.append(obj.fillWithData(body))
 
 
-        return tuple(returnValues)
+        
+        return returnValues[0];