apidae 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e808b66edad50c380f8fca862791bf6b7da5f56c
-  data.tar.gz: a4a914351aa03a75c5bf5337545466f938054281
+  metadata.gz: 73aee2961a8445a742b2d0d44df6a19a4e8cb3c1
+  data.tar.gz: 449b1eae7f0c4695b819d80994fcbed367142952
 SHA512:
-  metadata.gz: 094eb20a4bbf25b2184ff39c726f6d4ff8bbffade70288effd5959cc96dd8f5e413888b363efe24cf083d4e069157b7d318a7575dd334d4c3b04c5c9bacf261e
-  data.tar.gz: 67d508dc33db340246f378308930bc05e68e32dc8701bb0d0cdc44811845750a2b7ef5c5f299e9ed72d3b0c4242a42c5d2b304e6c4d48b8343437ed1f294293a
+  metadata.gz: aa1900606d48edd2850598554f08ffd64976a93ffa82de433de0a093af8ebdf5b369c84d4b12e37c5d1ef165cd07bd832365cbdf686ab08b104e8a627ecae389
+  data.tar.gz: b8948a4bc6c72ae3a561b8f6abcd0a025dd3d22274f64267cf7e729a1aecd90bc76bae441d82b9259e4c34d1f793a68fe395e33863849a50dd397dd9d72d7c8f

data/app/controllers/apidae/import_controller.rb

@@ -22,12 +22,19 @@ module Apidae
                             reset: params[:reinitialisation] == 'true', file_url: params[:urlRecuperation],
                             confirm_url: params[:urlConfirmation], status: Export::PENDING)
         if export.save
-          render nothing: true, status: :ok
+          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
+          end
+          head :ok
         else
-          render nothing: true, status: :internal_server_error
+          head :internal_server_error
         end
       else
-        render nothing: true, status: :not_found
+        head :not_found
       end
     end
 

data/app/models/apidae/obj.rb

@@ -5,7 +5,7 @@ module Apidae
     has_many :apidae_selection_objects, class_name: 'Apidae::SelectionObject', foreign_key: :apidae_object_id
     has_many :selections, class_name: 'Apidae::Selection', source: :apidae_selection, through: :apidae_selection_objects
 
-    store_accessor :description_data, :short_desc, :long_desc, :theme_desc
+    store_accessor :description_data, :short_desc, :long_desc, :theme_desc, :private_desc
     store_accessor :pictures_data, :pictures
     store_accessor :attachments_data, :attachments
     store_accessor :type_data, :categories, :themes, :capacity, :classification, :labels, :chains, :area, :track,
@@ -84,7 +84,7 @@ module Apidae
       apidae_obj.apidae_type = object_data[:type]
       apidae_obj.apidae_subtype = node_id(object_data[type_fields[:node]], type_fields[:subtype])
       apidae_obj.title = node_value(object_data, :nom)
-      apidae_obj.description_data = parse_desc_data(object_data[:presentation])
+      apidae_obj.description_data = parse_desc_data(object_data[:presentation], object_data[:donneesPrivees])
       apidae_obj.contact = contact(object_data[:informations])
       apidae_obj.location_data = parse_location_data(object_data[:localisation], object_data[type_fields[:node]],
                                                      object_data[:territoires])
@@ -120,12 +120,13 @@ module Apidae
       data_hash.keep_if {|k, v| !v.blank?}
     end
 
-    def self.parse_desc_data(data_hash)
+    def self.parse_desc_data(data_hash, private_data)
       unless data_hash.blank?
         {
             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
     end

data/lib/apidae/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apidae
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-03 00:00:00.000000000 Z
+date: 2018-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails