valkyrie 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 548ddef374169cdcc984f7990ec0fb0d8b89502a
-  data.tar.gz: 2ca99fe44d1cc2733eecb1b55c7f2ef100bcbe03
+SHA256:
+  metadata.gz: d66ba588c11dfaa509ab8dfe2c43a1018462103121e43fecb07e06e31878155d
+  data.tar.gz: 235551dbdb14be9f7a2034cbcf6a288ebbe6a11511cac31ea1a62fb3dcadfa39
 SHA512:
-  metadata.gz: bce389d966f1728e132f9167e871e44e1a9f2ad595e309a4c995be1eecc58e9fde87235d909823b0be65a6af46d682f8758ad2553c5e39d34cd3dd8da17a5a00
-  data.tar.gz: 6cfdfffce9c65714d45489a7b1aa63c8062c96d24ca45b28036278ddb24b69dd96ce7497e0f03e058eee5e446e1d12b88f10cf081c27bb592c5f76cf4ef4e8e8
+  metadata.gz: d9f8eafb124d7db30b9b6ab51165327877ac9dbd25a71cc8e074eec99880fa64bce7864abaad28ea81d65634567b8937332d42b27046b42490890158ee10da1c
+  data.tar.gz: 9b2877caed49d8e4e1aff11050391c2ccb8bc8259428e69786f3cc0256fc536f3afb05da40ca98e9878024ccacc4367d216cc61f60c18d2f446f1157e479daaa

data/.docker-stack/valkyrie-development/docker-compose.yml

@@ -1,17 +1,24 @@
 ---
 version: '3.4'
 volumes:
-  fedora:
+  fedora4:
+  fedora5:
   db:
   solr_repo:
   solr_index:
 services:
-  fedora:
-    image: nulib/fcrepo4
+  fedora4:
+    image: nulib/fcrepo4:4.7.5
     volumes:
-    - fedora:/data
+    - fedora4:/data
     ports:
     - 8986:8080
+  fedora5:
+    image: nulib/fcrepo4:5.0.0
+    volumes:
+    - fedora5:/data
+    ports:
+    - 8996:8080
   db:
     image: healthcheck/postgres:alpine
     volumes:

data/.docker-stack/valkyrie-test/docker-compose.yml

@@ -1,17 +1,24 @@
 ---
 version: '3.4'
 volumes:
-  fedora:
+  fedora4:
+  fedora5:
   db:
   solr_repo:
   solr_index:
 services:
-  fedora:
-    image: nulib/fcrepo4
+  fedora4:
+    image: nulib/fcrepo4:4.7.5
     volumes:
-    - fedora:/data
+    - fedora4:/data
     ports:
     - 8988:8080
+  fedora5:
+    image: nulib/fcrepo4:5.0.0
+    volumes:
+    - fedora5:/data
+    ports:
+    - 8998:8080
   db:
     image: healthcheck/postgres:alpine
     volumes:

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# v1.4.0 2018-01-08
+
+## Changes since last release.
+
+* Add support for Fedora 5
+  [escowles](https://github.com/escowles)
+
 # v1.3.0 2018-12-03
 
 ## Changes since last release

data/README.md

@@ -241,6 +241,12 @@ By default, it is assumed that a Valkyrie repository implementation shall use a
 1. Run `rake docker:test:down` to stop the server stack
    * The test stack cleans up after itself on exit.
 
+## Fedora 5 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.:
+   ```
+   Valkyrie::Storage::Fedora.new(connection: Ldp::Client.new("http://fedoraAdmin:fedoraAdmin@localhost:8988/rest"), fedora_version: 5)
+   ```
+
 The development and test stacks use fully contained virtual volumes and bind all services to different ports, so they can be running at the same time without issue.
 
 ## Get Help

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

@@ -9,15 +9,19 @@ module Valkyrie::Persistence::Fedora
   #     schema: Valkyrie::Persistence::Fedora::PermissiveSchema.new(title: RDF::URI("http://bad.com/title"))
   #   )
   class MetadataAdapter
-    attr_reader :connection, :base_path, :schema
+    attr_reader :connection, :base_path, :schema, :fedora_version
 
     # @param [Ldp::Client] connection
     # @param [String] base_path
     # @param [Valkyrie::Persistence::Fedora::PermissiveSchema] schema
-    def initialize(connection:, base_path: "/", schema: Valkyrie::Persistence::Fedora::PermissiveSchema.new)
+    # @param [Integer] fedora_version
+    def initialize(connection:, base_path: "/", schema: Valkyrie::Persistence::Fedora::PermissiveSchema.new, fedora_version: 4)
       @connection = connection
       @base_path = base_path
       @schema = schema
+      @fedora_version = fedora_version
+
+      warn "[DEPRECATION] `fedora_version` will default to 5 in the next major release." unless fedora_version
     end
 
     # Construct the query service object using this adapter
@@ -56,7 +60,8 @@ module Valkyrie::Persistence::Fedora
     # @param [RDF::URI] id the Valkyrie ID
     # @return [RDF::URI]
     def id_to_uri(id)
-      RDF::URI("#{connection_prefix}/#{pair_path(id)}/#{CGI.escape(id.to_s)}")
+      prefix = fedora_version == 5 ? "" : "#{pair_path(id)}/"
+      RDF::URI("#{connection_prefix}/#{prefix}#{CGI.escape(id.to_s)}")
     end
 
     # Generate the pairtree path for a given Valkyrie ID

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

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

data/lib/valkyrie/resource.rb

@@ -59,7 +59,7 @@ module Valkyrie
         schema.delete(name)
       end
       define_method("#{name}=") do |value|
-        instance_variable_set("@#{name}", self.class.schema[name].call(value))
+        set_value(name, value)
       end
       type = type.meta(ordered: true) if name == :member_ids
       super(name, type)

data/lib/valkyrie/storage/fedora.rb

@@ -2,13 +2,16 @@
 module Valkyrie::Storage
   # Implements the DataMapper Pattern to store binary data in fedora
   class Fedora
-    attr_reader :connection, :base_path
+    attr_reader :connection, :base_path, :fedora_version
     PROTOCOL = 'fedora://'
 
     # @param [Ldp::Client] connection
-    def initialize(connection:, base_path: "/")
+    def initialize(connection:, base_path: "/", fedora_version: 4)
       @connection = connection
       @base_path = base_path
+      @fedora_version = fedora_version
+
+      warn "[DEPRECATION] `fedora_version` will default to 5 in the next major release." unless fedora_version
     end
 
     # @param id [Valkyrie::ID]
@@ -31,11 +34,13 @@ module Valkyrie::Storage
     # @return [Valkyrie::StorageAdapter::StreamFile]
     def upload(file:, original_filename:, resource:)
       identifier = id_to_uri(resource.id) + '/original'
+      sha1 = fedora_version == 5 ? "sha" : "sha1"
       connection.http.put do |request|
         request.url identifier
         request.headers['Content-Type'] = file.content_type
         request.headers['Content-Disposition'] = "attachment; filename=\"#{original_filename}\""
-        request.headers['digest'] = "sha1=#{Digest::SHA1.file(file)}"
+        request.headers['digest'] = "#{sha1}=#{Digest::SHA1.file(file)}"
+        request.headers['link'] = "<http://www.w3.org/ns/ldp#NonRDFSource>; rel=\"type\""
         request.body = file.tempfile.read
       end
       find_by(id: Valkyrie::ID.new(identifier.to_s.sub(/^.+\/\//, PROTOCOL)))

data/lib/valkyrie/version.rb

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

data/tasks/dev.rake

@@ -7,10 +7,12 @@ namespace :server do
     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")) do |_fcrepo|
-          puts "Setup solr & fedora."
-          loop do
-            sleep(1)
+        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
@@ -22,7 +24,8 @@ namespace :server do
     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")).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."
   end
 
@@ -33,10 +36,12 @@ namespace :server do
 
     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: "fcrepo4-dev-data")) do |_fcrepo|
-          puts "Setup Solr & Fedora"
-          loop do
-            sleep(1)
+        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
@@ -51,7 +56,6 @@ namespace :server do
 
   def shared_fedora_opts
     opts = { managed: true, verbose: true, enable_jms: false, download_dir: "tmp" }
-    opts[:version] = ENV['FCREPO_VERSION'] if ENV['FCREPO_VERSION']
     opts
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valkyrie
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Trey Pendragon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-03 00:00:00.000000000 Z
+date: 2019-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct
@@ -590,7 +590,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: An ORM using the Data Mapper pattern, specifically built to solve Digital