diff --git a/examples/example.py b/examples/example.py index 97bd72c..d0207bb 100644 --- a/examples/example.py +++ b/examples/example.py @@ -28,10 +28,13 @@ def example(): def locked_locked(data): _LOGGER.info("Lock received") + def refresh_tracker(): + _LOGGER.info("Refresh tracker recieved") def connect_socket(account): socket = GeoRideSocket() socket.subscribe_locked(locked_locked) + socket.subscribe_refresh_tracker(refresh_tracker) socket.init() socket.connect(account.auth_token) time.sleep(10) diff --git a/georideapilib/objects.py b/georideapilib/objects.py index 39dc4ff..c3ec246 100644 --- a/georideapilib/objects.py +++ b/georideapilib/objects.py @@ -882,7 +882,7 @@ class GeoRideTrackerBeacon: self._power = tracker_beacon.power -class GeoRideSubscription: +class GeoRideSubscription(metaclass=JsonMgtMetaClass): """ Account object representation """ def __init__(self, subscription_id, subscription_type, initial_date, next_payment_date, status, paused_since, cancel_requested, price, first_name, last_name, card_information): @@ -959,14 +959,14 @@ class GeoRideSubscription: return GeoRideSubscription( json['id'], json['type'], - json['initialDate'], - json['nextPaymentDate'], - json['status'], - json['pausedSince'], - json['cancelRequested'], - json['price'], - json['firstName'], - json['lastName'], + cls.json_field_protect(json, 'initialDate'), + cls.json_field_protect(json, 'nextPaymentDate'), + cls.json_field_protect(json, 'status'), + cls.json_field_protect(json, 'pausedSince'), + cls.json_field_protect(json, 'cancelRequested'), + cls.json_field_protect(json, 'price'), + cls.json_field_protect(json, 'firstName'), + cls.json_field_protect(json, 'lastName'), GeoRideSubscription_CardInfo.from_json(json['cardInformation']) ) diff --git a/georideapilib/socket.py b/georideapilib/socket.py index 505bc73..e49e83b 100644 --- a/georideapilib/socket.py +++ b/georideapilib/socket.py @@ -112,19 +112,3 @@ class GeoRideSocket(): def disconnect(self): """disconnect from the georide socket""" sio.disconnect() - - -#TODO: remove in v0.8.0 -class GeorideSocket(GeoRideSocket): - """ Trip object representation """ - def __init_subclass__(cls, **kwargs): - """Print deprecation warning.""" - super().__init_subclass__(**kwargs) - _LOGGER.warning( - "GeorideSocket is deprecated, modify %s to use GeoRideSocket", - cls.__name__, - ) - def __init__(self, *argv): - """Print deprecation warning.""" - super().__init__(*argv) - _LOGGER.warning("GeorideSocket is deprecated, modify your code to use GeoRideSocket") \ No newline at end of file diff --git a/setup.py b/setup.py index 1e54be4..e5eedba 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,7 @@ CURRENT_DIR = os.path.dirname(__file__) setup( name='georideapilib', packages=['georideapilib'], # this must be the same as the name above - version='0.8.2', + version='0.8.3', description='Lib to control GeoRide tracker devices with theire rest api', author='Matthieu DUVAL', author_email='georideapilib@duval-dev.fr',