valkyrie 2.1.2 → 3.0.0.pre.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d82ceafa985dc327a594ad39da9f4feb343579e6330ae7f30a6fd7894471083
-  data.tar.gz: 56f54340890de9a799588b47eb4fb3ee6f400d598db03c7bf97d4163d128d831
+  metadata.gz: 92a63ed951bdc096d910ffcc3b357f5723607c7014dabe1e7e9e1fd83e33c6aa
+  data.tar.gz: 065703d34ed3cc701d72f83fe23a73f56ae504e1f4448db9b35c62c831246049
 SHA512:
-  metadata.gz: 2676a955ae6333f4c9b82a4f2a0e131bb235e4cdef8b05951bdfb787ac1218a9e2da410a476928482824b909a12ade0f2d6e2074915c3738922ca4f3a8004337
-  data.tar.gz: 67a8b919a2ce033240db9d8b507140f84a8c49edfbf7283f205a41a7a09d2ba99940e5c465f0959cc27ce707e52d68b5e2d04a0f67376f482ae560c4713608ee
+  metadata.gz: 673a3dd11538cccf8c99de59d303a58ae225bfd672dec42e19c1eb436e5a1112924b49319b72127d1f6cc8c0c555ebb748b2029f3cafb9f81dd5925ac6a3f6b8
+  data.tar.gz: 0b3ecfd44279c35865cd42e50ff7d40cc8d983f87cffccc09573f7c8ded1148e19e3855089bb9bdea72708efa528bb91bdd0f877f4c3b9abd33a7dc52f6c8251

data/.circleci/config.yml

@@ -28,13 +28,28 @@ jobs:
         environment:
           CATALINA_OPTS: "-Djava.awt.headless=true -Dfile.encoding=UTF-8 -server -Xms512m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m -XX:MaxPermSize=256m -XX:+DisableExplicitGC"
           JAVA_OPTIONS: "-Djetty.http.port=8998 -Dfcrepo.dynamic.jms.port=61618 -Dfcrepo.dynamic.stomp.port=61614"
+      - image: fcrepo/fcrepo:6.0.0
+        environment:
+          CATALINA_OPTS: "-Djava.awt.headless=true -Dfile.encoding=UTF-8 -server -Xms512m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m -XX:MaxPermSize=256m -XX:+DisableExplicitGC -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true"
+          JAVA_OPTS: "-Djetty.http.port=8978 -Dfcrepo.dynamic.jms.port=61619 -Dfcrepo.dynamic.stomp.port=61615 -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true"
       - image: solr:7.7-alpine
         command: bin/solr -cloud -noprompt -f -p 8994
     environment:
       BUNDLE_GEMFILE: << parameters.gemfile >>
       POSTGRES_PORT: 5432
+      FEDORA_6_PORT: 8080
     steps:
       - checkout
+
+      - run:
+          name: Check for 'master' branch
+          command: |
+              git fetch --all --quiet --prune --prune-tags
+              if [[ -n "$(git branch --all --list master */master)" ]]; then
+                  echo "A branch named 'master' was found. Please remove it."
+                  echo "$(git branch --all --list master */master)"
+              fi
+              [[ -z "$(git branch --all --list master */master)" ]]
       - run:
           name: Wait for solr
           command: dockerize -wait tcp://localhost:8994 -timeout 1m
@@ -50,7 +65,7 @@ jobs:
       - restore_cache:
          keys:
            - bundle-{{ checksum "<< parameters.gemfile >>" }}-{{ checksum "valkyrie.gemspec" }}-<< parameters.ruby >>-6
-      - run: sudo apt-get update && sudo apt-get install -y libpq-dev
+      - run: sudo apt update -y && sudo apt-get install -y libpq-dev lsof
       - run:
           name: Set BUNDLE_GEMFILE
           command: |
@@ -83,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
@@ -112,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/.lando.yml

@@ -38,3 +38,21 @@ services:
       ports:
       - 8998:8080
     portforward: true
+  valkyrie_fedora_6:
+    type: compose
+    app_mount: false
+    volumes:
+      fedora6:
+    services:
+      image: fcrepo/fcrepo:6.0.0
+      command:
+        - "catalina.sh"
+        - "run"
+      volumes:
+      - fedora6:/data
+      ports:
+      - 8978:8080
+      environment:
+        CATALINA_OPTS: "-Djava.awt.headless=true -Dfile.encoding=UTF-8 -server -Xms512m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m -XX:MaxPermSize=256m -XX:+DisableExplicitGC -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true"
+        JAVA_OPTS: "-Dfcrepo.dynamic.jms.port=61619 -Dfcrepo.dynamic.stomp.port=61615 -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true"
+    portforward: true

data/.rubocop.yml

@@ -39,3 +39,13 @@ Naming/FileName:
   Exclude:
     - 'Appraisals'
     - 'Gemfile'
+Metrics/MethodLength:
+  Exclude:
+    - 'lib/valkyrie/persistence/postgres/persister.rb'
+    - 'lib/valkyrie/persistence/fedora/persister.rb'
+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,4 +1,64 @@
-# v2.1.2 2020-03-12
+# 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
+
+* More informative NoMethodError for missing custom queries.
+  [no-reply](https://github.com/no-reply)
+* Persisters error if you save something which existed at query time, but has
+  since been deleted.
+* Shared write-only persisters.
+* Solr ModelConverter performance.
+* Don't hold open a file handle from StorageAdapter#upload/find_by
+* Files can be #close'd.
+* Remove Draper
+* Remove deprecated string equality function.
+* Remove deprecated BlacklistedValue.
+* Allow reform upgrade to 2.6.
+* Don't require a specific error message in shared specs
+  [tpendragon](https://github.com/tpendragon)
+
+Additional thanks to the following for code review and issue reports leading to
+this release:
+
+[hackartisan](https://github.com/hackartisan)
+[eliotjordan](https://github.com/eliotjordan)
+
+
+# v2.2.0 2021-05-06
+
+## Changes since last release
+
+* Add support for Fedora 6.
+  [tpendragon](https://github.com/tpendragon)
+* Deprecate pcdmuse:PreservationMasterFile in favor of pcdmuse:PreservationFile
+  [escowles](https://github.com/escowles)
+* Improve spec docs for resource.rb
+  [dchandekstark](https://github.com/dchandekstark)
+* Memoize resource in Solr queries to reduce Solr calls.
+  [dchandekstark](https://github.com/dchandekstark)
+
+# v2.1.2 2021-04-19
 
 ## Changes since last release
 
@@ -47,9 +107,9 @@ this release:
 * Use `::` prefixed names for `JSON::LD` references.
   [no-reply](https://github.com/no-reply)
 * Use SVG instead of PNG for version badge.
-  [hackmastera](https://github.com/hackmastera)
+  [hackartisan](https://github.com/hackartisan)
 * Fix Rubocop for latest Bixby.
-  [hackmastera](https://github.com/hackmastera)
+  [hackartisan](https://github.com/hackartisan)
 * Valkyrie IDs equal string equivalent of ID to String with config
   [jlevnhv](https://github.com/jlevnhv)
 * Add optional model parameter to find_inverse_references_by and
@@ -194,7 +254,7 @@ involved for their contributions in the last year:
 [cjcolvar](https://github.com/cjcolvar)
 [dgcliff](https://github.com/dgcliff)
 [escowles](https://github.com/escowles)
-[hackmastera](https://github.com/hackmastera)
+[hackartisan](https://github.com/hackartisan)
 [jeremyf](https://github.com/jeremyf)
 [jrgriffiniii](https://github.com/jrgriffiniii)
 [kelynch](https://github.com/kelynch)
@@ -275,17 +335,17 @@ this release:
 * Provide a warning when postgres adapter overwrites an ID, deprecate this
   behavior so it will throw an exception in the future.
   [cam156](https://github.com/cam156)
-  [hackmastera](https://github.com/hackmastera)
+  [hackartisan](https://github.com/hackartisan)
   [tpendragon](https://github.com/tpendragon)
 * Add support for passing just an ID to find_inverse_references_by
   [cam156](https://github.com/cam156)
-  [hackmastera](https://github.com/hackmastera)
+  [hackartisan](https://github.com/hackartisan)
 * Fix memory adapter raising an exception in find_by_alternate_identifier when
   there are resources without the alternate_identifier attribute.
   [jeremyf](https://github.com/jeremyf)
 * Provide a warning when using the postgres adapter without manually providing
   the pg gem, so it can be an optional dependency in 2.0.0.
-  [hackmastera](https://github.com/hackmastera)
+  [hackartisan](https://github.com/hackartisan)
 * Provide guidance in specs on how to define alternate_ids
   [cjcolvar](https://github.com/cjcolvar)
 * Upload files to Fedora using form/multipart.
@@ -331,17 +391,17 @@ Additional thanks to the following for code review:
 * Provide a warning when postgres adapter overwrites an ID, deprecate this
   behavior so it will throw an exception in the future.
   [cam156](https://github.com/cam156)
-  [hackmastera](https://github.com/hackmastera)
+  [hackartisan](https://github.com/hackartisan)
   [tpendragon](https://github.com/tpendragon)
 * Add support for passing just an ID to find_inverse_references_by
   [cam156](https://github.com/cam156)
-  [hackmastera](https://github.com/hackmastera)
+  [hackartisan](https://github.com/hackartisan)
 * Fix memory adapter raising an exception in find_by_alternate_identifier when
   there are resources without the alternate_identifier attribute.
   [jeremyf](https://github.com/jeremyf)
 * Provide a warning when using the postgres adapter without manually providing
   the pg gem, so it can be an optional dependency in 2.0.0.
-  [hackmastera](https://github.com/hackmastera)
+  [hackartisan](https://github.com/hackartisan)
 * Provide guidance in specs on how to define alternate_ids
   [cjcolvar](https://github.com/cjcolvar)
 * Upload files to Fedora using form/multipart.
@@ -392,7 +452,7 @@ this release:
 ## Changes since last release
 
 * Fix solr persister to pass through exceptions on timeout
-  [hackmastera](https://github.com/hackmastera)
+  [hackartisan](https://github.com/hackartisan)
 * Fix generated specs to work with shared_specs expectation
   [revgum](https://github.com/revgum)
 
@@ -439,7 +499,7 @@ following participants who made it happen:
 * [cam156](https://github.com/cam156)
 * [DanCoughlin](https://github.com/DanCoughlin)
 * [escowles](https://github.com/escowles)
-* [hackmastera](https://github.com/hackmastera)
+* [hackartisan](https://github.com/hackartisan)
 * [jrgriffiniii](https://github.com/jrgriffiniii)
 * [mtribone](https://github.com/mtribone)
 * [tpendragon](https://github.com/tpendragon)
@@ -456,7 +516,7 @@ following participants who made it happen:
 ## Changes since last release
 
 * Loosened ActiveRecord restriction to allow upgrading pg gem to 1.0.
-    [hackmastera](https://github.com/hackmastera)
+    [hackartisan](https://github.com/hackartisan)
 
 # v1.1.0 2018-05-08
 
@@ -535,7 +595,7 @@ Initial Release
 * [dlpierce](https://github.com/dlpierce)
 * [escowles](https://github.com/escowles)
 * [geekscruff](https://github.com/geekscruff)
-* [hackmastera](https://github.com/hackmastera)
+* [hackartisan](https://github.com/hackartisan)
 * [jcoyne](https://github.com/jcoyne)
 * [jeremyf](https://github.com/jeremyf)
 * [jgondron](https://github.com/jgondron)

data/CONTRIBUTING.md

@@ -22,6 +22,28 @@ https://wiki.duraspace.org/display/samvera/Samvera+Community+Intellectual+Proper
 
 You should also add yourself to the `CONTRIBUTORS.md` file in the root of the project.
 
+## Language
+The language we use matters.  Today, tomorrow, and for years to come
+people will read the code we write.  They will judge us for our
+design, logic, and the words we use to describe the system.
+Our words should be accessible.  Favor descriptive words that give
+meaning while avoiding reinforcing systemic inequities.  For example,
+in the Samvera community, we should favor using allowed\_list instead
+of whitelist, denied\_list instead of blacklist, or source/copy
+instead of master/slave.
+We're going to get it wrong, but this is a call to keep working to
+make it right.  View our code and the words we choose as a chance to
+have a conversation. A chance to grow an understanding of the systems
+we develop as well as the systems in which we live.
+See [“Blacklists” and “whitelists”: a salutary warning concerning the
+prevalence of racist language in discussions of predatory
+publishing](https://www.ncbi.nlm.nih.gov/pmc/articles/PMC6148600/) for
+further details.
+
+If you're working on PR for this project, create a feature branch off of `main`.
+
+Please ***do not*** create a branch called `master` for this repository or as part of your pull request; the branch will either need to be removed or renamed before it can be considered for inclusion in the code base and history of our repositories.
+
 ## Contribution Tasks
 
 * Reporting Issues
@@ -45,10 +67,10 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
 
 * Fork the repository on GitHub
 * Create a topic branch from where you want to base your work.
-  * This is usually the master branch.
-  * To quickly create a topic branch based on master; `git branch fix/master/my_contribution master`
-  * Then checkout the new branch with `git checkout fix/master/my_contribution`.
-  * Please avoid working directly on the `master` branch.
+  * This is usually the main branch.
+  * To quickly create a topic branch based on main; `git branch fix/main/my_contribution main`
+  * Then checkout the new branch with `git checkout fix/main/my_contribution`.
+  * Please avoid working directly on the `main` branch.
   * You may find the [hub suite of commands](https://github.com/defunkt/hub) helpful
 * Make sure you have added sufficient tests and documentation for your changes.
   * Test functionality with RSpec; Test features / UI with Capybara.
@@ -109,15 +131,15 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
 ### Submitting Changes
 
 * Read the article ["Using Pull Requests"](https://help.github.com/articles/using-pull-requests) on GitHub.
-* Make sure your branch is up to date with its parent branch (i.e. master)
-  * `git checkout master`
+* Make sure your branch is up to date with its parent branch (i.e. main)
+  * `git checkout main`
   * `git pull --rebase`
   * `git checkout <your-branch>`
-  * `git rebase master`
+  * `git rebase main`
   * It is a good idea to run your tests again.
 * If you've made more than one commit take a moment to consider whether squashing commits together would help improve their logical grouping.
   * [Detailed Walkthrough of One Pull Request per Commit](http://ndlib.github.io/practices/one-commit-per-pull-request/)
-  * `git rebase --interactive master` ([See Github help](https://help.github.com/articles/interactive-rebase))
+  * `git rebase --interactive main` ([See Github help](https://help.github.com/articles/interactive-rebase))
   * Squashing your branch's changes into one commit is "good form" and helps the person merging your request to see everything that is going on.
 * Push your changes to a topic branch in your fork of the repository.
 * Submit a pull request from your fork to the project.

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
@@ -239,7 +224,7 @@ custom adapters, but your application will still work.
 Using the shared specs in your own models is described in more detail on the [Shared Specs Wiki
 page](https://github.com/samvera/valkyrie/wiki/Shared-Specs).
 
-### Fedora 5 Compatibility
+### Fedora 5/6 Compatibility
 When configuring your adapter, include the `fedora_version` parameter in your metadata or storage adapter
 config.  If Fedora requires auth, you can also include that in the URL, e.g.:
 
@@ -282,3 +267,7 @@ This software has been developed by and is brought to you by the Samvera communi
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/samvera/valkyrie/.
+
+If you're working on PR for this project, create a feature branch off of `main`.
+
+This repository follows the [Samvera Community Code of Conduct](https://samvera.atlassian.net/wiki/spaces/samvera/pages/405212316/Code+of+Conduct) and [language recommendations](https://github.com/samvera/maintenance/blob/master/templates/CONTRIBUTING.md#language).  Please ***do not*** create a branch called `master` for this repository or as part of your pull request; the branch will either need to be removed or renamed before it can be considered for inclusion in the code base and history of this repository.

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'
@@ -32,6 +32,11 @@ namespace :db do
   task configure_connection: :configuration do
     DatabaseConnection.connect!(DATABASE_ENV)
     ActiveRecord::Base.logger = Logger.new STDOUT if @config['logger']
+    @config = if ::ActiveRecord::Base.configurations.respond_to?(:configs_for)
+                ::ActiveRecord::Base.configurations.configs_for(env_name: DATABASE_ENV.to_s)[0]
+              else
+                ::ActiveRecord::Base.configurations[DATABASE_ENV.to_s]
+              end
   end
 
   desc 'Create the database from db/config.yml for the current DATABASE_ENV'

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/id.rb

@@ -25,27 +25,12 @@ module Valkyrie
     delegate :hash, to: :state
 
     def eql?(other)
-      return string_equality(other) if Valkyrie.config.id_string_equality == true
-      default_equality(other)
+      other == to_str
     end
     alias == eql?
 
     protected
 
-    def default_equality(other)
-      output = (other.class == self.class && other.state == state)
-      return output if output == true
-      if output == false && string_equality(other) && Valkyrie.config.id_string_equality.nil?
-        warn "[DEPRECATION] Valkyrie::IDs will always be equal to their string counterparts in 3.0.0. " \
-          "To silence this message, please either compare IDs or set Valkyrie.config.id_string_equality = true."
-      end
-      false
-    end
-
-    def string_equality(other)
-      other == to_str
-    end
-
     def state
       [@id]
     end

data/lib/valkyrie/persistence/buffered_persister.rb

@@ -24,8 +24,8 @@ module Valkyrie::Persistence
       @buffer_class = buffer_class
     end
 
-    def save(resource:)
-      persister.save(resource: resource)
+    def save(resource:, external_resource: false)
+      persister.save(resource: resource, external_resource: external_resource)
     end
 
     def save_all(resources:)

data/lib/valkyrie/persistence/composite_persister.rb

@@ -24,14 +24,14 @@ module Valkyrie::Persistence
     end
 
     # (see Valkyrie::Persistence::Memory::Persister#save)
-    def save(resource:)
+    def save(resource:, external_resource: false)
       # Assume the first persister is the canonical data store; that's the optlock we want
       first, *rest = *persisters
-      cached_resource = first.save(resource: resource)
+      cached_resource = first.save(resource: resource, external_resource: external_resource)
       # Don't pass opt lock tokens to other persisters
       internal_resource = cached_resource.dup
       internal_resource.clear_optimistic_lock_token!
-      rest.inject(internal_resource) { |m, persister| persister.save(resource: m) }
+      rest.inject(internal_resource) { |m, persister| persister.save(resource: m, external_resource: true) }
       # return the one with the desired opt lock token
       cached_resource
     end

data/lib/valkyrie/persistence/custom_query_container.rb

@@ -39,25 +39,17 @@ module Valkyrie::Persistence
     attr_reader :query_service, :query_handlers
     def initialize(query_service:)
       @query_service = query_service
-      @query_handlers = []
+      @query_handlers = {}
     end
 
     def register_query_handler(query_handler)
-      @query_handlers << query_handler
-    end
-
-    def method_missing(meth_name, *args, &block)
-      query_handler = find_query_handler(meth_name).new(query_service: query_service)
-      return super unless query_handler
-      query_handler.__send__(meth_name, *args, &block)
-    end
-
-    def find_query_handler(method)
-      query_handlers.find { |x| x.queries.include?(method) }
-    end
-
-    def respond_to_missing?(meth_name, _args)
-      find_query_handler(meth_name).present?
+      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)
+        end
+      end
     end
   end
 end

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

@@ -58,7 +58,7 @@ module Valkyrie::Persistence::Fedora
     # @param [RDF::URI] id the Valkyrie ID
     # @return [RDF::URI]
     def id_to_uri(id)
-      prefix = fedora_version == 5 ? "" : "#{pair_path(id)}/"
+      prefix = [5, 6].include?(fedora_version) ? "" : "#{pair_path(id)}/"
       RDF::URI("#{connection_prefix}/#{prefix}#{CGI.escape(id.to_s)}")
     end
 
@@ -71,6 +71,10 @@ module Valkyrie::Persistence::Fedora
       id.to_s.split(/[-\/]/).first.split("").each_slice(2).map(&:join).join("/")
     end
 
+    def url_prefix
+      connection.http.url_prefix
+    end
+
     # Generate the prefix used in HTTP requests to the Fedora RESTful endpoint
     # @return [String]
     def connection_prefix

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/fedora/persister/model_converter.rb

@@ -313,7 +313,6 @@ module Valkyrie::Persistence::Fedora
         end
 
         # Generate a new RDF hash URI for the "child" graph for the ModelConverter::Property
-        # @see https://github.com/fcrepo4/fcrepo4/blob/master/fcrepo-kernel-modeshape/src/main/java/org/fcrepo/kernel/modeshape/rdf/JcrRdfTools.java#L455
         # @return [RDF::Graph]
         def subject_uri
           @subject_uri ||= ::RDF::URI(RDF::Node.new.to_s.gsub("_:", "#"))