hydra-works 2.0.0 → 2.1.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.circleci/config.yml +117 -22
- data/.rubocop.yml +1 -1
- data/README.md +14 -11
- data/hydra-works.gemspec +5 -4
- data/lib/hydra/works/version.rb +1 -1
- data/spec/hydra/works/services/persist_derivatives_spec.rb +7 -2
- metadata +19 -18
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 299915df094f99166ceb8580278c609aae957c1b2730e43fa59ef8f04dab6a44
|
|
4
|
+
data.tar.gz: e02e90ef61fb828758714a41fccfb3c80d4e78a1820492fe1475a7d70f472e21
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 8339edf5dc4ff96f1ec1bec49af72b624b87be9d93786522b991d49305269f08ee750ba1ceee12758a0e6c21f379941c36a91336ab6e9d3b086945c4f8d189ac
|
|
7
|
+
data.tar.gz: ba1ddb8186a4d86186fa322052327bebf2ef80f7d212b90adc802b41e23d994f698eada5676c68a89ca0345390a3ffbbce9bd526316d5759b69f4340d169ab0c
|
data/.circleci/config.yml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
version: 2.1
|
|
3
3
|
orbs:
|
|
4
|
-
samvera: samvera/circleci-orb@0
|
|
4
|
+
samvera: samvera/circleci-orb@1.0
|
|
5
5
|
jobs:
|
|
6
6
|
test:
|
|
7
7
|
parameters:
|
|
@@ -9,51 +9,146 @@ jobs:
|
|
|
9
9
|
type: string
|
|
10
10
|
bundler_version:
|
|
11
11
|
type: string
|
|
12
|
-
default:
|
|
12
|
+
default: 2.3.10
|
|
13
13
|
rails_version:
|
|
14
14
|
type: string
|
|
15
15
|
environment:
|
|
16
16
|
RAILS_VERSION: << parameters.rails_version >>
|
|
17
17
|
NOKOGIRI_USE_SYSTEM_LIBRARIES: true
|
|
18
18
|
executor:
|
|
19
|
-
name: 'samvera/
|
|
19
|
+
name: 'samvera/ruby_fcrepo_solr_redis_postgres'
|
|
20
20
|
ruby_version: << parameters.ruby_version >>
|
|
21
21
|
steps:
|
|
22
|
-
- run: 'sudo apt-get update
|
|
22
|
+
- run: 'sudo apt-get update'
|
|
23
|
+
- run: 'sudo apt-get install -y clamav libsqlite3-dev'
|
|
23
24
|
- run: 'sudo freshclam'
|
|
25
|
+
|
|
24
26
|
- samvera/cached_checkout
|
|
27
|
+
|
|
25
28
|
- samvera/bundle_for_gem:
|
|
26
29
|
ruby_version: << parameters.ruby_version >>
|
|
27
30
|
bundler_version: << parameters.bundler_version >>
|
|
28
31
|
project: hydra-works
|
|
29
|
-
|
|
32
|
+
|
|
33
|
+
- samvera/install_solr_core
|
|
34
|
+
|
|
30
35
|
- samvera/parallel_rspec
|
|
31
36
|
|
|
32
37
|
workflows:
|
|
33
38
|
version: 2
|
|
34
39
|
ci:
|
|
35
40
|
jobs:
|
|
41
|
+
# Rails 7.0
|
|
36
42
|
- test:
|
|
37
|
-
name:
|
|
38
|
-
ruby_version: 2.
|
|
39
|
-
rails_version:
|
|
43
|
+
name: ruby3-2_rails7-0
|
|
44
|
+
ruby_version: 3.2.0
|
|
45
|
+
rails_version: 7.0.4.1
|
|
46
|
+
- test:
|
|
47
|
+
name: ruby3-1_rails7-0
|
|
48
|
+
ruby_version: 3.1.3
|
|
49
|
+
rails_version: 7.0.4.1
|
|
50
|
+
- test:
|
|
51
|
+
name: ruby3-0_rails7-0
|
|
52
|
+
ruby_version: 3.0.5
|
|
53
|
+
rails_version: 7.0.4.1
|
|
54
|
+
# Rails 6.1
|
|
40
55
|
- test:
|
|
41
|
-
name:
|
|
42
|
-
ruby_version: 2.
|
|
43
|
-
rails_version: 6.
|
|
56
|
+
name: ruby3-2_rails6-1
|
|
57
|
+
ruby_version: 3.2.0
|
|
58
|
+
rails_version: 6.1.7.1
|
|
44
59
|
- test:
|
|
45
|
-
name:
|
|
46
|
-
ruby_version:
|
|
47
|
-
rails_version: 6.
|
|
60
|
+
name: ruby3-1_rails6-1
|
|
61
|
+
ruby_version: 3.1.3
|
|
62
|
+
rails_version: 6.1.7.1
|
|
63
|
+
- test:
|
|
64
|
+
name: ruby3-0_rails6-1
|
|
65
|
+
ruby_version: 3.0.5
|
|
66
|
+
rails_version: 6.1.7.1
|
|
67
|
+
- test:
|
|
68
|
+
name: ruby2-7_rails6-1
|
|
69
|
+
ruby_version: 2.7.7
|
|
70
|
+
rails_version: 6.1.7.1
|
|
71
|
+
# Rails 6.0
|
|
72
|
+
- test:
|
|
73
|
+
name: ruby3-2_rails6-0
|
|
74
|
+
ruby_version: 3.2.0
|
|
75
|
+
rails_version: 6.0.6.1
|
|
76
|
+
- test:
|
|
77
|
+
name: ruby3-1_rails6-0
|
|
78
|
+
ruby_version: 3.1.3
|
|
79
|
+
rails_version: 6.0.6.1
|
|
80
|
+
- test:
|
|
81
|
+
name: ruby3-0_rails6-0
|
|
82
|
+
ruby_version: 3.0.5
|
|
83
|
+
rails_version: 6.0.6.1
|
|
84
|
+
- test:
|
|
85
|
+
name: ruby2-7_rails6-0
|
|
86
|
+
ruby_version: 2.7.7
|
|
87
|
+
rails_version: 6.0.6.1
|
|
88
|
+
# Rails 5.2
|
|
48
89
|
- test:
|
|
49
90
|
name: ruby2-7_rails5-2
|
|
50
|
-
ruby_version: 2.7.
|
|
51
|
-
rails_version: 5.2.
|
|
91
|
+
ruby_version: 2.7.7
|
|
92
|
+
rails_version: 5.2.8.1
|
|
93
|
+
|
|
94
|
+
nightly:
|
|
95
|
+
triggers:
|
|
96
|
+
- schedule:
|
|
97
|
+
cron: "0 0 * * *"
|
|
98
|
+
filters:
|
|
99
|
+
branches:
|
|
100
|
+
only:
|
|
101
|
+
- main
|
|
102
|
+
jobs:
|
|
103
|
+
# Rails 7.0
|
|
104
|
+
- test:
|
|
105
|
+
name: ruby3-2_rails7-0
|
|
106
|
+
ruby_version: 3.2.0
|
|
107
|
+
rails_version: 7.0.4.1
|
|
108
|
+
- test:
|
|
109
|
+
name: ruby3-1_rails7-0
|
|
110
|
+
ruby_version: 3.1.3
|
|
111
|
+
rails_version: 7.0.4.1
|
|
112
|
+
- test:
|
|
113
|
+
name: ruby3-0_rails7-0
|
|
114
|
+
ruby_version: 3.0.5
|
|
115
|
+
rails_version: 7.0.4.1
|
|
116
|
+
# Rails 6.1
|
|
117
|
+
- test:
|
|
118
|
+
name: ruby3-2_rails6-1
|
|
119
|
+
ruby_version: 3.2.0
|
|
120
|
+
rails_version: 6.1.7.1
|
|
121
|
+
- test:
|
|
122
|
+
name: ruby3-1_rails6-1
|
|
123
|
+
ruby_version: 3.1.3
|
|
124
|
+
rails_version: 6.1.7.1
|
|
52
125
|
- test:
|
|
53
|
-
name:
|
|
54
|
-
ruby_version:
|
|
55
|
-
rails_version:
|
|
126
|
+
name: ruby3-0_rails6-1
|
|
127
|
+
ruby_version: 3.0.5
|
|
128
|
+
rails_version: 6.1.7.1
|
|
56
129
|
- test:
|
|
57
|
-
name: ruby2-
|
|
58
|
-
ruby_version: 2.
|
|
59
|
-
rails_version:
|
|
130
|
+
name: ruby2-7_rails6-1
|
|
131
|
+
ruby_version: 2.7.7
|
|
132
|
+
rails_version: 6.1.7.1
|
|
133
|
+
# Rails 6.0
|
|
134
|
+
- test:
|
|
135
|
+
name: ruby3-2_rails6-0
|
|
136
|
+
ruby_version: 3.2.0
|
|
137
|
+
rails_version: 6.0.6.1
|
|
138
|
+
- test:
|
|
139
|
+
name: ruby3-1_rails6-0
|
|
140
|
+
ruby_version: 3.1.3
|
|
141
|
+
rails_version: 6.0.6.1
|
|
142
|
+
- test:
|
|
143
|
+
name: ruby3-0_rails6-0
|
|
144
|
+
ruby_version: 3.0.5
|
|
145
|
+
rails_version: 6.0.6.1
|
|
146
|
+
- test:
|
|
147
|
+
name: ruby2-7_rails6-0
|
|
148
|
+
ruby_version: 2.7.7
|
|
149
|
+
rails_version: 6.0.6.1
|
|
150
|
+
# Rails 5.2
|
|
151
|
+
- test:
|
|
152
|
+
name: ruby2-7_rails5-2
|
|
153
|
+
ruby_version: 2.7.7
|
|
154
|
+
rails_version: 5.2.8.1
|
data/.rubocop.yml
CHANGED
data/README.md
CHANGED
|
@@ -1,27 +1,30 @@
|
|
|
1
1
|
# Hydra::Works
|
|
2
2
|
|
|
3
|
-
|
|
4
|
-
[](http://badge.fury.io/rb/hydra-works)
|
|
5
|
+
[](https://circleci.com/gh/samvera/hydra-works)
|
|
6
|
+
[](https://coveralls.io/r/samvera/hydra-works?branch=main)
|
|
6
7
|
[](https://codeclimate.com/github/samvera/hydra-works)
|
|
7
|
-
|
|
8
|
+
|
|
9
|
+
Docs:
|
|
8
10
|
[](./CONTRIBUTING.md)
|
|
11
|
+
[](./LICENSE)
|
|
9
12
|
[](http://rubydoc.info/gems/hydra-works)
|
|
10
13
|
|
|
11
|
-
|
|
14
|
+
Community Support: [](http://slack.samvera.org/)
|
|
12
15
|
|
|
13
16
|
# What is hydra-works?
|
|
14
|
-
The Hydra::Works gem implements the [PCDM](https://github.com/duraspace/pcdm/wiki) [Works](https://github.com/duraspace/pcdm/blob/
|
|
17
|
+
The Hydra::Works gem implements the [PCDM](https://github.com/duraspace/pcdm/wiki) [Works](https://github.com/duraspace/pcdm/blob/main/pcdm-ext/works.rdf) data model using ActiveFedora-based models. In addition to the models, Hydra::Works includes associated behaviors around the broad concept of describable "works" or intellectual entities, the need for which was expressed by a variety of [Samvera community use cases](https://github.com/samvera/hydra-works/tree/main/use-cases).
|
|
15
18
|
|
|
16
19
|
## Product Owner & Maintenance
|
|
17
20
|
|
|
18
|
-
hydra-works
|
|
19
|
-
what this means can be found
|
|
20
|
-
[here](http://samvera.github.io/core_components.html#requirements-for-a-core-component).
|
|
21
|
+
`hydra-works` was a Core Component of the Samvera Community. Given a decline in available labor required for maintenance, this project no longer has a dedicated Product Owner. The documentation for what this means can be found [here](http://samvera.github.io/core_components.html#requirements-for-a-core-component).
|
|
21
22
|
|
|
22
23
|
### Product Owner
|
|
23
24
|
|
|
24
|
-
|
|
25
|
+
**Vacant**
|
|
26
|
+
|
|
27
|
+
_Until a Product Owner has been identified, we ask that you please direct all requests for support, bug reports, and general questions to the [`#dev` Channel on the Samvera Slack](https://samvera.slack.com/app_redirect?channel=dev)._
|
|
25
28
|
|
|
26
29
|
# Help
|
|
27
30
|
|
|
@@ -122,7 +125,7 @@ end
|
|
|
122
125
|
|
|
123
126
|
## Access controls
|
|
124
127
|
|
|
125
|
-
We are using [Web ACL](http://www.w3.org/wiki/WebAccessControl) as implemented by [hydra-access-controls](https://github.com/samvera/hydra-head/tree/
|
|
128
|
+
We are using [Web ACL](http://www.w3.org/wiki/WebAccessControl) as implemented by [hydra-access-controls](https://github.com/samvera/hydra-head/tree/main/hydra-access-controls).
|
|
126
129
|
|
|
127
130
|
## How to contribute
|
|
128
131
|
|
data/hydra-works.gemspec
CHANGED
|
@@ -13,24 +13,25 @@ Gem::Specification.new do |spec|
|
|
|
13
13
|
spec.description = %q{Using this data model should enable easy collaboration amongst Samvera projects.}
|
|
14
14
|
spec.homepage = 'https://github.com/samvera/hydra-works'
|
|
15
15
|
spec.license = 'APACHE2'
|
|
16
|
+
spec.metadata = { "rubygems_mfa_required" => "true" }
|
|
16
17
|
|
|
17
18
|
spec.files = `git ls-files -z`.split("\x0") - DO_NOT_SHIP
|
|
18
19
|
spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
|
|
19
20
|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
|
|
20
21
|
spec.require_paths = ['lib']
|
|
21
22
|
|
|
22
|
-
spec.add_dependency 'activesupport', '>= 5.2', '< 7.
|
|
23
|
+
spec.add_dependency 'activesupport', '>= 5.2', '< 7.1'
|
|
23
24
|
spec.add_dependency 'hydra-derivatives', '~> 3.6'
|
|
24
25
|
spec.add_dependency 'hydra-file_characterization', '~> 1.0'
|
|
25
26
|
spec.add_dependency 'hydra-pcdm', '>= 0.9'
|
|
26
27
|
|
|
27
28
|
spec.add_development_dependency 'bundler', '>= 1.7'
|
|
28
29
|
spec.add_development_dependency 'coveralls'
|
|
29
|
-
spec.add_development_dependency 'fcrepo_wrapper'
|
|
30
|
-
spec.add_development_dependency 'rake'
|
|
30
|
+
spec.add_development_dependency 'fcrepo_wrapper'
|
|
31
|
+
spec.add_development_dependency 'rake'
|
|
31
32
|
spec.add_development_dependency 'rspec'
|
|
32
33
|
spec.add_development_dependency 'rspec-rails'
|
|
33
|
-
spec.add_development_dependency 'solr_wrapper'
|
|
34
|
+
spec.add_development_dependency 'solr_wrapper'
|
|
34
35
|
spec.add_development_dependency 'sqlite3'
|
|
35
36
|
spec.add_development_dependency 'rspec_junit_formatter'
|
|
36
37
|
end
|
data/lib/hydra/works/version.rb
CHANGED
|
@@ -61,7 +61,9 @@ describe Hydra::Works::PersistDerivative do
|
|
|
61
61
|
expect(file_set.thumbnail).to be_nil
|
|
62
62
|
end
|
|
63
63
|
|
|
64
|
-
|
|
64
|
+
# For Ruby 2.5.z releases, the following error is found within CircleCI environments:
|
|
65
|
+
# `gm mogrify: Unrecognized option (-flatten)`
|
|
66
|
+
xit 'uses PersistDerivative service to generate a thumbnail derivative' do
|
|
65
67
|
file_set.create_derivatives
|
|
66
68
|
expect(Hydra::Derivatives.output_file_service).to eq(described_class)
|
|
67
69
|
expect(file_set.thumbnail).to have_content
|
|
@@ -93,7 +95,10 @@ describe Hydra::Works::PersistDerivative do
|
|
|
93
95
|
expect(file_set.thumbnail).to be_nil
|
|
94
96
|
end
|
|
95
97
|
|
|
96
|
-
|
|
98
|
+
# This needs to be enabled once ImageMagick can be built with JPEG2000 support in CircleCI containers
|
|
99
|
+
# The following error is raised:
|
|
100
|
+
# `identify-im6.q16: no decode delegate for this image format `JP2' @ error/constitute.c/ReadImage/560.`
|
|
101
|
+
xit 'generates a thumbnail on job run' do
|
|
97
102
|
file_set.create_derivatives
|
|
98
103
|
expect(file_set.thumbnail).to have_content
|
|
99
104
|
expect(file_set.thumbnail.mime_type).to eq('image/jpeg')
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: hydra-works
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.
|
|
4
|
+
version: 2.1.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Justin Coyne
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date:
|
|
11
|
+
date: 2023-02-14 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: activesupport
|
|
@@ -19,7 +19,7 @@ dependencies:
|
|
|
19
19
|
version: '5.2'
|
|
20
20
|
- - "<"
|
|
21
21
|
- !ruby/object:Gem::Version
|
|
22
|
-
version: '7.
|
|
22
|
+
version: '7.1'
|
|
23
23
|
type: :runtime
|
|
24
24
|
prerelease: false
|
|
25
25
|
version_requirements: !ruby/object:Gem::Requirement
|
|
@@ -29,7 +29,7 @@ dependencies:
|
|
|
29
29
|
version: '5.2'
|
|
30
30
|
- - "<"
|
|
31
31
|
- !ruby/object:Gem::Version
|
|
32
|
-
version: '7.
|
|
32
|
+
version: '7.1'
|
|
33
33
|
- !ruby/object:Gem::Dependency
|
|
34
34
|
name: hydra-derivatives
|
|
35
35
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -104,30 +104,30 @@ dependencies:
|
|
|
104
104
|
name: fcrepo_wrapper
|
|
105
105
|
requirement: !ruby/object:Gem::Requirement
|
|
106
106
|
requirements:
|
|
107
|
-
- - "
|
|
107
|
+
- - ">="
|
|
108
108
|
- !ruby/object:Gem::Version
|
|
109
|
-
version: '0
|
|
109
|
+
version: '0'
|
|
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: '0
|
|
116
|
+
version: '0'
|
|
117
117
|
- !ruby/object:Gem::Dependency
|
|
118
118
|
name: rake
|
|
119
119
|
requirement: !ruby/object:Gem::Requirement
|
|
120
120
|
requirements:
|
|
121
|
-
- - "
|
|
121
|
+
- - ">="
|
|
122
122
|
- !ruby/object:Gem::Version
|
|
123
|
-
version: '
|
|
123
|
+
version: '0'
|
|
124
124
|
type: :development
|
|
125
125
|
prerelease: false
|
|
126
126
|
version_requirements: !ruby/object:Gem::Requirement
|
|
127
127
|
requirements:
|
|
128
|
-
- - "
|
|
128
|
+
- - ">="
|
|
129
129
|
- !ruby/object:Gem::Version
|
|
130
|
-
version: '
|
|
130
|
+
version: '0'
|
|
131
131
|
- !ruby/object:Gem::Dependency
|
|
132
132
|
name: rspec
|
|
133
133
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -160,16 +160,16 @@ dependencies:
|
|
|
160
160
|
name: solr_wrapper
|
|
161
161
|
requirement: !ruby/object:Gem::Requirement
|
|
162
162
|
requirements:
|
|
163
|
-
- - "
|
|
163
|
+
- - ">="
|
|
164
164
|
- !ruby/object:Gem::Version
|
|
165
|
-
version: '
|
|
165
|
+
version: '0'
|
|
166
166
|
type: :development
|
|
167
167
|
prerelease: false
|
|
168
168
|
version_requirements: !ruby/object:Gem::Requirement
|
|
169
169
|
requirements:
|
|
170
|
-
- - "
|
|
170
|
+
- - ">="
|
|
171
171
|
- !ruby/object:Gem::Version
|
|
172
|
-
version: '
|
|
172
|
+
version: '0'
|
|
173
173
|
- !ruby/object:Gem::Dependency
|
|
174
174
|
name: sqlite3
|
|
175
175
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -314,7 +314,8 @@ files:
|
|
|
314
314
|
homepage: https://github.com/samvera/hydra-works
|
|
315
315
|
licenses:
|
|
316
316
|
- APACHE2
|
|
317
|
-
metadata:
|
|
317
|
+
metadata:
|
|
318
|
+
rubygems_mfa_required: 'true'
|
|
318
319
|
post_install_message:
|
|
319
320
|
rdoc_options: []
|
|
320
321
|
require_paths:
|
|
@@ -330,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
330
331
|
- !ruby/object:Gem::Version
|
|
331
332
|
version: '0'
|
|
332
333
|
requirements: []
|
|
333
|
-
rubygems_version: 3.
|
|
334
|
+
rubygems_version: 3.4.6
|
|
334
335
|
signing_key:
|
|
335
336
|
specification_version: 4
|
|
336
337
|
summary: Fundamental repository data model for Samvera applications
|