valkyrie 2.0.0 → 2.1.2

data/lib/valkyrie/storage/fedora.rb

@@ -7,7 +7,7 @@ module Valkyrie::Storage
     SLASH = '/'
 
     # @param [Ldp::Client] connection
-    def initialize(connection:, base_path: "/", fedora_version: 5)
+    def initialize(connection:, base_path: "/", fedora_version: Valkyrie::Persistence::Fedora::DEFAULT_FEDORA_VERSION)
       @connection = connection
       @base_path = base_path
       @fedora_version = fedora_version
@@ -83,24 +83,24 @@ module Valkyrie::Storage
 
     private
 
-      # @return [IOProxy]
-      def response(id:)
-        response = connection.http.get(fedora_identifier(id: id))
-        raise Valkyrie::StorageAdapter::FileNotFound unless response.success?
-        IOProxy.new(response.body)
-      end
+    # @return [IOProxy]
+    def response(id:)
+      response = connection.http.get(fedora_identifier(id: id))
+      raise Valkyrie::StorageAdapter::FileNotFound unless response.success?
+      IOProxy.new(response.body)
+    end
 
-      def default_resource_uri_transformer
-        lambda do |resource, base_url|
-          id = CGI.escape(resource.id.to_s)
-          RDF::URI.new(base_url + id)
-        end
+    def default_resource_uri_transformer
+      lambda do |resource, base_url|
+        id = CGI.escape(resource.id.to_s)
+        RDF::URI.new(base_url + id)
       end
+    end
 
-      def base_url
-        pre_divider = base_path.starts_with?(SLASH) ? '' : SLASH
-        post_divider = base_path.ends_with?(SLASH) ? '' : SLASH
-        "#{connection.http.url_prefix}#{pre_divider}#{base_path}#{post_divider}"
-      end
+    def base_url
+      pre_divider = base_path.starts_with?(SLASH) ? '' : SLASH
+      post_divider = base_path.ends_with?(SLASH) ? '' : SLASH
+      "#{connection.http.url_prefix}#{pre_divider}#{base_path}#{post_divider}"
+    end
   end
 end

data/lib/valkyrie/storage_adapter.rb

@@ -5,6 +5,7 @@ module Valkyrie
   #  storage backends (such as fedora, disk, etc)
   class StorageAdapter
     class FileNotFound < StandardError; end
+    class AdapterNotFoundError < StandardError; end
     class_attribute :storage_adapters
     self.storage_adapters = {}
     class << self
@@ -54,10 +55,12 @@ module Valkyrie
       # @param id [Valkyrie::ID]
       # @return [Valkyrie::StorageAdapter]
       def adapter_for(id:)
-        # TODO: Determine the appropriate response when we have an unhandled :id
-        storage_adapters.values.find do |storage_adapter|
+        handler = storage_adapters.values.find do |storage_adapter|
           storage_adapter.handles?(id: id)
         end
+
+        raise AdapterNotFoundError, 'Unable to find a StorageAdapter' if handler.nil?
+        handler
       end
     end
 
@@ -103,20 +106,20 @@ module Valkyrie
 
       private
 
-        def tmp_file_name
-          id.to_s.tr(':/', '__')
-        end
+      def tmp_file_name
+        id.to_s.tr(':/', '__')
+      end
 
-        def tmp_file_path
-          ::File.join(Dir.tmpdir, tmp_file_name)
-        end
+      def tmp_file_path
+        ::File.join(Dir.tmpdir, tmp_file_name)
+      end
 
-        def tmp_file
-          @tmp_file ||= ::File.open(tmp_file_path, 'w+b') do |f|
-            IO.copy_stream(io, f)
-            f
-          end
+      def tmp_file
+        @tmp_file ||= ::File.open(tmp_file_path, 'w+b') do |f|
+          IO.copy_stream(io, f)
+          f
         end
+      end
     end
   end
 end

data/lib/valkyrie/types.rb

@@ -84,7 +84,7 @@ module Valkyrie
     Set = Array.constructor do |value|
       value = Array[value]
       clean_values = value.reject do |val|
-        val == '' || (val.is_a?(Valkyrie::ID) && val.to_s == '')
+        (val.is_a?(Valkyrie::ID) && val.to_s == '') || val == ''
       end.reject(&:nil?).uniq
 
       clean_values.map do |val|
@@ -99,6 +99,8 @@ module Valkyrie
     end
     Array.singleton_class.include(ArrayDefault)
     Set.singleton_class.include(ArrayDefault)
+    Relation = Valkyrie::Types::Set.of(Valkyrie::Types::ID)
+    OrderedRelation = Valkyrie::Types::Array.of(Valkyrie::Types::ID).meta(ordered: true)
 
     # Used for when an input may be an array, but the output needs to be a
     # single string.

data/lib/valkyrie/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Valkyrie
-  VERSION = "2.0.0"
+  VERSION = "2.1.2"
 end

data/solr/config/solrconfig.xml

@@ -284,16 +284,6 @@
       -->
   </searchComponent>
 
-  <searchComponent name="suggest" class="solr.SuggestComponent">
-    <lst name="suggester">
-      <str name="name">mySuggester</str>
-      <str name="lookupImpl">FuzzyLookupFactory</str>
-      <str name="suggestAnalyzerFieldType">textSuggest</str>
-      <str name="buildOnCommit">true</str>
-      <str name="field">suggest</str>
-    </lst>
-  </searchComponent>
-
   <requestHandler name="/suggest" class="solr.SearchHandler" startup="lazy">
     <lst name="defaults">
       <str name="suggest">true</str>

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.0.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.0.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

@@ -24,18 +24,19 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'draper'
   spec.add_dependency 'activemodel'
   spec.add_dependency 'dry-types', '~> 1.0'
-  spec.add_dependency 'rdf'
+  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"
@@ -46,7 +47,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.0.0
+  version: 2.1.2
 platform: ruby
 authors:
 - Trey Pendragon
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-06-20 00:00:00.000000000 Z
+date: 2021-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct
@@ -70,16 +70,22 @@ dependencies:
   name: rdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.10
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -112,16 +118,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
@@ -192,6 +198,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.5
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -216,16 +236,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
@@ -366,20 +386,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
@@ -408,7 +414,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - tpendragon@princeton.edu
 executables: []
@@ -417,9 +423,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"
@@ -449,9 +454,8 @@ files:
 - db/migrate/20180212092225_create_updated_at_index.rb
 - db/migrate/20180802220739_add_optimistic_locking_to_orm_resources.rb
 - db/schema.rb
-- db/seeds.rb
-- gemfiles/activerecord_5_1.gemfile
 - gemfiles/activerecord_5_2.gemfile
+- gemfiles/activerecord_6_0.gemfile
 - lib/config/database_connection.rb
 - lib/generators/valkyrie/resource_generator.rb
 - lib/generators/valkyrie/templates/resource.rb.erb
@@ -462,6 +466,7 @@ files:
 - lib/valkyrie/engine.rb
 - lib/valkyrie/id.rb
 - lib/valkyrie/indexers/access_controls_indexer.rb
+- lib/valkyrie/logging.rb
 - lib/valkyrie/metadata_adapter.rb
 - lib/valkyrie/persistence.rb
 - lib/valkyrie/persistence/buffered_persister.rb
@@ -555,13 +560,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
@@ -576,9 +580,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 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: nulib/fcrepo4:4.7.5
-    volumes:
-    - fedora4:/data
-    ports:
-    - 8986:8080
-  fedora5:
-    image: nulib/fcrepo4:5.0.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