apidae 1.0.5 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31b78ff6495e0ea74d29caaed66d76b83523d88c
-  data.tar.gz: 59baa0f6635975e9853087ec0a270d7aa53e25a7
+  metadata.gz: 8bd545f978b6e92863317ee32f69d390366929e7
+  data.tar.gz: 7708db489c0c2a976645e121b03c3da60224ffc6
 SHA512:
-  metadata.gz: 75220b103c72f0b97a8f4c1be7f3d7c190c20ddc6485ddc64c365a667d7ecb43b9f5021f162849a47f81cd241e78883551c480a911b3a550383276e12c248cdb
-  data.tar.gz: ef1e4fb867c8b0945b73914b3d0d69540b45ad87c0d8fa65fd59cf4a071afa7a98d744fb42e47629451ceef3007d329ed1e269181e6c27ef6418254c367d5bc2
+  metadata.gz: 47c2dd654c858986dc9cb77bec0088a3dc3102496d3807baa0e4c25dfe9927a4e5f374da9d7995bf915f773e90e70ab0ba84939a0a250835d254e19c33341174
+  data.tar.gz: 40cfebeba007efd9434a490cfdd001d47d4168ac4282276863178e3906273f523fa643f19c3e9dde7bdc3f9234d3f6166866b858f04765d14ac91cb3ad03760e

data/app/controllers/apidae/import_controller.rb

@@ -91,6 +91,11 @@ module Apidae
         logger.error("Error is : #{err}")
         success = false
         e.update(status: Export::CANCELLED)
+      rescue Exception => e
+        logger.error "Failed to import file : #{e.file_url}"
+        logger.error("Error is : #{err}")
+        success = false
+        e.update(status: Export::CANCELLED)
       end
       success
     end

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/controllers/apidae/projects_controller.rb

@@ -3,6 +3,7 @@ require_dependency "apidae/application_controller"
 module Apidae
   class ProjectsController < ApplicationController
     before_action :set_project, only: [:edit, :update, :destroy]
+    skip_before_action :check_user_data!, only: [:create]
 
     def index
       if user_is_admin?
@@ -24,7 +25,7 @@ module Apidae
       else
         @project = Project.new(project_params)
         if @project.save
-          referrer = (session.delete(:referrer) || projects_url)
+          referrer = params[:redirect_to] || session.delete(:referrer) || projects_url
           redirect_to (referrer + "?apidae_project_id=#{@project.id}"), notice: 'Le projet a bien été créé'
         else
           flash.now[:alert] = "Une erreur s'est produite lors la création du projet"
@@ -54,7 +55,7 @@ module Apidae
 
     def update_project
       if @project.update(project_params)
-        referrer = session.delete(:referrer)
+        referrer = params[:redirect_to] || session.delete(:referrer)
         redirect_to (referrer + "?apidae_project_id=#{@project.id}"), notice: 'Le projet a bien été mis à jour'
       else
         flash.now[:alert] = "Une erreur s'est produite lors la mise à jour du projet"

data/app/models/apidae/apidae_data_parser.rb

@@ -9,6 +9,23 @@ module Apidae
     TWITTER = 3755
     YELP = 4007
     TRIP_ADVISOR = 4000
+    FAX = 202
+    MOBILE_WEBSITE = 3769
+    SHORTY_URL = 4923
+
+    CONTACTS_MAP = {
+        'telephone' => PHONE,
+        'email' => EMAIL,
+        'website' => WEBSITE,
+        'facebook' => FACEBOOK,
+        'google' => GOOGLE,
+        'trip_advisor' => TRIP_ADVISOR,
+        'twitter' => TWITTER,
+        'yelp' => YELP,
+        'fax' => FAX,
+        'mobile_website' => MOBILE_WEBSITE,
+        'shorty_url' => SHORTY_URL
+    }
 
     MODE_AUTO = 'auto'
     MODE_MANUAL = 'manual'
@@ -114,7 +131,7 @@ module Apidae
                 url: pic[:traductionFichiers][0][:url].gsub('http:', 'https:'),
                 description: localized_value(pic, :legende, locale),
                 credits: localized_value(pic, :copyright, locale),
-                expiration_date: pic[:dateLimiteDePublication]
+                expiration_date: pic[:dateLimiteDePublication] || ''
             }
           end
         end
@@ -149,29 +166,38 @@ module Apidae
         contact_entries.each do |c|
           case c[:type][:id]
           when PHONE, ALT_PHONE
-            contact_details[:telephone] ||= []
-            contact_details[:telephone] << c[:coordonnees][:fr]
+            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[:coordonnees][:fr]
+            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[:coordonnees][:fr]
+            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[:coordonnees][:fr]
+            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[:coordonnees][:fr]
+            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[:coordonnees][:fr]
+            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[:coordonnees][:fr]
+            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[:coordonnees][:fr]
+            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
           end
         end
@@ -339,6 +365,7 @@ module Apidae
               external_id: o[:identifiantTechnique],
               start_date: o[:dateDebut],
               end_date: o[:dateFin],
+              each_year: o[:tousLesAns],
               closing_days: closing_days.blank? ? [] : closing_days.map {|d| d[:dateSpeciale]},
               details: node_value(o, :complementHoraire, *locales),
               time_periods: [

data/app/models/apidae/export.rb

@@ -7,6 +7,15 @@ module Apidae
 
     validates_presence_of :file_url, :project_id
 
+    before_save :normalize_url
+
+    def normalize_url
+      self.file_url = file_url.strip
+      unless file_url.include?('/')
+        self.file_url = "http://export.apidae-tourisme.com/exports/#{file_url}"
+      end
+    end
+
     # Note : handle reset case
     def self.pending
       where(remote_status: 'SUCCESS', status: PENDING).order(:id)

data/app/models/apidae/obj.rb

@@ -16,7 +16,8 @@ module Apidae
     store_accessor :type_data, :categories, :themes, :capacity, :classification, :labels, :chains, :area, :track,
                    :products, :audience, :animals, :animals_desc, :extra, :duration, :certifications, :business
     store_accessor :entity_data, :entity_id, :entity_name, :service_provider_id
-    store_accessor :contact_data, :telephone, :email, :website, :google, :facebook, :twitter, :yelp, :trip_advisor, :contacts
+    store_accessor :contact_data, :telephone, :email, :website, :google, :facebook, :twitter, :yelp, :trip_advisor, :fax,
+                   :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

data/app/models/apidae/selection.rb

@@ -116,8 +116,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/app/views/apidae/import/_form.html.erb

@@ -9,9 +9,10 @@
     </div>
   <% end %>
   <p>
-    Pour que les données soient importées correctement,
-    vos projets doivent être configurés pour exporter les données au format <strong>JSON V2</strong>, en
-    <strong>groupant les objets exportés</strong>.
+    Pour que les données soient importées correctement, vos projets doivent être configurés pour exporter les données
+    au format <strong>JSON V2</strong>, en <strong>groupant les objets exportés</strong>. L'adresse du fichier d'export
+    est à récupérer dans :<br/>
+    <em>Page du projet Apidae > Onglet "Calcul des sélections et Exports " > Accéder à la ficher de l'export > Champ "Fichier d'export"</em>
   </p>
 
   <div class="<%= styles[:form_field] %>">

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "1.0.5"
+  VERSION = "1.2.1"
 end

metadata

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