valkyrie 3.0.0.pre.beta.1 → 3.0.0.pre.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 240eb74a4be15202ae2036ac9a0067b1aadc23e65ad583638b6cd2874540a845
-  data.tar.gz: 65568d10c48dcadbee70bff7c23360a6e0b149f874b5ebe493b5770afb6e4362
+  metadata.gz: 987aae96fd21d248254a9957cc76686714c2f434b674c712130990a0943a3d88
+  data.tar.gz: edbd02182ed2f107bfdf2b4516663489bae7863a524d77b3147c9c6da6b1295b
 SHA512:
-  metadata.gz: 29b4ebfb067823191dfb2ca74151765ad8157f2c4b7b89cbecaf882e8e6f32eded31fdfb326ca198192e50574a562f8582205bab921d248707f2993b31960528
-  data.tar.gz: 1fc174038d3baac66d35e431211ed83e38d2531395f86ecfeee106a612631d42a1f2fa11fe55a561617d3a23561763707100c701a73a06147db11bb073a60636
+  metadata.gz: d955568572008da1a1e11b823e6b7c1da2732aa6bdd75619f337583c8741b83601cf3477dd04da1bad2d749c6c596ad484564eab6bbf466d53daa7b93f28fa0a
+  data.tar.gz: 88704affe5c5f2dd8d1f58d6901eefa3d72fc8d184098922e6125c1a9f61b2d4084bc1655926d18c1bbcb861ee71e4d3426778b724aa535ce00f4659aa625ac7

data/.circleci/config.yml

@@ -12,7 +12,7 @@ jobs:
         default: "2.6.5"
         type: "string"
     docker:
-      - image: circleci/ruby:<< parameters.ruby >>-node-browsers
+      - image: cimg/ruby:<< parameters.ruby >>
         environment:
           RAILS_ENV: test
       - image: postgres:10.6-alpine
@@ -98,6 +98,18 @@ workflows:
           gemfile: "gemfiles/activerecord_6_0.gemfile"
           ruby: 2.7.0
           name: "Ruby2-7_Rails6-0"
+      - build:
+          gemfile: "gemfiles/activerecord_7_0.gemfile"
+          ruby: 2.7.5
+          name: "Ruby2-7_rails7-0"
+      - build:
+          gemfile: "gemfiles/faraday_1.gemfile"
+          ruby: 2.7.0
+          name: "Faraday1"
+      - build:
+          gemfile: "gemfiles/faraday_0.gemfile"
+          ruby: 2.7.0
+          name: "Faraday0"
       - build:
           gemfile: "gemfiles/activerecord_6_0.gemfile"
           ruby: 2.6.5
@@ -127,6 +139,14 @@ workflows:
           gemfile: "gemfiles/activerecord_6_0.gemfile"
           ruby: 2.7.0
           name: "Ruby2-7_Rails6-0"
+      - build:
+          gemfile: "gemfiles/faraday_1.gemfile"
+          ruby: 2.7.0
+          name: "Faraday1"
+      - build:
+          gemfile: "gemfiles/faraday_0.gemfile"
+          ruby: 2.7.0
+          name: "Faraday0"
       - build:
           gemfile: "gemfiles/activerecord_6_0.gemfile"
           ruby: 2.6.5

data/.rubocop.yml

@@ -46,3 +46,6 @@ Metrics/MethodLength:
 Metrics/CyclomaticComplexity:
   Exclude:
     - 'lib/valkyrie/persistence/postgres/persister.rb'
+RSpec/VerifiedDoubles:
+  Exclude:
+    - 'spec/valkyrie/persistence/postgres/metadata_adapter_spec.rb'

data/.tool-versions

@@ -1 +1 @@
-ruby 2.6.6
+ruby 2.7.5

data/Appraisals

@@ -1,4 +1,9 @@
 # frozen_string_literal: true
+
+appraise "activerecord-7-0" do
+  gem "activerecord", "~> 7.0.0"
+end
+
 appraise "activerecord-6-0" do
   gem "activerecord", "~> 6.0.0"
 end
@@ -6,3 +11,13 @@ end
 appraise "activerecord-5-2" do
   gem "activerecord", "~> 5.2.0"
 end
+
+appraise "faraday-0" do
+  gem "faraday", "< 1"
+  gem "activerecord", "~> 6.0.0"
+end
+
+appraise "faraday-1" do
+  gem "faraday", "~> 1.0"
+  gem "activerecord", "~> 6.0.0"
+end

data/CHANGELOG.md

@@ -1,3 +1,35 @@
+# v3.0.0.rc1 2022-08-09
+
+## Unchanged from 3.0.0.beta3
+
+# v3.0.0.beta3 2022-08-09
+
+## Changes since last release
+
+* Fix Ruby 3.0 support issues
+  [marrus-sh](https://github.com/marrus-sh)
+
+# v3.0.0.beta2 2022-06-15
+
+## Changes since last release
+
+* Update pcdm_use warning
+  [dchandekstark](https://github.com/dchandekstark)
+* Add support for Faraday 2
+  [tpendragon](https://github.com/tpendragon)
+* Rails 7 Support
+  [cgalarza](https://github.com/cgalarza)
+  [tpendragon](https://github.com/tpendragon)
+* Support discovery of multiple disk adapters on different paths.
+  [no-reply](https://github.com/tpendragon)
+* New Product Owner: Alexandra Dunn!
+  [dunn](https://github.com/dunn)
+
+Additional thanks to the following for code review and issue reports leading to
+this release:
+
+[cjcolvar](https://github.com/cjcolvar)
+
 # v3.0.0.beta1 2021-10-18
 
 ## Changes since last release

data/README.md

@@ -17,7 +17,7 @@ Jump in: [![Slack Status](http://slack.samvera.org/badge.svg)](http://slack.samv
 ## Primary Contacts
 
 ### Product Owner
-[Kate Lynch](https://github.com/kelynch)
+[Alexandra Dunn](https://github.com/dunn)
 
 ### Technical Lead
 [Trey Pendragon](https://github.com/tpendragon)
@@ -180,21 +180,6 @@ attribute :authors, Valkyrie::Types::Array.meta(ordered: true)
 Defining resource attributes is explained in greater detail on the [Using Types Wiki
 page](https://github.com/samvera/valkyrie/wiki/Using-Types).
 
-#### Work Types Generator
-
-To create a custom Valkyrie model in your application, you can use the Rails generator.  For example, to
-generate a model named `FooBar` with an unordered `title` field and an ordered `member_ids` field:
-
-```
-rails generate valkyrie:resource FooBar title member_ids:array
-```
-
-You can namespace your model class by including a slash in the model name:
-
-```
-rails generate valkyrie:resource Foo/Bar title member_ids:array
-```
-
 ### Read and Write Data
 ```
 # initialize a metadata adapter

data/Rakefile

@@ -2,7 +2,7 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 require 'yaml'
-require 'config/database_connection'
+require_relative 'spec/support/database_connection.rb'
 require 'active_record'
 require 'rubocop/rake_task'
 load 'tasks/dev.rake'

data/db/config.yml

@@ -5,7 +5,7 @@ default: &default
   pool: <%= Integer(ENV.fetch("DB_POOL", 5)) %>
   reaping_frequency: <%= Integer(ENV.fetch("DB_REAPING_FREQUENCY", 10)) %>
   timeout: 5000
-  host: localhost
+  host: 127.0.0.1
   username: postgres
   password: 
 

data/gemfiles/activerecord_5_2.gemfile

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 # This file was generated by Appraisal
 
 source "https://rubygems.org"

data/gemfiles/activerecord_6_0.gemfile

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 # This file was generated by Appraisal
 
 source "https://rubygems.org"

data/gemfiles/activerecord_7_0.gemfile

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 7.0.0"
+gem "ldp"
+gem "pg"
+gem "rsolr"
+
+gemspec path: "../"

data/gemfiles/faraday_0.gemfile

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 6.0.0"
+gem "ldp"
+gem "pg"
+gem "rsolr"
+gem "faraday", "< 1"
+
+gemspec path: "../"

data/gemfiles/faraday_1.gemfile

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 6.0.0"
+gem "ldp"
+gem "pg"
+gem "rsolr"
+gem "faraday", "~> 1.0"
+
+gemspec path: "../"

data/lib/valkyrie/persistence/custom_query_container.rb

@@ -46,8 +46,14 @@ module Valkyrie::Persistence
       query_handler.queries.each do |query|
         handler = query_handler.new(query_service: query_service)
         query_handlers[query.to_sym] = handler
-        define_singleton_method query do |*args, &block|
-          query_handlers[query.to_sym].__send__(query, *args, &block)
+        define_singleton_method query do |*args, **kwargs, &block|
+          if kwargs.empty?
+            # This case needs to be specially handled in Ruby 2.6, or else an
+            # empty hash will be passed as the final argument.
+            query_handlers[query.to_sym].__send__(query, *args, &block)
+          else
+            query_handlers[query.to_sym].__send__(query, *args, **kwargs, &block)
+          end
         end
       end
     end

data/lib/valkyrie/persistence/fedora/ordered_list.rb

@@ -33,12 +33,10 @@ module Valkyrie::Persistence::Fedora
     #   empty, tail.prev is the first element.
     def tail
       @tail ||=
-        begin
-          if tail_subject
-            TailSentinel.new(self, prev_node: build_node(tail_subject))
-          else
-            head.next
-          end
+        if tail_subject
+          TailSentinel.new(self, prev_node: build_node(tail_subject))
+        else
+          head.next
         end
     end
 

data/lib/valkyrie/persistence/postgres/metadata_adapter.rb

@@ -31,9 +31,19 @@ module Valkyrie::Persistence::Postgres
     # @return [Valkyrie::ID]
     def id
       @id ||= begin
-        to_hash = "#{resource_factory.orm_class.connection_config['host']}:#{resource_factory.orm_class.connection_config['database']}"
+        to_hash = "#{connection_configuration[:host]}:#{connection_configuration[:database]}"
         Valkyrie::ID.new(Digest::MD5.hexdigest(to_hash))
       end
     end
+
+    private
+
+    def connection_configuration
+      if resource_factory.orm_class.respond_to?(:connection_db_config)
+        resource_factory.orm_class.connection_db_config.configuration_hash
+      else
+        resource_factory.orm_class.connection_config
+      end
+    end
   end
 end

data/lib/valkyrie/persistence.rb

@@ -37,8 +37,10 @@ module Valkyrie
     autoload :Fedora, 'valkyrie/persistence/fedora'
     class ObjectNotFoundError < StandardError
     end
+
     class UnsupportedDatatype < StandardError
     end
+
     class StaleObjectError < StandardError
     end
 

data/lib/valkyrie/rdf_patches.rb

@@ -9,6 +9,7 @@ module RDF
       ::JSON::LD::API.fromRdf([RDF::Statement.new(RDF::URI(""), RDF::URI(""), self)])[0][""][0]
     end
   end
+
   class URI
     def as_json(*_args)
       ::JSON::LD::API.fromRdf([RDF::Statement.new(RDF::URI(""), RDF::URI(""), self)])[0][""][0]

data/lib/valkyrie/specs/shared_specs/change_set_persister.rb

@@ -8,6 +8,7 @@ RSpec.shared_examples 'a Valkyrie::ChangeSetPersister' do |*_flags|
       attribute :member_ids
       attribute :nested_resource
     end
+
     class Valkyrie::Specs::CustomChangeSet < Valkyrie::ChangeSet
       self.fields = [:title]
     end

data/lib/valkyrie/specs/shared_specs/persister.rb

@@ -340,7 +340,7 @@ RSpec.shared_examples 'a Valkyrie::Persister' do |*flags|
     end
 
     after do
-      ActiveSupport::Dependencies.remove_constant("MyLockingResource")
+      Object.send(:remove_const, :MyLockingResource)
     end
 
     describe "#save" do

data/lib/valkyrie/specs/shared_specs/queries.rb

@@ -10,8 +10,10 @@ RSpec.shared_examples 'a Valkyrie query provider' do
       attribute :a_member_of, Valkyrie::Types::Array
       attribute :an_ordered_member_of, Valkyrie::Types::Array.meta(ordered: true)
     end
+
     class Valkyrie::Specs::SecondResource < Valkyrie::Resource
     end
+
     class Valkyrie::Specs::ThirdResource < Valkyrie::Resource
       attribute :a_member_of, Valkyrie::Types::Array
       attribute :an_ordered_member_of, Valkyrie::Types::Array.meta(ordered: true)
@@ -353,9 +355,11 @@ RSpec.shared_examples 'a Valkyrie query provider' do
       context "when the property is ordered for one child but not the other" do
         before do
           class Valkyrie::Specs::Parent < Valkyrie::Resource; end
+
           class Valkyrie::Specs::ChildWithUnorderedParents < Valkyrie::Resource
             attribute :a_member_of, Valkyrie::Types::Array
           end
+
           class Valkyrie::Specs::ChildWithOrderedParents < Valkyrie::Resource
             attribute :a_member_of, Valkyrie::Types::Array.meta(ordered: true)
           end
@@ -491,6 +495,26 @@ RSpec.shared_examples 'a Valkyrie query provider' do
       expect(query_service.custom_queries).to respond_to :find_by_user_id
       expect(query_service.custom_queries.find_by_user_id).to eq 1
     end
+
+    it "can register a query handler which takes keyword arguments" do
+      class QueryHandler
+        def self.queries
+          [:identity]
+        end
+
+        attr_reader :query_service
+        def initialize(query_service:)
+          @query_service = query_service
+        end
+
+        def identity(term:)
+          term
+        end
+      end
+      query_service.custom_queries.register_query_handler(QueryHandler)
+      expect(query_service.custom_queries).to respond_to :identity
+      expect(query_service.custom_queries.identity(term: :x)).to eq :x
+    end
   end
 
   context "optimistic locking" do

data/lib/valkyrie/storage/disk.rb

@@ -24,7 +24,7 @@ module Valkyrie::Storage
     # @param id [Valkyrie::ID]
     # @return [Boolean] true if this adapter can handle this type of identifer
     def handles?(id:)
-      id.to_s.start_with?("disk://")
+      id.to_s.start_with?("disk://#{base_path}")
     end
 
     def file_path(id)

data/lib/valkyrie/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Valkyrie
-  VERSION = "3.0.0-beta.1"
+  VERSION = "3.0.0-rc.1"
 end

data/lib/valkyrie/vocab/pcdm_use.rb

@@ -47,7 +47,8 @@ module Valkyrie::Vocab
          "rdf:subClassOf": %(http://pcdm.org/resources#File),
          "rdfs:isDefinedBy": %(pcdmuse:),
          type: "rdfs:Class"
-    warn "[DEPRECATION] PCDM is deprecating '#{self.class}#PreservationMasterFile'. Use #{self.class}#PreservationFile instead."
+    warn "[DEPRECATION] PCDM is deprecating '#{name}#PreservationMasterFile'. Use '#{name}#PreservationFile' instead. " \
+         "This warning does *not* indicate that usage of the deprecated term has been detected."
     # @deprecated
     term :PreservationMasterFile,
          comment: %(Best quality representation of the Object appropriate for long-term

data/lib/valkyrie.rb

@@ -27,7 +27,6 @@ module Valkyrie
   require 'valkyrie/indexers/access_controls_indexer'
   require 'valkyrie/storage'
   require 'valkyrie/vocab/pcdm_use'
-  require 'generators/valkyrie/resource_generator'
   require 'valkyrie/engine' if defined?(Rails)
   def config
     @config ||= Config.new(
@@ -74,16 +73,20 @@ module Valkyrie
   end
 
   class Config < OpenStruct
+    # Method lookup with OpenStruct appears to have issues in Ruby 3, so we
+    # unfortunately can’t just call +super+ when accessing values in the
+    # following methods. Using brackets works fine, though.
+
     def initialize(hsh = {})
       super(defaults.merge(hsh))
     end
 
     def metadata_adapter
-      Valkyrie::MetadataAdapter.find(super.to_sym)
+      Valkyrie::MetadataAdapter.find(self[:metadata_adapter].to_sym)
     end
 
     def storage_adapter
-      Valkyrie::StorageAdapter.find(super.to_sym)
+      Valkyrie::StorageAdapter.find(self[:storage_adapter].to_sym)
     end
 
     # @api public
@@ -97,7 +100,7 @@ module Valkyrie
     #
     # @see #default_resource_class_resolver for full interface
     def resource_class_resolver
-      super
+      self[:resource_class_resolver]
     end
 
     # @!attribute [w] resource_class_resolver=

data/valkyrie.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = 'An ORM using the Data Mapper pattern, specifically built to solve Digital Repository use cases.'
   spec.homepage      = "https://github.com/samvera/valkyrie"
+  spec.metadata      = { "rubygems_mfa_required" => "true" }
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
@@ -31,7 +32,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'json-ld'
   spec.add_dependency 'json'
   spec.add_dependency 'rdf-vocab'
-  spec.add_dependency 'faraday', '< 1.0'
+  spec.add_dependency 'faraday', '>= 0.9', '!= 2.0.0', '< 3'
+  spec.add_dependency 'faraday-multipart'
 
   spec.add_development_dependency "bundler", "> 1.16.0", "< 3"
   spec.add_development_dependency "rake", ">= 10"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valkyrie
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.beta.1
+  version: 3.0.0.pre.rc.1
 platform: ruby
 authors:
 - Trey Pendragon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-26 00:00:00.000000000 Z
+date: 2022-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct
@@ -174,16 +174,42 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: faraday-multipart
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -428,10 +454,9 @@ files:
 - db/schema.rb
 - 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
-- lib/generators/valkyrie/templates/resource_spec.rb.erb
+- gemfiles/activerecord_7_0.gemfile
+- gemfiles/faraday_0.gemfile
+- gemfiles/faraday_1.gemfile
 - lib/valkyrie.rb
 - lib/valkyrie/adapter_container.rb
 - lib/valkyrie/change_set.rb
@@ -537,7 +562,8 @@ files:
 - valkyrie_logo.png
 homepage: https://github.com/samvera/valkyrie
 licenses: []
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -553,7 +579,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: An ORM using the Data Mapper pattern, specifically built to solve Digital

data/lib/config/database_connection.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-require 'active_record'
-require 'erb'
-
-module DatabaseConnection
-  def self.connect!(env)
-    # Ref https://github.com/puma/puma#clustered-mode
-    ActiveSupport.on_load(:active_record) do
-      ::ActiveRecord::Base.connection_pool.disconnect! if ::ActiveRecord::Base.connected?
-      ::ActiveRecord::Base.configurations = YAML.safe_load(ERB.new(File.read("db/config.yml")).result, [], [], true) || {}
-      config = ::ActiveRecord::Base.configurations[env.to_s]
-      ::ActiveRecord::Base.establish_connection(config)
-    end
-  end
-end

data/lib/generators/valkyrie/resource_generator.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-require 'rails/generators'
-require 'rails/generators/model_helpers'
-
-class Valkyrie::ResourceGenerator < Rails::Generators::NamedBase
-  # Include ModelHelpers to warn about pluralization when generating new models or scaffolds
-  include Rails::Generators::ModelHelpers
-
-  source_root File.expand_path('../templates', __FILE__)
-
-  argument :attributes, type: :array, default: [], banner: 'field:type field:type'
-
-  def create_model
-    template('resource.rb.erb', File.join('app/models', class_path, "#{file_name}.rb"))
-  end
-
-  def create_model_spec
-    return unless rspec_installed?
-    template('resource_spec.rb.erb', File.join('spec/models', class_path, "#{file_name}_spec.rb"))
-  end
-
-  private
-
-  def rspec_installed?
-    defined?(RSpec) && defined?(RSpec::Rails)
-  end
-end

data/lib/generators/valkyrie/templates/resource.rb.erb

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-# Generated with `rails generate valkyrie:model <%= class_name %>`
-class <%= class_name %> < Valkyrie::Resource
-  include Valkyrie::Resource::AccessControls
-<%- attributes.each do |att| -%>
-  attribute :<%= att.name %>, Valkyrie::Types::<%= (att.type == :array) ? 'Array' : 'Set' %>
-<%- end -%>
-end

data/lib/generators/valkyrie/templates/resource_spec.rb.erb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-# Generated with `rails generate valkyrie:model <%= class_name %>`
-require 'rails_helper'
-require 'valkyrie/specs/shared_specs'
-
-RSpec.describe <%= class_name %> do
-  let(:resource_klass) { described_class }
-  it_behaves_like "a Valkyrie::Resource"
-
-  it "has tests" do
-    skip "Add your tests here"
-  end
-end