hyrax 4.0.0.beta2 → 4.0.0.rc2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (141) hide show
  1. checksums.yaml +4 -4
  2. data/.circleci/config.yml +126 -53
  3. data/.dassie/Gemfile +1 -1
  4. data/.dassie/app/controllers/catalog_controller.rb +1 -1
  5. data/.dassie/config/initializers/hyrax.rb +4 -0
  6. data/.github/CONTRIBUTING.md +39 -27
  7. data/.github/SUPPORT.md +2 -3
  8. data/.github/workflows/main.yml +4 -4
  9. data/.github/workflows/release.yml +10 -4
  10. data/.koppie/Gemfile +1 -2
  11. data/.koppie/app/controllers/catalog_controller.rb +1 -1
  12. data/.koppie/config/authorities/licenses.yml +7 -7
  13. data/.koppie/config/initializers/file_services.rb +4 -0
  14. data/.koppie/db/schema.rb +2 -2
  15. data/.koppie/yarn.lock +1 -1
  16. data/.regen +1 -1
  17. data/CONTAINERS.md +5 -5
  18. data/CONTRIBUTING.md +2 -2
  19. data/Dockerfile +21 -9
  20. data/README.md +24 -97
  21. data/app/actors/hyrax/actors/create_with_files_actor.rb +1 -1
  22. data/app/assets/stylesheets/hyrax/_catalog.scss +4 -0
  23. data/app/assets/stylesheets/hyrax/_forms.scss +4 -0
  24. data/app/controllers/concerns/hyrax/controller.rb +3 -24
  25. data/app/controllers/concerns/hyrax/works_controller_behavior.rb +1 -0
  26. data/app/controllers/hyrax/admin/strategies_controller.rb +2 -2
  27. data/app/controllers/hyrax/dashboard/collections_controller.rb +1 -1
  28. data/app/controllers/hyrax/downloads_controller.rb +16 -1
  29. data/app/controllers/hyrax/file_sets_controller.rb +9 -2
  30. data/app/controllers/hyrax/my/works_controller.rb +3 -1
  31. data/app/controllers/hyrax/transfers_controller.rb +4 -1
  32. data/app/controllers/hyrax/workflow_actions_controller.rb +3 -2
  33. data/app/forms/hyrax/forms/administrative_set_form.rb +1 -1
  34. data/app/forms/hyrax/forms/file_set_edit_form.rb +1 -1
  35. data/app/forms/hyrax/forms/file_set_form.rb +8 -35
  36. data/app/forms/hyrax/forms/pcdm_collection_form.rb +2 -2
  37. data/app/forms/hyrax/forms/pcdm_object_form.rb +46 -0
  38. data/app/forms/hyrax/forms/permission.rb +2 -2
  39. data/app/forms/hyrax/forms/resource_form.rb +19 -44
  40. data/app/forms/hyrax/forms/work_embargo_form.rb +3 -3
  41. data/app/forms/hyrax/forms/work_lease_form.rb +3 -3
  42. data/app/helpers/hyrax/content_block_helper_behavior.rb +1 -1
  43. data/app/helpers/hyrax/hyrax_helper_behavior.rb +1 -1
  44. data/app/helpers/hyrax/iiif_helper.rb +1 -1
  45. data/app/indexers/hyrax/valkyrie_file_set_indexer.rb +1 -1
  46. data/app/jobs/characterize_job.rb +3 -2
  47. data/app/jobs/valkyrie_create_derivatives_job.rb +0 -2
  48. data/app/models/collection_branding_info.rb +7 -13
  49. data/app/models/concerns/hyrax/ability.rb +1 -1
  50. data/app/models/concerns/hyrax/collection_behavior.rb +0 -47
  51. data/app/models/concerns/hyrax/solr_document/metadata.rb +1 -0
  52. data/app/models/concerns/hyrax/suppressible.rb +0 -8
  53. data/app/models/file_download_stat.rb +4 -4
  54. data/app/models/hyrax/collection_type.rb +0 -16
  55. data/app/models/hyrax/file_metadata.rb +5 -12
  56. data/app/models/hyrax/file_set.rb +1 -9
  57. data/app/models/hyrax/permission_template.rb +1 -1
  58. data/app/models/hyrax/statistic.rb +4 -4
  59. data/app/models/sipity.rb +27 -6
  60. data/app/presenters/hyrax/collection_presenter.rb +1 -1
  61. data/app/presenters/hyrax/iiif_manifest_presenter.rb +15 -5
  62. data/app/presenters/hyrax/presenter_factory.rb +2 -2
  63. data/app/presenters/hyrax/work_show_presenter.rb +1 -1
  64. data/app/presenters/hyrax/workflow_presenter.rb +1 -1
  65. data/app/search_builders/hyrax/collection_search_builder.rb +1 -0
  66. data/app/search_builders/hyrax/filter_suppressed_with_roles.rb +1 -1
  67. data/app/services/hyrax/admin_set_service.rb +1 -1
  68. data/app/services/hyrax/collections/nested_collection_query_service.rb +2 -2
  69. data/app/services/hyrax/database_migrator.rb +1 -1
  70. data/app/services/hyrax/edit_permissions_service.rb +21 -3
  71. data/app/services/hyrax/restriction_service.rb +1 -1
  72. data/app/services/hyrax/solr_query_service.rb +10 -2
  73. data/app/services/hyrax/solr_service.rb +24 -18
  74. data/app/services/hyrax/thumbnail_path_service.rb +10 -2
  75. data/app/services/hyrax/valkyrie_persist_derivatives.rb +26 -15
  76. data/app/services/hyrax/valkyrie_upload.rb +23 -30
  77. data/app/services/hyrax/visibility_propagator.rb +5 -5
  78. data/app/services/hyrax/visibility_reader.rb +1 -1
  79. data/app/services/hyrax/visibility_writer.rb +1 -1
  80. data/app/services/hyrax/workflow/permission_query.rb +5 -5
  81. data/app/services/hyrax/workflow/status_list_service.rb +1 -1
  82. data/app/validators/hyrax/collection_membership_validator.rb +2 -2
  83. data/app/views/hyrax/base/_attribute_rows.html.erb +2 -0
  84. data/app/views/hyrax/dashboard/collections/_form_for_select_collection.html.erb +1 -1
  85. data/app/views/hyrax/file_sets/_permission.html.erb +1 -1
  86. data/app/views/hyrax/file_sets/edit.html.erb +1 -1
  87. data/app/views/hyrax/file_sets/media_display/_audio.html.erb +1 -1
  88. data/app/views/hyrax/file_sets/media_display/_default.html.erb +1 -1
  89. data/app/views/hyrax/file_sets/media_display/_image.html.erb +1 -1
  90. data/app/views/hyrax/file_sets/media_display/_office_document.html.erb +1 -1
  91. data/app/views/hyrax/file_sets/media_display/_pdf.html.erb +1 -1
  92. data/app/views/hyrax/file_sets/media_display/_video.html.erb +1 -1
  93. data/app/views/hyrax/uploads/_js_templates.html.erb +8 -8
  94. data/app/views/hyrax/uploads/_js_templates_branding.html.erb +2 -2
  95. data/app/views/hyrax/users/_vitals.html.erb +4 -4
  96. data/chart/hyrax/Chart.yaml +7 -7
  97. data/chart/hyrax/README.md +5 -0
  98. data/chart/hyrax/templates/_helpers.tpl +14 -6
  99. data/chart/hyrax/templates/cron-embargo.yaml +1 -1
  100. data/chart/hyrax/templates/cron-lease.yaml +1 -1
  101. data/chart/hyrax/templates/deployment-worker.yaml +2 -2
  102. data/chart/hyrax/templates/extra-list.yaml +8 -0
  103. data/chart/hyrax/templates/secrets.yaml +3 -3
  104. data/chart/hyrax/values.yaml +22 -15
  105. data/config/initializers/kaminari_engine_patch.rb +16 -0
  106. data/config/locales/hyrax.de.yml +7 -7
  107. data/config/locales/hyrax.es.yml +7 -7
  108. data/config/locales/hyrax.fr.yml +8 -8
  109. data/config/locales/hyrax.it.yml +7 -7
  110. data/config/locales/hyrax.pt-BR.yml +7 -7
  111. data/config/locales/hyrax.zh.yml +8 -8
  112. data/config/metadata/file_set_metadata.yaml +130 -0
  113. data/documentation/MAINTENANCE.md +77 -0
  114. data/documentation/developing-your-hyrax-based-app.md +2 -2
  115. data/documentation/legacyREADME.md +3 -3
  116. data/hyrax.gemspec +7 -10
  117. data/lib/generators/hyrax/templates/catalog_controller.rb +1 -1
  118. data/lib/hyrax/configuration.rb +16 -0
  119. data/lib/hyrax/controlled_vocabularies/resource_label_caching.rb +1 -1
  120. data/lib/hyrax/engine.rb +2 -1
  121. data/lib/hyrax/transactions/container.rb +0 -2
  122. data/lib/hyrax/transactions/steps/save_collection_banner.rb +1 -1
  123. data/lib/hyrax/transactions/steps/save_collection_logo.rb +1 -1
  124. data/lib/hyrax/transactions/transaction.rb +3 -2
  125. data/lib/hyrax/version.rb +1 -1
  126. data/lib/hyrax.rb +0 -1
  127. data/lib/valkyrie/indexing/solr/indexing_adapter.rb +1 -1
  128. data/lib/wings/active_fedora_converter/file_metadata_node.rb +1 -1
  129. data/lib/wings/valkyrie/storage.rb +4 -1
  130. data/samvera-fall-TM3.svg +376 -0
  131. data/template.rb +1 -1
  132. metadata +43 -85
  133. data/app/conversions/power_converters/polymorphic_type.rb +0 -9
  134. data/app/conversions/power_converters/sipity_action.rb +0 -11
  135. data/app/conversions/power_converters/sipity_action_name.rb +0 -10
  136. data/app/conversions/power_converters/sipity_agent.rb +0 -9
  137. data/app/conversions/power_converters/sipity_entity.rb +0 -14
  138. data/app/conversions/power_converters/sipity_role.rb +0 -10
  139. data/app/conversions/power_converters/sipity_workflow_id.rb +0 -17
  140. data/app/conversions/power_converters/sipity_workflow_state.rb +0 -13
  141. data/app/conversions/power_converters.rb +0 -7
data/samvera-fall-TM3.svg ADDED
@@ -0,0 +1,376 @@
1
+ <?xml version="1.0" encoding="UTF-8" standalone="no"?>
2
+ <svg
3
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
4
+ xmlns:cc="http://creativecommons.org/ns#"
5
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
6
+ xmlns:svg="http://www.w3.org/2000/svg"
7
+ xmlns="http://www.w3.org/2000/svg"
8
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
9
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
10
+ width="620.73871"
11
+ height="327.47778"
12
+ viewBox="0 0 620.73871 327.47778"
13
+ version="1.1"
14
+ xml:space="preserve"
15
+ style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41420996"
16
+ id="svg327"
17
+ sodipodi:docname="samvera-fall-TM.svg"
18
+ inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
19
+ id="metadata333"><rdf:RDF><cc:Work
20
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
21
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
22
+ id="defs331" /><sodipodi:namedview
23
+ pagecolor="#ffffff"
24
+ bordercolor="#666666"
25
+ borderopacity="1"
26
+ objecttolerance="10"
27
+ gridtolerance="10"
28
+ guidetolerance="10"
29
+ inkscape:pageopacity="0"
30
+ inkscape:pageshadow="2"
31
+ inkscape:window-width="2560"
32
+ inkscape:window-height="1537"
33
+ id="namedview329"
34
+ showgrid="false"
35
+ inkscape:zoom="2.5044876"
36
+ inkscape:cx="289.60635"
37
+ inkscape:cy="163.42875"
38
+ inkscape:window-x="2552"
39
+ inkscape:window-y="-8"
40
+ inkscape:window-maximized="1"
41
+ inkscape:current-layer="svg327" /><g
42
+ id="Layer42"
43
+ transform="matrix(-0.791026,-0.151321,-0.151321,0.791026,730.56235,-46.490974)"><g
44
+ id="Layer41"
45
+ transform="matrix(1.60474,0,0,1.55397,-282.85,-132.238)"><g
46
+ transform="matrix(1.00133,0,0,1.03404,-16.2338,-22.9733)"
47
+ id="g142"><circle
48
+ cx="642.07898"
49
+ cy="400.33301"
50
+ r="17.117001"
51
+ style="fill:#f6b000"
52
+ id="circle140" /></g><g
53
+ transform="matrix(1.00133,0,0,1.03404,-86.5545,-97.8082)"
54
+ id="g146"><circle
55
+ cx="642.07898"
56
+ cy="400.33301"
57
+ r="17.117001"
58
+ style="fill:#c4021b"
59
+ id="circle144" /></g><g
60
+ transform="matrix(1.00133,0,0,1.03404,-97.8963,-38.8418)"
61
+ id="g150"><circle
62
+ cx="642.07898"
63
+ cy="400.33301"
64
+ r="17.117001"
65
+ style="fill:#f6b000"
66
+ id="circle148" /></g><g
67
+ transform="matrix(1.00133,0,0,1.03404,-147.267,-87.9063)"
68
+ id="g154"><circle
69
+ cx="642.07898"
70
+ cy="400.33301"
71
+ r="17.117001"
72
+ style="fill:#f6b000"
73
+ id="circle152" /></g><g
74
+ transform="matrix(1.00133,0,0,1.03404,-128.639,-175.504)"
75
+ id="g158"><circle
76
+ cx="642.07898"
77
+ cy="400.33301"
78
+ r="17.117001"
79
+ style="fill:#f6b000"
80
+ id="circle156" /></g><g
81
+ transform="matrix(1.00133,0,0,1.03404,-52.261,-127.758)"
82
+ id="g162"><circle
83
+ cx="642.07898"
84
+ cy="400.33301"
85
+ r="17.117001"
86
+ style="fill:#c4021b"
87
+ id="circle160" /></g><g
88
+ transform="matrix(1.00133,0,0,1.03404,50.5784,-136.932)"
89
+ id="g166"><circle
90
+ cx="642.07898"
91
+ cy="400.33301"
92
+ r="17.117001"
93
+ style="fill:#f6b000"
94
+ id="circle164" /></g><g
95
+ transform="matrix(1.00133,0,0,1.03404,42.5741,-65.3023)"
96
+ id="g170"><circle
97
+ cx="642.07898"
98
+ cy="400.33301"
99
+ r="17.117001"
100
+ style="fill:#f6b000"
101
+ id="circle168" /></g><g
102
+ transform="matrix(1.00133,0,0,1.03404,-118.169,-131.016)"
103
+ id="g174"><circle
104
+ cx="642.07898"
105
+ cy="400.33301"
106
+ r="17.117001"
107
+ style="fill:#f65c00"
108
+ id="circle172" /></g><g
109
+ transform="matrix(1.00133,0,0,1.03404,-6.49085,-179.45)"
110
+ id="g178"><circle
111
+ cx="642.07898"
112
+ cy="400.33301"
113
+ r="17.117001"
114
+ style="fill:#f6b000"
115
+ id="circle176" /></g><g
116
+ transform="matrix(1.00133,0,0,1.03404,-8.41462,-131.593)"
117
+ id="g182"><circle
118
+ cx="642.07898"
119
+ cy="400.33301"
120
+ r="17.117001"
121
+ style="fill:#f65c00"
122
+ id="circle180" /></g><g
123
+ transform="matrix(1.00133,0,0,1.03404,4.06413,-87.6588)"
124
+ id="g186"><circle
125
+ cx="642.07898"
126
+ cy="400.33301"
127
+ r="17.117001"
128
+ style="fill:#c4021b"
129
+ id="circle184" /></g><g
130
+ transform="matrix(1.00133,0,0,1.03404,-72.2885,-195.112)"
131
+ id="g190"><circle
132
+ cx="642.07898"
133
+ cy="400.33301"
134
+ r="17.117001"
135
+ style="fill:#f6b000"
136
+ id="circle188" /></g></g><g
137
+ id="Layer411"
138
+ transform="matrix(0.701898,0,0,0.69442,518.169,112.212)"><g
139
+ transform="translate(-470.946,-183.095)"
140
+ id="g195"><circle
141
+ cx="642.07898"
142
+ cy="400.33301"
143
+ r="17.117001"
144
+ style="fill:#f65c00"
145
+ id="circle193" /></g><g
146
+ transform="translate(-268.831,-171.133)"
147
+ id="g199"><circle
148
+ cx="642.07898"
149
+ cy="400.33301"
150
+ r="17.117001"
151
+ style="fill:#f6b000"
152
+ id="circle197" /></g><g
153
+ transform="translate(-589.093,28.4556)"
154
+ id="g203"><circle
155
+ cx="642.07898"
156
+ cy="400.33301"
157
+ r="17.117001"
158
+ style="fill:#f65c00"
159
+ id="circle201" /></g><g
160
+ transform="matrix(0.986314,0,0,0.986314,-645.189,-97.2815)"
161
+ id="g207"><circle
162
+ cx="642.07898"
163
+ cy="400.33301"
164
+ r="17.117001"
165
+ style="fill:#f6b000"
166
+ id="circle205" /></g><g
167
+ transform="matrix(0.986314,0,0,0.986314,-219.553,-40.1585)"
168
+ id="g211"><circle
169
+ cx="642.07898"
170
+ cy="400.33301"
171
+ r="17.117001"
172
+ style="fill:#f65c00"
173
+ id="circle209" /></g><g
174
+ transform="matrix(0.986314,0,0,0.986314,-368.704,-44.7953)"
175
+ id="g215"><circle
176
+ cx="642.07898"
177
+ cy="400.33301"
178
+ r="17.117001"
179
+ style="fill:#c4021b"
180
+ id="circle213" /></g><g
181
+ transform="translate(-277.902,109.44)"
182
+ id="g219"><circle
183
+ cx="642.07898"
184
+ cy="400.33301"
185
+ r="17.117001"
186
+ style="fill:#f65c00"
187
+ id="circle217" /></g><g
188
+ transform="translate(-176.05,-64.6805)"
189
+ id="g223"><circle
190
+ cx="642.07898"
191
+ cy="400.33301"
192
+ r="17.117001"
193
+ style="fill:#f6b000"
194
+ id="circle221" /></g><g
195
+ transform="translate(-359.693,22.2324)"
196
+ id="g227"><circle
197
+ cx="642.07898"
198
+ cy="400.33301"
199
+ r="17.117001"
200
+ style="fill:#c4021b"
201
+ id="circle225" /></g><g
202
+ transform="translate(-578.161,-33.7379)"
203
+ id="g231"><circle
204
+ cx="642.07898"
205
+ cy="400.33301"
206
+ r="17.117001"
207
+ style="fill:#c4021b"
208
+ id="circle229" /></g><g
209
+ transform="translate(-262.217,-92.8527)"
210
+ id="g235"><circle
211
+ cx="642.07898"
212
+ cy="400.33301"
213
+ r="17.117001"
214
+ style="fill:#f65c00"
215
+ id="circle233" /></g><g
216
+ transform="translate(-235.443,93.2302)"
217
+ id="g239"><circle
218
+ cx="642.07898"
219
+ cy="400.33301"
220
+ r="17.117001"
221
+ style="fill:#f6b000"
222
+ id="circle237" /></g><g
223
+ transform="translate(-464.039,18.1038)"
224
+ id="g243"><circle
225
+ cx="642.07898"
226
+ cy="400.33301"
227
+ r="17.117001"
228
+ style="fill:#c4021b"
229
+ id="circle241" /></g><g
230
+ transform="translate(-506.262,-128.978)"
231
+ id="g247"><circle
232
+ cx="642.07898"
233
+ cy="400.33301"
234
+ r="17.117001"
235
+ style="fill:#f65c00"
236
+ id="circle245" /></g><g
237
+ transform="translate(-530.781,-198.082)"
238
+ id="g251"><circle
239
+ cx="642.07898"
240
+ cy="400.33301"
241
+ r="17.117001"
242
+ style="fill:#f6b000"
243
+ id="circle249" /></g><g
244
+ transform="translate(-401.277,-236.544)"
245
+ id="g255"><circle
246
+ cx="642.07898"
247
+ cy="400.33301"
248
+ r="17.117001"
249
+ style="fill:#f6b000"
250
+ id="circle253" /></g><g
251
+ transform="translate(-392.044,-180.933)"
252
+ id="g259"><circle
253
+ cx="642.07898"
254
+ cy="400.33301"
255
+ r="17.117001"
256
+ style="fill:#f65c00"
257
+ id="circle257" /></g></g></g><g
258
+ transform="matrix(-2.2885,-0.252923,-0.206243,1.81962,3318.4164,-1876.081)"
259
+ id="g306"><g
260
+ id="Layer19"><g
261
+ id="g303"><g
262
+ id="Layer27"><path
263
+ d="m 1276.86,1299.48 c 0,0 15.99,16.59 -6.66,38.88 -5.37,5.29 -13.34,17.44 -12.96,21.89 -1.57,-3.01 4.11,-18.08 12.13,-28.16 5.1,-8.81 11.2,-10.42 7.49,-32.61 z"
264
+ style="fill:#8f2704"
265
+ id="path263"
266
+ inkscape:connector-curvature="0" /></g><g
267
+ id="Layer34"><path
268
+ d="m 1250.57,1363.19 c 0,0 2.81,13.48 14.22,20.2 -8.4,0.54 -17.14,-9.13 -14.22,-20.2 z"
269
+ style="fill:#8f2704"
270
+ id="path266"
271
+ inkscape:connector-curvature="0" /></g><g
272
+ transform="translate(-1.88249,-0.0421075)"
273
+ id="g272"><g
274
+ id="Layer28"><path
275
+ d="m 1271.42,1340.89 c 0,0 -25.07,29.64 16.64,48.92 0.47,0.22 -12.7,-3.98 -16.98,-5.18 -8.75,-9.16 -19.19,-23.41 0.34,-43.74 z"
276
+ style="fill:#8f2704"
277
+ id="path269"
278
+ inkscape:connector-curvature="0" /></g></g><g
279
+ id="Layer30"
280
+ transform="translate(1)"><path
281
+ d="m 1264.04,1326.53 c 0,0 1.54,-1.45 2.83,-2.73 -2.08,-1.7 -9.35,-7.98 -13.64,-19.83 0.67,7.91 6.43,20.28 10.81,22.56 z"
282
+ style="fill:#8f2704"
283
+ id="path274"
284
+ inkscape:connector-curvature="0" /></g><g
285
+ id="Layer31"
286
+ transform="translate(1)"><path
287
+ d="m 1253.95,1311.01 c -2.5,-0.43 -14.63,-5.32 -19.16,-10.28 5.59,7.81 15.87,11.8 20.41,13.68 0,0 -1.02,-2.19 -1.25,-3.4 z"
288
+ style="fill:#8f2704"
289
+ id="path277"
290
+ inkscape:connector-curvature="0" /></g><g
291
+ id="Layer32"
292
+ transform="translate(1)"><path
293
+ d="m 1270.44,1319.54 c 0,0 16.13,-27.22 -9.59,-27.07 19.96,3.58 9.59,27.07 9.59,27.07 z"
294
+ style="fill:#8f2704"
295
+ id="path280"
296
+ inkscape:connector-curvature="0" /></g><g
297
+ id="Layer33"><path
298
+ d="m 1282.45,1319.3 c 0,0 15.54,-10.87 26.75,-3.18 -8.44,-10.01 -25.95,-1.63 -26.08,-0.65 -0.14,0.98 0.08,1.7 -0.67,3.83 z"
299
+ style="fill:#8f2704"
300
+ id="path283"
301
+ inkscape:connector-curvature="0" /></g><g
302
+ id="Layer35"
303
+ transform="translate(0.192781,-0.188305)"><path
304
+ d="m 1250.23,1375.1 c 0,0 2.1,5.41 6.97,7.48 -8.48,-0.77 -17.41,-0.92 -22.28,-0.06 5.25,-1.9 9.92,-0.18 15.31,-7.42 z"
305
+ style="fill:#8f2704"
306
+ id="path286"
307
+ inkscape:connector-curvature="0" /></g><g
308
+ transform="translate(-4.51035,-0.473289)"
309
+ id="g292"><g
310
+ id="Layer36"><path
311
+ d="m 1299.86,1311.42 c 0,0 2.29,-0.48 3.86,-0.07 -0.06,-1.01 5.51,-3.98 9.67,-4.36 -4.33,-0.18 -12.46,3.38 -13.53,4.43 z"
312
+ style="fill:#8f2704"
313
+ id="path289"
314
+ inkscape:connector-curvature="0" /></g></g><g
315
+ id="Layer37"
316
+ transform="matrix(0.349764,0,0,0.393399,1036.79,1145.01)"><path
317
+ d="m 686.33,419.951 c 0,0 1.344,15.93 -30.538,42.807 -22.186,24.37 -29.968,36.971 -34.516,48.83 -9.445,24.629 -10.636,64.698 32.123,93.292 1.718,1.149 4.381,2.711 6.216,3.483 -48.115,-52.018 -30.508,-80.243 -20.834,-100.82 12.481,-27.647 51.664,-60.294 47.549,-87.592 z"
318
+ style="fill:#8f2704"
319
+ id="path294"
320
+ inkscape:connector-curvature="0" /></g><g
321
+ id="Layer38"
322
+ transform="matrix(0.349764,0,0,0.393399,1036.79,1145.01)"><path
323
+ d="m 666.94,588.585 c 0,0 -37.086,-21.742 -10.561,-72.329 -15.002,45.1 10.195,71.987 10.561,72.329 z"
324
+ style="fill:#8f2704"
325
+ id="path297"
326
+ inkscape:connector-curvature="0" /></g><g
327
+ id="Layer39"
328
+ transform="matrix(0.349764,0,0,0.393399,1036.79,1145.01)"><path
329
+ d="m 673.547,375.773 4.085,4.083 c 0,0 8.464,-20.823 5.041,-40.338 -0.814,20.73 -9.126,36.255 -9.126,36.255 z"
330
+ style="fill:#8f2704"
331
+ id="path300"
332
+ inkscape:connector-curvature="0" /></g></g></g></g><g
333
+ transform="translate(-1584.6336,-321.97997)"
334
+ id="g325"><g
335
+ id="Layer47"><g
336
+ id="g322"><path
337
+ d="m 1829.49,592.337 c 3.03,0.967 4.55,2.25 4.55,3.85 0,1.133 -0.45,2.583 -1.35,4.35 -0.9,1.767 -1.75,2.65 -2.55,2.65 -0.2,0 -1.13,-0.383 -2.8,-1.15 -1.67,-0.767 -3.67,-1.15 -6,-1.15 -2,0 -3.6,0.383 -4.8,1.15 -1.2,0.767 -1.8,1.883 -1.8,3.35 0,1.4 0.42,2.567 1.25,3.5 0.83,0.933 1.82,1.667 2.95,2.2 1.13,0.533 3.07,1.367 5.8,2.5 3.93,1.467 6.82,3.283 8.65,5.45 1.83,2.167 2.75,5.25 2.75,9.25 0,4.867 -1.72,8.833 -5.15,11.9 -3.43,3.067 -8.02,4.6 -13.75,4.6 -2.67,0 -5.27,-0.3 -7.8,-0.9 -2.53,-0.6 -4.6,-1.417 -6.2,-2.45 -1.6,-1.033 -2.4,-2.117 -2.4,-3.25 0,-1.067 0.57,-2.45 1.7,-4.15 1.13,-1.7 2.13,-2.55 3,-2.55 0.27,0 1,0.317 2.2,0.95 1.2,0.633 2.48,1.167 3.85,1.6 1.37,0.433 2.92,0.65 4.65,0.65 4.87,0 7.3,-1.867 7.3,-5.6 0,-1.8 -0.7,-3.2 -2.1,-4.2 -1.4,-1 -3.73,-2.1 -7,-3.3 -4,-1.267 -7.07,-3.033 -9.2,-5.3 -2.13,-2.267 -3.2,-5.5 -3.2,-9.7 0,-4.8 1.62,-8.617 4.85,-11.45 3.23,-2.833 7.52,-4.25 12.85,-4.25 3.47,0 6.72,0.483 9.75,1.45 z"
338
+ style="fill:#8f2704;fill-rule:nonzero"
339
+ id="path308"
340
+ inkscape:connector-curvature="0" /><path
341
+ d="m 1881.09,595.287 c 3.43,2.867 5.15,6.867 5.15,12 v 20.1 c 0,4.6 0.2,7.933 0.6,10 0.4,2.067 0.6,3.333 0.6,3.8 0,0.933 -1.1,1.65 -3.3,2.15 -2.2,0.5 -4.13,0.75 -5.8,0.75 -1.07,0 -1.83,-0.483 -2.3,-1.45 -0.47,-0.967 -0.82,-2.017 -1.05,-3.15 -0.23,-1.133 -0.38,-1.9 -0.45,-2.3 -1.53,1.867 -3.57,3.583 -6.1,5.15 -2.53,1.567 -5.67,2.35 -9.4,2.35 -5.07,0 -8.93,-1.317 -11.6,-3.95 -2.67,-2.633 -4,-6.217 -4,-10.75 0,-12.267 10.1,-18.433 30.3,-18.5 v -3.8 c 0,-4.467 -3,-6.7 -9,-6.7 -2.47,0 -4.65,0.283 -6.55,0.85 -1.9,0.567 -3.53,1.167 -4.9,1.8 -1.37,0.633 -2.15,0.95 -2.35,0.95 -0.87,0 -1.85,-0.917 -2.95,-2.75 -1.1,-1.833 -1.65,-3.217 -1.65,-4.15 0,-1.067 0.85,-2.117 2.55,-3.15 1.7,-1.033 4.02,-1.883 6.95,-2.55 2.93,-0.667 6.1,-1 9.5,-1 7.07,0 12.32,1.433 15.75,4.3 z m -20.35,26.95 c -3.13,1.233 -4.7,3.417 -4.7,6.55 0,1.8 0.53,3.217 1.6,4.25 1.07,1.033 2.63,1.55 4.7,1.55 2.33,0 4.48,-0.6 6.45,-1.8 1.97,-1.2 3.62,-2.767 4.95,-4.7 v -7.8 c -5.53,0.067 -9.87,0.717 -13,1.95 z"
342
+ style="fill:#8f2704;fill-rule:nonzero"
343
+ id="path310"
344
+ inkscape:connector-curvature="0" /><path
345
+ d="m 1971.34,607.187 v 34.2 c 0,1.867 -1.77,2.8 -5.3,2.8 h -1.9 c -3.53,0 -5.3,-0.933 -5.3,-2.8 v -32.5 c 0,-5 -2.4,-7.5 -7.2,-7.5 -2.2,0 -4.08,0.65 -5.65,1.95 -1.57,1.3 -2.85,2.75 -3.85,4.35 v 33.7 c 0,1.867 -1.77,2.8 -5.3,2.8 h -1.9 c -3.53,0 -5.3,-0.933 -5.3,-2.8 v -32.5 c 0,-5 -2.4,-7.5 -7.2,-7.5 -2.27,0 -4.25,0.7 -5.95,2.1 -1.7,1.4 -2.88,2.767 -3.55,4.1 v 33.8 c 0,1.867 -1.77,2.8 -5.3,2.8 h -1.9 c -3.53,0 -5.3,-0.933 -5.3,-2.8 v -33 c 0,-4.467 -0.2,-7.717 -0.6,-9.75 -0.4,-2.033 -0.6,-3.283 -0.6,-3.75 0,-0.933 1.1,-1.65 3.3,-2.15 2.2,-0.5 4.13,-0.75 5.8,-0.75 1.07,0 1.83,0.467 2.3,1.4 0.47,0.933 0.82,1.917 1.05,2.95 0.23,1.033 0.38,1.75 0.45,2.15 1.73,-2.133 3.92,-3.917 6.55,-5.35 2.63,-1.433 5.45,-2.15 8.45,-2.15 7,0 11.53,2.6 13.6,7.8 1.8,-2.2 4.08,-4.05 6.85,-5.55 2.77,-1.5 5.68,-2.25 8.75,-2.25 10,0 15,5.4 15,16.2 z"
346
+ style="fill:#8f2704;fill-rule:nonzero"
347
+ id="path312"
348
+ inkscape:connector-curvature="0" /><path
349
+ d="m 2025.44,593.487 c 0,0.4 -0.1,0.967 -0.3,1.7 l -16,47.1 c -0.47,1.267 -2.13,1.9 -5,1.9 h -3.3 c -2.93,0 -4.63,-0.633 -5.1,-1.9 l -15.9,-47.2 c -0.27,-0.667 -0.4,-1.2 -0.4,-1.6 0,-1.333 1.83,-2 5.5,-2 h 2.2 c 2.93,0 4.63,0.633 5.1,1.9 l 7.4,23.4 2.2,8.6 0.9,3.6 h 0.4 c 1,-5.133 1.93,-9.167 2.8,-12.1 l 7.5,-23.5 c 0.47,-1.267 2.17,-1.9 5.1,-1.9 h 1.7 c 3.47,0 5.2,0.667 5.2,2 z"
350
+ style="fill:#8f2704;fill-rule:nonzero"
351
+ id="path314"
352
+ inkscape:connector-curvature="0" /><path
353
+ d="m 2071.34,597.987 c 3.47,4.667 5.2,10.967 5.2,18.9 0,0.733 -0.57,1.783 -1.7,3.15 -1.13,1.367 -2.03,2.05 -2.7,2.05 h -27.7 c 0.33,4.467 1.57,7.683 3.7,9.65 2.13,1.967 5.2,2.95 9.2,2.95 2.2,0 4.15,-0.267 5.85,-0.8 1.7,-0.533 3.45,-1.2 5.25,-2 1.07,-0.467 1.7,-0.7 1.9,-0.7 0.87,0 1.85,0.867 2.95,2.6 1.1,1.733 1.65,3.067 1.65,4 0,1.267 -0.97,2.433 -2.9,3.5 -1.93,1.067 -4.32,1.9 -7.15,2.5 -2.83,0.6 -5.48,0.9 -7.95,0.9 -8.6,0 -15,-2.267 -19.2,-6.8 -4.2,-4.533 -6.3,-11.1 -6.3,-19.7 0,-9.2 2.08,-16.033 6.25,-20.5 4.17,-4.467 10.05,-6.7 17.65,-6.7 7.2,0 12.53,2.333 16,7 z m -26.9,15.2 h 19.7 c 0,-3.867 -0.73,-6.867 -2.2,-9 -1.47,-2.133 -3.7,-3.2 -6.7,-3.2 -6.27,0 -9.87,4.067 -10.8,12.2 z"
354
+ style="fill:#8f2704;fill-rule:nonzero"
355
+ id="path316"
356
+ inkscape:connector-curvature="0" /><path
357
+ d="m 2115.09,592.437 c 0.9,0.967 1.35,2.083 1.35,3.35 0,1.267 -0.27,2.8 -0.8,4.6 -0.53,1.8 -1.17,2.7 -1.9,2.7 -0.33,0 -1,-0.15 -2,-0.45 -1,-0.3 -2,-0.45 -3,-0.45 -1.93,0 -3.62,0.6 -5.05,1.8 -1.43,1.2 -2.55,2.4 -3.35,3.6 v 33.8 c 0,1.867 -1.77,2.8 -5.3,2.8 h -1.9 c -3.53,0 -5.3,-0.933 -5.3,-2.8 v -33 c 0,-4.467 -0.2,-7.717 -0.6,-9.75 -0.4,-2.033 -0.6,-3.283 -0.6,-3.75 0,-0.933 1.1,-1.65 3.3,-2.15 2.2,-0.5 4.13,-0.75 5.8,-0.75 1.07,0 1.83,0.467 2.3,1.4 0.47,0.933 0.82,1.917 1.05,2.95 0.23,1.033 0.38,1.75 0.45,2.15 1.47,-2.333 3.1,-4.167 4.9,-5.5 1.8,-1.333 3.9,-2 6.3,-2 2,0 3.45,0.483 4.35,1.45 z"
358
+ style="fill:#8f2704;fill-rule:nonzero"
359
+ id="path318"
360
+ inkscape:connector-curvature="0" /><path
361
+ d="m 2159.39,595.287 c 3.43,2.867 5.15,6.867 5.15,12 v 20.1 c 0,4.6 0.2,7.933 0.6,10 0.4,2.067 0.6,3.333 0.6,3.8 0,0.933 -1.1,1.65 -3.3,2.15 -2.2,0.5 -4.13,0.75 -5.8,0.75 -1.07,0 -1.83,-0.483 -2.3,-1.45 -0.47,-0.967 -0.82,-2.017 -1.05,-3.15 -0.23,-1.133 -0.38,-1.9 -0.45,-2.3 -1.53,1.867 -3.57,3.583 -6.1,5.15 -2.53,1.567 -5.67,2.35 -9.4,2.35 -5.07,0 -8.93,-1.317 -11.6,-3.95 -2.67,-2.633 -4,-6.217 -4,-10.75 0,-12.267 10.1,-18.433 30.3,-18.5 v -3.8 c 0,-4.467 -3,-6.7 -9,-6.7 -2.47,0 -4.65,0.283 -6.55,0.85 -1.9,0.567 -3.53,1.167 -4.9,1.8 -1.37,0.633 -2.15,0.95 -2.35,0.95 -0.87,0 -1.85,-0.917 -2.95,-2.75 -1.1,-1.833 -1.65,-3.217 -1.65,-4.15 0,-1.067 0.85,-2.117 2.55,-3.15 1.7,-1.033 4.02,-1.883 6.95,-2.55 2.93,-0.667 6.1,-1 9.5,-1 7.07,0 12.32,1.433 15.75,4.3 z m -20.35,26.95 c -3.13,1.233 -4.7,3.417 -4.7,6.55 0,1.8 0.53,3.217 1.6,4.25 1.07,1.033 2.63,1.55 4.7,1.55 2.33,0 4.48,-0.6 6.45,-1.8 1.97,-1.2 3.62,-2.767 4.95,-4.7 v -7.8 c -5.53,0.067 -9.87,0.717 -13,1.95 z"
362
+ style="fill:#8f2704;fill-rule:nonzero"
363
+ id="path320"
364
+ inkscape:connector-curvature="0" /></g></g></g><g
365
+ aria-label="TM"
366
+ style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:40px;line-height:1.25;font-family:Asap;-inkscape-font-specification:'Asap, Medium';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#8f2704;fill-opacity:1;stroke:none"
367
+ id="text337"
368
+ transform="translate(-2.893649,-0.95097374)"><path
369
+ d="m 602.14358,270.60644 h -12.58667 c -0.48,0 -0.69333,0.34666 -0.69333,1.14666 v 0.66667 c 0,0.8 0.21333,1.14667 0.69333,1.14667 h 4.56 v 15.01333 c 0,0.48 0.42667,0.74667 1.41334,0.74667 h 0.66666 c 0.98667,0 1.41334,-0.26667 1.41334,-0.74667 v -15.01333 h 4.53333 c 0.48,0 0.69333,-0.34667 0.69333,-1.14667 v -0.66667 c 0,-0.8 -0.21333,-1.14666 -0.69333,-1.14666 z"
370
+ style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:26.66666603px;font-family:Asap;-inkscape-font-specification:'Asap, Medium';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#8f2704;fill-opacity:1"
371
+ id="path339"
372
+ inkscape:connector-curvature="0" /><path
373
+ d="m 622.21899,270.5531 h -1.2 c -0.72,0 -1.22666,0.18667 -1.46666,0.64 l -4.72,8.26667 -0.4,0.82667 -0.37334,-0.85334 -4.69333,-8.24 c -0.24,-0.45333 -0.74666,-0.64 -1.46666,-0.64 h -1.25334 c -0.98666,0 -1.41333,0.26667 -1.41333,0.74667 v 17.28 c 0,0.48 0.42667,0.74667 1.41333,0.74667 h 0.56 c 0.98667,0 1.38667,-0.26667 1.38667,-0.74667 v -12.32 l 0.10667,0.0267 4.39999,7.81333 c 0.21334,0.29333 0.48,0.45333 0.90667,0.45333 h 0.88 c 0.42667,0 0.69333,-0.16 0.88,-0.45333 l 4.4,-7.76 h 0.08 v 12.24 c 0,0.48 0.42667,0.74667 1.41333,0.74667 h 0.56 c 0.98667,0 1.41334,-0.26667 1.41334,-0.74667 v -17.28 c 0,-0.48 -0.42667,-0.74667 -1.41334,-0.74667 z"
374
+ style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:26.66666603px;font-family:Asap;-inkscape-font-specification:'Asap, Medium';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#8f2704;fill-opacity:1"
375
+ id="path341"
376
+ inkscape:connector-curvature="0" /></g></svg>
data/template.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
  # Hack for https://github.com/rails/rails/issues/35153
3
3
  gsub_file 'Gemfile', /^gem ["']sqlite3["']$/, 'gem "sqlite3", "~> 1.3.0"'
4
- gem 'hyrax', '4.0.0.beta2'
4
+ gem 'hyrax', '4.0.0.rc2'
5
5
  run 'bundle install'
6
6
  generate 'hyrax:install', '-f'