apidae 0.9.6 → 0.9.7
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/models/apidae/file_import.rb +19 -14
- data/app/models/apidae/obj.rb +2 -2
- data/db/migrate/20190418133435_add_index_on_apidae_obj.rb +6 -0
- data/lib/apidae/version.rb +1 -1
- metadata +3 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: ac2dde55728a2ef67871f3ecd89b52df6b5e581b
|
4
|
+
data.tar.gz: 574d98fc4ec4fad54047351cd013771fea652c8e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: ba9e5bd5d67b024c42bd1c6589437c473b754e63c7bc3ee65dc0b0fbc4c725e8fa7b058d12ce9de6feb87259a54a410b80ac6ae43316f68b537ad516036b3c23
|
7
|
+
data.tar.gz: c5d16ba012ea42919d153da8062b82d26df6a7eff14fbed5af749326680995d3e4d1aa3e4dfe4d0cc0599210fb3d2f802b0f8d33350631815e2043049a0daa5b
|
@@ -66,22 +66,27 @@ module Apidae
|
|
66
66
|
|
67
67
|
def self.add_or_update_objects(objects_json, result, locales, versions)
|
68
68
|
objects_hashes = JSON.parse(objects_json, symbolize_names: true)
|
69
|
-
objects_hashes.
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
69
|
+
if objects_hashes.is_a?(Array)
|
70
|
+
objects_hashes.each do |object_data|
|
71
|
+
begin
|
72
|
+
existing = Obj.find_by_apidae_id(object_data[:id])
|
73
|
+
if existing
|
74
|
+
Obj.update_object(existing, object_data, locales, versions)
|
75
|
+
result[:updated] += 1
|
76
|
+
else
|
77
|
+
Obj.add_object(object_data, locales, versions)
|
78
|
+
result[:created] += 1
|
79
|
+
end
|
80
|
+
rescue Exception => e
|
81
|
+
puts "Failed to import object #{object_data[:id]}"
|
82
|
+
puts e.message
|
83
|
+
puts e.backtrace.join("\n")
|
84
|
+
raise e
|
78
85
|
end
|
79
|
-
rescue Exception => e
|
80
|
-
puts "Failed to import object #{object_data[:id]}"
|
81
|
-
puts e.message
|
82
|
-
puts e.backtrace.join("\n")
|
83
|
-
raise e
|
84
86
|
end
|
87
|
+
else
|
88
|
+
puts "Unsupported file format - Exported objects should be grouped"
|
89
|
+
raise Exception.new('Unsupported objects format - Exported objects should be grouped')
|
85
90
|
end
|
86
91
|
end
|
87
92
|
|
data/app/models/apidae/obj.rb
CHANGED
@@ -185,7 +185,7 @@ module Apidae
|
|
185
185
|
pictures_array.select { |p| p.is_a?(Hash) && !p[:traductionFichiers].blank? }.each do |pic|
|
186
186
|
pics_data[locale] << {
|
187
187
|
name: localized_value(pic, :nom, locale),
|
188
|
-
url: pic[:traductionFichiers][0][:url],
|
188
|
+
url: pic[:traductionFichiers][0][:url].gsub('http:', 'https:'),
|
189
189
|
description: localized_value(pic, :legende, locale),
|
190
190
|
credits: localized_value(pic, :copyright, locale)
|
191
191
|
}
|
@@ -204,7 +204,7 @@ module Apidae
|
|
204
204
|
attachments_array.select { |att| att.is_a?(Hash) && !att[:traductionFichiers].blank? }.each do |att|
|
205
205
|
atts_data[locale] << {
|
206
206
|
name: localized_value(att, :nom, locale),
|
207
|
-
url: att[:traductionFichiers][0][:url],
|
207
|
+
url: att[:traductionFichiers][0][:url].gsub('http:', 'https:'),
|
208
208
|
type: att[:type],
|
209
209
|
description: localized_value(att, :legende, locale)
|
210
210
|
}
|
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.9.
|
4
|
+
version: 0.9.7
|
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: 2019-
|
11
|
+
date: 2019-04-18 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -169,6 +169,7 @@ files:
|
|
169
169
|
- db/migrate/20190127210921_migrate_localized_apidae_obj_fields.rb
|
170
170
|
- db/migrate/20190127213602_migrate_localized_apidae_references.rb
|
171
171
|
- db/migrate/20190304142446_migrate_desc_apidae_obj_fields.rb
|
172
|
+
- db/migrate/20190418133435_add_index_on_apidae_obj.rb
|
172
173
|
- lib/apidae.rb
|
173
174
|
- lib/apidae/engine.rb
|
174
175
|
- lib/apidae/version.rb
|