wasserstand 0.0.5 → 0.0.6

data/lib/wasserstand.rb

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

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

@@ -6,7 +6,6 @@ module Wasserstand
       end
 
       def [](name)
-        doc = Nokogiri::HTML(fetch(@url), nil, 'ISO-8859-1')
         results = doc.xpath(xpath_lookup(name))
 
         case results.size
@@ -20,13 +19,13 @@ module Wasserstand
       end
 
       def all
-        Nokogiri::HTML(fetch(@url), nil, 'ISO-8859-1').xpath(xpath_all).map{|o| mapper.map(o)}
+        doc.xpath(xpath_all).map{|o| mapper.map(o)}
       end
 
       def find_by_name(name_expression)
         # Not the best performing way, but it gives us the ability to use the  XPath 2.0 'matches' function
         # which isn't supported in Nokogiri (yet).
-        Nokogiri::HTML(fetch(@url), nil, 'ISO-8859-1').xpath(xpath_finder(name_expression), Class.new{
+        doc.xpath(xpath_finder(name_expression), Class.new{
           def matches(node_set, regex)
             node_set.find_all do |node|
               node.to_s.match(%r{#{regex}})
@@ -38,7 +37,7 @@ module Wasserstand
       protected
 
       def xpath_lookup(name)
-        "#{xpath_all}[#{name_attribute}/text() = '#{name.upcase}']"
+        "#{xpath_all}[#{name_attribute}/text() = '#{UnicodeUtils.upcase(name)}']"
       end
 
       def xpath_finder(regex)
@@ -52,6 +51,12 @@ module Wasserstand
       def name_attribute
         'name'
       end
+
+      private
+
+      def doc
+        Nokogiri::HTML(fetch(@url), nil, 'ISO-8859-1')
+      end
     end
 
     class WaterwayProvider < Provider

data/lib/wasserstand/version.rb

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

data/lib/wasserstand/waterway.rb

@@ -2,11 +2,11 @@ module Wasserstand
   # http://stackoverflow.com/questions/2030336/how-do-i-create-a-hash-in-ruby-that-compares-strings-ignoring-case
   class HashClod < Hash
     def [](key)
-      key.respond_to?(:upcase) ? super(key.upcase) : super(key)
+      key.respond_to?(:upcase) ? super(UnicodeUtils.upcase(key)) : super(key)
     end
 
     def []=(key, value)
-      key.respond_to?(:upcase) ? super(key.encode.upcase, value) : super(key, value)
+      key.respond_to?(:upcase) ? super(UnicodeUtils.upcase(key), value) : super(key, value)
     end
   end
 

data/test/helper.rb

@@ -7,5 +7,6 @@ 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)
   end
 end

data/test/unit/test_waterway.rb

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 require 'helper'
 
 class TestWaterway < WasserstandTestCase
@@ -18,4 +19,9 @@ class TestWaterway < WasserstandTestCase
     assert(Waterway['Elbe'].levels['Pirna'])
     assert(Waterway['ELBE-HAVEL-KANAL'].levels['GENTHIN'])
   end
+
+  def test_lookup_umlaut
+    assert(Waterway['Küstenkanal'])
+    assert(Waterway['Elbe'].levels['Schöna'])
+  end
 end

data/wasserstand.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'require_all'
   gem.add_runtime_dependency 'nokogiri'
   gem.add_runtime_dependency 'tzinfo'
+  gem.add_runtime_dependency 'unicode_utils'
   gem.add_development_dependency 'minitest'
   gem.add_development_dependency 'rake'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wasserstand
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-16 00:00:00.000000000 Z
+date: 2012-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: unicode_utils
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement