valkyrie 2.0.1 → 2.2.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 +65 -56
- data/.lando.yml +58 -0
- data/.rubocop.yml +4 -1
- data/.tool-versions +1 -1
- data/Appraisals +4 -4
- data/CHANGELOG.md +134 -0
- data/README.md +21 -49
- data/Rakefile +26 -20
- data/db/config.yml +3 -10
- data/db/schema.rb +0 -40
- data/gemfiles/activerecord_5_2.gemfile +2 -0
- data/gemfiles/{activerecord_5_1.gemfile → activerecord_6_0.gemfile} +3 -1
- data/lib/generators/valkyrie/resource_generator.rb +3 -3
- data/lib/valkyrie.rb +33 -15
- data/lib/valkyrie/change_set.rb +3 -3
- data/lib/valkyrie/id.rb +26 -3
- data/lib/valkyrie/indexers/access_controls_indexer.rb +17 -17
- data/lib/valkyrie/logging.rb +72 -0
- data/lib/valkyrie/persistence/composite_persister.rb +1 -1
- data/lib/valkyrie/persistence/fedora.rb +2 -0
- data/lib/valkyrie/persistence/fedora/list_node.rb +46 -49
- data/lib/valkyrie/persistence/fedora/metadata_adapter.rb +7 -3
- data/lib/valkyrie/persistence/fedora/ordered_list.rb +90 -90
- data/lib/valkyrie/persistence/fedora/ordered_reader.rb +5 -5
- data/lib/valkyrie/persistence/fedora/permissive_schema.rb +3 -3
- data/lib/valkyrie/persistence/fedora/persister.rb +82 -83
- data/lib/valkyrie/persistence/fedora/persister/model_converter.rb +15 -15
- data/lib/valkyrie/persistence/fedora/persister/orm_converter.rb +38 -18
- data/lib/valkyrie/persistence/fedora/query_service.rb +55 -54
- data/lib/valkyrie/persistence/memory/persister.rb +33 -33
- data/lib/valkyrie/persistence/memory/query_service.rb +52 -34
- data/lib/valkyrie/persistence/postgres/orm_converter.rb +52 -52
- data/lib/valkyrie/persistence/postgres/query_service.rb +86 -33
- data/lib/valkyrie/persistence/postgres/resource_converter.rb +1 -1
- data/lib/valkyrie/persistence/shared/json_value_mapper.rb +1 -1
- data/lib/valkyrie/persistence/solr/model_converter.rb +337 -337
- data/lib/valkyrie/persistence/solr/orm_converter.rb +3 -3
- data/lib/valkyrie/persistence/solr/persister.rb +4 -17
- data/lib/valkyrie/persistence/solr/queries/find_all_query.rb +6 -0
- data/lib/valkyrie/persistence/solr/queries/find_by_alternate_identifier_query.rb +1 -1
- data/lib/valkyrie/persistence/solr/queries/find_by_id_query.rb +1 -1
- data/lib/valkyrie/persistence/solr/queries/find_members_query.rb +1 -1
- data/lib/valkyrie/persistence/solr/query_service.rb +42 -53
- data/lib/valkyrie/persistence/solr/repository.rb +2 -1
- data/lib/valkyrie/rdf_patches.rb +2 -2
- data/lib/valkyrie/resource.rb +36 -5
- data/lib/valkyrie/specs/shared_specs/change_set.rb +1 -1
- data/lib/valkyrie/specs/shared_specs/persister.rb +13 -5
- data/lib/valkyrie/specs/shared_specs/queries.rb +112 -9
- data/lib/valkyrie/specs/shared_specs/resource.rb +1 -1
- data/lib/valkyrie/storage/fedora.rb +18 -18
- data/lib/valkyrie/storage_adapter.rb +16 -13
- data/lib/valkyrie/types.rb +3 -1
- data/lib/valkyrie/version.rb +1 -1
- data/lib/valkyrie/vocab/pcdm_use.rb +12 -0
- data/solr/config/solrconfig.xml +0 -10
- data/tasks/dev.rake +14 -51
- data/valkyrie.gemspec +4 -4
- metadata +38 -35
- data/.docker-stack/valkyrie-development/docker-compose.yml +0 -53
- data/.docker-stack/valkyrie-test/docker-compose.yml +0 -53
- data/db/seeds.rb +0 -8
- data/tasks/docker.rake +0 -31
@@ -1,53 +0,0 @@
|
|
1
|
-
---
|
2
|
-
version: '3.4'
|
3
|
-
volumes:
|
4
|
-
fedora4:
|
5
|
-
fedora5:
|
6
|
-
db:
|
7
|
-
solr_repo:
|
8
|
-
solr_index:
|
9
|
-
services:
|
10
|
-
fedora4:
|
11
|
-
image: nulib/fcrepo4:4.7.5
|
12
|
-
volumes:
|
13
|
-
- fedora4:/data
|
14
|
-
ports:
|
15
|
-
- 8986:8080
|
16
|
-
fedora5:
|
17
|
-
image: nulib/fcrepo4:5.0.0
|
18
|
-
volumes:
|
19
|
-
- fedora5:/data
|
20
|
-
ports:
|
21
|
-
- 8996:8080
|
22
|
-
db:
|
23
|
-
image: healthcheck/postgres:alpine
|
24
|
-
volumes:
|
25
|
-
- db:/data
|
26
|
-
environment:
|
27
|
-
- PGDATA=/data
|
28
|
-
- POSTGRES_USER=docker
|
29
|
-
- POSTGRES_PASSWORD=d0ck3r
|
30
|
-
ports:
|
31
|
-
- 5433:5432
|
32
|
-
solr_repo:
|
33
|
-
image: solr:7.2-alpine
|
34
|
-
ports:
|
35
|
-
- 8983:8983
|
36
|
-
volumes:
|
37
|
-
- solr_repo:/opt/solr/server/solr/mycores
|
38
|
-
- "../../solr:/solr_config"
|
39
|
-
entrypoint:
|
40
|
-
- docker-entrypoint.sh
|
41
|
-
- solr-precreate
|
42
|
-
- blacklight-core
|
43
|
-
- "/solr_config/config"
|
44
|
-
healthcheck:
|
45
|
-
test:
|
46
|
-
- CMD
|
47
|
-
- wget
|
48
|
-
- "-O"
|
49
|
-
- "/dev/null"
|
50
|
-
- http://localhost:8983/solr/
|
51
|
-
interval: 30s
|
52
|
-
timeout: 5s
|
53
|
-
retries: 3
|
@@ -1,53 +0,0 @@
|
|
1
|
-
---
|
2
|
-
version: '3.4'
|
3
|
-
volumes:
|
4
|
-
fedora4:
|
5
|
-
fedora5:
|
6
|
-
db:
|
7
|
-
solr_repo:
|
8
|
-
solr_index:
|
9
|
-
services:
|
10
|
-
fedora4:
|
11
|
-
image: nulib/fcrepo4:4.7.5
|
12
|
-
volumes:
|
13
|
-
- fedora4:/data
|
14
|
-
ports:
|
15
|
-
- 8988:8080
|
16
|
-
fedora5:
|
17
|
-
image: nulib/fcrepo4:5.0.0
|
18
|
-
volumes:
|
19
|
-
- fedora5:/data
|
20
|
-
ports:
|
21
|
-
- 8998:8080
|
22
|
-
db:
|
23
|
-
image: healthcheck/postgres:alpine
|
24
|
-
volumes:
|
25
|
-
- db:/data
|
26
|
-
environment:
|
27
|
-
- PGDATA=/data
|
28
|
-
- POSTGRES_USER=docker
|
29
|
-
- POSTGRES_PASSWORD=d0ck3r
|
30
|
-
ports:
|
31
|
-
- 5434:5432
|
32
|
-
solr_repo:
|
33
|
-
image: solr:7.2-alpine
|
34
|
-
ports:
|
35
|
-
- 8984:8983
|
36
|
-
volumes:
|
37
|
-
- solr_repo:/opt/solr/server/solr/mycores
|
38
|
-
- "../../solr:/solr_config"
|
39
|
-
entrypoint:
|
40
|
-
- docker-entrypoint.sh
|
41
|
-
- solr-precreate
|
42
|
-
- blacklight-core-test
|
43
|
-
- "/solr_config/config"
|
44
|
-
healthcheck:
|
45
|
-
test:
|
46
|
-
- CMD
|
47
|
-
- wget
|
48
|
-
- "-O"
|
49
|
-
- "/dev/null"
|
50
|
-
- http://localhost:8983/solr/
|
51
|
-
interval: 30s
|
52
|
-
timeout: 5s
|
53
|
-
retries: 3
|
data/db/seeds.rb
DELETED
@@ -1,8 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
# This file should contain all the record creation needed to seed the database with its default values.
|
3
|
-
# The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup).
|
4
|
-
#
|
5
|
-
# Examples:
|
6
|
-
#
|
7
|
-
# movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }])
|
8
|
-
# Character.create(name: 'Luke', movie: movies.first)
|
data/tasks/docker.rake
DELETED
@@ -1,31 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
require 'valkyrie'
|
3
|
-
|
4
|
-
if Valkyrie.environment == "development" || Valkyrie.environment == "test"
|
5
|
-
begin
|
6
|
-
require 'docker/stack/rake_task'
|
7
|
-
|
8
|
-
def get_named_task(task_name)
|
9
|
-
Rake::Task[task_name]
|
10
|
-
rescue RuntimeError
|
11
|
-
nil
|
12
|
-
end
|
13
|
-
|
14
|
-
namespace :docker do
|
15
|
-
namespace(:dev) { Docker::Stack::RakeTask.load_tasks }
|
16
|
-
namespace(:test) { Docker::Stack::RakeTask.load_tasks(force_env: 'test', cleanup: true) }
|
17
|
-
|
18
|
-
desc 'Spin up test stack and run specs'
|
19
|
-
task :spec do
|
20
|
-
ENV["RACK_ENV"] = "test"
|
21
|
-
Docker::Stack::Controller.new(project: 'valkyrie', cleanup: true).with_containers do
|
22
|
-
Rake::Task['db:create'].invoke
|
23
|
-
Rake::Task['db:migrate'].invoke
|
24
|
-
Rake::Task['spec'].invoke
|
25
|
-
end
|
26
|
-
end
|
27
|
-
end
|
28
|
-
rescue LoadError
|
29
|
-
Rails.logger.warn 'Docker rake tasks not loaded.'
|
30
|
-
end
|
31
|
-
end
|