ddr-models 1.7.0 → 1.8.0

data/spec/models/ability_spec.rb

@@ -57,7 +57,7 @@ module Ddr
 
             context "and user has the downloader role", roles: true do
               before do
-                resource.roleAssignments.downloader << user.principal_name
+                resource.roles.downloader << user.principal_name
                 resource.save
               end
               context "and user has edit permission" do
@@ -116,7 +116,7 @@ module Ddr
 
               context "and user has the downloader role", roles: true do
                 before do
-                  obj.roleAssignments.downloader << user.principal_name
+                  obj.roles.downloader << user.principal_name
                   obj.save
                 end
                 context "and user has read permission on the object" do

data/spec/models/collection_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 RSpec.describe Collection, :type => :model do
 
   it_behaves_like "a DDR model"
-  
+
   it_behaves_like "it has an association", :has_many, :children, :is_member_of_collection, "Item"
 
   it_behaves_like "it has an association", :has_many, :targets, :is_external_target_for, "Target"
@@ -30,4 +30,11 @@ RSpec.describe Collection, :type => :model do
     end
   end
 
+  context "creation" do
+    let(:collection) { Collection.create(title: [ "Test Collection" ]) }
+    it "should be governed by itself" do
+      expect(collection.admin_policy).to eq(collection)
+    end
+  end
+
 end

data/spec/models/has_admin_metadata_spec.rb

@@ -0,0 +1,197 @@
+require 'spec_helper'
+
+module Ddr
+  module Models
+    RSpec.describe HasAdminMetadata, type: :model do
+
+      describe "permanent id and permanent url" do
+
+        before(:all) do
+          class PermanentlyIdentifiable < ActiveFedora::Base
+            include Ddr::Models::Describable
+            include Ddr::Models::Indexing
+            include Ddr::Models::HasAdminMetadata
+            include Ddr::Models::EventLoggable
+          end
+        end
+
+        after(:all) do
+          Ddr::Models.send(:remove_const, :PermanentlyIdentifiable)
+        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
+
+      describe "role assignments" do
+        before(:all) do
+          class RoleAssignable < ActiveFedora::Base
+            include HasAdminMetadata
+          end
+        end
+        
+        after(:all) do
+          Ddr::Models.send(:remove_const, :RoleAssignable)
+        end
+
+        subject { RoleAssignable.new }
+
+        describe "#principal_has_role?" do
+          it "should respond when given a list of principals and a valid role" do
+            expect { subject.principal_has_role?(["bob", "admins"], :administrator) }.not_to raise_error
+          end
+          it "should respond when given a principal name and a valid role" do
+            expect { subject.principal_has_role?("bob", :administrator) }.not_to raise_error
+          end
+          it "should raise an error when given an invalid role" do
+            expect { subject.principal_has_role?("bob", :foo) }.to raise_error
+          end
+        end
+      end
+
+      describe "workflow" do
+        before(:all) do
+          class Workflowable < ActiveFedora::Base
+            include HasAdminMetadata
+          end
+        end
+
+        subject { Workflowable.new }
+
+        describe "#published?" do
+          context "object is published" do
+            before { allow(subject).to receive(:workflow_state) { Ddr::Managers::WorkflowManager::PUBLISHED } }
+            it "should return true" do
+              expect(subject).to be_published
+            end
+          end
+          context "object is not published" do
+            before { allow(subject).to receive(:workflow_state) { nil } }
+            it "should return false" do
+              expect(subject).not_to be_published
+            end
+          end
+        end
+
+        describe "#publish" do
+          it "should publish the object" do
+            subject.publish
+            expect(subject).to be_published
+          end
+        end
+
+        describe "#publish!" do
+          it "should publish and persist the object" do
+            subject.publish!
+            expect(subject.reload).to be_published
+          end
+        end
+        
+        describe "#unpublish" do
+          before { subject.publish }
+          it "should unpublish the object" do
+            subject.unpublish
+            expect(subject).not_to be_published
+          end
+        end
+
+        describe "#unpublish!" do
+          before { subject.publish! }
+          it "should unpublish and persist the object" do
+            subject.unpublish!
+            expect(subject.reload).not_to be_published
+          end          
+        end
+      end
+    
+    end
+  end
+end

data/spec/models/has_admin_metadata_spec.rb~

@@ -0,0 +1,144 @@
+require 'spec_helper'
+
+module Ddr
+  module Models
+    RSpec.describe HasAdminMetadata, type: :model do
+
+      describe "permanent id and permanent url" do
+
+        before(:all) do
+          class PermanentlyIdentifiable < ActiveFedora::Base
+            include Ddr::Models::Describable
+            include Ddr::Models::Indexing
+            include Ddr::Models::HasWorkflow
+            include Ddr::Models::HasAdminMetadata
+            include Ddr::Models::EventLoggable
+          end
+        end
+
+        after(:all) do
+          Ddr::Models.send(:remove_const, :PermanentlyIdentifiable)
+        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
+
+      describe "role assignments" do
+
+        before(:all) do
+          class RoleAssignable < ActiveFedora::Base
+            include HasRoleAssignments
+          end
+        end
+        
+        after(:all) do
+          Ddr::Models.send(:remove_const, :RoleAssignable)
+        end
+
+        subject { RoleAssignable.new }
+
+        describe "#principal_has_role?" do
+          it "should respond when given a list of principals and a valid role" do
+            expect { subject.principal_has_role?(["bob", "admins"], :administrator) }.not_to raise_error
+          end
+          it "should respond when given a principal name and a valid role" do
+            expect { subject.principal_has_role?("bob", :administrator) }.not_to raise_error
+          end
+          it "should raise an error when given an invalid role" do
+            expect { subject.principal_has_role?("bob", :foo) }.to raise_error
+          end
+        end
+      end
+    
+    end
+  end
+end

data/spec/models/user_spec.rb

@@ -55,6 +55,12 @@ module Ddr
         end
       end
 
+      describe "#group_service" do
+        it "should be RemoteGroupService by default" do
+          expect(subject.group_service).to be_a(RemoteGroupService)
+        end
+      end
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2015-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -151,6 +151,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.25'
+- !ruby/object:Gem::Dependency
+  name: rdf-vocab
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -276,6 +290,9 @@ files:
 - db/migrate/20141107124012_add_columns_to_user.rb
 - db/migrate/20141216040225_drop_minted_ids.rb
 - db/migrate/20141218020612_add_exception_to_events.rb
+- db/migrate/20150109192134_drop_workflow_state.rb~
+- db/migrate/20150110023410_drop_workflow_states.rb
+- db/migrate/20150110023410_drop_workflow_states.rb~
 - lib/ddr-models.rb
 - lib/ddr/actions.rb
 - lib/ddr/actions/fixity_check.rb
@@ -287,6 +304,8 @@ files:
 - lib/ddr/auth/superuser.rb
 - lib/ddr/auth/user.rb
 - lib/ddr/datastreams.rb
+- lib/ddr/datastreams/admin_metadata_datastream.rb
+- lib/ddr/datastreams/admin_metadata_datastream.rb~
 - lib/ddr/datastreams/content_metadata_datastream.rb
 - lib/ddr/datastreams/datastream_behavior.rb
 - lib/ddr/datastreams/descriptive_metadata_datastream.rb
@@ -306,15 +325,23 @@ files:
 - lib/ddr/events/virus_check_event.rb
 - lib/ddr/index_fields.rb
 - lib/ddr/managers.rb
+- lib/ddr/managers/manager.rb
+- lib/ddr/managers/manager.rb~
 - lib/ddr/managers/permanent_id_manager.rb
+- lib/ddr/managers/role_manager.rb
+- lib/ddr/managers/role_manager.rb~
+- lib/ddr/managers/workflow_manager.rb
+- lib/ddr/managers/workflow_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
-- lib/ddr/metadata/roles_vocabulary.rb
 - 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
@@ -324,15 +351,14 @@ files:
 - lib/ddr/models/file_management.rb
 - lib/ddr/models/fixity_checkable.rb
 - lib/ddr/models/governable.rb
+- lib/ddr/models/has_admin_metadata.rb
+- lib/ddr/models/has_admin_metadata.rb~
 - lib/ddr/models/has_attachments.rb
 - 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/solr_document.rb
@@ -340,9 +366,10 @@ files:
 - lib/ddr/notifications.rb
 - lib/ddr/utils.rb
 - lib/ddr/vocab.rb
-- lib/ddr/vocab/preservation.rb
-- lib/ddr/workflow.rb
-- lib/ddr/workflow/workflow_state.rb
+- lib/ddr/vocab.rb~
+- lib/ddr/vocab/asset.rb
+- lib/ddr/vocab/roles.rb
+- lib/ddr/vocab/workflow.rb~
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
@@ -408,11 +435,9 @@ 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/has_admin_metadata_spec.rb
+- spec/models/has_admin_metadata_spec.rb~
 - spec/models/item_spec.rb
-- spec/models/role_assignments_datastream_spec.rb
 - spec/models/superuser_spec.rb
 - spec/models/target_spec.rb
 - spec/models/user_spec.rb
@@ -520,11 +545,9 @@ 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/has_admin_metadata_spec.rb
+- spec/models/has_admin_metadata_spec.rb~
 - spec/models/item_spec.rb
-- spec/models/role_assignments_datastream_spec.rb
 - spec/models/superuser_spec.rb
 - spec/models/target_spec.rb
 - spec/models/user_spec.rb