wasserstand 0.0.7 → 0.0.8

data/lib/wasserstand.rb

@@ -9,14 +9,8 @@ require_rel 'wasserstand'
 
 module Wasserstand
   class << self
-    attr_writer :waterway_provider, :level_provider
-
-    def waterway_provider
-      @waterway_provider ||= PegelOnline::WaterwayProvider.new
-    end
-
-    def level_provider
-      @level_provider ||= PegelOnline::LevelProvider.new
+    def providers
+      @providers ||= Hash.new{|hash, k| hash[k] = k.new}
     end
   end
 end

data/lib/wasserstand/level.rb

@@ -5,15 +5,21 @@ module Wasserstand
   class Level # Pegel
     class << self
       def [](name)
-        Wasserstand.level_provider[name]
+        provider[name]
       end
 
       def all
-        Wasserstand.level_provider.all
+        provider.all
       end
 
       def find_by_name(regex)
-        Wasserstand.level_provider.find_by_name(regex)
+        provider.find_by_name(regex)
+      end
+
+      private
+
+      def provider
+        Wasserstand.providers[PegelOnline::LevelProvider]
       end
     end
 

data/lib/wasserstand/provider/pegel-online.rb

@@ -45,6 +45,7 @@ module Wasserstand
       end
 
       def fetch(url)
+        STDERR.puts "FETCH #{url}"
         open(url).read
       end
 

data/lib/wasserstand/trend.rb

@@ -5,15 +5,19 @@ module Wasserstand
 
   class Trend
     def initialize(value)
-      @value = {'gleich'   => :gleichbleibend,
-                'steigend' => :steigend,
-                'fallend'  => :fallend}[UnicodeUtils.downcase(value.to_s)]
+      @value = {'gleich'    => :gleichbleibend,
+                'steigend'  => :steigend,
+                'fallend'   => :fallend,
+                'unbekannt' => :unbekannt}[UnicodeUtils.downcase(value.to_s)]
 
       raise IllegalValueError, "Unknown trend #{value.inspect}" unless @value
     end
 
     def symbol
-      {:gleichbleibend => '⬄', :steigend => '⬀', :fallend => '⬂'}[@value]
+      {:gleichbleibend => '⬄',
+       :steigend       => '⬀',
+       :fallend        => '⬂',
+       :unbekannt      => '?'}[@value]
     end
 
     def to_s

data/lib/wasserstand/version.rb

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

data/lib/wasserstand/waterway.rb

@@ -13,15 +13,21 @@ module Wasserstand
   class Waterway
     class << self
       def [](name)
-        Wasserstand.waterway_provider[name]
+        provider[name]
       end
 
       def all
-        Wasserstand.waterway_provider.all
+        provider.all
       end
 
       def find_by_name(regex)
-        Wasserstand.waterway_provider.find_by_name(regex)
+        provider.find_by_name(regex)
+      end
+
+      private
+
+      def provider
+        Wasserstand.providers[PegelOnline::WaterwayProvider]
       end
     end
 

data/test/fixtures/pegelstaende_neu.xml

@@ -5203,7 +5203,7 @@
 <messwert>137</messwert>
 <km>27,9</km>
 <pnp>54,666</pnp>
-<tendenz>Gleich</tendenz>
+<tendenz>Unbekannt</tendenz>
 <datum>13.09.2012</datum>
 <uhrzeit>05:00:00</uhrzeit>
 <pegelnummer>579100</pegelnummer>

data/test/helper.rb

@@ -6,7 +6,7 @@ class WasserstandTestCase < MiniTest::Unit::TestCase
 
   def setup
     url = File.join(File.dirname(__FILE__), 'fixtures', 'pegelstaende_neu.xml')
-    Wasserstand.waterway_provider = PegelOnline::WaterwayProvider.new(url)
-    Wasserstand.level_provider = PegelOnline::LevelProvider.new(url)
+    Wasserstand.providers[PegelOnline::WaterwayProvider] = PegelOnline::WaterwayProvider.new(url)
+    Wasserstand.providers[PegelOnline::LevelProvider] = PegelOnline::LevelProvider.new(url)
   end
 end

data/test/unit/test_trend.rb

@@ -3,7 +3,7 @@ require 'helper'
 
 class TestTrend < WasserstandTestCase
 
-  def test_create_unknown
+  def test_create_illegal
     assert_raises(ArgumentError){Trend.new}
     assert_raises(IllegalValueError){Trend.new(nil)}
     assert_raises(IllegalValueError){Trend.new('foobar')}
@@ -31,10 +31,18 @@ class TestTrend < WasserstandTestCase
     assert_trend_fallend(Trend.new(:fallend))
   end
 
+  def test_create_unbekannt
+    assert_trend_unbekannt(Trend.new('unbekannt'))
+    assert_trend_unbekannt(Trend.new('Unbekannt'))
+    assert_trend_unbekannt(Trend.new('UNBEKANNT'))
+    assert_trend_unbekannt(Trend.new(:unbekannt))
+  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)
+    assert_trend_unbekannt(Waterway['Saale'].levels['Nienburg'].measurements.last.trend)
   end
 
   private
@@ -56,4 +64,10 @@ class TestTrend < WasserstandTestCase
     assert_equal('⬀', trend.symbol)
     assert_equal('steigend', trend.to_s)
   end
+
+  def assert_trend_unbekannt(trend)
+    assert(trend)
+    assert_equal('?', trend.symbol)
+    assert_equal('unbekannt', trend.to_s)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wasserstand
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-18 00:00:00.000000000 Z
+date: 2012-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all