apidae 1.2.35 → 1.3.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/app/controllers/apidae/import_controller.rb +2 -40
- data/app/helpers/apidae/application_helper.rb +1 -1
- data/app/models/apidae/apidae_data_parser.rb +23 -63
- data/app/models/apidae/export.rb +41 -0
- data/app/models/apidae/file_import.rb +6 -15
- data/app/models/apidae/obj.rb +18 -26
- data/app/models/apidae/project.rb +0 -6
- data/app/models/apidae/reference.rb +1 -1
- data/app/models/apidae/selection.rb +1 -17
- data/config/initializers/constants.rb +5 -9
- data/config/locales/apidae.fr.yml +0 -1
- data/lib/apidae/version.rb +1 -1
- data/test/dummy/db/schema.rb +1 -3
- data/test/dummy/log/development.log +67 -58
- data/test/dummy/log/test.log +3324 -5771
- data/test/models/apidae/file_import_test.rb +0 -23
- metadata +14 -9
- data/test/data/shared_selections.json +0 -15
|
@@ -166,29 +166,6 @@ module Apidae
|
|
|
166
166
|
assert_equal 0, Selection.count
|
|
167
167
|
end
|
|
168
168
|
|
|
169
|
-
test "object deletion cancelled if used by another project" do
|
|
170
|
-
proj = Project.create(apidae_id: 123)
|
|
171
|
-
other_proj = Project.create(apidae_id: 456)
|
|
172
|
-
sel = Selection.create(apidae_id: 49063, apidae_project_id: proj.id, label: 'Sélection 2', reference: 'selection-2')
|
|
173
|
-
other_sel = Selection.create(apidae_id: 49999, apidae_project_id: other_proj.id, label: 'Sélection 99', reference: 'selection-99')
|
|
174
|
-
sel.objects << Obj.create(apidae_id: 503, title: 'Société des violoncellistes aixois')
|
|
175
|
-
sel.objects << Obj.create(apidae_id: 504, title: 'Société des contrebassistes aixois')
|
|
176
|
-
other_sel.objects << Obj.find_by_apidae_id(504)
|
|
177
|
-
|
|
178
|
-
assert_equal 2, sel.objects.count
|
|
179
|
-
assert_equal 1, other_sel.objects.count
|
|
180
|
-
|
|
181
|
-
selections_json = File.read('test/data/shared_selections.json')
|
|
182
|
-
FileImport.add_or_update_selections(proj, selections_json, @result)
|
|
183
|
-
deletion_json = File.read('test/data/deletion.json')
|
|
184
|
-
FileImport.delete_objects(deletion_json, @result)
|
|
185
|
-
|
|
186
|
-
assert_equal 2, Obj.count
|
|
187
|
-
assert_equal({created: 0, updated: 0, deleted: 1, selections:
|
|
188
|
-
[{:apidae_id=>49063, :reference=>"selection-2", :objects=>1}]}, @result)
|
|
189
|
-
assert_equal 1, other_sel.objects.count
|
|
190
|
-
end
|
|
191
|
-
|
|
192
169
|
test "full import process" do
|
|
193
170
|
Obj.create(apidae_id: 123, title: 'Objet à supprimer')
|
|
194
171
|
Obj.create(apidae_id: 4826186, title: 'Objet à mettre à jour')
|
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: 1.
|
|
4
|
+
version: 1.3.0
|
|
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:
|
|
11
|
+
date: 2020-10-07 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rails
|
|
@@ -16,14 +16,14 @@ dependencies:
|
|
|
16
16
|
requirements:
|
|
17
17
|
- - "~>"
|
|
18
18
|
- !ruby/object:Gem::Version
|
|
19
|
-
version: '
|
|
19
|
+
version: '6.0'
|
|
20
20
|
type: :runtime
|
|
21
21
|
prerelease: false
|
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
|
23
23
|
requirements:
|
|
24
24
|
- - "~>"
|
|
25
25
|
- !ruby/object:Gem::Version
|
|
26
|
-
version: '
|
|
26
|
+
version: '6.0'
|
|
27
27
|
- !ruby/object:Gem::Dependency
|
|
28
28
|
name: pg
|
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -31,6 +31,9 @@ dependencies:
|
|
|
31
31
|
- - "~>"
|
|
32
32
|
- !ruby/object:Gem::Version
|
|
33
33
|
version: '1.1'
|
|
34
|
+
- - "<"
|
|
35
|
+
- !ruby/object:Gem::Version
|
|
36
|
+
version: '2.0'
|
|
34
37
|
type: :runtime
|
|
35
38
|
prerelease: false
|
|
36
39
|
version_requirements: !ruby/object:Gem::Requirement
|
|
@@ -38,20 +41,23 @@ dependencies:
|
|
|
38
41
|
- - "~>"
|
|
39
42
|
- !ruby/object:Gem::Version
|
|
40
43
|
version: '1.1'
|
|
44
|
+
- - "<"
|
|
45
|
+
- !ruby/object:Gem::Version
|
|
46
|
+
version: '2.0'
|
|
41
47
|
- !ruby/object:Gem::Dependency
|
|
42
48
|
name: rubyzip
|
|
43
49
|
requirement: !ruby/object:Gem::Requirement
|
|
44
50
|
requirements:
|
|
45
51
|
- - "~>"
|
|
46
52
|
- !ruby/object:Gem::Version
|
|
47
|
-
version: '
|
|
53
|
+
version: '2.0'
|
|
48
54
|
type: :runtime
|
|
49
55
|
prerelease: false
|
|
50
56
|
version_requirements: !ruby/object:Gem::Requirement
|
|
51
57
|
requirements:
|
|
52
58
|
- - "~>"
|
|
53
59
|
- !ruby/object:Gem::Version
|
|
54
|
-
version: '
|
|
60
|
+
version: '2.0'
|
|
55
61
|
- !ruby/object:Gem::Dependency
|
|
56
62
|
name: jbuilder
|
|
57
63
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -199,7 +205,6 @@ files:
|
|
|
199
205
|
- test/data/hot_fr_en.json
|
|
200
206
|
- test/data/json_export.zip
|
|
201
207
|
- test/data/selections.json
|
|
202
|
-
- test/data/shared_selections.json
|
|
203
208
|
- test/data/structure.json
|
|
204
209
|
- test/data/update_selections.json
|
|
205
210
|
- test/dummy/README.rdoc
|
|
@@ -275,7 +280,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
275
280
|
- !ruby/object:Gem::Version
|
|
276
281
|
version: '0'
|
|
277
282
|
requirements: []
|
|
278
|
-
|
|
283
|
+
rubyforge_project:
|
|
284
|
+
rubygems_version: 2.6.13
|
|
279
285
|
signing_key:
|
|
280
286
|
specification_version: 4
|
|
281
287
|
summary: A Ruby on Rails engine for projects that involve Apidae data
|
|
@@ -341,7 +347,6 @@ test_files:
|
|
|
341
347
|
- test/controllers/apidae/dashboard_controller_test.rb
|
|
342
348
|
- test/controllers/apidae/references_controller_test.rb
|
|
343
349
|
- test/controllers/apidae/import_controller_test.rb
|
|
344
|
-
- test/data/shared_selections.json
|
|
345
350
|
- test/data/equ_groups.json
|
|
346
351
|
- test/data/update_selections.json
|
|
347
352
|
- test/data/json_export.zip
|