skiplan_client 0.1.3 → 0.1.4

data/lib/skiplan_client/metrics.rb

@@ -5,8 +5,8 @@ class Metrics
 
   include AttributeHelper
 
-  METRICS = ['ETAT_ROUTE', 'SKI_NUIT', 'KM_SKATING', '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',
+  METRICS = ['ETAT_CHAUSSEE', 'ETAT_ROUTE', 'SKI_NUIT', 'KM_SKATING', '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']
 
   def initialize(attributes)
@@ -64,10 +64,14 @@ class Metrics
     @KM_SKATING['ouvert'] unless @KM_SKATING.nil?
   end
 
-  def roads
+  def driving_conditions
     @ETAT_ROUTE['lib']
   end
 
+  def roads
+    @ETAT_CHAUSSEE['lib'] unless (@ETAT_CHAUSSEE.nil? || @ETAT_CHAUSSEE['val'] == '8')
+  end
+
   private
 
   def get_ratio(hash)

data/lib/skiplan_client/version.rb

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

data/test/skiplan_client/metrics_test.rb

@@ -9,6 +9,7 @@ class MetricsTest < Test::Unit::TestCase
   
   setup do
     attributes = {'ETAT_ROUTE' => {'lib' => "Routes dégagées, circulation normale"},
+                  'ETAT_CHAUSSEE' => {'val' => '0', 'lib' => "Dégagées et sèches"},
                   'SKI_NUIT' => {'etat' => '1'},
                   'KM_SKATING' => {'ouvert' => '10'},
                   'SKI_ALPIN'=>{'total'=>'44', 'total_periode'=>'44', 'total_periode_hpf'=>'44', 'ouvertes_previsions'=>'0', 'ouvertes'=>'10', 'previsions'=>'0', 'fermees'=>'44', 'lng_total'=>'0.0', 'lng_ouverts'=>'0.0'},
@@ -89,7 +90,11 @@ class MetricsTest < Test::Unit::TestCase
     assert_equal '10', @metrics.skating
   end
 
-  should 'return a detailed status for the local roads' do
-    assert_equal 'Routes dégagées, circulation normale', @metrics.roads
+  should 'return a detailed status for the driving conditions' do
+    assert_equal 'Routes dégagées, circulation normale', @metrics.driving_conditions
+  end
+
+  should 'return a detailed status for the roads' do
+    assert_equal 'Dégagées et sèches', @metrics.roads
   end
 end

metadata

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