active-fedora 13.2.3 → 13.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8d29a02255da46716747bba4708f04e209adac4000d05c85a79b89facbfd36f
-  data.tar.gz: aedc7dbe3a0ac8254487860560ade6497913c3f246eb544c737eda1904ddcbf5
+  metadata.gz: b2f9eb8fbfa34d943a8aed89f588a58e7a10c6d4fc077c9d0afb4600f38dc771
+  data.tar.gz: e1342febdbba15e85b46a032b05336377fc06233c89c94bc5a48d5c9b2a3f33a
 SHA512:
-  metadata.gz: 7f407c3923265fefa18ade5f35f71bc8a79171f7959aa877b1c5b49f1422ebb181e47eef5d13ca919f154383d7e2e540aba133ebe801fac7b289bce44702c804
-  data.tar.gz: 2e0de1699f5fb864e03ade7cfefcabf770d14d7935c0431e12a924479e96330906ebc1daf618135279ba9d09a79dd892aeb356281fef90455b9c3e8131f52a56
+  metadata.gz: 4fcd0f270caea3bae2a2d4e6c00e1ba6c12d6d61523c16942b4c674a78f8f28490d29e4b62e666e2babfaec44be18a9b581b4e5a4191ed9c95a748bf39d91bf0
+  data.tar.gz: 4375e0c3877dad17e06ec3481ea0801e5e6ab5815d1f752e0a86efb0291334573af3ce068941f71ca48c9a18140d093fedce1b6b12b965085ea9c5d488f4ed1f

data/.circleci/config.yml

@@ -21,7 +21,17 @@ jobs:
       RAILS_VERSION: << parameters.rails_version >>
     steps:
       - samvera/cached_checkout
-
+      - 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)" ]]
+              
       - samvera/bundle_for_gem:
           ruby_version: << parameters.ruby_version >>
           bundler_version: << parameters.bundler_version >>

data/active-fedora.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'fcrepo_wrapper', '~> 0.2'
   s.add_development_dependency "github_changelog_generator"
   s.add_development_dependency "rdoc"
+  s.add_development_dependency "psych", "< 4" # Restricted because 4.0+ do not work with rubocop 0.56.x
   s.add_development_dependency "rails"
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec", "~> 3.5"

data/lib/active_fedora/core/fedora_id_translator.rb

@@ -2,7 +2,7 @@ module ActiveFedora::Core
   class FedoraIdTranslator
     SLASH = '/'.freeze
     def self.call(id)
-      id = URI.escape(id, '[]'.freeze)
+      id = URI::DEFAULT_PARSER.escape(id, '[]'.freeze)
       id = "/#{id}" unless id.start_with? SLASH
       unless ActiveFedora.fedora.base_path == SLASH || id.start_with?("#{ActiveFedora.fedora.base_path}/")
         id = ActiveFedora.fedora.base_path + id

data/lib/active_fedora/core.rb

@@ -62,6 +62,9 @@ module ActiveFedora
       refresh
       load_attached_files
       self
+    rescue Ldp::Gone => err
+      logger.error("Tried to reload an object that has been destroyed.\n\t#{err.message}")
+      raise ActiveFedora::ObjectNotFoundError
     end
 
     # Initialize an empty model object and set its +resource+

data/lib/active_fedora/file.rb

@@ -174,7 +174,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.encode(@original_name)}\"" if @original_name
+        headers['Content-Disposition'.freeze] = "attachment; filename=\"#{URI::DEFAULT_PARSER.escape(@original_name)}\"" if @original_name
         headers
       end
 

data/lib/active_fedora/indexing/descendant_fetcher.rb

@@ -59,8 +59,8 @@ module ActiveFedora
 
         add_self_to_partitioned_uris unless @exclude_self
 
-        immediate_descendant_uris = rdf_graph.query(predicate: ::RDF::Vocab::LDP.contains).map { |descendant| descendant.object.to_s }
-        immediate_descendant_uris.each do |descendant_uri|
+        rdf_graph.query(predicate: ::RDF::Vocab::LDP.contains).each_object do |uri|
+          descendant_uri = uri.to_s
           self.class.new(
             descendant_uri,
             priority_models: priority_models
@@ -88,16 +88,12 @@ module ActiveFedora
           @partitioned_uris ||= {}
         end
 
-        def rdf_graph_models
-          rdf_graph.query(predicate: HAS_MODEL_PREDICATE).collect(&:object).collect do |rdf_object|
-            rdf_object.to_s if rdf_object.literal?
-          end.compact
-        end
-
         def add_self_to_partitioned_uris
-          rdf_graph_models.each do |model|
-            partitioned_uris[model] ||= []
-            partitioned_uris[model] << rdf_resource.subject
+          rdf_graph.query(predicate: HAS_MODEL_PREDICATE).each_object do |model|
+            next unless model.literal?
+
+            partitioned_uris[model.to_s] ||= []
+            partitioned_uris[model.to_s] << rdf_resource.subject
           end
         end
     end

data/lib/active_fedora/ldp_resource.rb

@@ -20,5 +20,11 @@ module ActiveFedora
     def marshal_load(data)
       data.each { |name, val| instance_variable_set(name, val) }
     end
+
+    private
+
+    def response_as_graph(resp)
+      graph_class.new(subject_uri, data: resp.graph.data)
+    end
   end
 end

data/lib/active_fedora/version.rb

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

data/lib/active_fedora/with_metadata/default_schema.rb

@@ -21,6 +21,6 @@ module ActiveFedora::WithMetadata
     property :date_modified, predicate: ::RDF::Vocab::EBUCore.dateModified
     property :byte_order, predicate: SweetJPLTerms.byteOrder
     # This is a server-managed predicate which means Fedora does not let us change it.
-    property :file_hash, predicate: ::RDF::Vocab::PREMIS.hasMessageDigest
+    property :file_hash, predicate: ::RDF::Vocab::PREMIS.hasMessageDigest, server_managed: true
   end
 end

data/lib/active_fedora/with_metadata/default_strategy.rb

@@ -1,6 +1,6 @@
 module ActiveFedora::WithMetadata
   class DefaultStrategy < ActiveTriples::ExtensionStrategy
-    # override apply method to check if property already exists or reciever already has predicate defined.
+    # override apply method to check if property already exists or receiver already has predicate defined.
     # Do not add property if the rdf_resource already responds to the property name
     # Do not add property if the rdf_resource already has a property with the same predicate.
     def self.apply(resource, property)

data/lib/active_fedora/with_metadata/metadata_node.rb

@@ -33,7 +33,7 @@ module ActiveFedora
 
       def set_value(*args)
         super
-        attribute_will_change! args.first
+        attribute_will_change! args.first unless server_managed_properties.include?(args.first)
       end
 
       def ldp_source
@@ -70,6 +70,10 @@ module ActiveFedora
           ChangeSet.new(self, self, changed_attributes.keys).changes
         end
 
+        def server_managed_properties
+          @server_managed_properties ||= properties.select { |k,v| v[:server_managed] }.keys.map(&:to_sym)
+        end
+
         class << self
           attr_writer :parent_class
 

data/lib/active_fedora.rb

@@ -11,9 +11,11 @@ require 'active_triples'
 # Monkey patching RDF::Literal::DateTime to support fractional seconds.
 # See https://github.com/samvera/active_fedora/issues/497
 # Also monkey patches in a fix for timezones to be stored properly.
+# This is needed in both RDF <= 3.2.4 and RDF >= 3.2.5
+# TODO: Figure out how to contribute something upstream to avoid monkey-patching
 module RDF
   class Literal
-    class DateTime < Literal
+    class DateTime
       ALTERNATIVE_FORMAT   = '%Y-%m-%dT%H:%M:%S'.freeze
       DOT                  = '.'.freeze
       EMPTY                = ''.freeze

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 13.2.3
+  version: 13.2.7
 platform: ruby
 authors:
 - Matt Zumwalt
 - McClain Looney
 - Justin Coyne
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-13 00:00:00.000000000 Z
+date: 2022-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -212,6 +212,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -589,7 +603,7 @@ homepage: https://github.com/samvera/active_fedora
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -604,8 +618,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: A convenience libary for manipulating documents in the Fedora Repository.
 test_files: []