ddr-models 2.6.2 → 2.7.0.rc1

data/spec/managers/technical_metadata_manager_spec.rb

@@ -8,21 +8,23 @@ module Ddr::Managers
     let(:obj) { Component.new }
 
     describe "when fits datastream not present" do
-      its(:valid) { is_expected.to be_empty }
-      its(:well_formed) { is_expected.to be_empty }
+      its(:fits?) { is_expected.to be false }
+
+      its(:created) { is_expected.to be_empty }
+      its(:creating_application) { is_expected.to be_empty }
+      its(:creation_time) { is_expected.to be_empty }
+      its(:file_size) { is_expected.to be_empty }
+      its(:fits_datetime) { is_expected.to be_nil }
+      its(:fits_version) { is_expected.to be_nil }
       its(:format_label) { is_expected.to be_empty }
-      its(:media_type) { is_expected.to be_empty }
       its(:format_version) { is_expected.to be_empty }
       its(:last_modified) { is_expected.to be_empty }
+      its(:md5) { is_expected.to be_nil }
+      its(:media_type) { is_expected.to be_empty }
       its(:modification_time) { is_expected.to be_empty }
-      its(:created) { is_expected.to be_empty }
-      its(:creation_time) { is_expected.to be_empty }
       its(:pronom_identifier) { is_expected.to be_empty }
-      its(:creating_application) { is_expected.to be_empty }
-      its(:file_size) { is_expected.to be_empty }
-      its(:fits_version) { is_expected.to be_nil }
-      its(:fits_datetime) { is_expected.to be_nil }
-      its(:fits?) { is_expected.to be false }
+      its(:valid) { is_expected.to be_empty }
+      its(:well_formed) { is_expected.to be_empty }
     end
 
     describe "when content is not present" do
@@ -34,20 +36,22 @@ module Ddr::Managers
       before do
         obj.fits.content = fixture_file_upload(File.join("fits", "document.xml"))
       end
+
       its(:fits?) { is_expected.to be true }
-      its(:valid) { is_expected.to eq(["false"]) }
-      its(:well_formed) { is_expected.to eq(["true"]) }
-      its(:format_label) { is_expected.to eq(["Portable Document Format"]) }
-      its(:media_type) { is_expected.to eq(["application/pdf"]) }
-      its(:format_version) { is_expected.to eq(["1.6"]) }
-      its(:last_modified) { is_expected.to eq(["2015-06-08T21:22:35Z"]) }
+
       its(:created) { is_expected.to eq(["2015:06:05 15:16:23-04:00"]) }
-      its(:pronom_identifier) { is_expected.to eq(["fmt/20"]) }
       its(:creating_application) { is_expected.to contain_exactly("Adobe Acrobat Pro 11.0.3 Paper Capture Plug-in/PREMIS Editorial Committee", "Adobe Acrobat Pro 11.0.3 Paper Capture Plug-in/Acrobat PDFMaker 11 for Word") }
-      its(:fits_version) { is_expected.to eq("0.8.5") }
       its(:extent) { is_expected.to eq(["3786205"]) }
       its(:file_size) { is_expected.to eq([3786205]) }
+      its(:fits_version) { is_expected.to eq("0.8.5") }
+      its(:format_label) { is_expected.to eq(["Portable Document Format"]) }
+      its(:format_version) { is_expected.to eq(["1.6"]) }
+      its(:last_modified) { is_expected.to eq(["2015-06-08T21:22:35Z"]) }
+      its(:md5) { is_expected.to eq("432ab76d650bfdc8f8d4a98cea9634bb") }
       its(:media_type) { is_expected.to eq(["application/pdf"]) }
+      its(:pronom_identifier) { is_expected.to eq(["fmt/20"]) }
+      its(:valid) { is_expected.to eq(["false"]) }
+      its(:well_formed) { is_expected.to eq(["true"]) }
 
       describe "datetime fields" do
         its(:creation_time) { is_expected.to contain_exactly(DateTime.parse("2015-06-05 15:16:23-04:00").to_time.utc) }

data/spec/models/active_fedora_base_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 RSpec.describe ActiveFedora::Base do
 
   describe ".find" do
@@ -26,108 +24,4 @@ RSpec.describe ActiveFedora::Base do
     end
   end
 
-  describe "attachments", attachments: true do
-    before do
-      class AttachToable < ActiveFedora::Base
-        include Ddr::Models::HasAttachments
-      end
-    end
-    after do
-      Object.send(:remove_const, :AttachToable)
-    end
-    describe "#can_have_attachments?" do
-      it "#should return true if the object can have attachments, otherwise false" do
-        expect(AttachToable.new.can_have_attachments?).to be_truthy
-        expect(ActiveFedora::Base.new.can_have_attachments?).to be_falsey
-      end
-    end
-    describe "#has_attachments?" do
-      let(:attach_toable) { AttachToable.new }
-      before { attach_toable.attachments << Attachment.new }
-      it "should return true if the object has Attachments, otherwise false" do
-        expect(AttachToable.new).not_to have_attachments
-        expect(ActiveFedora::Base.new).not_to have_attachments
-        expect(attach_toable).to have_attachments
-      end
-    end
-  end
-
-  describe "children", children: true do
-    before do
-      class Childrenable < ActiveFedora::Base
-        has_many :children, property: :is_member_of, class_name: 'ActiveFedora::Base'
-      end
-    end
-    after do
-      Object.send(:remove_const, :Childrenable)
-    end
-    describe "#can_have_children?" do
-      it "should return true if object can have children, otherwise false" do
-        expect(Childrenable.new.can_have_children?).to be_truthy
-        expect(ActiveFedora::Base.new.can_have_children?).to be_falsey
-      end
-    end
-    describe "#has_children?" do
-      let(:childrenable) { Childrenable.new }
-      before { childrenable.children << ActiveFedora::Base.new }
-      it "should return true if object has children, otherwise false" do
-        expect(Childrenable.new).not_to have_children
-        expect(ActiveFedora::Base.new).not_to have_children
-        expect(childrenable).to have_children
-      end
-    end
-  end
-
-  describe "thumbnail" do
-    before do
-      class Thumbnailable < ActiveFedora::Base
-        include Ddr::Models::HasThumbnail
-      end
-    end
-    after do
-      Object.send(:remove_const, :Thumbnailable)
-    end
-    describe "#can_have_thumbnail?" do
-      it "should return true if object can have a thumbnail, else false" do
-        expect(Thumbnailable.new.can_have_thumbnail?).to be_truthy
-        expect(ActiveFedora::Base.new.can_have_thumbnail?).to be_falsey
-      end
-    end
-    describe "#has_thumbnail?" do
-      let(:thumbnailable) { Thumbnailable.new }
-      before { allow(thumbnailable.datastreams[Ddr::Datastreams::THUMBNAIL]).to receive(:has_content?).and_return(true) }
-      it "should return true if object has a thumbnail, else false" do
-        expect(thumbnailable).to have_thumbnail
-        expect(Thumbnailable.new).not_to have_thumbnail
-        expect(ActiveFedora::Base.new).not_to have_thumbnail
-      end
-    end
-  end
-
-  describe "content" do
-    before do
-      class Contentable < ActiveFedora::Base
-        include Ddr::Models::HasContent
-      end
-    end
-    after do
-      Object.send(:remove_const, :Contentable)
-    end
-    describe "#can_have_content?" do
-      it "should return true if object can have content, else false" do
-        expect(Contentable.new.can_have_content?).to be_truthy
-        expect(ActiveFedora::Base.new.can_have_content?).to be_falsey
-      end
-    end
-    describe "#has_content?" do
-      let(:contentable) { Contentable.new }
-      before { allow(contentable.datastreams[Ddr::Datastreams::CONTENT]).to receive(:has_content?).and_return(true) }
-      it "should return true if object has content, else false" do
-        expect(contentable).to have_content
-        expect(Contentable.new).not_to have_content
-        expect(ActiveFedora::Base.new).not_to have_content
-      end
-    end
-  end
-
 end

data/spec/models/active_fedora_datastream_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module ActiveFedora
   RSpec.describe Datastream do
 
@@ -162,5 +160,38 @@ module ActiveFedora
 
     end # external datastreams
 
+    describe "notifications" do
+      let(:events) { [] }
+      before {
+        @subscriber = ActiveSupport::Notifications.subscribe(event_name) do |name, start, finish, id, payload|
+          events << payload
+        end
+      }
+      after {
+        ActiveSupport::Notifications.unsubscribe(@subscriber)
+      }
+      describe "on create" do
+        let(:obj) { ActiveFedora::Base.create }
+        let(:event_name) { "save.repo_file" }
+        specify {
+          obj.add_file_datastream("foo", dsid: "DS1", controlGroup: "M")
+          obj.save!
+          expect(events.last[:pid]).to eq obj.pid
+          expect(events.last[:file_id]).to eq "DS1"
+          expect(events.last[:profile]).to be_present
+        }
+      end
+      describe "on destroy" do
+        let(:obj) { FactoryGirl.create(:item) }
+        let(:event_name) { "delete.repo_file" }
+        specify {
+          obj.descMetadata.delete
+          expect(events.first[:pid]).to eq obj.pid
+          expect(events.first[:file_id]).to eq "descMetadata"
+          expect(events.first[:profile]).to be_present
+        }
+      end
+    end
+
   end
 end

data/spec/models/attachment_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 RSpec.describe Attachment, type: :model, attachments: true do
 
   it_behaves_like "a DDR model"

data/spec/models/cache_spec.rb

@@ -0,0 +1,32 @@
+module Ddr::Models
+  RSpec.describe Cache do
+
+    describe "#get" do
+      it "retrieves a value by key" do
+        expect(subject.get(:foo)).to be_nil
+        subject[:foo] = "bar"
+        expect(subject.get(:foo)).to eq "bar"
+      end
+    end
+
+    describe "#put" do
+      it "inserts a key/value" do
+        expect { subject.put(:foo, "bar") }.to change { subject[:foo] }.from(nil).to("bar")
+      end
+    end
+
+    describe "#with" do
+      it "returns the value of the block" do
+        result = subject.with(foo: "bar") { 1 }
+        expect(result).to eq 1
+      end
+      it "temporarily caches the arguments" do
+        subject.with(foo: "bar") do
+          expect(subject.get(:foo)).to eq "bar"
+        end
+        expect(subject.get(:foo)).to be_nil
+      end
+    end
+
+  end
+end

data/spec/models/collection_spec.rb

@@ -21,27 +21,11 @@ RSpec.describe Collection, type: :model do
   end
 
   describe "title" do
-    before do
-      subject.title = [ "Test Collection" ]
-    end
     it "indexes the collection title" do
       expect(subject.to_solr[Ddr::Index::Fields::COLLECTION_TITLE]).to eq("Test Collection")
     end
   end
 
-  describe "legacy license information" do
-    before do
-      subject.defaultRights.license.title = ["License Title"]
-      subject.defaultRights.license.description = ["License Description"]
-      subject.defaultRights.license.url = ["http://library.duke.edu"]
-    end
-    it "indexes the terms" do
-      expect(subject.to_solr[Ddr::Index::Fields::DEFAULT_LICENSE_TITLE]).to eq("License Title")
-      expect(subject.to_solr[Ddr::Index::Fields::DEFAULT_LICENSE_DESCRIPTION]).to eq("License Description")
-      expect(subject.to_solr[Ddr::Index::Fields::DEFAULT_LICENSE_URL]).to eq("http://library.duke.edu")
-    end
-  end
-
   describe "#components_from_solr" do
     subject { Collection.new(pid: 'test:1') }
     before do
@@ -66,7 +50,7 @@ RSpec.describe Collection, type: :model do
   end
 
   describe "creation" do
-    subject { Collection.create(title: [ "Test Collection" ]) }
+    before { subject.save! }
     it "is governed by itself" do
       expect(subject.admin_policy).to eq(subject)
     end
@@ -75,9 +59,49 @@ RSpec.describe Collection, type: :model do
   describe "roles granted to creator" do
     let(:user) { FactoryGirl.build(:user) }
     before { subject.grant_roles_to_creator(user) }
-    it "includes Curator roles in both resource and policy scopes" do
-      expect(subject.roles.to_a).to eq([Ddr::Auth::Roles::Role.build(type: "Curator", agent: user.agent, scope: "resource"), Ddr::Auth::Roles::Role.build(type: "Curator", agent: user.agent, scope: "policy")])
+    its(:roles) { is_expected.to include(Ddr::Auth::Roles::Role.build(type: "Curator", agent: user, scope: "policy")) }
+  end
+
+  describe "default roles granted" do
+    describe "and the metadata managers group is set" do
+      before do
+        allow(Ddr::Auth).to receive(:metadata_managers_group) { "metadata_managers" }
+        subject.save!
+      end
+      it "includes the MetadataEditor role in policy scope for the Metadata Managers group" do
+        expect(subject.roles.to_a).to eq([Ddr::Auth::Roles::Role.build(type: "MetadataEditor", agent: "metadata_managers", scope: "policy")])
+      end
+    end
+    describe "and the metadata managers group is not set" do
+      before do
+        allow(Ddr::Auth).to receive(:metadata_managers_group) { nil }
+        subject.save!
+      end
+      its(:roles) { is_expected.to be_empty }
     end
   end
 
+  describe "attachments" do
+    its(:can_have_attachments?) { is_expected.to be true }
+    it { is_expected.not_to have_attachments }
+    specify {
+      subject.attachments << Attachment.new
+      expect(subject).to have_attachments
+    }
+  end
+
+  describe "content" do
+    its(:can_have_content?) { is_expected.to be false }
+    it { is_expected.to_not have_content }
+  end
+
+  describe "children" do
+    its(:can_have_children?) { is_expected.to be true }
+    it { is_expected.to_not have_children }
+    specify {
+      subject.children << Item.new
+      expect(subject).to have_children
+    }
+  end
+
 end

data/spec/models/component_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 RSpec.describe Component, type: :model, components: true do
 
   it_behaves_like "a DDR model"
@@ -8,6 +6,7 @@ RSpec.describe Component, type: :model, components: true do
   it_behaves_like "it has an association", :belongs_to, :target, :has_external_target, "Target"
   it_behaves_like "a non-collection model"
   it_behaves_like "a potentially publishable object"
+  it_behaves_like "an object that can have an intermediate file"
 
   describe "indexing" do
     subject { FactoryGirl.build(:component) }
@@ -17,68 +16,59 @@ RSpec.describe Component, type: :model, components: true do
     its(:index_fields) { is_expected.to include(Ddr::Index::Fields::COLLECTION_URI => "info:fedora/test:1") }
   end
 
-  describe "extracted text" do
-    let(:parent) { FactoryGirl.create(:item) }
-    describe "when the child is not already associated with the parent" do
-      before {
-        subject.extractedText.content = fixture_file_upload('extractedText1.txt')
-        subject.save
-        subject.reload
-      }
-      it "updates the parent index when associated" do
-        expect(subject).to receive(:index_parent)
-        subject.parent = parent
-        subject.save
+  describe "default structure" do
+    describe "no content" do
+      it "should be nil" do
+        expect(subject.default_structure).to be_nil
       end
     end
-    describe "when the child is already associated with the parent" do
-      before {
-        subject.parent = parent
-        subject.save
-      }
-      describe "when there is no extracted text" do
-        describe "and none is added" do
-          it "does not trigger an index update on the parent" do
-            expect(subject).not_to receive(:index_parent)
-            subject.save
+    describe "has content" do
+      before { allow(subject).to receive(:has_content?) { true } }
+      before { allow(subject).to receive(:has_thumbnail?) { true } }
+      let(:struct) { subject.default_structure }
+      it "has the correct original file" do
+        expect(struct.uses[Ddr::Models::Structure::USE_ORIGINAL_FILE].first.href).to eq(Ddr::Datastreams::CONTENT)
+      end
+      it "has the correct preservation master file" do
+        expect(struct.uses[Ddr::Models::Structure::USE_PRESERVATION_MASTER_FILE].first.href)
+                                                                                  .to eq(Ddr::Datastreams::CONTENT)
+      end
+      describe "intermediate file" do
+        describe "with intermediate file" do
+          before do
+            allow(subject).to receive(:has_intermediate_file?) { true }
+          end
+          it "has the correct structure file" do
+            expect(struct.uses[Ddr::Models::Structure::USE_INTERMEDIATE_FILE].first.href)
+                .to eq(Ddr::Datastreams::INTERMEDIATE_FILE)
           end
         end
-        describe "and extracted text is added" do
-          it "triggers an index update on the parent" do
-            expect(subject).to receive(:index_parent)
-            subject.extractedText.content = fixture_file_upload('extractedText1.txt')
-            subject.save
+        describe "without intermediate image" do
+          it "has the correct structure file" do
+            expect(struct.uses[Ddr::Models::Structure::USE_INTERMEDIATE_FILE]).to be nil
           end
         end
       end
-      describe "when extracted text exists" do
-        before {
-          subject.extractedText.content = fixture_file_upload('extractedText1.txt')
-          subject.save
-          subject.reload
-        }
-        describe "and is removed" do
-          it "triggers an index update on the parent" do
-            pending "Deleting a datastream does not mark the content as changed"
-            expect(subject).to receive(:index_parent)
-            subject.extractedText.delete
-            subject.save
+      describe "service file" do
+        describe "with multires image" do
+          before do
+            allow(subject).to receive(:has_multires_image?) { true }
           end
-        end
-        describe "and doesn't change" do
-          it "triggers an index update on the parent" do
-            expect(subject).to receive(:index_parent)
-            subject.save
+          it "has the correct structure file" do
+            expect(struct.uses[Ddr::Models::Structure::USE_SERVICE_FILE].first.href)
+                                                                            .to eq(Ddr::Datastreams::MULTIRES_IMAGE)
           end
         end
-        describe "and changes" do
-          it "triggers an index update on the parent" do
-            expect(subject).to receive(:index_parent)
-            subject.extractedText.content = fixture_file_upload('extractedText2.txt')
-            subject.save
+        describe "without multires image" do
+          it "has the correct structure file" do
+            expect(struct.uses[Ddr::Models::Structure::USE_SERVICE_FILE].first.href).to eq(Ddr::Datastreams::CONTENT)
           end
         end
       end
+      it "has the correct thumbnail image" do
+        expect(struct.uses[Ddr::Models::Structure::USE_THUMBNAIL_IMAGE].first.href).to eq(Ddr::Datastreams::THUMBNAIL)
+      end
     end
+
   end
 end