ddr-models 2.6.2 → 2.7.0.rc1

data/spec/derivatives/ptif_generator_spec.rb

@@ -1,33 +1,29 @@
-require 'spec_helper'
+module Ddr::Derivatives
+  RSpec.describe PtifGenerator do
 
-module Ddr
-  module Derivatives
-    RSpec.describe PtifGenerator do
-
-      describe "generate" do
-        let(:tempdir) { Dir.mktmpdir }
-        let(:output_file) { File.new(File.join(tempdir, "output.ptif"), 'wb') }
-        let(:options) { "jpeg:90,tile:256x256,pyramid" }
-        let(:generator) { described_class.new(source, output_file.path, options) }
-        after { FileUtils.rmdir(tempdir) }
-        context "tiff source" do
-          context "8-bit source" do
-            let(:source) { File.join(Ddr::Models::Engine.root, "spec", "fixtures", "8bit.tif") }
-            it "should generate a non-empty file" do
-              generator.generate
-              expect(File.size(output_file.path)).to be > 0
-            end
+    describe "generate" do
+      let(:tempdir) { Dir.mktmpdir }
+      let(:output_file) { File.new(File.join(tempdir, "output.ptif"), 'wb') }
+      let(:options) { "jpeg:90,tile:256x256,pyramid" }
+      let(:generator) { described_class.new(source, output_file.path, options) }
+      after { FileUtils.rmdir(tempdir) }
+      context "tiff source" do
+        context "8-bit source" do
+          let(:source) { File.join(Ddr::Models::Engine.root, "spec", "fixtures", "8bit.tif") }
+          it "should generate a non-empty file" do
+            generator.generate
+            expect(File.size(output_file.path)).to be > 0
           end
-          context "16-bit source" do
-            let(:source) { File.join(Ddr::Models::Engine.root, "spec", "fixtures", "16bit.tif") }
-            it "should generate a non-empty file" do
-              generator.generate
-              expect(File.size(output_file.path)).to be > 0
-            end
+        end
+        context "16-bit source" do
+          let(:source) { File.join(Ddr::Models::Engine.root, "spec", "fixtures", "16bit.tif") }
+          it "should generate a non-empty file" do
+            generator.generate
+            expect(File.size(output_file.path)).to be > 0
           end
         end
       end
-
     end
+
   end
-end
+end

data/spec/dummy/config/environments/test.rb

@@ -13,7 +13,7 @@ Rails.application.configure do
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
+  config.serve_static_files  = true
   config.static_cache_control = 'public, max-age=3600'
 
   # Show full error reports and disable caching.

data/spec/dummy/db/schema.rb

@@ -13,21 +13,21 @@
 
 ActiveRecord::Schema.define(version: 20161021201011) do
 
-  create_table "events", force: true do |t|
+  create_table "events", force: :cascade do |t|
     t.datetime "event_date_time"
     t.integer  "user_id"
-    t.string   "type"
-    t.string   "pid"
-    t.string   "software"
+    t.string   "type",            limit: 255
+    t.string   "pid",             limit: 255
+    t.string   "software",        limit: 255
     t.text     "comment"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "summary"
-    t.string   "outcome"
+    t.string   "summary",         limit: 255
+    t.string   "outcome",         limit: 255
     t.text     "detail"
     t.text     "exception",       limit: 65535
-    t.string   "user_key"
-    t.string   "permanent_id"
+    t.string   "user_key",        limit: 255
+    t.string   "permanent_id",    limit: 255
   end
 
   add_index "events", ["event_date_time"], name: "index_events_on_event_date_time"
@@ -36,25 +36,25 @@ ActiveRecord::Schema.define(version: 20161021201011) do
   add_index "events", ["pid"], name: "index_events_on_pid"
   add_index "events", ["type"], name: "index_events_on_type"
 
-  create_table "users", force: true do |t|
-    t.string   "email",                  default: "", null: false
-    t.string   "encrypted_password",     default: "", null: false
-    t.string   "reset_password_token"
+  create_table "users", force: :cascade do |t|
+    t.string   "email",                  limit: 255, default: "", null: false
+    t.string   "encrypted_password",     limit: 255, default: "", null: false
+    t.string   "reset_password_token",   limit: 255
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",          default: 0
+    t.integer  "sign_in_count",                      default: 0
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
-    t.string   "current_sign_in_ip"
-    t.string   "last_sign_in_ip"
-    t.datetime "created_at",                          null: false
-    t.datetime "updated_at",                          null: false
-    t.string   "username",               default: "", null: false
-    t.string   "first_name"
-    t.string   "middle_name"
-    t.string   "nickname"
-    t.string   "last_name"
-    t.string   "display_name"
+    t.string   "current_sign_in_ip",     limit: 255
+    t.string   "last_sign_in_ip",        limit: 255
+    t.datetime "created_at",                                      null: false
+    t.datetime "updated_at",                                      null: false
+    t.string   "username",               limit: 255, default: "", null: false
+    t.string   "first_name",             limit: 255
+    t.string   "middle_name",            limit: 255
+    t.string   "nickname",               limit: 255
+    t.string   "last_name",              limit: 255
+    t.string   "display_name",           limit: 255
   end
 
   add_index "users", ["email"], name: "index_users_on_email"

data/spec/factories/structure_factories.rb

@@ -2,7 +2,7 @@ require 'support/structural_metadata_helper'
 
 FactoryGirl.define do
 
-  factory :structure, class: Ddr::Models::Structure do
+  factory :structures, class: Ddr::Models::Structure do
 
     factory :simple_structure do
       initialize_with do
@@ -16,6 +16,12 @@ FactoryGirl.define do
       end
     end
 
+    factory :nested_structure_mptr do
+      initialize_with do
+        new(nested_structure_mptr_document)
+      end
+    end
+
     factory :multiple_struct_maps_structure do
       initialize_with do
         new(multiple_struct_maps_structure_document)
@@ -24,4 +30,4 @@ FactoryGirl.define do
 
   end
 
-end
+end

data/spec/index/csv_query_result_spec.rb

@@ -6,7 +6,7 @@ module Ddr::Index
     before do
       Item.create(title: ["Testing 1"],
                   identifier: ["test1"],
-                  description: ["The process of eliminating errors."])
+                  description: ["The process of\r\neliminating errors\nmust include checking newlines."])
       Item.create(title: ["Testing 2"],
                   identifier: ["test2"])
       Item.create(title: ["Testing 3"])
@@ -22,7 +22,7 @@ module Ddr::Index
     specify {
       expect(subject["title"]).to contain_exactly("Testing 1", "Testing 2", "Testing 3")
       expect(subject["identifier"]).to contain_exactly("test1", "test2", nil)
-      expect(subject["description"]).to contain_exactly("The process of eliminating errors.", nil, nil)
+      expect(subject["description"]).to contain_exactly("The process of\r\neliminating errors\nmust include checking newlines.", nil, nil)
       expect(subject["creator"]).to contain_exactly(nil, nil, nil)
       expect(subject.headers).to include("creator")
       expect(subject.to_s).to match(/creator/)
@@ -33,7 +33,7 @@ module Ddr::Index
         subject.delete_empty_columns!
         expect(subject["title"]).to contain_exactly("Testing 1", "Testing 2", "Testing 3")
         expect(subject["identifier"]).to contain_exactly("test1", "test2", nil)
-        expect(subject["description"]).to contain_exactly("The process of eliminating errors.", nil, nil)
+        expect(subject["description"]).to contain_exactly("The process of\r\neliminating errors\nmust include checking newlines.", nil, nil)
         expect(subject["creator"]).to contain_exactly(nil, nil, nil)
         expect(subject.headers).to contain_exactly("pid", "title", "identifier", "description")
         expect(subject.to_s).not_to match(/creator/)

data/spec/index/fields_spec.rb

@@ -16,6 +16,7 @@ module Ddr::Index
                                    Fields::TECHMD_ICC_PROFILE_VERSION,
                                    Fields::TECHMD_IMAGE_HEIGHT,
                                    Fields::TECHMD_IMAGE_WIDTH,
+                                   Fields::TECHMD_MD5,
                                    Fields::TECHMD_MEDIA_TYPE,
                                    Fields::TECHMD_MODIFICATION_TIME,
                                    Fields::TECHMD_PRONOM_IDENTIFIER,
@@ -32,12 +33,6 @@ module Ddr::Index
         its(:heading) { is_expected.to eq "pid" }
       end
 
-      describe "PID" do
-        subject { Fields::PID }
-        its(:label) { is_expected.to eq "Fedora PID" }
-        its(:heading) { is_expected.to eq "pid" }
-      end
-
       describe "ACCESS_ROLE" do
         subject { Fields::ACCESS_ROLE }
         its(:label) { is_expected.to eq "Access Role" }
@@ -296,6 +291,12 @@ module Ddr::Index
         its(:heading) { is_expected.to eq "image_width" }
       end
 
+      describe "TECHMD_MD5" do
+        subject { Fields::TECHMD_MD5 }
+        its(:label) { is_expected.to eq "MD5" }
+        its(:heading) { is_expected.to eq "md5" }
+      end
+
       describe "TECHMD_MEDIA_TYPE" do
         subject { Fields::TECHMD_MEDIA_TYPE }
         its(:label) { is_expected.to eq "Media Type" }

data/spec/managers/derivatives_manager_spec.rb

@@ -1,137 +1,130 @@
-require 'spec_helper'
+module Ddr::Managers
+  RSpec.describe DerivativesManager do
 
-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
-      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, Ddr::Datastreams::CONTENT }
-        context "all derivatives" do
-          context "not multires_image_able" do
-            let(:object) { ContentBearing.new }
-            context "content is an 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
-            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
+    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 "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
+          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
-            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)
-              end
+          end
+        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
-            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)
-              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)
             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) { 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)
+          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)
+            end
           end
         end
       end
-
-      describe "derivative generation" do
+      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") }
-        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
-        describe "ptif" do
-          let(:object) { MultiresImageable.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
-          end
+        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
 
-      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)
+    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
+        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
         end
       end
+    end
 
-      describe "exception during derivative generation" do
-        let(:object) { ContentBearing.create }
+    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
-          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)
+          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.intermediateFile).to receive(:content).and_call_original
+          expect(object.content).to_not receive(:content)
+          object.derivatives.generate_derivative! Ddr::Derivatives::DERIVATIVES[:multires_image]
         end
-        it "should delete the temporary work directory" do
-          expect(File.exist?(File.join(Dir.tmpdir, 'test-temp-dir'))).to be false
+      end
+      describe "object does not have intermediate file" do
+        it "uses the content file as the derivative source" do
+          expect(object.content).to receive(:content).and_call_original
+          object.derivatives.generate_derivative! Ddr::Derivatives::DERIVATIVES[:multires_image]
         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