wh2600 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82cfe0f175d0f030dde4178008d31a0a4defd4c1
-  data.tar.gz: 7da0532dad68d130740e5d1b1c1998c40c7cd66e
+  metadata.gz: 89e331e701c722c90a6ee0c3e60b7c466f1de641
+  data.tar.gz: 567152cb95ae18bb101b99e1b20f4c736c6ea778
 SHA512:
-  metadata.gz: 96faaa5016d449da7e79287d14660a400ec0acff62a30fd2ff0798c9ba25a03911595146875fcc0ea198138cc2af46a2c9e7f9f83b827b26081b33acc738f4cd
-  data.tar.gz: 8fc6eb3186896b42adb8af2e32129dc3a2696945f0458b7db5a2e40938acbf596c9af592ce4035687b00e1fa1359c97fdec728a9db4ff1063547e29237ced9a9
+  metadata.gz: 77bf8ea79446ce9a66686bfff4272132eb68e7de3caee4c25101f9f1c9cac99dd0e95dd92f6470851210f87cb5f8e31866a804aad358e35ce44247881a77987a
+  data.tar.gz: a73c1827350b8e667ce8c807157ff0a8143471489b905af087e6b5cbcb8d975b35f6297520c99e967bff970f7af8d0ae993f18b0f103b0bef11fc90005c6f1bc

data/lib/wh2600.rb

@@ -2,15 +2,14 @@ require 'nokogiri'
 require 'open-uri'
 
 class Wh2600
-  def initialize(ip_address, time_zone='CET')
+  def initialize(ip_address)
     @ip_address = ip_address
-    @time_zone = time_zone
   end
 
   def get_data(live_data_uri='livedata.htm')
     data = {}
     data_html = Nokogiri::HTML(open_page(live_data_uri))
-    data['receiver_datetime'] = DateTime.strptime(data_html.at_xpath('//input[@name="CurrTime"]')['value'] << @time_zone , '%H:%M %m/%d/%Y%Z')
+    data['station_datetime'] = Time.strptime(data_html.at_xpath('//input[@name="CurrTime"]').attr('value'), '%H:%M %m/%d/%Y')
     data['sensors'] = {}
     data['sensors']['indoor_id'] = data_html.at_xpath('//input[@name="IndoorID"]').attr('value')
     data['sensors']['outdoor1_id'] = data_html.at_xpath('//input[@name="Outdoor1ID"]').attr('value')
@@ -32,12 +31,12 @@ class Wh2600
     data['solar']['radiation'] = data_html.at_xpath('//input[@name="solarrad"]').attr('value').to_f
     data['solar']['uv'] = data_html.at_xpath('//input[@name="uv"]').attr('value').to_f
     data['solar']['uvi'] = data_html.at_xpath('//input[@name="uvi"]').attr('value').to_f
-    data['rain'] = {}
-    data['rain']['hourly'] = data_html.at_xpath('//input[@name="rainofhourly"]').attr('value').to_f
-    data['rain']['daily'] = data_html.at_xpath('//input[@name="rainofhourly"]').attr('value').to_f
-    data['rain']['weekly'] = data_html.at_xpath('//input[@name="rainofhourly"]').attr('value').to_f
-    data['rain']['monthly'] = data_html.at_xpath('//input[@name="rainofhourly"]').attr('value').to_f
-    data['rain']['yearly'] = data_html.at_xpath('//input[@name="rainofhourly"]').attr('value').to_f
+    data['rainfall'] = {}
+    data['rainfall']['hourly'] = data_html.at_xpath('//input[@name="rainofhourly"]').attr('value').to_f
+    data['rainfall']['daily'] = data_html.at_xpath('//input[@name="rainofhourly"]').attr('value').to_f
+    data['rainfall']['weekly'] = data_html.at_xpath('//input[@name="rainofhourly"]').attr('value').to_f
+    data['rainfall']['monthly'] = data_html.at_xpath('//input[@name="rainofhourly"]').attr('value').to_f
+    data['rainfall']['yearly'] = data_html.at_xpath('//input[@name="rainofhourly"]').attr('value').to_f
     return data
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wh2600
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Krunoslav Husak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-17 00:00:00.000000000 Z
+date: 2016-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri