hydra-works 0.2.0 → 0.3.0

data/spec/hydra/works/models/concerns/{generic_file → file_set}/contained_files_spec.rb

@@ -1,29 +1,29 @@
 require 'spec_helper'
 
-describe Hydra::Works::GenericFile::ContainedFiles do
-  let(:generic_file) do
-    Hydra::Works::GenericFile::Base.create
+describe Hydra::Works::ContainedFiles do
+  let(:file_set) do
+    Hydra::Works::FileSet.create
   end
 
   let(:thumbnail) do
-    file = generic_file.files.build
+    file = file_set.files.build
     Hydra::PCDM::AddTypeToFile.call(file, pcdm_thumbnail_uri)
   end
 
-  let(:file)                { generic_file.files.build }
+  let(:file)                { file_set.files.build }
   let(:pcdm_thumbnail_uri)  { ::RDF::URI('http://pcdm.org/use#ThumbnailImage') }
 
   before do
-    generic_file.files = [file]
+    file_set.files = [file]
   end
 
   describe '#thumbnail' do
     context 'when a thumbnail is present' do
       before do
-        original_file = generic_file.build_thumbnail
+        original_file = file_set.build_thumbnail
         original_file.content = 'thumbnail'
       end
-      subject { generic_file.thumbnail }
+      subject { file_set.thumbnail }
       it 'can be saved without errors' do
         expect(subject.save).to be_truthy
       end
@@ -37,7 +37,7 @@ describe Hydra::Works::GenericFile::ContainedFiles do
     end
 
     context 'when building new thumbnail' do
-      subject { generic_file.build_thumbnail }
+      subject { file_set.build_thumbnail }
       it 'initializes an unsaved File object with Thumbnail type' do
         expect(subject).to be_new_record
         expect(subject.metadata_node.type).to include(pcdm_thumbnail_uri)
@@ -49,10 +49,10 @@ describe Hydra::Works::GenericFile::ContainedFiles do
   describe '#original_file' do
     context 'when an original file is present' do
       before do
-        original_file = generic_file.build_original_file
+        original_file = file_set.build_original_file
         original_file.content = 'original_file'
       end
-      subject { generic_file.original_file }
+      subject { file_set.original_file }
 
       it 'can be saved without errors' do
         expect(subject.save).to be_truthy
@@ -63,12 +63,12 @@ describe Hydra::Works::GenericFile::ContainedFiles do
       end
       it 'retains origin pcdm.File RDF type' do
         expect(subject.metadata_node.type).to include(::RDF::URI('http://pcdm.org/use#OriginalFile'))
-        expect(generic_file.original_file.metadata_node.type).to include(Hydra::PCDM::Vocab::PCDMTerms.File)
+        expect(file_set.original_file.metadata_node.type).to include(Hydra::PCDM::Vocab::PCDMTerms.File)
       end
     end
 
     context 'when building original file' do
-      subject { generic_file.build_original_file }
+      subject { file_set.build_original_file }
       it 'initializes an unsaved File object with OrignalFile type' do
         expect(subject).to be_new_record
         expect(subject.metadata_node.type).to include(::RDF::URI('http://pcdm.org/use#OriginalFile'))
@@ -80,10 +80,10 @@ describe Hydra::Works::GenericFile::ContainedFiles do
   describe '#extracted_text' do
     context 'when extracted text is present' do
       before do
-        extracted_text = generic_file.build_extracted_text
+        extracted_text = file_set.build_extracted_text
         extracted_text.content = 'extracted_text'
       end
-      subject { generic_file.extracted_text }
+      subject { file_set.extracted_text }
       it 'can be saved without errors' do
         expect(subject.save).to be_truthy
       end
@@ -97,7 +97,7 @@ describe Hydra::Works::GenericFile::ContainedFiles do
     end
 
     context 'when building new extracted text object' do
-      subject { generic_file.build_extracted_text }
+      subject { file_set.build_extracted_text }
       it 'initializes an unsaved File object with ExtractedText type' do
         expect(subject).to be_new_record
         expect(subject.metadata_node.type).to include(::RDF::URI('http://pcdm.org/use#ExtractedText'))

data/spec/hydra/works/models/concerns/{generic_file → file_set}/mime_types_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe Hydra::Works::GenericFile::MimeTypes do
-  subject { Hydra::Works::GenericFile::Base.new }
+describe Hydra::Works::MimeTypes do
+  subject { Hydra::Works::FileSet.new }
 
   describe '#pdf?' do
     before do

data/spec/hydra/works/models/concerns/file_set/versioned_content_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe Hydra::Works::VersionedContent do
+  let(:file_set) { Hydra::Works::FileSet.new }
+  before do
+    Hydra::Works::UploadFileToFileSet.call(file_set, File.open(File.join(fixture_path, 'sample-file.pdf')))
+    Hydra::Works::UploadFileToFileSet.call(file_set, File.open(File.join(fixture_path, 'updated-file.txt')))
+  end
+
+  describe 'content_versions' do
+    subject { file_set.content_versions }
+    it 'lists all of the versions of original_file' do
+      expect(subject.count).to eq(2)
+      expect(subject.map(&:uri)).to eq(file_set.original_file.versions.all.map(&:uri))
+    end
+  end
+
+  describe 'latest_content_version' do
+    subject { file_set.latest_content_version }
+    it 'returns the most recent version entry for original_file' do
+      # Can't use a simple equivalence because they are actually different ResourceVersion objects
+      expect(subject.uri).to eq(file_set.original_file.versions.last.uri)
+      expect(subject.label).to eq(file_set.original_file.versions.last.label)
+    end
+  end
+
+  describe 'current_content_version_uri' do
+    it 'returns the URI of the most recent version of original_file' do
+      expect(file_set.current_content_version_uri).to eq(file_set.original_file.versions.last.uri)
+    end
+  end
+end

data/spec/hydra/works/models/concerns/{generic_file → file_set}/virus_check_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe Hydra::Works::GenericFile::VirusCheck do
+describe Hydra::Works::VirusCheck do
   before do
     class FileWithVirusCheck < ActiveFedora::Base
-      include Hydra::Works::GenericFileBehavior
-      include Hydra::Works::GenericFile::VirusCheck
+      include Hydra::Works::FileSetBehavior
+      include Hydra::Works::VirusCheck
     end
     class ClamAV
       def self.instance

data/spec/hydra/works/models/concerns/file_set_behavior_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe Hydra::Works::FileSetBehavior do
+  class IncludesFileSetBehavior < ActiveFedora::Base
+    include Hydra::Works::FileSetBehavior
+  end
+  subject { IncludesFileSetBehavior.new }
+
+  it 'ensures that objects will be recognized as file_sets' do
+    expect(subject).to be_file_set
+  end
+end

data/spec/hydra/works/models/generic_file_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Hydra::Works::GenericFile::Base do
+describe Hydra::Works::FileSet do
   let(:generic_file1) { described_class.new }
 
   describe 'Related objects' do
@@ -38,8 +38,8 @@ describe Hydra::Works::GenericFile::Base do
       context 'with acceptable related objects' do
         let(:object1) { Hydra::PCDM::Object.create }
         let(:object2) { Hydra::PCDM::Object.new }
-        let(:generic_work1) { Hydra::Works::GenericWork::Base.create }
-        let(:generic_work2) { Hydra::Works::GenericWork::Base.new }
+        let(:generic_work1) { Hydra::Works::GenericWork.create }
+        let(:generic_work2) { Hydra::Works::GenericWork.new }
         let(:generic_file1) { described_class.create }
 
         it 'adds various types of related objects to generic_file' do
@@ -135,7 +135,7 @@ describe Hydra::Works::GenericFile::Base do
     let(:object1) { Hydra::PCDM::Object.new }
     let(:object2) { Hydra::PCDM::Object.new }
 
-    let(:generic_work1) { Hydra::Works::GenericWork::Base.new }
+    let(:generic_work1) { Hydra::Works::GenericWork.new }
     let(:generic_file1) { described_class.new }
 
     context 'with generic files' do
@@ -167,10 +167,10 @@ describe Hydra::Works::GenericFile::Base do
     subject { described_class.new }
 
     let(:related_object1) { Hydra::PCDM::Object.new }
-    let(:related_work2)   { Hydra::Works::GenericWork::Base.new }
+    let(:related_work2)   { Hydra::Works::GenericWork.new }
     let(:related_file3)   { described_class.new }
     let(:related_object4) { Hydra::PCDM::Object.new }
-    let(:related_work5)   { Hydra::Works::GenericWork::Base.new }
+    let(:related_work5)   { Hydra::Works::GenericWork.new }
 
     let(:generic_file1) { described_class.new }
     let(:generic_file2) { described_class.new }
@@ -207,28 +207,31 @@ describe Hydra::Works::GenericFile::Base do
   end
 
   describe 'should have parent work accessors' do
-    let(:generic_work1) { Hydra::Works::GenericWork::Base.create }
+    let(:generic_work1) { Hydra::Works::GenericWork.create }
     before do
-      generic_work1.generic_files << generic_file1
+      generic_work1.ordered_members << generic_file1
+      generic_work1.save
     end
 
     it 'has parents' do
       expect(generic_file1.member_of).to eq [generic_work1]
     end
     it 'has a parent work' do
-      expect(generic_file1.in_generic_works).to eq [generic_work1]
+      expect(generic_file1.in_works).to eq [generic_work1]
     end
   end
 
   describe 'make sure deprecated methods still work' do
-    let(:generic_work1) { Hydra::Works::GenericWork::Base.create }
+    let(:generic_work1) { Hydra::Works::GenericWork.create }
     before do
-      generic_work1.generic_files << generic_file1
+      generic_work1.ordered_members << generic_file1
       generic_work1.save # required until issue AF-Agg-75 is fixed
     end
     it 'deprecated methods should pass' do
-      expect(generic_file1.generic_works).to eq [generic_work1]
-      expect(generic_file1.parents).to eq [generic_work1]
+      Deprecation.silence(Hydra::Works::GenericFileBehavior) do
+        expect(generic_file1.generic_works).to eq [generic_work1]
+        expect(generic_file1.parents).to eq [generic_work1]
+      end
     end
   end
 end

data/spec/hydra/works/models/generic_work_spec.rb

@@ -1,58 +1,82 @@
 require 'spec_helper'
 
 describe Hydra::Works::GenericWork do
-  subject { Hydra::Works::GenericWork::Base.new }
+  subject { described_class.new }
 
-  let(:generic_work1) { Hydra::Works::GenericWork::Base.new }
-  let(:generic_work2) { Hydra::Works::GenericWork::Base.new }
-  let(:generic_work3) { Hydra::Works::GenericWork::Base.new }
-  let(:generic_work4) { Hydra::Works::GenericWork::Base.new }
-  let(:generic_work5) { Hydra::Works::GenericWork::Base.new }
+  let(:generic_work1) { described_class.new }
+  let(:generic_work2) { described_class.new }
+  let(:generic_work3) { described_class.new }
+  let(:generic_work4) { described_class.new }
+  let(:generic_work5) { described_class.new }
 
-  let(:generic_file1) { Hydra::Works::GenericFile::Base.new }
-  let(:generic_file2) { Hydra::Works::GenericFile::Base.new }
+  let(:file_set1) { Hydra::Works::FileSet.new }
+  let(:file_set2) { Hydra::Works::FileSet.new }
 
   let(:object1) { Hydra::PCDM::Object.new }
   let(:object2) { Hydra::PCDM::Object.new }
 
   let(:pcdm_file1) { Hydra::PCDM::File.new }
 
-  describe '#generic_works=' do
-    it 'aggregates generic_works' do
-      generic_work1.generic_works = [generic_work2, generic_work3]
-      expect(generic_work1.generic_works).to eq [generic_work2, generic_work3]
+  describe "#file_set_ids" do
+    it "returns non-ordered file set IDs" do
+      generic_work1.members << file_set1
+      generic_work1.ordered_members << file_set2
+
+      expect(generic_work1.file_set_ids).to eq [file_set1.id, file_set2.id]
+      expect(generic_work1.ordered_file_set_ids).to eq [file_set2.id]
+    end
+  end
+
+  describe "#file_sets" do
+    it "returns non-ordered file sets" do
+      generic_work1.members << file_set1
+      generic_work1.ordered_members << file_set2
+
+      expect(generic_work1.file_sets).to eq [file_set1, file_set2]
+    end
+  end
+
+  describe "#work_ids" do
+    it "returns non-ordered file set IDs" do
+      generic_work1.members << generic_work2
+      generic_work1.ordered_members << generic_work3
+
+      expect(generic_work1.work_ids).to eq [generic_work2.id, generic_work3.id]
+      expect(generic_work1.ordered_work_ids).to eq [generic_work3.id]
     end
   end
 
-  describe '#generic_files=' do
-    it 'aggregates generic_files' do
-      generic_work1.generic_files = [generic_file1, generic_file2]
-      expect(generic_work1.generic_files).to eq [generic_file1, generic_file2]
+  describe "#works" do
+    it "returns non-ordered file sets" do
+      generic_work1.members << generic_work2
+      generic_work1.ordered_members << generic_work3
+
+      expect(generic_work1.works).to eq [generic_work2, generic_work3]
     end
   end
 
-  describe '#generic_file_ids' do
-    it 'lists generic_file ids' do
-      generic_work1.generic_files = [generic_file1, generic_file2]
-      expect(generic_work1.generic_file_ids).to eq [generic_file1.id, generic_file2.id]
+  describe '#ordered_file_set_ids' do
+    it 'lists file_set ids' do
+      generic_work1.ordered_members = [file_set1, file_set2]
+      expect(generic_work1.ordered_file_set_ids).to eq [file_set1.id, file_set2.id]
     end
   end
 
   context 'sub-class' do
     before do
-      class TestWork < Hydra::Works::GenericWork::Base
+      class TestWork < Hydra::Works::GenericWork
       end
     end
 
-    subject { TestWork.new(generic_files: [generic_file1]) }
+    subject { TestWork.new(ordered_members: [file_set1]) }
 
     it 'has many generic files' do
-      expect(subject.generic_files).to eq [generic_file1]
+      expect(subject.ordered_file_sets).to eq [file_set1]
     end
   end
 
   describe 'Related objects' do
-    let(:generic_work1) { Hydra::Works::GenericWork::Base.new }
+    let(:generic_work1) { described_class.new }
     let(:object1) { Hydra::PCDM::Object.new }
 
     before do
@@ -64,249 +88,48 @@ describe Hydra::Works::GenericWork do
     end
   end
 
-  describe '#generic_works' do
-    context 'with acceptable generic_works' do
-      context 'with generic_files and generic_works' do
+  describe '#ordered_works' do
+    context 'with acceptable works' do
+      context 'with file_sets and works' do
         before do
-          subject.generic_files << generic_file1
-          subject.generic_files << generic_file2
-          subject.generic_works << generic_work1
-          subject.generic_works << generic_work2
+          subject.ordered_members << file_set1
+          subject.ordered_members << file_set2
+          subject.ordered_members << generic_work1
+          subject.ordered_members << generic_work2
         end
 
-        it 'adds generic_work to generic_work with generic_files and generic_works' do
-          subject.generic_works << generic_work3
-          expect(subject.generic_works).to eq [generic_work1, generic_work2, generic_work3]
+        it 'adds generic_work to generic_work with file_sets and works' do
+          subject.ordered_members << generic_work3
+          expect(subject.ordered_works).to eq [generic_work1, generic_work2, generic_work3]
         end
       end
 
-      describe 'aggregates generic_works that implement Hydra::Works::GenericWorkBehavior' do
+      describe 'aggregates works that implement Hydra::Works::WorkBehavior' do
         before do
           class DummyIncWork < ActiveFedora::Base
-            include Hydra::Works::GenericWorkBehavior
+            include Hydra::Works::WorkBehavior
           end
         end
         after { Object.send(:remove_const, :DummyIncWork) }
         let(:iwork1) { DummyIncWork.new }
 
         it 'accepts implementing generic_work as a child' do
-          subject.generic_works << iwork1
-          expect(subject.generic_works).to eq [iwork1]
+          subject.ordered_members << iwork1
+          expect(subject.ordered_works).to eq [iwork1]
         end
       end
 
-      describe 'aggregates generic_works that extend Hydra::Works::GenericWork::Base' do
+      describe 'aggregates works that extend Hydra::Works::GenericWork' do
         before do
-          class DummyExtWork < Hydra::Works::GenericWork::Base
+          class DummyExtWork < Hydra::Works::GenericWork
           end
         end
         after { Object.send(:remove_const, :DummyExtWork) }
         let(:ework1) { DummyExtWork.new }
 
         it 'accepts extending generic_work as a child' do
-          subject.generic_works << ework1
-          expect(subject.generic_works).to eq [ework1]
-        end
-      end
-    end
-
-    context 'with unacceptable inputs' do
-      before(:all) do
-        @generic_work102      = Hydra::Works::GenericWork::Base.new
-
-        @works_collection101  = Hydra::Works::Collection.new
-        @generic_file101      = Hydra::Works::GenericFile::Base.new
-        @pcdm_collection101   = Hydra::PCDM::Collection.new
-        @pcdm_object101       = Hydra::PCDM::Object.new
-        @pcdm_file101         = Hydra::PCDM::File.new
-        @non_pcdm_object      = "I'm not a PCDM object"
-        @af_base_object       = ActiveFedora::Base.new
-      end
-
-      context 'that are unacceptable child generic works' do
-        let(:error_type1)    { ArgumentError }
-        let(:error_message1) { /Hydra::Works::(GenericFile::Base|Collection) with ID:  was expected to works_generic_work\?, but it was false/ }
-        let(:error_type2)    { NoMethodError }
-        let(:error_message2) { /undefined method `works_generic_work\?' for .*/ }
-
-        it 'does not aggregate Hydra::Works::Collection in generic works aggregation' do
-          expect { subject.generic_works << @works_collection101 }.to raise_error(error_type1, error_message1)
-        end
-
-        it 'does not aggregate Hydra::Works::GenericFile in generic works aggregation' do
-          expect { subject.generic_works << @generic_file101 }.to raise_error(error_type1, error_message1)
-        end
-
-        it 'does not aggregate Hydra::PCDM::Collections in generic works aggregation' do
-          expect { subject.generic_works << @pcdm_collection101 }.to raise_error(error_type2, error_message2)
-        end
-
-        it 'does not aggregate Hydra::PCDM::Objects in generic works aggregation' do
-          expect { subject.generic_works << @pcdm_object101 }.to raise_error(error_type2, error_message2)
-        end
-
-        it 'does not aggregate Hydra::PCDM::Files in generic works aggregation' do
-          expect { subject.generic_works << @pcdm_file101 }.to raise_error(error_type2, error_message2)
-        end
-
-        it 'does not aggregate non-PCDM objects in generic works aggregation' do
-          expect { subject.generic_works << @non_pcdm_object }.to raise_error(error_type2, error_message2)
-        end
-
-        it 'does not aggregate AF::Base objects in generic works aggregation' do
-          expect { subject.generic_works << @af_base_object }.to raise_error(error_type2, error_message2)
-        end
-      end
-    end
-  end
-
-  describe '#generic_files <<' do
-    it 'returns empty array when only generic_files are aggregated' do
-      subject.generic_files << generic_file1
-      subject.generic_files << generic_file2
-      expect(subject.generic_works).to eq []
-    end
-
-    context 'with generic_files and generic_works' do
-      before do
-        subject.generic_files << generic_file1
-        subject.generic_files << generic_file2
-        subject.generic_works << generic_work1
-        subject.generic_works << generic_work2
-      end
-
-      it 'returns only generic_works' do
-        expect(subject.generic_works).to eq [generic_work1, generic_work2]
-      end
-    end
-  end
-
-  describe '#generic_works.delete' do
-    context 'when multiple collections' do
-      before do
-        subject.generic_works << generic_work1
-        subject.generic_works << generic_work2
-        subject.generic_files << generic_file2
-        subject.generic_works << generic_work3
-        subject.generic_works << generic_work4
-        subject.generic_files << generic_file1
-        subject.generic_works << generic_work5
-        expect(subject.generic_works).to eq [generic_work1, generic_work2, generic_work3, generic_work4, generic_work5]
-      end
-
-      it 'removes first collection' do
-        expect(subject.generic_works.delete generic_work1).to eq [generic_work1]
-        expect(subject.generic_works).to eq [generic_work2, generic_work3, generic_work4, generic_work5]
-        expect(subject.generic_files).to eq [generic_file2, generic_file1]
-      end
-
-      it 'removes last collection' do
-        expect(subject.generic_works.delete generic_work5).to eq [generic_work5]
-        expect(subject.generic_works).to eq [generic_work1, generic_work2, generic_work3, generic_work4]
-        expect(subject.generic_files).to eq [generic_file2, generic_file1]
-      end
-
-      it 'removes middle collection' do
-        expect(subject.generic_works.delete generic_work3).to eq [generic_work3]
-        expect(subject.generic_works).to eq [generic_work1, generic_work2, generic_work4, generic_work5]
-        expect(subject.generic_files).to eq [generic_file2, generic_file1]
-      end
-    end
-  end
-
-  describe '#generic_works <<' do
-    context 'with acceptable generic_works' do
-      context 'with generic_files and generic_works' do
-        let(:generic_file3) { Hydra::Works::GenericFile::Base.new }
-        before do
-          subject.generic_files << generic_file1
-          subject.generic_files << generic_file2
-          subject.generic_works << generic_work1
-          subject.generic_works << generic_work2
-        end
-
-        it 'adds generic_file to generic_work with generic_files and generic_works' do
-          subject.generic_files << generic_file3
-          expect(subject.generic_files).to eq [generic_file1, generic_file2, generic_file3]
-        end
-      end
-
-      describe 'aggregates generic_files that implement Hydra::Works::GenericFileBehavior' do
-        before do
-          class DummyIncFile < ActiveFedora::Base
-            include Hydra::Works::GenericFileBehavior
-          end
-        end
-        after { Object.send(:remove_const, :DummyIncFile) }
-        let(:ifile1) { DummyIncFile.new }
-
-        it 'accepts implementing generic_file as a child' do
-          subject.generic_files << ifile1
-          expect(subject.generic_files).to eq [ifile1]
-        end
-      end
-
-      describe 'aggregates generic_files that extend Hydra::Works::GenericFile::Base' do
-        before do
-          class DummyExtFile < Hydra::Works::GenericFile::Base
-          end
-        end
-        after { Object.send(:remove_const, :DummyExtFile) }
-        let(:efile1) { DummyExtFile.new }
-
-        it 'accepts extending generic_file as a child' do
-          subject.generic_files << efile1
-          expect(subject.generic_files).to eq [efile1]
-        end
-      end
-    end
-
-    context 'with unacceptable inputs' do
-      before(:all) do
-        @generic_work102      = Hydra::Works::GenericWork::Base.new
-
-        @works_collection101  = Hydra::Works::Collection.new
-        @generic_work101      = Hydra::Works::GenericWork::Base.new
-        @generic_file101      = Hydra::Works::GenericFile::Base.new
-        @pcdm_collection101   = Hydra::PCDM::Collection.new
-        @pcdm_object101       = Hydra::PCDM::Object.new
-        @pcdm_file101         = Hydra::PCDM::File.new
-        @non_pcdm_object      = "I'm not a PCDM object"
-        @af_base_object       = ActiveFedora::Base.new
-      end
-
-      context 'that are unacceptable child generic files' do
-        let(:error_type1)    { ArgumentError }
-        let(:error_message1) { /Hydra::Works::(GenericWork::Base|Collection) with ID:  was expected to works_generic_file\?, but it was false/ }
-        let(:error_type2)    { NoMethodError }
-        let(:error_message2) { /undefined method `works_generic_file\?' for .*/ }
-
-        it 'does not aggregate Hydra::Works::Collection in generic files aggregation' do
-          expect { subject.generic_files << @works_collection101 }.to raise_error(error_type1, error_message1)
-        end
-
-        it 'does not aggregate Hydra::Works::GenericWork in generic files aggregation' do
-          expect { subject.generic_files << @generic_work101 }.to raise_error(error_type1, error_message1)
-        end
-
-        it 'does not aggregate Hydra::PCDM::Collections in generic files aggregation' do
-          expect { subject.generic_files << @pcdm_collection101 }.to raise_error(error_type2, error_message2)
-        end
-
-        it 'does not aggregate Hydra::PCDM::Objects in generic files aggregation' do
-          expect { subject.generic_files << @pcdm_object101 }.to raise_error(error_type2, error_message2)
-        end
-
-        it 'does not aggregate Hydra::PCDM::Files in generic files aggregation' do
-          expect { subject.generic_files << @pcdm_file101 }.to raise_error(error_type2, error_message2)
-        end
-
-        it 'does not aggregate non-PCDM objects in generic files aggregation' do
-          expect { subject.generic_files << @non_pcdm_object }.to raise_error(error_type2, error_message2)
-        end
-
-        it 'does not aggregate AF::Base objects in generic files aggregation' do
-          expect { subject.generic_files << @af_base_object }.to raise_error(error_type2, error_message2)
+          subject.ordered_members << ework1
+          expect(subject.ordered_works).to eq [ework1]
         end
       end
     end
@@ -314,71 +137,72 @@ describe Hydra::Works::GenericWork do
 
   context 'move generic file' do
     before do
-      subject.generic_files << generic_file1
-      subject.generic_files << generic_file2
+      subject.ordered_members << file_set1
+      subject.ordered_members << file_set2
     end
     it 'moves file from one work to another' do
-      expect(subject.generic_files).to eq([generic_file1, generic_file2])
-      expect(generic_work1.generic_files).to eq([])
-      generic_work1.generic_files << subject.generic_files.delete(generic_file1)
-      expect(subject.generic_files).to eq([generic_file2])
-      expect(generic_work1.generic_files).to eq([generic_file1])
+      expect(subject.ordered_file_sets).to eq([file_set1, file_set2])
+      expect(generic_work1.ordered_file_sets).to eq([])
+      subject.ordered_member_proxies.delete_at(0)
+      generic_work1.ordered_members << file_set1
+      expect(subject.ordered_file_sets).to eq([file_set2])
+      expect(generic_work1.ordered_file_sets).to eq([file_set1])
     end
   end
 
-  describe '#generic_files' do
-    it 'returns empty array when only generic_works are aggregated' do
-      subject.generic_works << generic_work1
-      subject.generic_works << generic_work2
-      expect(subject.generic_files).to eq []
+  describe '#file_sets' do
+    it 'returns empty array when only works are aggregated' do
+      subject.ordered_members << generic_work1
+      subject.ordered_members << generic_work2
+      expect(subject.ordered_file_sets).to eq []
     end
 
-    context 'with generic_files and generic_works' do
+    context 'with file_sets and works' do
       before do
-        subject.generic_files << generic_file1
-        subject.generic_files << generic_file2
-        subject.generic_works << generic_work1
-        subject.generic_works << generic_work2
+        subject.ordered_members << file_set1
+        subject.ordered_members << file_set2
+        subject.ordered_members << generic_work1
+        subject.ordered_members << generic_work2
       end
 
-      it 'returns only generic_files' do
-        expect(subject.generic_files).to eq [generic_file1, generic_file2]
+      it 'returns only file_sets' do
+        expect(subject.ordered_file_sets).to eq [file_set1, file_set2]
       end
     end
   end
 
-  describe '#generic_files.delete' do
+  describe '#file_sets.delete' do
     context 'when multiple collections' do
-      let(:generic_file3) { Hydra::Works::GenericFile::Base.new }
-      let(:generic_file4) { Hydra::Works::GenericFile::Base.new }
-      let(:generic_file5) { Hydra::Works::GenericFile::Base.new }
+      let(:file_set3) { Hydra::Works::FileSet.new }
+      let(:file_set4) { Hydra::Works::FileSet.new }
+      let(:file_set5) { Hydra::Works::FileSet.new }
       before do
-        subject.generic_files << generic_file1
-        subject.generic_files << generic_file2
-        subject.generic_works << generic_work2
-        subject.generic_files << generic_file3
-        subject.generic_files << generic_file4
-        subject.generic_works << generic_work1
-        subject.generic_files << generic_file5
-        expect(subject.generic_files).to eq [generic_file1, generic_file2, generic_file3, generic_file4, generic_file5]
+        subject.ordered_members << file_set1
+        subject.ordered_members << file_set2
+        subject.ordered_members << generic_work2
+        subject.ordered_members << file_set3
+        subject.ordered_members << file_set4
+        subject.ordered_members << generic_work1
+        subject.ordered_members << file_set5
+        expect(subject.ordered_file_sets).to eq [file_set1, file_set2, file_set3, file_set4, file_set5]
       end
 
       it 'removes first collection' do
-        expect(subject.generic_files.delete generic_file1).to eq [generic_file1]
-        expect(subject.generic_files).to eq [generic_file2, generic_file3, generic_file4, generic_file5]
-        expect(subject.generic_works).to eq [generic_work2, generic_work1]
+        subject.ordered_member_proxies.delete_at(0)
+        expect(subject.ordered_file_sets).to eq [file_set2, file_set3, file_set4, file_set5]
+        expect(subject.ordered_works).to eq [generic_work2, generic_work1]
       end
 
       it 'removes last collection' do
-        expect(subject.generic_files.delete generic_file5).to eq [generic_file5]
-        expect(subject.generic_files).to eq [generic_file1, generic_file2, generic_file3, generic_file4]
-        expect(subject.generic_works).to eq [generic_work2, generic_work1]
+        subject.ordered_member_proxies.delete_at(6)
+        expect(subject.ordered_file_sets).to eq [file_set1, file_set2, file_set3, file_set4]
+        expect(subject.ordered_works).to eq [generic_work2, generic_work1]
       end
 
       it 'removes middle collection' do
-        expect(subject.generic_files.delete generic_file3).to eq [generic_file3]
-        expect(subject.generic_files).to eq [generic_file1, generic_file2, generic_file4, generic_file5]
-        expect(subject.generic_works).to eq [generic_work2, generic_work1]
+        subject.ordered_member_proxies.delete_at(3)
+        expect(subject.ordered_file_sets).to eq [file_set1, file_set2, file_set4, file_set5]
+        expect(subject.ordered_works).to eq [generic_work2, generic_work1]
       end
     end
   end
@@ -387,26 +211,26 @@ describe Hydra::Works::GenericWork do
     context 'with acceptable related objects' do
       it 'adds various types of related objects to generic_work' do
         subject.related_objects << generic_work1
-        subject.related_objects << generic_file1
+        subject.related_objects << file_set1
         subject.related_objects << object1
         subject.save
         subject.reload
         expect(subject.related_objects.include? generic_work1).to be true
-        expect(subject.related_objects.include? generic_file1).to be true
+        expect(subject.related_objects.include? file_set1).to be true
         expect(subject.related_objects.include? object1).to be true
         expect(subject.related_objects.size).to eq 3
       end
 
-      context 'with generic_works and generic_files' do
+      context 'with works and file_sets' do
         before do
-          subject.generic_files << generic_file1
-          subject.generic_files << generic_file2
-          subject.generic_works << generic_work1
-          subject.generic_works << generic_work2
+          subject.ordered_file_sets << file_set1
+          subject.ordered_file_sets << file_set2
+          subject.ordered_works << generic_work1
+          subject.ordered_works << generic_work2
           subject.related_objects << object1
         end
 
-        it 'adds a related object to generic_work with generic_works and generic_files' do
+        it 'adds a related object to file_set with works and file_sets' do
           subject.related_objects << object2
           subject.save
           subject.reload
@@ -462,11 +286,11 @@ describe Hydra::Works::GenericWork do
   end
 
   describe '#related_objects <<' do
-    context 'with generic files and works' do
+    context 'with file sets and works' do
       before do
-        subject.generic_works << generic_work1
-        subject.generic_works << generic_work1
-        subject.generic_files << generic_file1
+        subject.ordered_members << generic_work1
+        subject.ordered_members << generic_work1
+        subject.ordered_members << file_set1
       end
 
       it 'returns empty array when only generic files and generic works are aggregated' do
@@ -480,9 +304,9 @@ describe Hydra::Works::GenericWork do
 
       it 'returns related objects of various types' do
         subject.related_objects << generic_work2
-        subject.related_objects << generic_file1
+        subject.related_objects << file_set1
         subject.related_objects << object1
-        expect(subject.related_objects).to eq [generic_work2, generic_file1, object1]
+        expect(subject.related_objects).to eq [generic_work2, file_set1, object1]
         expect(subject.related_objects.size).to eq 3
       end
     end
@@ -491,18 +315,18 @@ describe Hydra::Works::GenericWork do
   describe '#related_objects.delete' do
     context 'when multiple related objects' do
       let(:related_object1) { Hydra::PCDM::Object.new }
-      let(:related_work2) { Hydra::Works::GenericWork::Base.new }
-      let(:related_file3) { Hydra::Works::GenericFile::Base.new }
+      let(:related_work2) { described_class.new }
+      let(:related_file3) { Hydra::Works::FileSet.new }
       let(:related_object4) { Hydra::PCDM::Object.new }
-      let(:related_work5) { Hydra::Works::GenericWork::Base.new }
+      let(:related_work5) { described_class.new }
       before do
         subject.related_objects << related_object1
         subject.related_objects << related_work2
-        subject.generic_works << generic_work2
-        subject.generic_files << generic_file1
+        subject.ordered_members << generic_work2
+        subject.ordered_members << file_set1
         subject.related_objects << related_file3
         subject.related_objects << related_object4
-        subject.generic_works << generic_work1
+        subject.ordered_members << generic_work1
         subject.related_objects << related_work5
         expect(subject.related_objects).to eq [related_object1, related_work2, related_file3, related_object4, related_work5]
       end
@@ -510,22 +334,22 @@ describe Hydra::Works::GenericWork do
       it 'removes first related object' do
         expect(subject.related_objects.delete related_object1).to eq [related_object1]
         expect(subject.related_objects).to eq [related_work2, related_file3, related_object4, related_work5]
-        expect(subject.generic_works).to eq [generic_work2, generic_work1]
-        expect(subject.generic_files).to eq [generic_file1]
+        expect(subject.ordered_works).to eq [generic_work2, generic_work1]
+        expect(subject.ordered_file_sets).to eq [file_set1]
       end
 
       it 'removes last related object' do
         expect(subject.related_objects.delete related_work5).to eq [related_work5]
         expect(subject.related_objects).to eq [related_object1, related_work2, related_file3, related_object4]
-        expect(subject.generic_works).to eq [generic_work2, generic_work1]
-        expect(subject.generic_files).to eq [generic_file1]
+        expect(subject.ordered_works).to eq [generic_work2, generic_work1]
+        expect(subject.ordered_file_sets).to eq [file_set1]
       end
 
       it 'removes middle related object' do
         expect(subject.related_objects.delete related_file3).to eq [related_file3]
         expect(subject.related_objects).to eq [related_object1, related_work2, related_object4, related_work5]
-        expect(subject.generic_works).to eq [generic_work2, generic_work1]
-        expect(subject.generic_files).to eq [generic_file1]
+        expect(subject.ordered_works).to eq [generic_work2, generic_work1]
+        expect(subject.ordered_file_sets).to eq [file_set1]
       end
     end
   end
@@ -533,8 +357,8 @@ describe Hydra::Works::GenericWork do
   describe 'should have parent work and collection accessors' do
     let(:collection1) { Hydra::Works::Collection.new }
     before do
-      collection1.generic_works << generic_work2
-      generic_work1.generic_works << generic_work2
+      collection1.ordered_members << generic_work2
+      generic_work1.ordered_members << generic_work2
       collection1.save
       generic_work1.save
       generic_work2.save
@@ -547,18 +371,24 @@ describe Hydra::Works::GenericWork do
       expect(generic_work2.in_collections).to eq [collection1]
     end
     it 'has a parent generic_work' do
-      expect(generic_work2.in_generic_works).to eq [generic_work1]
+      expect(generic_work2.in_works).to eq [generic_work1]
     end
   end
 
   describe 'make sure deprecated methods still work' do
+    let(:collection1) { Hydra::Works::Collection.new }
     it 'deprecated methods should pass' do
-      expect(generic_work1.child_generic_works = [generic_work2]).to eq [generic_work2]
-      expect(generic_work1.child_generic_works << generic_work3).to eq [generic_work2, generic_work3]
-      expect(generic_work1.child_generic_works += [generic_work4]).to eq [generic_work2, generic_work3, generic_work4]
-      generic_work1.save # required until issue AF-Agg-75 is fixed
-      expect(generic_work2.parent_generic_works).to eq [generic_work1]
-      expect(generic_work2.parents).to eq [generic_work1]
+      Deprecation.silence(Hydra::Works::WorkBehavior) do
+        collection1.ordered_members << generic_work1
+        generic_work1.ordered_members << generic_work2
+        expect(generic_work1.child_generic_works).to eq [generic_work2]
+        expect(generic_work1.child_generic_work_ids).to eq [generic_work2.id]
+        generic_work1.save # required until issue AF-Agg-75 is fixed
+        collection1.save
+        expect(generic_work2.parent_generic_works).to eq [generic_work1]
+        expect(generic_work1.parent_collections).to eq [collection1]
+        expect(generic_work2.parents).to eq [generic_work1]
+      end
     end
   end
 end