active-fedora 12.2.2 → 13.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04a0f3a304bb9913cc223be4945bd3d33daed83d90296fcc9aed8b389bfdbcd3
-  data.tar.gz: 72f4706d2d82fb299a2bd4597a69eb0db5c95875fd8a385e5d983c174b2ee197
+  metadata.gz: 61e9e73d569fd4d2c553d84d8edf1005cceb73912478bd45bd5b7ae451d28d63
+  data.tar.gz: 82d9d52da4b6cb81bb2ef1748542305dce3a6ffd5ed81fc2bae598cb6114a405
 SHA512:
-  metadata.gz: b2596f8e1ef7db12e7cd0a84f41d3d8076cb5fe8f0da60942796d1d360f42de79024e6aa95bc053bffdd61358da56bef5cc870431451d4bacc086c2391b44f5e
-  data.tar.gz: e6db68033a7e8e9fe2c4787cd8fa66e2db42e136c925a280649560d26a7558b6f68117269f6e29e5e594ed7a74824b10c59d711a784a4cb648743b65e78de965
+  metadata.gz: 526c020760edeb2703961ad0a34e85ddfcd2de5535a753c15598afd45c503640c89527dc5ad239522d051d522e1072cbd10f8a054361bbee437f70378f317940
+  data.tar.gz: 9c6a6b796268853d5b594804dd5036e82d2cf085888f82eac0924108cdce8f152ddc5de85fae385f03590c5ee857345cf031df529684df1490eeae746869b71b

data/active-fedora.gemspec

@@ -20,7 +20,6 @@ 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'

data/lib/active_fedora/file.rb

@@ -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.2'.freeze
+  VERSION = "13.0.0".freeze
 end

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/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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 12.2.2
+  version: 13.0.0
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-19 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
@@ -746,7 +732,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: A convenience libary for manipulating documents in the Fedora Repository.