Wink subscription support (#2324)

homeassistant/components/sensor/wink.py

@@ -7,11 +7,12 @@ at https://home-assistant.io/components/sensor.wink/
 import logging
 
 from homeassistant.const import (CONF_ACCESS_TOKEN, STATE_CLOSED,
-                                 STATE_OPEN, TEMP_CELSIUS,
-                                 ATTR_BATTERY_LEVEL)
+                                 STATE_OPEN, TEMP_CELSIUS)
 from homeassistant.helpers.entity import Entity
+from homeassistant.components.wink import WinkDevice
+from homeassistant.loader import get_component
 
-REQUIREMENTS = ['python-wink==0.7.7']
+REQUIREMENTS = ['python-wink==0.7.8', 'pubnub==3.7.8']
 
 SENSOR_TYPES = ['temperature', 'humidity']
 
@@ -38,14 +39,14 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     add_devices(WinkEggMinder(eggtray) for eggtray in pywink.get_eggtrays())
 
 
-class WinkSensorDevice(Entity):
+class WinkSensorDevice(WinkDevice, Entity):
     """Representation of a Wink sensor."""
 
     def __init__(self, wink):
-        """Initialize the sensor."""
-        self.wink = wink
+        """Initialize the Wink device."""
+        super().__init__(wink)
+        wink = get_component('wink')
         self.capability = self.wink.capability()
-        self._battery = self.wink.battery_level
         if self.wink.UNIT == "°":
             self._unit_of_measurement = TEMP_CELSIUS
         else:
@@ -55,9 +56,9 @@ class WinkSensorDevice(Entity):
     def state(self):
         """Return the state."""
         if self.capability == "humidity":
-            return self.wink.humidity_percentage()
+            return round(self.wink.humidity_percentage())
         elif self.capability == "temperature":
-            return self.wink.temperature_float()
+            return round(self.wink.temperature_float(), 1)
         else:
             return STATE_OPEN if self.is_open else STATE_CLOSED
 
@@ -66,80 +67,20 @@ class WinkSensorDevice(Entity):
         """Return the unit of measurement of this entity, if any."""
         return self._unit_of_measurement
 
-    @property
-    def unique_id(self):
-        """Return the ID of this wink sensor."""
-        return "{}.{}".format(self.__class__, self.wink.device_id())
-
-    @property
-    def name(self):
-        """Return the name of the sensor if any."""
-        return self.wink.name()
-
-    @property
-    def available(self):
-        """True if connection == True."""
-        return self.wink.available
-
-    def update(self):
-        """Update state of the sensor."""
-        self.wink.update_state()
-
     @property
     def is_open(self):
         """Return true if door is open."""
         return self.wink.state()
 
-    @property
-    def device_state_attributes(self):
-        """Return the state attributes."""
-        if self._battery:
-            return {
-                ATTR_BATTERY_LEVEL: self._battery_level,
-            }
 
-    @property
-    def _battery_level(self):
-        """Return the battery level."""
-        return self.wink.battery_level * 100
-
-
-class WinkEggMinder(Entity):
+class WinkEggMinder(WinkDevice, Entity):
     """Representation of a Wink Egg Minder."""
 
     def __init__(self, wink):
         """Initialize the sensor."""
-        self.wink = wink
-        self._battery = self.wink.battery_level
+        WinkDevice.__init__(self, wink)
 
     @property
     def state(self):
         """Return the state."""
         return self.wink.state()
-
-    @property
-    def unique_id(self):
-        """Return the id of this wink Egg Minder."""
-        return "{}.{}".format(self.__class__, self.wink.device_id())
-
-    @property
-    def name(self):
-        """Return the name of the Egg Minder if any."""
-        return self.wink.name()
-
-    def update(self):
-        """Update state of the Egg Minder."""
-        self.wink.update_state()
-
-    @property
-    def device_state_attributes(self):
-        """Return the state attributes."""
-        if self._battery:
-            return {
-                ATTR_BATTERY_LEVEL: self._battery_level,
-            }
-
-    @property
-    def _battery_level(self):
-        """Return the battery level."""
-        return self.wink.battery_level * 100