active-fedora 13.2.0 → 13.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00a0ee2d4db27136d4c181eb008490eecab14d91894881bf7d2d8c730ea4820a
-  data.tar.gz: edcf4cf277ccaa6d284e8aad6c8a3cb4c418e88010caa35959316bb0659c77cf
+  metadata.gz: e04e045acabedcf73c91fd93413d63e02d8548073cd938e0579bcfb65cf8c82f
+  data.tar.gz: a66e8b81d3d27f5858dbb1c5de880c69e6c6f4e1f13d3f11191d174788a2769b
 SHA512:
-  metadata.gz: 18a144b467bd18f7ca1d9cccce519d32402580986f8d7b917306f029f25048d245226b7c25dfb36625428f197942eca236cbc82702848695447b90c2a44dda73
-  data.tar.gz: '089c1166e138e0e861f341862cdd4967f048356c55de015e96b1f611113d64b85c0df4900be47e79b8c1db8f45585ee9e5deb2739b86aae8a2800737d380bbb2'
+  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

@@ -21,7 +21,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'faraday', '~> 0.12'
   s.add_dependency 'faraday-encoding', '>= 0.0.5'
   s.add_dependency "ldp", '>= 0.7.0', '< 2'
-  s.add_dependency 'rdf-vocab', '< 3.1.5'
   s.add_dependency 'rsolr', '>= 1.1.2', '< 3'
   s.add_dependency "ruby-progressbar", '~> 1.0'
 
@@ -29,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/config/fedora.yml

@@ -1,14 +1,14 @@
 development:
   user: fedoraAdmin
   password: fedoraAdmin
-  url: http://<%= ENV['FCREPO_HOST'] || 'localhost' %>:<%= ENV['FCREPO_DEVELOPMENT_PORT'] || ENV['FCREPO_PORT'] || 8984 %>/rest
+  url: http://<%= ENV['FCREPO_HOST'] || 'localhost' %>:<%= ENV['FCREPO_DEVELOPMENT_PORT'] || ENV['FCREPO_PORT'] || 8984 %>/<%= ENV['FCREPO_REST_PATH'] || 'rest' %>
   base_path: <%= ENV['FCREPO_BASE_PATH'] || '/dev' %>
 test:
   user: fedoraAdmin
   password: fedoraAdmin
-  url: http://<%= ENV['FCREPO_HOST'] || 'localhost' %>:<%= ENV['FCREPO_TEST_PORT'] || ENV['FCREPO_PORT'] || 8986 %>/rest
+  url: http://<%= ENV['FCREPO_HOST'] || 'localhost' %>:<%= ENV['FCREPO_TEST_PORT'] || ENV['FCREPO_PORT'] || 8986 %>/<%= ENV['FCREPO_REST_PATH'] || 'rest' %>
   base_path: <%= ENV['FCREPO_BASE_PATH'] || '/test' %>
 production:
   user: fedoraAdmin
   password: fedoraAdmin
-  url: http://<%= ENV['FCREPO_HOST'] || 'localhost' %>:<%= ENV['FCREPO_PORT'] || 8983 %>/rest
+  url: http://<%= ENV['FCREPO_HOST'] || 'localhost' %>:<%= ENV['FCREPO_PORT'] || 8983 %>/<%= ENV['FCREPO_REST_PATH'] || 'rest' %>

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/orders/ordered_list.rb

@@ -12,7 +12,7 @@ module ActiveFedora
       #   stored.
       # @param [::RDF::URI] head_subject URI of head node in list.
       # @param [::RDF::URI] tail_subject URI of tail node in list.
-      def initialize(graph, head_subject, tail_subject)
+      def initialize(graph, head_subject, tail_subject, node_cache: NodeCache.new)
         @graph = if graph.respond_to?(:graph)
                    graph.graph.data
                  else
@@ -20,7 +20,7 @@ module ActiveFedora
                  end
         @head_subject = head_subject
         @tail_subject = tail_subject
-        @node_cache ||= NodeCache.new
+        @node_cache = node_cache
         @changed = false
         tail
       end

data/lib/active_fedora/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveFedora
-  VERSION = '13.2.0'.freeze
+  VERSION = '13.2.5'
 end

data/lib/active_fedora/with_metadata/default_schema.rb

@@ -3,13 +3,24 @@
 # to add rdf triples to a non-rdf resource and have them persisted.
 module ActiveFedora::WithMetadata
   class DefaultSchema < ActiveTriples::Schema
+    def self.legacy_ebucore_vocabulary
+      @legacy_ebucore_vocabulary ||= Class.new(RDF::StrictVocabulary("http://www.ebu.ch/metadata/ontologies/ebucore/ebucore#")) do
+        property :filename,
+          comment: %(The name of the file containing the Resource.).freeze,
+          domain: "ebucore:Resource".freeze,
+          label: "File name".freeze,
+          range: "xsd:string".freeze,
+          type: "rdf:Property".freeze
+      end
+    end
+
     property :label, predicate: ::RDF::RDFS.label
-    property :file_name, predicate: ::RDF::Vocab::EBUCore.filename
+    property :file_name, predicate: legacy_ebucore_vocabulary.filename
     property :file_size, predicate: ::RDF::Vocab::EBUCore.fileSize
     property :date_created, predicate: ::RDF::Vocab::EBUCore.dateCreated
     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/generators/active_fedora/config/fedora/templates/fedora.yml

@@ -1,15 +1,15 @@
 development:
   user: fedoraAdmin
   password: fedoraAdmin
-  url: http://<%= ENV['FCREPO_HOST'] || 'localhost' %>:<%= ENV['FCREPO_DEVELOPMENT_PORT'] || ENV['FCREPO_PORT'] || 8984 %>/rest
+  url: http://<%= ENV['FCREPO_HOST'] || 'localhost' %>:<%= ENV['FCREPO_DEVELOPMENT_PORT'] || ENV['FCREPO_PORT'] || 8984 %>/<%= ENV['FCREPO_REST_PATH'] || 'rest' %>
   base_path: <%= ENV['FCREPO_BASE_PATH'] || '/dev' %>
 test:
   user: fedoraAdmin
   password: fedoraAdmin
-  url: http://<%= ENV['FCREPO_HOST'] || 'localhost' %>:<%= ENV['FCREPO_TEST_PORT'] || ENV['FCREPO_PORT'] || 8986 %>/rest
+  url: http://<%= ENV['FCREPO_HOST'] || 'localhost' %>:<%= ENV['FCREPO_TEST_PORT'] || ENV['FCREPO_PORT'] || 8986 %>/<%= ENV['FCREPO_REST_PATH'] || 'rest' %>
   base_path: <%= ENV['FCREPO_BASE_PATH'] || '/test' %>
 production:
   user: fedoraAdmin
   password: fedoraAdmin
-  url: http://<%= ENV['FCREPO_HOST'] || 'localhost' %>:<%= ENV['FCREPO_PORT'] || 8983 %>/rest
+  url: http://<%= ENV['FCREPO_HOST'] || 'localhost' %>:<%= ENV['FCREPO_PORT'] || 8983 %>/<%= ENV['FCREPO_REST_PATH'] || 'rest' %>
   base_path: <%= ENV['FCREPO_BASE_PATH'] || '/prod' %>

data/lib/generators/active_fedora/config/solr/templates/solr/conf/schema.xml

@@ -84,7 +84,7 @@
     <!-- A PointField based date field for faster date range queries and date faceting. -->
     <fieldType name="tdate" class="solr.DatePointField" docValues="true"/>
     <!-- A DateRange based date field for truly faster date range queries. -->
-    <fieldType name="dateRange" class="solr.DateRangeField"/>
+    <fieldType name="dateRange" class="solr.DateRangeField" omitNorms="true" omitTermFreqAndPositions="true"/>
 
     <!-- This point type indexes the coordinates as separate fields (subFields)
       If subFieldType is defined, it references a type, and a dynamic field
@@ -261,10 +261,10 @@
     <!-- date range (_dr...) (for faster AND better range queries) -->
     <dynamicField name="*_dri" type="dateRange" stored="false" indexed="true" multiValued="false"/>
     <dynamicField name="*_drim" type="dateRange" stored="false" indexed="true" multiValued="true"/>
-    <dynamicField name="*_drs" type="dateRange" stored="true" indexed="false" multiValued="false"/>
-    <dynamicField name="*_drsm" type="dateRange" stored="true" indexed="false" multiValued="true"/>
     <dynamicField name="*_drsi" type="dateRange" stored="true" indexed="true" multiValued="false"/>
     <dynamicField name="*_drsim" type="dateRange" stored="true" indexed="true" multiValued="true"/>
+    <dynamicField name="*_drs" type="dateRange" stored="true" indexed="true" multiValued="false"/> <!-- indexed anyway because DateRangeField errors otherwise -->
+    <dynamicField name="*_drsm" type="dateRange" stored="true" indexed="true" multiValued="true"/> <!-- indexed anyway because DateRangeField errors otherwise -->
 
     <!-- long (_l...) -->
     <dynamicField name="*_li" type="long" stored="false" indexed="true" multiValued="false"/>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 13.2.0
+  version: 13.2.5
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-07 00:00:00.000000000 Z
+date: 2022-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -122,20 +122,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
-- !ruby/object:Gem::Dependency
-  name: rdf-vocab
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 3.1.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 3.1.5
 - !ruby/object:Gem::Dependency
   name: rsolr
   requirement: !ruby/object:Gem::Requirement
@@ -226,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
@@ -618,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.1.6
 signing_key: 
 specification_version: 4
 summary: A convenience libary for manipulating documents in the Fedora Repository.