apidae 1.0.5 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31b78ff6495e0ea74d29caaed66d76b83523d88c
-  data.tar.gz: 59baa0f6635975e9853087ec0a270d7aa53e25a7
+  metadata.gz: f69774e7655cd66923973e23882e6d1d0df0cb2a
+  data.tar.gz: 199df4ea7f45f563e569f9e1229dfdd012f6a2db
 SHA512:
-  metadata.gz: 75220b103c72f0b97a8f4c1be7f3d7c190c20ddc6485ddc64c365a667d7ecb43b9f5021f162849a47f81cd241e78883551c480a911b3a550383276e12c248cdb
-  data.tar.gz: ef1e4fb867c8b0945b73914b3d0d69540b45ad87c0d8fa65fd59cf4a071afa7a98d744fb42e47629451ceef3007d329ed1e269181e6c27ef6418254c367d5bc2
+  metadata.gz: 671a682f09badf6919a55227c7366478c23bc74456fd58669101ac7a4c9462a5c08cd32a1a58711652bb484c39867c106d338afd9989f08b759af5c4dab375de
+  data.tar.gz: f7ba0f5be1b236da982b133e682c454ff251a1848927db75f54dd827ee0367e4b38a2fa93884dc64aebc29d60bfe04a307d25b33a10cc268ddd4ab82ce786ce5

data/app/controllers/apidae/projects_controller.rb

@@ -24,7 +24,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 +54,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

@@ -10,6 +10,17 @@ module Apidae
     YELP = 4007
     TRIP_ADVISOR = 4000
 
+    CONTACTS_MAP = {
+        'telephone' => PHONE,
+        'email' => EMAIL,
+        'website' => WEBSITE,
+        'facebook' => FACEBOOK,
+        'google' => GOOGLE,
+        'trip_advisor' => TRIP_ADVISOR,
+        'twitter' => TWITTER,
+        'yelp' => YELP
+    }
+
     MODE_AUTO = 'auto'
     MODE_MANUAL = 'manual'
 
@@ -114,7 +125,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 +160,29 @@ 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]] = c[:coordonnees][:fr]
           when EMAIL
-            contact_details[:email] ||= []
-            contact_details[:email] << c[:coordonnees][:fr]
+            contact_details[:email] ||= {}
+            contact_details[:email][c[:identifiant]] = c[:coordonnees][:fr]
           when WEBSITE
-            contact_details[:website] ||= []
-            contact_details[:website] << c[:coordonnees][:fr]
+            contact_details[:website] ||= {}
+            contact_details[:website][c[:identifiant]] = c[:coordonnees][:fr]
           when GOOGLE
-            contact_details[:google] ||= []
-            contact_details[:google] << c[:coordonnees][:fr]
+            contact_details[:google] ||= {}
+            contact_details[:google][c[:identifiant]] = c[:coordonnees][:fr]
           when FACEBOOK
-            contact_details[:facebook] ||= []
-            contact_details[:facebook] << c[:coordonnees][:fr]
+            contact_details[:facebook] ||= {}
+            contact_details[:facebook][c[:identifiant]] = c[:coordonnees][:fr]
           when TWITTER
-            contact_details[:twitter] ||= []
-            contact_details[:twitter] << c[:coordonnees][:fr]
+            contact_details[:twitter] ||= {}
+            contact_details[:twitter][c[:identifiant]] = c[:coordonnees][:fr]
           when YELP
-            contact_details[:yelp] ||= []
-            contact_details[:yelp] << c[:coordonnees][:fr]
+            contact_details[:yelp] ||= {}
+            contact_details[:yelp][c[:identifiant]] = c[:coordonnees][:fr]
           when TRIP_ADVISOR
-            contact_details[:trip_advisor] ||= []
-            contact_details[:trip_advisor] << c[:coordonnees][:fr]
+            contact_details[:trip_advisor] ||= {}
+            contact_details[:trip_advisor][c[:identifiant]] = c[:coordonnees][:fr]
           else
           end
         end
@@ -339,6 +350,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/lib/apidae/version.rb

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

metadata

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