sitra_client 0.0.3 → 0.0.4

data/lib/sitra_client/touristic_object.rb

@@ -5,6 +5,25 @@ class TouristicObject
 
   include AttributeHelper
 
+  SPECIFIC_INFOS = {
+    'ACTIVITE' => '@informationsActivite',
+    'COMMERCE_ET_SERVICE' => '@informationsCommerceEtService',
+    'DEGUSTATION' => '@informationsDegustation',
+    'DOMAINE_SKIABLE' => '@informationsDomaineSkiable',
+    'EQUIPEMENT' => '@informationsEquipement',
+    'FETE_ET_MANIFESTATION' => '@informationsFeteEtManifestation',
+    'HEBERGEMENT_COLLECTIF' => '@informationsHebergementCollectif',
+    'HEBERGEMENT_LOCATIF' => '@informationsHebergementLocatif',
+    'HOTELLERIE' => '@informationsHotellerie',
+    'HOTELLERIE_PLEIN_AIR' => '@informationsHotelleriePleinAir',
+    'PATRIMOINE_CULTUREL' => '@informationsPatrimoineCulturel',
+    'PATRIMOINE_NATUREL' => '@informationsPatrimoineNaturel',
+    'RESTAURATION' => '@informationsRestauration',
+    'SEJOUR_PACKAGE' => '@informationsSejourPackage',
+    'STRUCTURE' => '@informationsStructure',
+    'TERRITOIRE' => '@informationsTerritoire'
+  }
+
   def initialize(hash)
     self.attributes = hash
   end
@@ -13,6 +32,10 @@ class TouristicObject
     @id.to_s
   end
 
+  def type
+    @type
+  end
+
   def title
     @nom[:libelleFr]
   end
@@ -25,16 +48,26 @@ class TouristicObject
     @presentation[:descriptifDetaille][:libelleFr] unless @presentation[:descriptifDetaille].nil?
   end
 
-  def contact
+  def contact(fields = [])
     contact_details = {}
     contact_entries = @informations[:moyensCommunication].nil? ? [] : @informations[:moyensCommunication]
     contact_entries.each do |c|
       label = c[:type][:libelleFr]
-      contact_details[c[:type][:libelleFr]] = c[:coordonnee] unless label == 'Fax'
+      if fields.include?(label)
+        contact_details[c[:type][:libelleFr]] = c[:coordonnee] unless label.downcase.include?('fax')
+      end
     end
     contact_details
   end
 
+  def information
+    specific_information = {}
+    unless @type.nil?
+      specific_information = instance_variable_get(SPECIFIC_INFOS[@type])
+    end
+    @informations.merge(specific_information)
+  end
+
   def picture_url(default_url)
     @imagePrincipale.nil? ? default_url : @imagePrincipale[:traductionFichiers][0][:url]
   end

data/lib/sitra_client/version.rb

@@ -1,3 +1,3 @@
 module SitraClient
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/sitra_client/touristic_object_test.rb

@@ -28,18 +28,19 @@ class TouristicObjectTest < Test::Unit::TestCase
     assert_equal 'my_detailed_description', touristic_object.details
   end
 
-  should 'populate contact details' do
+  should 'populate contact details for provided fields' do
     hash_result = {
         :informations => {
             :moyensCommunication => [
                 {:type => {:libelleFr => "Téléphone"}, :coordonnee => "0123456789"},
+                {:type => {:libelleFr => "Mél"}, :coordonnee => "my@email.fr"},
                 {:type => {:libelleFr => "Fax"}, :coordonnee => "9876543201"}
             ]
         }
     }
     touristic_object = TouristicObject.new(hash_result)
 
-    assert_equal({'Téléphone' => '0123456789'}, touristic_object.contact)
+    assert_equal({'Téléphone' => '0123456789', 'Mél' => 'my@email.fr'}, touristic_object.contact(['Téléphone', 'Mél']))
   end
 
   should 'populate image details' do
@@ -131,4 +132,25 @@ class TouristicObjectTest < Test::Unit::TestCase
     assert_true touristic_object.adapted_tourism.include?('Accessible en fauteuil roulant en autonomie')
   end
 
+  should 'retrieve merged general and specific information' do
+    hash_result = {
+        :type => 'ACTIVITE',
+        :informations => {
+            :moyensCommunication => [
+                {:type => {:libelleFr => "Téléphone"}, :coordonnee => "0123456789"}
+            ]
+        },
+        :informationsActivite => {
+            :commerceEtServicePrestataire => {
+                :nom => {:libelleFr => "my_service"}
+            }
+        }
+    }
+
+    touristic_object = TouristicObject.new(hash_result)
+
+    assert_equal "0123456789", touristic_object.information[:moyensCommunication][0][:coordonnee]
+    assert_equal "my_service", touristic_object.information[:commerceEtServicePrestataire][:nom][:libelleFr]
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sitra_client
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-02 00:00:00.000000000 Z
+date: 2014-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler