active-fedora 15.0.2 → 16.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1bb5230c1f80099f942e283a26cf7e07798387634c350047d2961b23235c6b2
-  data.tar.gz: c0ef73d8128a926f8f4838d9b6c5d4cd5d3cddf3ff7f326a1d01b8e0ae6e5b63
+  metadata.gz: f5d0386b3a13967268eb18a96ea04dd3df72727560894ce0b57384b30c5dd2ef
+  data.tar.gz: a279cfdf64d1c3a792cd5660b58f84468ab97162bf3fdc0d3998d61873220cd9
 SHA512:
-  metadata.gz: 7aaee50903bd5328dcbafc6ebd01b399a4d008cd55049301e64bc2891fed0a6ddd9eb766de1274df86b6d3d9b7521740db8ec183ea01df3b989b3b81a63334e6
-  data.tar.gz: e4335a6571e38cc2577e1ee170405bb4692df7ed3efd292b4c48b12f9709a7b1407b99ae70ada41267787b21f1e774b7cee6b108d56941c7f57647a0822f2b51
+  metadata.gz: fe5eaad145521121a5fa40ae7b17e76833b3dc42fbccb478be53862af54d5cbd9fa6f183dcf1af8662a0244ce005384c8843e4c05401f263b668bc0d0d6eee75
+  data.tar.gz: d67621a40ef2dd9225a94393645a08d878af77f7802d2a1a45fc508c8216dc9c14b74722a0e8418e2d647f47f569c61e76f918f99b24382467b55cc365f52d81

data/.circleci/config.yml

@@ -3,8 +3,10 @@ orbs:
   samvera: samvera/circleci-orb@1.0
 jobs:
   bundle_lint_test:
-    resource_class: medium+
     parameters:
+      ruby_type:
+        type: string
+        default: 'ruby'
       ruby_version:
         type: string
       bundler_version:
@@ -15,31 +17,30 @@ jobs:
       solr_config_path:
         type: string
         default: lib/generators/active_fedora/config/solr/templates/solr/conf
-      ruby_type:
-        type: string
-        default: 'ruby'
       solr_port:
         type: string
         default: '8985'
       fcrepo_version:
         type: string
-        default: "4.7.5"
+        default: "5.1.0"
       solr_version:
         type: string
-        default: "9.10.1"
+        default: "9"
     docker:
       - image: cimg/<< parameters.ruby_type >>:<< parameters.ruby_version >>-browsers
-      - image: samvera/fcrepo4:<< parameters.fcrepo_version >>
+      - image: fcrepo/fcrepo:6.5-tomcat9
         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_OPTS: -Dfcrepo.autoversioning.enabled=false -Dfcrepo.external.content.allowed=/fcrepo_allow.txt
+        command: |
+          /bin/bash -c "echo 'http://fedoraAdmin:fedoraAdmin@localhost:8080/' > /fcrepo_allow.txt && catalina.sh run"
       - image: zookeeper:3.9
         environment:
           ZOO_ADMINSERVER_ENABLED: false
       - image: solr:<< parameters.solr_version >>
         environment:
           VERBOSE: yes
-          SOLR_OPTS: "-Dsolr.config.lib.enabled=true"
           SECURITY_JSON: '{"authentication":{"blockUnknown": false, "class":"solr.BasicAuthPlugin", "credentials":{"solr":"IV0EHq1OnNrj6gvRCwvFwTrZ1+z1oBbnQdiVC3otuq0= Ndd7LKvVBAaZIF0QAVi1ekCfAJXr1GGfLtRUXhgrF8c="}, "realm":"My Solr users", "forwardCredentials": false}, "authorization":{ "class":"solr.RuleBasedAuthorizationPlugin", "permissions":[{"name":"security-edit", "role":"admin"}], "user-role":{"solr":"admin"}}}'
+          SOLR_MODULES: "analysis-extras,extraction"
         command: sh -c "server/scripts/cloud-scripts/zkcli.sh -zkhost localhost:2181 -cmd put /security.json \"${SECURITY_JSON}\" && solr-fg -cloud -noprompt  -p << parameters.solr_port >> -z localhost:2181"
     environment:
       BUNDLE_PATH: vendor/bundle
@@ -50,6 +51,8 @@ jobs:
       FCREPO_TEST_PORT: 8080
       SPEC_OPTS: --profile 10 --format RspecJunitFormatter --out /tmp/test-results/rspec.xml --format progress
       RAILS_VERSION: << parameters.rails_version >>
+      FCREPO_PORT: 8080
+      FCREPO_REST_PATH: fcrepo/rest
     steps:
       - samvera/cached_checkout
       - checkout
@@ -83,45 +86,54 @@ jobs:
 workflows:
   ci:
     jobs:
-      # Ruby 4.0 releases
+      # Ruby 3.4 releases
       - bundle_lint_test:
-          name: ruby4-0_rails8-1
-          ruby_version: 4.0.7
-          rails_version: 8.1.3.1
+          name: ruby3-4_rails8-0
+          ruby_version: 3.4.4
+          rails_version: 8.0.2
+      # Ruby 3.3 releases
       - bundle_lint_test:
-          name: ruby4-0_rails8-0
-          ruby_version: 4.0.7
-          rails_version: 8.0.5.1
+          name: ruby3-3_rails7-2
+          ruby_version: 3.3.4
+          rails_version: 7.2.0
       - bundle_lint_test:
-          name: ruby_4-0_rails7-2
-          ruby_version: 4.0.7
-          rails_version: 7.2.3.2
-      # Ruby 3.4 releases
+          name: ruby3-3_rails7-1
+          ruby_version: 3.3.4
+          rails_version: 7.1.3.4
       - bundle_lint_test:
-          name: ruby3-4_rails8-1
-          ruby_version: 3.4.10
-          rails_version: 8.1.3.1
+          name: ruby3-3_rails7-0
+          ruby_version: 3.3.4
+          rails_version: 7.0.8.4
       - bundle_lint_test:
-          name: ruby3-4_rails8-0
-          ruby_version: 3.4.10
-          rails_version: 8.0.5.1
+          name: ruby3-3_rails6-1
+          ruby_version: 3.3.4
+          rails_version: 6.1.7.8
+      # Ruby 3.2 releases
       - bundle_lint_test:
-          name: ruby_3-4_rails7-2
-          ruby_version: 3.4.10
-          rails_version: 7.2.3.2
-      # Ruby 3.3 releases
+          name: ruby3-2_rails7-1
+          ruby_version: 3.2.5
+          rails_version: 7.1.3.4
+      - bundle_lint_test:
+          name: ruby3-2_rails7-0
+          ruby_version: 3.2.5
+          rails_version: 7.0.8.4
+      - bundle_lint_test:
+          name: ruby3-2_rails6-1
+          ruby_version: 3.2.5
+          rails_version: 6.1.7.8
+      # Ruby 3.1 releases
       - bundle_lint_test:
-          name: ruby3-3_rails8-1
-          ruby_version: 3.3.12
-          rails_version: 8.1.3.1
+          name: ruby3-1_rails7-1
+          ruby_version: 3.1.6
+          rails_version: 7.1.3.4
       - bundle_lint_test:
-          name: ruby3-3_rails8-0
-          ruby_version: 3.3.12
-          rails_version: 8.0.5.1
+          name: ruby3-1_rails7-0
+          ruby_version: 3.1.6
+          rails_version: 7.0.8.4
       - bundle_lint_test:
-          name: ruby_3-3_rails7-2
-          ruby_version: 3.3.12
-          rails_version: 7.2.3.2
+          name: ruby3-1_rails6-1
+          ruby_version: 3.1.6
+          rails_version: 6.1.7.8
 
   nightly:
     triggers:
@@ -132,42 +144,51 @@ workflows:
               only:
                 - main
     jobs:
-      # Ruby 4.0 releases
+      # Ruby 3.4 releases
       - bundle_lint_test:
-          name: ruby4-0_rails8-1
-          ruby_version: 4.0.7
-          rails_version: 8.1.3.1
+          name: ruby3-4_rails8-0
+          ruby_version: 3.4.4
+          rails_version: 8.0.2
+      # Ruby 3.3 releases
       - bundle_lint_test:
-          name: ruby4-0_rails8-0
-          ruby_version: 4.0.7
-          rails_version: 8.0.5.1
+          name: ruby3-3_rails7-2
+          ruby_version: 3.3.4
+          rails_version: 7.2.0
       - bundle_lint_test:
-          name: ruby_4-0_rails7-2
-          ruby_version: 4.0.7
-          rails_version: 7.2.3.2
-      # Ruby 3.4 releases
+          name: ruby3-3_rails7-1
+          ruby_version: 3.3.4
+          rails_version: 7.1.3.4
       - bundle_lint_test:
-          name: ruby3-4_rails8-1
-          ruby_version: 3.4.10
-          rails_version: 8.1.3.1
+          name: ruby3-3_rails7-0
+          ruby_version: 3.3.4
+          rails_version: 7.0.8.4
       - bundle_lint_test:
-          name: ruby3-4_rails8-0
-          ruby_version: 3.4.10
-          rails_version: 8.0.5.1
+          name: ruby3-3_rails6-1
+          ruby_version: 3.3.4
+          rails_version: 6.1.7.8
+      # Ruby 3.2 releases
       - bundle_lint_test:
-          name: ruby_3-4_rails7-2
-          ruby_version: 3.4.10
-          rails_version: 7.2.3.2
-      # Ruby 3.3 releases
+          name: ruby3-2_rails7-1
+          ruby_version: 3.2.5
+          rails_version: 7.1.3.4
+      - bundle_lint_test:
+          name: ruby3-2_rails7-0
+          ruby_version: 3.2.5
+          rails_version: 7.0.8.4
+      - bundle_lint_test:
+          name: ruby3-2_rails6-1
+          ruby_version: 3.2.5
+          rails_version: 6.1.7.8
+      # Ruby 3.1 releases
       - bundle_lint_test:
-          name: ruby3-3_rails8-1
-          ruby_version: 3.3.12
-          rails_version: 8.1.3.1
+          name: ruby3-1_rails7-1
+          ruby_version: 3.1.6
+          rails_version: 7.1.3.4
       - bundle_lint_test:
-          name: ruby3-3_rails8-0
-          ruby_version: 3.3.12
-          rails_version: 8.0.5.1
+          name: ruby3-1_rails7-0
+          ruby_version: 3.1.6
+          rails_version: 7.0.8.4
       - bundle_lint_test:
-          name: ruby_3-3_rails7-2
-          ruby_version: 3.3.12
-          rails_version: 7.2.3.2
+          name: ruby3-1_rails6-1
+          ruby_version: 3.1.6
+          rails_version: 6.1.7.8

data/.fcrepo_wrapper

@@ -0,0 +1,10 @@
+# Place any default configuration for solr_wrapper here
+port: 8986
+version: 6.4.0
+enable_jms: false
+java_options: ['-Dfcrepo.log.http.api=DEBUG','-Dfcrepo.log.kernel=ERROR','-Xmx512m',
+  '-Dfcrepo.external.content.allowed=config/fcrepo_allow.txt', '-Dfcrepo.autoversioning.enabled=false']
+#managed: true
+#fcrepo_home_dir: tmp/fcrepo-development-data
+url: https://github.com/fcrepo/fcrepo/releases/download/fcrepo-6.4.0/fcrepo-webapp-6.4.0-jetty-console.jar
+ignore_md5sum: true

data/.rubocop.yml

@@ -248,6 +248,9 @@ Rails/FilePath:
 Rails/ActiveRecordAliases:
   Enabled: false
 
+Rails/RakeEnvironment:
+  Enabled: false
+
 Rails/SkipsModelValidations:
   Enabled: false
 

data/.solr_wrapper

@@ -1,5 +1,5 @@
 # Place any default configuration for solr_wrapper here
-# version: 6.1.0
+version: 7.7.3
 port: 8985
 collection:
   dir: lib/generators/active_fedora/config/solr/templates/solr/conf/

data/Gemfile

@@ -25,5 +25,3 @@ gem 'jruby-openssl', platform: :jruby
 
 # rdf-tabular has a dependency on csv but it was removed from the ruby standard library starting in 3.4
 gem "csv", "~> 3.0" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.3')
-
-gem 'json', '< 3.0' # ActiveSupport::JSON only stops passing the quirks_mode kwarg that json 3.0 dropped

data/Upgrading.md

@@ -0,0 +1,46 @@
+# Upgrading to ActiveFedora 16+
+
+ActiveFedora 16+ is built for use with Fedora 6+.
+
+## Changes from ActiveFedora 15
+
+- Direct/Indirect container classes now specified in headers required by Fedora 5+
+- External files supported via a Link header (see ActiveFedora::File::External)
+- Versioning updated based upon Fedora's use of Memento
+- Ability to restore previous versions removed
+
+## Upgrade considerations
+
+- You may want to turn off autoversioning in Fedora (`fcrepo.autoversioning.enabled=false`) if you edit objects frequently.
+- Be sure to allocate sufficient memory (2-4 GB) to the import-export tools.
+- The Fedora 4 export and Fedora 5/6 data directories have lots of files so file system operations can take a LONG time.
+
+## Upgrading from Fedora 4 (without versions)
+
+1. Install Java 21+
+2. Download [fcrepo-import-export](https://github.com/fcrepo-exts/fcrepo-import-export/) 1.2.0 or higher.
+3. Export from Fedora 4 (update --resource url to match the root of your fedora instance):
+```
+java -jar fcrepo-import-export-1.2.0.jar -b --dir fcrepo4.7.5_export --user fedoraAdmin:fedoraAdmin --mode export --resource http://fedora:8080/fedora/rest --binaries --membership --auditLog > importexport_`date +%Y%m%dT%H%M%S`.log 2>&1
+```
+4. Check that all objects were exported (uses ripgrep):
+```
+rg '^<(http://fedora:8080/fedora/[^#:]*)>$' -g '*.ttl' fcrepo4.7.5_export/ --no-heading -m 1 -INor '$1' | sort | uniq > subject_ids
+rg '<(http://fedora:8080/fedora/[^#:]*)>.*[.;]$' -g '*.ttl' fcrepo4.7.5_export/ --no-heading -INor '$1' | sort | uniq > object_ids
+comm -13 subject_ids object_ids > missing_ids
+```
+5. (If necessary) Restart export from missing_ids file (can also be done with remaining file if export does not finish successfully):
+```
+java -jar fcrepo-import-export-1.2.0.jar --dir fcrepo4.7.5_export --user fedoraAdmin:fedoraAdmin --mode export --repositoryRoot http://fedora:8080/fedora/rest --resourcesFile missing_ids --binaries --membership --auditLog > importexport_`date +%Y%m%dT%H%M%S`.log 2>&1
+``` 
+6. Download [fcrepo-upgrade-utils](https://github.com/fcrepo-exts/fcrepo-upgrade-utils/) 6.4.0 or higher.  (6.4.0 has not been released yet so use the [Avalon patched version](https://github.com/avalonmediasystem/fcrepo-upgrade-utils/releases/download/6.3.0-AVALON/fcrepo-upgrade-utils-6.3.0-AVALON.jar) for now.)
+7. Migrate Fedora 4 export to Fedora 5:
+```
+java -jar fcrepo-upgrade-utils-6.3.0-AVALON.jar --input-dir fcrepo4.7.5_export --output-dir fcrepo5_export --source-version 4.7.5 --target-version 5+ > upgrade_5_`date +%Y%m%dT%H%M%S`.log 2>&1
+```
+8. Migrate Fedora 5 data directory to Fedora 6 (be sure that --base-uri matches --resource from the Fedora 4 export):
+```
+java --add-opens java.base/java.util.concurrent=ALL-UNNAMED -jar fcrepo-upgrade-utils-6.3.0-AVALON.jar --input-dir fcrepo5_export --output-dir fcrepo6_export  --source-version 5+ --target-version 6+ --base-uri http://fedora:8080/fedora/rest > upgrade_6_`date +%Y%m%dT%H%M%S`.log 2>&1
+```
+9. Copy Fedora 6 data directory to `fcrepo.home` and startup Fedora
+This will kick off Fedora's indexing which can take hours depending on the size of your repository.  During indexing Fedora will not respond to requests.

data/active-fedora.gemspec

@@ -20,11 +20,12 @@ Gem::Specification.new do |s|
   s.add_dependency "activesupport", '>= 6.1'
   s.add_dependency "active-triples", '>= 0.11.0', '< 2.0.0'
   s.add_dependency "deprecation"
-  s.add_dependency 'faraday', '>= 1.0'
+  s.add_dependency 'faraday', '>= 2.0'
   s.add_dependency 'faraday-encoding', '>= 0.0.5'
+  s.add_dependency 'faraday-follow_redirects'
   s.add_dependency "ldp", '>= 0.7.0', '< 2'
   s.add_dependency "mutex_m"
-  s.add_dependency 'rsolr', '>= 1.1.2', '< 4'
+  s.add_dependency 'rsolr', '>= 1.1.2', '< 3'
   s.add_dependency "ruby-progressbar", '~> 1.0'
 
   s.add_development_dependency "bixby"
@@ -47,4 +48,5 @@ Gem::Specification.new do |s|
     "README.md"
   ]
   s.require_paths = ["lib"]
+  s.post_install_message = "ActiveFedora 16+ is built for Fedora 6+.  See Upgrading.md for important changes from ActiveFedora 15 and hints for using the Fedora upgrade tools to migrate from Fedora 4."
 end

data/config/fcrepo_allow.txt

@@ -0,0 +1,3 @@
+https://example.com/
+http://example.com/
+http://localhost:8986/

data/lib/active_fedora/attached_files.rb

@@ -80,6 +80,8 @@ module ActiveFedora
         node.content = file
         node.mime_type = opts[:mime_type]
         node.original_name = opts[:original_name]
+        node.external_uri = opts[:external_uri]
+        node.external_handling = opts[:external_handling]
       end
     end
 

data/lib/active_fedora/change_set.rb

@@ -32,7 +32,9 @@ module ActiveFedora
         elsif key == 'type'.freeze
           # working around https://github.com/ActiveTriples/ActiveTriples/issues/122
           predicate = ::RDF.type
-          result[predicate] = graph.query({ subject: object.rdf_subject, predicate: predicate })
+          result[predicate] = graph.query({ subject: object.rdf_subject, predicate: predicate }).select do |statement|
+            !statement.object.to_s.start_with?("http://fedora.info/definitions/v4/repository#", "http://www.w3.org/ns/ldp#")
+          end
         elsif object.local_attributes.include?(key)
           raise "Unable to find a graph predicate corresponding to the attribute: \"#{key}\""
         end

data/lib/active_fedora/clean_connection.rb

@@ -13,6 +13,7 @@ module ActiveFedora
 
       def omit_uris
         [
+          "http://fedora.info/definitions/fcrepo#ServerManaged",
           ::RDF::Vocab::Fcrepo4.ServerManaged,
           ::RDF::Vocab::LDP.PreferContainment,
           ::RDF::Vocab::LDP.PreferEmptyContainer,

data/lib/active_fedora/containers/direct_container.rb

@@ -1,5 +1,4 @@
 module ActiveFedora
   class DirectContainer < Container
-    type ::RDF::Vocab::LDP.DirectContainer
   end
 end

data/lib/active_fedora/containers/indirect_container.rb

@@ -1,7 +1,5 @@
 module ActiveFedora
   class IndirectContainer < Container
-    type ::RDF::Vocab::LDP.IndirectContainer
-
     property :inserted_content_relation, predicate: ::RDF::Vocab::LDP.insertedContentRelation
   end
 end

data/lib/active_fedora/file/external.rb

@@ -0,0 +1,39 @@
+module ActiveFedora::File::External
+  HANDLING_TYPES = ['redirect', 'proxy', 'copy'].freeze
+
+  def external_uri
+    @external_uri ||= fetch_external_uri
+  end
+
+  def external_uri=(uri)
+    @external_uri = uri
+  end
+
+  def external_handling=(handling)
+    @external_handling = handling
+  end
+
+  def external_handling
+    @external_handling ||= fetch_external_handling
+  end
+
+  private
+
+    def fetch_external_uri
+      return if new_record?
+      ldp_source.head.response.headers['Content-Location']
+    end
+
+    def fetch_external_handling
+      return if new_record?
+      response = ldp_source.head.response
+      return unless response.headers.key?('Content-Location')
+
+      case response.status
+      when Net::HTTPRedirection
+        'redirect'
+      when Net::HTTPSuccess
+        'proxy'
+      end
+    end
+end

data/lib/active_fedora/file/streaming.rb

@@ -1,17 +1,17 @@
+require 'faraday/follow_redirects'
+
 module ActiveFedora::File::Streaming
   # @param range [String] the Range HTTP header
   # @return [Stream] an object that responds to each
   def stream(range = nil)
     uri = URI.parse(self.uri)
-    FileBody.new(uri, headers(range, authorization_key))
+    FileBody.new(uri, headers(range, nil))
   end
 
   # @param range [String] from #stream
-  # @param key [String] from #authorization_key
   # @return [Hash]
-  def headers(range, key, result = {})
+  def headers(range, _key, result = {})
     result["Range"] = range if range
-    result["Authorization"] = key if key
     result
   end
 
@@ -22,32 +22,35 @@ module ActiveFedora::File::Streaming
       @headers = headers
     end
 
-    def each(no_of_requests_limit = 3, &block)
-      raise ArgumentError, 'HTTP redirect too deep' if no_of_requests_limit.zero?
-      Net::HTTP.start(uri.host, uri.port, use_ssl: (uri.scheme == 'https')) do |http|
-        request = Net::HTTP::Get.new uri, headers
-        http.request request do |response|
-          case response
-          when Net::HTTPSuccess
-            response.read_body do |chunk|
-              yield chunk
-            end
-          when Net::HTTPRedirection
-            no_of_requests_limit -= 1
-            @uri = URI(response["location"])
-            each(no_of_requests_limit, &block)
-          else
-            raise "Couldn't get data from Fedora (#{uri}). Response: #{response.code}"
-          end
+    def each(no_of_requests_limit = 3)
+      redirecting_connection(no_of_requests_limit).get(uri.to_s, nil, headers) do |req|
+        req.options.on_data = proc do |chunk, overall_received_bytes, _env|
+          yield chunk unless overall_received_bytes.zero? # Don't yield when redirecting
         end
       end
+    rescue Faraday::FollowRedirects::RedirectLimitReached
+      raise ArgumentError, 'HTTP redirect too deep'
+    rescue Faraday::Error => ex
+      raise "Couldn't get data from Fedora (#{uri}). Response: #{ex.response_status}"
     end
-  end
 
-  private
+    private
 
-    # @return [String] current authorization token from Ldp::Client
-    def authorization_key
-      ldp_source.client.http.headers.fetch("Authorization", nil)
-    end
+      # Create a new faraday connection with follow_redirects enabled and configured using passed value
+      def redirecting_connection(redirection_limit)
+        options = {}
+        options[:ssl] = ActiveFedora.fedora.ssl_options if ActiveFedora.fedora.ssl_options
+        options[:request] = ActiveFedora.fedora.request_options if ActiveFedora.fedora.request_options
+        Faraday.new(ActiveFedora.fedora.host, options) do |conn|
+          conn.response :encoding # use Faraday::Encoding middleware
+          conn.adapter Faraday.default_adapter # net/http
+          if Gem::Version.new(Faraday::VERSION) < Gem::Version.new('2')
+            conn.request :basic_auth, ActiveFedora.fedora.user, ActiveFedora.fedora.password
+          else
+            conn.request :authorization, :basic, ActiveFedora.fedora.user, ActiveFedora.fedora.password
+            conn.response :follow_redirects, limit: redirection_limit - 1 # Need to reduce by one to retain same behavior as before
+          end
+        end
+      end
+  end
 end

data/lib/active_fedora/file.rb

@@ -8,10 +8,12 @@ module ActiveFedora
 
     autoload :Streaming
     autoload :Attributes
+    autoload :External
 
     include Common
     include ActiveFedora::File::Attributes
     include ActiveFedora::File::Streaming
+    include ActiveFedora::File::External
     include ActiveFedora::FilePersistence
     include ActiveFedora::Versionable
     include ActiveModel::Dirty
@@ -175,6 +177,7 @@ module ActiveFedora
       def ldp_headers
         headers = { 'Content-Type'.freeze => mime_type, 'Content-Length'.freeze => content.size.to_s }
         headers['Content-Disposition'.freeze] = "attachment; filename=\"#{URI::DEFAULT_PARSER.escape(@original_name)}\"" if @original_name
+        headers["Link"] = "<#{@external_uri}>; rel=\"http://fedora.info/definitions/fcrepo#ExternalContent\"; handling=\"#{@external_handling}\"; type=\"#{mime_type}\"" if @external_uri
         headers
       end
 

data/lib/active_fedora/file_configurator.rb

@@ -183,7 +183,7 @@ module ActiveFedora
       end
 
       if defined?(Rails.root)
-        config_path = "#{Rails.root}/config/#{config_type}.yml"
+        config_path = [Rails.root, "config/#{config_type}.yml"].join('/')
         return config_path if ::File.file? config_path
       end
 

data/lib/active_fedora/indexing/descendant_fetcher.rb

@@ -55,7 +55,7 @@ module ActiveFedora
       def descendant_and_self_uris_partitioned_by_model
         # GET could be slow if it's a big resource, we're using HEAD to avoid this problem,
         # but this causes more requests to Fedora.
-        return partitioned_uris unless rdf_resource.head.rdf_source?
+        return partitioned_uris unless rdf_source?
 
         add_self_to_partitioned_uris unless @exclude_self
 
@@ -76,6 +76,12 @@ module ActiveFedora
 
       protected
 
+        # Fcrepo 6.4 returns a 406 for file objects when returning ntriples
+        # so use the standard connection just for the head request
+        def rdf_source?
+          Ldp::Resource.new(ActiveFedora.fedora.connection, uri).head.rdf_source?
+        end
+
         def rdf_resource
           @rdf_resource ||= Ldp::Resource::RdfSource.new(ActiveFedora.fedora.build_ntriples_connection, uri)
         end

data/lib/active_fedora/ldp_resource.rb

@@ -1,11 +1,14 @@
 module ActiveFedora
-  class LdpResource < Ldp::Resource::RdfSource
-    def build_empty_graph
-      graph_class.new(subject_uri)
+  module LdpResourceAddons
+    extend ActiveSupport::Concern
+    module ClassMethods
+      def graph_class
+        ActiveTriples::Resource
+      end
     end
 
-    def self.graph_class
-      ActiveTriples::Resource
+    def build_empty_graph
+      graph_class.new(subject_uri)
     end
 
     def graph_class
@@ -27,4 +30,16 @@ module ActiveFedora
         graph_class.new(subject_uri, data: resp.graph.data)
       end
   end
+
+  class LdpResource < Ldp::Resource::RdfSource
+    include LdpResourceAddons
+  end
+
+  class IndirectContainerResource < Ldp::Container::Indirect
+    include LdpResourceAddons
+  end
+
+  class DirectContainerResource < Ldp::Container::Direct
+    include LdpResourceAddons
+  end
 end

data/lib/active_fedora/ldp_resource_service.rb

@@ -7,11 +7,22 @@ module ActiveFedora
     end
 
     def build(klass, id)
+      resource_klass = resource_klass(klass)
       if id
-        LdpResource.new(connection, to_uri(klass, id))
+        resource_klass.new(connection, to_uri(klass, id))
       else
         parent_uri = ActiveFedora.fedora.host + ActiveFedora.fedora.base_path
-        LdpResource.new(connection, nil, nil, parent_uri)
+        resource_klass.new(connection, nil, nil, parent_uri)
+      end
+    end
+
+    def resource_klass(klass)
+      if klass <= ActiveFedora::IndirectContainer
+        IndirectContainerResource
+      elsif klass <= ActiveFedora::DirectContainer
+        DirectContainerResource
+      else
+        LdpResource
       end
     end
 

data/lib/active_fedora/persistence.rb

@@ -228,10 +228,11 @@ module ActiveFedora
       # and assign_id can mint an id for the object, then assign it to the resource.
       # Otherwise the resource will have the id assigned by the LDP server
       def assign_rdf_subject
+        ldp_resource_klass = ActiveFedora.fedora.ldp_resource_service.resource_klass(self.class)
         @ldp_source = if !id && new_id = assign_id
-                        LdpResource.new(ActiveFedora.fedora.connection, self.class.id_to_uri(new_id), @resource)
+                        ldp_resource_klass.new(ActiveFedora.fedora.connection, self.class.id_to_uri(new_id), @resource)
                       else
-                        LdpResource.new(ActiveFedora.fedora.connection, @ldp_source.subject, @resource, base_path_for_resource)
+                        ldp_resource_klass.new(ActiveFedora.fedora.connection, @ldp_source.subject, @resource, base_path_for_resource)
                       end
       end
 

data/lib/active_fedora/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveFedora
-  VERSION = '15.0.2'
+  VERSION = '16.0.0'
 end

data/lib/active_fedora/versionable.rb

@@ -6,21 +6,11 @@ module ActiveFedora
       class_attribute :versionable
     end
 
-    def model_type
-      if respond_to?(:metadata)
-        metadata.ldp_source.graph.query({ predicate: ::RDF.type }).objects
-      else
-        resource.query({ subject: resource.rdf_subject, predicate: ::RDF.type }).objects
-      end
-    end
-
     # Returns an array of ActiveFedora::VersionsGraph::ResourceVersion objects.
-    # Excludes auto-snapshot versions from Fedora.
     def versions(reload = false)
       response = versions_request
 
       return ActiveFedora::VersionsGraph.new unless response
-
       if reload
         @versions = ActiveFedora::VersionsGraph.new << versions_request.reader
       else
@@ -29,46 +19,32 @@ module ActiveFedora
     end
 
     def create_version
-      resp = ActiveFedora.fedora.connection.post(versions_uri, nil, slug: version_name)
+      resp = ActiveFedora.fedora.connection.post(versions_uri, nil)
       @versions = nil
       resp.success?
     end
 
     # Queries Fedora to figure out if there are versions for the resource.
     def has_versions?
-      ActiveFedora.fedora.connection.head(versions_uri)
-      true
+      resp = ActiveFedora.fedora.connection.get(versions_uri)
+      graph = ::RDF::Graph.new << resp.reader
+      graph.query({ predicate: ::RDF::Vocab::LDP.contains }).present?
     rescue Ldp::NotFound
       false
     end
 
-    def restore_version(label)
-      resp = ActiveFedora.fedora.connection.patch(versions.with_label(label).uri, nil)
-      @versions = nil
-      reload
-      refresh_attributes if respond_to?("refresh_attributes")
-      resp.success?
-    end
-
     private
 
       def versions_request
-        return false unless has_versions?
         ActiveFedora.fedora.connection.get(versions_uri)
+      rescue Ldp::NotFound
+        false
       end
 
       def versions_uri
         uri + '/fcr:versions'
       end
 
-      def version_name
-        if versions.all.empty?
-          "version1"
-        else
-          "version" + (versions.all.count + 1).to_s
-        end
-      end
-
       def status_message(response)
         "Unexpected return value #{response.status} when retrieving datastream content at #{uri}\n\t#{response.body}"
       end

data/lib/active_fedora/versions_graph.rb

@@ -1,8 +1,7 @@
 module ActiveFedora
   class VersionsGraph < ::RDF::Graph
-    def all(opts = {})
+    def all(_opts = {})
       versions = fedora_versions
-      versions.reject! { |version| version.label =~ /auto/ } unless opts[:include_auto_save]
       versions.sort_by { |version| DateTime.parse(version.created) }
     rescue ArgumentError, NoMethodError
       raise ActiveFedora::VersionLacksCreateDate
@@ -12,40 +11,31 @@ module ActiveFedora
 
     delegate :last, to: :all
 
-    def with_label(label)
+    def with_datetime(datetime)
       all.each do |version|
-        return version if version.label == label
+        return version if version.created == datetime
       end
     end
 
-    def resources
-      query({ predicate: ::RDF::Vocab::Fcrepo4.hasVersion })
+    def versions
+      query({ predicate: ::RDF::Vocab::LDP.contains })
     end
 
     private
 
       class ResourceVersion
-        attr_accessor :uri, :label, :created
+        attr_accessor :uri, :created
       end
 
       def version_from_resource(statement)
         version = ResourceVersion.new
-        version.uri = statement.object.to_s.gsub(/\/fcr:metadata$/, "")
-        version.label = label_query(statement)
-        version.created = created_query(statement)
+        version.uri = statement.object
+        version.created = statement.object.to_s.split("fcr:versions/")[1]
         version
       end
 
-      def label_query(statement)
-        query({ subject: statement.object }).query({ predicate: ::RDF::Vocab::Fcrepo4.hasVersionLabel }).first.object.to_s
-      end
-
-      def created_query(statement)
-        query({ subject: statement.object }).query({ predicate: ::RDF::Vocab::Fcrepo4.created }).first.object.to_s
-      end
-
       def fedora_versions
-        resources.map { |statement| version_from_resource(statement) }
+        versions.map { |statement| version_from_resource(statement) }
       end
   end
 end

data/lib/active_fedora/with_metadata/metadata_node.rb

@@ -14,8 +14,13 @@ module ActiveFedora
       def initialize(file)
         @file = file
         super(file.uri, ldp_source.graph)
+
         return unless self.class.type && !type.include?(self.class.type)
-        attribute_will_change!(:type) if type.present?
+        types = type.reject do |statement|
+          ::RDF::URI.new(statement.object).to_s.start_with?("http://fedora.info/definitions/v4/repository#", "http://www.w3.org/ns/ldp#")
+        end
+
+        attribute_will_change!(:type) if types.present?
         # Workaround for https://github.com/ActiveTriples/ActiveTriples/issues/123
         get_values(:type) << self.class.type
       end

data/lib/tasks/active_fedora_dev.rake

@@ -19,7 +19,7 @@ namespace :active_fedora do
     end
   rescue LoadError
     desc "Generate YARD Documentation"
-    task doc: :environment do
+    task :doc do
       abort "Please install the YARD gem to generate rdoc."
     end
   end
@@ -42,7 +42,7 @@ namespace :active_fedora do
   end
 
   desc "CI build"
-  task ci: :environment do
+  task :ci do
     Rake::Task['active_fedora:rubocop'].invoke unless ENV['NO_RUBOCOP']
     ENV['environment'] = "test"
     with_test_server do
@@ -51,7 +51,7 @@ namespace :active_fedora do
   end
 
   desc "Execute specs with coverage"
-  task coverage: :environment do
+  task :coverage do
     # Put spec opts in a file named .rspec in root
     ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : "ruby"
     ENV['COVERAGE'] = 'true' unless ruby_engine == 'jruby'
@@ -59,7 +59,7 @@ namespace :active_fedora do
   end
 
   desc "Execute specs with coverage"
-  task spec: :environment do
+  task :spec do
     with_test_server do
       Rake::Task["active_fedora:rspec"].invoke
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 15.0.2
+  version: 16.0.0
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -79,14 +79,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: faraday-encoding
   requirement: !ruby/object:Gem::Requirement
@@ -101,6 +101,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.5
+- !ruby/object:Gem::Dependency
+  name: faraday-follow_redirects
+  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: ldp
   requirement: !ruby/object:Gem::Requirement
@@ -144,7 +158,7 @@ dependencies:
         version: 1.1.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +168,7 @@ dependencies:
         version: 1.1.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -348,6 +362,7 @@ extra_rdoc_files:
 - README.md
 files:
 - ".circleci/config.yml"
+- ".fcrepo_wrapper"
 - ".github_changelog_generator"
 - ".gitignore"
 - ".gitmodules"
@@ -366,7 +381,9 @@ files:
 - README.md
 - Rakefile
 - SUPPORT.md
+- Upgrading.md
 - active-fedora.gemspec
+- config/fcrepo_allow.txt
 - config/fedora.yml
 - config/service_mappings.yml
 - config/solr.yml
@@ -455,6 +472,7 @@ files:
 - lib/active_fedora/fedora_attributes.rb
 - lib/active_fedora/file.rb
 - lib/active_fedora/file/attributes.rb
+- lib/active_fedora/file/external.rb
 - lib/active_fedora/file/streaming.rb
 - lib/active_fedora/file_configurator.rb
 - lib/active_fedora/file_io.rb
@@ -589,6 +607,9 @@ licenses:
 - Apache-2.0
 metadata:
   rubygems_mfa_required: 'true'
+post_install_message: ActiveFedora 16+ is built for Fedora 6+.  See Upgrading.md for
+  important changes from ActiveFedora 15 and hints for using the Fedora upgrade tools
+  to migrate from Fedora 4.
 rdoc_options: []
 require_paths:
 - lib
@@ -603,7 +624,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.23
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A convenience libary for manipulating documents in the Fedora Repository.
 test_files: []