apidae 1.2.4 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e45899b8d14f77793f2dc9d928f2c2aa6eba0dad
-  data.tar.gz: 3123ee0afa071eea4db09c3484de7916be2c6529
+  metadata.gz: 2be2cf907e5a637962c70ddfde7fb4c2fab3f898
+  data.tar.gz: f71204e522ad70932deb15a8c2dd0330ddbdefa0
 SHA512:
-  metadata.gz: '059806981d7ed7c469a45cda41072dceb8384d1cc5943089f42e766378a444d516a2e728d48e0335eea1da411673053e296ed6cf3c4cf309f4c9f45ccbb2faaf'
-  data.tar.gz: fde56d7ce57fef6fc0b984cfba695e80e22d63b52d4b258807edabedb3952f2ca5adbcca3510512445a4a90e4361f54c51142318a836e2f6cb8ad0db880d914d
+  metadata.gz: 4176569bfe745b9f7391435ccd898cb5b3cdd2560febbca15ecd8500cdf00a7d7a01642a2ff9aa36f12c405c3db6c8e451d4c3e4ac61aa7fb7dab2cde377f824
+  data.tar.gz: e6f83af4e0b1d8688ebf5dae737ded92335d41196ec48ab7205875f8d54e11cf4971afd7ebd91bf5491a48e033ca0bcfef3c0a93ae4febb091cd32083350f4c4

data/app/models/apidae/apidae_data_parser.rb

@@ -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
@@ -236,6 +237,7 @@ module Apidae
             openings_desc: node_value(openings_hash, :periodeEnClair, *locales),
             openings_desc_mode: openings_hash[:periodeEnClairGenerationMode] == 'AUTOMATIQUE' ? MODE_AUTO : MODE_MANUAL,
             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])
         }
@@ -335,10 +337,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

@@ -7,6 +7,7 @@ module Apidae
 
     attr_accessor :locale
     attr_accessor :obj_version
+    attr_accessor :obj_versions
 
     store_accessor :title_data, :title
     store_accessor :owner_data, :owner_name, :owner_id
@@ -15,7 +16,7 @@ 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
@@ -83,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},
@@ -100,6 +101,7 @@ module Apidae
     after_initialize do
       @locale = DEFAULT_LOCALE
       @obj_version = DEFAULT_VERSION
+      @obj_versions = {}
     end
 
     def root_obj
@@ -111,11 +113,15 @@ module Apidae
     end
 
     def in_version(v)
-      @cached_versions ||= {}
-      if @cached_versions[v].nil?
-        @cached_versions[v] = versions.where(version: v).first
+      if v == DEFAULT_VERSION && root_obj_id.nil?
+        @obj_version = DEFAULT_VERSION
+        self
+      else
+        if @obj_versions[v].nil?
+          @obj_versions[v] = versions.where(version: v).first
+        end
+        @obj_versions[v]
       end
-      @cached_versions[v]
     end
 
     def in_locale(l)
@@ -164,6 +170,7 @@ module Apidae
       apidae_obj
     end
 
+    # Note : overrides existing fields (not a merge)
     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?
@@ -183,7 +190,7 @@ module Apidae
                                              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/app/models/apidae/reference.rb

@@ -10,7 +10,7 @@ module Apidae
     end
 
     def self.import(refs_json)
-    locales = Rails.application.config.respond_to?(:apidae_locales) ? Rails.application.config.apidae_locales : [DEFAULT_LOCALE]
+      locales = Rails.application.config.respond_to?(:apidae_locales) ? Rails.application.config.apidae_locales : [DEFAULT_LOCALE]
       locales_map = Hash[locales.map {|loc| ["libelle#{loc.camelize.gsub('-', '')}".to_sym, loc]}]
       refs_hashes = JSON.parse(refs_json, symbolize_names: true)
       if refs_hashes.length != where("apidae_type != ?", INTERNAL).count

data/app/models/apidae/selection.rb

@@ -92,9 +92,10 @@ module Apidae
       query_api(query_args, true, false)
     end
 
-    def add_or_refresh_obj(apidae_obj_id)
+    # Note : WARNING - updated obj will only contain the provided fields
+    def add_or_refresh_obj(apidae_obj_id, fields = ["@all"])
       if valid_api?
-        res = api_object(apidae_obj_id)
+        res = api_object(apidae_obj_id, fields)
         if res[:results] && res[:results].length == 1
           obj_data = res[:results].first.deep_symbolize_keys
           add_or_refresh(obj_data)
@@ -102,6 +103,7 @@ module Apidae
       end
     end
 
+    # Note : WARNING - updated objs will only contain the provided fields
     def add_or_refresh_objs(fields = ["@all"])
       if valid_api?
         res = api_objects({fields: fields})

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'
@@ -24,8 +25,11 @@ 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, :services,
+  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,
+                                   :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]
 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.4"
+  VERSION = "1.2.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.9
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-06 00:00:00.000000000 Z
+date: 2020-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails