apidae 1.3.16 → 1.3.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6e092adead9d8f84f1d6de9b4029bdec48188bfa085dd265adbc8b1a8b57124
-  data.tar.gz: 22717992328c5a0a585a4762f33d9e33cfc7a3704157ab51098b8d53716e3a36
+  metadata.gz: 404091c3c4aeea7ead657d6f94d1c87729df31a856e1e2c84926e8e9dbe19367
+  data.tar.gz: de47d5b8f2526a44586b55207d3dd466b867590a3ab78874b78d5179a37fdf6c
 SHA512:
-  metadata.gz: 6b8c334f666305fc53f485a2bb68a867c2280b30f09233e320a03f5d28b2fc302a950260879c1e9900b26c5e00ed9ac48dd3d553b118c78597f7ed072313d89c
-  data.tar.gz: 0d9c5826b752fab4f0802d3a574c970b9bb58f7594c31ec9efd4b6310a750fc5150d1d2e1affa2032f9e25c5eda67bec74c1354a632314c913271c9e47eef64f
+  metadata.gz: 7dff3c671ee521d5fc73dd9d9a0061bf8d3815f6df24d121e677574d2406d2582533533b46b22505da22d4d639e206d228b66fdfbcfc6cc21bad8a956922c90a
+  data.tar.gz: bad3ccfea997dcc9e2674b9bb0fc882581ef66391c0a11e8fbc3eed79ab599b1fedd2620e70330998d886694c54b9e2575a80497aab11cd8e976b0c676513f00

data/app/models/apidae/apidae_data_parser.rb

@@ -101,10 +101,15 @@ module Apidae
       {title: node_value(data_hash, :nom, *locales)}
     end
 
-    def self.parse_owner_data(data_hash)
+    def self.parse_owner_data(data_hash, polls_data)
+      owner_data = {}
       unless data_hash.blank?
-        {owner_name: data_hash[:nom], owner_id: data_hash[:id]}
+        owner_data.merge!({owner_name: data_hash[:nom], owner_id: data_hash[:id]})
       end
+      unless polls_data.blank?
+        owner_data.merge!({polls: polls_data[:enquetes] || []})
+      end
+      owner_data
     end
 
     def self.parse_desc_data(data_hash, private_data, *locales)
@@ -233,7 +238,7 @@ module Apidae
     end
 
     # Note : use internal format for openings storage (ideally Apihours one, to merge data from both sources)
-    def self.parse_openings(openings_hash, *locales)
+    def self.parse_openings(openings_hash, opening_days, *locales)
       if openings_hash && openings_hash[:periodeEnClair]
         {
             openings_desc: node_value(openings_hash, :periodeEnClair, *locales),
@@ -241,7 +246,8 @@ module Apidae
             openings: build_openings(openings_hash, *locales),
             all_year_long: openings_hash[:ouvertTouteLAnnee] == 'OUVERT_TOUTE_L_ANNEE' ? 'true' : 'false',
             time_periods: lists_ids(openings_hash[:indicationsPeriode]),
-            openings_extra: lists_ids(openings_hash[:ouverturesComplementaires])
+            openings_extra: lists_ids(openings_hash[:ouverturesComplementaires]),
+            opening_days: opening_days
         }
       end
     end

data/app/models/apidae/obj.rb

@@ -21,7 +21,7 @@ module Apidae
     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
+    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 :booking_data, :booking_desc, :booking_entities, :visits_allowed, :visits_desc, :visits_duration, :visits_services
@@ -175,7 +175,7 @@ module Apidae
     def self.populate_fields(apidae_obj, object_data, locales)
       type_fields = TYPES_DATA[object_data[:type]]
       apidae_obj.last_update = DateTime.parse(object_data[:gestion][:dateModification]) unless object_data[:gestion].blank?
-      apidae_obj.owner_data = ApidaeDataParser.parse_owner_data(object_data[:gestion][:membreProprietaire]) unless object_data[:gestion].blank?
+      apidae_obj.owner_data = ApidaeDataParser.parse_owner_data(object_data[:gestion][:membreProprietaire], object_data[:enquete]) unless (object_data[:gestion].blank? && object_data[:enquete].blank?)
       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)
@@ -184,7 +184,7 @@ module Apidae
       apidae_obj.location_data = ApidaeDataParser.parse_location_data(object_data[:localisation], object_data[type_fields[:node]],
                                                      object_data[:territoires])
       apidae_obj.town = ApidaeDataParser.parse_town(object_data[:localisation])
-      apidae_obj.openings_data = ApidaeDataParser.parse_openings(object_data[:ouverture], *locales)
+      apidae_obj.openings_data = ApidaeDataParser.parse_openings(object_data[:ouverture], object_data[:datesOuverture], *locales)
       apidae_obj.rates_data = ApidaeDataParser.parse_rates(object_data[:descriptionTarif], *locales)
       apidae_obj.booking_data = ApidaeDataParser.parse_booking(object_data[:reservation], object_data[:visites], *locales)
       apidae_obj.type_data = ApidaeDataParser.parse_type_data(apidae_obj, object_data[type_fields[:node]], object_data[:prestations],

data/app/models/apidae/selection.rb

@@ -220,7 +220,7 @@ module Apidae
     def get_response(args)
       response = ''
       query = JSON.generate args.except(:url)
-      logger.info "Apidae API query : #{args[:url]}?query=#{query}"
+      logger.debug "Apidae API query : #{args[:url]}?query=#{query}"
       open("#{args[:url]}?query=#{CGI.escape query}") { |f|
         f.each_line {|line| response += line if line}
       }

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "1.3.16"
+  VERSION = "1.3.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 1.3.16
+  version: 1.3.18
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-02 00:00:00.000000000 Z
+date: 2022-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails