active-fedora 13.2.4 → 13.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85c4c145c52dd7a76031180b40c4a9d8d2cca56073178db2d7543264ff76afea
-  data.tar.gz: 5e89813a2fb65dcd80487a1203bec8ca869cc3c611924440903cb22830133dcb
+  metadata.gz: 5833c4a96e372ae86f5727ec33d965f054ba21567c177c0b4340ecc2d6e7bb84
+  data.tar.gz: 86204eff86f88f343876d0974ac446b60d087945bb856a7ec4854d0f91f3adfa
 SHA512:
-  metadata.gz: 8e97b32bca2819b43732657cd70b3cbb6f932b144bf00c10f390a0caee675b59a6f480637ff0fe93ad0f1b8bcfa791d1298a8dedf580b59699ff74ad8dd31240
-  data.tar.gz: 4ca64c09d2b36a4378303ccd5cb257d0012207c44793bf93cac44be0dda1a230e87066ff19664f91d36ac42367b2539484b512012b5cdee071ae728fe399e811
+  metadata.gz: 70c86acbc2effa48e03911fc3a985918e5ce7004b7e02898ea841e95172db330a5c44a6cd3438513b76312d98b2dbe5b2116b4fdecfd978d15bf5715dbced3e4
+  data.tar.gz: e473abc4f550bae98d519fd6e1617d6336e1427926702bc4d904e59cd9f49638b820b982350c174bd2f7f6f778ef3d53a196d46667e5c4bd1b3f285c99e7eaba

data/.circleci/config.yml

@@ -1,6 +1,6 @@
 version: 2.1
 orbs:
-  samvera: samvera/circleci-orb@0
+  samvera: samvera/circleci-orb@1.0
 jobs:
   bundle_lint_test:
     parameters:
@@ -8,7 +8,7 @@ jobs:
         type: string
       bundler_version:
         type: string
-        default: 2.0.1
+        default: 2.3.11
       rails_version:
         type: string
       solr_config_path:
@@ -21,6 +21,16 @@ 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 >>
@@ -37,31 +47,83 @@ jobs:
 workflows:
   ci:
     jobs:
+      # Ruby 2.7 releases
+      - bundle_lint_test:
+          name: ruby2-7_rails6-1
+          ruby_version: 2.7.5
+          rails_version: 6.1.6.1
+      - bundle_lint_test:
+          name: ruby2-7_rails6-0
+          ruby_version: 2.7.5
+          rails_version: 6.0.4.7
       - bundle_lint_test:
           name: ruby2-7_rails5-2
-          ruby_version: 2.7.0
+          ruby_version: 2.7.5
           rails_version: 5.2.4
+      # Ruby 2.6 releases
+      - bundle_lint_test:
+          name: ruby2-6_rails6-1
+          ruby_version: 2.6.9
+          rails_version: 6.1.6.1
+      - bundle_lint_test:
+          name: ruby2-6_rails6-0
+          ruby_version: 2.6.9
+          rails_version: 6.0.4.7
       - bundle_lint_test:
           name: ruby2-6_rails5-2
-          ruby_version: 2.6.5
+          ruby_version: 2.6.9
           rails_version: 5.2.4
+      # Ruby 2.5 releases
+      - bundle_lint_test:
+          name: ruby2-5_rails6.0
+          ruby_version: 2.5.9
+          rails_version: 6.0.4.7
       - bundle_lint_test:
           name: ruby2-5_rails5-2
-          ruby_version: 2.5.7
+          ruby_version: 2.5.9
           rails_version: 5.2.4
+
+  nightly:
+    triggers:
+      - schedule:
+          cron: "0 0 * * *"
+          filters:
+            branches:
+              only:
+                - main
+    jobs:
+      # Ruby 2.7 releases
       - bundle_lint_test:
-          name: ruby2-4_rails5-2
-          ruby_version: 2.4.9
-          rails_version: 5.2.4
+          name: ruby2-7_rails6-1
+          ruby_version: 2.7.5
+          rails_version: 6.1.6.1
       - bundle_lint_test:
           name: ruby2-7_rails6-0
-          ruby_version: 2.7.0
-          rails_version: 6.0.2
+          ruby_version: 2.7.5
+          rails_version: 6.0.4.7
+      - bundle_lint_test:
+          name: ruby2-7_rails5-2
+          ruby_version: 2.7.5
+          rails_version: 5.2.4
+      # Ruby 2.6 releases
+      - bundle_lint_test:
+          name: ruby2-6_rails6-1
+          ruby_version: 2.6.9
+          rails_version: 6.1.6.1
       - bundle_lint_test:
           name: ruby2-6_rails6-0
-          ruby_version: 2.6.5
-          rails_version: 6.0.2
+          ruby_version: 2.6.9
+          rails_version: 6.0.4.7
+      - bundle_lint_test:
+          name: ruby2-6_rails5-2
+          ruby_version: 2.6.9
+          rails_version: 5.2.4
+      # Ruby 2.5 releases
       - bundle_lint_test:
           name: ruby2-5_rails6.0
-          ruby_version: 2.5.7
-          rails_version: 6.0.2
+          ruby_version: 2.5.9
+          rails_version: 6.0.4.7
+      - bundle_lint_test:
+          name: ruby2-5_rails5-2
+          ruby_version: 2.5.9
+          rails_version: 5.2.4

data/CONTRIBUTING.md

@@ -44,6 +44,10 @@ prevalence of racist language in discussions of predatory
 publishing](https://www.ncbi.nlm.nih.gov/pmc/articles/PMC6148600/) for
 further details.
 
+If you're working on PR for this project, create a feature branch off of `main`.
+
+Please ***do not*** create a branch called `master` for this repository or as part of your pull request; the branch will either need to be removed or renamed before it can be considered for inclusion in the code base and history of our repositories.
+
 ## Contribution Tasks
 
 * Reporting Issues
@@ -67,10 +71,10 @@ further details.
 
 * Fork the repository on GitHub
 * Create a topic branch from where you want to base your work.
-  * This is usually the master branch.
-  * To quickly create a topic branch based on master; `git branch fix/master/my_contribution master`
-  * Then checkout the new branch with `git checkout fix/master/my_contribution`.
-  * Please avoid working directly on the `master` branch.
+  * This is usually the main branch.
+  * To quickly create a topic branch based on main; `git branch fix/main/my_contribution main`
+  * Then checkout the new branch with `git checkout fix/main/my_contribution`.
+  * Please avoid working directly on the `main` branch.
   * You may find the [hub suite of commands](https://github.com/defunkt/hub) helpful
 * Make sure you have added sufficient tests and documentation for your changes.
   * Test functionality with RSpec; Test features / UI with Capybara.
@@ -131,15 +135,15 @@ further details.
 ### Submitting Changes
 
 * Read the article ["Using Pull Requests"](https://help.github.com/articles/using-pull-requests) on GitHub.
-* Make sure your branch is up to date with its parent branch (i.e. master)
-  * `git checkout master`
+* Make sure your branch is up to date with its parent branch (i.e. main)
+  * `git checkout main`
   * `git pull --rebase`
   * `git checkout <your-branch>`
-  * `git rebase master`
+  * `git rebase main`
   * It is a good idea to run your tests again.
 * If you've made more than one commit take a moment to consider whether squashing commits together would help improve their logical grouping.
   * [Detailed Walkthrough of One Pull Request per Commit](http://ndlib.github.io/practices/one-commit-per-pull-request/)
-  * `git rebase --interactive master` ([See Github help](https://help.github.com/articles/interactive-rebase))
+  * `git rebase --interactive main` ([See Github help](https://help.github.com/articles/interactive-rebase))
   * Squashing your branch's changes into one commit is "good form" and helps the person merging your request to see everything that is going on.
 * Push your changes to a topic branch in your fork of the repository.
 * Submit a pull request from your fork to the project.

data/Gemfile

@@ -7,7 +7,13 @@ gemspec path: File.expand_path('..', __FILE__)
 gem 'byebug' unless ENV['TRAVIS']
 gem 'pry-byebug' unless ENV['CI']
 
-gem 'activemodel', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
+if ENV['RAILS_VERSION']
+  gem 'activemodel', ENV['RAILS_VERSION']
+  gem 'rails', ENV['RAILS_VERSION']
+else
+  gem 'activemodel', '~> 6.0.4', '< 7'
+  gem 'rails', '~> 6.0.4', '< 7'
+end
 
 group :test do
   gem 'simplecov', require: false

data/README.md

@@ -1,13 +1,14 @@
 # ActiveFedora
 
-Code: [![Version](https://badge.fury.io/rb/active-fedora.png)](http://badge.fury.io/rb/active-fedora)
+Code: [![Samvera Core Component](https://img.shields.io/badge/samvera-core--component-brightgreen)](https://github.com/samvera/maintenance#samvera-core-components)
 [![Build Status](https://circleci.com/gh/samvera/active_fedora.svg?style=svg)](https://circleci.com/gh/samvera/active_fedora)
-[![Coverage Status](https://coveralls.io/repos/github/samvera/active_fedora/badge.svg?branch=master)](https://coveralls.io/github/samvera/active_fedora?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/samvera/active_fedora/badge.svg?branch=main)](https://coveralls.io/github/samvera/active_fedora?branch=main)
+[![Version](https://img.shields.io/gem/v/active-fedora)](https://rubygems.org/gems/active-fedora)
 
 Docs: [![Contribution Guidelines](http://img.shields.io/badge/CONTRIBUTING-Guidelines-blue.svg)](./CONTRIBUTING.md)
 [![Apache 2.0 License](http://img.shields.io/badge/APACHE2-license-blue.svg)](./LICENSE)
 
-Jump in: [![Slack Status](http://slack.samvera.org/badge.svg)](http://slack.samvera.org/)
+Community Support: [![Samvera Community Slack](https://img.shields.io/badge/samvera-slack-blueviolet)](http://slack.samvera.org/)
 
 # What is ActiveFedora?
 
@@ -101,6 +102,12 @@ is installed, run:
 rake spec
 ```
 
+## Contributing
+
+If you're working on PR for this project, create a feature branch off of `main`.
+
+This repository follows the [Samvera Community Code of Conduct](https://samvera.atlassian.net/wiki/spaces/samvera/pages/405212316/Code+of+Conduct) and [language recommendations](https://github.com/samvera/maintenance/blob/master/templates/CONTRIBUTING.md#language).  Please ***do not*** create a branch called `master` for this repository or as part of your pull request; the branch will either need to be removed or renamed before it can be considered for inclusion in the code base and history of this repository.
+
 # Release Process
 
 The [release process](https://github.com/samvera/active_fedora/wiki/Release-management-process) is documented on the wiki.

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/attribute_methods/read.rb

@@ -4,7 +4,7 @@ module ActiveFedora
       module ClassMethods
         protected
 
-          def define_method_attribute(name)
+          def define_method_attribute(name, owner: nil)
             name = name.to_s
             safe_name = name.unpack('h*'.freeze).first
             temp_method = "__temp__#{safe_name}"

data/lib/active_fedora/attribute_methods/write.rb

@@ -4,7 +4,7 @@ module ActiveFedora
       module ClassMethods
         protected
 
-          def define_method_attribute=(name)
+          def define_method_attribute=(name, owner: nil)
             name = name.to_s
             safe_name = name.unpack('h*'.freeze).first
             ActiveFedora::AttributeMethods::AttrNames.set_name_cache safe_name, name

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

@@ -9,7 +9,8 @@ module ActiveFedora
     end
 
     def default_sort_params
-      [indexer.create_time_solr_name + ' asc']
+      [ActiveFedora.index_field_mapper.solr_name('system_create', :stored_sortable, type: :date) +
+       ' asc']
     end
   end
 end

data/lib/active_fedora/solr_service.rb

@@ -8,7 +8,7 @@ module ActiveFedora
     MAX_ROWS = 10_000
 
     def initialize(options = {})
-      @options = { read_timeout: 120, open_timeout: 120, url: 'http://localhost:8080/solr' }.merge(options)
+      @options = { timeout: 120, open_timeout: 120, url: 'http://localhost:8080/solr' }.merge(options)
     end
 
     def conn

data/lib/active_fedora/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveFedora
-  VERSION = '13.2.4'
+  VERSION = '13.3.0'
 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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 13.2.4
+  version: 13.3.0
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-17 00:00:00.000000000 Z
+date: 2022-07-25 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
@@ -604,7 +618,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: A convenience libary for manipulating documents in the Fedora Repository.