ddr-models 3.0.0.alpha.2 → 3.0.0.alpha.3

data/spec/auth/ability_spec.rb

@@ -21,11 +21,11 @@ module Ddr::Auth
         describe "\"#{dsid}\"" do
           let(:ds) { obj.datastreams[dsid] }
           describe "can #{permission.inspect} object" do
-            before { subject.can permission, obj.pid }
+            before { subject.can permission, obj.id }
             it { should be_able_to(:download, ds) }
           end
           describe "cannot #{permission.inspect} object" do
-            before { subject.cannot permission, obj.pid }
+            before { subject.cannot permission, obj.id }
             it { should_not be_able_to(:download, ds) }
           end
         end
@@ -35,7 +35,7 @@ module Ddr::Auth
         (Component.ds_specs.keys.map(&:to_s) - DatastreamAbilityDefinitions::DATASTREAM_DOWNLOAD_ABILITIES.keys).each do |dsid|
           describe "\"#{dsid}\"" do
             let(:ds) { obj.datastreams[dsid] }
-            before { subject.can :download, obj.pid }
+            before { subject.can :download, obj.id }
             it { should_not be_able_to(:download, ds) }
           end
         end
@@ -175,23 +175,23 @@ module Ddr::Auth
       end
 
       describe "with a Ddr model instance" do
-        let(:obj) { Collection.new(pid: "test:1") }
-        let(:cache_key) { obj.pid }
+        let(:obj) { Collection.new(id: "test-1") }
+        let(:cache_key) { obj.id }
         let(:perm_obj) { obj }
         it_behaves_like "it has role based abilities"
       end
 
       describe "with a Solr document" do
-        let(:obj) { SolrDocument.new({"id"=>"test:1"}) }
-        let(:cache_key) { obj.pid }
+        let(:obj) { SolrDocument.new({"id"=>"test-1"}) }
+        let(:cache_key) { obj.id }
         let(:perm_obj) { obj }
         it_behaves_like "it has role based abilities"
       end
 
       describe "with a String" do
-        let(:obj) { "test:1" }
+        let(:obj) { "test-1" }
         let(:cache_key) { obj }
-        let(:perm_obj) { SolrDocument.new({"id"=>"test:1"}) }
+        let(:perm_obj) { SolrDocument.new({"id"=>"test-1"}) }
         before do
           allow_any_instance_of(RoleBasedAbilityDefinitions).to receive(:permissions_doc).with(obj) { perm_obj }
         end

data/spec/jobs/fits_file_characterization_spec.rb

@@ -24,7 +24,7 @@ module Ddr::Jobs
         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)
+          Ddr::Jobs::FitsFileCharacterization.perform(object.id)
           object.reload
         end
         it "should populate the fits datastream" do
@@ -38,7 +38,7 @@ module Ddr::Jobs
         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)
+          Ddr::Jobs::FitsFileCharacterization.perform(object.id)
           object.reload
         end
         it "should not populate the fits datastream" do
@@ -49,4 +49,4 @@ module Ddr::Jobs
     end
 
   end
-end
+end

data/spec/models/active_fedora_base_spec.rb

@@ -6,22 +6,22 @@ RSpec.describe ActiveFedora::Base do
     let!(:collection) { FactoryGirl.create(:collection) }
     describe "when called on the wrong class" do
       it "should raise an exception" do
-        expect { Item.find(collection.pid) }.to raise_error(ActiveFedora::ActiveFedoraError)
+        expect { Item.find(collection.id) }.to raise_error(ActiveFedora::ActiveFedoraError)
       end
     end
     describe "when called on Ddr::Models::Base" do
       it "should cast to the object's class" do
-        expect(Ddr::Models::Base.find(collection.pid)).to eq(collection)
+        expect(Ddr::Models::Base.find(collection.id)).to eq(collection)
       end
     end
     describe "when called on ActiveFedora::Base" do
       it "should cast to the object's class" do
-        expect(ActiveFedora::Base.find(collection.pid)).to eq(collection)
+        expect(ActiveFedora::Base.find(collection.id)).to eq(collection)
       end
     end
     describe "when called on the object's class" do
       it "should return the object" do
-        expect(Collection.find(collection.pid)).to eq(collection)
+        expect(Collection.find(collection.id)).to eq(collection)
       end
     end
   end

data/spec/models/active_fedora_datastream_spec.rb

@@ -65,20 +65,20 @@ module ActiveFedora
         context "the datstream is new" do
           before { allow(subject).to receive(:new_record?) { true } }
           it "should raise an exception" do
-            expect { subject.validate_checksum!(checksum, checksum_type) }.to raise_error
+            expect { subject.validate_checksum!("bb3200c2ddaee4bd7b9a4dc1ad3e10ed886eaef1") }.to raise_error(Ddr::Models::Error)
           end
         end
         context "the datastream content has changed" do
           before { allow(subject).to receive(:content_changed?) { true } }
           it "should raise an exception" do
-            expect { subject.validate_checksum!(checksum, checksum_type) }.to raise_error
+            expect { subject.validate_checksum!("bb3200c2ddaee4bd7b9a4dc1ad3e10ed886eaef1") }.to raise_error(Ddr::Models::Error)
           end
         end
       end
       context "with persisted content" do
         before do
           allow(subject).to receive(:new_record?) { false }
-          allow(subject).to receive(:pid) { "foobar:1" }
+          allow(subject).to receive(:pid) { "foobar-1" }
           allow(subject).to receive(:checksum) { checksum }
         end
         context "and the repository internal checksum in invalid" do
@@ -99,21 +99,19 @@ module ActiveFedora
           end
           context "and the checksum type is nil" do
             it "should compare the provided checksum with the datastream checksum" do
-              expect { subject.validate_checksum!(checksum.value) }
-                .not_to raise_error(Ddr::Models::Error)
+              expect { subject.validate_checksum!(checksum.value) }.not_to raise_error
             end
           end
           context "and the checksum type is the same as the datastream checksum type" do
             it "should compare the provided checksum with the datastream checksum" do
-              expect { subject.validate_checksum!(checksum.value, checksum.algorithm) }
-                .not_to raise_error(Ddr::Models::Error)
+              expect { subject.validate_checksum!(checksum.value, checksum.algorithm) }.not_to raise_error
             end
           end
           context "and the checksum type differs from the datastream checksum type" do
             let!(:md5digest) { "273ae0f4aa60d94e89bc0e0652ae2c8f" }
             it "should generate a checksum for comparison" do
               allow(subject).to receive(:content_digest).with("MD5") { md5digest }
-              expect { subject.validate_checksum!(md5digest, "MD5") }.not_to raise_error(Ddr::Models::Error)
+              expect { subject.validate_checksum!(md5digest, "MD5") }.not_to raise_error
             end
           end
           context "and the checksum doesn't match" do

data/spec/models/collection_spec.rb

@@ -13,7 +13,7 @@ RSpec.describe Collection, type: :model do
       component = Component.create
       docs = subject.components_from_solr
       expect(docs.size).to eq(1)
-      expect(docs.first.id).to eq(component.pid)
+      expect(docs.first.id).to eq(component.id)
     end
   end
 

data/spec/models/descriptive_metadata_spec.rb

@@ -1,7 +1,4 @@
 require 'spec_helper'
-require 'rdf/isomorphic'
-
-include RDF::Isomorphic
 
 module Ddr::Models
   RSpec.describe DescriptiveMetadata do

data/spec/models/effective_license_spec.rb

@@ -8,7 +8,7 @@ module Ddr::Models
     let(:license) { License.new(url: url) }
     before { allow(License).to receive(:find).with(url: url) { license } }
 
-    let(:obj) { double(pid: "test:1", id: "test:1", license: nil, parent: nil, admin_policy: nil, admin_policy_id: nil) }
+    let(:obj) { double(id: "test-1", license: nil, parent: nil, admin_policy: nil, admin_policy_id: nil) }
 
     describe "when the object has a license" do
       before { allow(obj).to receive(:license) { url } }
@@ -17,7 +17,7 @@ module Ddr::Models
 
     describe "when the object does not have a license" do
       describe "and the object has a parent" do
-        let(:parent) { double(pid: "test:2", license: nil) }
+        let(:parent) { double(id: "test-2", license: nil) }
         before do
           allow(obj).to receive(:parent) { parent }
         end
@@ -33,11 +33,11 @@ module Ddr::Models
       end
       describe "and the object does not have a parent" do
         describe "and the object has an admin policy" do
-          let(:admin_policy) { double(pid: "test:3", id: "test:3", license: nil) }
+          let(:admin_policy) { double(id: "test-3", license: nil) }
           before { allow(obj).to receive(:admin_policy) { admin_policy } }
           describe "and the admin policy has a different id from the object" do
             before do
-              allow(obj).to receive(:admin_policy_id) { "test:3" }
+              allow(obj).to receive(:admin_policy_id) { "test-3" }
             end
             describe "and the admin policy has a license" do
               before do

data/spec/models/indexing_spec.rb

@@ -1,7 +1,7 @@
 module Ddr::Models
   RSpec.describe Indexing do
 
-    let(:obj) { FactoryGirl.build(:item) }
+    let(:obj) { FactoryGirl.create(:item) }
 
     let(:role1) { FactoryGirl.build(:role, :curator, :person, :resource) }
     let(:role2) { FactoryGirl.build(:role, :curator, :person, :policy) }

data/spec/models/license_spec.rb

@@ -6,16 +6,16 @@ module Ddr::Models
 
       describe "when the object has a license URL" do
         let(:url) { "http://example.com" }
-        let(:obj) { double(pid: "test:1", license: url) }
+        let(:obj) { double(id: "test-1", license: url) }
         before do
           allow(described_class).to receive(:find).with(url: url) { described_class.new(url: url, title: "A License") }
         end
-        its(:pid) { is_expected.to eq("test:1") }
+        its(:pid) { is_expected.to eq("test-1") }
         its(:to_s) { is_expected.to eq("A License") }
       end
 
       describe "when the object does not have a license" do
-        let(:obj) { double(pid: "test:1", license: nil) }
+        let(:obj) { double(id: "test-1", license: nil) }
         it { is_expected.to be_nil }
       end
     end

data/spec/spec_helper.rb

@@ -9,22 +9,23 @@ require "rails"
 require "rspec/rails"
 require "rspec/its"
 require "factory_girl_rails"
-require "database_cleaner"
 require "tempfile"
-require "resque"
 require "cancan/matchers"
 require 'equivalent-xml/rspec_matchers'
+require 'active_fedora/cleaner'
 
+require "resque"
 Resque.inline = true
 
 OmniAuth.config.test_mode = true
 
 Dir[File.join(File.dirname(__FILE__), "support", "*.rb")].each { |f| require f }
 
+require "database_cleaner"
 DatabaseCleaner.strategy = :truncation
 
 # Silence deprecation warnings
-warn "Default deprecation behavior set to :silence!"
+warn "WARNING: Default deprecation behavior set to :silence!"
 Deprecation.default_deprecation_behavior = :silence
 
 RSpec.configure do |config|
@@ -105,7 +106,7 @@ RSpec.configure do |config|
 
   config.before(:suite) do
     DatabaseCleaner.clean
-    ActiveFedora::Base.destroy_all
+    ActiveFedora::Cleaner.clean!
     Ddr::Derivatives.configure do |config|
       config.update_derivatives = [ :multires_image, :thumbnail ]
     end
@@ -127,7 +128,7 @@ RSpec.configure do |config|
   end
 
   config.after(:each) do
-    ActiveFedora::Base.destroy_all
+    ActiveFedora::Cleaner.clean!
   end
 
 end

data/spec/support/shared_examples_for_ddr_models.rb

@@ -4,6 +4,7 @@ RSpec.shared_examples "a DDR model" do
   it_behaves_like "a governable object"
   it_behaves_like "an object that has a display title"
   it_behaves_like "an object that has identifiers"
+  it_behaves_like "a fixity checkable object"
 
   describe "events" do
     describe "on deletion with #destroy" do

data/spec/support/shared_examples_for_describables.rb

@@ -19,9 +19,9 @@ RSpec.shared_examples "a describable object" do
     describe "arguments" do
       it "with fixed results" do
         expect(object.desc_metadata_terms(:dcterms))
-          .to eq(Ddr::Models::MetadataMapper.dc11.unqualified_names + (Ddr::Models::MetadataMapper.dcterms.unqualified_names - Ddr::Models::MetadataMapper.dc11.unqualified_names))
+          .to eq(Ddr::Models::MetadataMapping.dc11.unqualified_names + (Ddr::Models::MetadataMapping.dcterms.unqualified_names - Ddr::Models::MetadataMapping.dc11.unqualified_names))
         expect(object.desc_metadata_terms(:dcterms))
-          .to match_array(Ddr::Models::MetadataMapper.dcterms.unqualified_names)
+          .to match_array(Ddr::Models::MetadataMapping.dcterms.unqualified_names)
         expect(object.desc_metadata_terms(:duke)).to eq Ddr::Vocab::Vocabulary.term_names(Ddr::Vocab::DukeTerms)
         expect(object.desc_metadata_terms(:dcterms_elements11)).to eq Ddr::Vocab::Vocabulary.term_names(RDF::DC11)
         expect(object.desc_metadata_terms(:defined_attributes)).to match_array Ddr::Vocab::Vocabulary.term_names(RDF::DC11)

data/spec/support/shared_examples_for_events.rb

@@ -82,7 +82,7 @@ RSpec.shared_examples "an event" do
     end
     context "when attributes are set" do
       let(:obj) { ActiveFedora::Base.create }
-      let(:event) { described_class.new(pid: obj.pid, outcome: Ddr::Events::Event::FAILURE, event_date_time: Time.utc(2013), software: "Test", summary: "A terrible disaster") }
+      let(:event) { described_class.new(pid: obj.id, outcome: Ddr::Events::Event::FAILURE, event_date_time: Time.utc(2013), software: "Test", summary: "A terrible disaster") }
       it "should not overwrite attributes" do
         expect { event.send(:set_defaults) }.not_to change { event.outcome }
         expect { event.send(:set_defaults) }.not_to change { event.event_date_time }
@@ -93,25 +93,25 @@ RSpec.shared_examples "an event" do
   end
 
   describe "object getter" do
-    subject { described_class.new(pid: "test:123") }
+    subject { described_class.new(pid: "test-123") }
     let(:object) { mock_object }
-    before { allow(ActiveFedora::Base).to receive(:find).with("test:123") { object } }
+    before { allow(ActiveFedora::Base).to receive(:find).with("test-123") { object } }
     it "should retrieve the object" do
       expect(subject.object).to eq object
     end
     it "should cache the object" do
-      expect(ActiveFedora::Base).to receive(:find).with("test:123").once
+      expect(ActiveFedora::Base).to receive(:find).with("test-123").once
       subject.object
       subject.object
     end
   end
 
   describe "object setter" do
-    let(:object) { mock_object(pid: "test:123") }
+    let(:object) { mock_object(id: "test-123") }
     it "should set the event pid and object" do
       allow(object).to receive(:new_record?) { false }
       subject.object = object
-      expect(subject.pid).to eq "test:123"
+      expect(subject.pid).to eq "test-123"
       expect(subject.object).to eq object
     end
     it "should raise an ArgumentError if object is a new record" do

data/spec/support/shared_examples_for_fixity_checkable_spec.rb

@@ -0,0 +1,15 @@
+RSpec.shared_examples "a fixity checkable object" do
+
+  let(:object) { described_class.new }
+
+  describe "fixity check" do
+    before do
+      object.thumbnail.content = '1234567890'
+      object.save(validate: false)
+    end
+    it "should be able to perform a fixity check" do
+      expect(Ddr::Actions::FixityCheck.execute(object)).to_not be_nil
+    end
+  end
+
+end

data/spec/support/shared_examples_for_governables.rb

@@ -11,7 +11,7 @@ RSpec.shared_examples "a governable object" do
     it "should set its admin policy with #admin_policy= and get with #admin_policy" do
       object.admin_policy = coll
       object.save(validate: false)
-      expect(ActiveFedora::Base.find(object.pid).admin_policy).to eq(coll)
+      expect(ActiveFedora::Base.find(object.id).admin_policy).to eq(coll)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 3.0.0.alpha.2
+  version: 3.0.0.alpha.3
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-23 00:00:00.000000000 Z
+date: 2015-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -494,6 +494,8 @@ files:
 - lib/ddr/models.rb
 - lib/ddr/models/access_controllable.rb
 - lib/ddr/models/admin_set.rb
+- lib/ddr/models/attached_file_profile.rb
+- lib/ddr/models/attached_files_profile.rb
 - lib/ddr/models/base.rb
 - lib/ddr/models/describable.rb
 - lib/ddr/models/engine.rb
@@ -518,14 +520,15 @@ files:
 - lib/ddr/models/licenses/parent_license.rb
 - lib/ddr/models/metadata/descriptive_metadata.rb
 - lib/ddr/models/metadata/metadata.rb
-- lib/ddr/models/metadata/metadata_mapper.rb
-- lib/ddr/models/metadata/metadata_mappers.rb
+- lib/ddr/models/metadata/metadata_mapping.rb
 - lib/ddr/models/metadata/metadata_term.rb
 - lib/ddr/models/metadata/metadata_vocabularies.rb
 - lib/ddr/models/metadata/metadata_vocabulary.rb
+- lib/ddr/models/object_api.rb
 - lib/ddr/models/solr_document.rb
 - lib/ddr/models/struct_div.rb
 - lib/ddr/models/structure.rb
+- lib/ddr/models/url_safe_id.rb
 - lib/ddr/models/version.rb
 - lib/ddr/models/year_facet.rb
 - lib/ddr/notifications.rb
@@ -669,6 +672,7 @@ files:
 - spec/support/shared_examples_for_ddr_models.rb
 - spec/support/shared_examples_for_describables.rb
 - spec/support/shared_examples_for_events.rb
+- spec/support/shared_examples_for_fixity_checkable_spec.rb
 - spec/support/shared_examples_for_governables.rb
 - spec/support/shared_examples_for_has_content.rb
 - spec/support/shared_examples_for_indexing.rb
@@ -832,6 +836,7 @@ test_files:
 - spec/support/shared_examples_for_ddr_models.rb
 - spec/support/shared_examples_for_describables.rb
 - spec/support/shared_examples_for_events.rb
+- spec/support/shared_examples_for_fixity_checkable_spec.rb
 - spec/support/shared_examples_for_governables.rb
 - spec/support/shared_examples_for_has_content.rb
 - spec/support/shared_examples_for_indexing.rb

data/lib/ddr/models/metadata/metadata_mapper.rb

@@ -1,32 +0,0 @@
-module Ddr::Models
-  #
-  # Maps vocabulary terms to names
-  #
-  class MetadataMapper
-    extend MetadataMappers
-
-    attr_reader :mapping
-
-    # param vocab [MetadataVocabulary] the vocabulary
-    def initialize(vocab)
-      @mapping = vocab.terms.each_with_object({}) do |term, memo|
-        memo[term.qualified_name] = term
-      end
-    end
-
-    def terms
-      mapping.values
-    end
-
-    def unqualified_names
-      mapping.values.map(&:unqualified_name)
-    end
-
-    def merge(other)
-      merged = self.dup
-      merged.mapping.merge! other.mapping
-      merged
-    end
-
-  end
-end