apidae 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aecffb4dbac3b6d3b2c73f08d0ca3647c8d4c807
-  data.tar.gz: f55420c1dc448d89bd4819950c150f6e08d73624
+  metadata.gz: 2ec3c909a4d3a0cf9b9312db0b7f94e5a58c42d2
+  data.tar.gz: 3c7ce15d9d02a27d97567f4da56e3634068fcb23
 SHA512:
-  metadata.gz: 44ce804f3dd69a73d049c4c3b093cfee288eae63a348507bd76c14925bb3ec2fd14ad11dcb7faf46fb5b4760b4e6fecb3b999c9ebf2912cf846c6859e105ccac
-  data.tar.gz: 518f6e0bbfbe3b176a375da2133349955a550570f1e6aa3654554519f1fa7dbafe24b611b779671bff0bf7208d1bfbf525c945546376b7b57026a55f110d490f
+  metadata.gz: 2959dc04c3a7763578402a35a219a7bdb5888e114288343c654cba7d4a8e4d57b5cdceaf39a3de1ecf292c22d89a11186dfb05bc27f04108ac5cea5b2557c79a
+  data.tar.gz: 4b6dc11085319946637ac528feafdff08d66e4a1f80276734919f26960a51b5404787461bf22a461f8ff7abee2cc36df068a576b4eeec514164e2ea2655313f9

data/app/controllers/apidae/objects_controller.rb

@@ -62,9 +62,19 @@ module Apidae
 
     def refresh
       referrer = (session.delete(:referrer) || objects_url)
-      if @obj && @obj.selections.first.add_or_refresh_obj(@obj.apidae_id)
-        redirect_to referrer, notice: "L'objet touristique a bien été mis à jour."
-      else
+      begin
+        if @obj && @obj.selections.first.add_or_refresh_obj(@obj.apidae_id)
+          redirect_to referrer, notice: "L'objet touristique a bien été mis à jour."
+        else
+          redirect_to referrer, alert: "Une erreur s'est produite lors de la mise à jour de l'objet."
+        end
+      rescue OpenURI::HTTPError => err
+        logger.error("Failed to refresh obj : #{@obj.apidae_id}")
+        logger.error("Error is : #{err}")
+        redirect_to referrer, alert: "Une erreur s'est produite lors de la mise à jour de l'objet. Veuillez vérifier que le projet Apidae comporte une clé API valide."
+      rescue Exception => ex
+        logger.error("Failed to refresh obj : #{@obj.apidae_id}")
+        logger.error("Error is : #{err}")
         redirect_to referrer, alert: "Une erreur s'est produite lors de la mise à jour de l'objet."
       end
     end

data/app/models/apidae/apidae_data_parser.rb

@@ -167,37 +167,37 @@ module Apidae
           case c[:type][:id]
           when PHONE, ALT_PHONE
             contact_details[:telephone] ||= {}
-            contact_details[:telephone][c[:identifiant]] = c[:coordonnees][:fr]
+            contact_details[:telephone][c[:identifiant]] = {value: c[:coordonnees][:fr], description: c.dig(:observation, :libelleFr)}
           when EMAIL
             contact_details[:email] ||= {}
-            contact_details[:email][c[:identifiant]] = c[:coordonnees][:fr]
+            contact_details[:email][c[:identifiant]] = {value: c[:coordonnees][:fr], description: c.dig(:observation, :libelleFr)}
           when WEBSITE
             contact_details[:website] ||= {}
-            contact_details[:website][c[:identifiant]] = c[:coordonnees][:fr]
+            contact_details[:website][c[:identifiant]] = {value: c[:coordonnees][:fr], description: c.dig(:observation, :libelleFr)}
           when GOOGLE
             contact_details[:google] ||= {}
-            contact_details[:google][c[:identifiant]] = c[:coordonnees][:fr]
+            contact_details[:google][c[:identifiant]] = {value: c[:coordonnees][:fr], description: c.dig(:observation, :libelleFr)}
           when FACEBOOK
             contact_details[:facebook] ||= {}
-            contact_details[:facebook][c[:identifiant]] = c[:coordonnees][:fr]
+            contact_details[:facebook][c[:identifiant]] = {value: c[:coordonnees][:fr], description: c.dig(:observation, :libelleFr)}
           when TWITTER
             contact_details[:twitter] ||= {}
-            contact_details[:twitter][c[:identifiant]] = c[:coordonnees][:fr]
+            contact_details[:twitter][c[:identifiant]] = {value: c[:coordonnees][:fr], description: c.dig(:observation, :libelleFr)}
           when YELP
             contact_details[:yelp] ||= {}
-            contact_details[:yelp][c[:identifiant]] = c[:coordonnees][:fr]
+            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]] = c[:coordonnees][:fr]
+            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]] = c[:coordonnees][:fr]
+            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]] = c[:coordonnees][:fr]
+            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]] = c[:coordonnees][:fr]
+            contact_details[:shorty_url][c[:identifiant]] = {value: c[:coordonnees][:fr], description: c.dig(:observation, :libelleFr)}
           else
           end
         end

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "1.1.2"
+  VERSION = "1.2.0"
 end

metadata

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