active-fedora 11.1.3 → 11.2.1

data/spec/unit/file_spec.rb

@@ -1,29 +1,27 @@
 require 'spec_helper'
 
 describe ActiveFedora::File do
-  let(:file) { described_class.new }
-
-  subject(:af_file) { file }
+  subject(:af_file) { described_class.new }
 
   it { is_expected.not_to be_metadata }
 
   describe "#save!" do
     context "when updating metadata" do
       before do
-        file.content = 'foo'
-        file.save!
-        file.mime_type = 'application/pdf'
+        af_file.content = 'foo'
+        af_file.save!
+        af_file.mime_type = 'application/pdf'
       end
 
       it "Updates metadata" do
-        expect(file.metadata).to receive(:save)
-        file.save!
+        expect(af_file.metadata).to receive(:save)
+        af_file.save!
       end
     end
   end
 
   describe "#behaves_like_io?" do
-    subject { file.send(:behaves_like_io?, object) }
+    subject { af_file.send(:behaves_like_io?, object) }
 
     context "with a File" do
       let(:object) { File.new __FILE__ }
@@ -43,20 +41,20 @@ describe ActiveFedora::File do
   end
 
   describe "#uri" do
-    subject(:uri) { file.uri }
+    subject(:uri) { af_file.uri }
 
     context "when the file is in an ldp:BasicContainer" do
       let(:parent) { ActiveFedora::Base.new(id: '1234') }
 
       context "and it's initialized with the URI" do
-        let(:file) { described_class.new(parent.uri + "/FOO1") }
+        let(:af_file) { described_class.new(parent.uri + "/FOO1") }
         it "works" do
           expect(uri.to_s).to eq "#{ActiveFedora.fedora.base_uri}/1234/FOO1"
         end
       end
 
       context "and it's initialized with an ID" do
-        let(:file) { described_class.new(parent.id + "/FOO1") }
+        let(:af_file) { described_class.new(parent.id + "/FOO1") }
         it "works" do
           expect(uri.to_s).to eq "#{ActiveFedora.fedora.base_uri}/1234/FOO1"
         end
@@ -184,12 +182,12 @@ describe ActiveFedora::File do
 
   context "when the file has local content" do
     before do
-      file.uri = "http://localhost:8983/fedora/rest/test/1234/abcd"
-      file.content = "hi there"
+      af_file.uri = "http://localhost:8983/fedora/rest/test/1234/abcd"
+      af_file.content = "hi there"
     end
 
     describe "#inspect" do
-      subject { file.inspect }
+      subject { af_file.inspect }
       it { is_expected.to eq "#<ActiveFedora::File uri=\"http://localhost:8983/fedora/rest/test/1234/abcd\" >" }
     end
   end
@@ -214,11 +212,11 @@ describe ActiveFedora::File do
   end
 
   context "original_name" do
-    subject { file.original_name }
+    subject { af_file.original_name }
 
     context "on a new file" do
       context "that has a name set locally" do
-        before { file.original_name = "my_image.png" }
+        before { af_file.original_name = "my_image.png" }
         it { is_expected.to eq "my_image.png" }
       end
 
@@ -252,7 +250,7 @@ describe ActiveFedora::File do
   end
 
   context "digest" do
-    subject { file.digest }
+    subject(:digest) { af_file.digest }
 
     context "on a new file" do
       it { is_expected.to be_empty }
@@ -274,11 +272,11 @@ describe ActiveFedora::File do
         predicate = ::RDF::URI("http://fedora.info/definitions/v4/repository#digest")
         object = RDF::URI.new("urn:sha1:f1d2d2f924e986ac86fdf7b36c94bcdf32beec15")
         graph = ActiveTriples::Resource.new
-        graph << RDF::Statement.new(file.uri, predicate, object)
-        allow(file).to receive_message_chain(:metadata, :ldp_source, :graph).and_return(graph)
+        graph << RDF::Statement.new(af_file.uri, predicate, object)
+        allow(af_file).to receive_message_chain(:metadata, :ldp_source, :graph).and_return(graph)
       end
       it "falls back on fedora:digest if premis:hasMessageDigest is not present" do
-        expect(file.digest.first).to be_kind_of RDF::URI
+        expect(digest.first).to be_kind_of RDF::URI
       end
     end
   end
@@ -308,14 +306,14 @@ describe ActiveFedora::File do
   end
 
   describe "#create_date" do
-    subject { file.create_date }
+    subject { af_file.create_date }
     describe "when new record" do
       it { is_expected.to be_nil }
     end
     describe "when persisted" do
       before do
-        file.content = "foo"
-        file.save!
+        af_file.content = "foo"
+        af_file.save!
       end
       it { is_expected.to be_a(DateTime) }
     end
@@ -453,7 +451,7 @@ describe ActiveFedora::File do
 
     context "when Array passed to new" do
       it "raises an expection" do
-        expect { described_class.new([]) }.to raise_error
+        expect { described_class.new([]) }.to raise_error(RuntimeError)
       end
     end
   end

data/spec/unit/files_hash_spec.rb

@@ -10,13 +10,12 @@ describe ActiveFedora::FilesHash do
 
   after { Object.send(:remove_const, :FilesContainer) }
 
+  subject(:file_hash) { described_class.new(container) }
   let(:reflection) { instance_double(ActiveFedora::Reflection::MacroReflection) }
   let(:association) { instance_double(ActiveFedora::Associations::SingularAssociation, reader: object) }
   let(:object) { double('object') }
   let(:container) { FilesContainer.new }
 
-  subject(:file_hash) { described_class.new(container) }
-
   describe "#key?" do
     context 'when the key is present' do
       it "is true" do

data/spec/unit/filter_spec.rb

@@ -120,14 +120,14 @@ describe ActiveFedora::Associations::FilterAssociation do
   end
 
   describe "#delete" do
+    subject { image.members }
+
     let(:another_object) { TestObject.new }
     before do
       image.members = [test_object, test_collection, another_object]
       image.child_objects.delete(test_object)
     end
 
-    subject { image.members }
-
     it { is_expected.to contain_exactly test_collection, another_object }
   end
 end

data/spec/unit/fixity_service_spec.rb

@@ -4,6 +4,32 @@ describe ActiveFedora::FixityService do
   let(:service) { described_class.new(uri) }
   let(:uri) { RDF::URI("http://path/to/resource") }
 
+  let(:passing_fedora44_response_body) {
+    <<-EOF
+@prefix premis: <http://www.loc.gov/premis/rdf/v1#> .
+
+<http://127.0.0.1:8080/rest/dev/0k/22/5b/04/0k225b04p/files/9f296a1f-10e7-44a3-83eb-4811d611edc6/fcr:versions/version1> premis:hasFixity <http://127.0.0.1:8080/rest/dev/0k/22/5b/04/0k225b04p/files/9f296a1f-10e7-44a3-83eb-4811d611edc6/fcr:versions/version1#fixity/1493843767961> .
+
+<http://127.0.0.1:8080/rest/dev/0k/22/5b/04/0k225b04p/files/9f296a1f-10e7-44a3-83eb-4811d611edc6/fcr:versions/version1#fixity/1493843767961> a premis:Fixity , premis:EventOutcomeDetail ;
+  premis:hasEventOutcome "SUCCESS"^^<http://www.w3.org/2001/XMLSchema#string> ;
+  premis:hasMessageDigest <urn:sha1:b995eef5262dd1c74f0ed9c96be1f404394d45dc> ;
+  premis:hasSize "103945"^^<http://www.w3.org/2001/XMLSchema#long> .
+  EOF
+  }
+
+  let(:failing_fedora44_response_body) {
+    <<-EOF
+@prefix premis: <http://www.loc.gov/premis/rdf/v1#> .
+
+<http://127.0.0.1:8080/rest/dev/ks/65/hc/20/ks65hc20t/files/e316b4b5-4627-44f8-9fdb-d2016e0e7380/fcr:versions/version3> premis:hasFixity <http://127.0.0.1:8080/rest/dev/ks/65/hc/20/ks65hc20t/files/e316b4b5-4627-44f8-9fdb-d2016e0e7380/fcr:versions/version3#fixity/1493844791463> .
+
+<http://127.0.0.1:8080/rest/dev/ks/65/hc/20/ks65hc20t/files/e316b4b5-4627-44f8-9fdb-d2016e0e7380/fcr:versions/version3#fixity/1493844791463> a premis:Fixity , premis:EventOutcomeDetail ;
+  premis:hasEventOutcome "BAD_CHECKSUM"^^<http://www.w3.org/2001/XMLSchema#string> , "BAD_SIZE"^^<http://www.w3.org/2001/XMLSchema#string> ;
+  premis:hasMessageDigest <urn:sha1:1a89571e25dd372563a10740a883e93f8af2d146> ;
+  premis:hasSize "1878582"^^<http://www.w3.org/2001/XMLSchema#long> .
+EOF
+  }
+
   describe "the instance" do
     subject { described_class.new(uri) }
     it { is_expected.to respond_to(:response) }
@@ -11,8 +37,8 @@ describe ActiveFedora::FixityService do
 
   describe "initialize" do
     context "with a string" do
-      let(:uri) { 'http://path/to/resource' }
       subject { service.target }
+      let(:uri) { 'http://path/to/resource' }
       it { is_expected.to eq 'http://path/to/resource' }
     end
 
@@ -22,21 +48,21 @@ describe ActiveFedora::FixityService do
     end
   end
 
-  describe "#check" do
+  describe "#verified?" do
     before { allow(service).to receive(:fixity_response_from_fedora).and_return(response) }
-    subject { service.check }
+    subject { service.verified? }
 
     context "with Fedora version >= 4.4.0" do
       context "with a passing result" do
         let(:response) do
-          instance_double("Response", body: '<subject> <http://www.loc.gov/premis/rdf/v1#hasEventOutcome> "SUCCESS"^^<http://www.w3.org/2001/XMLSchema#string> .')
+          instance_double("Response", body: passing_fedora44_response_body)
         end
         it { is_expected.to be true }
       end
 
       context "with a failing result" do
         let(:response) do
-          instance_double("Response", body: '<subject> <http://www.loc.gov/premis/rdf/v1#hasEventOutcome> "BAD_CHECKSUM"^^<http://www.w3.org/2001/XMLSchema#string> .')
+          instance_double("Response", body: failing_fedora44_response_body)
         end
         it { is_expected.to be false }
       end
@@ -65,4 +91,38 @@ describe ActiveFedora::FixityService do
       it { is_expected.to be false }
     end
   end
+
+  describe "expected_message_digest" do
+    before { allow(service).to receive(:fixity_response_from_fedora).and_return(response) }
+    subject { service.expected_message_digest }
+    context "with success response" do
+      let(:response) do
+        instance_double("Response", body: passing_fedora44_response_body)
+      end
+      it { is_expected.to match(/urn:sha1:[a-f0-9]+/) }
+    end
+    context "with failure response" do
+      let(:response) do
+        instance_double("Response", body: failing_fedora44_response_body)
+      end
+      it { is_expected.to match(/urn:sha1:[a-f0-9]+/) }
+    end
+  end
+
+  describe "expected_size" do
+    before { allow(service).to receive(:fixity_response_from_fedora).and_return(response) }
+    subject { service.expected_size }
+    context "with success response" do
+      let(:response) do
+        instance_double("Response", body: passing_fedora44_response_body)
+      end
+      it { is_expected.to be_kind_of Numeric }
+    end
+    context "with failure response" do
+      let(:response) do
+        instance_double("Response", body: failing_fedora44_response_body)
+      end
+      it { is_expected.to be_kind_of Numeric }
+    end
+  end
 end

data/spec/unit/has_and_belongs_to_many_association_spec.rb

@@ -77,8 +77,7 @@ describe ActiveFedora::Associations::HasAndBelongsToManyAssociation do
     before do
       class Collection < ActiveFedora::Base
         has_and_belongs_to_many :members, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.hasCollectionMember, class_name: "ActiveFedora::Base", after_remove: :remove_member
-        def remove_member(_m)
-        end
+        def remove_member(_m); end
       end
 
       class Thing < ActiveFedora::Base

data/spec/unit/has_many_association_spec.rb

@@ -33,11 +33,11 @@ describe ActiveFedora::Associations::HasManyAssociation do
   end
 
   describe "#find_polymorphic_inverse" do
+    subject(:af_page) { association.send(:find_polymorphic_inverse, page) }
+
     let(:book_reflection) { ActiveFedora::Reflection.create(:has_many, 'pages', nil, { predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf }, Book) }
     let(:association) { described_class.new(book, book_reflection) }
 
-    subject(:af_page) { association.send(:find_polymorphic_inverse, page) }
-
     context "when a has_many is present" do
       before do
         # :books must come first, so that we can test that is being passed over in favor of :contents

data/spec/unit/indexing/map/index_object_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+RSpec.describe ActiveFedora::Indexing::Map::IndexObject do
+  describe "with a block" do
+    subject(:instance) do
+      described_class.new(:name) do |index|
+        index.as :stored_searchable, :facetable
+      end
+    end
+
+    it "can set behaviors" do
+      expect(instance.behaviors).to eq [:stored_searchable, :facetable]
+    end
+  end
+
+  describe "with an initializer parameters" do
+    subject(:instance) do
+      described_class.new(:name, behaviors: [:stored_searchable, :facetable])
+    end
+
+    it "can set behaviors" do
+      expect(instance.behaviors).to eq [:stored_searchable, :facetable]
+    end
+  end
+end

data/spec/unit/indexing/map_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+RSpec.describe ActiveFedora::Indexing::Map do
+  describe ".merge" do
+    subject(:merged) { first_map.merge(extra) }
+    let(:index_object1) { instance_double(described_class::IndexObject) }
+    let(:index_object2) { instance_double(described_class::IndexObject) }
+    let(:index_object3) { instance_double(described_class::IndexObject) }
+    let(:first_map) { described_class.new(one: index_object1, two: index_object2) }
+
+    context "with a hash" do
+      let(:extra) { { three: index_object3 } }
+      it "merges with a hash" do
+        expect(merged).to be_instance_of described_class
+        expect(merged.keys).to match_array [:one, :two, :three]
+      end
+    end
+
+    context "with another Indexing::Map" do
+      let(:extra) { described_class.new(three: index_object3) }
+      it "merges with the other map" do
+        expect(merged).to be_instance_of described_class
+        expect(merged.keys).to match_array [:one, :two, :three]
+      end
+    end
+  end
+end

data/spec/unit/indexing_spec.rb

@@ -53,9 +53,8 @@ describe ActiveFedora::Indexing do
       Object.send(:remove_const, :SpecNode)
     end
 
-    let(:test_object) { SpecNode.new(title: ['first title'], abstract: 'The abstract') }
-
     subject(:solr_doc) { test_object.to_solr }
+    let(:test_object) { SpecNode.new(title: ['first title'], abstract: 'The abstract') }
 
     it "indexs the rdf properties" do
       expect(solr_doc).to include('title_tesim' => ['first title'], 'abstract_ssi' => 'The abstract')

data/spec/unit/inheritance_spec.rb

@@ -8,6 +8,9 @@ describe ActiveFedora::Base do
     class MySample < ActiveFedora::File
     end
 
+    class MyDeepSample < MySample
+    end
+
     class Foo < ActiveFedora::Base
       has_subresource 'foostream', class_name: 'MyDS'
       has_subresource 'dcstream', class_name: 'MySample'
@@ -16,18 +19,42 @@ describe ActiveFedora::Base do
     class Bar < ActiveFedora::Base
       has_subresource 'barstream', class_name: 'MyDS'
     end
+
+    class Baz < Bar
+    end
   end
-  let(:f) { Foo.new }
+
   subject(:attached_files) { f.attached_files }
+  let(:f) { Foo.new }
 
   it "doesn't overwrite stream specs" do
     expect(attached_files.values).to match_array [MyDS, MySample]
   end
 
+  context 'base_class' do
+    it 'shallow < Base' do
+      expect(Bar.base_class).to eq(Bar)
+    end
+
+    it 'deep < Base' do
+      expect(Baz.base_class).to eq(Bar)
+    end
+
+    it 'shallow < File' do
+      expect(MySample.base_class).to eq(ActiveFedora::File)
+    end
+
+    it 'deep < File' do
+      expect(MyDeepSample.base_class).to eq(ActiveFedora::File)
+    end
+  end
+
   after do
+    Object.send(:remove_const, :Baz)
     Object.send(:remove_const, :Bar)
     Object.send(:remove_const, :Foo)
     Object.send(:remove_const, :MyDS)
+    Object.send(:remove_const, :MyDeepSample)
     Object.send(:remove_const, :MySample)
   end
 end

data/spec/unit/model_classifier_spec.rb

@@ -10,8 +10,8 @@ describe ActiveFedora::ModelClassifier do
     end
   end
 
-  let(:class_names) { ["ParentClass::SiblingClass", "ParentClass::OtherSiblingClass", "ParentClass::SubclassClass", "ParentClass::NoSuchClass"] }
   subject(:classifier) { described_class.new class_names }
+  let(:class_names) { ["ParentClass::SiblingClass", "ParentClass::OtherSiblingClass", "ParentClass::SubclassClass", "ParentClass::NoSuchClass"] }
 
   describe ".class_from_string" do
     it "returns class constants based on strings" do

data/spec/unit/pathing_spec.rb

@@ -2,8 +2,6 @@ require 'spec_helper'
 
 describe ActiveFedora::Base do
   describe ".uri_prefix" do
-    let(:path) { "foo" }
-
     before do
       class FooHistory < ActiveFedora::Base
         def uri_prefix
@@ -18,6 +16,7 @@ describe ActiveFedora::Base do
     end
 
     subject(:history) { FooHistory.new(title: ["Root foo"]) }
+    let(:path) { "foo" }
 
     it { is_expected.to have_uri_prefix }