valkyrie 2.1.0 → 3.0.0.pre.beta.1

data/tasks/dev.rake

@@ -2,63 +2,26 @@
 
 namespace :server do
   desc "Start solr and fedora servers for testing"
-  task :test do
+  task :start do
     require 'rails'
-    require 'solr_wrapper'
-    require 'fcrepo_wrapper'
-    SolrWrapper.wrap(shared_solr_opts.merge(port: 8984, instance_dir: 'tmp/blacklight-core-test')) do |solr|
-      solr.with_collection(name: "blacklight-core-test", dir: Pathname.new(__dir__).join("..", "solr", "config").to_s) do
-        FcrepoWrapper.wrap(shared_fedora_opts.merge(port: 8988, fcrepo_home_dir: "tmp/fcrepo4-test-data", version: "4.7.5", instance_directory: "tmp/fcrepo4")) do |_fcrepo|
-          FcrepoWrapper::Instance.new(shared_fedora_opts.merge(port: 8998, fcrepo_home_dir: "tmp/fcrepo5-test-data", version: "5.1.0", instance_directory: "tmp/fcrepo5")).wrap do |_other_repo|
-            puts "Setup solr & Fedora"
-            loop do
-              sleep(1)
-            end
-          end
-        end
-      end
-    end
+    `lando start`
+    `bundle exec rake db:create`
+    `bundle exec rake db:migrate`
+    puts "Started Solr/Fedora/Postgres"
   end
 
   desc "Cleanup test servers"
-  task :clean_test do
+  task :clean do
     require 'rails'
-    require 'solr_wrapper'
-    require 'fcrepo_wrapper'
-    SolrWrapper.instance(shared_solr_opts.merge(port: 8984, instance_dir: 'tmp/blacklight-core-test')).remove_instance_dir!
-    FcrepoWrapper.default_instance(shared_fedora_opts.merge(port: 8988, fcrepo_home_dir: "tmp/fcrepo4-test-data", instance_directory: "tmp/fcrepo4")).remove_instance_dir!
-    FcrepoWrapper::Instance.new(shared_fedora_opts.merge(port: 8998, fcrepo_home_dir: "tmp/fcrepo5-test-data", instance_directory: "tmp/fcrepo5")).remove_instance_dir!
-    puts "Cleaned up test solr & fedora servers."
+    `lando destroy -y`
+    `lando start`
+    `bundle exec rake db:create`
+    `bundle exec rake db:migrate`
+    puts "Cleaned/Started Solr/Fedora/Postgres"
   end
 
-  desc "Start solr and fedora servers for development"
-  task :development do
-    require 'rails'
-    require 'solr_wrapper'
-    require 'fcrepo_wrapper'
-
-    SolrWrapper.wrap(shared_solr_opts.merge(port: 8983, instance_dir: 'tmp/blacklight-core')) do |solr|
-      solr.with_collection(name: "blacklight-core", dir: Pathname.new(__dir__).join("..", "solr", "config").to_s) do
-        FcrepoWrapper.wrap(shared_fedora_opts.merge(port: 8986, fcrepo_home_dir: "tmp/fcrepo4-dev-data", version: "4.7.5")) do |_fcrepo|
-          FcrepoWrapper::Instance.new(shared_fedora_opts.merge(port: 8996, fcrepo_home_dir: "tmp/fcrepo5-dev-data", version: "5.1.0")).wrap do |_fcrepo|
-            puts "Setup solr & Fedora"
-            loop do
-              sleep(1)
-            end
-          end
-        end
-      end
-    end
-  end
-
-  def shared_solr_opts
-    opts = { managed: true, verbose: true, persist: false, download_dir: "tmp" }
-    opts[:version] = ENV['SOLR_VERSION'] if ENV['SOLR_VERSION']
-    opts
-  end
-
-  def shared_fedora_opts
-    opts = { managed: true, verbose: true, enable_jms: false, download_dir: "tmp" }
-    opts
+  desc "Stop test servers"
+  task :stop do
+    `lando stop -y`
   end
 end

data/valkyrie.gemspec

@@ -21,22 +21,20 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'dry-struct'
-  spec.add_dependency 'draper'
   spec.add_dependency 'activemodel'
   spec.add_dependency 'dry-types', '~> 1.0'
-  spec.add_dependency 'rdf', '~> 3.0.10'
+  spec.add_dependency 'rdf', '~> 3.0', '>= 3.0.10'
   spec.add_dependency 'activesupport'
   spec.add_dependency 'railties' # To use generators and engines
-  spec.add_dependency 'reform'
+  spec.add_dependency 'reform', '~> 2.2'
   spec.add_dependency 'reform-rails'
   spec.add_dependency 'json-ld'
   spec.add_dependency 'json'
   spec.add_dependency 'rdf-vocab'
-  spec.add_dependency 'disposable', '~> 0.4.5'
   spec.add_dependency 'faraday', '< 1.0'
 
   spec.add_development_dependency "bundler", "> 1.16.0", "< 3"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", ">= 10"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "webmock"
@@ -47,7 +45,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'yard'
   spec.add_development_dependency 'solr_wrapper'
   spec.add_development_dependency 'fcrepo_wrapper'
-  spec.add_development_dependency 'docker-stack', '~> 0.2.6'
   spec.add_development_dependency 'timecop'
   spec.add_development_dependency 'appraisal'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valkyrie
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0.pre.beta.1
 platform: ruby
 authors:
 - Trey Pendragon
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-09 00:00:00.000000000 Z
+date: 2021-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: draper
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -71,6 +57,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.10
   type: :runtime
@@ -78,6 +67,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.10
 - !ruby/object:Gem::Dependency
@@ -112,16 +104,16 @@ dependencies:
   name: reform
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: reform-rails
   requirement: !ruby/object:Gem::Requirement
@@ -178,20 +170,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: disposable
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.5
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -230,16 +208,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -380,20 +358,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: docker-stack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.6
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -422,7 +386,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - tpendragon@princeton.edu
 executables: []
@@ -431,9 +395,8 @@ extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
 - ".ctags"
-- ".docker-stack/valkyrie-development/docker-compose.yml"
-- ".docker-stack/valkyrie-test/docker-compose.yml"
 - ".gitignore"
+- ".lando.yml"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
@@ -542,6 +505,7 @@ files:
 - lib/valkyrie/specs/shared_specs/resource.rb
 - lib/valkyrie/specs/shared_specs/solr_indexer.rb
 - lib/valkyrie/specs/shared_specs/storage_adapter.rb
+- lib/valkyrie/specs/shared_specs/write_only/metadata_adapter.rb
 - lib/valkyrie/storage.rb
 - lib/valkyrie/storage/disk.rb
 - lib/valkyrie/storage/fedora.rb
@@ -569,13 +533,12 @@ files:
 - solr/config/xslt/luke.xsl
 - solr/solr.xml
 - tasks/dev.rake
-- tasks/docker.rake
 - valkyrie.gemspec
 - valkyrie_logo.png
 homepage: https://github.com/samvera/valkyrie
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -586,13 +549,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: An ORM using the Data Mapper pattern, specifically built to solve Digital
   Repository use cases.

data/.docker-stack/valkyrie-development/docker-compose.yml

@@ -1,53 +0,0 @@
----
-version: '3.4'
-volumes:
-  fedora4:
-  fedora5:
-  db:
-  solr_repo:
-  solr_index:
-services:
-  fedora4:
-    image: samvera/fcrepo4:4.7.5
-    volumes:
-    - fedora4:/data
-    ports:
-    - 8986:8080
-  fedora5:
-    image: samvera/fcrepo4:5.1.0
-    volumes:
-    - fedora5:/data
-    ports:
-    - 8996:8080
-  db:
-    image: healthcheck/postgres:alpine
-    volumes:
-    - db:/data
-    environment:
-    - PGDATA=/data
-    - POSTGRES_USER=docker
-    - POSTGRES_PASSWORD=d0ck3r
-    ports:
-    - 5433:5432
-  solr_repo:
-    image: solr:7.2-alpine
-    ports:
-    - 8983:8983
-    volumes:
-    - solr_repo:/opt/solr/server/solr/mycores
-    - "../../solr:/solr_config"
-    entrypoint:
-    - docker-entrypoint.sh
-    - solr-precreate
-    - blacklight-core
-    - "/solr_config/config"
-    healthcheck:
-      test:
-      - CMD
-      - wget
-      - "-O"
-      - "/dev/null"
-      - http://localhost:8983/solr/
-      interval: 30s
-      timeout: 5s
-      retries: 3

data/.docker-stack/valkyrie-test/docker-compose.yml

@@ -1,53 +0,0 @@
----
-version: '3.4'
-volumes:
-  fedora4:
-  fedora5:
-  db:
-  solr_repo:
-  solr_index:
-services:
-  fedora4:
-    image: samvera/fcrepo4:4.7.5
-    volumes:
-    - fedora4:/data
-    ports:
-    - 8988:8080
-  fedora5:
-    image: samvera/fcrepo4:5.1.0
-    volumes:
-    - fedora5:/data
-    ports:
-    - 8998:8080
-  db:
-    image: healthcheck/postgres:alpine
-    volumes:
-    - db:/data
-    environment:
-    - PGDATA=/data
-    - POSTGRES_USER=docker
-    - POSTGRES_PASSWORD=d0ck3r
-    ports:
-    - 5434:5432
-  solr_repo:
-    image: solr:7.2-alpine
-    ports:
-    - 8984:8983
-    volumes:
-    - solr_repo:/opt/solr/server/solr/mycores
-    - "../../solr:/solr_config"
-    entrypoint:
-    - docker-entrypoint.sh
-    - solr-precreate
-    - blacklight-core-test
-    - "/solr_config/config"
-    healthcheck:
-      test:
-      - CMD
-      - wget
-      - "-O"
-      - "/dev/null"
-      - http://localhost:8983/solr/
-      interval: 30s
-      timeout: 5s
-      retries: 3

data/tasks/docker.rake

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-require 'valkyrie'
-
-if Valkyrie.environment == "development" || Valkyrie.environment == "test"
-  begin
-    require 'docker/stack/rake_task'
-
-    def get_named_task(task_name)
-      Rake::Task[task_name]
-    rescue RuntimeError
-      nil
-    end
-
-    namespace :docker do
-      namespace(:dev)  { Docker::Stack::RakeTask.load_tasks }
-      namespace(:test) { Docker::Stack::RakeTask.load_tasks(force_env: 'test', cleanup: true) }
-
-      desc 'Spin up test stack and run specs'
-      task :spec do
-        ENV["RACK_ENV"] = "test"
-        Docker::Stack::Controller.new(project: 'valkyrie', cleanup: true).with_containers do
-          Rake::Task['db:create'].invoke
-          Rake::Task['db:migrate'].invoke
-          Rake::Task['spec'].invoke
-        end
-      end
-    end
-  rescue LoadError
-    Rails.logger.warn 'Docker rake tasks not loaded.'
-  end
-end