apidae 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c68638a33f855dbe14caf23d4bb0fa842e8a0263
-  data.tar.gz: 05978a1df57ca66bd96f42d66b8141e8c5c096f9
+  metadata.gz: fd09605f8fc42cf6117c1339ec62cc76620b10bc
+  data.tar.gz: 072fd7a05baf4b878c76cca5baeeb8bc459352d9
 SHA512:
-  metadata.gz: 071dc1136e326c7a3370055203ed04eae6954394a65d0f83194a3c9118199c51e4c17650acf0d09931ee43234175365af1cd58c10bec596a19e7b8c7acc19813
-  data.tar.gz: 6c82209df78847b4d22b5d42119cc7c664184ced8a067d7a24f6356cebbe7ee29a3b8213b9ecae14620d6e7e00784231a42d98607cf52a6a8e862c9060df936f
+  metadata.gz: e0acaaed45a9f86a98538808fba65872ec01d1fffbcd7dfe45118a0e83bdfa597172d39b5596ab7acfbee41633e42e95d691644527f698cbdb1a1275dcc83238
+  data.tar.gz: ceb438158398ade5e20dbcdf542c9430e8895b875adb9621d59d712f39d1386461c3b0c773315a39220f7f535883d926da392a1564cdeaf921120c08763c88e7

data/Rakefile

@@ -24,7 +24,11 @@ load 'rails/tasks/statistics.rake'
 
 Bundler::GemHelper.install_tasks
 
+# Note : where should engine-related test dependencies go ?
 require 'rake/testtask'
+require 'paperclip/schema'
+
+include Paperclip::Schema
 
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'

data/app/assets/images/apidae/logo-apidae-grey.svg

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 3000 1335" style="enable-background:new 0 0 3000 1335;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#D7D7D7;}
+	.st2{fill:#B2B2B2;}
+	.st3{fill:#999999;}
+	.st4{fill:#C2C2C2;}
+	.st5{fill:#8A8A8A;}
+	.st6{fill:#9A9A9A;}
+	.st7{fill:#9B9B9B;}
+	.st8{fill:#656565;}
+	.st9{fill:#FFFFFF;}
+	.st10{fill:#DDDDDD;}
+	.st11{fill:#A6A6A6;}
+	.st12{fill:#CCCCCC;}
+	.st13{fill:#C1C1C1;}
+	.st14{fill:#808080;}
+	.st15{fill:#777777;}
+</style>
+<title>Plan de travail 1</title>
+<path class="st0" d="M2519,501.1c16.9-40.8,24.8-83.6,27.7-122.7c-17.1,27.5-39.4,69.4-54.1,118.4L2519,501.1z"/>
+<path class="st0" d="M1973.6,424.3L1973.6,424.3c-1-1.3-2-2.5-3-3.8C1971.6,421.8,1972.6,423.1,1973.6,424.3z"/>
+<path class="st1" d="M1688.9,441h103.8v101.7l27.2-33.3c-0.2-0.5-0.5-1.1-0.7-1.6c-1.4-3.4-2.7-6.9-4-10.3c-0.3-0.8-0.6-1.5-0.8-2.3
+	l-0.2-0.5c-22.4-63.1-19.3-130.1-9.4-184c-123-28.8-249.7,22-249.7,22s24.4,81.5,83.3,154.3v-46H1688.9z"/>
+<path class="st2" d="M1837.6,201.4c0,0-21.1,45.6-32.8,109.2l0,0l0,0c19.4,4.6,39.2,10.8,57.9,19.9c44.6,21.7,80.2,55,107.9,90
+	c1,1.3,2,2.5,3,3.8l14.8,2.4c2-35.2,8.1-73.8,21.9-111.2C1936.8,237,1837.6,201.4,1837.6,201.4z"/>
+<path class="st3" d="M1970.6,420.6c-27.7-35-63.3-68.2-107.9-90c-18.7-9.1-38.5-15.3-57.9-19.9l0,0l-0.1,0.5
+	c-10,54-12.8,120.5,9.5,183.5l0.2,0.5c0.3,0.8,0.6,1.5,0.8,2.3c1.3,3.6,2.7,7.1,4.2,10.6c0.2,0.4,0.4,0.8,0.5,1.2l70.7-86.6
+	l8.6-10.6l13.4,2.2l60.9,9.9C1972.6,423.1,1971.6,421.8,1970.6,420.6z"/>
+<path class="st4" d="M2078.3,430.7L2187,298.5l8.6-10.5l13.4,2.2l98.1,16.3c24-103.5-0.2-203.8-0.2-203.8s-181.1,26.8-266.3,153.1
+	c-12.5,18.6-22.7,38.7-30.3,59.8c23.4,25,44.2,54.3,58.4,88.2C2072.4,412.6,2075.6,421.6,2078.3,430.7z"/>
+<path class="st5" d="M2070.6,440.1l6.3-7.7l1.4-1.8c-2.7-9.1-5.9-18.1-9.6-26.9c-14.2-33.9-35-63.2-58.4-88.2
+	c-13.8,37.4-19.9,76-21.9,111.2L2070.6,440.1z"/>
+<path class="st6" d="M2393.7,320.8l4.8,12.8l59.2,157.7l4.9,0.8l30.1,4.9c14.6-49,37-90.9,54.1-118.4c6.2-80.7-8.6-145.8-8.6-145.8
+	s-109,14.7-202.7,78.5l44.9,7.5L2393.7,320.8z"/>
+<path class="st7" d="M2619,517.2c26.8-17.8,54.8-31.4,80.9-41.7c-53.3-82.1-129.3-132.1-129.3-132.1c-8.6,11.2-16.6,22.9-23.9,35
+	c-3,39.1-10.9,81.8-27.7,122.7L2619,517.2z"/>
+<path class="st8" d="M2519,501.1c17.8-41.8,24.7-82.5,27.7-122.7c-17.1,27.5-39.4,69.4-54.1,118.4L2519,501.1L2519,501.1z"/>
+<polygon class="st9" points="2492.6,496.8 2492.6,496.9 2492.6,496.8 "/>
+<path class="st10" d="M2425.4,590l42.1-51.8l147,23.7l16.2,42.5c10.3,5.3,20.2,11.3,29.6,18l-30.4-79.6l-171.3-27.5l-77.3,95
+	l0.1-0.1C2395.5,602.1,2410.2,595.3,2425.4,590z"/>
+<polygon class="st11" points="2119.4,451.5 2213.9,336.5 2360.8,360.8 2413.1,500.2 2318.6,615.2 2285.3,609.7 2285.3,631.3 
+	2327.2,638.2 2437.4,504.2 2376.4,341.8 2205.3,313.5 2095.1,447.4 2147.4,586.8 2170.2,586.8 "/>
+<path class="st12" d="M1849.2,644l-25.8-68l94.2-115.3l147,23.9l39.6,104.3c9.2,3.2,18.2,7,26.8,11.4v-0.5l-50.9-134.1l-171.2-27.9
+	l-109.7,134.3l33.7,89C1838.1,655.1,1843.5,649.4,1849.2,644z"/>
+<path class="st13" d="M2740.3,719c3,6.5,5.7,13.1,8.2,19.9c2.1,5.9,4,11.8,5.7,17.8c1.9-2.5,3.7-5,5.5-7.5
+	c88-124.4,48.9-303.3,48.9-303.3s-49.2,6.2-108.8,29.7c22.3,34.4,40.7,74.5,47.8,119C2754.7,637.6,2750.2,680.2,2740.3,719z"/>
+<path class="st14" d="M2747.8,594.5c-7.1-44.4-25.5-84.5-47.8-119c-26.1,10.3-54.1,23.9-80.9,41.7l14.8,2.4l13.4,2.2l4.9,12.7
+	l46.5,122c17,18.6,31.1,39.7,41.8,62.6C2750.2,680.2,2754.7,637.6,2747.8,594.5z"/>
+<path class="st15" d="M151.6,1023.7l221.9-531.5H431l219.8,531.5H586l-61.7-148.3H276.8l-61,148.3H151.6z M294.6,825.6h211.8
+	L400.2,559.2L294.6,825.6z"/>
+<path class="st15" d="M708,1214.1V637.3h50.5v81.2c16.1-28.9,38-51.5,65.7-67.8c27.7-16.2,59.7-24.4,95.9-24.3
+	c25.2,0,48.7,3.9,70.5,11.8c21.7,7.8,40.3,18.4,55.6,31.8c15.4,13.5,28.8,29.2,39.6,46.5c10.9,17.3,19.2,36.1,24.5,55.8
+	c5.3,19.5,7.9,39.7,7.9,59.9c0.1,52.2-19.2,102.7-54,141.6c-16.8,18.5-37.7,33.3-62.8,44.3c-25,11-52.1,16.4-81.3,16.4
+	c-19.6,0.1-39.2-2.7-58-8.2c-18.3-5.5-34-12.7-47-21.7c-12.1-8.3-23.2-17.9-33.1-28.7c-9.1-10.2-16-20.5-20.7-31v269.2L708,1214.1z
+	 M757.8,831.6c0,43.3,14.8,79.8,44.5,109.5c29.2,29.2,65.5,43.7,109,43.7c43.7,0,80.2-14.6,109.6-43.9c29.3-29.3,44-65.9,44-110
+	v-0.7c0-18.7-3.3-37.2-9.8-54.7c-6.6-17.9-16.2-34.5-28.4-49.1c-12.4-14.9-28.7-27-48.9-36.2s-42.8-13.8-67.8-13.8
+	c-42.5,0-78.9,15-109,45.1C772.2,751.5,757.8,788.2,757.8,831.6L757.8,831.6z"/>
+<path class="st15" d="M1198.8,566.2v-74h53.3v74H1198.8z M1198.8,1023.7V637.3h53.3v386.4L1198.8,1023.7z"/>
+<path class="st15" d="M1331.7,830.2c0-37.9,8.5-72.4,25.5-103.4c16.6-30.6,41.2-56,71.3-73.4c30.5-17.9,64.8-26.9,102.8-26.9
+	c39,0,72.6,9.1,100.8,27.4s47.3,39,57.1,62.3V492.2h53.3v531.5h-51.2v-79.5c-14.5,27.1-35.9,49.7-62.2,65.7
+	c-26.7,16.5-59.1,24.7-97.2,24.7c-30,0-57.8-5.6-83.3-16.8c-25.5-11.2-46.7-26.2-63.5-45c-17.1-19.1-30.5-41.1-39.4-65.1
+	C1336.4,882.9,1331.6,856.6,1331.7,830.2z M1385,830.9c0.4,38.9,14.5,76.3,39.9,105.8c12.6,14.6,28.9,26.2,48.8,35
+	c19.9,8.8,42.1,13.1,66.4,13.1c20.7,0.1,41.3-3.9,60.4-11.9c18.5-7.6,35.3-18.9,49.2-33.2c28.7-29.4,43.1-64.5,43.1-105.3v-5.6
+	c0-43.1-14.8-79.2-44.5-108.1c-28.9-29.6-65.2-44.4-108.9-44.4c-44.4,0-81.2,14.8-110.5,44.3c-29.3,29.5-43.9,66.1-43.9,109.6
+	L1385,830.9z"/>
+<path class="st15" d="M1822.5,830.9c0-37.7,8.4-72.1,25.3-103.1c16.9-31,40.8-55.7,71.7-73.9c30.9-18.2,65.5-27.4,104-27.4
+	c38.5,0,71.9,9.3,100.1,27.9c28.2,18.6,47.5,40.2,57.8,64.9v-81.9h53.3v386.4h-53.3v-79.5c-15,28.7-36.3,51-64.1,66.7
+	c-27.8,15.8-59.1,23.6-93.8,23.6c-24.7,0-47.7-3.7-69.2-11c-21.5-7.3-40.2-17.4-56.2-30.3c-15.9-12.8-29.8-27.9-41.2-44.8
+	c-11.5-17.1-20.3-35.8-25.9-55.7C1825.4,872.7,1822.5,851.8,1822.5,830.9z M1875.8,831.6c0.3,18.3,3.6,36.4,10,53.5
+	c6.5,17.7,15.9,34.3,27.8,49c12.2,15.2,28.4,27.4,48.7,36.7c20.3,9.3,43.2,14,68.6,14c33.2,0,61.9-8.6,86.3-25.7s42-39.8,52.7-68
+	c8.6-18.2,12.9-38.5,12.9-60.9v-4.9c0.2-19.6-4-38.9-12.2-56.7c-11-27.5-29-49.8-53.9-66.8c-25-17-54-25.5-87.2-25.5
+	c-44.1,0-80.8,14.9-110,44.8s-43.8,66.5-43.8,109.8L1875.8,831.6z"/>
+<path class="st15" d="M2307.4,831.2c0-37.4,8.8-71.7,26.5-103.1c17.3-30.9,42.6-56.6,73.3-74.3c31.2-18.2,65.7-27.4,103.6-27.3
+	c26.5-0.1,52.9,4.7,77.7,14.2c23.8,9.1,45.6,22.8,64,40.5c21.8,20.9,38.5,46.6,48.7,75c8.2,22.4,12.4,46,12.6,69.8
+	c0,6.6-0.3,13.1-1,19.6h-352c0.7,23.2,5.9,44.2,15.4,63.1s21.8,34,36.6,45.5c14.5,11.3,30.6,20.2,47.9,26.4
+	c15.7,5.8,32.4,8.6,49.1,8.5h1.8c29.7,0,56.1-7,79.2-21.1c23.1-14.1,41-33.8,53.6-59.2h55.4c-17.5,41.1-43.7,72.6-78.5,94.3
+	c-32.7,21-69.3,31.6-109.7,31.6c-25.9,0-50.1-4-72.6-11.9c-22.5-7.9-41.6-18.6-57.3-32.1c-15.7-13.4-29.4-29-40.7-46.3
+	c-11.1-17-19.6-35.5-25.2-55C2310.2,870.4,2307.4,850.9,2307.4,831.2z M2361.4,803.2H2660c-1.9-34.7-17.4-65.5-46.6-92.3
+	c-28.3-25.9-61-38.9-98.1-38.9h-3.9c-40.9,0-75.5,12.9-103.8,38.7C2379.3,736.4,2363.9,767.3,2361.4,803.2L2361.4,803.2z"/>
+</svg>

data/app/controllers/apidae/dashboard_controller.rb

@@ -0,0 +1,11 @@
+require_dependency "apidae/application_controller"
+
+module Apidae
+  class DashboardController < ApplicationController
+    def index
+      @objects = Apidae::Object.count
+      @selections = Apidae::Selection.count
+      @last_imports = Apidae::FileImport.order(id: :desc).take(5)
+    end
+  end
+end

data/app/controllers/apidae/import_controller.rb

@@ -0,0 +1,50 @@
+require_dependency "apidae/application_controller"
+require 'net/http'
+
+module Apidae
+  class ImportController < ApplicationController
+    skip_before_action :verify_authenticity_token
+
+    # Callback endpoint for Apidae exports
+    #
+    # projetId : un entier. C’est l’identifiant du projet concerné.
+    # statut : une chaine de caractères, ‘SUCCESS’ ou ‘ERROR’. C’est l’issue de l’export.
+    # ponctuel : un booléen. Indique si l’export est ponctuel (true) ou périodique (false).
+    # reinitialisation : un booléen. Indique si l’export est une réinitialisation (true) ou différentiel (false).
+    # urlRecuperation : une chaine de caractères. L’URL de récupération du fichier d’export.
+    # urlConfirmation : une chaine de caractères. L’URL de confirmation.
+    def callback
+      project_id = params[:projetId]
+      if project_id == Rails.application.config.apidae_project_id
+        export = Export.new(project_id: project_id, remote_status: params[:status], oneshot: params[:ponctuel] == 'true',
+                            reset: params[:reinitialisation] == 'true', file_url: params[:urlRecuperation],
+                            confirm_url: params[:urlConfirmation], status: Export::PENDING)
+        if export.save
+          render nothing: true, status: :ok
+        else
+          render nothing: true, status: :internal_server_error
+        end
+      else
+        render nothing: true, status: :not_found
+      end
+    end
+
+    def run
+      success = true
+      Export.pending.each do |e|
+        open(e.file_url) do |f|
+          begin
+            FileImport.import(f)
+            Net::HTTP.post(e.confirm_url, '')
+            e.update(status: Export::COMPLETE)
+          rescue Exception => ex
+            logger.error("Failed to retrieve export file : #{ex.file_url}")
+            logger.error("Error is : #{ex}")
+            success = false
+          end
+        end
+      end
+      render nothing: true, status: (success ? :ok : :internal_server_error)
+    end
+  end
+end

data/app/helpers/apidae/dashboard_helper.rb

@@ -0,0 +1,4 @@
+module Apidae
+  module DashboardHelper
+  end
+end

data/app/helpers/apidae/import_helper.rb

@@ -0,0 +1,4 @@
+module Apidae
+  module ImportHelper
+  end
+end

data/app/models/apidae/export.rb

@@ -0,0 +1,12 @@
+module Apidae
+  class Export < ActiveRecord::Base
+
+    PENDING = 'pending'
+    COMPLETE = 'complete'
+
+    # Note : handle reset case
+    def self.pending
+      where(remote_status: 'SUCCESS', status: PENDING).order(:id)
+    end
+  end
+end

data/app/models/apidae/file_import.rb

@@ -1,3 +1,5 @@
+require 'zip'
+
 module Apidae
   class FileImport < ActiveRecord::Base
 
@@ -9,61 +11,78 @@ module Apidae
     DELETED_FILE = 'objets_supprimes.json'
     SELECTIONS_FILE = 'selections.json'
 
-    def self.import(dir)
-      puts 'Update results : '
-      puts import_updates(File.join(dir, MODIFIED_DIR))
-      puts '------'
-      puts 'Deletion results : '
-      puts import_deletions(File.join(dir, DELETED_FILE))
-      puts '------'
-      puts 'Selection results : '
-      puts import_selections(File.join(dir,SELECTIONS_FILE))
-      puts '------'
+    def self.import(zip_file)
+      Zip::File.open(zip_file) do |zfile|
+        result = {created: 0, updated: 0, deleted: 0, selections: []}
+        zfile.each do |file|
+          if file.file? && file.name.end_with?('.json')
+            if file.name.include?(MODIFIED_DIR)
+              add_or_update_objects(zfile.read(file.name), result)
+            elsif file.name.include?(DELETED_FILE)
+              delete_objects(zfile.read(file.name), result)
+            elsif file.name.include?(SELECTIONS_FILE)
+              add_or_update_selections(zfile.read(file.name), result)
+            end
+          end
+        end
+        puts "Import results : #{result}"
+        result
+      end
+    end
+
+    def self.import_dir(dir)
+      result = {created: 0, updated: 0, deleted: 0, selections: []}
+      import_updates(File.join(dir, MODIFIED_DIR), result)
+      import_deletions(File.join(dir, DELETED_FILE), result)
+      import_selections(File.join(dir,SELECTIONS_FILE), result)
+      puts "Import results : #{result}"
+      result
     end
 
-    def self.import_updates(json_dir)
-      result = {success: false, created: 0, updated: 0}
+    def self.import_updates(json_dir, result)
       if Dir.exist?(json_dir)
         Dir.foreach(json_dir) do |f|
           if f.end_with?('.json')
             json_file = File.join(json_dir, f)
             objects_json = File.read(json_file)
-            objects_hashes = JSON.parse(objects_json, symbolize_names: true)
-            objects_hashes.each do |object_data|
-              existing = Apidae::Object.find_by_apidae_id(object_data[:id])
-              if existing
-                Apidae::Object.update_object(existing, object_data)
-                result[:updated] += 1
-              else
-                Apidae::Object.add_object(object_data)
-                result[:created] += 1
-              end
-            end
+            add_or_update_objects(objects_json, result)
           end
-          result[:success] = true
         end
       end
-      result
     end
 
+    def self.add_or_update_objects(objects_json, result)
+      objects_hashes = JSON.parse(objects_json, symbolize_names: true)
+      objects_hashes.each do |object_data|
+        existing = Apidae::Object.find_by_apidae_id(object_data[:id])
+        if existing
+          Apidae::Object.update_object(existing, object_data)
+          result[:updated] += 1
+        else
+          Apidae::Object.add_object(object_data)
+          result[:created] += 1
+        end
+      end
+    end
 
-    def self.import_deletions(json_file)
-      result = {success: false, deleted: 0}
+    def self.import_deletions(json_file, result)
       if File.exist?(json_file)
         deleted_json = File.read(json_file)
-        deleted_ids = JSON.parse(deleted_json)
-        deleted_ids.each do |id|
-          obj = Apidae::Object.find_by_apidae_id(id)
-          if obj
-            obj.destroy!
-            result[:deleted] += 1
-          else
-            puts "skipping object deletion : #{id}"
-          end
+        delete_objects(deleted_json, result)
+      end
+    end
+
+    def self.delete_objects(deleted_json, result)
+      deleted_ids = JSON.parse(deleted_json)
+      deleted_ids.each do |id|
+        obj = Apidae::Object.find_by_apidae_id(id)
+        if obj
+          obj.destroy!
+          result[:deleted] += 1
+        else
+          puts "skipping object deletion : #{id}"
         end
-        result[:success] = true
       end
-      result
     end
 
     def self.update_fields(json_dir)
@@ -104,13 +123,20 @@ module Apidae
       end
     end
 
-    def self.import_selections(json_file)
+    def self.import_selections(json_file, result)
       selections_json = File.read(json_file)
+      add_or_update_selections(selections_json, result)
+    end
+
+    def self.add_or_update_selections(selections_json, result)
       selections_hashes = JSON.parse(selections_json, symbolize_names: true)
+      deleted_ids = Apidae::Selection.all.collect {|sel| sel.apidae_id}.uniq - selections_hashes.collect {|sel| sel[:id]}
+      Apidae::Selection.where(apidae_id: deleted_ids).delete_all
       selections_hashes.each do |selection_data|
         Apidae::Selection.add_or_update(selection_data)
       end
-      Apidae::Selection.all.collect {|sel| {id: sel.id, apidae_id: sel.apidae_id, reference: sel.reference, objects: sel.objects.count}}
+      result[:selections] = Apidae::Selection.all
+                                .collect {|sel| {apidae_id: sel.apidae_id, reference: sel.reference, objects: sel.objects.count}}
     end
   end
 end

data/app/models/apidae/selection.rb

@@ -5,6 +5,10 @@ module Apidae
     MAX_COUNT = 100
     MAX_LOOPS = 10
 
+    validates_presence_of :apidae_id, :reference
+
+    before_validation :generate_reference, on: :create
+
     def self.add_or_update(selection_data)
       apidae_sel = Apidae::Selection.where(apidae_id: selection_data[:id]).first_or_initialize
       apidae_sel.label = selection_data[:nom]
@@ -85,5 +89,8 @@ module Apidae
       end
     end
 
+    def generate_reference
+      self.reference ||= (self.label.parameterize || self.apidae_id)
+    end
   end
 end

data/app/views/apidae/dashboard/index.html.erb

@@ -0,0 +1,39 @@
+<%= render layout: "/layouts/#{Rails.application.config.apidae_layout}" do |styles| %>
+    <div id="apidae_header" class="<%= styles[:header] %>">
+      <h1 class="<%= styles[:h1] %>">Apidae</h1>
+    </div>
+    <div id="apidae_dashboard" class="<%= styles[:wrapper] %>">
+      <div id="apidae_imports_panel" class="<%= styles[:body] %>">
+        <h2 class="<%= styles[:h2] %>">Derniers imports</h2>
+        <table id="apidae_imports" class="<%= styles[:table] %>">
+          <thead>
+          <tr>
+            <th>Date</th>
+            <th>Fichier</th>
+            <th>Statut</th>
+          </tr>
+          </thead>
+
+          <tbody>
+          <% @last_imports.each do |import| %>
+              <tr>
+                <td><%= import.updated_at.strftime('Le %d/%m/%Y à %H:%M') if import.updated_at %></td>
+                <td><%= import.remote_file %></td>
+                <td><%= import.status %></td>
+              </tr>
+          <% end %>
+          <% if @last_imports.empty? %>
+              <tr>
+                <td colspan="3">Aucun import pour le moment.</td>
+              </tr>
+          <% end %>
+          </tbody>
+        </table>
+      </div>
+      <div id="apidae_navigation_panel" class="<%= styles[:body] %>">
+        <h2 class="<%= styles[:h2] %>">Données issues d'Apidae</h2>
+        <h3 class="<%= styles[:h3] %>"><%= link_to pluralize(@selections, 'sélection'), apidae.selections_path %></h3>
+        <h3 class="<%= styles[:h3] %>"><%= link_to pluralize(@objects, 'objet touristique', 'objets touristiques'), apidae.objects_path %></h3>
+      </div>
+    </div>
+<% end %>

data/app/views/apidae/import/callback.html.erb

@@ -0,0 +1,2 @@
+<h1>Apidae::Import#callback</h1>
+<p>Find me in app/views/apidae/apidae/import/callback.html.erb</p>

data/app/views/apidae/objects/index.html.erb

@@ -1,53 +1,30 @@
-<p id="notice"><%= notice %></p>
+<%= render layout: "/layouts/#{Rails.application.config.apidae_layout}" do |styles| %>
+    <div id="apidae_header" class="<%= styles[:header] %>">
+      <h1 class="<%= styles[:h1] %>">Apidae - Objets touristiques</h1>
+    </div>
+    <div id="apidae_dashboard" class="<%= styles[:wrapper] %>">
+      <div id="apidae_imports_panel" class="<%= styles[:body] %>">
+        <table id="apidae_objects" class="<%= styles[:table] %>">
+          <thead>
+          <tr>
+            <th>Titre</th>
+            <th>Identifiant</th>
+            <th>Type</th>
+            <th>Mise à jour</th>
+          </tr>
+          </thead>
 
-<h1>Listing Objects</h1>
-
-<table>
-  <thead>
-    <tr>
-      <th>Address</th>
-      <th>Apidae</th>
-      <th>Apidae type</th>
-      <th>Apidae subtype</th>
-      <th>Title</th>
-      <th>Short desc</th>
-      <th>Contact</th>
-      <th>Long desc</th>
-      <th>Type data</th>
-      <th>Latitude</th>
-      <th>Longitude</th>
-      <th>Openings</th>
-      <th>Rates</th>
-      <th>Reservation</th>
-      <th colspan="3"></th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <% @objects.each do |object| %>
-      <tr>
-        <td><%= object.address %></td>
-        <td><%= object.apidae_id %></td>
-        <td><%= object.apidae_type %></td>
-        <td><%= object.apidae_subtype %></td>
-        <td><%= object.title %></td>
-        <td><%= object.short_desc %></td>
-        <td><%= object.contact %></td>
-        <td><%= object.long_desc %></td>
-        <td><%= object.type_data %></td>
-        <td><%= object.latitude %></td>
-        <td><%= object.longitude %></td>
-        <td><%= object.openings %></td>
-        <td><%= object.rates %></td>
-        <td><%= object.reservation %></td>
-        <td><%= link_to 'Show', object %></td>
-        <td><%= link_to 'Edit', edit_object_path(object) %></td>
-        <td><%= link_to 'Destroy', object, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
-
-<br>
-
-<%= link_to 'New Object', new_object_path %>
+          <tbody>
+          <% @objects.each do |object| %>
+              <tr>
+                <td><%= object.title %></td>
+                <td><%= object.apidae_id %></td>
+                <td><%= object.apidae_type %></td>
+                <td><%= object.updated_at.strftime('Le %d/%m/%Y à %H:%M') if object.updated_at %></td>
+              </tr>
+          <% end %>
+          </tbody>
+        </table>
+      </div>
+    </div>
+<% end %>