apidae 1.4.4 → 1.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b92a9500f041a825be642e53f3bc1497e6f3448d40a31185485fc0cc313d34a8
-  data.tar.gz: 4fa5733460999f4c3a9558f35b3caf5ba94cbc5a0cf82fd4c83a953a25355001
+  metadata.gz: a61ea097b41173558021ee6eda38efaf0c472bcb192116c8957b822c58e72018
+  data.tar.gz: 86de5486f34f4f1498ea6a7558191a765dbf0293b175fa1485042f906551257f
 SHA512:
-  metadata.gz: 7ff90b90ff0153f945b54382af7792be8ae9096b9c6e7fb4e345d15f5c044f0cf695d00ce9ea6c6716d576a4c2485387cd65e43a6718431d068e29309506aea7
-  data.tar.gz: 84fac7d1042a47b33fe67a27eb19ad856b1896f03704b763f8da740f482cabb7a21413249361fe4908de36a1f5d3ff34c6751d31b91510f9dca8f762afa1983c
+  metadata.gz: 9da5479e9c3f93a80875c8746a48ac9a2ad8ff25788481dcd98f4347da487c78d5f62bc9bba823023c10ccd2e2f8865e81226d05d19a516844c67a052b8e3878
+  data.tar.gz: 6727ae118f54f37b47a42365a1e81044e985ff60b046e886ece950b7708085183c0ce5ef5836d466b101371d1351390362cffba60631393f1d116d9387b3de5a

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
@@ -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/config/initializers/constants.rb

@@ -28,7 +28,7 @@ module Apidae
   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, :accessibility_desc, :capacity, :telephone, :email, :website,
-                                   :google, :facebook, :twitter, :yelp, :trip_advisor, :fax, :mobile_website, :shorty_url,
+                                   :google, :facebook, :twitter, :yelp, :trip_advisor, :fax, :mobile_website, :shorty_url, :instagram,
                                    :openings, :openings_extra, :rates, :services, :payment_methods, :categories, :themes,
                                    :labels, :chains, :classification, :challenged, :environments, :languages, :products,
                                    :animals, :equipments, :comfort, :activities, :promo, :internal, :linked]

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "1.4.4"
+  VERSION = "1.4.6"
 end