apidae 1.4.1 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7426138fffb907d9917ac5d115a954002023efcc6a2ccbe0d6e27a0ca5f4e85d
-  data.tar.gz: d4716809c8a3bb226d8cf538a23c07e2e926a65b1d396911f680cef4dba8cc3f
+  metadata.gz: aabfe9be4d2de7c87baa00f3234faf20fe31ab8125f6163acf65e0aa772e1dbc
+  data.tar.gz: fb0e940576b5b979ed5ae0dd5fba63c24578c8293152372e8f0dfa67d195588b
 SHA512:
-  metadata.gz: a0e49d2d72be1d4f9f0036ca7da7138fb778af340a363b97b2a027062d166dfdf88dc7bc9db9ba83b4b66a186290d157767592552eb889f42c4ba8b5a4b0671d
-  data.tar.gz: 44d1a75ac8f9a9a14d3bc54ab31a9b9fdb1bef8bfa35f9edb7d2c19891e1637e89ed6e6f10bd1fd3131966293de66c788508988b1ac3b46cb71017dd3235bb37
+  metadata.gz: fc81a47d8e6165241e0449217e116e1d9f22e39c4e403ba377950bc8d527631abe593ab2be49ef589d1f8dbca41430606c890722020bb525a364dcaa3642f9a3
+  data.tar.gz: fbd8e4c42aec95838f8a65c6d88a73f07f82082910d42fbbf71068678adb51cccc1d6caf61e9e1bded5424d965ade31c46ec49bbe6eb1d649fc0227bd12fe06f

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
@@ -138,7 +139,7 @@ module Apidae
                 description: localized_value(pic, :legende, locale),
                 credits: localized_value(pic, :copyright, locale),
                 expiration_date: pic[:dateLimiteDePublication] || '',
-                properties: {size: pic_file[:taille], width: pic_file[:largeur], height: pic_file[:height]}
+                properties: {size: pic_file[:taille], width: pic_file[:largeur], height: pic_file[:hauteur]}
             }
           end
         end
@@ -282,7 +283,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],
@@ -317,7 +319,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
@@ -365,7 +368,10 @@ module Apidae
       entity_hash = {}
       if information_hash
         if information_hash[:structureGestion]
-          entity_hash.merge!({entity_id: information_hash[:structureGestion][:id], service_provider_id: node_id(type_data_hash, :prestataireActivites)})
+          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]).dig(:nom, :libelleFr),
+                              service_provider_id: node_id(type_data_hash, :prestataireActivites)})
         end
 
         if information_hash[:informationsLegales]

data/app/models/apidae/obj.rb

@@ -8,22 +8,23 @@ module Apidae
     attr_accessor :locale
     attr_accessor :obj_version
     attr_accessor :obj_versions
+    attr_accessor :skip_archiving
 
     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,
                    :classification_ref, :labels, :chains, :area, :track, :tricky_sections, :products, :audience, :animals,
                    :animals_desc, :extra, :duration, :certifications, :business, :business_equipments, :business_rooms
-    store_accessor :entity_data, :entity_id, :entity_name, :service_provider_id, :is_service_provider, :legal
+    store_accessor :entity_data, :entity_id, :entity_name, :info_entity_id, :info_entity_name, :service_provider_id, :is_service_provider, :legal
     store_accessor :contact_data, :telephone, :email, :website, :google, :facebook, :twitter, :yelp, :trip_advisor, :fax,
                    :mobile_website, :shorty_url, :contacts
     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, :opening_days
     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
@@ -152,7 +153,7 @@ module Apidae
       self.prev_data ||= {}
       ignored_root_attributes = ['prev_data', 'updated_at']
       changed_attributes.each_pair do |attr, prev_value|
-        unless ignored_root_attributes.include?(attr)
+        unless ignored_root_attributes.include?(attr) || skip_archiving
           if prev_value.is_a?(Hash)
             archive_hash_value(prev_value)
           else
@@ -234,7 +235,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

@@ -25,9 +25,9 @@ module Apidae
   ALL_VERSIONS = [STANDARD_VERSION, WINTER_VERSION, SUMMER_VERSION, CHALLENGED_VERSION, BUSINESS_VERSION,
                   GROUPS_VERSION, ACTIVITIES_VERSION]
 
-  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,
+  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, :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.4.1"
+  VERSION = "1.4.3"
 end