wasserstand 0.0.2 → 0.0.3

data/lib/wasserstand/mapper.rb

@@ -21,13 +21,17 @@ module Wasserstand
       def map(node)
         Waterway.new(node.xpath('name').text) .tap do |ww|
           node.xpath('item').each do |item|
-            ww.level[name] = Level.new(item.xpath('pegelnummer').text).tap do |pegel|
-              pegel.name = item.xpath('pegelname').text
+            pegel_name = item.xpath('pegelname').text
+            ww.levels[pegel_name] = Level.new(item.xpath('pegelnummer').text).tap do |pegel|
+              pegel.name = pegel_name
               pegel.km = item.xpath('km').text
 
-              messdatum = Time.now # TODO parse date from date and time elements
-              wert = item.xpath('messwert').text
-              tendenz = item.xpath('tendenz').text
+              datum = item.xpath('datum').text
+              uhrzeit = item.xpath('uhrzeit').text
+
+              messdatum = Time.parse("#{datum} #{uhrzeit}")
+              wert = item.xpath('messwert').text.sub(',', '.').to_f
+              tendenz = item.xpath('tendenz').text.downcase.to_sym
 
               pegel.measurements << Measurement.new(messdatum, wert, tendenz)
             end

data/lib/wasserstand/version.rb

@@ -1,3 +1,3 @@
 module Wasserstand
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/wasserstand/waterway.rb

@@ -6,11 +6,11 @@ module Wasserstand
       end
     end
 
-    attr_reader :name, :level
+    attr_reader :name, :levels
 
     def initialize(name)
       @name = name
-      @level = {}
+      @levels = {}
     end
   end
 end

data/lib/wasserstand.rb

@@ -1,5 +1,6 @@
 require 'nokogiri'
 require 'open-uri'
+require 'tzinfo'
 
 require 'require_all'
 require_rel 'wasserstand'

data/test/unit/test_wasserstand.rb

@@ -13,6 +13,19 @@ class TestWasserstand < MiniTest::Unit::TestCase
   end
 
   def test_levels
-    assert_equal(1, Waterway['BODENSEE'].level.size)
+    assert_equal(1, Waterway['BODENSEE'].levels.size)
+  end
+
+  def test_level_lookup
+    assert(Waterway['BODENSEE'].levels['KONSTANZ'])
+    assert(Waterway['ELBE-HAVEL-KANAL'].levels['GENTHIN'])
+  end
+
+  def test_single_measurement
+    konstanz_measurements = Waterway['BODENSEE'].levels['KONSTANZ'].measurements
+
+    assert_equal(Time.parse('2012-09-13 20:00:00 +0200'), konstanz_measurements.last.date)
+    assert_equal(380.7, konstanz_measurements.last.value)
+    assert_equal(:gleich, konstanz_measurements.last.trend)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wasserstand
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors: