apidae 1.1.2 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aecffb4dbac3b6d3b2c73f08d0ca3647c8d4c807
-  data.tar.gz: f55420c1dc448d89bd4819950c150f6e08d73624
+  metadata.gz: e45899b8d14f77793f2dc9d928f2c2aa6eba0dad
+  data.tar.gz: 3123ee0afa071eea4db09c3484de7916be2c6529
 SHA512:
-  metadata.gz: 44ce804f3dd69a73d049c4c3b093cfee288eae63a348507bd76c14925bb3ec2fd14ad11dcb7faf46fb5b4760b4e6fecb3b999c9ebf2912cf846c6859e105ccac
-  data.tar.gz: 518f6e0bbfbe3b176a375da2133349955a550570f1e6aa3654554519f1fa7dbafe24b611b779671bff0bf7208d1bfbf525c945546376b7b57026a55f110d490f
+  metadata.gz: '059806981d7ed7c469a45cda41072dceb8384d1cc5943089f42e766378a444d516a2e728d48e0335eea1da411673053e296ed6cf3c4cf309f4c9f45ccbb2faaf'
+  data.tar.gz: fde56d7ce57fef6fc0b984cfba695e80e22d63b52d4b258807edabedb3952f2ca5adbcca3510512445a4a90e4361f54c51142318a836e2f6cb8ad0db880d914d

data/app/controllers/apidae/objects_controller.rb

@@ -34,17 +34,15 @@ module Apidae
     def create
       @obj = Obj.new(object_params)
       if Obj.find_by_apidae_id(@obj.apidae_id)
-        redirect_to objects_url, alert: "Cet objet est déjà importé."
-      else
-        selection = params[:selection_apidae_id].blank? ? Selection.last : Selection.find_by_apidae_id(params[:selection_apidae_id])
-        if @obj.save && selection.add_or_refresh_obj(@obj.apidae_id)
-          redirect_to objects_url, notice: "L'objet a bien été importé"
-        else
-          flash[:alert] = "Une erreur s'est produite lors de l'import de l'objet."
-          render :new
+        redirect_to objects_url, alert: "Cet objet est déjà importé." and return
+      elsif !params[:selection_apidae_id].blank?
+        selection = Selection.find_by_apidae_id(params[:selection_apidae_id])
+        if selection && selection.valid_api? && @obj.save && selection.add_or_refresh_obj(@obj.apidae_id)
+          redirect_to objects_url, notice: "L'objet a bien été importé" and return
         end
       end
-
+      flash[:alert] = "Une erreur s'est produite lors de l'import de l'objet."
+      render :new
     end
 
     def update
@@ -62,9 +60,20 @@ 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
+        sel = @obj.selections.find {|s| s.valid_api?}
+        if sel && sel.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
@@ -245,13 +245,14 @@ module Apidae
     def self.parse_rates(rates_hash, *locales)
       if rates_hash
         desc = rates_hash[:gratuit] ? {DEFAULT_LOCALE => 'gratuit'} : node_value(rates_hash, :tarifsEnClair, *locales)
-        values = rates_hash[:periodes].blank? ? [] : rates_hash[:periodes].map {|p| build_rate(p)}
+        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_mode: rates_hash[:tarifsEnClairGenerationMode] == 'AUTOMATIQUE' ? MODE_AUTO : MODE_MANUAL,
             includes: node_value(rates_hash, :leTarifComprend, *locales),
-            excludes: node_value(rates_hash, :leTarifNeComprendPas, *locales)
+            excludes: node_value(rates_hash, :leTarifNeComprendPas, *locales),
+            rates_extra: node_value(rates_hash, :complement, *locales)
         }
       end
     end
@@ -346,10 +347,10 @@ module Apidae
 
     private
 
-    def self.build_rate(rate_period)
+    def self.build_rate(rate_period, *locales)
       {
           id: rate_period[:identifiant], start_date: rate_period[:dateDebut], end_date: rate_period[:dateFin],
-          values: rate_period[:tarifs].blank? ? [] : rate_period[:tarifs].map {|t| {min: t[:minimum], max: t[:maximum], type: t[:type][:id], details: node_value(t, :precisionTarif)}}
+          values: rate_period[:tarifs].blank? ? [] : rate_period[:tarifs].map {|t| {min: t[:minimum], max: t[:maximum], type: t[:type][:id], details: node_value(t, :precisionTarif, *locales)}}
       }
     end
 

data/app/models/apidae/obj.rb

@@ -20,7 +20,7 @@ module Apidae
                    :mobile_website, :shorty_url, :contacts
     store_accessor :location_data, :address, :place, :latitude, :longitude, :access, :territories, :environments
     store_accessor :openings_data, :openings_desc, :openings_desc_mode, :openings, :time_periods, :openings_extra
-    store_accessor :rates_data, :rates_desc, :rates_desc_mode, :rates, :payment_methods, :includes, :excludes
+    store_accessor :rates_data, :rates_desc, :rates_desc_mode, :rates, :payment_methods, :includes, :excludes, :rates_extra
     store_accessor :service_data, :services, :equipments, :comfort, :activities, :challenged, :languages
     store_accessor :booking_data, :booking_desc, :booking_entities
     store_accessor :tags_data, :promo, :internal, :linked

data/app/models/apidae/selection.rb

@@ -50,6 +50,10 @@ module Apidae
       objects.where(where_clause).count
     end
 
+    def valid_api?
+      apidae_project && !apidae_project.api_key.blank? && !apidae_project.apidae_id.blank?
+    end
+
     def api_results(opts = {})
       key = cache_key(:results)
       res = $apidae_cache.read(key)
@@ -83,13 +87,13 @@ module Apidae
       res
     end
 
-    def api_object(apidae_obj_id)
-      query_args = build_args(OBJECTS_ENDPOINT, {obj_ids: [apidae_obj_id], fields: ["@all"]})
+    def api_object(apidae_obj_id, fields = ["@all"])
+      query_args = build_args(OBJECTS_ENDPOINT, {obj_ids: [apidae_obj_id], fields: fields})
       query_api(query_args, true, false)
     end
 
     def add_or_refresh_obj(apidae_obj_id)
-      if apidae_project
+      if valid_api?
         res = api_object(apidae_obj_id)
         if res[:results] && res[:results].length == 1
           obj_data = res[:results].first.deep_symbolize_keys
@@ -99,7 +103,7 @@ module Apidae
     end
 
     def add_or_refresh_objs(fields = ["@all"])
-      if apidae_project
+      if valid_api?
         res = api_objects({fields: fields})
         if res[:results] && res[:results].length > 0
           res[:results].each do |result|
@@ -116,8 +120,9 @@ module Apidae
         obj = Obj.update_object(obj, obj_data, apidae_project.locales, apidae_project.versions)
       else
         obj = Obj.add_object(obj_data, apidae_project.locales, apidae_project.versions)
-        SelectionObject.create(apidae_selection_id: id, apidae_object_id: added_obj.id)
       end
+      SelectionObject.create(apidae_selection_id: id, apidae_object_id: obj.id) unless objects.include?(obj)
+
       if Rails.application.config.respond_to?(:apidae_obj_refresh_callback)
         Rails.application.config.apidae_obj_refresh_callback.call(obj.apidae_id)
       end

data/lib/apidae/version.rb

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

data/test/dummy/log/development.log

@@ -63,3 +63,5 @@ Migrating to AddLocalesDataToApidaeProjects (20190123214635)
    (0.2ms)  COMMIT
    (0.2ms)  SELECT pg_advisory_unlock(6140174353533887940)
    (0.2ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+  Apidae::Obj Load (26.8ms)  SELECT apidae_id, COUNT(id) FROM "apidae_objs" WHERE "apidae_objs"."root_obj_id" IS NULL GROUP BY "apidae_objs"."apidae_id" HAVING (COUNT(id) > 1)
+  Apidae::Obj Load (2.4ms)  SELECT apidae_id, COUNT(id) FROM "apidae_objs" WHERE "apidae_objs"."root_obj_id" IS NULL GROUP BY "apidae_objs"."apidae_id" HAVING (COUNT(id) > 1)

metadata

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