apidae 0.9.17 → 0.9.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38d435a4b6892209d4fecb365150c3ca191663e9
-  data.tar.gz: 443da76f9e5c1108ec874c10e1bce59411cdf1bb
+  metadata.gz: 28d400967d3ea2d666c49734380cf467deb0d82b
+  data.tar.gz: a4c6af5d5c21d6a8b25c5504dc4e2c9007830f9e
 SHA512:
-  metadata.gz: 1f25282df1c8c67d31bd6d60cfc8cba4125f56a433943572902f0c701a4d5608279986b9da05164a3d1cdce231a86b41293b4f8c60da5425f406575d9a1a57ad
-  data.tar.gz: d2f0fd59fe09cb2558aaa294eb7a124c67efdd139ee73c489b20ba4486cffc7670669ff0306beed0eab38f7befd322e05d508c7d133603e7cd00b2c592f52eb2
+  metadata.gz: 4e81cd23076a646eea49001e3bf1fb046177f1da56683df3334d6394d6afd5be3a71889455f61ce345d37840c198b343293dc5d85c0f720d5c85a499e7f56923
+  data.tar.gz: e51e78678a7bf2e176237b0854b433a1c3985f683920babea67b773c8ce070b47d59b936bed2de71b36c177df5a6e0503b67cb2512786aafe24248eee172c8b0

data/app/controllers/apidae/objects_controller.rb

@@ -28,7 +28,7 @@ module Apidae
     def create
       @obj = Obj.new(object_params)
       selection = params[:selection_apidae_id].blank? ? Selection.last : Selection.find_by_apidae_id(params[:selection_apidae_id])
-      if @obj.save && selection.refresh_obj(@obj.apidae_id)
+      if @obj.save && selection.add_or_refresh_obj(@obj.apidae_id)
         redirect_to objects_url, notice: "L'objet a bien été importé"
       else
         flash[:alert] = "Une erreur s'est produite lors de l'import de l'objet."
@@ -51,7 +51,7 @@ module Apidae
 
     def refresh
       referrer = (session.delete(:referrer) || objects_url)
-      if @obj && @obj.selections.first.refresh_obj(@obj.apidae_id)
+      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."

data/app/models/apidae/obj.rb

@@ -115,6 +115,7 @@ module Apidae
     end
 
     def self.update_object(apidae_obj, object_data, locales, versions)
+      result = true
       populate_fields(apidae_obj, object_data, locales)
       apidae_obj.save!
 
@@ -130,6 +131,7 @@ module Apidae
           end
         end
       end
+      result
 
       # if Rails.application.config.respond_to?(:apidae_aspect) && !object_data[:aspects].blank?
       #   apidae_aspect = object_data[:aspects].find {|a| a[:aspect] == Rails.application.config.apidae_aspect}

data/app/models/apidae/selection.rb

@@ -88,7 +88,7 @@ module Apidae
       query_objects_api(query_args, true)
     end
 
-    def refresh_obj(apidae_obj_id)
+    def add_or_refresh_obj(apidae_obj_id)
       if apidae_project
         res = api_object(apidae_obj_id)
         if res[:results] && res[:results].length == 1
@@ -100,6 +100,8 @@ module Apidae
               Rails.application.config.apidae_obj_refresh_callback.call(apidae_obj_id)
             end
             refreshed
+          else
+            Obj.add_object(obj_data, apidae_project.locales, apidae_project.versions)
           end
         end
       end

data/lib/apidae/version.rb

@@ -1,3 +1,3 @@
 module Apidae
-  VERSION = "0.9.17"
+  VERSION = "0.9.18"
 end

metadata

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