sitra_client 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bf7717dd12ece88029946b5ce751736f15e0e9c
-  data.tar.gz: 0b1fd13c206a166295a9e5a0111a42de0250ee6e
+  metadata.gz: 03c0e5f7c528194aee12c4e7192d07536ee42487
+  data.tar.gz: 8ffbbac92e296e88230ead9b57823137d503d9c7
 SHA512:
-  metadata.gz: 91baf5ec3a14abb51961f9d0bde7877a4ab4077546f0fd4271d3529caa5a8c15db22fc1618ec11a6076fd35e00de747070e1d82b1667c022fa54a17f21751c1c
-  data.tar.gz: af9ec62d87f46c00c4a12cbd6a696d706d0b5bccbc69b4154745cad949e1a43ef32bb28491c8fbf3ef380038e0d049ca29db2de7d40336d8defae77329d61fc8
+  metadata.gz: fff07c50e9efd03d0fc3bb00170aa6c0a06fdb011b930767baf706b9fc7670d8574129e3b5ebc148da76c16b5ff21b37f995f2ddca2ccd0d90a37acf8f587900
+  data.tar.gz: fa41884e542281aa3bdff031fc7cc8e4f80b52e4e95146b0b7a86a893473f907af0d37fac39c5557659d8c68da9d265c00fdeafad2610787acaaedb17e916150

data/lib/sitra_client/touristic_object.rb

@@ -10,25 +10,6 @@ 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'
-  }
-
   DEFAULT_LIBELLE = :libelleFr
 
   ASPECT_WINTER = 'HIVER'
@@ -82,6 +63,32 @@ class TouristicObject
     @type
   end
 
+  def specific_info(capitalize = false)
+    type = @type.downcase.split('_')
+
+    if capitalize
+      type[0] = type[0].capitalize
+    end
+
+    type.each_index do |index|
+      if index > 0
+        type[index] = type[index].capitalize
+      end
+    end
+
+    @specific_info = type.join('')
+  end
+
+  def sub_type
+    infos_label = '@informations' + specific_info(true)
+    type_label = specific_info + 'Type'
+
+    infos_type = instance_variable_get(infos_label)
+    if infos_type && infos_type[type_label.to_sym]
+      infos_type[type_label.to_sym][@libelle] || infos_type[type_label.to_sym][DEFAULT_LIBELLE]
+    end
+  end
+
   def title
     @nom[@libelle] || @nom[DEFAULT_LIBELLE]
   end
@@ -113,7 +120,7 @@ class TouristicObject
   def information
     specific_information = {}
     unless @type.nil?
-      specific_information = instance_variable_get(SPECIFIC_INFOS[@type])
+      specific_information = instance_variable_get('@informations' + specific_info(true))
     end
     @informations.merge(specific_information)
   end
@@ -295,6 +302,14 @@ class TouristicObject
     is_eligible
   end
 
+  def certification
+    info_specific = instance_variable_get('@informations' + specific_info(true))
+
+    if info_specific && info_specific[:labels]
+      info_specific[:labels].collect {|t| t[:id]}
+    end
+  end
+
   private
 
   def occurrence_in_month(date)

data/lib/sitra_client/version.rb

@@ -1,3 +1,3 @@
 module SitraClient
-  VERSION = '0.3.4'
+  VERSION = '0.3.5'
 end

data/sitra_client.gemspec

@@ -24,7 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "shoulda"
   spec.add_runtime_dependency "rails", ">= 4.0"
   spec.add_runtime_dependency "json"
-  if RUBY_VERSION < '2.3'
-    spec.add_runtime_dependency "backport_dig"
-  end
+  spec.add_runtime_dependency "ruby_dig"
 end

data/test/sitra_client/touristic_object_test.rb

@@ -330,52 +330,69 @@ class TouristicObjectTest < Test::Unit::TestCase
     assert_equal false, touristic_object.open_on?('2015-2-3', '2015-2-10')
   end
 
-  should 'load overridden aspect values' do
-    hash = {
-        nom: {libelleFr: 'my_title'},
-        presentation: {
-            descriptifCourt: {libelleFr: 'my_description'},
-            descriptifDetaille: {libelleFr: 'my_detailed_description'}
-        },
-        ouverture: {
-          periodeEnClair: {libelleFr: 'my_opening_hours'},
-          periodesOuvertures: [
-              {dateDebut: '2014-1-1', dateFin: '2014-12-31', tousLesAns: true, type: 'OUVERTURE_MOIS'},
-              {dateDebut: '2015-1-1', dateFin: '2015-1-31', tousLesAns: false, type: 'OUVERTURE_SEMAINE'}
-          ]
-        },
-        aspects: [
-            {
-                aspect: 'HIVER',
-                champsAspect: ['presentation.descriptifCourt', 'presentation.descriptifDetaille', 'ouverture.periodesOuvertures'],
-                presentation: {
-                    descriptifCourt: {libelleFr: 'my_description hiver'}
-                },
-                ouverture: {
-                    periodesOuvertures: [
-                        {dateDebut: '2014-2-1', dateFin: '2014-4-30', tousLesAns: true, type: 'OUVERTURE_MOIS'}
-                    ]
-                },
+  should 'populate cetification information for provided fields' do
+    hash_results = { type: "HEBERGEMENT_COLLECTIF",
+        informationsHebergementCollectif: {
+            labels: [{id: '1256'},
+                     {id: '5478'},
+                     {id: '7899'}]
+        }
+    }
+
+    touristic_object = TouristicObject.new(hash_results)
+
+    assert_equal('1256', touristic_object.certification[0])
+    assert_equal('5478', touristic_object.certification[1])
+    assert_equal('7899', touristic_object.certification[2])
+    assert_not_equal('5555', touristic_object.certification[2])
+  end
+
+  should 'not populate certification information if empty' do
+    hash_results = { type: 'HEBERGEMENT_LOCATIF',
+        informationsHebergementLocatif: {
+            labels: []
+        }
+    }
+
+    touristic_object = TouristicObject.new(hash_results)
+
+    assert_equal([], touristic_object.certification)
+  end
+
+  should 'return specific info of the touristic object' do
+    array_types = ['ACTIVITE', 'COMMERCE_ET_SERVICE', 'DEGUSTATION', 'DOMAINE_SKIABLE', 'EQUIPEMENT', 'FETE_ET_MANIFESTATION',
+                 'HEBERGEMENT_COLLECTIF', 'HEBERGEMENT_LOCATIF', 'HOTELLERIE', 'HOTELLERIE_PLEIN_AIR',
+                 'PATRIMOINE_CULTUREL', 'PATRIMOINE_NATUREL', 'RESTAURATION', 'SEJOUR_PACKAGE', 'STRUCTURE', 'TERRITOIRE']
+
+    expected = ['activite', 'commerceEtService', 'degustation', 'domaineSkiable', 'equipement', 'feteEtManifestation', 'hebergementCollectif',
+                'hebergementLocatif', 'hotellerie', 'hotelleriePleinAir', 'patrimoineCulturel', 'patrimoineNaturel', 'restauration',
+                'sejourPackage', 'structure', 'territoire']
+
+    results = []
+
+    array_types.each do |type|
+      hash_results = { type: type }
+      touristic_type = TouristicObject.new(hash_results)
+      results << touristic_type.specific_info
+    end
+
+    assert_equal expected, results
+  end
+
+  should 'populate sub type label for provided fields' do
+    hash_results = {
+        type: 'HOTELLERIE_PLEIN_AIR',
+        informationsHotelleriePleinAir: {
+            hotelleriePleinAirType: {
+                libelleFr: 'label'
             }
-        ]
+        }
     }
 
-    std_object = TouristicObject.new(hash)
-    winter_object = TouristicObject.new(hash.deep_dup, TouristicObject::ASPECT_WINTER)
-
-    assert_equal 'my_title', std_object.title
-    assert_equal 'my_description', std_object.description
-    assert_equal 'my_detailed_description', std_object.details
-    assert_equal 'my_opening_hours', std_object.horaires
-    assert_equal [{dateDebut: '2014-1-1', dateFin: '2014-12-31', tousLesAns: true, type: 'OUVERTURE_MOIS'},
-                  {dateDebut: '2015-1-1', dateFin: '2015-1-31', tousLesAns: false, type: 'OUVERTURE_SEMAINE'}],
-        std_object.attributes['ouverture'][:periodesOuvertures]
-
-    assert_equal 'my_title', winter_object.title
-    assert_equal 'my_description hiver', winter_object.description
-    assert_nil winter_object.details
-    assert_equal 'my_opening_hours', winter_object.horaires
-    assert_equal [{dateDebut: '2014-2-1', dateFin: '2014-4-30', tousLesAns: true, type: 'OUVERTURE_MOIS'}],
-                 winter_object.attributes['ouverture'][:periodesOuvertures]
+    touristic_object = TouristicObject.new(hash_results)
+
+    assert_equal('label', touristic_object.sub_type)
   end
+
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sitra_client
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - jeanbaptistevilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-07 00:00:00.000000000 Z
+date: 2016-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby_dig
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Sitra Client Gem
 email:
 - jbvilain@gmail.com