active-fedora 12.2.4 → 13.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1a57319331ca1e0be39acbb5b59e6e2c5e9c3ccbd55dad26455cd6e0bb63b54
-  data.tar.gz: 7e77d61dfb2cea447e9f60ecf5c9a61d0c7b4011a1b46139e0a71914cda5edd9
+  metadata.gz: 61e9e73d569fd4d2c553d84d8edf1005cceb73912478bd45bd5b7ae451d28d63
+  data.tar.gz: 82d9d52da4b6cb81bb2ef1748542305dce3a6ffd5ed81fc2bae598cb6114a405
 SHA512:
-  metadata.gz: 92b28ccf174ca95f2d8cdf0b6d17c594f3e9717cba879babcf53fae1b9871d7bded7f40c15dbd69267480c9e15a85bb3a77d919aa9e48bbf556b9584861aefa1
-  data.tar.gz: 431456f315b9602012acc2fae788aa4c2b15f1f7e1e6ff8cc2b35609fdaeeb947eaef3b4a06a2d0930539225e831c6f437958c88bc132e4b5021c8c2ac985c9f
+  metadata.gz: 526c020760edeb2703961ad0a34e85ddfcd2de5535a753c15598afd45c503640c89527dc5ad239522d051d522e1072cbd10f8a054361bbee437f70378f317940
+  data.tar.gz: 9c6a6b796268853d5b594804dd5036e82d2cf085888f82eac0924108cdce8f152ddc5de85fae385f03590c5ee857345cf031df529684df1490eeae746869b71b

data/active-fedora.gemspec

@@ -20,25 +20,22 @@ Gem::Specification.new do |s|
   s.add_dependency "active-triples", '>= 0.11.0', '< 2.0.0'
   s.add_dependency "deprecation"
   s.add_dependency "ldp", '>= 0.7.0', '< 2'
-  s.add_dependency 'rdf-vocab', '< 3.1.5'
   s.add_dependency "ruby-progressbar", '~> 1.0'
   s.add_dependency 'faraday', '~> 0.12'
   s.add_dependency 'faraday-encoding', '0.0.4'
 
-  s.add_development_dependency "equivalent-xml"
-  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 "rdoc"
+  s.add_development_dependency "yard"
   s.add_development_dependency "rake"
+  s.add_development_dependency "solr_wrapper", "~> 2.0"
+  s.add_development_dependency 'fcrepo_wrapper', '~> 0.2'
   s.add_development_dependency "rspec", "~> 3.5"
   s.add_development_dependency "rspec-its"
+  s.add_development_dependency "equivalent-xml"
+  s.add_development_dependency "simplecov", '~> 0.8'
   s.add_development_dependency "rubocop", '~> 0.56.0'
   s.add_development_dependency "rubocop-rspec", '~> 1.12.0'
-  s.add_development_dependency "simplecov", '~> 0.8'
-  s.add_development_dependency "solr_wrapper", "~> 2.0"
-  s.add_development_dependency "yard"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {spec}/*`.split("\n")

data/lib/active_fedora/aggregation/list_source.rb

@@ -61,16 +61,6 @@ module ActiveFedora
         ["ActiveFedora::Aggregation::ListSource"]
       end
 
-      # Short circuit ActiveModel::Dirty which attempts to load the whole ordered list when calling nodes_will_change!
-      # which leads to a stack level too deep exception in some cases
-      # See https://github.com/samvera/hyrax/issues/4581
-      # This approach was also taken in ActiveFedora::File:
-      # See https://github.com/samvera/active_fedora/pull/1312/commits/7c8bbbefdacefd655a2ca653f5950c991e1dc999#diff-28356c4daa0d55cbaf97e4269869f510R100-R103
-      def attribute_will_change!(attr)
-        return super unless attr == 'nodes'
-        attributes_changed_by_setter[:nodes] = true
-      end
-
       private
 
         def persist_ordered_self

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::DEFAULT_PARSER.escape(id, '[]'.freeze)
+      id = URI.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

@@ -179,7 +179,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['Content-Disposition'.freeze] = "attachment; filename=\"#{URI.encode(@original_name)}\"" if @original_name
         headers
       end
 
@@ -196,7 +196,9 @@ module ActiveFedora
       end
 
       def local_or_remote_content(ensure_fetch = true)
-        @content ||= ensure_fetch ? remote_content : @ds_content unless new_record?
+        return @content if new_record?
+
+        @content ||= ensure_fetch ? remote_content : @ds_content
         @content.rewind if behaves_like_io?(@content)
         @content
       end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = '12.2.4'.freeze
+  VERSION = "13.0.0".freeze
 end

data/lib/active_fedora.rb

@@ -11,11 +11,9 @@ 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
+    class DateTime < Literal
       ALTERNATIVE_FORMAT   = '%Y-%m-%dT%H:%M:%S'.freeze
       DOT                  = '.'.freeze
       EMPTY                = ''.freeze

data/lib/generators/active_fedora/config/solr/solr_generator.rb

@@ -7,7 +7,7 @@ module ActiveFedora
     def generate
       # Overwrite the configuration files that Blacklight has installed
       copy_file 'solr.yml', 'config/solr.yml', force: true
-      directory 'solr', 'solr'
+      directory 'solr', 'solr', force: true
     end
 
     def solr_wrapper_config

data/spec/integration/date_time_properties_spec.rb

@@ -33,33 +33,9 @@ describe ActiveFedora::Base do
 
   describe 'serializing' do
     let(:object) { Foo.new(date: [date]) }
-    let(:triple) { object.resource.query(predicate: ::RDF::Vocab::DC.date).to_a.first.object }
+    let(:triple) { object.resource.query(predicate: ::RDF::Vocab::DC.date).to_a.first }
     it 'time zone must have semicolin to be a cannonical XMLSchema#dateTime' do
       expect(triple.to_s).to match(/\+01:00/)
     end
-
-    context 'nanoseconds' do
-      let(:date) { DateTime.parse("2015-10-22T10:20:03.653991025+01:00") }
-
-      it 'includes nanosecond precision' do
-        expect(triple.to_s).to eq "2015-10-22T10:20:03.653991025+01:00"
-      end
-
-      context 'with trailing zeros' do
-        let(:date) { DateTime.parse("2015-10-22T15:34:20.97800000-11:00") }
-
-        it 'trims trailing zeros' do
-          expect(triple.to_s).to eq "2015-10-22T15:34:20.978-11:00"
-        end
-
-        context 'and only zero nanoseconds' do
-          let(:date) { DateTime.parse("2015-10-22T15:34:20.000000000-11:00") }
-
-          it 'trims trailing zeros and dot if nanoseconds are all 0' do
-            expect(triple.to_s).to eq "2015-10-22T15:34:20-11:00"
-          end
-        end
-      end
-    end
   end
 end

data/spec/unit/file_spec.rb

@@ -192,23 +192,6 @@ describe ActiveFedora::File do
     end
   end
 
-  context 'when file is new and content behaves like io' do
-    let(:file_content) { "hello world" }
-
-    before do
-      af_file.uri = "http://localhost:8983/fedora/rest/test/1234/abcd"
-      af_file.content = StringIO.new(file_content)
-      allow(af_file).to receive(:new_record?).and_return(true)
-    end
-
-    describe "#content" do
-      it 'can be re-read' do
-        expect(af_file.content.read).to eq file_content
-        expect(af_file.content.read).to eq file_content
-      end
-    end
-  end
-
   describe "#mime_type" do
     let(:parent) { ActiveFedora::Base.create }
     before do

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 12.2.4
+  version: 13.0.0
 platform: ruby
 authors:
 - Matt Zumwalt
 - McClain Looney
 - Justin Coyne
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-07 00:00:00.000000000 Z
+date: 2019-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -126,20 +126,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: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -183,7 +169,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.0.4
 - !ruby/object:Gem::Dependency
-  name: equivalent-xml
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -197,21 +183,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fcrepo_wrapper
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-- !ruby/object:Gem::Dependency
-  name: github_changelog_generator
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -225,7 +197,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -239,47 +211,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: psych
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: solr_wrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: fcrepo_wrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -309,33 +281,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.56.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.56.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
+  name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -351,33 +309,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
-  name: solr_wrapper
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 0.56.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 0.56.0
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.12.0
 description: ActiveFedora provides for creating and managing objects in the Fedora
   Repository Architecture.
 email:
@@ -759,7 +717,7 @@ homepage: https://github.com/samvera/active_fedora
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -774,8 +732,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.0.1
+signing_key: 
 specification_version: 4
 summary: A convenience libary for manipulating documents in the Fedora Repository.
 test_files: []