ddr-models 1.5.0 → 1.6.0

data/spec/models/has_preservation_metadata_spec.rb

@@ -0,0 +1,109 @@
+require 'spec_helper'
+
+module Ddr
+  module Models
+    RSpec.describe HasPreservationMetadata, type: :model do
+
+      before(:all) do
+        class PermanentlyIdentifiable < ActiveFedora::Base
+          include Ddr::Models::Describable
+          include Ddr::Models::Indexing
+          include Ddr::Models::HasWorkflow
+          include Ddr::Models::HasPreservationMetadata
+          include Ddr::Models::EventLoggable
+        end
+      end
+
+      subject { PermanentlyIdentifiable.new }
+
+      describe "permanent_id" do
+        describe "when a permanent id has not been assigned" do
+          it "should be nil" do
+            expect(subject.permanent_id).to be_nil
+          end
+        end
+      end
+
+      describe "object lifecycle" do
+        context "when created" do
+          context "and auto-assignment is enabled" do
+            before { allow(Ddr::Models).to receive(:auto_assign_permanent_ids) { true } }
+            it "should assign a permanent id" do
+              expect_any_instance_of(PermanentlyIdentifiable).to receive(:assign_permanent_id!) { nil }
+              PermanentlyIdentifiable.create
+            end
+          end
+          context "and auto-assignment is disabled" do
+            before { allow(Ddr::Models).to receive(:auto_assign_permanent_ids) { false } }
+            it "should not assign a permanent id" do
+              expect_any_instance_of(PermanentlyIdentifiable).not_to receive(:assign_permanent_id!)
+              PermanentlyIdentifiable.create
+            end
+          end
+        end        
+        context "when saved" do
+          context "and auto-assignment is enabled" do
+            before { allow(Ddr::Models).to receive(:auto_assign_permanent_ids) { true } }
+            it "should assign a permanent id once" do
+              expect(subject).to receive(:assign_permanent_id!).once { nil }
+              subject.save
+              subject.title = ["New Title"]
+              subject.save
+            end
+          end
+          context "and auto-assignment is disabled" do
+            before { allow(Ddr::Models).to receive(:auto_assign_permanent_ids) { false } }
+            it "should not assign a permanent id" do
+              expect(subject).not_to receive(:assign_permanent_id!)
+              subject.save
+            end
+          end
+        end
+      end
+
+      describe "#assign_permanent_id!" do
+        it "should assign the permanent id later" do
+          expect(subject.permanent_id_manager).to receive(:assign_later) { nil }
+          subject.assign_permanent_id!
+        end
+      end
+
+      describe "events" do
+        before { allow(Ddr::Models).to receive(:auto_assign_permanent_ids) { true } }  
+        context "when the operation succeeds" do
+          let(:stub_identifier) { double(id: "ark:/99999/fk4zzz", metadata: "_target: http://example.com") }
+          before { allow_any_instance_of(Ddr::Managers::PermanentIdManager).to receive(:mint) { stub_identifier } }
+          it "should create a success event" do
+            expect { subject.save }.to change { subject.update_events.count }.by(1)
+          end
+        end
+        context "when there's an exception" do
+          before { allow(Ezid::Identifier).to receive(:create).and_raise(Ezid::Error) }
+          it "should create a failure event" do
+            begin
+              subject.save
+            rescue Ezid::Error
+            end
+            expect(subject.update_events.last).to be_failure
+          end
+        end
+      end
+
+      describe "indexing" do
+        let(:permanent_id) { "ark:/99999/fk4zzz" }
+        let(:permanent_url) { "http://id.library.duke.edu/ark:/99999/fk4zzz" }
+        before do
+          subject.permanent_id = permanent_id
+          subject.permanent_url = permanent_url
+        end
+        it "should index the permanent id value" do
+          expect(subject.to_solr[Ddr::IndexFields::PERMANENT_ID]).to eq(permanent_id)
+        end
+        it "should index the permanent url" do
+          expect(subject.to_solr[Ddr::IndexFields::PERMANENT_URL]).to eq(permanent_url)
+        end
+      end
+    
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -11,6 +11,9 @@ require "rspec/rails"
 require "factory_girl_rails"
 require "database_cleaner"
 require "tempfile"
+require "resque"
+
+Resque.inline = true
 
 Dir[File.join(File.dirname(__FILE__), "support", "*.rb")].each { |f| require f }
 

data/spec/support/shared_examples_for_events.rb

@@ -176,4 +176,12 @@ RSpec.shared_examples "an event" do
       end
     end
   end
+
+  describe "when the exception attribute is set" do
+    before { subject.exception = "Gah!" }
+    it "should be persisted as a failure" do
+      subject.save(validate: false)
+      expect(subject).to be_failure
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-12 00:00:00.000000000 Z
+date: 2014-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -81,20 +81,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: noid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: ddr-antivirus
   requirement: !ruby/object:Gem::Requirement
@@ -137,6 +123,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ezid-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: resque
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.25'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.25'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -260,6 +274,8 @@ files:
 - db/migrate/20141103192146_create_workflow_state.rb
 - db/migrate/20141104181418_create_users.rb
 - db/migrate/20141107124012_add_columns_to_user.rb
+- db/migrate/20141216040225_drop_minted_ids.rb
+- db/migrate/20141218020612_add_exception_to_events.rb
 - lib/ddr-models.rb
 - lib/ddr/actions.rb
 - lib/ddr/actions/fixity_check.rb
@@ -274,6 +290,7 @@ files:
 - lib/ddr/datastreams/content_metadata_datastream.rb
 - lib/ddr/datastreams/datastream_behavior.rb
 - lib/ddr/datastreams/descriptive_metadata_datastream.rb
+- lib/ddr/datastreams/preservation_metadata_datastream.rb
 - lib/ddr/datastreams/properties_datastream.rb
 - lib/ddr/datastreams/role_assignments_datastream.rb
 - lib/ddr/events.rb
@@ -288,7 +305,10 @@ files:
 - lib/ddr/events/validation_event.rb
 - lib/ddr/events/virus_check_event.rb
 - lib/ddr/index_fields.rb
+- lib/ddr/managers.rb
+- lib/ddr/managers/permanent_id_manager.rb
 - lib/ddr/metadata.rb
+- lib/ddr/metadata/#permanent_id_record.rb#
 - lib/ddr/metadata/duke_terms.rb
 - lib/ddr/metadata/premis_event.rb
 - lib/ddr/metadata/rdf_vocabulary_parser.rb
@@ -296,6 +316,8 @@ files:
 - lib/ddr/metadata/sources/duketerms.rdf.xml
 - lib/ddr/metadata/vocabulary.rb
 - lib/ddr/models.rb
+- lib/ddr/models/#has_ezid_identifier.rb#
+- lib/ddr/models/#has_permanent_identifier.rb#
 - lib/ddr/models/access_controllable.rb
 - lib/ddr/models/base.rb
 - lib/ddr/models/describable.rb
@@ -309,18 +331,20 @@ files:
 - lib/ddr/models/has_children.rb
 - lib/ddr/models/has_content.rb
 - lib/ddr/models/has_content_metadata.rb
+- lib/ddr/models/has_preservation_metadata.rb
 - lib/ddr/models/has_properties.rb
 - lib/ddr/models/has_role_assignments.rb
 - lib/ddr/models/has_thumbnail.rb
 - lib/ddr/models/has_workflow.rb
 - lib/ddr/models/indexing.rb
 - lib/ddr/models/licensable.rb
-- lib/ddr/models/minted_id.rb
-- lib/ddr/models/permanent_identification.rb
 - lib/ddr/models/solr_document.rb
 - lib/ddr/models/version.rb
 - lib/ddr/notifications.rb
 - lib/ddr/utils.rb
+- lib/ddr/vocab.rb
+- lib/ddr/vocab.rb~
+- lib/ddr/vocab/preservation.rb
 - lib/ddr/workflow.rb
 - lib/ddr/workflow/workflow_state.rb
 - spec/dummy/README.rdoc
@@ -388,10 +412,10 @@ files:
 - spec/models/descriptive_metadata_datastream_spec.rb
 - spec/models/events_spec.rb
 - spec/models/file_management_spec.rb
+- spec/models/has_preservation_metadata_spec.rb
 - spec/models/has_role_assignments_spec.rb
 - spec/models/has_workflow_spec.rb
 - spec/models/item_spec.rb
-- spec/models/permanent_identification_spec.rb
 - spec/models/role_assignments_datastream_spec.rb
 - spec/models/superuser_spec.rb
 - spec/models/target_spec.rb
@@ -500,10 +524,10 @@ test_files:
 - spec/models/descriptive_metadata_datastream_spec.rb
 - spec/models/events_spec.rb
 - spec/models/file_management_spec.rb
+- spec/models/has_preservation_metadata_spec.rb
 - spec/models/has_role_assignments_spec.rb
 - spec/models/has_workflow_spec.rb
 - spec/models/item_spec.rb
-- spec/models/permanent_identification_spec.rb
 - spec/models/role_assignments_datastream_spec.rb
 - spec/models/superuser_spec.rb
 - spec/models/target_spec.rb

data/lib/ddr/models/minted_id.rb

@@ -1,10 +0,0 @@
-module Ddr
-  module Models
-    class MintedId < ActiveRecord::Base
-
-      validates_presence_of :minted_id
-      validates_uniqueness_of :minted_id
-
-    end
-  end
-end

data/lib/ddr/models/permanent_identification.rb

@@ -1,23 +0,0 @@
-module Ddr
-  module Models
-    module PermanentIdentification
-      extend ActiveSupport::Concern
-
-      PERMALINK_BASE_URL = 'http://id.library.duke.edu/'
-
-      included do
-        has_attributes :permanent_id, datastream: Ddr::Datastreams::PROPERTIES, multiple: false
-
-        def self.permalink(permanent_id)
-          permanent_id.present? ? PERMALINK_BASE_URL + permanent_id : nil
-        end
-
-      end
-
-      def permalink
-        self.class.permalink(permanent_id)
-      end
-
-    end
-  end
-end

data/spec/models/permanent_identification_spec.rb

@@ -1,67 +0,0 @@
-require 'spec_helper'
-
-module Ddr
-  module Models
-
-    RSpec.shared_examples "a permanently identified object" do
-      it "should have a permanent id" do
-        expect(object.permanent_id).to_not be_nil
-      end
-      it "should have an appropriate update event" do
-        expect(object.update_events.map(&:summary)).to include("Assigned permanent ID")
-      end
-      it "should be a referent for the permanent id" do
-        expect(Ddr::Models::MintedId.find_by(minted_id: object.permanent_id).referent).to eql(object.pid)
-      end
-      it "should have a permlink" do
-        expect(object.permalink).to eql(Ddr::Models::PermanentIdentification::PERMALINK_BASE_URL + object.permanent_id)
-      end
-    end
-
-    RSpec.describe PermanentIdentification, type: :model do
-
-      before { skip }
-
-      before(:all) do
-        class PermanentlyIdentifiable < ActiveFedora::Base
-          include Ddr::Models::Describable
-          include Ddr::Models::HasProperties
-          include Ddr::Models::PermanentIdentification
-          include Ddr::Models::EventLoggable
-        end
-      end
-
-      context "creating new object" do
-        let(:object) { PermanentlyIdentifiable.create }
-        it_behaves_like "a permanently identified object"
-      end
-    
-      context "saving new object" do
-        let(:object) { PermanentlyIdentifiable.new }
-        before { object.save }
-        it_behaves_like "a permanently identified object"
-      end
-    
-      context "saving an existing object" do
-        let(:object) { PermanentlyIdentifiable.create }
-        it "should keep its existing permanent id" do
-          perm_id = object.permanent_id
-          object.title = [ "New Title" ]
-          object.save
-          expect(object.permanent_id).to eq(perm_id)
-        end
-      end
-    
-      context "exception during permanent id minting" do
-        let(:object) { PermanentlyIdentifiable.create }
-        before { allow(Ddr::Services::IdService).to receive(:mint).and_raise(Exception) }
-        it "should have a failure update event" do
-          expect(object.update_events.last.summary).to eq("Assigned permanent ID")
-          expect(object.update_events.last.outcome).to eq(Ddr::Events::Event::FAILURE)
-        end
-      end
-
-    end
-
-  end
-end