skiplan_client 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94773202512f28a9b5ec221e91ebb45151f3bb4d
-  data.tar.gz: a8bfcec5b4e3959556bbbc4998475adb0410ad47
+  metadata.gz: c3b5e3eb3aee4a977eee4cbbc1a8fbeb96ca2717
+  data.tar.gz: 93e01c7036deecd5bb1dd5faa1c5580723b4b471
 SHA512:
-  metadata.gz: fae8e1a71257d9ed055592f5bc7f8ec1a835027c5e79b5fa8084d710f0312dc22454afa416d54214daa2984e599288f0470f4cadee3589f75bbf6ad2b14afa30
-  data.tar.gz: 3ea1a3c7d5a1c195a68c991e2f19ff5228d5b5dc4a1e2f39994269bd67d93516a71261f67c6f73fcb5b3aaf7229182dfbc92f64bfca7664d9fcbadcf61540f3b
+  metadata.gz: 2902eb1ddab5f7849a023ed8ea87ea4521f5dcfc3cf6aa19bd1b84192efb89c4ca04e8bf8a65b704870f9d62cee636937e31fbb3a83730ca4837c1a3136e8167
+  data.tar.gz: 1590c29da44bebe320760f0cb985e4f9d0b48bd79c103872918404413ecbcfa454c9e857eafd64a45b39ce2884807243f9725fa33b48691dfbd9987cc497e625

data/lib/skiplan_client.rb

@@ -49,18 +49,27 @@ module SkiplanClient
 
   def self.texts
     xml = Nokogiri::XML(open(@config[:base_url]))
+    {
+        fr: SkiplanClient.localized_texts(xml, 'fr'),
+        en: SkiplanClient.localized_texts(xml, 'en')
+    }
+  end
+
+  private
+
+  def self.localized_texts(xml, locale)
     text_messages = {}
 
-    today_forecast = xml.xpath('//BULLETINS//JOUR//LANGUE[@val="fr"]')
+    today_forecast = xml.xpath('//BULLETINS//JOUR//LANGUE[@val="' + locale + '"]')
     text_messages['today_forecast'] = Hash.from_xml(today_forecast.to_s)['LANGUE']
 
-    tomorrow_forecast = xml.xpath('//BULLETINS//LENDEMAIN//LANGUE[@val="fr"]')
+    tomorrow_forecast = xml.xpath('//BULLETINS//LENDEMAIN//LANGUE[@val="' + locale + '"]')
     text_messages['tomorrow_forecast'] = Hash.from_xml(tomorrow_forecast.to_s)['LANGUE']
 
-    forecasts_comment = xml.xpath('//BULLETINS//COMMENTAIRES//LANGUE[@val="fr"]')
+    forecasts_comment = xml.xpath('//BULLETINS//COMMENTAIRES//LANGUE[@val="' + locale + '"]')
     text_messages['forecasts_comment'] = Hash.from_xml(forecasts_comment.to_s)['LANGUE']
 
-    ski_area_comment = xml.xpath('//INDICES//COMMENTAIRES//LANGUE[@val="fr"]')
+    ski_area_comment = xml.xpath('//INDICES//COMMENTAIRES//LANGUE[@val="' + locale + '"]')
     text_messages['ski_area'] = Hash.from_xml(ski_area_comment.to_s)['LANGUE']
 
     conditions_comment = xml.xpath('//INDICES//ETAT_ROUTE')

data/lib/skiplan_client/version.rb

@@ -1,3 +1,3 @@
 module SkiplanClient
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

data/test/skiplan_client/skiplan_client_test.rb

@@ -85,11 +85,17 @@ class SkiplanClientTest < Test::Unit::TestCase
   should 'retrieve forecasts text messages' do
     texts = SkiplanClient.texts
 
-    assert_equal 'Pluie. Vent faible variable.', texts['today_forecast']
-    assert_equal 'Beau temps sec et ensoleillé. Vent faible variable.', texts['tomorrow_forecast']
-    assert_equal 'Col de la Colombière ouvert.', texts['forecasts_comment']
-    assert_equal 'LE DOMAINE SKIABLE EST FERME POUR LA SAISON 2013/2014.', texts['ski_area']
-    assert_equal 'Routes degagees, circulation normale', texts['conditions']
-    assert_equal 'Non defini', texts['roads']
+    assert_equal 'Pluie. Vent faible variable.', texts[:fr]['today_forecast']
+    assert_equal 'Beau temps sec et ensoleillé. Vent faible variable.', texts[:fr]['tomorrow_forecast']
+    assert_equal 'Col de la Colombière ouvert.', texts[:fr]['forecasts_comment']
+    assert_equal 'LE DOMAINE SKIABLE EST FERME POUR LA SAISON 2013/2014.', texts[:fr]['ski_area']
+    assert_equal 'Routes degagees, circulation normale', texts[:fr]['conditions']
+    assert_equal 'Non defini', texts[:fr]['roads']
+    assert_equal 'Rain and snow. Variable winds, light at most places.', texts[:en]['today_forecast']
+    assert_equal 'Dry and mostly sunny. Variable winds, light at most places.', texts[:en]['tomorrow_forecast']
+    assert_equal 'Col de la Colombière open.', texts[:en]['forecasts_comment']
+    assert_equal 'SKI AREA IS CLOSED FOR THE SEASON 2013/2014.', texts[:en]['ski_area']
+    assert_equal 'Routes degagees, circulation normale', texts[:en]['conditions']
+    assert_equal 'Non defini', texts[:en]['roads']
   end
 end

data/test/skiplan_client/zone_test.rb

@@ -8,7 +8,10 @@ class ZoneTest < Test::Unit::TestCase
 
   setup do
     attributes = {'nom' => 'ALPIN CHINAILLON',
-                  'REMONTEE' => [{'nom' => 'TS LA FLORIA', 'etat' => 'O', 'type' => 'TS', 'msg' => 'Fermee pour la saison', 'heuredeb' => '09:00', 'heurefin' => '16:45'},
+                  'REMONTEE' => [{
+                                     'nom' => 'TS LA FLORIA', 'etat' => 'O', 'type' => 'TS', 'msg' => 'Fermee pour la saison', 'heuredeb' => '09:00', 'heurefin' => '16:45',
+                                     'MSG_ASSOCIE' => ['message fr', 'message en']
+                                 },
                                  {'nom' => 'TK LE STADE', 'etat' => 'F', 'type' => 'TK', 'msg' => 'Fermee pour la saison', 'heuredeb' => '09:00', 'heurefin' => '16:00'}],
                   'PISTE' => [{'nom' => 'LA SERPENTINE', 'etat' => 'F', 'type' => 'A', 'msg' => 'Piste de retour au Village', 'niveau' => 'V', 'entretien_num' => '1'},
                               {'nom' => 'LE VENAY', 'etat' => 'O', 'type' => 'A', 'msg' => '', 'niveau' => 'V', 'entretien_num' => '0'}],
@@ -20,7 +23,10 @@ class ZoneTest < Test::Unit::TestCase
 
   should 'retrieve the data for a given zone' do
     assert_equal 'ALPIN CHINAILLON', @zone.name
-    assert_equal [{'nom' => 'TS LA FLORIA', 'etat' => 'O', 'type' => 'TS', 'msg' => 'Fermee pour la saison', 'heuredeb' => '09:00', 'heurefin' => '16:45'},
+    assert_equal [{
+                      'nom' => 'TS LA FLORIA', 'etat' => 'O', 'type' => 'TS', 'msg' => 'Fermee pour la saison', 'heuredeb' => '09:00', 'heurefin' => '16:45',
+                      'MSG_ASSOCIE' => ['message fr', 'message en']
+                  },
                   {'nom' => 'TK LE STADE', 'etat' => 'F', 'type' => 'TK', 'msg' => 'Fermee pour la saison', 'heuredeb' => '09:00', 'heurefin' => '16:00'}], @zone.skilifts
     assert_equal [{'nom' => 'LA SERPENTINE', 'etat' => 'F', 'type' => 'A', 'msg' => 'Piste de retour au Village', 'niveau' => 'V', 'entretien_num' => '1'},
                   {'nom' => 'LE VENAY', 'etat' => 'O', 'type' => 'A', 'msg' => '', 'niveau' => 'V', 'entretien_num' => '0'}], @zone.slopes

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: skiplan_client
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - SimonRonzani
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-03 00:00:00.000000000 Z
+date: 2015-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler