apidae 2.0.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2e758f9b9ec206503bf49f0b007a703e4b99d0092294b0f28dd563bfd7e0d3c
-  data.tar.gz: 6504e5a2b17c7fb7ac75ce662b8f9273d932ada2219be41d557a461be6b3aca2
+  metadata.gz: b59d7df8185fbde86fd4532acbc872b1934cb78bdf416fb09a2d1bd52849be51
+  data.tar.gz: 591556125cfe37d3e48079c0dc85a729e71af01bc6fc0363e7bd4c4dede0568f
 SHA512:
-  metadata.gz: 7a9348ceed64ae7dfa7476e4a444eff649cca4148b5329305e9057e8fcbbae396308cf8e99119b1cbe0518935e254b7471ab0234250215454014ed23c3022325
-  data.tar.gz: f0e3ee4e7945eec4fbb642a5838d29b81fb4c9a6ed34272b781180c30394d79b5f5ab3dc9910b25f0a79061b4058fb5364a50f2ae3a9327e883cc8cd89002d75
+  metadata.gz: acb9f767ef159db23a6811d8f9e765e4a3a1291ca5d138e4fa86c03fa4bcd919a895911d6ff24af550be968fe09877568b1a0dce1ba0da9ab956d56f007031e5
+  data.tar.gz: 0c804f60d22c6a5b5392636c0bcddfce4b977d0b8868d7affaa122633a0030bbbae897d4367923568d7345c670f706234d7bf2eb6898d7eba6ac6aa06f3e92f0

data/app/controllers/apidae/objects_controller.rb

@@ -80,6 +80,7 @@ module Apidae
 
     def search
       user_selections = Project.where(apidae_id: apidae_user.apidae_projects_ids).map {|p| p.apidae_selection_ids}.flatten.uniq
+      @query = params[:query]
       @results = PgSearch::Document.tsv_search(params[:query])
                         .joins("INNER JOIN apidae_selection_objects AS aso ON (aso.apidae_object_id = pg_search_documents.searchable_id) AND pg_search_documents.searchable_type = 'Apidae::Obj'")
                         .where("aso.apidae_selection_id IN (?)", user_selections)

data/app/models/apidae/obj.rb

@@ -162,7 +162,8 @@ module Apidae
     end
 
     def searchable_fields
-      {s_title: title, s_desc: short_desc, s_external_id: apidae_id, s_type: apidae_type, s_picture: main_picture}
+      {s_title: title, s_desc: short_desc, s_external_id: apidae_id, s_type: apidae_type, s_picture: main_picture,
+       s_selections: selection_ids}
     end
 
     def dig(*keys)

data/app/models/apidae/selection.rb

@@ -40,6 +40,9 @@ module Apidae
 
       removed_ids = Obj.where(apidae_id: removed).map {|o| o.id}
       SelectionObject.where(apidae_selection_id: apidae_sel.id, apidae_object_id: removed_ids).delete_all
+      if added.any? || removed.any? || (apidae_sel.objects.maximum(:updated_at) > apidae_sel.updated_at)
+        apidae_sel.touch
+      end
     end
 
     def cleanup

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

@@ -26,11 +26,11 @@
         <tbody class="<%= styles[:table_body] %>">
         <% @results.each do |object| %>
           <tr>
-            <td><%= object.searchable_title %></td>
-            <td><%= object.searchable_id %></td>
-            <td><%= object.searchable_category %></td>
+            <td><%= object.s_title %></td>
+            <td><%= object.s_external_id %></td>
+            <td><%= object.s_type %></td>
             <td><%= object.updated_at.strftime('Le %d/%m/%Y à %H:%M') if object.updated_at %></td>
-            <td><%= link_to 'Rafraîchir', apidae.refresh_object_path(object), method: :post,
+            <td><%= link_to 'Rafraîchir', apidae.refresh_object_path(object.searchable_id), method: :post,
                             data: {confirm: 'Voulez-vous vraiment rafraîchir cet objet ? Les données existantes seront écrasées.'} %></td>
           </tr>
         <% end %>

data/config/initializers/search.rb

@@ -1,4 +1,4 @@
-Rails.application.config.after_initialize do
+Rails.configuration.to_prepare do
   require 'pg_search'
 
   PgSearch.multisearch_options = {

data/config/routes.rb

@@ -2,7 +2,7 @@ Apidae::Engine.routes.draw do
 
   resources :objects, only: [:index, :show, :new, :create], path: 'objets' do
     post 'refresh', on: :member
-    get 'search', on: :collection
+    get :search, on: :collection, path: 'rechercher'
   end
 
   resources :selections, only: [:index] do

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "2.0.0"
+  VERSION = "2.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-04 00:00:00.000000000 Z
+date: 2025-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails