Travis

Author: andgineer

.travis.yml

@@ -0,0 +1,5 @@
+  language: python
+  python:
+    - "3.6"
+  script:
+    - pytest

ambientweather_livedata.py

@@ -16,87 +16,42 @@ class SensorData(object):
     battery ('Normal')
     """
 
-
-def parse(live_data_html):
-    """
-    Extract sensor's data from html (LiveData.html from your ObserverIP)
-    Returns touple with (sensor1, sensor2 -> SensorData)
-    """
-
-    tree = html.fromstring(live_data_html)
-    title = tree.xpath('//title/text()')
-    if title[0] != TITLE:
-        raise Exception('Wrong html page. Good one have to have title {}'.format(TITLE))
-
-    inSensor = SensorData()
-    time_str = tree.xpath('//input[@name="CurrTime"]/@value')[0]
-    inSensor.time = datetime.strptime(time_str, '%H:%M %m/%d/%Y')
-    inSensor.temp = float(tree.xpath('//input[@name="inTemp"]/@value')[0])
-    inSensor.humidity = float(tree.xpath('//input[@name="inHumi"]/@value')[0])
-    inSensor.abs_press = float(tree.xpath('//input[@name="AbsPress"]/@value')[0])
-    inSensor.rel_press = float(tree.xpath('//input[@name="RelPress"]/@value')[0])
-    inSensor.battery = tree.xpath('//input[@name="inBattSta"]/@value')[0]
-
-    outSensor = SensorData()
-    outSensor.time = inSensor.time
-    outSensor.temp = float(tree.xpath('//input[@name="outTemp"]/@value')[0])
-    outSensor.humidity = float(tree.xpath('//input[@name="outHumi"]/@value')[0])
-    outSensor.abs_press = inSensor.abs_press
-    outSensor.rel_press = inSensor.rel_press
-    outSensor.battery = tree.xpath('//input[@name="outBattSta2"]/@value')[0]
-
-    return inSensor, outSensor
-
-
-def get(url):
-    """
-    Load ObserverIP live data page from the URL and parse it
-
-    Returns touple with (sensor1, sensor2 -> SensorData)
-    """
-
-    page = requests.get(url).content
-    return parse(page)
-
-
-def test():
-    with open('LiveData.html', 'r') as f:
-        page = f.read()
-
-    inSensor, outSensor = parse(page)
-
-    print('Time: {}\n'.format(inSensor.time))
-    print('''Indoor\n{delimiter}\nTemperature: {temp}\nHumidity: {humidity}
-Absolute preassure: {abs_press}\nRelative preassure: {rel_press}\nBattery status: {battery}\n'''.format(
-        delimiter='='*20,
-        temp=inSensor.temp,
-        humidity=inSensor.humidity,
-        abs_press=inSensor.abs_press,
-        rel_press=inSensor.rel_press,
-        battery=inSensor.battery
-    ))
-    print('''Outdoor\n{delimiter}\nTemperature: {temp}\nHumidity: {humidity}
-Battery status: {battery}\n'''.format(
-        delimiter='='*20,
-        temp=inSensor.temp,
-        humidity=inSensor.humidity,
-        battery=inSensor.battery
-    ))
-
-    assert inSensor.time == datetime.strptime('2017/10/06 13:55:00', '%Y/%m/%d %H:%M:%S')
-    assert inSensor.temp == 21.9
-    assert inSensor.humidity == 50.0
-    assert inSensor.abs_press == 744.29
-    assert inSensor.rel_press == 728.31
-    assert inSensor.battery == 'Normal'
-    assert outSensor.temp == 10.1
-    assert outSensor.humidity == 71.0
-    assert outSensor.battery == 'Normal'
-
-
-if __name__ == '__main__':
-    test()
-
-
-
-
+    def parse(self, live_data_html):
+        """
+        Extract sensor's data from html (LiveData.html from your ObserverIP)
+        Returns touple with (sensor1, sensor2 -> SensorData)
+        """
+
+        tree = html.fromstring(live_data_html)
+        title = tree.xpath('//title/text()')
+        if title[0] != TITLE:
+            raise Exception('Wrong html page. Good one have to have title {}'.format(TITLE))
+
+        inSensor = SensorData()
+        time_str = tree.xpath('//input[@name="CurrTime"]/@value')[0]
+        inSensor.time = datetime.strptime(time_str, '%H:%M %m/%d/%Y')
+        inSensor.temp = float(tree.xpath('//input[@name="inTemp"]/@value')[0])
+        inSensor.humidity = float(tree.xpath('//input[@name="inHumi"]/@value')[0])
+        inSensor.abs_press = float(tree.xpath('//input[@name="AbsPress"]/@value')[0])
+        inSensor.rel_press = float(tree.xpath('//input[@name="RelPress"]/@value')[0])
+        inSensor.battery = tree.xpath('//input[@name="inBattSta"]/@value')[0]
+
+        outSensor = SensorData()
+        outSensor.time = inSensor.time
+        outSensor.temp = float(tree.xpath('//input[@name="outTemp"]/@value')[0])
+        outSensor.humidity = float(tree.xpath('//input[@name="outHumi"]/@value')[0])
+        outSensor.abs_press = inSensor.abs_press
+        outSensor.rel_press = inSensor.rel_press
+        outSensor.battery = tree.xpath('//input[@name="outBattSta2"]/@value')[0]
+
+        return inSensor, outSensor
+
+    def get(self, url):
+        """
+        Load ObserverIP live data page from the URL and parse it
+
+        Returns touple with (sensor1, sensor2 -> SensorData)
+        """
+
+        page = requests.get(url).content
+        return self.parse(page)

requirements.txt

@@ -0,0 +1,3 @@
+lxml
+requests
+

test/ambientweather_livedata_test.py

@@ -0,0 +1,42 @@
+from ambientweather_livedata import SensorData
+from _datetime import datetime
+
+
+def test():
+    with open('LiveData.html', 'r') as f:
+        page = f.read()
+
+    sensor_data = SensorData()
+    inSensor, outSensor = sensor_data.parse(page)
+
+    print('Time: {}\n'.format(inSensor.time))
+    print('''Indoor\n{delimiter}\nTemperature: {temp}\nHumidity: {humidity}
+Absolute preassure: {abs_press}\nRelative preassure: {rel_press}\nBattery status: {battery}\n'''.format(
+        delimiter='='*20,
+        temp=inSensor.temp,
+        humidity=inSensor.humidity,
+        abs_press=inSensor.abs_press,
+        rel_press=inSensor.rel_press,
+        battery=inSensor.battery
+    ))
+    print('''Outdoor\n{delimiter}\nTemperature: {temp}\nHumidity: {humidity}
+Battery status: {battery}\n'''.format(
+        delimiter='='*20,
+        temp=inSensor.temp,
+        humidity=inSensor.humidity,
+        battery=inSensor.battery
+    ))
+
+    assert inSensor.time == datetime.strptime('2017/10/06 13:55:00', '%Y/%m/%d %H:%M:%S')
+    assert inSensor.temp == 21.9
+    assert inSensor.humidity == 50.0
+    assert inSensor.abs_press == 744.29
+    assert inSensor.rel_press == 728.31
+    assert inSensor.battery == 'Normal'
+    assert outSensor.temp == 10.1
+    assert outSensor.humidity == 71.0
+    assert outSensor.battery == 'Normal'
+
+
+
+