apidae 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a89823d97fa0f65fa985b4c5868cdcad0ddc4c66
-  data.tar.gz: 3ea06983a6b4a0e36b5607dce58f5908048153f7
+  metadata.gz: 75ec8d84f77ede131aab6a98442f004fe54920a8
+  data.tar.gz: 740c16247d3e53be233d802cd26cadc7d14e6896
 SHA512:
-  metadata.gz: 4682b5926be504889286583e6a316eb3a7940cccd9aaf91408944a165f33dc1134a1b84548e91e57a7825233784b9e4be4fa30792c66b086001ce64087f09bc3
-  data.tar.gz: 3812b82094ed52d53eb62a3ba6110fe7a97ef7a680434fd2109e2e072681e6cd090b5b024188e6436b9741da4b1c8806922dd9d5d08b429bb1a77ac36728a143
+  metadata.gz: 098cb9aa6df607f6cbd4a527d895006c75c0d4b0aac1ed682c10aca9f7142209df0986680d45fb3de153f0b06ba550172ba0381fd86a437454b32017b27c9f6a
+  data.tar.gz: c02948e3b352d5b09fe2ad90df543e2c7aa486bc4e9179949fa66e235284303118839dac06c2d454ca63d48e8d74dd9a0bced19907594aa44def59a98f193cf0

data/app/models/apidae/export.rb

@@ -3,6 +3,7 @@ module Apidae
 
     PENDING = 'pending'
     COMPLETE = 'complete'
+    CANCELLED = 'cancelled'
 
     # Note : handle reset case
     def self.pending

data/app/models/apidae/object.rb

@@ -8,14 +8,14 @@ module Apidae
 
     store_accessor :pictures_data, :pictures
     store_accessor :attachments_data, :attachments
-    store_accessor :type_data, :categories, :themes, :capacity, :classification, :labels, :chains
+    store_accessor :type_data, :categories, :themes, :capacity, :classification, :labels, :chains, :area, :track
     store_accessor :entity_data, :entity_id, :entity_name
     store_accessor :contact, :telephone, :email, :website
-    store_accessor :address, :address_fields
+    store_accessor :address, :address_fields, :place
     store_accessor :openings_data, :openings_desc, :openings
     store_accessor :rates_data, :rates_desc, :rates, :payment_methods
     store_accessor :service_data, :services, :equipments, :comfort, :activities
-    store_accessor :tags_data, :tags
+    store_accessor :tags_data, :promo, :internal
 
     ACT = 'ACTIVITE'
     COS = 'COMMERCE_ET_SERVICE'
@@ -70,14 +70,14 @@ module Apidae
       apidae_obj.short_desc = node_value(object_data[:presentation], :descriptifCourt)
       apidae_obj.long_desc = node_value(object_data[:presentation], :descriptifDetaille)
       apidae_obj.contact = contact(object_data[:informations])
-      apidae_obj.address = address(object_data[:localisation][:adresse])
+      apidae_obj.address = address(object_data[:localisation][:adresse], object_data[type_fields[:node]])
       apidae_obj.town = town(object_data[:localisation][:adresse])
       apidae_obj.latitude = latitude(object_data[:localisation])
       apidae_obj.longitude = longitude(object_data[:localisation])
       apidae_obj.openings_data = parse_openings(object_data[:ouverture])
       apidae_obj.rates_data = parse_rates(object_data[:descriptionTarif])
       apidae_obj.reservation = parse_reservation(object_data[:reservation])
-      apidae_obj.type_data = parse_type_data(object_data[type_fields[:node]], object_data[:prestations])
+      apidae_obj.type_data = parse_type_data(object_data[:type], object_data[type_fields[:node]], object_data[:prestations])
       apidae_obj.pictures_data = pictures_urls(object_data[:illustrations])
       apidae_obj.attachments_data = attachments_urls(object_data[:multimedias])
       apidae_obj.entity_data = entity_fields(object_data[:informations])
@@ -121,25 +121,28 @@ module Apidae
       contact_entries.each do |c|
         case c[:type][:id]
           when PHONE
-            contact_details[:telephone] = c[:coordonnees][:fr]
+            contact_details[:telephone] ||= []
+            contact_details[:telephone] << c[:coordonnees][:fr]
           when EMAIL
-            contact_details[:email] = c[:coordonnees][:fr]
+            contact_details[:email] ||= []
+            contact_details[:email] << c[:coordonnees][:fr]
           when WEBSITE
-            contact_details[:website] = c[:coordonnees][:fr]
+            contact_details[:website] ||= []
+            contact_details[:website] << c[:coordonnees][:fr]
           else
         end
       end
       contact_details
     end
 
-    def self.address(address_hash)
+    def self.address(address_hash, type_data_hash)
       computed_address = []
       unless address_hash.blank?
         computed_address << address_hash[:adresse1] unless address_hash[:adresse1].blank?
         computed_address << address_hash[:adresse2] unless address_hash[:adresse2].blank?
         computed_address << address_hash[:adresse3] unless address_hash[:adresse3].blank?
       end
-      {address_fields: computed_address}
+      {address_fields: computed_address, place: type_data_hash[:nomLieu]}
     end
 
     def self.town(address_hash = {})
@@ -175,15 +178,18 @@ module Apidae
       end
     end
 
-    def self.parse_type_data(data_hash, prestations_hash)
+    def self.parse_type_data(object_type, data_hash, prestations_hash)
       if data_hash
         {
             categories: lists_ids(data_hash[:categories]),
             themes: lists_ids(data_hash[:themes]),
             capacity: data_hash[:capacite],
-            classification: nodes_ids(data_hash[:classement], data_hash[:classementPrefectoral]),
+            classification: nodes_ids(data_hash[:classement], data_hash[:classementPrefectoral], data_hash[:classification]) +
+                                      lists_ids(data_hash[:classementsGuides]),
             labels: lists_ids(data_hash[:labels], prestations_hash[:labelsTourismeHandicap]),
-            chains: lists_ids(data_hash[:chaines]) + nodes_ids(data_hash[:chaineEtLabel])
+            chains: lists_ids(data_hash[:chaines]) + nodes_ids(data_hash[:chaineEtLabel]),
+            area: object_type == DOS ? data_hash.except(:classification) : nil,
+            track: object_type == EQU ? data_hash[:itineraire] : nil
         }
       end
     end
@@ -200,14 +206,14 @@ module Apidae
     end
 
     def self.parse_tags_data(pres_data_hash, crit_data_hash)
-      tags = []
+      tags = {}
       if pres_data_hash
-        tags += lists_ids(pres_data_hash[:typologiesPromoSitra])
+        tags[:promo] = lists_ids(pres_data_hash[:typologiesPromoSitra])
       end
       unless crit_data_hash.blank?
-        tags += crit_data_hash.map {|c| c[:id]}
+        tags[:internal] = crit_data_hash.map {|c| c[:id]}
       end
-      {tags: tags}
+      tags
     end
 
     def self.parse_reservation(reservation_hash)

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-19 00:00:00.000000000 Z
+date: 2018-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails