valkyrie 3.0.0.pre.beta.2 → 3.0.0.pre.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92a63ed951bdc096d910ffcc3b357f5723607c7014dabe1e7e9e1fd83e33c6aa
-  data.tar.gz: 065703d34ed3cc701d72f83fe23a73f56ae504e1f4448db9b35c62c831246049
+  metadata.gz: 750ec9e34bb5fdcf933600cc1cf5732b4e98eec398257d02be08ccf3b7f54d94
+  data.tar.gz: f4ba8f5e531df99149c91937f4057ba5cea53e0db3b3faea0bcb18db7032b31c
 SHA512:
-  metadata.gz: 673a3dd11538cccf8c99de59d303a58ae225bfd672dec42e19c1eb436e5a1112924b49319b72127d1f6cc8c0c555ebb748b2029f3cafb9f81dd5925ac6a3f6b8
-  data.tar.gz: 0b3ecfd44279c35865cd42e50ff7d40cc8d983f87cffccc09573f7c8ded1148e19e3855089bb9bdea72708efa528bb91bdd0f877f4c3b9abd33a7dc52f6c8251
+  metadata.gz: ec513e8410606fada867265d3328cbbdec11ba3f34957f94049aef84c25f879e4c745e14157f0d7dc2c88e5e01fc73bda60ff717308ab0fa064b196c150f4d59
+  data.tar.gz: c9c819f1b3dc93bee6ff287617ad78af8a32c0169e9ecf3803fa0036b5c533c3595b72de44e7763564d42e7be006d45033f207b9c53087fd2ca3067b7f0cc37a

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

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 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

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/specs/shared_specs/queries.rb

@@ -495,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/version.rb

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

data/lib/valkyrie.rb

@@ -73,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
@@ -96,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)/})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valkyrie
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.beta.2
+  version: 3.0.0.pre.beta.3
 platform: ruby
 authors:
 - Trey Pendragon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-15 00:00:00.000000000 Z
+date: 2022-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct
@@ -562,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:
@@ -578,7 +579,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.15
 signing_key:
 specification_version: 4
 summary: An ORM using the Data Mapper pattern, specifically built to solve Digital