Merge branch 'release/0.12.4'

Author: Kevin Hellemun

.gitignore

@@ -92,3 +92,4 @@ config.json
 connectQr.png
 .DS_Store
 bunq_sdk.egg-info
+.idea/codeStyles/

CHANGELOG.md

@@ -0,0 +1,117 @@
+# Change Log
+
+## [0.12.4](https://github.com/bunq/sdk_python/tree/0.12.4) (2017-12-21)
+[Full Changelog](https://github.com/bunq/sdk_python/compare/0.12.3...0.12.4)
+
+**Implemented enhancements:**
+
+- Make sure received signatures headers are correctly cased [\#51](https://github.com/bunq/sdk_python/issues/51)
+- Introduce from\_json method  [\#50](https://github.com/bunq/sdk_python/issues/50)
+- Return base class from createFromJsonString [\#49](https://github.com/bunq/sdk_python/issues/49)
+- CHANGELOG.md is empty [\#46](https://github.com/bunq/sdk_python/issues/46)
+- Improve decoder to recognise child object  [\#42](https://github.com/bunq/sdk_python/issues/42)
+
+**Closed issues:**
+
+- Python doesn't want CamelCase  [\#45](https://github.com/bunq/sdk_python/issues/45)
+
+**Merged pull requests:**
+
+- Feature/make sure headers are correctly cased bunq/sdk python\#51 [\#57](https://github.com/bunq/sdk_python/pull/57) ([OGKevin](https://github.com/OGKevin))
+- Feature/improve decoder bunq/sdk python\#42 [\#56](https://github.com/bunq/sdk_python/pull/56) ([OGKevin](https://github.com/OGKevin))
+- Renamed camelCase methods. \(bunq/sdk\_python\#45\) [\#48](https://github.com/bunq/sdk_python/pull/48) ([OGKevin](https://github.com/OGKevin))
+- Generated CHANGELOG.md :clap:. \(bunq/sdk\_python\#46\) [\#47](https://github.com/bunq/sdk_python/pull/47) ([OGKevin](https://github.com/OGKevin))
+
+## [0.12.3](https://github.com/bunq/sdk_python/tree/0.12.3) (2017-11-15)
+[Full Changelog](https://github.com/bunq/sdk_python/compare/0.12.2...0.12.3)
+
+**Implemented enhancements:**
+
+- Callback models for holding callback data [\#40](https://github.com/bunq/sdk_python/issues/40)
+- Feature/callback models bunq/sdk python\#40 [\#43](https://github.com/bunq/sdk_python/pull/43) ([OGKevin](https://github.com/OGKevin))
+
+**Fixed bugs:**
+
+- ScheduledPayment causes decode error due to Typo [\#44](https://github.com/bunq/sdk_python/issues/44)
+
+## [0.12.2](https://github.com/bunq/sdk_python/tree/0.12.2) (2017-11-08)
+[Full Changelog](https://github.com/bunq/sdk_python/compare/0.12.0...0.12.2)
+
+**Implemented enhancements:**
+
+- Add missing fields for cvc endpoint [\#37](https://github.com/bunq/sdk_python/issues/37)
+- Missing CARD GENERATED CVC2 endpoint  [\#33](https://github.com/bunq/sdk_python/issues/33)
+- More flexibility for sessionContext handling [\#31](https://github.com/bunq/sdk_python/issues/31)
+- Added cvc\_endpoint. \#33 [\#34](https://github.com/bunq/sdk_python/pull/34) ([OGKevin](https://github.com/OGKevin))
+- Added isSessionExpired\(\) method \#31. [\#32](https://github.com/bunq/sdk_python/pull/32) ([OGKevin](https://github.com/OGKevin))
+
+**Fixed bugs:**
+
+- DraftPayment object field causes converter error  [\#36](https://github.com/bunq/sdk_python/issues/36)
+
+**Merged pull requests:**
+
+- Feature/fix draft payment object \#36 [\#39](https://github.com/bunq/sdk_python/pull/39) ([OGKevin](https://github.com/OGKevin))
+- Feature/add missing cvc fields \#37 [\#38](https://github.com/bunq/sdk_python/pull/38) ([OGKevin](https://github.com/OGKevin))
+
+## [0.12.0](https://github.com/bunq/sdk_python/tree/0.12.0) (2017-10-11)
+[Full Changelog](https://github.com/bunq/sdk_python/compare/0.11.0...0.12.0)
+
+**Implemented enhancements:**
+
+- Add strictly typed BunqResponses [\#27](https://github.com/bunq/sdk_python/issues/27)
+- Better error handling  [\#25](https://github.com/bunq/sdk_python/issues/25)
+- Add Pagination [\#20](https://github.com/bunq/sdk_python/issues/20)
+- Marked all files in generated dir as generated code. [\#24](https://github.com/bunq/sdk_python/pull/24) ([OGKevin](https://github.com/OGKevin))
+
+**Merged pull requests:**
+
+- cleanup after 27-strictly-typed-response [\#30](https://github.com/bunq/sdk_python/pull/30) ([dnl-blkv](https://github.com/dnl-blkv))
+- Add strictly typed responses; fix circular dependencies; improve namespaces [\#28](https://github.com/bunq/sdk_python/pull/28) ([dnl-blkv](https://github.com/dnl-blkv))
+- Feature/exception handler [\#26](https://github.com/bunq/sdk_python/pull/26) ([OGKevin](https://github.com/OGKevin))
+
+## [0.11.0](https://github.com/bunq/sdk_python/tree/0.11.0) (2017-09-06)
+[Full Changelog](https://github.com/bunq/sdk_python/compare/0.10.0...0.11.0)
+
+**Implemented enhancements:**
+
+- Ignore generated code for reviews  [\#22](https://github.com/bunq/sdk_python/issues/22)
+- Feature/git attributes [\#23](https://github.com/bunq/sdk_python/pull/23) ([OGKevin](https://github.com/OGKevin))
+- Add pagination [\#21](https://github.com/bunq/sdk_python/pull/21) ([dnl-blkv](https://github.com/dnl-blkv))
+
+## [0.10.0](https://github.com/bunq/sdk_python/tree/0.10.0) (2017-08-22)
+[Full Changelog](https://github.com/bunq/sdk_python/compare/0.9.1...0.10.0)
+
+**Implemented enhancements:**
+
+- Add proxy support to Python SDK [\#16](https://github.com/bunq/sdk_python/issues/16)
+- Break the SDK's dependence on the bunq.conf file [\#11](https://github.com/bunq/sdk_python/issues/11)
+- Response is missing response headers and pagination [\#9](https://github.com/bunq/sdk_python/issues/9)
+- cleanup tests \[\#18\] [\#19](https://github.com/bunq/sdk_python/pull/19) ([dnl-blkv](https://github.com/dnl-blkv))
+- Changed test class name [\#14](https://github.com/bunq/sdk_python/pull/14) ([OGKevin](https://github.com/OGKevin))
+- Load and Save an ApiContext from and to JSON Data [\#13](https://github.com/bunq/sdk_python/pull/13) ([PJUllrich](https://github.com/PJUllrich))
+- \#9 Introduce BunqResponse [\#10](https://github.com/bunq/sdk_python/pull/10) ([dnl-blkv](https://github.com/dnl-blkv))
+
+**Closed issues:**
+
+- Tests need a minor cleanup [\#18](https://github.com/bunq/sdk_python/issues/18)
+
+**Merged pull requests:**
+
+- Add proxy support \[\#16\] [\#17](https://github.com/bunq/sdk_python/pull/17) ([dnl-blkv](https://github.com/dnl-blkv))
+
+## [0.9.1](https://github.com/bunq/sdk_python/tree/0.9.1) (2017-08-07)
+**Implemented enhancements:**
+
+- Submit this as package to PyPi [\#2](https://github.com/bunq/sdk_python/issues/2)
+- Readme for tests [\#5](https://github.com/bunq/sdk_python/pull/5) ([OGKevin](https://github.com/OGKevin))
+- Uploaded to PyPi [\#4](https://github.com/bunq/sdk_python/pull/4) ([OGKevin](https://github.com/OGKevin))
+- Add first series of unit-tests [\#1](https://github.com/bunq/sdk_python/pull/1) ([OGKevin](https://github.com/OGKevin))
+
+**Fixed bugs:**
+
+- Add Threadsafety for x-bunq-server-signature [\#7](https://github.com/bunq/sdk_python/issues/7)
+
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

VERSION

@@ -1 +1 @@
-0.12.3
+0.12.4

bunq/__init__.py

@@ -7,13 +7,15 @@ def initialize_converter():
     """
 
     import datetime
+    import inspect
 
     from bunq.sdk import client
     from bunq.sdk import context
     from bunq.sdk.model import core
     from bunq.sdk.json import adapters
     from bunq.sdk.json import converter
     from bunq.sdk.model.generated import object_
+    from bunq.sdk.model.generated import endpoint
 
     converter.register_adapter(core.Installation, adapters.InstallationAdapter)
     converter.register_adapter(
@@ -38,5 +40,27 @@ def initialize_converter():
     converter.register_adapter(datetime.datetime, adapters.DateTimeAdapter)
     converter.register_adapter(client.Pagination, adapters.PaginationAdapter)
 
+    def register_anchor_adapter(class_to_regsiter):
+        if issubclass(class_to_regsiter, core.AnchoredObjectInterface):
+            converter.register_adapter(
+                class_to_regsiter,
+                adapters.AnchoredObjectModelAdapter
+            )
+
+    def get_class(class_string_to_get):
+        if hasattr(object_, class_string_to_get):
+            return getattr(object_, class_string_to_get)
+
+        if hasattr(endpoint, class_string_to_get):
+            return getattr(endpoint, class_string_to_get)
+
+    for class_string in list(dir(object_) + dir(endpoint)):
+        class_ = get_class(class_string)
+
+        if not inspect.isclass(class_):
+            continue
+
+        register_anchor_adapter(class_)
+
 
 converter.set_initializer_function(initialize_converter)

bunq/sdk/client.py

@@ -41,7 +41,7 @@ class ApiClient(object):
     HEADER_AUTHENTICATION = 'X-Bunq-Client-Authentication'
 
     # Default header values
-    _USER_AGENT_BUNQ = 'bunq-sdk-python/0.12.3'
+    _USER_AGENT_BUNQ = 'bunq-sdk-python/0.12.4'
     _GEOLOCATION_ZERO = '0 0 0 0 NL'
     _LANGUAGE_EN_US = 'en_US'
     _REGION_NL_NL = 'nl_NL'

bunq/sdk/json/adapters.py

@@ -8,6 +8,71 @@
 from bunq.sdk.model import core
 from bunq.sdk.model.generated import endpoint
 from bunq.sdk.model.generated import object_
+from bunq.sdk.exception import BunqException
+
+
+class AnchoredObjectModelAdapter(converter.JsonAdapter):
+
+    _ERROR_MODEL_NOT_FOUND = '{} is not in endpoint nor object.'
+
+    _override_field_map = {
+        'ScheduledPayment': 'SchedulePayment',
+        'ScheduledInstance': 'ScheduleInstance',
+        }
+
+    @classmethod
+    def deserialize(cls, cls_target, obj_raw):
+        """
+        :type cls_target: core.BunqModel
+        :type obj_raw: int|str|bool|float|list|dict|None
+
+        :rtype: T
+        """
+
+        model_ = super()._deserialize_default(cls_target, obj_raw)
+
+        if isinstance(model_, core.AnchoredObjectInterface) and model_.is_all_field_none():
+            for field in model_.__dict__:
+                field_ = None
+                if field in cls._override_field_map:
+                    field_ = cls._override_field_map[field]
+
+                if field_ is None:
+                    object_class = cls._get_object_class(field)
+                else:
+                    object_class = cls._get_object_class(field_)
+
+                contents = super()._deserialize_default(object_class, obj_raw)
+
+                if contents.is_all_field_none():
+                    setattr(model_, field, None)
+                else:
+                    setattr(model_, field, contents)
+
+        return model_
+
+    @classmethod
+    def can_serialize(cls):
+        return False
+
+    @classmethod
+    def _get_object_class(cls, class_name):
+        """
+        :type class_name: str
+        :rtype: core.BunqModel
+        """
+
+        try:
+            return getattr(endpoint, class_name)
+        except AttributeError:
+            pass
+
+        try:
+            return getattr(object_, class_name)
+        except AttributeError:
+            pass
+
+        raise BunqException(cls._ERROR_MODEL_NOT_FOUND.format(class_name))
 
 
 class InstallationAdapter(converter.JsonAdapter):

bunq/sdk/model/core.py

@@ -2,6 +2,10 @@
 from bunq.sdk.json import converter
 
 
+class AnchoredObjectInterface:
+    pass
+
+
 class BunqModel(object):
     # Field constants
     _FIELD_RESPONSE = 'Response'
@@ -12,13 +16,20 @@ class BunqModel(object):
     # The very first index of an array
     _INDEX_FIRST = 0
 
+    def is_all_field_none(self):
+        raise NotImplementedError
+
     def to_json(self):
         """
         :rtype: str
         """
 
         return converter.class_to_json(self)
 
+    @staticmethod
+    def from_json(json_str):
+        raise NotImplementedError
+
     @classmethod
     def _from_json_array_nested(cls, response_raw):
         """
@@ -141,6 +152,13 @@ def id_(self):
 
         return self._id_
 
+    def is_all_field_none(self):
+        if self.id_ is not None:
+            return False
+
+        return True
+
+
 
 class Uuid(BunqModel):
     """
@@ -158,6 +176,11 @@ def uuid(self):
 
         return self._uuid
 
+    def is_all_field_none(self):
+        if self.uuid is not None:
+            return False
+
+        return True
 
 class SessionToken(BunqModel):
     """
@@ -205,6 +228,21 @@ def token(self):
 
         return self._token
 
+    def is_all_field_none(self):
+        if self.id_ is not None:
+            return False
+
+        if self.created is not None:
+            return False
+
+        if self.updated is not None:
+            return False
+
+        if self.token is not None:
+            return False
+
+        return True
+
 
 class PublicKeyServer(BunqModel):
     """
@@ -222,6 +260,12 @@ def server_public_key(self):
 
         return self._server_public_key
 
+    def is_all_field_none(self):
+        if self.server_public_key is not None:
+            return False
+
+        return True
+
 
 class Installation(BunqModel):
     """
@@ -296,6 +340,17 @@ def generate_request_body_bytes(cls, public_key_string):
             }
         ).encode()
 
+    def is_all_field_none(self):
+        if self.id_ is not None:
+            return False
+
+        if self.token is not None:
+            return False
+
+        if self.server_public_key is not None:
+            return False
+
+        return True
 
 class SessionServer(BunqModel):
     """
@@ -373,4 +428,17 @@ def generate_request_body_bytes(cls, secret):
 
         return converter.class_to_json({cls.FIELD_SECRET: secret}).encode()
 
+    def is_all_field_none(self):
+        if self.id_ is not None:
+            return False
+
+        if self.token is not None:
+            return False
+
+        if self.user_person is not None:
+            return False
+
+        if self.user_company is not None:
+            return False
 
+        return True