skiplan_client 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42068c3a84b2879b16eec84694323bec90db2b22
-  data.tar.gz: a419f08eb37767a5c977848e963532d8a9d28e90
+  metadata.gz: 496d00698f96f630128ff4a9918df9a66b0bff9a
+  data.tar.gz: c6c09193f4a2f2467faccc691d9729b12ba0e812
 SHA512:
-  metadata.gz: 69574a4abf0874b67a44739fcaee6b59f8b9a207a1a1bbce401821655276ca7184d9d580379e121defc518c6062246b4bd89bbf2ee8942f22b3a6e5c5beba830
-  data.tar.gz: 558bf28a737ac02e7045284a3113b15c5b442b4200e2ddfc56e93e33d316c0234bb7416f07fe7f3954bff00d7470d9ba00aa9397efb27e9f80b95fc3e91e84a1
+  metadata.gz: 93fbbea408b667cd68adf49f893ad7b2d3511365cf7be8ea2f33f2abd6f49ff4e4bd753847e841d6e3dd326c77312d274cf8c62fbe9ad451307c0c851ed40495
+  data.tar.gz: b855c27449b4c3a21f2f3656f74d53bca05603cf66d10616302c81a750d2b68fc04709c858b1d4bea1a65502bc290e853e54a01580fc391727dd4921a4385ac0

data/data/lumi_response.xml

@@ -268,8 +268,8 @@
         <SKIABILITE val="0" lib="0 : station ferm??e"/>
         <AMBIANCE val="2" lib="Non : pas de neige"/>
         <RETOUR_SKI val="2" lib="Non : le retour n'est pas assur?? ou n'existe pas"/>
-        <ETAT_ROUTE val="0" lib="Routes d??gag??es, circulation normale"/>
-        <ETAT_CHAUSSEE val="8" lib="Non d??fini"/>
+        <ETAT_ROUTE val="0" lib="Routes degagees, circulation normale"/>
+        <ETAT_CHAUSSEE val="8" lib="Non defini"/>
         <PRATIQUE_ACTIVITES val="2" lib="Bonnes"/>
         <STATION_OUVERTURE val="2" lib="Ferm??e (fin de saison)"/>
         <STATION_PERIODE_HIVER debut="30/11/2013" debut_en="11/30/2013" fin="21/04/2014" fin_en="04/21/2014"/>

data/lib/skiplan_client/version.rb

@@ -1,3 +1,3 @@
 module SkiplanClient
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/lib/skiplan_client.rb

@@ -27,15 +27,6 @@ module SkiplanClient
       skiplan.forecasts[n['nom']] = Forecast.new(Hash.from_xml(n.to_s)['ZONE'])
     end
 
-    today_forecast = xml.xpath('//BULLETINS//JOUR//LANGUE[@val="fr"]')
-    skiplan.text_messages['today_forecast'] = Hash.from_xml(today_forecast.to_s)['LANGUE']
-
-    tomorrow_forecast = xml.xpath('//BULLETINS//LENDEMAIN//LANGUE[@val="fr"]')
-    skiplan.text_messages['tomorrow_forecast'] = Hash.from_xml(tomorrow_forecast.to_s)['LANGUE']
-
-    forecasts_comment = xml.xpath('//BULLETINS//COMMENTAIRES//LANGUE[@val="fr"]')
-    skiplan.text_messages['forecasts_comment'] = Hash.from_xml(forecasts_comment.to_s)['LANGUE']
-
     skiplan
   end
 
@@ -46,9 +37,6 @@ module SkiplanClient
     area_metrics = xml.xpath('//INDICES')
     area_metrics.each do |area|
       skiplan.metrics[area['nom']] = Metrics.new(Hash.from_xml(area.to_s)['INDICES'])
-      slopes_comment = area.xpath('.//COMMENTAIRES//LANGUE[@val="fr"]')
-      skiplan.text_messages[area['nom']] ||= {}
-      skiplan.text_messages[area['nom']]['slopes_comment'] = Hash.from_xml(slopes_comment.to_s)['LANGUE']
     end
 
     zones = xml.xpath('//SECTEUR')
@@ -58,4 +46,29 @@ module SkiplanClient
 
     skiplan
   end
+
+  def self.texts
+    xml = Nokogiri::XML(open(@config[:base_url]))
+    text_messages = {}
+
+    today_forecast = xml.xpath('//BULLETINS//JOUR//LANGUE[@val="fr"]')
+    text_messages['today_forecast'] = Hash.from_xml(today_forecast.to_s)['LANGUE']
+
+    tomorrow_forecast = xml.xpath('//BULLETINS//LENDEMAIN//LANGUE[@val="fr"]')
+    text_messages['tomorrow_forecast'] = Hash.from_xml(tomorrow_forecast.to_s)['LANGUE']
+
+    forecasts_comment = xml.xpath('//BULLETINS//COMMENTAIRES//LANGUE[@val="fr"]')
+    text_messages['forecasts_comment'] = Hash.from_xml(forecasts_comment.to_s)['LANGUE']
+
+    ski_area_comment = xml.xpath('//INDICES//COMMENTAIRES//LANGUE[@val="fr"]')
+    text_messages['ski_area'] = Hash.from_xml(ski_area_comment.to_s)['LANGUE']
+
+    conditions_comment = xml.xpath('//INDICES//ETAT_ROUTE')
+    text_messages['conditions'] = Hash.from_xml(conditions_comment.to_s)['ETAT_ROUTE']['lib']
+
+    roads_comment = xml.xpath('//INDICES//ETAT_CHAUSSEE')
+    text_messages['roads'] = Hash.from_xml(roads_comment.to_s)['ETAT_CHAUSSEE']['lib']
+
+    text_messages
+  end
 end

data/test/skiplan_client/skiplan_client_test.rb

@@ -82,16 +82,13 @@ class SkiplanClientTest < Test::Unit::TestCase
   end
 
   should 'retrieve forecasts text messages' do
-    text_forecasts = SkiplanClient.weather('CHINAILLON').text_messages
-
-    assert_equal 'Pluie. Vent faible variable.', text_forecasts['today_forecast']
-    assert_equal 'Beau temps sec et ensoleillé. Vent faible variable.', text_forecasts['tomorrow_forecast']
-    assert_equal 'Col de la Colombière ouvert.', text_forecasts['forecasts_comment']
-  end
-
-  should 'retrieve ski area text messages' do
-    text_forecasts = SkiplanClient.ski_area.text_messages['GRAND BORNAND']
-
-    assert_equal 'LE DOMAINE SKIABLE EST FERME POUR LA SAISON 2013/2014.', text_forecasts['slopes_comment']
+    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']
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: skiplan_client
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - SimonRonzani