skiplan_client 0.1.4 → 0.1.5

data/Rakefile

@@ -1 +1,7 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.verbose = true
+  t.pattern = '**/*_test.rb'
+end

data/data/lumi_response.xml

@@ -278,16 +278,8 @@
         <SKI_AURORE etat="0"/>
         <KM_SKATING ouvert="0"/>
         <COMMENTAIRES>
-          <LANGUE val="en"><![CDATA[SKI AREA IS CLOSED FOR THE SEASON 2013/2014.
-
-Col de la Colombi??re closed.
-Road D12 is closed between St Pierre en Faucigny and Petit-Bornand les Gli??res from 31/03 to 15/06/14 for work. Deviation from Annecy.
-Ski lifts opening and slopes access may change at any time depending on weather conditions and various maintenance operations. Outside opening hours, the ski area is strictly prohibited.]]></LANGUE>
-          <LANGUE val="fr"><![CDATA[LE DOMAINE SKIABLE EST FERM?? POUR LA SAISON 2013/2014.
-
-Col de la Colombi??re ferm??.
-Attention, fermeture de la D12 entre St Pierre en Faucigny et Petit-Bornand les Gli??res du 31/03 au 15/06/14 pour travaux. D??viation par Annecy.
-L'ouverture des remont??es m??caniques et l'acc??s aux pistes peuvent ??voluer en fonction des conditions m??t??orologiques et des op??rations d'entretien et de maintenance. En dehors des heures d'ouverture, le domaine skiable est strictement interdit.]]></LANGUE>
+          <LANGUE val="en"><![CDATA[SKI AREA IS CLOSED FOR THE SEASON 2013/2014.]]></LANGUE>
+          <LANGUE val="fr"><![CDATA[LE DOMAINE SKIABLE EST FERME POUR LA SAISON 2013/2014.]]></LANGUE>
         </COMMENTAIRES>
         <PISTES total="44" total_periode="44" total_periode_hpf="44" ouvertes_previsions="0" ouvertes="0" previsions="0" fermees="44" lng_total="0.0" lng_ouverts="0.0"/>
         <PISTES_VERTES total="12" total_periode="12" total_periode_hpf="12" ouvertes_previsions="0" ouvertes="0" previsions="0" fermees="12" lng_total="0.0" lng_ouverts="0.0"/>

data/lib/skiplan_client/metrics.rb

@@ -5,7 +5,7 @@ class Metrics
 
   include AttributeHelper
 
-  METRICS = ['ETAT_CHAUSSEE', 'ETAT_ROUTE', 'SKI_NUIT', 'KM_SKATING', 'SKI_ALPIN', 'SKI_ALPIN_VERTES', 'SKI_ALPIN_BLEUES', 'SKI_ALPIN_ROUGES',
+  METRICS = ['ETAT_CHAUSSEE', 'ETAT_ROUTE', 'SKI_NUIT', 'KM_SKATING', 'COMMENTAIRES', 'SKI_ALPIN', 'SKI_ALPIN_VERTES', 'SKI_ALPIN_BLEUES', 'SKI_ALPIN_ROUGES',
              'SKI_ALPIN_NOIRES', 'SKI_NORDIQUE', 'SKI_NORDIQUE_VERTES', 'SKI_NORDIQUE_BLEUES', 'SKI_NORDIQUE_ROUGES', 'SKI_NORDIQUE_NOIRES',
              'REMONTEES', 'PIETONS', 'RAQUETTES', 'LUGE', 'SNOWPARK']
 

data/lib/skiplan_client/skiplan.rb

@@ -1,10 +1,10 @@
 class Skiplan
 
-  attr_accessor :forecasts, :text_forecasts, :metrics, :zones
+  attr_accessor :forecasts, :text_messages, :metrics, :zones
 
   def initialize
     @forecasts = {}
     @zones = {}
-    @text_forecasts = {}
+    @text_messages = {}
   end
 end

data/lib/skiplan_client/version.rb

@@ -1,3 +1,3 @@
 module SkiplanClient
-  VERSION = "0.1.4"
+  VERSION = '0.1.5'
 end

data/lib/skiplan_client.rb

@@ -41,8 +41,14 @@ module SkiplanClient
       weather.zones[z['nom']] = Zone.new(Hash.from_xml(z.to_s)['SECTEUR'])
     end
 
-    text_forecasts = xml.xpath('//BULLETINS//JOUR//LANGUE[@val="fr"]')
-    weather.text_forecasts = Hash.from_xml(text_forecasts.to_s)['LANGUE']
+    today_forecast = xml.xpath('//BULLETINS//JOUR//LANGUE[@val="fr"]')
+    weather.text_messages['today_forecast'] = Hash.from_xml(today_forecast.to_s)['LANGUE']
+
+    forecasts_comment = xml.xpath('//BULLETINS//COMMENTAIRES//LANGUE[@val="fr"]')
+    weather.text_messages['forecasts_comment'] = Hash.from_xml(forecasts_comment.to_s)['LANGUE']
+
+    slopes_comment = xml.xpath('//INDICES//COMMENTAIRES//LANGUE[@val="fr"]')
+    weather.text_messages['slopes_comment'] = Hash.from_xml(slopes_comment.to_s)['LANGUE']
 
     weather
   end

data/test/skiplan_client/skiplan_client_test.rb

@@ -8,9 +8,15 @@ require 'skiplan_client/skiplan'
 
 class SkiplanClientTest < Test::Unit::TestCase
 
-  should 'retrieve weather data' do
+  setup do
+    if Dir.pwd.include?('test')
+      SkiplanClient.configure('../../data/lumi_response.xml')
+    else
+      SkiplanClient.configure('data/lumi_response.xml')
+    end
+  end
 
-    SkiplanClient.configure('../../data/lumi_response.xml')
+  should 'retrieve weather data' do
     weather = SkiplanClient.get_weather('CHINAILLON')
 
     today_forecast = weather.forecasts['j']
@@ -48,7 +54,6 @@ class SkiplanClientTest < Test::Unit::TestCase
   end
 
   should 'retrieve metrics data' do
-    SkiplanClient.configure('../../data/lumi_response.xml')
     metrics = SkiplanClient.get_weather('CHINAILLON').metrics
 
     assert_equal '0/44', metrics.alpine[:total]
@@ -60,7 +65,6 @@ class SkiplanClientTest < Test::Unit::TestCase
   end
 
   should 'retrieve zones data' do
-    SkiplanClient.configure('../../data/lumi_response.xml')
     zones = SkiplanClient.get_weather('CHINAILLON').zones
 
     assert_equal 10, zones.length
@@ -76,10 +80,11 @@ class SkiplanClientTest < Test::Unit::TestCase
     assert_equal 'my_new_url', config
   end
 
-  should 'retrieve text forecasts' do
-    SkiplanClient.configure('../../data/lumi_response.xml')
-    text_forecasts = SkiplanClient.get_weather('CHINAILLON').text_forecasts
+  should 'retrieve text messages' do
+    text_forecasts = SkiplanClient.get_weather('CHINAILLON').text_messages
 
-    assert_equal 'Pluie. Vent faible variable.', text_forecasts
+    assert_equal 'Pluie. Vent faible variable.', text_forecasts['today_forecast']
+    assert_equal 'Col de la Colombière ouvert.', text_forecasts['forecasts_comment']
+    assert_equal 'LE DOMAINE SKIABLE EST FERME POUR LA SAISON 2013/2014.', text_forecasts['slopes_comment']
   end
 end

data/test/skiplan_client/zone_test.rb

@@ -9,9 +9,9 @@ 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'},
-                                 {'nom' => 'TK LE STADE', 'etat' => 'F', 'type' => 'TK', 'msg' => 'Fermee pour la saison'}],
-                  'PISTE' => [{'nom' => 'LA SERPENTINE', 'etat' => 'F', 'type' => 'A', 'msg' => '', 'niveau' => 'V'},
+                  'REMONTEE' => [{'nom' => 'TS LA FLORIA', 'etat' => 'O', 'type' => 'TS', 'msg' => 'Fermee pour la saison', 'heuredeb' => '09:00', 'heurefin' => '16:45'},
+                                 {'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'},
                               {'nom' => 'LE VENAY', 'etat' => 'O', 'type' => 'A', 'msg' => '', 'niveau' => 'V'}]
     }
     @zone = Zone.new(attributes)
@@ -19,9 +19,9 @@ 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'},
-                  {'nom' => 'TK LE STADE', 'etat' => 'F', 'type' => 'TK', 'msg' => 'Fermee pour la saison'}], @zone.skilifts
-    assert_equal [{'nom' => 'LA SERPENTINE', 'etat' => 'F', 'type' => 'A', 'msg' => '', 'niveau' => 'V'},
+    assert_equal [{'nom' => 'TS LA FLORIA', 'etat' => 'O', 'type' => 'TS', 'msg' => 'Fermee pour la saison', 'heuredeb' => '09:00', 'heurefin' => '16:45'},
+                  {'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'},
                   {'nom' => 'LE VENAY', 'etat' => 'O', 'type' => 'A', 'msg' => '', 'niveau' => 'V'}], @zone.slopes
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: skiplan_client
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler