active-fedora 13.2.4 → 13.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85c4c145c52dd7a76031180b40c4a9d8d2cca56073178db2d7543264ff76afea
-  data.tar.gz: 5e89813a2fb65dcd80487a1203bec8ca869cc3c611924440903cb22830133dcb
+  metadata.gz: e04e045acabedcf73c91fd93413d63e02d8548073cd938e0579bcfb65cf8c82f
+  data.tar.gz: a66e8b81d3d27f5858dbb1c5de880c69e6c6f4e1f13d3f11191d174788a2769b
 SHA512:
-  metadata.gz: 8e97b32bca2819b43732657cd70b3cbb6f932b144bf00c10f390a0caee675b59a6f480637ff0fe93ad0f1b8bcfa791d1298a8dedf580b59699ff74ad8dd31240
-  data.tar.gz: 4ca64c09d2b36a4378303ccd5cb257d0012207c44793bf93cac44be0dda1a230e87066ff19664f91d36ac42367b2539484b512012b5cdee071ae728fe399e811
+  metadata.gz: 39a8f3d9c0a7da3dfa15b60e315b93f7c947326b46a59f343d78e88eb21ac479dbe1e93d08e340549caecb7b2ba07d0f6ae9817524d03addfc635a87ff5bc37c
+  data.tar.gz: 1f08ff94aa74c88e7c554b4a3378c807e1558e164cfa561db608caf3e9ec97b7af3a7d013018ce54cefa7413fd8da98594de306cd7791e9771e71272241a2b0e

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveFedora
-  VERSION = '13.2.4'
+  VERSION = '13.2.5'
 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
 

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 13.2.4
+  version: 13.2.5
 platform: ruby
 authors:
 - Matt Zumwalt
 - McClain Looney
 - Justin Coyne
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-17 00:00:00.000000000 Z
+date: 2022-01-12 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: []