apidae 1.2.7 → 1.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7f870ce44d951a04a1b73afa9c3b16a5a8ebdb9
-  data.tar.gz: e95f2475a72a05c59cbcab56863d77d316b4ffbc
+  metadata.gz: 14c1e6c1ecb7759e122f8b6598d38df5a3c6c65e
+  data.tar.gz: b053447b481455f07d200ea6c3c2ddaa306ce451
 SHA512:
-  metadata.gz: 9cf4871c99377ff9e1dbb875099a5b75279177fb1964a18f57363083c38af1f0b5bce1e8f880103486652b5bb417da7dbebf6b2d2602b537c2432d1bf801bc62
-  data.tar.gz: 2896159f983e04f3710a82a465c75a5a2080336bfa6f4266c0ec10b6a7e46f6a2929a87ff410db44fb700ecfa8ccdfbd09e664e15ce8ae628c58b19c4cb43369
+  metadata.gz: 75533fc47e84a10f7fe1409103bb4aa027a7f807581565f690fb575c45beb9f05a21e3741702ec47dd85a77ca9534b82a8087af911e0f32df81e1142881e7a36
+  data.tar.gz: 4ce2cc2ebd34a81f1029d258a36fe522a9900f33adfcd029cfb01c29a22034ff3b0edb84a8d40cd3542ec0df95ce33741047e07607edacaffd82426084bc0c69

data/app/models/apidae/apidae_data_parser.rb

@@ -44,7 +44,7 @@ module Apidae
         'LUNDI' => MONDAY,
         'MARDI' => TUESDAY,
         'MERCREDI' => WEDNESDAY,
-        'JEUD' => THURSDAY,
+        'JEUDI' => THURSDAY,
         'VENDREDI' => FRIDAY,
         'SAMEDI' => SATURDAY,
         'DIMANCHE' => SUNDAY
@@ -151,6 +151,7 @@ module Apidae
                 name: localized_value(att, :nom, locale),
                 url: att[:traductionFichiers][0][:url].gsub('http:', 'https:'),
                 type: att[:type],
+                link: att[:link],
                 description: localized_value(att, :legende, locale)
             }
           end
@@ -219,6 +220,7 @@ module Apidae
         loc_data.merge!({place: type_data_hash[:nomLieu]}) if type_data_hash
         geoloc_details = location_hash[:geolocalisation]
         if geoloc_details && geoloc_details[:valide] && geoloc_details[:geoJson]
+          loc_data[:altitude] = geoloc_details[:altitude]
           loc_data[:latitude] = geoloc_details[:geoJson][:coordinates][1]
           loc_data[:longitude] = geoloc_details[:geoJson][:coordinates][0]
         end
@@ -318,13 +320,17 @@ module Apidae
       tags
     end
 
-    def self.parse_booking(reservation_hash, *locales)
+    def self.parse_booking(reservation_hash, visits_hash, *locales)
+      booking_hash = {}
       if reservation_hash
-        {
-            booking_desc: node_value(reservation_hash, :complement, *locales),
-            booking_entities: reservation_hash[:organismes]
-        }
+        booking_hash[:booking_desc] = node_value(reservation_hash, :complement, *locales),
+        booking_hash[:booking_entities] = reservation_hash[:organismes]
       end
+      if visits_hash
+        booking_hash[:visits_allowed] = visits_hash[:visitable] == true
+        booking_hash[:visits_desc] = node_value(visits_hash, :complementVisite, *locales)
+      end
+      booking_hash
     end
 
     def self.parse_town(location_hash)
@@ -336,10 +342,15 @@ module Apidae
       end
     end
 
-    def self.parse_entity_fields(information_hash, type_data_hash)
+    def self.parse_entity_fields(information_hash, type_data_hash, sp_hash)
+      entity_hash = {}
       if information_hash && information_hash[:structureGestion]
-        {entity_id: information_hash[:structureGestion][:id], service_provider_id: node_id(type_data_hash, :prestataireActivites)}
+        entity_hash.merge!({entity_id: information_hash[:structureGestion][:id], service_provider_id: node_id(type_data_hash, :prestataireActivites)})
+      end
+      if sp_hash && sp_hash[:prestataireActivites]
+        entity_hash[:is_service_provider] = true
       end
+      entity_hash
     end
 
     def self.node_id(node, key)

data/app/models/apidae/obj.rb

@@ -16,14 +16,14 @@ module Apidae
     store_accessor :attachments_data, :attachments
     store_accessor :type_data, :categories, :themes, :capacity, :classification, :labels, :chains, :area, :track,
                    :products, :audience, :animals, :animals_desc, :extra, :duration, :certifications, :business
-    store_accessor :entity_data, :entity_id, :entity_name, :service_provider_id
+    store_accessor :entity_data, :entity_id, :entity_name, :service_provider_id, :is_service_provider
     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
+    store_accessor :location_data, :address, :place, :latitude, :longitude, :access, :territories, :environments, :altitude
     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
     store_accessor :service_data, :services, :equipments, :comfort, :activities, :challenged, :languages
-    store_accessor :booking_data, :booking_desc, :booking_entities
+    store_accessor :booking_data, :booking_desc, :booking_entities, :visits_allowed, :visits_desc
     store_accessor :tags_data, :promo, :internal, :linked
     store_accessor :version_data, :versioned_fields
 
@@ -84,7 +84,7 @@ module Apidae
         COS => {node: :informationsCommerceEtService, subtype: :commerceEtServiceType},
         DEG => {node: :informationsDegustation, subtype: :degustationType},
         DOS => {node: :informationsDomaineSkiable, subtype: :domaineSkiableType},
-        EQU => {node: :informationsEquipement, subtype: :equipementType},
+        EQU => {node: :informationsEquipement, subtype: :rubrique},
         FEM => {node: :informationsFeteEtManifestation, subtype: :feteEtManifestationType},
         HCO => {node: :informationsHebergementCollectif, subtype: :hebergementCollectifType},
         HLO => {node: :informationsHebergementLocatif, subtype: :hebergementLocatifType},
@@ -185,12 +185,12 @@ module Apidae
       apidae_obj.town = ApidaeDataParser.parse_town(object_data[:localisation])
       apidae_obj.openings_data = ApidaeDataParser.parse_openings(object_data[:ouverture], *locales)
       apidae_obj.rates_data = ApidaeDataParser.parse_rates(object_data[:descriptionTarif], *locales)
-      apidae_obj.booking_data = ApidaeDataParser.parse_booking(object_data[:reservation], *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],
                                              object_data[:tourismeAffaires], *locales)
       apidae_obj.pictures_data = ApidaeDataParser.parse_pictures_data(object_data[:illustrations], *locales)
       apidae_obj.attachments_data = ApidaeDataParser.parse_attachments_data(object_data[:multimedias], *locales)
-      apidae_obj.entity_data = ApidaeDataParser.parse_entity_fields(object_data[:informations], object_data[type_fields[:node]])
+      apidae_obj.entity_data = ApidaeDataParser.parse_entity_fields(object_data[:informations], object_data[type_fields[:node]], object_data[:informationsPrestataireActivites])
       apidae_obj.service_data = ApidaeDataParser.parse_service_data(object_data[:prestations], object_data[type_fields[:node]])
       apidae_obj.tags_data = ApidaeDataParser.parse_tags_data(object_data[:presentation], object_data[:criteresInternes], object_data[:liens])
       apidae_obj.meta_data = object_data[:metadonnees]

data/config/initializers/constants.rb

@@ -8,9 +8,10 @@ module Apidae
   LOCALE_ZH = 'zh'
   LOCALE_ES = 'es'
   LOCALE_PT_BR = 'pt-BR'
+  LOCALE_JP = 'jp'
 
   DEFAULT_LOCALE = LOCALE_FR
-  ALL_LOCALES = [LOCALE_FR, LOCALE_EN, LOCALE_IT, LOCALE_DE, LOCALE_NL, LOCALE_RU, LOCALE_ZH, LOCALE_ES, LOCALE_PT_BR]
+  ALL_LOCALES = [LOCALE_FR, LOCALE_EN, LOCALE_IT, LOCALE_DE, LOCALE_NL, LOCALE_RU, LOCALE_ZH, LOCALE_ES, LOCALE_PT_BR, LOCALE_JP]
 
   STANDARD_VERSION = 'STANDARD'
   WINTER_VERSION = 'HIVER'
@@ -28,7 +29,7 @@ module Apidae
                       :openings_desc, :rates_desc, :includes, :excludes, :extra, :booking_desc]
   ALL_FIELDS = LOCALIZED_FIELDS + [:theme_desc, :private_desc, :capacity, :telephone, :email, :website,
                                    :google, :facebook, :twitter, :yelp, :trip_advisor, :fax, :mobile_website, :shorty_url,
-                                   :openings, :rates, :services, :payment_methods, :categories, :themes, :labels, :chains,
-                                   :classification, :challenged, :environments, :languages, :products, :animals,
-                                   :equipments, :comfort, :activities, :promo, :internal, :linked]
+                                   :openings, :openings_extra, :rates, :services, :payment_methods, :categories, :themes,
+                                   :labels, :chains, :classification, :challenged, :environments, :languages, :products,
+                                   :animals, :equipments, :comfort, :activities, :promo, :internal, :linked]
 end

data/config/locales/apidae.fr.yml

@@ -41,6 +41,7 @@ fr:
       ru: Russe
       zh: Chinois
       'pt-BR': Brésilien
+      jp: Japonais
     versions:
       STANDARD: Standard
       HIVER: Hiver

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "1.2.7"
+  VERSION = "1.2.12"
 end

data/test/dummy/log/development.log

@@ -65,3 +65,5 @@ Migrating to AddLocalesDataToApidaeProjects (20190123214635)
    (0.2ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
   Apidae::Obj Load (26.8ms)  SELECT apidae_id, COUNT(id) FROM "apidae_objs" WHERE "apidae_objs"."root_obj_id" IS NULL GROUP BY "apidae_objs"."apidae_id" HAVING (COUNT(id) > 1)
   Apidae::Obj Load (2.4ms)  SELECT apidae_id, COUNT(id) FROM "apidae_objs" WHERE "apidae_objs"."root_obj_id" IS NULL GROUP BY "apidae_objs"."apidae_id" HAVING (COUNT(id) > 1)
+  Apidae::Obj Load (0.8ms)  SELECT  "apidae_objs".* FROM "apidae_objs" ORDER BY "apidae_objs"."id" ASC LIMIT $1  [["LIMIT", 1]]
+   (3.4ms)  SELECT COUNT(*) FROM "apidae_objs"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.12
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-06 00:00:00.000000000 Z
+date: 2021-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails