fix merge conflicts

Author: rserna2010

README.md

@@ -4,6 +4,8 @@ Online Marketplace Payments
 
 [![Build Status](https://secure.travis-ci.org/balanced/balanced-python.png?branch=master)](http://travis-ci.org/balanced/balanced-python)
 
+**v1.x requires Balanced API 1.1. Use [v0.x](https://github.com/balanced/balanced-python/tree/rev0) for Balanced API 1.0.**
+
 ## Installation
 
     pip install balanced

balanced/__init__.py

@@ -1,6 +1,6 @@
 from __future__ import unicode_literals
 
-__version__ = '1.beta3'
+__version__ = '1.0.1'
 
 from balanced.config import configure
 from balanced import resources

balanced/exc.py

@@ -6,7 +6,13 @@
 
 
 class BalancedError(Exception):
-    pass
+
+    def __str__(self):
+        attrs = ', '.join([
+            '{0}={1}'.format(k, repr(v))
+            for k, v in self.__dict__.iteritems()
+        ])
+        return '{0}({1})'.format(self.__class__.__name__, attrs)
 
 
 class ResourceError(BalancedError):

balanced/resources.py

@@ -132,8 +132,8 @@ def items(self):
             # there is no resources key in the response from server
             # if the list is empty, so when we try to get something like
             # `debits`, an AttributeError will be raised. Not sure is this
-            # behavior a bug of server, but anyway, this is just a workaround here
-            # for solving the problem. The issue was posted here
+            # behavior a bug of server, but anyway, this is just a workaround
+            # here for solving the problem. The issue was posted here
             # https://github.com/balanced/balanced-python/issues/93
             return []
 
@@ -186,7 +186,8 @@ def __getattr__(self, item):
             if suffix not in item:
                 href = getattr(self, item + suffix, None)
                 if href:
-                    setattr(self, item, Resource.get(href))
+                    item_type = Resource.registry.get(item + 's', Resource)
+                    setattr(self, item, item_type.get(href))
                     return getattr(self, item)
         raise AttributeError(
             "'{0}' has no attribute '{1}'".format(

examples/bank_account_debits.py

@@ -35,10 +35,15 @@ def main():
 
     print 'PROTIP: for TEST bank accounts the valid amount is always 1 and 1'
     try:
-        verification.confirm(amount_1=1, amount_2=1)
+        verification.confirm(amount_1=1, amount_2=2)
     except balanced.exc.BankAccountVerificationFailure as ex:
         print 'Authentication error , %s' % ex.message
 
+    # reload
+    verification = balanced.BankAccount.fetch(
+        bank_account.href
+    ).bank_account_verification
+
     if verification.confirm(1, 1).verification_status != 'succeeded':
         raise Exception('unpossible')
     debit = bank_account.debit(100)

render_scenarios.py

@@ -1,14 +1,45 @@
 import glob2
 import os
 import json
+import balanced
+import pprint
+from pprint import PrettyPrinter
 from mako.template import Template
 from mako.lookup import TemplateLookup
 
+def construct_response(scenario_name):
+    # load up response data
+    data = json.load(open('scenario.cache','r'))
+    lookup = TemplateLookup(directories=['./scenarios'])
+
+    for path in glob2.glob('./scenarios/**/request.mako'):
+        if path != scenario_name:
+            continue
+        event_name = path.split('/')[-2]
+        template = Template("${response}")
+        try:
+            response = data[event_name].get('response', {})
+            text = template.render(response=response).strip()
+            response =  json.loads(text)
+            del response["links"]
+            for key, value in response.items():
+                response = value[0]
+                type = key
+                resource = balanced.Resource()
+                object_type = resource.registry[type]
+                object_instance = object_type()
+                for key, value in response.items():
+                   setattr(object_instance, key, value)
+            text = template.render(response=object_instance)
+        except KeyError:
+            text = ''
+    return text
+
 def render_executables():
     # load up scenario data
     data = json.load(open('scenario.cache','r'))
     lookup = TemplateLookup(directories=['./scenarios'])
-    
+
     for path in glob2.glob('./scenarios/**/request.mako'):
         event_name = path.split('/')[-2]
         template = Template(filename=path, lookup=lookup,)
@@ -31,8 +62,10 @@ def render_mako():
         with open(os.path.join(dir, 'python.mako'), 'w+b') as wfile:
             definition = open(os.path.join(dir, 'definition.mako'),'r').read()
             request = open(os.path.join(dir, 'executable.py'),'r').read()
+            response = construct_response(path)
             body = "% if mode == 'definition':\n{}".format(definition) + "\n" \
-                                                                    "% elif mode == 'request':\n" + request + "\n% endif"
+                   "% elif mode == 'request':\n" + request + "\n" \
+                    "% elif mode == 'response':\n" + response + "\n% endif"
             wfile.write(body)
 
 def issue_no_mako_warnings():

scenarios/_mj/_template/_create/python.mako

@@ -3,4 +3,6 @@ balanced.RESOURCE
 
 % elif mode == 'request':
 
+% elif mode == 'response':
+
 % endif

scenarios/_mj/_template/_delete/python.mako

@@ -2,4 +2,6 @@
 
 % elif mode == 'request':
 
+% elif mode == 'response':
+
 % endif

scenarios/_mj/_template/_list/python.mako

@@ -2,4 +2,6 @@
 
 % elif mode == 'request':
 
+% elif mode == 'response':
+
 % endif

scenarios/_mj/_template/_retrieve/python.mako

@@ -2,4 +2,6 @@
 
 % elif mode == 'request':
 
+% elif mode == 'response':
+
 % endif