apidae 1.4.3 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aabfe9be4d2de7c87baa00f3234faf20fe31ab8125f6163acf65e0aa772e1dbc
-  data.tar.gz: fb0e940576b5b979ed5ae0dd5fba63c24578c8293152372e8f0dfa67d195588b
+  metadata.gz: 5993f5c75ce5af62a6bfb8ac53a4f4ae0e07536fa9ac532686a88966461edfc5
+  data.tar.gz: 0e015ab1ffaf6af58f709e3dc1662f50200422ae5551b9dcf2a790b67050d249
 SHA512:
-  metadata.gz: fc81a47d8e6165241e0449217e116e1d9f22e39c4e403ba377950bc8d527631abe593ab2be49ef589d1f8dbca41430606c890722020bb525a364dcaa3642f9a3
-  data.tar.gz: fbd8e4c42aec95838f8a65c6d88a73f07f82082910d42fbbf71068678adb51cccc1d6caf61e9e1bded5424d965ade31c46ec49bbe6eb1d649fc0227bd12fe06f
+  metadata.gz: a4f0e9122f14fc19c07145963b11d4ed1a2edbae80ef8045d6277e3613fa2be478c6e36c89f794dd60a97f4e6eff049eaf59657da8219e454d14a7795a39d57c
+  data.tar.gz: ae9c7c1697a424a83e151bbbee9e47e918473c951e16f53c4780d8b9b83085aa7623af3e596f722866e790f16018e751600c71c89f4b8964b059a665176b5b38

data/app/models/apidae/apidae_data_parser.rb

@@ -12,6 +12,7 @@ module Apidae
     FAX = 202
     MOBILE_WEBSITE = 3769
     SHORTY_URL = 4923
+    INSTAGRAM = 7221
 
     CONTACTS_MAP = {
         'telephone' => PHONE,
@@ -24,7 +25,8 @@ module Apidae
         'yelp' => YELP,
         'fax' => FAX,
         'mobile_website' => MOBILE_WEBSITE,
-        'shorty_url' => SHORTY_URL
+        'shorty_url' => SHORTY_URL,
+        'instagram' => INSTAGRAM
     }
 
     MODE_AUTO = 'auto'
@@ -177,37 +179,13 @@ module Apidae
           when PHONE, ALT_PHONE
             contact_details[:telephone] ||= {}
             contact_details[:telephone][c[:identifiant]] = {value: c[:coordonnees][:fr], description: c.dig(:observation, :libelleFr)}
-          when EMAIL
-            contact_details[:email] ||= {}
-            contact_details[:email][c[:identifiant]] = {value: c[:coordonnees][:fr], description: c.dig(:observation, :libelleFr)}
-          when WEBSITE
-            contact_details[:website] ||= {}
-            contact_details[:website][c[:identifiant]] = {value: c[:coordonnees][:fr], description: c.dig(:observation, :libelleFr)}
-          when GOOGLE
-            contact_details[:google] ||= {}
-            contact_details[:google][c[:identifiant]] = {value: c[:coordonnees][:fr], description: c.dig(:observation, :libelleFr)}
-          when FACEBOOK
-            contact_details[:facebook] ||= {}
-            contact_details[:facebook][c[:identifiant]] = {value: c[:coordonnees][:fr], description: c.dig(:observation, :libelleFr)}
-          when TWITTER
-            contact_details[:twitter] ||= {}
-            contact_details[:twitter][c[:identifiant]] = {value: c[:coordonnees][:fr], description: c.dig(:observation, :libelleFr)}
-          when YELP
-            contact_details[:yelp] ||= {}
-            contact_details[:yelp][c[:identifiant]] = {value: c[:coordonnees][:fr], description: c.dig(:observation, :libelleFr)}
-          when TRIP_ADVISOR
-            contact_details[:trip_advisor] ||= {}
-            contact_details[:trip_advisor][c[:identifiant]] = {value: c[:coordonnees][:fr], description: c.dig(:observation, :libelleFr)}
-          when FAX
-            contact_details[:fax] ||= {}
-            contact_details[:fax][c[:identifiant]] = {value: c[:coordonnees][:fr], description: c.dig(:observation, :libelleFr)}
-          when MOBILE_WEBSITE
-            contact_details[:mobile_website] ||= {}
-            contact_details[:mobile_website][c[:identifiant]] = {value: c[:coordonnees][:fr], description: c.dig(:observation, :libelleFr)}
-          when SHORTY_URL
-            contact_details[:shorty_url] ||= {}
-            contact_details[:shorty_url][c[:identifiant]] = {value: c[:coordonnees][:fr], description: c.dig(:observation, :libelleFr)}
           else
+            contacts_refs_by_code = CONTACTS_MAP.invert
+            if contacts_refs_by_code.keys.include?(c[:type][:id])
+              contact_ref = contacts_refs_by_code[c[:type][:id]].to_sym
+              contact_details[contact_ref] ||= {}
+              contact_details[contact_ref][c[:identifiant]] = {value: c[:coordonnees][:fr], description: c.dig(:observation, :libelleFr)}
+            end
           end
         end
       end
@@ -262,7 +240,7 @@ module Apidae
         values = rates_hash[:periodes].blank? ? [] : rates_hash[:periodes].map {|p| build_rate(p, *locales)}
         methods = rates_hash[:modesPaiement].blank? ? [] : rates_hash[:modesPaiement].map {|p| p[:id]}
         {
-            rates_desc: desc, rates: values, payment_methods: methods,
+            rates_desc: desc, rates: values, rates_category: rates_hash[:indicationTarif], payment_methods: methods,
             tax_included: rates_hash[:taxeDeSejourIncluse].blank? ? nil : (rates_hash[:taxeDeSejourIncluse] == 'OUI'),
             rates_desc_mode: rates_hash[:tarifsEnClairGenerationMode] == 'AUTOMATIQUE' ? MODE_AUTO : MODE_MANUAL,
             includes: node_value(rates_hash, :leTarifComprend, *locales),
@@ -282,7 +260,7 @@ module Apidae
           categories: lists_ids(data_hash[:categories], data_hash[:typesDetailles], data_hash[:activiteCategories], data_hash[:typesHabitation]),
           themes: lists_ids(data_hash[:themes]),
           capacity: (data_hash[:capacite] || {})
-                        .merge(presta_hash ? {group_min: presta_hash[:tailleGroupeMin], group_max: presta_hash[:tailleGroupeMax],
+                        .merge(presta_hash ? {group_min: (presta_hash[:nombrePersonnesMinimum] || presta_hash[:tailleGroupeMin]), group_max: presta_hash[:tailleGroupeMax],
                                               age_min: presta_hash[:ageMin], age_max: presta_hash[:ageMax],
                                               wheelchair_max: presta_hash[:nombrePersonnesEnFauteuilRoulantAccueilliesSimultanement]} : {}),
           classification: nodes_ids(data_hash[:classement], data_hash[:classementPrefectoral], data_hash[:classification]) +

data/app/models/apidae/obj.rb

@@ -23,7 +23,8 @@ module Apidae
                    :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, :opening_days
-    store_accessor :rates_data, :rates_desc, :rates_desc_mode, :rates, :payment_methods, :includes, :excludes, :rates_extra, :tax_included
+    store_accessor :rates_data, :rates_desc, :rates_desc_mode, :rates, :rates_category, :payment_methods, :includes, :excludes,
+                   :rates_extra, :tax_included
     store_accessor :service_data, :services, :equipments, :comfort, :activities, :challenged, :languages, :documentation_languages
     store_accessor :booking_data, :booking_desc, :booking_entities, :visits_allowed, :visits_desc, :visits_duration, :visits_services
     store_accessor :tags_data, :promo, :internal, :linked

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "1.4.3"
+  VERSION = "1.4.5"
 end