Renamed all package and classes to , updated version and package info

Author: Aman-Aalam

docs/README.md

@@ -36,15 +36,14 @@
 Create a client for the Trolley Python API
 
 
-	client = Configuration.gateway("YOUR-PUBLIC-API","YOUR-PRIVATE-API","production")
+	client = Configuration.gateway("ACCESS_KEY","SECRET_KEY")
 
 **Parameters:**
 
 | Param | Type | Description |
 | ------ | ------ | ------ |
-| publicKey | [String]   |  The public key |
-| secretKey | [String]   |  The secret key |
-| enviroment | [String]   |  The enviroment that should be used |
+| ACCESS_KEY | [String]   |  The public key |
+| SECRET_KEY | [String]   |  The secret key |
 
 
 

paymentrails/__init__.py

@@ -1,15 +1,15 @@
 from setuptools import setup
 
 setup (
-    name='paymentrails',
-    version='0.2',
-    packages=["paymentrails", "paymentrails.exceptions"],
-    package_data={"paymentrails": ["ssl/*"]},
+    name='trolleyhq',
+    version='1.0.0',
+    packages=["trolley", "trolley.exceptions"],
+    package_data={"trolley": ["ssl/*"]},
     install_requires=['requests>=2.13.0'],
     author='Trolley',
     author_email='[email protected]',
     summary='Trolley Python SDK',
-    url='',
-    license='',
+    url='https://www.trolley.com',
+    license='MIT',
     long_description='A native Python SDK for the Trolley API',
 )

setup.py

@@ -5,11 +5,11 @@
 
 sys.path.append(os.path.abspath('.'))
 
-from paymentrails.configuration import Configuration
-from paymentrails.recipient import Recipient
-from paymentrails.recipient_account import RecipientAccount
-from paymentrails.batch import Batch
-from paymentrails.payment import Payment
+from trolley.configuration import Configuration
+from trolley.recipient import Recipient
+from trolley.recipient_account import RecipientAccount
+from trolley.batch import Batch
+from trolley.payment import Payment
 from TestSetup import TestSetup
 
 

test/integration/BatchTest.py

@@ -5,9 +5,9 @@
 
 sys.path.append(os.path.abspath('.'))
 
-from paymentrails.configuration import Configuration
-from paymentrails.recipient import Recipient
-from paymentrails.recipient_account import RecipientAccount
+from trolley.configuration import Configuration
+from trolley.recipient import Recipient
+from trolley.recipient_account import RecipientAccount
 from TestSetup import TestSetup
 
 

test/integration/RecipientTest.py

@@ -3,7 +3,7 @@
 
 sys.path.append(os.path.abspath('.'))
 
-from paymentrails.configuration import Configuration
+from trolley.configuration import Configuration
 from dotenv import dotenv_values
 
 class TestSetup:

test/integration/TestSetup.py

@@ -4,13 +4,13 @@
 
 sys.path.append(os.path.abspath('.'))
 
-import paymentrails.configuration
-import paymentrails.balances
+import trolley.configuration
+import trolley.balances
 from mock import MagicMock, Mock, patch
 
 
-import paymentrails.exceptions.notFoundException
-import paymentrails.exceptions.invalidFieldException
+import trolley.exceptions.notFoundException
+import trolley.exceptions.invalidFieldException
 
 
 def fake_find():
@@ -30,11 +30,11 @@ def setUp(self):
     private_key = ("privatekey")
 
     def test_retrieve_payoutMethod(self):
-        paymentrails.configuration.Configuration.set_public_key(
+        trolley.configuration.Configuration.set_public_key(
             TestBalances.public_key)
-        paymentrails.configuration.Configuration.set_private_key(
+        trolley.configuration.Configuration.set_private_key(
             TestBalances.private_key)
-        response = paymentrails.balances.Balances.find()
+        response = trolley.balances.Balances.find()
         status = {"ok": "true", "balances": {"USD": {"primary": "true", "amount": "10000.00",
                                                      "currency": "USD", "type": "paymentrails", "accountNumber": "null"}}}
         self.assertEqual(response, status)

test/unit/testBalances.py

@@ -0,0 +1,9 @@
+from trolley.configuration import Configuration
+from trolley.recipient import Recipient
+from trolley.balances import Balances
+from trolley.client import Client
+from trolley.batch import Batch
+from trolley.payment import Payment
+from trolley.recipient_account import RecipientAccount
+from trolley.gateway import Gateway
+from trolley.batch_summary import BatchSummary

test/unit/testBatch.py

@@ -1,5 +1,5 @@
-from paymentrails.configuration import Configuration
-from paymentrails.gateway import Gateway
+from trolley.configuration import Configuration
+from trolley.gateway import Gateway
 
 class Balances:
     """

test/unit/testPayment.py

@@ -1,6 +1,6 @@
 from collections import namedtuple
-from paymentrails.exceptions.invalidFieldException import InvalidFieldException
-import paymentrails.configuration
+from trolley.exceptions.invalidFieldException import InvalidFieldException
+import trolley.configuration
 
 
 class BalancesGateway(object):
@@ -17,8 +17,8 @@ def find(self, term=""):
         if term is None:
             raise InvalidFieldException("Term cannot be None")
         endpoint = '/v1/balances/' + term
-        response = paymentrails.configuration.Configuration.client(
+        response = trolley.configuration.Configuration.client(
             self.config).get(endpoint)
-        oldbalance = paymentrails.balances.Balances.factory(response)
+        oldbalance = trolley.balances.Balances.factory(response)
         balance = namedtuple("Balances", oldbalance.keys())(*oldbalance.values())
         return balance

test/unit/testRecipient.py

@@ -1,5 +1,5 @@
-from paymentrails.configuration import Configuration
-from paymentrails.gateway import Gateway
+from trolley.configuration import Configuration
+from trolley.gateway import Gateway
 
 class Batch:
     """

trolley/__init__.py

@@ -1,6 +1,6 @@
 from collections import namedtuple
-from paymentrails.exceptions.invalidFieldException import InvalidFieldException
-import paymentrails.configuration
+from trolley.exceptions.invalidFieldException import InvalidFieldException
+import trolley.configuration
 
 
 
@@ -18,19 +18,19 @@ def find(self, batchid):
         if batchid is None:
             raise InvalidFieldException("Batch id cannot be None.")
         endpoint = '/v1/batches/' + batchid
-        response = paymentrails.configuration.Configuration.client(
+        response = trolley.configuration.Configuration.client(
             self.config).get(endpoint)
-        tempbatch = paymentrails.batch.Batch.factory(response)
+        tempbatch = trolley.batch.Batch.factory(response)
         batch = namedtuple("Batch", tempbatch.keys())(*tempbatch.values())
         return batch
 
     def create(self, body):
         if body is None:
             raise InvalidFieldException("Body cannot be None.")
         endpoint = '/v1/batches/'
-        response = paymentrails.configuration.Configuration.client(
+        response = trolley.configuration.Configuration.client(
             self.config).post(endpoint, body)
-        tempbatch = paymentrails.batch.Batch.factory(response)
+        tempbatch = trolley.batch.Batch.factory(response)
         batch = namedtuple("Batch", tempbatch.keys())(*tempbatch.values())
         return batch
 
@@ -40,26 +40,26 @@ def update(self, batchid, body):
         if body is None:
             raise InvalidFieldException("Body cannot be None.")
         endpoint = '/v1/batches/' + batchid
-        paymentrails.configuration.Configuration.client(
+        trolley.configuration.Configuration.client(
             self.config).patch(endpoint, body)
         return True
 
     def delete(self, batchid):
         if batchid is None:
             raise InvalidFieldException("Batch id cannot be None.")
         endpoint = '/v1/batches/' + batchid
-        paymentrails.configuration.Configuration.client(
+        trolley.configuration.Configuration.client(
             self.config).delete(endpoint)
         return True
     def search(self, page=1, pagenumber=10, term=""):
         endpoint = '/v1/batches?search=' + term + \
             '&page=' + str(page) + '&pageSize=' + str(pagenumber)
-        response = paymentrails.configuration.Configuration.client(
+        response = trolley.configuration.Configuration.client(
             self.config).get(endpoint)
         batches = []
         count = 0
         for batch in response['batches']:
-            tempbatch = paymentrails.batch.Batch.factory(batch)
+            tempbatch = trolley.batch.Batch.factory(batch)
             newbatch = namedtuple("Batch", tempbatch.keys())(*tempbatch.values())
             batches.insert(count, newbatch)
             count = count + 1
@@ -69,9 +69,9 @@ def summary(self, batchid):
         if batchid is None:
             raise InvalidFieldException("Batch id cannot be None.")
         endpoint = '/v1/batches/' + batchid + '/summary'
-        response = paymentrails.configuration.Configuration.client(
+        response = trolley.configuration.Configuration.client(
             self.config).get(endpoint)
-        tempbatchsummary = paymentrails.batch_summary.BatchSummary.factory(
+        tempbatchsummary = trolley.batch_summary.BatchSummary.factory(
             response)
         batchsummary = namedtuple("BatchSummary", tempbatchsummary.keys())(
             *tempbatchsummary.values())
@@ -81,18 +81,18 @@ def generate_quote(self, batchid):
         if batchid is None:
             raise InvalidFieldException("Batch id cannot be None.")
         endpoint = '/v1/batches/' + batchid + '/generate-quote'
-        response = paymentrails.configuration.Configuration.client(
+        response = trolley.configuration.Configuration.client(
             self.config).post(endpoint, {})
-        tempbatch = paymentrails.batch.Batch.factory(response)
+        tempbatch = trolley.batch.Batch.factory(response)
         batch = namedtuple("Batch", tempbatch.keys())(*tempbatch.values())
         return batch
 
     def process_batch(self, batchid):
         if batchid is None:
             raise InvalidFieldException("Batch id cannot be None.")
         endpoint = '/v1/batches/' + batchid + '/start-processing'
-        response = paymentrails.configuration.Configuration.client(
+        response = trolley.configuration.Configuration.client(
             self.config).post(endpoint, {})
-        tempbatch = paymentrails.batch.Batch.factory(response)
+        tempbatch = trolley.batch.Batch.factory(response)
         batch = namedtuple("Batch", tempbatch.keys())(*tempbatch.values())
         return batch

paymentrails/balances.py renamed to trolley/balances.py

@@ -5,17 +5,17 @@
 import json
 import requests
 
-from paymentrails.exceptions.invalidFieldException import InvalidFieldException
-from paymentrails.exceptions.unexpectedException import UnexpectedException
-from paymentrails.exceptions.notFoundException import NotFoundException
-from paymentrails.exceptions.authenticationException import AuthenticationException
-from paymentrails.exceptions.authorizationException import AuthorizationException
-from paymentrails.exceptions.invalidFieldException import InvalidFieldException
-from paymentrails.exceptions.tooManyRequestsException import TooManyRequestsException
-from paymentrails.exceptions.downForMaintenanceException import DownForMaintenanceException
-from paymentrails.exceptions.malformedException import MalformedException
-from paymentrails.exceptions.invalidStatusException import InvalidStatusException
-from paymentrails.exceptions.invalidServerConnectionException import InvalidServerConnectionException
+from trolley.exceptions.invalidFieldException import InvalidFieldException
+from trolley.exceptions.unexpectedException import UnexpectedException
+from trolley.exceptions.notFoundException import NotFoundException
+from trolley.exceptions.authenticationException import AuthenticationException
+from trolley.exceptions.authorizationException import AuthorizationException
+from trolley.exceptions.invalidFieldException import InvalidFieldException
+from trolley.exceptions.tooManyRequestsException import TooManyRequestsException
+from trolley.exceptions.downForMaintenanceException import DownForMaintenanceException
+from trolley.exceptions.malformedException import MalformedException
+from trolley.exceptions.invalidStatusException import InvalidStatusException
+from trolley.exceptions.invalidServerConnectionException import InvalidServerConnectionException
 
 
 class Client(object):
@@ -41,7 +41,7 @@ def sendRequest(self,endpoint,method,body=""):
             headers = {'Content-Type': 'application/json',
                        'Authorization': authorization,
                        'X-PR-Timestamp': str(timestamp),
-                       'Trolley-Source': 'python-sdk_0.2'
+                       'Trolley-Source': 'python-sdk_1.0.0'
                        }
 
             if method == "GET":

paymentrails/balances_gateway.py renamed to trolley/balances_gateway.py

@@ -1,6 +1,6 @@
 
-from paymentrails.client import Client
-from paymentrails.gateway import Gateway
+from trolley.client import Client
+from trolley.gateway import Gateway
 from dotenv import dotenv_values
 
 class Configuration(object):

paymentrails/batch.py renamed to trolley/batch.py

@@ -1,9 +1,9 @@
-from paymentrails.recipient_gateway import RecipientGateway
-from paymentrails.balances_gateway import BalancesGateway
-from paymentrails.batch_gateway import BatchGateway
-from paymentrails.payment_gateway import PaymentGateway
-from paymentrails.recipient_account_gateway import RecipientAccountGateway
-import paymentrails.configuration
+from trolley.recipient_gateway import RecipientGateway
+from trolley.balances_gateway import BalancesGateway
+from trolley.batch_gateway import BatchGateway
+from trolley.payment_gateway import PaymentGateway
+from trolley.recipient_account_gateway import RecipientAccountGateway
+import trolley.configuration
 
 
 class Gateway(object):
@@ -12,10 +12,10 @@ class Gateway(object):
     """
 
     def __init__(self, config=None, **kwargs):
-        if isinstance(config, paymentrails.configuration.Configuration):
+        if isinstance(config, trolley.configuration.Configuration):
             self.config = config
         else:
-            self.config = paymentrails.configuration.Configuration(
+            self.config = trolley.configuration.Configuration(
                 public_key=kwargs.get("public_key"),
                 private_key=kwargs.get("private_key")
             )

paymentrails/batch_gateway.py renamed to trolley/batch_gateway.py

@@ -1,5 +1,5 @@
-from paymentrails.configuration import Configuration
-from paymentrails.gateway import Gateway
+from trolley.configuration import Configuration
+from trolley.gateway import Gateway
 
 class Payment:
     """