apidae 0.6.2 → 0.6.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/apidae/import_controller.rb +10 -3
- data/app/models/apidae/obj.rb +5 -4
- data/lib/apidae/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 73aee2961a8445a742b2d0d44df6a19a4e8cb3c1
|
4
|
+
data.tar.gz: 449b1eae7f0c4695b819d80994fcbed367142952
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: aa1900606d48edd2850598554f08ffd64976a93ffa82de433de0a093af8ebdf5b369c84d4b12e37c5d1ef165cd07bd832365cbdf686ab08b104e8a627ecae389
|
7
|
+
data.tar.gz: b8948a4bc6c72ae3a561b8f6abcd0a025dd3d22274f64267cf7e729a1aecd90bc76bae441d82b9259e4c34d1f793a68fe395e33863849a50dd397dd9d72d7c8f
|
@@ -22,12 +22,19 @@ module Apidae
|
|
22
22
|
reset: params[:reinitialisation] == 'true', file_url: params[:urlRecuperation],
|
23
23
|
confirm_url: params[:urlConfirmation], status: Export::PENDING)
|
24
24
|
if export.save
|
25
|
-
|
25
|
+
if Rails.application.config.respond_to?(:apidae_propagate_callback)
|
26
|
+
uri = URI(Rails.application.config.apidae_propagate_callback)
|
27
|
+
req = Net::HTTP::Post.new(uri)
|
28
|
+
Net::HTTP.start(uri.hostname, uri.port) do |http|
|
29
|
+
http.request(req, params.to_unsafe_h.to_query)
|
30
|
+
end
|
31
|
+
end
|
32
|
+
head :ok
|
26
33
|
else
|
27
|
-
|
34
|
+
head :internal_server_error
|
28
35
|
end
|
29
36
|
else
|
30
|
-
|
37
|
+
head :not_found
|
31
38
|
end
|
32
39
|
end
|
33
40
|
|
data/app/models/apidae/obj.rb
CHANGED
@@ -5,7 +5,7 @@ module Apidae
|
|
5
5
|
has_many :apidae_selection_objects, class_name: 'Apidae::SelectionObject', foreign_key: :apidae_object_id
|
6
6
|
has_many :selections, class_name: 'Apidae::Selection', source: :apidae_selection, through: :apidae_selection_objects
|
7
7
|
|
8
|
-
store_accessor :description_data, :short_desc, :long_desc, :theme_desc
|
8
|
+
store_accessor :description_data, :short_desc, :long_desc, :theme_desc, :private_desc
|
9
9
|
store_accessor :pictures_data, :pictures
|
10
10
|
store_accessor :attachments_data, :attachments
|
11
11
|
store_accessor :type_data, :categories, :themes, :capacity, :classification, :labels, :chains, :area, :track,
|
@@ -84,7 +84,7 @@ module Apidae
|
|
84
84
|
apidae_obj.apidae_type = object_data[:type]
|
85
85
|
apidae_obj.apidae_subtype = node_id(object_data[type_fields[:node]], type_fields[:subtype])
|
86
86
|
apidae_obj.title = node_value(object_data, :nom)
|
87
|
-
apidae_obj.description_data = parse_desc_data(object_data[:presentation])
|
87
|
+
apidae_obj.description_data = parse_desc_data(object_data[:presentation], object_data[:donneesPrivees])
|
88
88
|
apidae_obj.contact = contact(object_data[:informations])
|
89
89
|
apidae_obj.location_data = parse_location_data(object_data[:localisation], object_data[type_fields[:node]],
|
90
90
|
object_data[:territoires])
|
@@ -120,12 +120,13 @@ module Apidae
|
|
120
120
|
data_hash.keep_if {|k, v| !v.blank?}
|
121
121
|
end
|
122
122
|
|
123
|
-
def self.parse_desc_data(data_hash)
|
123
|
+
def self.parse_desc_data(data_hash, private_data)
|
124
124
|
unless data_hash.blank?
|
125
125
|
{
|
126
126
|
short_desc: node_value(data_hash, :descriptifCourt),
|
127
127
|
long_desc: node_value(data_hash, :descriptifDetaille),
|
128
|
-
theme_desc: data_hash[:descriptifsThematises].blank? ? [] : Hash[data_hash[:descriptifsThematises].map {|th| [node_id(th, :theme), node_value(th, :description)]}]
|
128
|
+
theme_desc: data_hash[:descriptifsThematises].blank? ? [] : Hash[data_hash[:descriptifsThematises].map {|th| [node_id(th, :theme), node_value(th, :description)]}],
|
129
|
+
private_desc: private_data.blank? ? {} : Hash[private_data.map {|d| [d[:nomTechnique], node_value(d, :descriptif)]}]
|
129
130
|
}
|
130
131
|
end
|
131
132
|
end
|
data/lib/apidae/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: apidae
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.6.
|
4
|
+
version: 0.6.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Jean-Baptiste Vilain
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-10-
|
11
|
+
date: 2018-10-22 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|