apidae 1.2.34 → 1.2.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b548817eebe84592342e15e6b2803973996ba58a9db772735c3354905056ad85
-  data.tar.gz: 7e58e1648fe95c04b89ab03a2038577267da8e1353fa72f294a3a0475958745a
+  metadata.gz: 5e6c9a3388be874c4b24127f34824279025527c2fdd431393d620de6a33cabc2
+  data.tar.gz: 667cd897185d201d1c04e301bbb7e0b1d74b7d3cf0ffcd7e11cd590bd811bb98
 SHA512:
-  metadata.gz: df46f230175cf3c7d9fc6c07d2bd271436ac2fdeb412b6e899d92d984d9603bacc5621bcd3e3c1953efe654516f547abb07d75b7e9e77a4c8dc66cb647f27484
-  data.tar.gz: 49934f72f635316528b6712d44f7029f9317507fbffa0e5b48b881226b9050167e2d19fb0b5e3a760bebee6a1cb492571b8a37900e9dac4209b102b94295cc49
+  metadata.gz: 1787ecebf05b6af211e39cb2c931e8b56b143e5ffbacca52d4fc585a2c6171091ea8386f0c52d8d908cf5cfdb4d4dfecd5bb9002b1fa57f378d7e909aede870c
+  data.tar.gz: 061a47265527f1110f59b596013bb49e04a33bd689e017e524ef3bfa38d9476ac99e7d5fd91acf3edd890f03831cbd93c014736bf59e547614853769e891979f

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
@@ -222,7 +223,7 @@ module Apidae
           computed_address << address_hash[:adresse3]
         end
         loc_data.merge!({address: computed_address})
-        loc_data.merge!({place: (type_data_hash ? type_data_hash[:nomLieu] : nil) || address_hash[:nomDuLieu]})
+        loc_data.merge!({place: (type_data_hash || {})[:nomLieu] || (address_hash || {})[:nomDuLieu]})
         geoloc_details = location_hash[:geolocalisation]
         if geoloc_details && geoloc_details[:valide] && geoloc_details[:geoJson]
           loc_data[:latitude] = geoloc_details[:geoJson][:coordinates][1]
@@ -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

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.34"
+  VERSION = "1.2.36"
 end