zizia 6.0.0 → 6.0.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (20) hide show
  1. checksums.yaml +4 -4
  2. data/.circleci/config.yml +12 -6
  3. data/.github_changelog_generator +1 -1
  4. data/CHANGELOG.md +148 -16
  5. data/README.md +23 -17
  6. data/app/assets/stylesheets/zizia/_button.scss +10 -0
  7. data/app/assets/stylesheets/zizia/zizia.scss +1 -5
  8. data/app/importers/modular_importer.rb +10 -6
  9. data/app/lib/zizia/metadata_details.rb +14 -14
  10. data/lib/zizia/parser.rb +6 -6
  11. data/lib/zizia/version.rb +1 -1
  12. data/spec/dummy/.gitignore +1 -1
  13. data/spec/dummy/db/schema.rb +0 -1
  14. data/spec/dummy/db/test.sqlite3 +0 -0
  15. data/spec/dummy/spec/system/csv_import_details_page_spec.rb +4 -0
  16. data/spec/dummy/spec/system/import_from_csv_spec.rb +1 -2
  17. data/spec/zizia/csv_format_validator_spec.rb +1 -1
  18. data/zizia.gemspec +10 -9
  19. metadata +54 -33
  20. data/.travis.yml +0 -12
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 4ea278f920c48f0ca7d4e52cc54a619fdcb1214cf115efaeff63f96ca36590ce
4
- data.tar.gz: cf2d2a451e0e6d41d80ccf121793e1672cb2b1ce13a830013bfd031273a69f26
3
+ metadata.gz: fa20860ee0d126aeb20510762076a369db7a437b55a96c76d2951848b9c58e10
4
+ data.tar.gz: '04819010a1955331cd6a1265acb765bccfff17dd3a0770e1076bbdb1b16948f5'
5
5
  SHA512:
6
- metadata.gz: 30c878339f6b6076f203c008fed9b6ae448466947e55fbb8c80a53b56920e014be4e92d58afc322fffde6e04120a8cf8cee9be66ba5b90fda776a92ded3d5606
7
- data.tar.gz: dfaf9874758df10a63ce96425105c986708858ed549f02217fac2977bb000e204294cb05dbe6e5b8a3ceb347604418e1a67396ddc2b97d0428389c23d8185e9d
6
+ metadata.gz: fd99c65e5d9e6be74d8235373af881d607be825e1f2121a1caec15c7598ac41bf63a8a29862e13da7752c80794925442c5c11e6be75f35701eea62dd458fecc5
7
+ data.tar.gz: 459a88b20db1ef17927bafea06b43f8dbbdabcfd3c32aaec377d256f510067f3ba0d9ea27779ad295f041cd9586ac3b5d29c49ea998d9901ec13b657ddb2684c
data/.circleci/config.yml CHANGED
@@ -1,6 +1,6 @@
1
1
  version: 2.1
2
2
  orbs:
3
- samvera: samvera/circleci-orb@0.3.1
3
+ samvera: samvera/circleci-orb@0
4
4
  jobs:
5
5
  build:
6
6
  parameters:
@@ -9,7 +9,7 @@ jobs:
9
9
  default: 2.5.3
10
10
  bundler_version:
11
11
  type: string
12
- default: 2.0.1
12
+ default: 2.1.4
13
13
  rails_version:
14
14
  type: string
15
15
  default: 5.1.7
@@ -46,8 +46,14 @@ workflows:
46
46
  ci:
47
47
  jobs:
48
48
  - build:
49
- name: ruby2-5-3_with_rails_5_1
50
- rails_version: 5.1.7
49
+ name: ruby2-5-8_with_rails_5_2
50
+ ruby_version: 2.5.8
51
+ rails_version: 5.2.4.3
51
52
  - build:
52
- name: ruby2-5-3_with_rails_5_2
53
- rails_version: 5.2.3
53
+ name: ruby2-6-6_with_rails_5_2
54
+ ruby_version: 2.6.6
55
+ rails_version: 5.2.4.3
56
+ - build:
57
+ name: ruby2-7-1_with_rails_5_2
58
+ ruby_version: 2.7.1
59
+ rails_version: 5.2.4.3
data/.github_changelog_generator CHANGED
@@ -1,2 +1,2 @@
1
1
  unreleased=true
2
- future-release=6.0.0
2
+ future-release=v6.0.1
data/CHANGELOG.md CHANGED
@@ -1,8 +1,37 @@
1
1
  # Changelog
2
2
 
3
- ## [6.0.0](https://github.com/curationexperts/zizia/tree/6.0.0) (2019-12-13)
3
+ ## [v6.0.1](https://github.com/curationexperts/zizia/tree/v6.0.1) (2020-08-07)
4
4
 
5
- [Full Changelog](https://github.com/curationexperts/zizia/compare/v5.5.0...6.0.0)
5
+ [Full Changelog](https://github.com/curationexperts/zizia/compare/v6.0.0...v6.0.1)
6
+
7
+ **Fixed bugs:**
8
+
9
+ - Intermittently failing test in CI - Viewing the csv import detail page has pagination for PreIngestWorks [\#82](https://github.com/curationexperts/zizia/issues/82)
10
+ - Bundle install not working - seems to get in infinite loop on bundler [\#70](https://github.com/curationexperts/zizia/issues/70)
11
+
12
+ **Merged pull requests:**
13
+
14
+ - Loosen dependency requirements slightly for listen gem. [\#104](https://github.com/curationexperts/zizia/pull/104) ([fnibbit](https://github.com/fnibbit))
15
+ - Pause in test to avoid timing-dependent failures [\#102](https://github.com/curationexperts/zizia/pull/102) ([fnibbit](https://github.com/fnibbit))
16
+ - Stop requiring test migrations be re-run [\#101](https://github.com/curationexperts/zizia/pull/101) ([bess](https://github.com/bess))
17
+ - Update ruby and rails version in second CI build [\#100](https://github.com/curationexperts/zizia/pull/100) ([maxkadel](https://github.com/maxkadel))
18
+ - Update CI workflow with ruby and rails versions in build [\#99](https://github.com/curationexperts/zizia/pull/99) ([maxkadel](https://github.com/maxkadel))
19
+ - Use latest Samvera circleci orb [\#98](https://github.com/curationexperts/zizia/pull/98) ([maxkadel](https://github.com/maxkadel))
20
+ - Match CI bundler to local development [\#97](https://github.com/curationexperts/zizia/pull/97) ([maxkadel](https://github.com/maxkadel))
21
+ - Remove Travis config - using CircleCI [\#96](https://github.com/curationexperts/zizia/pull/96) ([maxkadel](https://github.com/maxkadel))
22
+ - Upgrade capybara to 3.x [\#88](https://github.com/curationexperts/zizia/pull/88) ([fnibbit](https://github.com/fnibbit))
23
+ - Loosen gem dependencies slightly [\#87](https://github.com/curationexperts/zizia/pull/87) ([fnibbit](https://github.com/fnibbit))
24
+ - Require bundler 2 to avoid dependency loops [\#86](https://github.com/curationexperts/zizia/pull/86) ([fnibbit](https://github.com/fnibbit))
25
+ - Cherry pick rescue missing files [\#85](https://github.com/curationexperts/zizia/pull/85) ([maxkadel](https://github.com/maxkadel))
26
+ - Update readme to reflect local development practices [\#84](https://github.com/curationexperts/zizia/pull/84) ([maxkadel](https://github.com/maxkadel))
27
+ - Update sass-rails to fix dependency calculation [\#83](https://github.com/curationexperts/zizia/pull/83) ([maxkadel](https://github.com/maxkadel))
28
+ - Fixing a typo [\#80](https://github.com/curationexperts/zizia/pull/80) ([jeremyf](https://github.com/jeremyf))
29
+ - Update bixby to ~\> 2.0 [\#72](https://github.com/curationexperts/zizia/pull/72) ([little9](https://github.com/little9))
30
+ - Update button styling [\#71](https://github.com/curationexperts/zizia/pull/71) ([little9](https://github.com/little9))
31
+
32
+ ## [v6.0.0](https://github.com/curationexperts/zizia/tree/v6.0.0) (2019-12-13)
33
+
34
+ [Full Changelog](https://github.com/curationexperts/zizia/compare/v5.5.0...v6.0.0)
6
35
 
7
36
  **Merged pull requests:**
8
37
 
@@ -82,7 +111,6 @@
82
111
  - Update headers for the downloadable CSV template [\#43](https://github.com/curationexperts/zizia/pull/43) ([mark-dce](https://github.com/mark-dce))
83
112
  - Update design of new CSV import page [\#42](https://github.com/curationexperts/zizia/pull/42) ([mark-dce](https://github.com/mark-dce))
84
113
  - Update to correct spelling for keyword field [\#41](https://github.com/curationexperts/zizia/pull/41) ([mark-dce](https://github.com/mark-dce))
85
- - Use yes/no language in the metadata guide [\#40](https://github.com/curationexperts/zizia/pull/40) ([bess](https://github.com/bess))
86
114
 
87
115
  ## [v4.6.0.alpha01](https://github.com/curationexperts/zizia/tree/v4.6.0.alpha01) (2019-10-15)
88
116
 
@@ -90,13 +118,13 @@
90
118
 
91
119
  **Merged pull requests:**
92
120
 
121
+ - Use yes/no language in the metadata guide [\#40](https://github.com/curationexperts/zizia/pull/40) ([bess](https://github.com/bess))
93
122
  - Add dashboard layout to csv import screens [\#39](https://github.com/curationexperts/zizia/pull/39) ([bess](https://github.com/bess))
94
123
  - Update Usage data for the metadata field guide [\#38](https://github.com/curationexperts/zizia/pull/38) ([mark-dce](https://github.com/mark-dce))
95
124
  - Update language for multiple values on metadata field guide [\#37](https://github.com/curationexperts/zizia/pull/37) ([bess](https://github.com/bess))
96
125
  - Add intro header for metadata field guide [\#36](https://github.com/curationexperts/zizia/pull/36) ([bess](https://github.com/bess))
97
126
  - Add field definitions for 'files' and 'visibility' to the field guide [\#35](https://github.com/curationexperts/zizia/pull/35) ([mark-dce](https://github.com/mark-dce))
98
127
  - Label and hide system fields [\#34](https://github.com/curationexperts/zizia/pull/34) ([bess](https://github.com/bess))
99
- - Add files count to import details page [\#32](https://github.com/curationexperts/zizia/pull/32) ([little9](https://github.com/little9))
100
128
 
101
129
  ## [v4.5.4.alpha.01](https://github.com/curationexperts/zizia/tree/v4.5.4.alpha.01) (2019-10-04)
102
130
 
@@ -110,6 +138,10 @@
110
138
 
111
139
  [Full Changelog](https://github.com/curationexperts/zizia/compare/v4.5.2.alpha.01...v4.5.3.alpha.01)
112
140
 
141
+ **Merged pull requests:**
142
+
143
+ - Add files count to import details page [\#32](https://github.com/curationexperts/zizia/pull/32) ([little9](https://github.com/little9))
144
+
113
145
  ## [v4.5.2.alpha.01](https://github.com/curationexperts/zizia/tree/v4.5.2.alpha.01) (2019-10-03)
114
146
 
115
147
  [Full Changelog](https://github.com/curationexperts/zizia/compare/v4.5.1.alpha.01...v4.5.2.alpha.01)
@@ -153,7 +185,11 @@
153
185
 
154
186
  ## [v4.2.0.alpha.01](https://github.com/curationexperts/zizia/tree/v4.2.0.alpha.01) (2019-10-01)
155
187
 
156
- [Full Changelog](https://github.com/curationexperts/zizia/compare/v4.1.0.alpha.01...v4.2.0.alpha.01)
188
+ [Full Changelog](https://github.com/curationexperts/zizia/compare/vv4.2.0.alpha.01...v4.2.0.alpha.01)
189
+
190
+ ## [vv4.2.0.alpha.01](https://github.com/curationexperts/zizia/tree/vv4.2.0.alpha.01) (2019-10-01)
191
+
192
+ [Full Changelog](https://github.com/curationexperts/zizia/compare/v4.1.0.alpha.01...vv4.2.0.alpha.01)
157
193
 
158
194
  **Merged pull requests:**
159
195
 
@@ -161,7 +197,7 @@
161
197
 
162
198
  ## [v4.1.0.alpha.01](https://github.com/curationexperts/zizia/tree/v4.1.0.alpha.01) (2019-09-30)
163
199
 
164
- [Full Changelog](https://github.com/curationexperts/zizia/compare/v4...v4.1.0.alpha.01)
200
+ [Full Changelog](https://github.com/curationexperts/zizia/compare/v4.0.2.alpha.01...v4.1.0.alpha.01)
165
201
 
166
202
  **Merged pull requests:**
167
203
 
@@ -169,13 +205,13 @@
169
205
  - Revert "Update coverage formatter for CI environments" [\#23](https://github.com/curationexperts/zizia/pull/23) ([mark-dce](https://github.com/mark-dce))
170
206
  - Update coverage formatter for CI environments [\#22](https://github.com/curationexperts/zizia/pull/22) ([mark-dce](https://github.com/mark-dce))
171
207
 
172
- ## [v4](https://github.com/curationexperts/zizia/tree/v4) (2019-09-25)
208
+ ## [v4.0.2.alpha.01](https://github.com/curationexperts/zizia/tree/v4.0.2.alpha.01) (2019-09-25)
173
209
 
174
- [Full Changelog](https://github.com/curationexperts/zizia/compare/v4.0.2.alpha.01...v4)
210
+ [Full Changelog](https://github.com/curationexperts/zizia/compare/v4...v4.0.2.alpha.01)
175
211
 
176
- ## [v4.0.2.alpha.01](https://github.com/curationexperts/zizia/tree/v4.0.2.alpha.01) (2019-09-25)
212
+ ## [v4](https://github.com/curationexperts/zizia/tree/v4) (2019-09-25)
177
213
 
178
- [Full Changelog](https://github.com/curationexperts/zizia/compare/v4.0.0.alpha.01...v4.0.2.alpha.01)
214
+ [Full Changelog](https://github.com/curationexperts/zizia/compare/v4.0.0.alpha.01...v4)
179
215
 
180
216
  ## [v4.0.0.alpha.01](https://github.com/curationexperts/zizia/tree/v4.0.0.alpha.01) (2019-09-25)
181
217
 
@@ -248,11 +284,7 @@
248
284
 
249
285
  ## [v2.1.0.alpha.04](https://github.com/curationexperts/zizia/tree/v2.1.0.alpha.04) (2019-08-01)
250
286
 
251
- [Full Changelog](https://github.com/curationexperts/zizia/compare/v2.1.0.alpha.03...v2.1.0.alpha.04)
252
-
253
- ## [v2.1.0.alpha.03](https://github.com/curationexperts/zizia/tree/v2.1.0.alpha.03) (2019-08-01)
254
-
255
- [Full Changelog](https://github.com/curationexperts/zizia/compare/v2.1.0.alpha.02...v2.1.0.alpha.03)
287
+ [Full Changelog](https://github.com/curationexperts/zizia/compare/v2.1.0.alpha.02...v2.1.0.alpha.04)
256
288
 
257
289
  **Merged pull requests:**
258
290
 
@@ -292,7 +324,107 @@
292
324
 
293
325
  ## [v1.0.1](https://github.com/curationexperts/zizia/tree/v1.0.1) (2019-07-25)
294
326
 
295
- [Full Changelog](https://github.com/curationexperts/zizia/compare/3d82f40f28eb65607837bd832c3dd46e3a305361...v1.0.1)
327
+ [Full Changelog](https://github.com/curationexperts/zizia/compare/v3.2.2...v1.0.1)
328
+
329
+ ## [v3.2.2](https://github.com/curationexperts/zizia/tree/v3.2.2) (2019-04-04)
330
+
331
+ [Full Changelog](https://github.com/curationexperts/zizia/compare/v3.2.1...v3.2.2)
332
+
333
+ ## [v3.2.1](https://github.com/curationexperts/zizia/tree/v3.2.1) (2019-04-04)
334
+
335
+ [Full Changelog](https://github.com/curationexperts/zizia/compare/v3.2.0...v3.2.1)
336
+
337
+ ## [v3.2.0](https://github.com/curationexperts/zizia/tree/v3.2.0) (2019-03-05)
338
+
339
+ [Full Changelog](https://github.com/curationexperts/zizia/compare/v3.1.1...v3.2.0)
340
+
341
+ ## [v3.1.1](https://github.com/curationexperts/zizia/tree/v3.1.1) (2019-02-26)
342
+
343
+ [Full Changelog](https://github.com/curationexperts/zizia/compare/v3.1.0...v3.1.1)
344
+
345
+ ## [v3.1.0](https://github.com/curationexperts/zizia/tree/v3.1.0) (2019-02-26)
346
+
347
+ [Full Changelog](https://github.com/curationexperts/zizia/compare/v3.0.5...v3.1.0)
348
+
349
+ ## [v3.0.5](https://github.com/curationexperts/zizia/tree/v3.0.5) (2019-02-26)
350
+
351
+ [Full Changelog](https://github.com/curationexperts/zizia/compare/v3.0.4...v3.0.5)
352
+
353
+ ## [v3.0.4](https://github.com/curationexperts/zizia/tree/v3.0.4) (2019-02-22)
354
+
355
+ [Full Changelog](https://github.com/curationexperts/zizia/compare/v3.0.3...v3.0.4)
356
+
357
+ ## [v3.0.3](https://github.com/curationexperts/zizia/tree/v3.0.3) (2019-02-21)
358
+
359
+ [Full Changelog](https://github.com/curationexperts/zizia/compare/v3.0.2...v3.0.3)
360
+
361
+ ## [v3.0.2](https://github.com/curationexperts/zizia/tree/v3.0.2) (2019-02-21)
362
+
363
+ [Full Changelog](https://github.com/curationexperts/zizia/compare/v3.0.1...v3.0.2)
364
+
365
+ ## [v3.0.1](https://github.com/curationexperts/zizia/tree/v3.0.1) (2019-02-14)
366
+
367
+ [Full Changelog](https://github.com/curationexperts/zizia/compare/v3.0.0...v3.0.1)
368
+
369
+ ## [v3.0.0](https://github.com/curationexperts/zizia/tree/v3.0.0) (2019-02-13)
370
+
371
+ [Full Changelog](https://github.com/curationexperts/zizia/compare/v2.2.0...v3.0.0)
372
+
373
+ ## [v2.2.0](https://github.com/curationexperts/zizia/tree/v2.2.0) (2019-02-13)
374
+
375
+ [Full Changelog](https://github.com/curationexperts/zizia/compare/v2.1.0...v2.2.0)
376
+
377
+ ## [v2.1.0](https://github.com/curationexperts/zizia/tree/v2.1.0) (2019-02-12)
378
+
379
+ [Full Changelog](https://github.com/curationexperts/zizia/compare/v2.0.0...v2.1.0)
380
+
381
+ ## [v2.0.0](https://github.com/curationexperts/zizia/tree/v2.0.0) (2019-02-04)
382
+
383
+ [Full Changelog](https://github.com/curationexperts/zizia/compare/v1.2.3...v2.0.0)
384
+
385
+ ## [v1.2.3](https://github.com/curationexperts/zizia/tree/v1.2.3) (2019-01-24)
386
+
387
+ [Full Changelog](https://github.com/curationexperts/zizia/compare/v1.2.2...v1.2.3)
388
+
389
+ ## [v1.2.2](https://github.com/curationexperts/zizia/tree/v1.2.2) (2019-01-24)
390
+
391
+ [Full Changelog](https://github.com/curationexperts/zizia/compare/v1.2.1...v1.2.2)
392
+
393
+ ## [v1.2.1](https://github.com/curationexperts/zizia/tree/v1.2.1) (2019-01-24)
394
+
395
+ [Full Changelog](https://github.com/curationexperts/zizia/compare/v1.2.0...v1.2.1)
396
+
397
+ ## [v1.2.0](https://github.com/curationexperts/zizia/tree/v1.2.0) (2019-01-03)
398
+
399
+ [Full Changelog](https://github.com/curationexperts/zizia/compare/v1.1.0...v1.2.0)
400
+
401
+ ## [v1.1.0](https://github.com/curationexperts/zizia/tree/v1.1.0) (2018-12-18)
402
+
403
+ [Full Changelog](https://github.com/curationexperts/zizia/compare/v1.0.0...v1.1.0)
404
+
405
+ ## [v1.0.0](https://github.com/curationexperts/zizia/tree/v1.0.0) (2018-01-29)
406
+
407
+ [Full Changelog](https://github.com/curationexperts/zizia/compare/v1.0.0.pre.rc1...v1.0.0)
408
+
409
+ ## [v1.0.0.pre.rc1](https://github.com/curationexperts/zizia/tree/v1.0.0.pre.rc1) (2018-01-25)
410
+
411
+ [Full Changelog](https://github.com/curationexperts/zizia/compare/v0.3.0...v1.0.0.pre.rc1)
412
+
413
+ ## [v0.3.0](https://github.com/curationexperts/zizia/tree/v0.3.0) (2018-01-19)
414
+
415
+ [Full Changelog](https://github.com/curationexperts/zizia/compare/v0.2.0...v0.3.0)
416
+
417
+ ## [v0.2.0](https://github.com/curationexperts/zizia/tree/v0.2.0) (2018-01-17)
418
+
419
+ [Full Changelog](https://github.com/curationexperts/zizia/compare/v0.1.1...v0.2.0)
420
+
421
+ ## [v0.1.1](https://github.com/curationexperts/zizia/tree/v0.1.1) (2018-01-12)
422
+
423
+ [Full Changelog](https://github.com/curationexperts/zizia/compare/v0.1.0...v0.1.1)
424
+
425
+ ## [v0.1.0](https://github.com/curationexperts/zizia/tree/v0.1.0) (2018-01-11)
426
+
427
+ [Full Changelog](https://github.com/curationexperts/zizia/compare/3d82f40f28eb65607837bd832c3dd46e3a305361...v0.1.0)
296
428
 
297
429
 
298
430
 
data/README.md CHANGED
@@ -57,7 +57,7 @@ The `spec/dummy` folder in this application is a complete Hyrax application with
57
57
  You can use that as an example for adding this to your current Hyrax application or copy that
58
58
  to create a new application with Zizia installed.
59
59
 
60
- 8. Add a deduplication_key to your default work type's medata:
60
+ 8. Add a deduplication_key to your default work type's metadata:
61
61
 
62
62
  ```
63
63
  property :deduplication_key, predicate: ::RDF::Vocab::BF2::identifiedBy, multiple: false do |index|
@@ -68,7 +68,7 @@ to create a new application with Zizia installed.
68
68
  9. If you are using the default [Hyrax metadata profile](https://samvera.github.io/metadata_application_profile.html) aka `Hyrax::BasicMetadata`, you are ready to download a sample CSV and start importing.
69
69
 
70
70
 
71
- If you aren't using `Hyrax::BasicMedata` you'll need to create a custom `importer` and `mapper` class. First ensure that a [work type is registered](http://www.rubydoc.info/github/samvera/hyrax/Hyrax/Configuration#register_curation_concern-instance_method)
71
+ If you aren't using `Hyrax::BasicMetadata` you'll need to create a custom `importer` and `mapper` class. First ensure that a [work type is registered](http://www.rubydoc.info/github/samvera/hyrax/Hyrax/Configuration#register_curation_concern-instance_method)
72
72
  with your `Hyrax` application. Then write a class like this:
73
73
 
74
74
  ```ruby
@@ -100,15 +100,31 @@ You can find [an example csv file for import to Hyrax](https://github.com/curati
100
100
  with a heading of `files`, and the location of the files should be specified via an
101
101
  environment variables called `IMPORT_PATH`. If `IMPORT_PATH` is not set, `HyraxRecordImporter` will look in `/opt/data` by default.
102
102
 
103
- ## Testing
103
+ ## Local Development
104
104
 
105
- To run Solr and Fedora for testing purposes, open a new terminal session for each and run the following commads:
105
+ ```sh
106
+ git clone https://github.com/curationexperts/zizia
107
+ cd zizia
108
+
109
+ bundle install
110
+ ```
111
+
112
+ To run Solr and Fedora for testing purposes, open a new terminal session for each of the following commands and run each in it's own terminal session:
106
113
 
107
- `solr_wrapper --config spec/dummy/config/solr_wrapper_test.yml`
114
+ `solr_wrapper --config spec/dummy/config/solr_wrapper_test.yml`
108
115
  `fcrepo_wrapper --config spec/dummy/config/fcrepo_wrapper_test.yml`
109
116
 
110
- After this you can run the whole suite, or individual specs. System specs are located
111
- in the `spec/dummy/spec/system` folder:
117
+ Please also ensure you have an appropriate version of [ChromeDriver](https://chromedriver.chromium.org/home) installed and are running Redis in order to run the test suite:
118
+ `redis-cli ping` should return "PONG"
119
+ `chromedriver -v` should return a version matching your installed version of Chrome
120
+
121
+
122
+ After this you can run the whole suite:
123
+ ```bash
124
+ bundle exec rspec spec
125
+ ```
126
+
127
+ System specs are located in the `spec/dummy/spec/system` folder:
112
128
 
113
129
  `bundle exec rspec spec/dummy/spec/system/csv_import_details_page_spec.rb`
114
130
 
@@ -117,16 +133,6 @@ in the `spec/dummy/spec/system` folder:
117
133
  To input any kind of file other than CSV, you need to provide a `Parser` (out of the box, we support simple CSV import with `CsvParser`). We will be writing guides about
118
134
  how to support custom mappers (for metadata outside of Hyrax's core and basic metadata fields).
119
135
 
120
- ## Development
121
-
122
- ```sh
123
- git clone https://github.com/curationexperts/zizia
124
- cd zizia
125
-
126
- bundle install
127
- bundle exec rake ci
128
- ```
129
-
130
136
  ## Releasing
131
137
 
132
138
  To make a new release:
data/app/assets/stylesheets/zizia/_button.scss ADDED
@@ -0,0 +1,10 @@
1
+ /* In general we want buttons to use word wrap in the UI */
2
+ .btn {
3
+ white-space: normal !important;
4
+ word-wrap: break-word;
5
+ }
6
+
7
+ /* This is for the Go button */
8
+ #search-submit-header {
9
+ white-space: unset !important;
10
+ }
data/app/assets/stylesheets/zizia/zizia.scss CHANGED
@@ -2,8 +2,4 @@
2
2
  @import 'field_guide';
3
3
  @import 'new';
4
4
  @import 'import_table';
5
-
6
- .btn {
7
- white-space:normal !important;
8
- word-wrap: break-word;
9
- }
5
+ @import 'button';
data/app/importers/modular_importer.rb CHANGED
@@ -39,12 +39,16 @@ class ModularImporter
39
39
  pre_ingest_work = Zizia::PreIngestWork.find_or_create_by(deduplication_key: record.mapper.metadata['deduplication_key'])
40
40
  pre_ingest_work.csv_import_detail_id = csv_import_detail.id
41
41
  record.mapper.files.each do |child_file|
42
- full_path = Dir.glob("#{ENV['IMPORT_PATH']}/**/#{child_file}").first
43
- pre_ingest_file = Zizia::PreIngestFile.new(row_number: index + 1,
44
- pre_ingest_work: pre_ingest_work,
45
- filename: child_file,
46
- size: File.size(full_path))
47
- pre_ingest_file.save
42
+ begin
43
+ full_path = Dir.glob("#{ENV['IMPORT_PATH']}/**/#{child_file}").first
44
+ pre_ingest_file = Zizia::PreIngestFile.new(row_number: index + 1,
45
+ pre_ingest_work: pre_ingest_work,
46
+ filename: child_file,
47
+ size: File.size(full_path))
48
+ pre_ingest_file.save
49
+ rescue
50
+ Rails.logger.error "Error: Could not create Zizia::PreIngestFile for #{child_file}"
51
+ end
48
52
  end
49
53
  pre_ingest_work.save
50
54
  end
data/app/lib/zizia/metadata_details.rb CHANGED
@@ -71,28 +71,28 @@ module Zizia
71
71
 
72
72
  def file_definition
73
73
  {
74
- attribute: 'files',
75
- predicate: 'n/a',
76
- multiple: 'true',
77
- type: 'String',
78
- validator: 'Required, must name a file on the server',
79
- label: 'Items (listed at bottom of page)',
74
+ attribute: 'files',
75
+ predicate: 'n/a',
76
+ multiple: 'true',
77
+ type: 'String',
78
+ validator: 'Required, must name a file on the server',
79
+ label: 'Items (listed at bottom of page)',
80
80
  csv_header: 'files',
81
- required_on_form: 'true',
81
+ required_on_form: 'true',
82
82
  usage: MetadataUsage.instance.usage['files']
83
83
  }
84
84
  end
85
85
 
86
86
  def visibility_definition
87
87
  {
88
- attribute: 'visibility',
89
- predicate: 'n/a',
90
- multiple: 'false',
91
- type: 'String',
92
- validator: 'Required, must exist in the application\'s controlled vocabulary for visiblity levels.',
93
- label: 'Visibility',
88
+ attribute: 'visibility',
89
+ predicate: 'n/a',
90
+ multiple: 'false',
91
+ type: 'String',
92
+ validator: 'Required, must exist in the application\'s controlled vocabulary for visiblity levels.',
93
+ label: 'Visibility',
94
94
  csv_header: 'visibility',
95
- required_on_form: 'true',
95
+ required_on_form: 'true',
96
96
  usage: MetadataUsage.instance.usage['visibility']
97
97
  }
98
98
  end
data/lib/zizia/parser.rb CHANGED
@@ -83,12 +83,12 @@ module Zizia
83
83
 
84
84
  private
85
85
 
86
- ##
87
- # @private Register a new class when inherited
88
- def inherited(subclass)
89
- @@subclasses.unshift subclass
90
- super
91
- end
86
+ ##
87
+ # @private Register a new class when inherited
88
+ def inherited(subclass)
89
+ @@subclasses.unshift subclass
90
+ super
91
+ end
92
92
  end
93
93
 
94
94
  ##
data/lib/zizia/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Zizia
4
- VERSION = '6.0.0'
4
+ VERSION = '6.0.1'
5
5
  end
data/spec/dummy/.gitignore CHANGED
@@ -8,7 +8,7 @@
8
8
  /.bundle
9
9
 
10
10
  # Ignore the default SQLite database.
11
- /db/*.sqlite3
11
+ /db/development.sqlite3
12
12
  /db/*.sqlite3-journal
13
13
 
14
14
  # Ignore all logfiles and tempfiles.
data/spec/dummy/db/schema.rb CHANGED
@@ -596,7 +596,6 @@ ActiveRecord::Schema.define(version: 201901241536542) do
596
596
  t.datetime "created_at", null: false
597
597
  t.datetime "updated_at", null: false
598
598
  t.string "status", default: "preingest"
599
- t.string "access_control_id"
600
599
  t.index ["pre_ingest_work_id"], name: "index_zizia_pre_ingest_files_on_pre_ingest_work_id"
601
600
  end
602
601
 
data/spec/dummy/spec/system/csv_import_details_page_spec.rb CHANGED
@@ -119,10 +119,14 @@ RSpec.describe 'viewing the csv import detail page', js: true do
119
119
 
120
120
  it 'has pagination for PreIngestWorks at 10' do
121
121
  visit('/csv_import_details/index')
122
+ sleep(2)
122
123
  click_on 'Next'
124
+ sleep(2)
123
125
  click_on '4'
126
+ sleep(2)
124
127
  expect(page).to have_content 'Next'
125
128
  click_on 'Next'
129
+ sleep(2)
126
130
  expect(page).to have_content 'Previous'
127
131
  end
128
132
 
data/spec/dummy/spec/system/import_from_csv_spec.rb CHANGED
@@ -93,8 +93,7 @@ RSpec.describe 'Importing records from a CSV file', :perform_jobs, :clean, type:
93
93
  visit "/concern/works/#{work.id}"
94
94
  expect(page).to have_content work.title.first
95
95
  # Controlled vocabulary location should have been resolved to its label name
96
- expect(page).to have_content "Montana"
97
- expect(page).to have_content "United States"
96
+ expect(page).to have_content "Los Angeles"
98
97
 
99
98
  # The license value resolves to a controlled field from creative commons
100
99
  expect(page).to have_link "Attribution 4.0"
data/spec/zizia/csv_format_validator_spec.rb CHANGED
@@ -32,7 +32,7 @@ describe Zizia::CsvFormatValidator do
32
32
  expect(validator.validate(parser: invalid_parser))
33
33
  .to contain_exactly a_validator_error
34
34
  .with(validator: validator.class,
35
- name: CSV::MalformedCSVError)
35
+ name: CSV::MalformedCSVError)
36
36
  end
37
37
  end
38
38
  end
data/zizia.gemspec CHANGED
@@ -22,10 +22,11 @@ Gem::Specification.new do |gem|
22
22
  gem.add_dependency 'carrierwave'
23
23
  gem.add_dependency 'rails-controller-testing'
24
24
 
25
- gem.add_development_dependency 'bixby'
26
- gem.add_development_dependency 'bootstrap-sass', '~> 3.0'
25
+ gem.add_development_dependency 'bixby', '~> 2'
26
+ gem.add_development_dependency 'bootstrap-sass', '~> 3'
27
+ gem.add_development_dependency 'bundler', '~> 2'
27
28
  gem.add_development_dependency 'byebug'
28
- gem.add_development_dependency 'capybara', '~> 2.13'
29
+ gem.add_development_dependency 'capybara', '~> 3'
29
30
  gem.add_development_dependency 'coffee-rails', '~> 4.2'
30
31
  gem.add_development_dependency 'coveralls'
31
32
  gem.add_development_dependency 'devise'
@@ -36,11 +37,11 @@ Gem::Specification.new do |gem|
36
37
  gem.add_development_dependency 'font-awesome-rails'
37
38
  gem.add_development_dependency 'github_changelog_generator'
38
39
  gem.add_development_dependency 'hydra-role-management'
39
- gem.add_development_dependency 'hyrax', '~> 2.5.1'
40
+ gem.add_development_dependency 'hyrax', '>= 2.5.1', '< 3.0'
40
41
  gem.add_development_dependency 'hyrax-spec'
41
42
  gem.add_development_dependency 'jbuilder', '~> 2.5'
42
43
  gem.add_development_dependency 'jquery-rails'
43
- gem.add_development_dependency 'listen', '>= 3.0.5', '< 3.2'
44
+ gem.add_development_dependency 'listen', '>= 3.0.5', '~> 3'
44
45
  gem.add_development_dependency 'puma', '~> 3.7'
45
46
  gem.add_development_dependency 'rake'
46
47
  gem.add_development_dependency 'riiif', '~> 2.0'
@@ -49,17 +50,17 @@ Gem::Specification.new do |gem|
49
50
  gem.add_development_dependency 'rspec'
50
51
  gem.add_development_dependency 'rspec-rails'
51
52
  gem.add_development_dependency 'rspec_junit_formatter'
52
- gem.add_development_dependency "sass-rails", "~> 5.0.4"
53
+ gem.add_development_dependency 'sass-rails', '>= 5.0'
53
54
  gem.add_development_dependency 'selenium-webdriver'
54
55
  gem.add_development_dependency 'solr_wrapper', '>= 0.3'
55
56
  gem.add_development_dependency 'spring'
56
- gem.add_development_dependency 'spring-watcher-listen', '~> 2.0.0'
57
- gem.add_development_dependency 'sqlite3', '~> 1.3.0'
57
+ gem.add_development_dependency 'spring-watcher-listen', '~> 2'
58
+ gem.add_development_dependency 'sqlite3', '~> 1.3'
58
59
  gem.add_development_dependency 'turbolinks', '~> 5'
59
60
  gem.add_development_dependency 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'
60
61
  gem.add_development_dependency 'uglifier', '>= 1.3.0'
61
62
  gem.add_development_dependency 'web-console', '>= 3.3.0'
62
63
  gem.add_development_dependency 'yard'
63
- gem.add_development_dependency 'font-awesome-sass', '~> 4.4.0'
64
+ gem.add_development_dependency 'font-awesome-sass', '~> 4.4'
64
65
  gem.add_development_dependency 'sidekiq'
65
66
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: zizia
3
3
  version: !ruby/object:Gem::Version
4
- version: 6.0.0
4
+ version: 6.0.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Data Curation Experts
8
- autorequire:
8
+ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-12-13 00:00:00.000000000 Z
11
+ date: 2020-08-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: active-fedora
@@ -90,30 +90,44 @@ dependencies:
90
90
  name: bixby
91
91
  requirement: !ruby/object:Gem::Requirement
92
92
  requirements:
93
- - - ">="
93
+ - - "~>"
94
94
  - !ruby/object:Gem::Version
95
- version: '0'
95
+ version: '2'
96
96
  type: :development
97
97
  prerelease: false
98
98
  version_requirements: !ruby/object:Gem::Requirement
99
99
  requirements:
100
- - - ">="
100
+ - - "~>"
101
101
  - !ruby/object:Gem::Version
102
- version: '0'
102
+ version: '2'
103
103
  - !ruby/object:Gem::Dependency
104
104
  name: bootstrap-sass
105
105
  requirement: !ruby/object:Gem::Requirement
106
106
  requirements:
107
107
  - - "~>"
108
108
  - !ruby/object:Gem::Version
109
- version: '3.0'
109
+ version: '3'
110
110
  type: :development
111
111
  prerelease: false
112
112
  version_requirements: !ruby/object:Gem::Requirement
113
113
  requirements:
114
114
  - - "~>"
115
115
  - !ruby/object:Gem::Version
116
- version: '3.0'
116
+ version: '3'
117
+ - !ruby/object:Gem::Dependency
118
+ name: bundler
119
+ requirement: !ruby/object:Gem::Requirement
120
+ requirements:
121
+ - - "~>"
122
+ - !ruby/object:Gem::Version
123
+ version: '2'
124
+ type: :development
125
+ prerelease: false
126
+ version_requirements: !ruby/object:Gem::Requirement
127
+ requirements:
128
+ - - "~>"
129
+ - !ruby/object:Gem::Version
130
+ version: '2'
117
131
  - !ruby/object:Gem::Dependency
118
132
  name: byebug
119
133
  requirement: !ruby/object:Gem::Requirement
@@ -134,14 +148,14 @@ dependencies:
134
148
  requirements:
135
149
  - - "~>"
136
150
  - !ruby/object:Gem::Version
137
- version: '2.13'
151
+ version: '3'
138
152
  type: :development
139
153
  prerelease: false
140
154
  version_requirements: !ruby/object:Gem::Requirement
141
155
  requirements:
142
156
  - - "~>"
143
157
  - !ruby/object:Gem::Version
144
- version: '2.13'
158
+ version: '3'
145
159
  - !ruby/object:Gem::Dependency
146
160
  name: coffee-rails
147
161
  requirement: !ruby/object:Gem::Requirement
@@ -286,16 +300,22 @@ dependencies:
286
300
  name: hyrax
287
301
  requirement: !ruby/object:Gem::Requirement
288
302
  requirements:
289
- - - "~>"
303
+ - - ">="
290
304
  - !ruby/object:Gem::Version
291
305
  version: 2.5.1
306
+ - - "<"
307
+ - !ruby/object:Gem::Version
308
+ version: '3.0'
292
309
  type: :development
293
310
  prerelease: false
294
311
  version_requirements: !ruby/object:Gem::Requirement
295
312
  requirements:
296
- - - "~>"
313
+ - - ">="
297
314
  - !ruby/object:Gem::Version
298
315
  version: 2.5.1
316
+ - - "<"
317
+ - !ruby/object:Gem::Version
318
+ version: '3.0'
299
319
  - !ruby/object:Gem::Dependency
300
320
  name: hyrax-spec
301
321
  requirement: !ruby/object:Gem::Requirement
@@ -345,9 +365,9 @@ dependencies:
345
365
  - - ">="
346
366
  - !ruby/object:Gem::Version
347
367
  version: 3.0.5
348
- - - "<"
368
+ - - "~>"
349
369
  - !ruby/object:Gem::Version
350
- version: '3.2'
370
+ version: '3'
351
371
  type: :development
352
372
  prerelease: false
353
373
  version_requirements: !ruby/object:Gem::Requirement
@@ -355,9 +375,9 @@ dependencies:
355
375
  - - ">="
356
376
  - !ruby/object:Gem::Version
357
377
  version: 3.0.5
358
- - - "<"
378
+ - - "~>"
359
379
  - !ruby/object:Gem::Version
360
- version: '3.2'
380
+ version: '3'
361
381
  - !ruby/object:Gem::Dependency
362
382
  name: puma
363
383
  requirement: !ruby/object:Gem::Requirement
@@ -474,16 +494,16 @@ dependencies:
474
494
  name: sass-rails
475
495
  requirement: !ruby/object:Gem::Requirement
476
496
  requirements:
477
- - - "~>"
497
+ - - ">="
478
498
  - !ruby/object:Gem::Version
479
- version: 5.0.4
499
+ version: '5.0'
480
500
  type: :development
481
501
  prerelease: false
482
502
  version_requirements: !ruby/object:Gem::Requirement
483
503
  requirements:
484
- - - "~>"
504
+ - - ">="
485
505
  - !ruby/object:Gem::Version
486
- version: 5.0.4
506
+ version: '5.0'
487
507
  - !ruby/object:Gem::Dependency
488
508
  name: selenium-webdriver
489
509
  requirement: !ruby/object:Gem::Requirement
@@ -532,28 +552,28 @@ dependencies:
532
552
  requirements:
533
553
  - - "~>"
534
554
  - !ruby/object:Gem::Version
535
- version: 2.0.0
555
+ version: '2'
536
556
  type: :development
537
557
  prerelease: false
538
558
  version_requirements: !ruby/object:Gem::Requirement
539
559
  requirements:
540
560
  - - "~>"
541
561
  - !ruby/object:Gem::Version
542
- version: 2.0.0
562
+ version: '2'
543
563
  - !ruby/object:Gem::Dependency
544
564
  name: sqlite3
545
565
  requirement: !ruby/object:Gem::Requirement
546
566
  requirements:
547
567
  - - "~>"
548
568
  - !ruby/object:Gem::Version
549
- version: 1.3.0
569
+ version: '1.3'
550
570
  type: :development
551
571
  prerelease: false
552
572
  version_requirements: !ruby/object:Gem::Requirement
553
573
  requirements:
554
574
  - - "~>"
555
575
  - !ruby/object:Gem::Version
556
- version: 1.3.0
576
+ version: '1.3'
557
577
  - !ruby/object:Gem::Dependency
558
578
  name: turbolinks
559
579
  requirement: !ruby/object:Gem::Requirement
@@ -630,14 +650,14 @@ dependencies:
630
650
  requirements:
631
651
  - - "~>"
632
652
  - !ruby/object:Gem::Version
633
- version: 4.4.0
653
+ version: '4.4'
634
654
  type: :development
635
655
  prerelease: false
636
656
  version_requirements: !ruby/object:Gem::Requirement
637
657
  requirements:
638
658
  - - "~>"
639
659
  - !ruby/object:Gem::Version
640
- version: 4.4.0
660
+ version: '4.4'
641
661
  - !ruby/object:Gem::Dependency
642
662
  name: sidekiq
643
663
  requirement: !ruby/object:Gem::Requirement
@@ -652,7 +672,7 @@ dependencies:
652
672
  - - ">="
653
673
  - !ruby/object:Gem::Version
654
674
  version: '0'
655
- description:
675
+ description:
656
676
  email:
657
677
  - administrator@curationexperts.com
658
678
  executables: []
@@ -666,7 +686,6 @@ files:
666
686
  - ".rubocop.yml"
667
687
  - ".rubocop_todo.yml"
668
688
  - ".solr_wrapper"
669
- - ".travis.yml"
670
689
  - CHANGELOG.md
671
690
  - Gemfile
672
691
  - README.md
@@ -676,6 +695,7 @@ files:
676
695
  - app/assets/javascripts/zizia/DisplayUploadedFile.es6
677
696
  - app/assets/javascripts/zizia/application.js
678
697
  - app/assets/javascripts/zizia/zizia.js
698
+ - app/assets/stylesheets/zizia/_button.scss
679
699
  - app/assets/stylesheets/zizia/_field_guide.scss
680
700
  - app/assets/stylesheets/zizia/_file_upload.scss
681
701
  - app/assets/stylesheets/zizia/_import_table.scss
@@ -980,6 +1000,7 @@ files:
980
1000
  - spec/dummy/db/migrate/20190918193046_rename_minter_state_random_to_rand.noid_rails_engine.rb
981
1001
  - spec/dummy/db/schema.rb
982
1002
  - spec/dummy/db/seeds.rb
1003
+ - spec/dummy/db/test.sqlite3
983
1004
  - spec/dummy/lib/assets/.keep
984
1005
  - spec/dummy/lib/tasks/.keep
985
1006
  - spec/dummy/log/.keep
@@ -1574,11 +1595,11 @@ files:
1574
1595
  - spec/zizia/version_spec.rb
1575
1596
  - spec/zizia_spec.rb
1576
1597
  - zizia.gemspec
1577
- homepage:
1598
+ homepage:
1578
1599
  licenses:
1579
1600
  - Apache-2.0
1580
1601
  metadata: {}
1581
- post_install_message:
1602
+ post_install_message:
1582
1603
  rdoc_options: []
1583
1604
  require_paths:
1584
1605
  - lib
@@ -1593,8 +1614,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
1593
1614
  - !ruby/object:Gem::Version
1594
1615
  version: '0'
1595
1616
  requirements: []
1596
- rubygems_version: 3.0.6
1597
- signing_key:
1617
+ rubygems_version: 3.1.2
1618
+ signing_key:
1598
1619
  specification_version: 4
1599
1620
  summary: Hyrax importers.
1600
1621
  test_files: []
data/.travis.yml DELETED
@@ -1,12 +0,0 @@
1
- language: ruby
2
- sudo: false
3
- cache: bundler
4
- dist: trusty
5
-
6
- rvm:
7
- - 2.3.8
8
- - 2.4.5
9
- - 2.5.3
10
- script:
11
- - RAILS_ENV='test' bundle exec rake db:migrate
12
- - bundle exec rake