valkyrie 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d82ceafa985dc327a594ad39da9f4feb343579e6330ae7f30a6fd7894471083
-  data.tar.gz: 56f54340890de9a799588b47eb4fb3ee6f400d598db03c7bf97d4163d128d831
+  metadata.gz: a9562026fbee014b2e1f3076826af96c850373e9ff94eeb1921facbad11edcec
+  data.tar.gz: '0119066f0cf241db23c9a29d7f9501803c669df197bda350f0706d2b2db6120d'
 SHA512:
-  metadata.gz: 2676a955ae6333f4c9b82a4f2a0e131bb235e4cdef8b05951bdfb787ac1218a9e2da410a476928482824b909a12ade0f2d6e2074915c3738922ca4f3a8004337
-  data.tar.gz: 67a8b919a2ce033240db9d8b507140f84a8c49edfbf7283f205a41a7a09d2ba99940e5c465f0959cc27ce707e52d68b5e2d04a0f67376f482ae560c4713608ee
+  metadata.gz: 63279c6ea99e08f10dcb8b6aa6cd6fada5d60937852dde46ad08b2923e3d129eb03442be0d4a11640affefeda7367fdabc9d93bb6c90f53b25c71fc12dea7cc4
+  data.tar.gz: cd471fa3caa33b644cca4c5897104225dbdc3fafe0d10a889d102a03e6e5ba74aa9284cd5fc27933ded7c842e2d09f0326d66119290df557f7ca1c29e2c7f2e2

data/.circleci/config.yml

@@ -28,11 +28,16 @@ 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-beta-1
+        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:

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-beta-1
+      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/CHANGELOG.md

@@ -1,4 +1,17 @@
-# v2.1.2 2020-03-12
+# 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
 

data/Rakefile

@@ -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/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/query_service.rb

@@ -52,7 +52,7 @@ module Valkyrie::Persistence::Fedora
     # @return [Array<RDF::URI>]
     def include_uris
       [
-        adapter.fedora_version == 5 ? "http://fedora.info/definitions/fcrepo#PreferInboundReferences" : ::RDF::Vocab::Fcrepo4.InboundReferences
+        [5, 6].include?(adapter.fedora_version) ? "http://fedora.info/definitions/fcrepo#PreferInboundReferences" : ::RDF::Vocab::Fcrepo4.InboundReferences
       ]
     end
 

data/lib/valkyrie/persistence/solr/queries/find_by_alternate_identifier_query.rb

@@ -32,7 +32,7 @@ module Valkyrie::Persistence::Solr::Queries
     # @note the field used here is alternate_ids_ssim and the value is prefixed by "id-"
     # @return [Hash]
     def resource
-      connection.get("select", params: { q: "alternate_ids_ssim:\"id-#{alternate_identifier}\"", fl: "*", rows: 1 })["response"]["docs"].first
+      @resource ||= connection.get("select", params: { q: "alternate_ids_ssim:\"id-#{alternate_identifier}\"", fl: "*", rows: 1 })["response"]["docs"].first
     end
   end
 end

data/lib/valkyrie/persistence/solr/queries/find_by_id_query.rb

@@ -31,7 +31,7 @@ module Valkyrie::Persistence::Solr::Queries
     # Query Solr for for the first document with the ID in a field
     # @return [Hash]
     def resource
-      connection.get("select", params: { q: "id:\"#{id}\"", fl: "*", rows: 1 })["response"]["docs"].first
+      @resource ||= connection.get("select", params: { q: "id:\"#{id}\"", fl: "*", rows: 1 })["response"]["docs"].first
     end
   end
 end

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

@@ -31,7 +31,7 @@ RSpec.shared_examples 'a Valkyrie::Resource' do
       end
     end
 
-    describe "#fields" do
+    describe ".fields" do
       it "returns a set of fields" do
         expect(meta_klass).to respond_to(:fields).with(0).arguments
         expect(meta_klass.fields).to include(:id)

data/lib/valkyrie/storage/fedora.rb

@@ -37,7 +37,7 @@ module Valkyrie::Storage
     def upload(file:, original_filename:, resource:, content_type: "application/octet-stream", # rubocop:disable Metrics/ParameterLists
                resource_uri_transformer: default_resource_uri_transformer, **_extra_arguments)
       identifier = resource_uri_transformer.call(resource, base_url) + '/original'
-      sha1 = fedora_version == 5 ? "sha" : "sha1"
+      sha1 = [5, 6].include?(fedora_version) ? "sha" : "sha1"
       connection.http.put do |request|
         request.url identifier
         request.headers['Content-Type'] = content_type

data/lib/valkyrie/version.rb

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

data/lib/valkyrie/vocab/pcdm_use.rb

@@ -39,10 +39,22 @@ module Valkyrie::Vocab
          "rdf:subClassOf": %(http://pcdm.org/resources#File),
          "rdfs:isDefinedBy": %(pcdmuse:),
          type: "rdfs:Class"
+    term :PreservationFile,
+         comment: %(Best quality representation of the Object appropriate for long-term
+           preservation.),
+         label: "preservation file",
+         "dct:replaces": %(http://pcdm.org/use#PreservationMasterFile),
+         "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."
+    # @deprecated
     term :PreservationMasterFile,
          comment: %(Best quality representation of the Object appropriate for long-term
            preservation.),
          label: "preservation master file",
+         "dct:isReplacedBy": %(http://pcdm.org/use#PreservationFile),
+         "owl:deprecated": true,
          "rdf:subClassOf": %(http://pcdm.org/resources#File),
          "rdfs:isDefinedBy": %(pcdmuse:),
          type: "rdfs:Class"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valkyrie
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Trey Pendragon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-19 00:00:00.000000000 Z
+date: 2021-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct