wasserstand 0.0.6 → 0.0.7

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.cache_rake_t

data/lib/wasserstand.rb

@@ -2,6 +2,7 @@ require 'nokogiri'
 require 'open-uri'
 require 'tzinfo'
 require 'unicode_utils/upcase'
+require 'unicode_utils/downcase'
 
 require 'require_all'
 require_rel 'wasserstand'

data/lib/wasserstand/provider/level_mapper.rb

@@ -30,9 +30,9 @@ module Wasserstand
 
             messdatum = TZInfo::Timezone.get('Europe/Berlin').local_to_utc(Time.parse("#{datum} #{uhrzeit}"))
             wert = item.xpath('messwert').text.sub(',', '.').to_f
-            tendenz = item.xpath('tendenz').text.downcase.to_sym
+            tendenz = item.xpath('tendenz').text
 
-            pegel.measurements << Measurement.new(messdatum, wert, tendenz)
+            pegel.measurements << Measurement.new(messdatum, wert, Trend.new(tendenz))
           end
         end
       end

data/lib/wasserstand/trend.rb

@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+module Wasserstand
+  # http://blog.steveklabnik.com/posts/2012-09-09-random-ruby-tricks--class-new
+  IllegalValueError = Class.new(StandardError)
+
+  class Trend
+    def initialize(value)
+      @value = {'gleich'   => :gleichbleibend,
+                'steigend' => :steigend,
+                'fallend'  => :fallend}[UnicodeUtils.downcase(value.to_s)]
+
+      raise IllegalValueError, "Unknown trend #{value.inspect}" unless @value
+    end
+
+    def symbol
+      {:gleichbleibend => '⬄', :steigend => '⬀', :fallend => '⬂'}[@value]
+    end
+
+    def to_s
+      @value.to_s
+    end
+  end
+end

data/lib/wasserstand/version.rb

@@ -1,3 +1,3 @@
 module Wasserstand
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/test/unit/test_measurement.rb

@@ -4,8 +4,8 @@ class TestMeasurement < WasserstandTestCase
   def test_single
     konstanz_measurements = Waterway['BODENSEE'].levels['KONSTANZ'].measurements
 
+    assert_equal(1, konstanz_measurements.size)
     assert_equal(Time.parse('2012-09-13 18:00:00 UTC'), konstanz_measurements.last.date)
     assert_equal(380.7, konstanz_measurements.last.value)
-    assert_equal(:gleich, konstanz_measurements.last.trend)
   end
 end

data/test/unit/test_trend.rb

@@ -0,0 +1,59 @@
+# -*- encoding: utf-8 -*-
+require 'helper'
+
+class TestTrend < WasserstandTestCase
+
+  def test_create_unknown
+    assert_raises(ArgumentError){Trend.new}
+    assert_raises(IllegalValueError){Trend.new(nil)}
+    assert_raises(IllegalValueError){Trend.new('foobar')}
+    assert_raises(IllegalValueError){Trend.new(:foobar)}
+  end
+
+  def test_create_gleich
+    assert_trend_gleich(Trend.new('gleich'))
+    assert_trend_gleich(Trend.new('Gleich'))
+    assert_trend_gleich(Trend.new('GLEICH'))
+    assert_trend_gleich(Trend.new(:gleich))
+  end
+
+  def test_create_steigend
+    assert_trend_steigend(Trend.new('steigend'))
+    assert_trend_steigend(Trend.new('Steigend'))
+    assert_trend_steigend(Trend.new('STEIGEND'))
+    assert_trend_steigend(Trend.new(:steigend))
+  end
+
+  def test_create_fallend
+    assert_trend_fallend(Trend.new('fallend'))
+    assert_trend_fallend(Trend.new('Fallend'))
+    assert_trend_fallend(Trend.new('FALLEND'))
+    assert_trend_fallend(Trend.new(:fallend))
+  end
+
+  def test_mapped
+    assert_trend_gleich(Waterway['BODENSEE'].levels['KONSTANZ'].measurements.last.trend)
+    assert_trend_steigend(Waterway['Oder'].levels['SCHWEDT-ODERBRÜCKE'].measurements.last.trend)
+    assert_trend_fallend(Waterway['Elbe'].levels['STADERSAND'].measurements.last.trend)
+  end
+
+  private
+
+  def assert_trend_gleich(trend)
+    assert(trend)
+    assert_equal('⬄', trend.symbol)
+    assert_equal('gleichbleibend', trend.to_s)
+  end
+
+  def assert_trend_fallend(trend)
+    assert(trend)
+    assert_equal('⬂', trend.symbol)
+    assert_equal('fallend', trend.to_s)
+  end
+
+  def assert_trend_steigend(trend)
+    assert(trend)
+    assert_equal('⬀', trend.symbol)
+    assert_equal('steigend', trend.to_s)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wasserstand
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-17 00:00:00.000000000 Z
+date: 2012-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all
@@ -128,12 +128,14 @@ files:
 - lib/wasserstand/provider/level_mapper.rb
 - lib/wasserstand/provider/pegel-online.rb
 - lib/wasserstand/provider/waterway_mapper.rb
+- lib/wasserstand/trend.rb
 - lib/wasserstand/version.rb
 - lib/wasserstand/waterway.rb
 - test/fixtures/pegelstaende_neu.xml
 - test/helper.rb
 - test/unit/test_level.rb
 - test/unit/test_measurement.rb
+- test/unit/test_trend.rb
 - test/unit/test_waterway.rb
 - wasserstand.gemspec
 homepage: http://github.com/nerab/wasserstand
@@ -165,4 +167,5 @@ test_files:
 - test/helper.rb
 - test/unit/test_level.rb
 - test/unit/test_measurement.rb
+- test/unit/test_trend.rb
 - test/unit/test_waterway.rb