apidae 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecf4dc2ccc60bf43998df20e62627e9f4ae8db4e
-  data.tar.gz: 716a338e66bba90e698ff4352c1bb81d398937fc
+  metadata.gz: 3df5740373cfa229b7411e21a55eae04df831561
+  data.tar.gz: ec010b9d61a4cea4fa552180531f606498e04231
 SHA512:
-  metadata.gz: 3f15e2f455ad96b75a6f9173b3626c5d5252eac4b57ef2df292b0a713d3a38d397d1091f7e3ab39f549bc73a8737158b1f77d0cb987148d255104ee87a77dc5d
-  data.tar.gz: 0f72c91e82ad9dc80bd70202fc67e0818583a5567e2e10985ed6d89b1b2ccba74a0d0452103e23a4652dc65a0ba730139148d743dd04f8575f5f61cf5c2a4373
+  metadata.gz: 141dca6a42911917ad0722772df54b4f542364de8fe1502586e6710d9a37b0ade5cddd9abf5994b6768d8597b66fe3627f4fa3068d8d8da7506a4f899fa34737
+  data.tar.gz: 17f51ee8066cd53f353bf91f395191bb78255343f65f7978ff01e56c27b9205d91203687ad0c7b4b234cb05b88116decba24df1eba317b51d52992a9baa9495e

data/app/models/apidae/apidae_data_parser.rb

@@ -335,10 +335,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

@@ -15,7 +15,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
@@ -183,7 +183,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/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'

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.3.1"
+  VERSION = "1.3.2"
 end

metadata

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