ddr-models 2.11.0 → 3.0.0.alpha.1

data/spec/index/filters_spec.rb

@@ -0,0 +1,17 @@
+module Ddr::Index
+  RSpec.describe Filters do
+
+    describe "HAS_CONTENT" do
+      subject { Filters::HAS_CONTENT }
+      its(:clauses) { is_expected.to eq(["active_fedora_model_ssi:(Component OR Attachment OR Target)"]) }
+    end
+
+    describe "class methods" do
+      describe "is_governed_by(pid)" do
+        subject { Filters.is_governed_by("test-1") }
+        its(:clauses) { is_expected.to eq(["{!term f=isGovernedBy_ssim}test-1"]) }
+      end
+    end
+
+  end
+end

data/spec/index/query_spec.rb

@@ -1,91 +1,19 @@
 module Ddr::Index
   RSpec.describe Query do
-    describe ".build" do
-      let(:local1) { double(value: "foo:bar") }
-      let(:local2) { double(value: "foo") }
-      subject {
-        described_class.build(local1, local2) do |l1, l2|
-          q l1.value
-          where "spam"=>"eggs"
-          fields :id, "foo", "spam"
-          asc l2.value
-          limit 50
-        end
-      }
 
-      its(:to_s) {
-        is_expected.to eq "q=foo%3Abar&fq=spam%3Aeggs&fl=id%2Cfoo%2Cspam&sort=foo+asc&rows=50"
-      }
-      its(:params) {
-        is_expected.to eq({q: "foo:bar", fl: "id,foo,spam", fq: ["spam:eggs"], sort: "foo asc", rows: 50})
-      }
+    subject do
+      QueryBuilder.build do |query|
+        query
+          .q("foo:bar")
+          .where("spam"=>"eggs")
+          .fields("id", "foo", "spam")
+          .limit(50)
+      end
     end
 
-    describe "initialization" do
-      describe "with attributes" do
-        let(:id) { UniqueKeyField.instance }
-        let(:foo) { Field.new("foo") }
-        let(:spam) { Field.new("spam") }
-        let(:filter) { Filter.where(spam=>"eggs") }
-        let(:sort_order) { SortOrder.new(field: foo, order: "asc") }
-        let(:fields) { [id, foo, spam] }
-
-        subject {
-          described_class.new(q: "foo:bar",
-                              filters: [filter],
-                              fields: fields,
-                              sort: sort_order,
-                              rows: 50)
-        }
+    its(:to_s) { is_expected.to eq("q=foo%3Abar&fq=%7B%21term+f%3Dspam%7Deggs&fl=id%2Cfoo%2Cspam&rows=50") }
 
-        its(:to_s) {
-          is_expected.to eq "q=foo%3Abar&fq=spam%3Aeggs&fl=id%2Cfoo%2Cspam&sort=foo+asc&rows=50"
-        }
-        its(:params) {
-          is_expected.to eq({q: "foo:bar", fl: "id,foo,spam", fq: ["spam:eggs"], sort: "foo asc", rows: 50})
-        }
-      end
+    its(:params) { is_expected.to eq({q: "foo:bar", fl: "id,foo,spam", fq: ["{!term f=spam}eggs"], rows: 50}) }
 
-      describe "with a block" do
-        subject {
-          described_class.new do
-            q "foo:bar"
-            where "spam"=>"eggs"
-            fields :id, "foo", "spam"
-            asc "foo"
-            limit 50
-          end
-        }
-
-        its(:to_s) {
-          is_expected.to eq "q=foo%3Abar&fq=spam%3Aeggs&fl=id%2Cfoo%2Cspam&sort=foo+asc&rows=50"
-        }
-        its(:params) {
-          is_expected.to eq({q: "foo:bar", fl: "id,foo,spam", fq: ["spam:eggs"], sort: "foo asc", rows: 50})
-        }
-      end
-    end
-
-    describe "equality" do
-      subject {
-        described_class.new do
-          q "foo:bar"
-          where "spam"=>"eggs"
-          fields :id, "foo", "spam"
-          asc "foo"
-          limit 50
-        end
-      }
-      let(:other) do
-        described_class.new do
-          q "foo:bar"
-          where "spam"=>"eggs"
-          fields :id, "foo", "spam"
-          asc "foo"
-          limit 50
-        end
-      end
-      it { is_expected.to eq other }
-    end
   end
 end

data/spec/jobs/fits_file_characterization_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+module Ddr::Jobs
+  RSpec.describe FitsFileCharacterization, jobs: true, file_characterization: true do
+
+    shared_examples "has a fits update event" do
+      let(:event) { object.update_events.last }
+      it "should have the correct event attributes" do
+        expect(event.outcome).to eq(expected_outcome)
+        expect(event.detail).to eq(expected_detail)
+        expect(event.software).to eq("fits #{fits_version}")
+      end
+    end
+
+    context "content-bearing object" do
+      let(:object) { TestContent.create }
+      let(:stdout_msg) { '<fits />' }
+      let(:stderr_msg) { 'stderr msg' }
+      let(:fits_version) { '0.9.9 '}
+      before { allow(Ddr::Jobs::FitsFileCharacterization).to receive(:fits_version) { fits_version } }
+      context "fits command is successful" do
+        let(:expected_outcome) { Ddr::Events::Event::SUCCESS }
+        let(:expected_detail) { nil }
+        before do
+          allow(Open3).to receive(:capture3) { [ stdout_msg, stderr_msg,  $? ] }
+          allow_any_instance_of(Process::Status).to receive(:success?) { true }
+          Ddr::Jobs::FitsFileCharacterization.perform(object.pid)
+          object.reload
+        end
+        it "should populate the fits datastream" do
+          expect(object.fits.content).to be_present
+        end
+        it_behaves_like "has a fits update event"
+      end
+      context "fits command is not successful" do
+        let(:expected_outcome) { Ddr::Events::Event::FAILURE }
+        let(:expected_detail) { stderr_msg }
+        before do
+          allow(Open3).to receive(:capture3) { [ stdout_msg, stderr_msg,  $? ] }
+          allow_any_instance_of(Process::Status).to receive(:success?) { false }
+          Ddr::Jobs::FitsFileCharacterization.perform(object.pid)
+          object.reload
+        end
+        it "should not populate the fits datastream" do
+          expect(object.fits.content).to_not be_present
+        end
+        it_behaves_like "has a fits update event"
+      end
+    end
+
+  end
+end

data/spec/managers/derivatives_manager_spec.rb

@@ -1,127 +1,125 @@
-module Ddr::Managers
-  RSpec.describe DerivativesManager do
+require 'spec_helper'
 
-    describe "generators called" do
-      before { object.add_file file, Ddr::Datastreams::CONTENT }
-      context "all derivatives" do
-        context "not multires_image_able" do
-          let(:object) { Target.new }
-          context "content is an image" do
-            let(:file) { fixture_file_upload("imageA.tif", "image/tiff") }
-            it "calls the thumbnail generator and not the ptif generator" do
-              expect(object.derivatives).to receive(:generate_derivative).with(Ddr::Derivatives::DERIVATIVES[:thumbnail])
-              expect(object.derivatives).to_not receive(:generate_derivative).with(Ddr::Derivatives::DERIVATIVES[:multires_image])
-              object.derivatives.update_derivatives(:now)
-            end
-          end
-          context "content is not an image" do
-            let(:file) { fixture_file_upload("sample.docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document") }
-            it "should generate neither a thumbnail nor a ptif" do
-              expect(object.derivatives).to_not receive(:generate_derivative).with(Ddr::Derivatives::DERIVATIVES[:thumbnail])
-              expect(object.derivatives).to_not receive(:generate_derivative).with(Ddr::Derivatives::DERIVATIVES[:multires_image])
-              object.derivatives.update_derivatives(:now)
-            end
-          end
+module Ddr
+  module Managers
+    RSpec.describe DerivativesManager do
+
+      before(:all) do
+        class ContentBearing < ActiveFedora::Base
+          include Ddr::Models::HasAdminMetadata
+          include Ddr::Models::HasContent
+          include Ddr::Models::HasThumbnail
+          include Ddr::Models::EventLoggable
+          _save_callbacks.clear
+        end
+        class MultiresImageable < ContentBearing
+          include Ddr::Models::HasMultiresImage
+          _save_callbacks.clear
         end
-        context "multires_image_able" do
-          let(:object) { Component.new }
-          context "content is tiff image" do
-            let(:file) { fixture_file_upload("imageA.tif", "image/tiff") }
-            it "should generate a thumbnail and a ptif" do
-              expect(object.derivatives).to receive(:generate_derivative).with(Ddr::Derivatives::DERIVATIVES[:thumbnail])
-              expect(object.derivatives).to receive(:generate_derivative).with(Ddr::Derivatives::DERIVATIVES[:multires_image])
-              object.derivatives.update_derivatives(:now)
+      end
+
+      after(:all) do
+        Ddr::Managers.send(:remove_const, :MultiresImageable)
+        Ddr::Managers.send(:remove_const, :ContentBearing)
+      end
+
+      describe "generators called" do
+        before { object.add_file file, path: Ddr::Datastreams::CONTENT }
+        context "all derivatives" do
+          context "not multires_image_able" do
+            let(:object) { ContentBearing.new }
+            context "content is image" do
+              let(:file) { fixture_file_upload("imageA.tif", "image/tiff") }
+              it "should generate a thumbnail and not a ptif" do
+                expect(object.derivatives).to receive(:generate_derivative).with(Ddr::Derivatives::DERIVATIVES[:thumbnail])
+                expect(object.derivatives).to_not receive(:generate_derivative).with(Ddr::Derivatives::DERIVATIVES[:multires_image])
+                object.derivatives.update_derivatives(:now)
+              end
             end
-          end
-          context "content is not tiff image" do
-            let(:file) { fixture_file_upload("bird.jpg", "image/jpeg") }
-            it "should generate a thumbnail and a ptif" do
-              expect(object.derivatives).to receive(:generate_derivative).with(Ddr::Derivatives::DERIVATIVES[:thumbnail])
-              expect(object.derivatives).to receive(:generate_derivative).with(Ddr::Derivatives::DERIVATIVES[:multires_image])
-              object.derivatives.update_derivatives(:now)
+            # context "content is a PDF" do
+            #   let(:file) { fixture_file_upload("sample.pdf", "application/pdf") }
+            #   it "should generate a thumbnail and not a ptif" do
+            #     expect(object.derivatives).to receive(:generate_derivative).with(Ddr::Derivatives::DERIVATIVES[:thumbnail])
+            #     expect(object.derivatives).to_not receive(:generate_derivative).with(Ddr::Derivatives::DERIVATIVES[:multires_image])
+            #     object.derivatives.update_derivatives(:now)
+            #   end
+            # end
+            context "content is neither an image nor a PDF" do
+              let(:file) { fixture_file_upload("sample.docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document") }
+              it "should generate neither a thumbnail nor a ptif" do
+                expect(object.derivatives).to_not receive(:generate_derivative).with(Ddr::Derivatives::DERIVATIVES[:thumbnail])
+                expect(object.derivatives).to_not receive(:generate_derivative).with(Ddr::Derivatives::DERIVATIVES[:multires_image])
+                object.derivatives.update_derivatives(:now)
+              end
             end
           end
-          context "content is not tiff or jpeg image" do
-            let(:file) { fixture_file_upload("arrow1rightred_e0.gif", "image/gif") }
-            it "should generate a thumbnail but not a ptif" do
-              expect(object.derivatives).to receive(:generate_derivative).with(Ddr::Derivatives::DERIVATIVES[:thumbnail])
-              expect(object.derivatives).to_not receive(:generate_derivative).with(Ddr::Derivatives::DERIVATIVES[:multires_image])
-              object.derivatives.update_derivatives(:now)
+          context "multires_image_able" do
+            let(:object) { MultiresImageable.new }
+            context "content is tiff image" do
+              let(:file) { fixture_file_upload("imageA.tif", "image/tiff") }
+              it "should generate a thumbnail and a ptif" do
+                expect(object.derivatives).to receive(:generate_derivative).with(Ddr::Derivatives::DERIVATIVES[:thumbnail])
+                expect(object.derivatives).to receive(:generate_derivative).with(Ddr::Derivatives::DERIVATIVES[:multires_image])
+                object.derivatives.update_derivatives(:now)
+              end
+            end
+            context "content is not tiff image" do
+              let(:file) { fixture_file_upload("bird.jpg", "image/jpeg") }
+              it "should generate a thumbnail but not a ptif" do
+                expect(object.derivatives).to receive(:generate_derivative).with(Ddr::Derivatives::DERIVATIVES[:thumbnail])
+                expect(object.derivatives).to_not receive(:generate_derivative).with(Ddr::Derivatives::DERIVATIVES[:multires_image])
+                object.derivatives.update_derivatives(:now)
+              end
             end
           end
         end
-      end
-      context "not all derivatives" do
-        let!(:derivs) { Ddr::Derivatives.update_derivatives }
-        before { Ddr::Derivatives.update_derivatives = [ :thumbnail ] }
-        after { Ddr::Derivatives.update_derivatives = derivs }
-        let(:object) { Component.new }
-        let(:file) { fixture_file_upload("imageA.tif", "image/tiff") }
-        it "should only generate the thumbnail derivative" do
-          expect(object.derivatives).to receive(:generate_derivative).with(Ddr::Derivatives::DERIVATIVES[:thumbnail])
-          expect(object.derivatives).to_not receive(:generate_derivative).with(Ddr::Derivatives::DERIVATIVES[:multires_image])
-          object.derivatives.update_derivatives(:now)
+        context "not all derivatives" do
+          let!(:derivs) { Ddr::Derivatives.update_derivatives }
+          before { Ddr::Derivatives.update_derivatives = [ :thumbnail ] }
+          after { Ddr::Derivatives.update_derivatives = derivs }
+          let(:object) { MultiresImageable.new }
+          let(:file) { fixture_file_upload("imageA.tif", "image/tiff") }
+          it "should only generate the thumbnail derivative" do
+            expect(object.derivatives).to receive(:generate_derivative).with(Ddr::Derivatives::DERIVATIVES[:thumbnail])
+            expect(object.derivatives).to_not receive(:generate_derivative).with(Ddr::Derivatives::DERIVATIVES[:multires_image])
+            object.derivatives.update_derivatives(:now)
+          end
         end
-      end
-    end
+end
 
-    describe "derivative generation" do
-      let(:file) { fixture_file_upload("imageA.tif", "image/tiff") }
-      before { object.upload! file }
-      describe "thumbnail" do
-        let(:object) { Component.create }
-        it "should create content in the thumbnail datastream" do
-          expect(object.datastreams[Ddr::Datastreams::THUMBNAIL]).to_not be_present
-          object.derivatives.generate_derivative! Ddr::Derivatives::DERIVATIVES[:thumbnail]
-          expect(object.datastreams[Ddr::Datastreams::THUMBNAIL]).to be_present
-          expect(object.datastreams[Ddr::Datastreams::THUMBNAIL].size).to be > 0
+      describe "derivative generation" do
+        let(:file) { fixture_file_upload("imageA.tif", "image/tiff") }
+        before { object.upload! file }
+        describe "thumbnail" do
+          let(:object) { ContentBearing.create }
+          it "should create content in the thumbnail datastream" do
+            expect(object.datastreams[Ddr::Datastreams::THUMBNAIL]).to_not be_present
+            object.derivatives.generate_derivative Ddr::Derivatives::DERIVATIVES[:thumbnail]
+            expect(object.datastreams[Ddr::Datastreams::THUMBNAIL]).to be_present
+            expect(object.datastreams[Ddr::Datastreams::THUMBNAIL].size).to be > 0
+          end
         end
-      end
-      describe "ptif" do
-        let(:object) { Component.create }
-        it "should create content in the multires image datastream" do
-          expect(object.datastreams[Ddr::Datastreams::MULTIRES_IMAGE]).to_not be_present
-          object.derivatives.generate_derivative! Ddr::Derivatives::DERIVATIVES[:multires_image]
-          expect(object.datastreams[Ddr::Datastreams::MULTIRES_IMAGE]).to be_present
-          file_uri = object.datastreams[Ddr::Datastreams::MULTIRES_IMAGE].dsLocation
-          expect(File.size(Ddr::Utils.path_from_uri(file_uri))).to be > 0
+        describe "ptif" do
+          let(:object) { MultiresImageable.create }
+          it "should create content in the multires image datastream" do
+            expect(object.has_multires_image?).to be_falsey
+            object.derivatives.generate_derivative Ddr::Derivatives::DERIVATIVES[:multires_image]
+            expect(object.multires_image_file_path).to be_present
+            file_path = object.multires_image_file_path
+            expect(File.size(file_path)).to be > 0
+          end
         end
       end
-    end
 
-    describe "intermediate file handling" do
-      let(:object) { Component.create }
-      let(:file) { fixture_file_upload("imageA.tif", "image/tiff") }
-      before { object.upload! file }
-      describe "object has intermediate file" do
-        let(:intermediate_file) { fixture_file_upload("bird.jpg", "image/jpeg") }
-        before do
-          object.add_file intermediate_file, Ddr::Datastreams::INTERMEDIATE_FILE
-          object.save!
-          object.reload
-        end
-        it "uses the intermediate file as the derivative source" do
-          expect(object.derivatives.source_datastream).to equal(object.datastreams[Ddr::Datastreams::INTERMEDIATE_FILE])
-        end
-      end
-      describe "object does not have intermediate file" do
-        it "uses the content file as the derivative source" do
-          expect(object.derivatives.source_datastream).to equal(object.datastreams[Ddr::Datastreams::CONTENT])
+      describe "event creation" do
+        let(:file) { fixture_file_upload("imageA.tif", "image/tiff") }
+        before { object.upload! file }
+        let(:object) { MultiresImageable.create }
+        it "should create an update event for each derivative updated" do
+          expect {object.derivatives.update_derivatives(:now) }.to change { object.update_events.count }.by(2)
         end
       end
-    end
 
-    describe "exception during derivative generation" do
-      let(:object) { Component.create }
-      before do
-        allow(Dir::Tmpname).to receive(:make_tmpname).with('', nil) { 'test-temp-dir' }
-        # simulate raising of exception during derivative generation
-        allow_any_instance_of(Ddr::Managers::DerivativesManager).to receive(:generate_derivative!).and_raise(StandardError)
-      end
-      it "should delete the temporary work directory" do
-        expect(File.exist?(File.join(Dir.tmpdir, 'test-temp-dir'))).to be false
-      end
     end
-
   end
 end

data/spec/managers/technical_metadata_manager_spec.rb

@@ -8,23 +8,21 @@ module Ddr::Managers
     let(:obj) { Component.new }
 
     describe "when fits datastream not present" do
-      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(:valid) { is_expected.to be_empty }
+      its(:well_formed) { is_expected.to be_empty }
       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(:valid) { is_expected.to be_empty }
-      its(:well_formed) { 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 }
     end
 
     describe "when content is not present" do
@@ -36,48 +34,43 @@ 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(:created) { is_expected.to eq(["2015:12:09 13:23:09-05:00"]) }
-      its(:creating_application) { is_expected.to contain_exactly("Adobe PDF Library 11.0/Acrobat PDFMaker 11 for Word") }
-      its(:extent) { is_expected.to eq(["2176353"]) }
-      its(:file_size) { is_expected.to eq([2176353]) }
-      its(:fits_version) { is_expected.to eq("1.2.0") }
+      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(:format_version) { is_expected.to eq(["1.6"]) }
-      its(:last_modified) { is_expected.to eq(["2016-01-07T14:49:50Z"]) }
-      its(:md5) { is_expected.to eq("58fee04df34490ee7ecf3cdd5ddafc72") }
       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(:valid) { is_expected.to eq(["true"]) }
-      its(:well_formed) { is_expected.to eq(["true"]) }
+      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(:media_type) { is_expected.to eq(["application/pdf"]) }
 
       describe "datetime fields" do
-        its(:creation_time) { is_expected.to contain_exactly(DateTime.parse("2015-12-09 13:23:09-05:00").to_time.utc) }
-        its(:modification_time) { is_expected.to contain_exactly(DateTime.parse("2016-01-07T14:49:50Z").to_time.utc) }
+        its(:creation_time) { is_expected.to contain_exactly(DateTime.parse("2015-06-05 15:16:23-04:00").to_time.utc) }
+        its(:modification_time) { is_expected.to contain_exactly(DateTime.parse("2015-06-08T21:22:35Z").to_time.utc) }
       end
     end
 
     describe "checksum fields" do
       before do
-        allow(obj.content).to receive(:checksumType) { "SHA-256" }
-        allow(obj.content).to receive(:checksum) { "b744b4b308a11a7b6282b383ec428a91d77b21701d4bd09021bf0543dc8946fa" }
+        allow(obj.content).to receive(:digest) { [RDF::URI("urn:sha1:da75a5724d49962456804dc019333a5faeb80898")] }
       end
 
-      its(:checksum_digest) { is_expected.to eq("SHA-256") }
-      its(:checksum_value) { is_expected.to eq("b744b4b308a11a7b6282b383ec428a91d77b21701d4bd09021bf0543dc8946fa") }
+      its(:checksum_digest) { is_expected.to eq("SHA1") }
+      its(:checksum_value) { is_expected.to eq("da75a5724d49962456804dc019333a5faeb80898") }
     end
 
     describe "image metadata" do
       before do
         obj.fits.content = fixture_file_upload(File.join("fits", "image.xml"))
       end
-      its(:image_width) { is_expected.to eq(["512"]) }
-      its(:image_height) { is_expected.to eq(["583"]) }
+      its(:image_width) { is_expected.to eq(["500"]) }
+      its(:image_height) { is_expected.to eq(["569"]) }
       its(:color_space) { is_expected.to eq(["YCbCr"]) }
-      its(:icc_profile_name) { is_expected.to eq(["c2"]) }
-      its(:icc_profile_version) { is_expected.to eq(["2.1.0"]) }
     end
 
     describe "valid? / invalid?" do