apidae 0.6.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73aee2961a8445a742b2d0d44df6a19a4e8cb3c1
-  data.tar.gz: 449b1eae7f0c4695b819d80994fcbed367142952
+  metadata.gz: 44825ff63506e2a48c0e3c3a9a283c804daae923
+  data.tar.gz: 2cd5dc90fe25340322d26717f75c2ca5757da753
 SHA512:
-  metadata.gz: aa1900606d48edd2850598554f08ffd64976a93ffa82de433de0a093af8ebdf5b369c84d4b12e37c5d1ef165cd07bd832365cbdf686ab08b104e8a627ecae389
-  data.tar.gz: b8948a4bc6c72ae3a561b8f6abcd0a025dd3d22274f64267cf7e729a1aecd90bc76bae441d82b9259e4c34d1f793a68fe395e33863849a50dd397dd9d72d7c8f
+  metadata.gz: ff6e9558ab78808534e1030184b40e1b3f4ca0cae89bc5692178726af3787592526b8991328e11c611b70d4818722fcaf57db5c6f410f9ce472496fbbf2c80aa
+  data.tar.gz: ff6c592151798073270a602ac0a2b3907bb51dafac6f6c3b9d4452f70e505280729af898f58f43f8de0312d2d49918f4490320f07c67fb510b305d789dd00436

data/app/controllers/apidae/dashboard_controller.rb

@@ -5,6 +5,7 @@ module Apidae
     def index
       @objects = Obj.count
       @selections = Selection.count
+      @projects = Project.count
       @references = Reference.count
       @last_imports = FileImport.order(id: :desc).take(5)
     end

data/app/controllers/apidae/import_controller.rb

@@ -16,25 +16,20 @@ module Apidae
     # 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[:statut], oneshot: params[:ponctuel] == 'true',
-                            reset: params[:reinitialisation] == 'true', file_url: params[:urlRecuperation],
-                            confirm_url: params[:urlConfirmation], status: Export::PENDING)
-        if export.save
-          if Rails.application.config.respond_to?(:apidae_propagate_callback)
-            uri = URI(Rails.application.config.apidae_propagate_callback)
-            req = Net::HTTP::Post.new(uri)
-            Net::HTTP.start(uri.hostname, uri.port) do |http|
-              http.request(req, params.to_unsafe_h.to_query)
-            end
+      export = Export.new(project_id: params[:projetId], remote_status: params[:statut], oneshot: params[:ponctuel] == 'true',
+                          reset: params[:reinitialisation] == 'true', file_url: params[:urlRecuperation],
+                          confirm_url: params[:urlConfirmation], status: Export::PENDING)
+      if export.save
+        if Rails.application.config.respond_to?(:apidae_propagate_callback)
+          uri = URI(Rails.application.config.apidae_propagate_callback)
+          req = Net::HTTP::Post.new(uri)
+          Net::HTTP.start(uri.hostname, uri.port, use_ssl: (uri.scheme == "https")) do |http|
+            http.request(req, params.to_unsafe_h.to_query)
           end
-          head :ok
-        else
-          head :internal_server_error
         end
+        head :ok
       else
-        head :not_found
+        head :internal_server_error
       end
     end
 
@@ -44,7 +39,7 @@ module Apidae
         begin
           open(e.file_url) do |f|
             begin
-              FileImport.import(f)
+              FileImport.import(f, e.project_id)
               uri = URI(e.confirm_url)
               req = Net::HTTP::Post.new(uri)
               Net::HTTP.start(uri.hostname, uri.port) do |http|

data/app/controllers/apidae/projects_controller.rb

@@ -0,0 +1,35 @@
+require_dependency "apidae/application_controller"
+
+module Apidae
+  class ProjectsController < ApplicationController
+    before_action :set_project, only: [:edit, :update]
+
+    def index
+      @projects = Project.all
+    end
+
+    def edit
+      session[:referrer] = request.referrer
+    end
+
+    def update
+      if @project.update(project_params)
+        referrer = session.delete(:referrer)
+        redirect_to referrer, notice: 'Le projet a bien été mis à jour'
+      else
+        flash.now[:alert] = "Une erreur s'est produite lors la mise à jour du projet"
+        render :edit
+      end
+    end
+
+    private
+
+    def set_project
+      @project = Project.find(params[:id])
+    end
+
+    def project_params
+      params.require(:project).permit(:name, :api_key)
+    end
+  end
+end

data/app/models/apidae/file_import.rb

@@ -14,7 +14,7 @@ module Apidae
     DELETED_FILE = 'objets_supprimes.json'
     SELECTIONS_FILE = 'selections.json'
 
-    def self.import(zip_file)
+    def self.import(zip_file, project_id)
       Zip::File.open(zip_file) do |zfile|
         result = {created: 0, updated: 0, deleted: 0, selections: []}
         Reference.import(zfile.read(REFERENCES_FILE))
@@ -30,21 +30,21 @@ module Apidae
             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)
+              add_or_update_selections(project_id, zfile.read(file.name), result)
             end
           end
         end
-        create(result.except(:selections).merge({remote_file: zip_file, status: STATUS_COMPLETE}))
+        create(result.except(:selections).merge({remote_file: (zip_file.is_a?(File) ? zip_file.path : zip_file), status: STATUS_COMPLETE}))
         logger.info "Import results : #{result}"
         result
       end
     end
 
-    def self.import_dir(dir)
+    def self.import_dir(project_id, 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)
+      import_selections(project_id, File.join(dir, SELECTIONS_FILE), result)
       logger.info "Import results : #{result}"
       result
     end
@@ -140,20 +140,21 @@ module Apidae
     #   end
     # end
 
-    def self.import_selections(json_file, result)
+    def self.import_selections(project_id, json_file, result)
       selections_json = File.read(json_file)
-      add_or_update_selections(selections_json, result)
+      add_or_update_selections(project_id, selections_json, result)
     end
 
-    def self.add_or_update_selections(selections_json, result)
+    def self.add_or_update_selections(project_id, selections_json, result)
       selections_hashes = JSON.parse(selections_json, symbolize_names: true)
-      deleted_ids = Selection.all.collect {|sel| sel.apidae_id}.uniq - selections_hashes.collect {|sel| sel[:id]}
+      project = Project.find_or_create_by(apidae_id: project_id)
+      deleted_ids = Selection.where(apidae_project_id: project.id).collect {|sel| sel.apidae_id}.uniq - selections_hashes.collect {|sel| sel[:id]}
       Selection.where(apidae_id: deleted_ids).delete_all
       selections_hashes.each do |selection_data|
         logger.info "Updating selection #{selection_data[:id]}"
-        Selection.add_or_update(selection_data)
+        Selection.add_or_update(selection_data, project.id)
       end
-      result[:selections] = Selection.all
+      result[:selections] = Selection.where(apidae_project_id: project_id)
                                 .collect {|sel| {apidae_id: sel.apidae_id, reference: sel.reference, objects: sel.objects.count}}
     end
   end

data/app/models/apidae/obj.rb

@@ -125,7 +125,7 @@ module Apidae
         {
             short_desc: node_value(data_hash, :descriptifCourt),
             long_desc: node_value(data_hash, :descriptifDetaille),
-            theme_desc: data_hash[:descriptifsThematises].blank? ? [] : Hash[data_hash[:descriptifsThematises].map {|th| [node_id(th, :theme), node_value(th, :description)]}],
+            theme_desc: data_hash[:descriptifsThematises].blank? ? {} : Hash[data_hash[:descriptifsThematises].map {|th| [node_id(th, :theme), node_value(th, :description)]}],
             private_desc: private_data.blank? ? {} : Hash[private_data.map {|d| [d[:nomTechnique], node_value(d, :descriptif)]}]
         }
       end

data/app/models/apidae/project.rb

@@ -0,0 +1,5 @@
+module Apidae
+  class Project < ActiveRecord::Base
+    has_many :apidae_selections, class_name: 'Apidae::Selection', foreign_key: :apidae_project_id
+  end
+end

data/app/models/apidae/selection.rb

@@ -4,6 +4,7 @@ module Apidae
   class Selection < ActiveRecord::Base
     has_many :apidae_selection_objects, class_name: 'Apidae::SelectionObject', foreign_key: :apidae_selection_id
     has_many :objects, class_name: 'Apidae::Obj', source: :apidae_object, through: :apidae_selection_objects
+    belongs_to :apidae_project, optional: true, class_name: 'Apidae::Project', foreign_key: :apidae_project_id
 
     AGENDA_ENDPOINT = 'agenda/detaille/list-identifiants'
     SELECTION_ENDPOINT = 'recherche/list-identifiants'
@@ -13,9 +14,10 @@ module Apidae
     validates_presence_of :apidae_id, :reference
     before_validation :generate_reference, on: :create
 
-    def self.add_or_update(selection_data)
+    def self.add_or_update(selection_data, apidae_proj_id)
       apidae_sel = Selection.where(apidae_id: selection_data[:id]).first_or_initialize
       apidae_sel.label = selection_data[:nom]
+      apidae_sel.apidae_project_id = apidae_proj_id
       apidae_sel.save!
 
       # Note : should be done with basic collection assignment, but can't make it work...
@@ -134,8 +136,8 @@ module Apidae
     def build_args(endpoint, opts = {})
       {
           url: "#{Rails.application.config.apidae_api_url}/#{endpoint}",
-          apiKey: Rails.application.config.apidae_api_key,
-          projetId: Rails.application.config.apidae_project_id,
+          apiKey: apidae_project ? apidae_project.api_key : '',
+          projetId: apidae_project.apidae_id,
           first: opts[:first] || 0,
           count: opts[:count] || MAX_COUNT,
           selectionIds: opts[:selection_ids],

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

@@ -1,5 +1,6 @@
 <%= render layout: "/layouts/#{Rails.application.config.apidae_layout}" do |styles| %>
     <div id="apidae_header" class="<%= styles[:header] %>">
+      <%= link_to pluralize(@projects, 'projet', 'projets'), apidae.projects_path, class: styles[:projects] %>
       <%= link_to pluralize(@selections, 'sélection', 'sélections'), apidae.selections_path, class: styles[:selections] %>
       <%= link_to pluralize(@objects, 'objet touristique', 'objets touristiques'), apidae.objects_path, class: styles[:objects] %>
       <%= link_to (pluralize(@references, 'élément', 'éléments') + ' de référence'), apidae.references_path, class: styles[:references] %>

data/app/views/apidae/projects/edit.html.erb

@@ -0,0 +1,33 @@
+<%= render layout: "/layouts/#{Rails.application.config.apidae_layout}" do |styles| %>
+  <div id="apidae_header" class="<%= styles[:header] %>">
+    <%= link_to 'Retour', :back, class: styles[:back] %>
+    <h1 class="<%= styles[:h1] %>">Apidae - Modifier le projet</h1>
+  </div>
+  <div id="apidae_edit_project" class="<%= styles[:wrapper] %>">
+    <div id="apidae_form" class="<%= styles[:body] %>">
+      <%= form_for(@project, class: styles[:form]) do |f| %>
+        <% if @project.errors.any? %>
+          <div id="apidae_form_errors">
+            <ul>
+              <% @project.errors.full_messages.each do |message| %>
+                <li><%= message %></li>
+              <% end %>
+            </ul>
+          </div>
+        <% end %>
+
+        <div class="<%= styles[:form_field] %>">
+          <div><%= f.label :name %></div>
+          <div><%= f.text_field :name %></div>
+        </div>
+        <div class="<%= styles[:form_field] %>">
+          <div><%= f.label :api_key %></div>
+          <div><%= f.text_field :api_key %></div>
+        </div>
+        <div class="<%= styles[:form_actions] %>">
+          <%= f.submit 'Valider' %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+<% end %>

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

@@ -0,0 +1,35 @@
+<%= render layout: "/layouts/#{Rails.application.config.apidae_layout}" do |styles| %>
+  <div id="apidae_header" class="<%= styles[:header] %>">
+    <%= link_to 'Retour', root_path, class: styles[:back] %>
+    <h1 class="<%= styles[:h1] %>">Apidae - Projets</h1>
+  </div>
+  <div class="<%= styles[:wrapper] %>">
+    <div class="<%= styles[:body] %>">
+      <table id="apidae_projects" class="<%= styles[:table] %>">
+        <thead class="<%= styles[:table_head] %>">
+        <tr>
+          <th>Nom</th>
+          <th>Identifiant</th>
+          <th>Mise à jour</th>
+          <th></th>
+        </tr>
+        </thead>
+        <tbody class="<%= styles[:table_body] %>">
+        <% @projects.each do |proj| %>
+          <tr>
+            <td><%= proj.name %></td>
+            <td><%= proj.apidae_id %></td>
+            <td><%= proj.updated_at.strftime('Le %d/%m/%Y à %H:%M') if proj.updated_at %></td>
+            <td><%= link_to 'Modifier', edit_project_path(proj) %></td>
+          </tr>
+        <% end %>
+        <% if @projects.empty? %>
+          <tr>
+            <td colspan="4">Aucun projet pour le moment.</td>
+          </tr>
+        <% end %>
+        </tbody>
+      </table>
+    </div>
+  </div>
+<% end %>

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

@@ -3,8 +3,8 @@
     <%= link_to 'Retour', root_path, class: styles[:back] %>
     <h1 class="<%= styles[:h1] %>">Apidae - Eléments de référence</h1>
   </div>
-  <div id="apidae_dashboard" class="<%= styles[:wrapper] %>">
-    <div id="apidae_imports_panel" class="<%= styles[:body] %>">
+  <div class="<%= styles[:wrapper] %>">
+    <div class="<%= styles[:body] %>">
       <table id="apidae_references" class="<%= styles[:table] %>">
         <thead class="<%= styles[:table_head] %>">
         <tr>

data/config/routes.rb

@@ -5,6 +5,7 @@ Apidae::Engine.routes.draw do
     resources :objects, only: [:index], path: 'objets'
   end
   resources :references, only: [:index]
+  resources :projects, only: [:index, :edit, :update], path: 'projets'
 
   match 'import/callback', via: :post, to: 'import#callback'
   match 'import/run', via: :post, to: 'import#run'

data/db/migrate/20181024072424_add_project_id_to_selections.rb

@@ -0,0 +1,5 @@
+class AddProjectIdToSelections < ActiveRecord::Migration[5.1]
+  def change
+    add_column :apidae_selections, :apidae_project_id, :integer
+  end
+end

data/db/migrate/20181024072843_create_apidae_projects.rb

@@ -0,0 +1,10 @@
+class CreateApidaeProjects < ActiveRecord::Migration[5.1]
+  def change
+    create_table :apidae_projects do |t|
+      t.string :name
+      t.integer :apidae_id
+      t.string :api_key
+      t.timestamps
+    end
+  end
+end

data/lib/apidae/engine.rb

@@ -4,6 +4,9 @@ module Apidae
     # Include all helpers from main app
     config.to_prepare do
       ApplicationController.helper(ActionView::Helpers::ApplicationHelper)
+      Dir.glob(Rails.root + "app/decorators/**/*_decorator*.rb").each do |c|
+        require_dependency(c)
+      end
     end
   end
 end

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "0.6.3"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-22 00:00:00.000000000 Z
+date: 2018-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -84,6 +84,7 @@ files:
 - app/controllers/apidae/dashboard_controller.rb
 - app/controllers/apidae/import_controller.rb
 - app/controllers/apidae/objects_controller.rb
+- app/controllers/apidae/projects_controller.rb
 - app/controllers/apidae/references_controller.rb
 - app/controllers/apidae/selections_controller.rb
 - app/helpers/apidae/api_helper.rb
@@ -97,6 +98,7 @@ files:
 - app/models/apidae/export.rb
 - app/models/apidae/file_import.rb
 - app/models/apidae/obj.rb
+- app/models/apidae/project.rb
 - app/models/apidae/reference.rb
 - app/models/apidae/selection.rb
 - app/models/apidae/selection_object.rb
@@ -110,6 +112,8 @@ files:
 - app/views/apidae/objects/new.html.erb
 - app/views/apidae/objects/show.html.erb
 - app/views/apidae/objects/show.json.jbuilder
+- app/views/apidae/projects/edit.html.erb
+- app/views/apidae/projects/index.html.erb
 - app/views/apidae/references/index.html.erb
 - app/views/apidae/selections/_form.html.erb
 - app/views/apidae/selections/edit.html.erb
@@ -150,6 +154,8 @@ files:
 - db/migrate/20180519170210_remove_insee_code_unicity.rb
 - db/migrate/20180521211735_destroy_attached_files.rb
 - db/migrate/20180625050400_rename_objects_to_obj.rb
+- db/migrate/20181024072424_add_project_id_to_selections.rb
+- db/migrate/20181024072843_create_apidae_projects.rb
 - lib/apidae.rb
 - lib/apidae/engine.rb
 - lib/apidae/version.rb