ddr-models 3.0.0.beta.4 → 3.0.0.beta.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec966b30c1ee1106c893b7bcf914015a74d6a872
-  data.tar.gz: 4780ab2e5ec085392cf788e79cf920fed807ad0a
+  metadata.gz: 459b647ededb659adc26f3d0a4ac39fcec9d7bdb
+  data.tar.gz: 750255ea83e547d666bc18e35c90bff4a9785659
 SHA512:
-  metadata.gz: 78bfd911fbcaebc909ad6ab26bef1efdc6447eb4c99f9733abc36b75f6ba1a6ea6acbe6856d379bbadcbf46476d8d9cdbf5d61bb9f23400ab9f62aff6bf75a79
-  data.tar.gz: d32e38fec5818a9887061e9a84bcee2cb471b080d9353ff85c04ce535c76525781e9b56eb42cdd6c41813f0ca1e52cbe12ae3b312d24def4639a60acc0103e86
+  metadata.gz: 1245520f4f5221511c40edd77182a008c2ca0d21ba0c3e8424795e93fedccf2cf008087151ec7c577c3f334d2d9fd91574ea48b171133cbf3166ddff3026fbf7
+  data.tar.gz: 4d0b4daed25e1a942fe46805c8c52e771a92128d5c2d9721fc492d852d2485c077a71aaac28a6dded20c05361a2a3e89e7deb80a5f0ed1275bf55ae425459bb2

data/app/models/collection.rb

@@ -24,7 +24,7 @@ class Collection < Ddr::Models::Base
   # @return A lazy enumerator of SolrDocuments.
   def components_from_solr
     query = "#{Ddr::Index::Fields::COLLECTION_URI}:#{RSolr.solr_escape(id)}"
-    filter = ActiveFedora::SolrService.construct_query_for_rel(:has_model => Component.to_class_uri)
+    filter = ActiveFedora::SolrQueryBuilder.construct_query_for_rel(:has_model => Component.to_class_uri)
     results = ActiveFedora::SolrService.query(query, fq: filter, rows: 100000)
     results.lazy.map {|doc| SolrDocument.new(doc)}
   end

data/lib/ddr/events.rb

@@ -7,6 +7,7 @@ module Ddr
     autoload :DeletionEvent
     autoload :FixityCheckEvent
     autoload :IngestionEvent
+    autoload :MigrationEvent
     autoload :UpdateEvent
     autoload :ValidationEvent
     autoload :VirusCheckEvent

data/lib/ddr/events/migration_event.rb

@@ -0,0 +1,9 @@
+module Ddr::Events
+  class MigrationEvent < Event
+    include PreservationEventBehavior
+
+    self.description = "Object migrated"
+    self.preservation_event_type = :mig
+
+  end
+end

data/lib/ddr/index.rb

@@ -11,7 +11,6 @@ module Ddr
     autoload :FieldAttribute
     autoload :Fields
     autoload :Filter
-    autoload :Filters
     autoload :LegacyLicenseFields
     autoload :Query
     autoload :QueryBuilder

data/lib/ddr/index/fields.rb

@@ -13,6 +13,7 @@ module Ddr::Index
     BOX_NUMBER_FACET            = Field.new :box_number_facet, :facetable
     COLLECTION_FACET            = Field.new :collection_facet, :facetable
     COLLECTION_URI              = Field.new :collection_uri, :symbol
+    CONTENT_CREATE_DATE         = Field.new :content_create_date, :stored_sortable, type: :date
     CONTENT_SIZE                = Field.new :content_size, solr_name: "content_size_lsi"
     CONTENT_SIZE_HUMAN          = Field.new :content_size_human, :symbol
     CONTRIBUTOR_FACET           = Field.new :contributor_facet, :facetable

data/lib/ddr/index/query.rb

@@ -52,5 +52,14 @@ module Ddr::Index
       self
     end
 
+    def ==(other)
+      other.instance_of?(self.class) &&
+        other.q == self.q &&
+        other.fields == self.fields &&
+        other.filters == self.filters &&
+        other.rows == self.rows &&
+        other.sort == self.sort
+    end
+
   end
 end

data/lib/ddr/jobs/fits_file_characterization.rb

@@ -4,8 +4,8 @@ module Ddr::Jobs
 
     @queue = :file_characterization
 
-    def self.perform(pid)
-      obj = ActiveFedora::Base.find(pid)
+    def self.perform(id)
+      obj = ActiveFedora::Base.find(id)
       Ddr::Models::FileCharacterization.call(obj)
     end
 

data/lib/ddr/managers/derivatives_manager.rb

@@ -63,8 +63,8 @@ module Ddr
 
       class DerivativeJob
         @queue = :derivatives
-        def self.perform(pid, derivative_name)
-          object = ActiveFedora::Base.find(pid)
+        def self.perform(id, derivative_name)
+          object = ActiveFedora::Base.find(id)
           derivative = Ddr::Derivatives::DERIVATIVES[derivative_name.to_sym]
           object.derivatives.update_derivative(derivative)
         end

data/lib/ddr/managers/permanent_id_manager.rb

@@ -46,8 +46,8 @@ EZID Metadata:
       class AssignmentJob
         @queue = :permanent_id
 
-        def self.perform(pid)
-          object = ActiveFedora::Base.find(pid)
+        def self.perform(id)
+          object = ActiveFedora::Base.find(id)
           object.permanent_id_manager.assign
         end
       end

data/lib/ddr/models/attached_files_profile.rb

@@ -10,7 +10,11 @@ module Ddr::Models
     end
 
     def attributes
-      files_hash.keys.each_with_object({}) { |k, memo| memo[k.to_s] = nil }
+      files_hash.keys.each_with_object({}) do |key, memo|
+        unless files_hash[key].destroyed?
+          memo[key.to_s] = nil
+        end
+      end
     end
 
     def read_attribute_for_serialization(key)

data/lib/ddr/models/base.rb

@@ -22,10 +22,6 @@ module Ddr::Models
       end
     end
 
-    def self.find_by_identifier(identifier)
-      find(Ddr::Index::Fields::IDENTIFIER_ALL => identifier)
-    end
-
     def inspect
       "#<#{model_and_id}, uri: \"#{uri}\">"
     end
@@ -57,9 +53,9 @@ module Ddr::Models
       arg = args.pop
       terms = case arg.to_sym
               when :empty
-                desc_metadata_terms.select { |t| desc_metadata_values(t).empty? }
+                desc_metadata_terms.select { |t| desc_metadata.values(t).empty? }
               when :present
-                desc_metadata_terms.select { |t| desc_metadata_values(t).present? }
+                desc_metadata_terms.select { |t| desc_metadata.values(t).present? }
               when :defined_attributes
                 desc_metadata_terms & desc_metadata_attributes
               when :required
@@ -97,10 +93,10 @@ module Ddr::Models
       desc_metadata.set_values(term, values)
     end
 
-    # Update all descMetadata terms with values in hash
+    # Update all desc_metadata terms with values in hash
     # Note that term not having key in hash will be set to nil!
     def set_desc_metadata(term_values_hash)
-      desc_metadata_terms.each { |t| set_desc_metadata_values(t, term_values_hash[t]) }
+      desc_metadata_terms.each { |t| desc_metadata.set_values(t, term_values_hash[t]) }
     end
 
     def attached_files_profile

data/lib/ddr/models/event_loggable.rb

@@ -13,7 +13,7 @@ module Ddr
 
       # TESTME
       def notify_event(type, args={})
-        Ddr::Notifications.notify_event(type, args.merge(pid: pid))
+        Ddr::Notifications.notify_event(type, args.merge(pid: id))
       end
 
       def has_events?

data/lib/ddr/models/file_management.rb

@@ -55,7 +55,7 @@ module Ddr::Models
 
     def notify_virus_scan_results
       while result = virus_scan_results.shift
-        result.merge! pid: pid
+        result.merge! pid: id
         ActiveSupport::Notifications.instrument(Ddr::Notifications::VIRUS_CHECK, result)
       end
     end

data/lib/ddr/models/has_admin_metadata.rb

@@ -38,7 +38,7 @@ module Ddr::Models
                multiple: false
 
       property :license,
-               predicate: RDF::DC.license,
+               predicate: RDF::Vocab::DC.license,
                multiple: false
 
       property :local_id,

data/lib/ddr/models/has_content.rb

@@ -17,7 +17,9 @@ module Ddr
 
         around_save :update_derivatives, if: :content_changed?
 
-        around_save :characterize_file, if: [ :content_changed?, "Ddr::Models.characterize_files?" ]
+        before_save if: :re_characterize? do
+          fits.delete(eradicate: true)
+        end
 
         delegate :validate_checksum!, to: :content
       end
@@ -116,9 +118,8 @@ module Ddr
         derivatives.update_derivatives(:later)
       end
 
-      def characterize_file
-        yield
-        Resque.enqueue(Ddr::Jobs::FitsFileCharacterization, pid)
+      def re_characterize?
+        content_changed? && !fits.new_record?
       end
 
       def default_content_type

data/lib/ddr/models/has_struct_metadata.rb

@@ -26,13 +26,13 @@ module Ddr
       end
 
       def multires_image_file_paths(type='default')
-        ::SolrDocument.find(pid).multires_image_file_paths(type)
+        ::SolrDocument.find(id).multires_image_file_paths(type)
       end
 
       private
 
       def find_children
-        query = ActiveFedora::SolrService.construct_query_for_rel([[ self.class.reflect_on_association(:children), self.id ]])
+        query = ActiveFedora::SolrQueryBuilder.construct_query_for_rel([[ self.class.reflect_on_association(:children), self.id ]])
         sort = "#{Ddr::Index::Fields::LOCAL_ID} ASC, #{Ddr::Index::Fields::OBJECT_CREATE_DATE} ASC"
         ActiveFedora::SolrService.query(query, sort: sort, rows: 999999)
       end

data/lib/ddr/models/indexing.rb

@@ -1,3 +1,5 @@
+require 'time'
+
 module Ddr
   module Models
     module Indexing
@@ -19,10 +21,10 @@ module Ddr
           ADMIN_SET             => admin_set,
           ASPACE_ID             => aspace_id,
           ATTACHED_FILES        => attached_files_profile.to_json,
-          BOX_NUMBER_FACET      => desc_metadata_values('box_number'),
-          CONTRIBUTOR_FACET     => desc_metadata_values('contributor'),
-          CREATOR_FACET         => descMetadata.creator,
-          DATE_FACET            => descMetadata.date,
+          BOX_NUMBER_FACET      => desc_metadata.values('box_number'),
+          CONTRIBUTOR_FACET     => desc_metadata.values('contributor'),
+          CREATOR_FACET         => desc_metadata.creator,
+          DATE_FACET            => desc_metadata.date,
           DATE_SORT             => date_sort,
           DEPOSITOR             => depositor,
           DISPLAY_FORMAT        => display_format,
@@ -35,14 +37,14 @@ module Ddr
           PERMANENT_ID          => permanent_id,
           PERMANENT_URL         => permanent_url,
           POLICY_ROLE           => roles.in_policy_scope.agents,
-          PUBLISHER_FACET       => descMetadata.publisher,
+          PUBLISHER_FACET       => desc_metadata.publisher,
           RESEARCH_HELP_CONTACT => research_help_contact,
           RESOURCE_ROLE         => roles.in_resource_scope.agents,
-          SERIES_FACET          => desc_metadata_values('series'),
-          SPATIAL_FACET         => desc_metadata_values('spatial'),
-          SUBJECT_FACET         => desc_metadata_values('subject'),
+          SERIES_FACET          => desc_metadata.values('series'),
+          SPATIAL_FACET         => desc_metadata.values('spatial'),
+          SUBJECT_FACET         => desc_metadata.values('subject'),
           TITLE                 => title_display,
-          TYPE_FACET            => descMetadata.type,
+          TYPE_FACET            => desc_metadata.type,
           WORKFLOW_STATE        => workflow_state,
           YEAR_FACET            => year_facet,
         }
@@ -56,6 +58,7 @@ module Ddr
         end
         if has_content?
           fields[ORIGINAL_FILENAME] = original_filename
+          fields[CONTENT_CREATE_DATE] = Ddr::Utils.solr_date(content.create_date)
           fields[CONTENT_SIZE] = content_size
           fields[CONTENT_SIZE_HUMAN] = content_human_size
           fields[MEDIA_TYPE] = content_type
@@ -87,14 +90,14 @@ module Ddr
       end
 
       def title_display
-        return descMetadata.title.first if descMetadata.title.present?
-        return descMetadata.identifier.first if descMetadata.identifier.present?
+        return desc_metadata.title.first if desc_metadata.title.present?
+        return desc_metadata.identifier.first if desc_metadata.identifier.present?
         return original_filename if respond_to?(:original_filename) && original_filename.present?
-        "[#{pid}]"
+        "[#{id}]"
       end
 
       def all_identifiers
-        descMetadata.identifier + [local_id, permanent_id, pid].compact
+        desc_metadata.identifier + [local_id, permanent_id, id].compact
       end
 
       def associated_collection
@@ -114,7 +117,7 @@ module Ddr
       end
 
       def date_sort
-        descMetadata.date.first
+        desc_metadata.date.first
       end
 
       def year_facet

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

@@ -3,11 +3,11 @@ module Ddr::Models
   module MetadataVocabularies
 
     def dc11
-      MetadataVocabulary.new(RDF::DC11)
+      MetadataVocabulary.new(RDF::Vocab::DC11)
     end
 
     def dcterms
-      MetadataVocabulary.new(RDF::DC, except: RDF::DC.license)
+      MetadataVocabulary.new(RDF::Vocab::DC, except: RDF::Vocab::DC.license)
     end
 
     def duketerms

data/lib/ddr/models/search/search_builder.rb

@@ -40,13 +40,13 @@ module Ddr::Models
     def policy_role_filters
       if policy_role_policies.present?
         rels = policy_role_policies.map { |pid| [:isGovernedBy, pid] }
-        ActiveFedora::SolrService.construct_query_for_rel(rels, " OR ")
+        ActiveFedora::SolrQueryBuilder.construct_query_for_rel(rels, " OR ")
       end
     end
 
     def resource_role_filters
       current_ability.agents.map do |agent|
-        ActiveFedora::SolrService.raw_query(Ddr::Index::Fields::RESOURCE_ROLE, agent)
+        ActiveFedora::SolrQueryBuilder.raw_query(Ddr::Index::Fields::RESOURCE_ROLE, agent)
       end.join(" OR ")
     end
 

data/lib/ddr/models/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Models
-    VERSION = "3.0.0.beta.4"
+    VERSION = "3.0.0.beta.6"
   end
 end

data/lib/ddr/models/year_facet.rb

@@ -55,7 +55,7 @@ module Ddr::Models
     end
 
     def facet_values
-      obj.descMetadata.date.each do |date|
+      obj.desc_metadata.date.each do |date|
         date.split(/;/).each do |value|
           clean! value
           years = extract_years(value)

data/lib/ddr/notifications.rb

@@ -6,6 +6,7 @@ module Ddr
     CREATION = "creation.events.ddr"
     UPDATE = "update.events.ddr"
     DELETION = "deletion.events.ddr"
+    MIGRATION = "migration.events.ddr"
 
     def self.notify_event(type, args={})
       name = "#{type}.events.ddr"

data/spec/auth/effective_permissions_spec.rb

@@ -2,7 +2,7 @@ module Ddr::Auth
   RSpec.describe EffectivePermissions do
 
     let(:resource) { FactoryGirl.build(:item) }
-    let(:policy) { Collection.new(pid: "coll-1") }
+    let(:policy) { Collection.new(id: "coll-1") }
     let(:agents) { [ "Editors", "bob@example.com" ] }
     
     before do

data/spec/auth/effective_roles_spec.rb

@@ -4,7 +4,7 @@ module Ddr::Auth
     let(:resource) { FactoryGirl.build(:item) }
     let(:policy) { Collection.new(id: "coll-1") }
     let(:agents) { [ "Editors", "bob@example.com", "public" ] }
-    let(:editor) { Roles::Role.build role_type: "Editor", agent: "Editors", scope: "policy" }
+    let(:editor) { Roles::Role.new role_type: "Editor", agent: "Editors", scope: "policy" }
     let(:downloader) { FactoryGirl.build(:role, :downloader, :public) }
     
     before do

data/spec/auth/roles/role_set_query_spec.rb

@@ -12,11 +12,11 @@ module Ddr::Auth
       let(:contributor_group) { "Contributors" }
       let(:downloader_group) { "Downloaders" }
       let(:viewer_group) { "Viewers" }
-      let(:contributor_role) { Role.build(role_type: "Contributor", agent: contributor_group, scope: "resource") }
-      let(:downloader_role) { Role.build(role_type: "Downloader", agent: downloader_group, scope: "resource") }
-      let(:editor_role) { Role.build(role_type: "Editor", agent: editor, scope: "resource") }
-      let(:curator_role) { Role.build(role_type: "Curator", agent: curator, scope: "policy") }
-      let(:viewer_role) { Role.build(role_type: "Viewer", agent: viewer_group, scope: "policy") }
+      let(:contributor_role) { Role.new(role_type: "Contributor", agent: contributor_group, scope: "resource") }
+      let(:downloader_role) { Role.new(role_type: "Downloader", agent: downloader_group, scope: "resource") }
+      let(:editor_role) { Role.new(role_type: "Editor", agent: editor, scope: "resource") }
+      let(:curator_role) { Role.new(role_type: "Curator", agent: curator, scope: "policy") }
+      let(:viewer_role) { Role.new(role_type: "Viewer", agent: viewer_group, scope: "policy") }
       let(:policy_roles) { [curator_role, viewer_role] }
       let(:resource_roles) { [contributor_role, downloader_role, editor_role] }
 

data/spec/factories/role_factories.rb

@@ -2,7 +2,7 @@ FactoryGirl.define do
 
   factory :role, class: Ddr::Auth::Roles::Role do
 
-    initialize_with { Ddr::Auth::Roles::Role.build(attributes) }
+    initialize_with { Ddr::Auth::Roles::Role.new(attributes) }
 
     Ddr::Auth::Roles.role_types.each do |rt|
       trait rt.to_s.downcase.to_sym do

data/spec/index/query_spec.rb

@@ -44,5 +44,27 @@ module Ddr::Index
       }
     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/models/active_fedora_datastream_spec.rb

@@ -14,7 +14,7 @@ module ActiveFedora
         before do
           subject.content = file.read
           subject.mime_type = file.content_type
-          allow(subject).to receive(:pid) { "test:1" }
+          allow(subject).to receive(:id) { "test-1" }
         end
         describe "the yielded file" do
           it "should by default have an extension for the datastream media type" do
@@ -43,6 +43,7 @@ module ActiveFedora
             end
             describe "when the file has no id" do
               it "should be NEW" do
+                allow(subject).to receive(:id) { nil }
                 subject.tempfile do |f|
                   expect(::File.basename(f.path).start_with?("NEW--")).to be true
                 end
@@ -78,7 +79,7 @@ module ActiveFedora
       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(:id) { "foobar-1" }
           allow(subject).to receive(:checksum) { checksum }
         end
         context "and the repository internal checksum in invalid" do

data/spec/models/collection_spec.rb

@@ -35,7 +35,7 @@ RSpec.describe Collection, type: :model do
     let(:user) { FactoryGirl.build(:user) }
     before { subject.grant_roles_to_creator(user) }
     it "should include Curator roles in both resource abd policy scopes" do
-      expect(subject.roles.to_a).to eq([Ddr::Auth::Roles::Role.build(role_type: "Curator", agent: user.agent, scope: "resource"), Ddr::Auth::Roles::Role.build(role_type: "Curator", agent: user.agent, scope: "policy")])
+      expect(subject.roles.to_a).to eq([Ddr::Auth::Roles::Role.new(role_type: "Curator", agent: user.agent, scope: "resource"), Ddr::Auth::Roles::Role.new(role_type: "Curator", agent: user.agent, scope: "policy")])
     end
   end
 

data/spec/models/effective_license_spec.rb

@@ -7,9 +7,9 @@ module Ddr::Models
 
     let(:license) { License.new(url: url) }
 
-    let(:obj) { Component.new(pid: "test:1") }
-    let(:parent) { Item.new(pid: "test:2") }
-    let(:admin_policy) { Collection.new(pid: "test:3") }
+    let(:obj) { Component.new(id: "test-1") }
+    let(:parent) { Item.new(id: "test-2") }
+    let(:admin_policy) { Collection.new(id: "test-3") }
 
     describe "when the object has a license" do
       before do

data/spec/models/events_spec.rb

@@ -1,73 +1,76 @@
-require 'spec_helper'
 require 'support/shared_examples_for_events'
 
-module Ddr
-  module Events
-    RSpec.describe Event, type: :model, events: true do
-      it_behaves_like "an event"
-    end
+module Ddr::Events
+  RSpec.describe Event, type: :model, events: true do
+    it_behaves_like "an event"
+  end
 
-    RSpec.describe UpdateEvent, type: :model, events: true do
-      it_behaves_like "an event"
-      it "should have a display type" do
-        expect(subject.display_type).to eq "Update"
-      end
+  RSpec.describe UpdateEvent, type: :model, events: true do
+    it_behaves_like "an event"
+    it "should have a display type" do
+      expect(subject.display_type).to eq "Update"
     end
+  end
 
-    RSpec.describe CreationEvent, type: :model, events: true do
-      it_behaves_like "an event"
-      it_behaves_like "a preservation-related event"
-      it "should have a display type" do
-        expect(subject.display_type).to eq "Creation"
-      end
+  RSpec.describe CreationEvent, type: :model, events: true do
+    it_behaves_like "an event"
+    it_behaves_like "a preservation-related event"
+    it "should have a display type" do
+      expect(subject.display_type).to eq "Creation"
     end
+  end
 
-    RSpec.describe FixityCheckEvent, type: :model, events: true do
-      it_behaves_like "an event"
-      it_behaves_like "a preservation-related event"
-      it_behaves_like "an event that reindexes its object after save"
-      it "should have a display type" do
-        expect(subject.display_type).to eq "Fixity Check"
-      end
-      describe "defaults" do
-        it "should set software to the Fedora repository version" do
-          pending "Fedora 4 API for getting repository version"
-          expect(subject.software).to match /^Fedora Repository \d\.\d\.\d$/
-        end
+  RSpec.describe FixityCheckEvent, type: :model, events: true do
+    it_behaves_like "an event"
+    it_behaves_like "a preservation-related event"
+    it_behaves_like "an event that reindexes its object after save"
+    it "should have a display type" do
+      expect(subject.display_type).to eq "Fixity Check"
+    end
+    describe "defaults" do
+      it "should set software to the Fedora repository version" do
+        pending "Fedora 4 API for getting repository version"
+        expect(subject.software).to match /^Fedora Repository \d\.\d\.\d$/
       end
     end
+  end
 
-    RSpec.describe VirusCheckEvent, type: :model, events: true do
-      it_behaves_like "an event"
-      it_behaves_like "a preservation-related event"
-      it_behaves_like "an event that reindexes its object after save"
-      it "should have a display type" do
-        expect(subject.display_type).to eq "Virus Check"
-      end
+  RSpec.describe VirusCheckEvent, type: :model, events: true do
+    it_behaves_like "an event"
+    it_behaves_like "a preservation-related event"
+    it_behaves_like "an event that reindexes its object after save"
+    it "should have a display type" do
+      expect(subject.display_type).to eq "Virus Check"
     end
+  end
 
-    RSpec.describe IngestionEvent, type: :model, events: true do
-      it_behaves_like "an event"
-      it_behaves_like "a preservation-related event"
-      it "should have a display type" do
-        expect(subject.display_type).to eq "Ingestion"
-      end
+  RSpec.describe IngestionEvent, type: :model, events: true do
+    it_behaves_like "an event"
+    it_behaves_like "a preservation-related event"
+    it "should have a display type" do
+      expect(subject.display_type).to eq "Ingestion"
     end
+  end
 
-    RSpec.describe ValidationEvent, type: :model, events: true do
-      it_behaves_like "an event"
-      it_behaves_like "a preservation-related event"
-      it "should have a display type" do
-        expect(subject.display_type).to eq "Validation"
-      end
+  RSpec.describe ValidationEvent, type: :model, events: true do
+    it_behaves_like "an event"
+    it_behaves_like "a preservation-related event"
+    it "should have a display type" do
+      expect(subject.display_type).to eq "Validation"
     end
+  end
 
-    RSpec.describe DeletionEvent, type: :model, events: true do
-      it_behaves_like "an event"
-      it_behaves_like "a preservation-related event"
-      it "should have a display type" do
-        expect(subject.display_type).to eq "Deletion"
-      end
+  RSpec.describe DeletionEvent, type: :model, events: true do
+    it_behaves_like "an event"
+    it_behaves_like "a preservation-related event"
+    it "should have a display type" do
+      expect(subject.display_type).to eq "Deletion"
     end
   end
+
+  RSpec.describe MigrationEvent, type: :model, events: true do
+    it_behaves_like "an event"
+    it_behaves_like "a preservation-related event"
+    its(:display_type) { is_expected.to eq "Migration" }
+  end
 end

data/spec/models/has_admin_metadata_spec.rb

@@ -163,7 +163,7 @@ module Ddr::Models
       describe "#grant_roles_to_creator" do
         let(:user) { FactoryGirl.build(:user) }
         before { subject.grant_roles_to_creator(user) }
-        its(:roles) { should include(Ddr::Auth::Roles::Role.build(role_type: "Editor", agent: user.agent, scope: "resource")) }
+        its(:roles) { should include(Ddr::Auth::Roles::Role.new(role_type: "Editor", agent: user.agent, scope: "resource")) }
       end
 
       describe "persistence" do

data/spec/models/indexing_spec.rb

@@ -1,37 +1,50 @@
 module Ddr::Models
   RSpec.describe Indexing do
 
-    let(:obj) { FactoryGirl.create(:item) }
+    subject { obj.index_fields }
 
-    let(:role1) { FactoryGirl.build(:role, :curator, :person, :resource) }
-    let(:role2) { FactoryGirl.build(:role, :curator, :person, :policy) }
-    let(:role3) { FactoryGirl.build(:role, :editor, :group, :policy) }
-    let(:role4) { FactoryGirl.build(:role, :editor, :person, :policy) }
+    describe "general indexing" do
+      let(:obj) { FactoryGirl.build(:item) }
 
-    subject { obj.index_fields }
+      let(:role1) { FactoryGirl.build(:role, :curator, :person, :resource) }
+      let(:role2) { FactoryGirl.build(:role, :curator, :person, :policy) }
+      let(:role3) { FactoryGirl.build(:role, :editor, :group, :policy) }
+      let(:role4) { FactoryGirl.build(:role, :editor, :person, :policy) }
+
+      before do
+        obj.license = "cc-by-nc-nd-40"
+        obj.local_id = "foo"
+        obj.doi << "http://doi.org/10.1000/182"
+        obj.permanent_id = "ark:/99999/fk4zzz"
+        obj.permanent_url = "http://id.library.duke.edu/ark:/99999/fk4zzz"
+        obj.display_format = "Image"
+        obj.roles.grant role1, role2, role3, role4
+        obj.aspace_id = "aspace_dccea43034e1b8261e14cf999e86449d"
+        obj.fcrepo3_pid = "duke:1"
+      end
+
+      its([Indexing::LICENSE]) { is_expected.to eq("cc-by-nc-nd-40") }
+      its([Indexing::LOCAL_ID]) { is_expected.to eq("foo") }
+      its([Indexing::DOI]) { is_expected.to eq(["http://doi.org/10.1000/182"]) }
+      its([Indexing::PERMANENT_ID]) { is_expected.to eq("ark:/99999/fk4zzz") }
+      its([Indexing::PERMANENT_URL]) { is_expected.to eq("http://id.library.duke.edu/ark:/99999/fk4zzz") }
+      its([Indexing::DISPLAY_FORMAT]) { is_expected.to eq("Image") }
+      its([Indexing::ACCESS_ROLE]) { is_expected.to eq(obj.roles.to_json) }
+      its([Indexing::ASPACE_ID]) { is_expected.to eq("aspace_dccea43034e1b8261e14cf999e86449d") }
+      its([Indexing::POLICY_ROLE]) { is_expected.to contain_exactly(role2.agent, role3.agent, role4.agent) }
+      its([Indexing::RESOURCE_ROLE]) { is_expected.to contain_exactly(role1.agent) }
+      its([Indexing::FCREPO3_PID]) { is_expected.to eq("duke:1") }
+    end
+
+    describe "content-bearing object indexing" do
+      let(:obj) { FactoryGirl.create(:component) }
+      let!(:create_date) { DateTime.parse("2016-01-22T21:50:33Z") }
+      before {
+        allow(obj.content).to receive(:create_date) { create_date }
+      }
 
-    before do
-      obj.license = "cc-by-nc-nd-40"
-      obj.local_id = "foo"
-      obj.doi << "http://doi.org/10.1000/182"
-      obj.permanent_id = "ark:/99999/fk4zzz"
-      obj.permanent_url = "http://id.library.duke.edu/ark:/99999/fk4zzz"
-      obj.display_format = "Image"
-      obj.roles.grant role1, role2, role3, role4
-      obj.aspace_id = "aspace_dccea43034e1b8261e14cf999e86449d"
-      obj.fcrepo3_pid = "duke:1"
+      its([Indexing::CONTENT_CREATE_DATE]) { is_expected.to eq "2016-01-22T21:50:33Z" }
     end
 
-    its([Indexing::LICENSE]) { is_expected.to eq("cc-by-nc-nd-40") }
-    its([Indexing::LOCAL_ID]) { is_expected.to eq("foo") }
-    its([Indexing::DOI]) { is_expected.to eq(["http://doi.org/10.1000/182"]) }
-    its([Indexing::PERMANENT_ID]) { is_expected.to eq("ark:/99999/fk4zzz") }
-    its([Indexing::PERMANENT_URL]) { is_expected.to eq("http://id.library.duke.edu/ark:/99999/fk4zzz") }
-    its([Indexing::DISPLAY_FORMAT]) { is_expected.to eq("Image") }
-    its([Indexing::ACCESS_ROLE]) { is_expected.to eq(obj.roles.to_json) }
-    its([Indexing::ASPACE_ID]) { is_expected.to eq("aspace_dccea43034e1b8261e14cf999e86449d") }
-    its([Indexing::POLICY_ROLE]) { is_expected.to contain_exactly(role2.agent, role3.agent, role4.agent) }
-    its([Indexing::RESOURCE_ROLE]) { is_expected.to contain_exactly(role1.agent) }
-    its([Indexing::FCREPO3_PID]) { is_expected.to eq("duke:1") }
   end
 end

data/spec/models/solr_document_spec.rb

@@ -86,8 +86,8 @@ RSpec.describe SolrDocument, type: :model, contacts: true do
     before { subject[Ddr::Index::Fields::ACCESS_ROLE] = json }
     it "should deserialize the roles from JSON" do
       expect(subject.roles.to_a)
-        .to eq([Ddr::Auth::Roles::Role.build(role_type: "Editor", agent: "Editors", scope: "policy"),
-                Ddr::Auth::Roles::Role.build(role_type: "Contributor", agent: "bob@example.com", scope: "resource")])
+        .to eq([Ddr::Auth::Roles::Role.new(role_type: "Editor", agent: "Editors", scope: "policy"),
+                Ddr::Auth::Roles::Role.new(role_type: "Contributor", agent: "bob@example.com", scope: "resource")])
     end
   end
 

data/spec/spec_helper.rb

@@ -26,10 +26,6 @@ Dir[File.join(File.dirname(__FILE__), "support", "*.rb")].each { |f| require f }
 require "database_cleaner"
 DatabaseCleaner.strategy = :truncation
 
-# Silence deprecation warnings
-warn "WARNING: Default deprecation behavior set to :silence!"
-Deprecation.default_deprecation_behavior = :silence
-
 RSpec.configure do |config|
 
   config.include ActionDispatch::TestProcess

data/spec/support/shared_examples_for_describables.rb

@@ -2,16 +2,6 @@ RSpec.shared_examples "a describable object" do
 
   let(:object) { described_class.new }
 
-  describe "having an identifier" do
-    before do
-      object.descMetadata.identifier = ["id001"]
-      object.save(validate: false)
-    end
-    it "should be findable by identifier" do
-      expect(described_class.find_by_identifier('id001')).to include object
-    end
-  end
-
   describe "#desc_metadata_terms" do
     it "should have a default value" do
       expect(object.desc_metadata_terms).to match_array(Ddr::Models::DescriptiveMetadata.unqualified_names)
@@ -28,9 +18,9 @@ RSpec.shared_examples "a describable object" do
       end
       context "with variable results" do
         before do
-          object.descMetadata.title = ["Object Title"]
-          object.descMetadata.creator = ["Duke University Libraries"]
-          object.descMetadata.identifier = ["id001"]
+          object.desc_metadata.title = ["Object Title"]
+          object.desc_metadata.creator = ["Duke University Libraries"]
+          object.desc_metadata.identifier = ["id001"]
           object.save
         end
         it "should accept an :empty argument" do
@@ -44,9 +34,9 @@ RSpec.shared_examples "a describable object" do
   end
   describe "#set_desc_metadata" do
     let(:term_values_hash) { object.desc_metadata_terms.each_with_object({}) {|t, memo| memo[t] = ["Value"]} }
-    it "should set the descMetadata terms to the values of the matching keys in the hash" do
+    it "should set the desc_metadata terms to the values of the matching keys in the hash" do
       object.desc_metadata_terms.each do |t|
-        expect(object).to receive(:set_desc_metadata_values).with(t, ["Value"])
+        expect(object.desc_metadata).to receive(:set_values).with(t, ["Value"])
       end
       object.set_desc_metadata(term_values_hash)
     end
@@ -55,13 +45,13 @@ RSpec.shared_examples "a describable object" do
     context "when values == nil" do
       it "should set the term to an empty value" do
         object.set_desc_metadata_values(:title, nil)
-        expect(object.descMetadata.title).to be_empty
+        expect(object.desc_metadata.title).to be_empty
       end
     end
     context "when values is an array" do
       it "should reject empty values from the array" do
         object.set_desc_metadata_values(:title, ["Object Title", nil, "Alternative Title", ""])
-        expect(object.descMetadata.title).to eq ["Object Title", "Alternative Title"]
+        expect(object.desc_metadata.title).to eq ["Object Title", "Alternative Title"]
       end
     end
   end

data/spec/support/shared_examples_for_governables.rb

@@ -1,8 +1,8 @@
 RSpec.shared_examples "a governable object" do
   let(:object) do
     described_class.new.tap do |obj|
-      obj.descMetadata.title = [ 'Describable' ]
-      obj.descMetadata.identifier = [ 'id001' ]
+      obj.desc_metadata.title = [ 'Describable' ]
+      obj.desc_metadata.identifier = [ 'id001' ]
       obj.save(validate: false)
     end
   end

data/spec/support/shared_examples_for_has_content.rb

@@ -56,22 +56,6 @@ RSpec.shared_examples "an object that can have content" do
           expect(subject.derivatives).to receive(:update_derivatives)
           subject.save
         end
-        describe "file characterization" do
-          context "characterize files is false" do
-            before { allow(Ddr::Models).to receive(:characterize_files?) { false } }
-            it "should not enqueue a FITS file characterization job" do
-              expect(Resque).to_not receive(:enqueue).with(Ddr::Jobs::FitsFileCharacterization, instance_of(String))
-              subject.save
-            end
-          end
-          context "characterize files is true" do
-            before { allow(Ddr::Models).to receive(:characterize_files?) { true } }
-            it "should enqueue a FITS file characterization job" do
-              expect(Resque).to receive(:enqueue).with(Ddr::Jobs::FitsFileCharacterization, instance_of(String))
-              subject.save
-            end
-          end
-        end
       end
 
       context "and it's an existing object with content" do
@@ -81,20 +65,29 @@ RSpec.shared_examples "an object that can have content" do
           expect(subject.derivatives).to receive(:update_derivatives)
           subject.upload! file
         end
-        describe "file characterization" do
-          context "characterize files is false" do
-            before { allow(Ddr::Models).to receive(:characterize_files?) { false } }
-            it "should not enqueue a FITS file characterization job" do
-              expect(Resque).to_not receive(:enqueue).with(Ddr::Jobs::FitsFileCharacterization, instance_of(String))
-              subject.upload! file
-            end
+        context "and the file has not previously been characterized" do
+          it "does not try to delete the existing characterization data" do
+            expect(subject.fits).not_to receive(:delete)
+            subject.upload! file
           end
-          context "characterize files is true" do
-            before { allow(Ddr::Models).to receive(:characterize_files?) { true } }
-            it "should enqueue a FITS file characterization job" do
-              expect(Resque).to receive(:enqueue).with(Ddr::Jobs::FitsFileCharacterization, instance_of(String))
-              subject.upload! file
-            end
+        end
+        context "and the file has new characterization data" do
+          before {
+            subject.fits.content = fixture_file_upload("fits/document.xml")
+          }
+          it "preserves the characterization data" do
+            subject.upload! file
+            expect(subject.reload.fits).to have_content
+          end
+        end
+        context "and the file has previously been characterized" do
+          before {
+            subject.fits.content = fixture_file_upload("fits/document.xml")
+            subject.save!
+          }
+          it "deletes the existing characterization data" do
+            subject.upload! file
+            expect(subject.reload.fits).to_not have_content
           end
         end
       end

data/spec/support/shared_examples_for_indexing.rb

@@ -3,13 +3,13 @@ RSpec.shared_examples "an object that has a display title" do
     let(:object) { described_class.new }
     subject { object.title_display }
     context "has title" do
-      before { object.descMetadata.title = [ 'Title' ] }
+      before { object.desc_metadata.title = [ 'Title' ] }
       it "should return the first title" do
         expect(subject).to eq('Title')
       end
     end
     context "has no title, has identifier" do
-      before { object.descMetadata.identifier = [ 'id001' ] }
+      before { object.desc_metadata.identifier = [ 'id001' ] }
       it "should return the first identifier" do
         expect(subject).to eq('id001')
       end
@@ -27,8 +27,8 @@ RSpec.shared_examples "an object that has a display title" do
     #   end
     # end
     context "has no title, no identifier, no original_filename" do
-      let(:object) { described_class.new(:pid => 'duke-test') }
-      it "should return the PID in square brackets" do
+      let(:object) { described_class.new(id: 'duke-test') }
+      it "should return the id in square brackets" do
         expect(subject).to eq "[duke-test]"
       end
     end
@@ -37,22 +37,22 @@ end
 
 RSpec.shared_examples "an object that has identifiers" do
   describe "#all_identifiers" do
-    let(:object) { described_class.new(pid: 'test:3') }
+    let(:object) { described_class.new(id: 'test-3') }
     subject { object.all_identifiers }
-    context "has descriptive identifiers, local ID, permanent ID, and PID" do
+    context "has descriptive identifiers, local ID, permanent ID, and id" do
       before do
-        object.descMetadata.identifier = [ 'ID001', 'ID002' ]
+        object.desc_metadata.identifier = [ 'ID001', 'ID002' ]
         object.local_id = 'LOCAL_ID_A'
         object.permanent_id = 'ark:/999999/cd3'
       end
       it "should return all the identifiers" do
-        expect(subject).to match_array([ 'ID001', 'ID002', 'LOCAL_ID_A', 'ark:/999999/cd3', 'test:3' ])
+        expect(subject).to match_array([ 'ID001', 'ID002', 'LOCAL_ID_A', 'ark:/999999/cd3', 'test-3' ])
       end
     end
     context "no descriptive identifiers or local ID" do
       before { object.permanent_id = 'ark:/999999/cd3' }
       it "should return the permanent ID and PID" do
-        expect(subject).to match_array([ 'ark:/999999/cd3', 'test:3' ])
+        expect(subject).to match_array([ 'ark:/999999/cd3', 'test-3' ])
       end
     end
   end

data/spec/support/shared_examples_for_non_collection_models.rb

@@ -4,7 +4,7 @@ RSpec.shared_examples "a non-collection model" do
     let(:user) { FactoryGirl.build(:user) }
     before { subject.grant_roles_to_creator(user) }
     it "should include the Editor role in resource scope" do
-      expect(subject.roles.to_a).to eq([Ddr::Auth::Roles::Role.build(role_type: "Editor", agent: user.agent, scope: "resource")])
+      expect(subject.roles.to_a).to eq([Ddr::Auth::Roles::Role.new(role_type: "Editor", agent: user.agent, scope: "resource")])
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta.4
+  version: 3.0.0.beta.6
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-08 00:00:00.000000000 Z
+date: 2016-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -487,6 +487,7 @@ files:
 - lib/ddr/events/event.rb
 - lib/ddr/events/fixity_check_event.rb
 - lib/ddr/events/ingestion_event.rb
+- lib/ddr/events/migration_event.rb
 - lib/ddr/events/preservation_event_behavior.rb
 - lib/ddr/events/reindex_object_after_save.rb
 - lib/ddr/events/update_event.rb
@@ -502,7 +503,6 @@ files:
 - lib/ddr/index/field_attribute.rb
 - lib/ddr/index/fields.rb
 - lib/ddr/index/filter.rb
-- lib/ddr/index/filters.rb
 - lib/ddr/index/query.rb
 - lib/ddr/index/query_builder.rb
 - lib/ddr/index/query_clause.rb

data/lib/ddr/index/filters.rb

@@ -1,24 +0,0 @@
-module Ddr::Index
-  module Filters
-    extend Deprecation
-
-    def self.is_governed_by(pid)
-      Deprecation.warn(self,
-                       "`Ddr::Index:Filters.is_governed_by` is deprecated and will be removed in ddr-models 3.0." \
-                       " Use `Ddr::Index::Filter.is_governed_by` instead.")
-      Filter.is_governed_by(pid)
-    end
-
-    def self.const_missing(name)
-      if name == :HAS_CONTENT
-        Deprecation.warn(self,
-                         "`Ddr::Index::Filters::#{name}` is deprecated and will be removed in ddr-models 3.0." \
-                         " Use `Ddr::Index::Filter.has_content` instead.")
-        Filter.has_content
-      else
-        super
-      end
-    end
-
-  end
-end