apidae 1.2.33 → 1.2.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b734a86f74580f550511355efe321a11d760d140c9bfcc42bca846ea30706a4
-  data.tar.gz: 696d2b99eed6646d84320f239a7edb94edb3e2f6faa7b82891d90e7c8bf7d95a
+  metadata.gz: 0ab6ee3f3a2d8930bc4d486e7de657f1fb408e69f0faf9b49e01921241210b02
+  data.tar.gz: 8c7637a88153f8befc3d3b94569f60afad0caf19235fc128b5302b104109bc1e
 SHA512:
-  metadata.gz: 97545275be12c00ba5c803a624b7c5f35efa1121405acb7b3059cdc8795de97cf3ff51225eb1e26d032459fbd4cca3a8509e37496c4b021b645fbf865f042268
-  data.tar.gz: 6b44066754d0a2010b6cf5301ab61f337974f1dbde0739dce1fef461bafe8d9a8cb1d5354b179c3a08faaf72873080128b6f0561963f41198650c89257839a0d
+  metadata.gz: 3f27a28ff6f954de764937f484ce844113acc6f642c2ba7f6eab37889f80c979ad92f4ddd0c13263017280678f969f83ff0920a4ac315306237bbefc75d35114
+  data.tar.gz: 75b2bb35a5d82be0b16019e4f55e1b804e69aa8cbe496d8f240dfb8dff7771d6f24a9c0150841ea389a80182f5b5851e56cb0b50c27ad11c1b50d470f3d94cb0

data/app/models/apidae/apidae_data_parser.rb

@@ -112,13 +112,14 @@ module Apidae
       owner_data
     end
 
-    def self.parse_desc_data(data_hash, private_data, *locales)
+    def self.parse_desc_data(data_hash, private_data, presta_data, *locales)
       unless data_hash.blank?
         {
             short_desc: node_value(data_hash, :descriptifCourt, *locales),
             long_desc: node_value(data_hash, :descriptifDetaille, *locales),
             theme_desc: data_hash[:descriptifsThematises].blank? ? {} : Hash[data_hash[:descriptifsThematises].map {|th| [node_id(th, :theme), node_value(th, :description, *locales)]}],
-            private_desc: private_data.blank? ? {} : Hash[private_data.map {|d| [d[:nomTechnique], (node_value(d, :descriptif, *locales).blank? ? {LOCALE_FR => d[:libelleFr]} : node_value(d, :descriptif, *locales))]}]
+            private_desc: private_data.blank? ? {} : Hash[private_data.map {|d| [d[:nomTechnique], (node_value(d, :descriptif, *locales).blank? ? {LOCALE_FR => d[:libelleFr]} : node_value(d, :descriptif, *locales))]}],
+            accessibility_desc: presta_data.blank? ? {} : Hash[presta_data.select {|k, v| k.to_s.start_with?('descriptifHandicap')}.map {|k, v| [k, node_value(presta_data, k, *locales)]}]
         }
       end
     end
@@ -279,7 +280,8 @@ module Apidae
           themes: lists_ids(data_hash[:themes]),
           capacity: (data_hash[:capacite] || {})
                         .merge(presta_hash ? {group_min: presta_hash[:tailleGroupeMin], group_max: presta_hash[:tailleGroupeMax],
-                                              age_min: presta_hash[:ageMin], age_max: presta_hash[:ageMax]} : {}),
+                                              age_min: presta_hash[:ageMin], age_max: presta_hash[:ageMax],
+                                              wheelchair_max: presta_hash[:nombrePersonnesEnFauteuilRoulantAccueilliesSimultanement]} : {}),
           classification: nodes_ids(data_hash[:classement], data_hash[:classementPrefectoral], data_hash[:classification]) +
               lists_ids(data_hash[:classementsGuides]) + lists_ids(data_hash[:classements]),
           classification_date: data_hash[:dateClassement],
@@ -314,7 +316,8 @@ module Apidae
                                   type_data_hash ? type_data_hash[:activitesSportives] : [],
                                   type_data_hash ? type_data_hash[:activitesCulturelles] : []),
             challenged: lists_ids(data_hash[:tourismesAdaptes]),
-            languages: lists_ids(data_hash[:languesParlees])
+            languages: lists_ids(data_hash[:languesParlees]),
+            documentation_languages: lists_ids(data_hash[:languesDocumentation])
         }
       end
     end
@@ -362,9 +365,9 @@ module Apidae
       entity_hash = {}
       if information_hash
         if information_hash[:structureGestion]
-          entity_hash.merge!({entity_id: information_hash[:structureGestion][:id], entity_name: information_hash[:structureGestion][:nom][:libelleFr],
+          entity_hash.merge!({entity_id: information_hash[:structureGestion][:id], entity_name: information_hash[:structureGestion].dig(:nom, :libelleFr),
                               info_entity_id: (information_hash[:structureInformation] || information_hash[:structureGestion])[:id],
-                              info_entity_name: (information_hash[:structureInformation] || information_hash[:structureGestion])[:nom][:libelleFr],
+                              info_entity_name: (information_hash[:structureInformation] || information_hash[:structureGestion]).dig(:nom, :libelleFr),
                               service_provider_id: node_id(type_data_hash, :prestataireActivites)})
         end
 

data/app/models/apidae/obj.rb

@@ -11,7 +11,7 @@ module Apidae
 
     store_accessor :title_data, :title
     store_accessor :owner_data, :owner_name, :owner_id, :polls
-    store_accessor :description_data, :short_desc, :long_desc, :theme_desc, :private_desc
+    store_accessor :description_data, :short_desc, :long_desc, :theme_desc, :private_desc, :accessibility_desc
     store_accessor :pictures_data, :pictures
     store_accessor :attachments_data, :attachments
     store_accessor :type_data, :categories, :themes, :capacity, :classification, :classification_date,
@@ -23,7 +23,7 @@ module Apidae
     store_accessor :location_data, :address, :place, :latitude, :longitude, :access, :territories, :environments, :altitude, :map_reference
     store_accessor :openings_data, :openings_desc, :openings_desc_mode, :openings, :time_periods, :openings_extra
     store_accessor :rates_data, :rates_desc, :rates_desc_mode, :rates, :payment_methods, :includes, :excludes, :rates_extra, :tax_included
-    store_accessor :service_data, :services, :equipments, :comfort, :activities, :challenged, :languages
+    store_accessor :service_data, :services, :equipments, :comfort, :activities, :challenged, :languages, :documentation_languages
     store_accessor :booking_data, :booking_desc, :booking_entities, :visits_allowed, :visits_desc, :visits_duration, :visits_services
     store_accessor :tags_data, :promo, :internal, :linked
     store_accessor :version_data, :versioned_fields
@@ -179,7 +179,7 @@ module Apidae
       apidae_obj.apidae_type = object_data[:type]
       apidae_obj.apidae_subtype = ApidaeDataParser.node_id(object_data[type_fields[:node]], type_fields[:subtype])
       apidae_obj.title_data = ApidaeDataParser.parse_title(object_data, *locales)
-      apidae_obj.description_data = ApidaeDataParser.parse_desc_data(object_data[:presentation], object_data[:donneesPrivees], *locales)
+      apidae_obj.description_data = ApidaeDataParser.parse_desc_data(object_data[:presentation], object_data[:donneesPrivees], object_data[:prestations], *locales)
       apidae_obj.contact_data = ApidaeDataParser.parse_contact_data(object_data[:informations], object_data[:contacts])
       apidae_obj.location_data = ApidaeDataParser.parse_location_data(object_data[:localisation], object_data[type_fields[:node]],
                                                      object_data[:territoires])

data/config/initializers/constants.rb

@@ -27,7 +27,7 @@ module Apidae
 
   LOCALIZED_FIELDS = [:title, :short_desc, :long_desc, :pictures, :attachments,
                       :openings_desc, :rates_desc, :includes, :excludes, :extra, :booking_desc]
-  ALL_FIELDS = LOCALIZED_FIELDS + [:theme_desc, :private_desc, :capacity, :telephone, :email, :website,
+  ALL_FIELDS = LOCALIZED_FIELDS + [:theme_desc, :private_desc, :accessibility_desc, :capacity, :telephone, :email, :website,
                                    :google, :facebook, :twitter, :yelp, :trip_advisor, :fax, :mobile_website, :shorty_url,
                                    :openings, :openings_extra, :rates, :services, :payment_methods, :categories, :themes,
                                    :labels, :chains, :classification, :challenged, :environments, :languages, :products,

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "1.2.33"
+  VERSION = "1.2.35"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 1.2.33
+  version: 1.2.35
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-28 00:00:00.000000000 Z
+date: 2023-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails