hydra-works 0.6.0 → 0.7.0

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

@@ -4,11 +4,11 @@ describe Hydra::Works::Collection do
   let(:collection) { described_class.new }
 
   let(:collection1) { described_class.new }
-  let(:generic_work1) { Hydra::Works::GenericWork.new }
+  let(:work1) { Hydra::Works::Work.new }
 
   describe '#collections' do
     it 'returns empty array when only works are aggregated' do
-      collection.ordered_members << generic_work1
+      collection.ordered_members << work1
       expect(collection.collections).to eq []
     end
 
@@ -17,7 +17,7 @@ describe Hydra::Works::Collection do
       before do
         collection.ordered_members << collection1
         collection.ordered_members << collection2
-        collection.ordered_members << generic_work1
+        collection.ordered_members << work1
       end
 
       it 'returns only collections' do
@@ -35,16 +35,16 @@ describe Hydra::Works::Collection do
       end
     end
 
-    context 'with collections and generic works' do
-      let(:generic_work2) { Hydra::Works::GenericWork.new }
+    context 'with collections and works' do
+      let(:work2) { Hydra::Works::Work.new }
       before do
         collection.ordered_members << collection1
-        collection.ordered_members << generic_work1
-        collection.ordered_members << generic_work2
+        collection.ordered_members << work1
+        collection.ordered_members << work2
       end
 
-      it 'returns only generic works' do
-        expect(subject).to eq [generic_work1, generic_work2]
+      it 'returns only works' do
+        expect(subject).to eq [work1, work2]
       end
     end
   end
@@ -58,16 +58,16 @@ describe Hydra::Works::Collection do
       end
     end
 
-    context 'with collections and generic works' do
-      let(:generic_work2) { Hydra::Works::GenericWork.new }
+    context 'with collections and works' do
+      let(:work2) { Hydra::Works::Work.new }
       before do
         collection.ordered_members << collection1
-        collection.ordered_members << generic_work1
-        collection.ordered_members << generic_work2
+        collection.ordered_members << work1
+        collection.ordered_members << work2
       end
 
-      it 'returns only generic works' do
-        expect(subject).to eq [generic_work1, generic_work2]
+      it 'returns only works' do
+        expect(subject).to eq [work1, work2]
       end
     end
   end
@@ -75,8 +75,8 @@ describe Hydra::Works::Collection do
   describe "#ordered_work_ids" do
     subject { collection.ordered_work_ids }
     it "returns IDs of ordered works" do
-      collection.ordered_members << generic_work1
-      expect(subject).to eq [generic_work1.id]
+      collection.ordered_members << work1
+      expect(subject).to eq [work1.id]
     end
   end
 

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

@@ -33,25 +33,25 @@ describe Hydra::Works::FileSet do
 
   describe '#in_works' do
     subject { file_set.in_works }
-    let(:generic_work) { Hydra::Works::GenericWork.create }
+    let(:work) { Hydra::Works::Work.create }
     before do
-      generic_work.ordered_members << file_set
-      generic_work.save
+      work.ordered_members << file_set
+      work.save
     end
 
-    it { is_expected.to eq [generic_work] }
+    it { is_expected.to eq [work] }
   end
 
   describe '#destroy' do
-    let(:generic_work) { Hydra::Works::GenericWork.create }
+    let(:work) { Hydra::Works::Work.create }
     before do
-      generic_work.ordered_members << file_set
-      generic_work.save
+      work.ordered_members << file_set
+      work.save
     end
 
     it "Removes the proxy, the list_node and the FileSet" do
       expect { file_set.destroy }.to change { ActiveFedora::Aggregation::Proxy.count }.by(-1)
-        .and change { generic_work.reload.ordered_member_proxies.to_a.length }.by(-1)
+        .and change { work.reload.ordered_member_proxies.to_a.length }.by(-1)
     end
   end
 end

data/spec/hydra/works/models/{generic_work_spec.rb → work_spec.rb}

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
-describe Hydra::Works::GenericWork do
+describe Hydra::Works::Work do
   subject { described_class.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(:work1) { described_class.new }
+  let(:work2) { described_class.new }
+  let(:work3) { described_class.new }
+  let(:work4) { described_class.new }
+  let(:work5) { described_class.new }
 
   let(:file_set1) { Hydra::Works::FileSet.new }
   let(:file_set2) { Hydra::Works::FileSet.new }
@@ -19,72 +19,72 @@ describe Hydra::Works::GenericWork do
 
   describe "#file_set_ids" do
     it "returns non-ordered file set IDs" do
-      generic_work1.members << file_set1
-      generic_work1.ordered_members << file_set2
+      work1.members << file_set1
+      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]
+      expect(work1.file_set_ids).to eq [file_set1.id, file_set2.id]
+      expect(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
+      work1.members << file_set1
+      work1.ordered_members << file_set2
 
-      expect(generic_work1.file_sets).to eq [file_set1, file_set2]
+      expect(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
+      work1.members << work2
+      work1.ordered_members << 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]
+      expect(work1.work_ids).to eq [work2.id, work3.id]
+      expect(work1.ordered_work_ids).to eq [work3.id]
     end
   end
 
   describe "#works" do
     it "returns non-ordered file sets" do
-      generic_work1.members << generic_work2
-      generic_work1.ordered_members << generic_work3
+      work1.members << work2
+      work1.ordered_members << work3
 
-      expect(generic_work1.works).to eq [generic_work2, generic_work3]
+      expect(work1.works).to eq [work2, work3]
     end
   end
 
   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]
+      work1.ordered_members = [file_set1, file_set2]
+      expect(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
+      class TestWork < Hydra::Works::Work
       end
     end
 
     subject { TestWork.new(ordered_members: [file_set1]) }
 
-    it 'has many generic files' do
+    it 'has many file sets' do
       expect(subject.ordered_file_sets).to eq [file_set1]
     end
   end
 
   describe 'Related objects' do
-    let(:generic_work1) { described_class.new }
+    let(:work1) { described_class.new }
     let(:object1) { Hydra::PCDM::Object.new }
 
     before do
-      generic_work1.related_objects = [object1]
+      work1.related_objects = [object1]
     end
 
     it 'persists' do
-      expect(generic_work1.related_objects).to eq [object1]
+      expect(work1.related_objects).to eq [object1]
     end
   end
 
@@ -94,13 +94,13 @@ describe Hydra::Works::GenericWork do
         before do
           subject.ordered_members << file_set1
           subject.ordered_members << file_set2
-          subject.ordered_members << generic_work1
-          subject.ordered_members << generic_work2
+          subject.ordered_members << work1
+          subject.ordered_members << work2
         end
 
-        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]
+        it 'adds work to work with file_sets and works' do
+          subject.ordered_members << work3
+          expect(subject.ordered_works).to eq [work1, work2, work3]
         end
       end
 
@@ -113,21 +113,21 @@ describe Hydra::Works::GenericWork do
         after { Object.send(:remove_const, :DummyIncWork) }
         let(:iwork1) { DummyIncWork.new }
 
-        it 'accepts implementing generic_work as a child' do
+        it 'accepts implementing work as a child' do
           subject.ordered_members << iwork1
           expect(subject.ordered_works).to eq [iwork1]
         end
       end
 
-      describe 'aggregates works that extend Hydra::Works::GenericWork' do
+      describe 'aggregates works that extend Hydra::Works::Work' do
         before do
-          class DummyExtWork < Hydra::Works::GenericWork
+          class DummyExtWork < Hydra::Works::Work
           end
         end
         after { Object.send(:remove_const, :DummyExtWork) }
         let(:ework1) { DummyExtWork.new }
 
-        it 'accepts extending generic_work as a child' do
+        it 'accepts extending work as a child' do
           subject.ordered_members << ework1
           expect(subject.ordered_works).to eq [ework1]
         end
@@ -135,25 +135,25 @@ describe Hydra::Works::GenericWork do
     end
   end
 
-  context 'move generic file' do
+  context 'move file set' do
     before do
       subject.ordered_members << file_set1
       subject.ordered_members << file_set2
     end
     it 'moves file from one work to another' do
       expect(subject.ordered_file_sets).to eq([file_set1, file_set2])
-      expect(generic_work1.ordered_file_sets).to eq([])
+      expect(work1.ordered_file_sets).to eq([])
       subject.ordered_member_proxies.delete_at(0)
-      generic_work1.ordered_members << file_set1
+      work1.ordered_members << file_set1
       expect(subject.ordered_file_sets).to eq([file_set2])
-      expect(generic_work1.ordered_file_sets).to eq([file_set1])
+      expect(work1.ordered_file_sets).to eq([file_set1])
     end
   end
 
   describe '#file_sets' do
     it 'returns empty array when only works are aggregated' do
-      subject.ordered_members << generic_work1
-      subject.ordered_members << generic_work2
+      subject.ordered_members << work1
+      subject.ordered_members << work2
       expect(subject.ordered_file_sets).to eq []
     end
 
@@ -161,8 +161,8 @@ describe Hydra::Works::GenericWork do
       before do
         subject.ordered_members << file_set1
         subject.ordered_members << file_set2
-        subject.ordered_members << generic_work1
-        subject.ordered_members << generic_work2
+        subject.ordered_members << work1
+        subject.ordered_members << work2
       end
 
       it 'returns only file_sets' do
@@ -179,10 +179,10 @@ describe Hydra::Works::GenericWork do
       before do
         subject.ordered_members << file_set1
         subject.ordered_members << file_set2
-        subject.ordered_members << generic_work2
+        subject.ordered_members << work2
         subject.ordered_members << file_set3
         subject.ordered_members << file_set4
-        subject.ordered_members << generic_work1
+        subject.ordered_members << work1
         subject.ordered_members << file_set5
         expect(subject.ordered_file_sets).to eq [file_set1, file_set2, file_set3, file_set4, file_set5]
       end
@@ -190,19 +190,19 @@ describe Hydra::Works::GenericWork do
       it 'removes first collection' do
         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]
+        expect(subject.ordered_works).to eq [work2, work1]
       end
 
       it 'removes last collection' do
         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]
+        expect(subject.ordered_works).to eq [work2, work1]
       end
 
       it 'removes middle collection' do
         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]
+        expect(subject.ordered_works).to eq [work2, work1]
       end
     end
   end
@@ -210,21 +210,21 @@ describe Hydra::Works::GenericWork do
   describe 'should have parent work and collection accessors' do
     let(:collection1) { Hydra::Works::Collection.new }
     before do
-      collection1.ordered_members << generic_work2
-      generic_work1.ordered_members << generic_work2
+      collection1.ordered_members << work2
+      work1.ordered_members << work2
       collection1.save
-      generic_work1.save
-      generic_work2.save
+      work1.save
+      work2.save
     end
 
     it 'has parents' do
-      expect(generic_work2.member_of).to eq [collection1, generic_work1]
+      expect(work2.member_of).to eq [collection1, work1]
     end
     it 'has a parent collection' do
-      expect(generic_work2.in_collections).to eq [collection1]
+      expect(work2.in_collections).to eq [collection1]
     end
-    it 'has a parent generic_work' do
-      expect(generic_work2.in_works).to eq [generic_work1]
+    it 'has a parent work' do
+      expect(work2.in_works).to eq [work1]
     end
   end
 end

data/spec/hydra/works/services/add_file_to_file_set_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Hydra::Works::AddFileToFileSet do
-  let(:generic_file)        { Hydra::Works::FileSet.new }
+  let(:file_set)            { Hydra::Works::FileSet.new }
   let(:filename)            { 'sample-file.pdf' }
   let(:filename2)           { 'updated-file.txt' }
   let(:original_name)       { 'original-name.pdf' }
@@ -11,21 +11,21 @@ describe Hydra::Works::AddFileToFileSet do
   let(:update_existing)     { true }
   let(:mime_type)           { 'application/pdf' }
 
-  context 'when generic_file is not persisted' do
-    let(:generic_file) { Hydra::Works::FileSet.new }
-    it 'saves generic_file' do
-      described_class.call(generic_file, file, type)
-      expect(generic_file.persisted?).to be true
+  context 'when file_set is not persisted' do
+    let(:file_set) { Hydra::Works::FileSet.new }
+    it 'saves file_set' do
+      described_class.call(file_set, file, type)
+      expect(file_set.persisted?).to be true
     end
   end
 
-  context 'when generic_file is not valid' do
+  context 'when file_set is not valid' do
     before do
-      generic_file.save
-      allow(generic_file).to receive(:valid?).and_return(false)
+      file_set.save
+      allow(file_set).to receive(:valid?).and_return(false)
     end
     it 'returns false' do
-      expect(described_class.call(generic_file, file, type)).to be false
+      expect(described_class.call(file_set, file, type)).to be false
     end
   end
 
@@ -33,9 +33,9 @@ describe Hydra::Works::AddFileToFileSet do
     before do
       allow(file).to receive(:mime_type).and_return(mime_type)
       allow(file).to receive(:original_name).and_return(original_name)
-      described_class.call(generic_file, file, type)
+      described_class.call(file_set, file, type)
     end
-    subject { generic_file.filter_files_by_type(type).first }
+    subject { file_set.filter_files_by_type(type).first }
     it 'uses the mime_type and original_name methods' do
       expect(subject.mime_type).to eq(mime_type)
       expect(subject.original_name).to eq(original_name)
@@ -46,38 +46,38 @@ describe Hydra::Works::AddFileToFileSet do
     it 'defaults to Hydra::PCDM for mimetype and ::File for basename.' do
       expect(Hydra::PCDM::GetMimeTypeForFile).to receive(:call).with(file.path)
       expect(::File).to receive(:basename).with(file.path)
-      described_class.call(generic_file, file, type)
+      described_class.call(file_set, file, type)
     end
   end
 
   it 'adds the given file and applies the specified type to it' do
-    described_class.call(generic_file, file, type, update_existing: update_existing)
-    expect(generic_file.filter_files_by_type(type).first.content).to start_with('%PDF-1.3')
+    described_class.call(file_set, file, type, update_existing: update_existing)
+    expect(file_set.filter_files_by_type(type).first.content).to start_with('%PDF-1.3')
   end
 
   context 'when :type is the name of an association' do
     let(:type)  { :extracted_text }
     before do
-      described_class.call(generic_file, file, type)
+      described_class.call(file_set, file, type)
     end
     it "builds and uses the association's target" do
-      expect(generic_file.extracted_text.content).to start_with('%PDF-1.3')
+      expect(file_set.extracted_text.content).to start_with('%PDF-1.3')
     end
   end
 
   context 'when :versioning => true' do
     let(:type)        { :original_file }
     let(:versioning)  { true }
-    subject     { generic_file }
+    subject     { file_set }
     it 'updates the file and creates a version' do
-      described_class.call(generic_file, file, type, versioning: versioning)
+      described_class.call(file_set, file, type, versioning: versioning)
       expect(subject.original_file.versions.all.count).to eq(1)
       expect(subject.original_file.content).to start_with('%PDF-1.3')
     end
     context 'and there are already versions' do
       before do
-        described_class.call(generic_file, file, type, versioning: versioning)
-        described_class.call(generic_file, file2, type, versioning: versioning)
+        described_class.call(file_set, file, type, versioning: versioning)
+        described_class.call(file_set, file2, type, versioning: versioning)
       end
       it 'adds to the version history' do
         expect(subject.original_file.versions.all.count).to eq(2)
@@ -90,9 +90,9 @@ describe Hydra::Works::AddFileToFileSet do
     let(:type)        { :original_file }
     let(:versioning)  { false }
     before do
-      described_class.call(generic_file, file, type, versioning: versioning)
+      described_class.call(file_set, file, type, versioning: versioning)
     end
-    subject { generic_file }
+    subject { file_set }
     it 'skips creating versions' do
       expect(subject.original_file.versions.all.count).to eq(0)
       expect(subject.original_file.content).to start_with('%PDF-1.3')

data/spec/hydra/works/services/upload_file_spec.rb

@@ -1,27 +1,27 @@
 require 'spec_helper'
 
 describe Hydra::Works::UploadFileToFileSet do
-  let(:generic_work)        { Hydra::Works::GenericWork.new }
-  let(:generic_file)        { Hydra::Works::FileSet.new }
-  let(:file)                { File.open(File.join(fixture_path, 'sample-file.pdf')) }
-  let(:updated_file)        { File.open(File.join(fixture_path, 'updated-file.txt')) }
-  let(:mime_type)           { 'application/pdf' }
-  let(:original_name)       { 'my_original.pdf' }
-  let(:updated_mime_type)   { 'text/plain' }
-  let(:updated_name)        { 'my_updated.txt' }
+  let(:work) { Hydra::Works::Work.new }
+  let(:file_set) { Hydra::Works::FileSet.new }
+  let(:file) { File.open(File.join(fixture_path, 'sample-file.pdf')) }
+  let(:updated_file) { File.open(File.join(fixture_path, 'updated-file.txt')) }
+  let(:mime_type) { 'application/pdf' }
+  let(:original_name) { 'my_original.pdf' }
+  let(:updated_mime_type) { 'text/plain' }
+  let(:updated_name) { 'my_updated.txt' }
 
   context 'when you provide mime_type and original_name, etc' do
     it 'uses the provided values' do
-      expect(Hydra::Works::AddFileToFileSet).to receive(:call).with(generic_file, file, :original_file, update_existing: true, versioning: true)
-      described_class.call(generic_file, file)
+      expect(Hydra::Works::AddFileToFileSet).to receive(:call).with(file_set, file, :original_file, update_existing: true, versioning: true)
+      described_class.call(file_set, file)
     end
   end
 
   # Duplicate test from add_file_spec
-  context 'without a proper generic file' do
-    let(:error_message) { 'supplied object must be a generic file' }
+  context 'without a proper file set' do
+    let(:error_message) { 'supplied object must be a file set' }
     it 'raises an error' do
-      expect(-> { described_class.call(generic_work, file) }).to raise_error(ArgumentError, error_message)
+      expect(-> { described_class.call(work, file) }).to raise_error(ArgumentError, error_message)
     end
   end
 
@@ -29,20 +29,20 @@ describe Hydra::Works::UploadFileToFileSet do
   context 'without file that responds to read.' do
     let(:error_message) { 'supplied file must respond to read' }
     it 'raises an error' do
-      expect(-> { described_class.call(generic_file, ['this does not respond to read.']) }).to raise_error(ArgumentError, error_message)
+      expect(-> { described_class.call(file_set, ['this does not respond to read.']) }).to raise_error(ArgumentError, error_message)
     end
   end
 
-  context 'with an empty generic file' do
+  context 'with an empty file set' do
     let(:additional_services) { [] }
     before do
       allow(file).to receive(:mime_type).and_return(mime_type)
       allow(file).to receive(:original_name).and_return(original_name)
-      described_class.call(generic_file, file, additional_services: additional_services)
+      described_class.call(file_set, file, additional_services: additional_services)
     end
 
     describe 'the uploaded file' do
-      subject { generic_file.original_file }
+      subject { file_set.original_file }
       it 'has updated properties' do
         expect(subject.content).to start_with('%PDF-1.3')
         expect(subject.mime_type).to eql mime_type
@@ -50,8 +50,8 @@ describe Hydra::Works::UploadFileToFileSet do
       end
     end
 
-    describe "the generic file's generated files" do
-      subject { generic_file }
+    describe "the file set's generated files" do
+      subject { file_set }
       it 'has content and generated files' do
         expect(subject.original_file.content).to start_with('%PDF-1.3')
         expect(subject.original_file.mime_type).to eql mime_type
@@ -68,12 +68,12 @@ describe Hydra::Works::UploadFileToFileSet do
       allow(updated_file).to receive(:mime_type).and_return(updated_mime_type)
       allow(updated_file).to receive(:original_name).and_return(updated_name)
 
-      described_class.call(generic_file, file, additional_services: additional_services)
-      described_class.call(generic_file, updated_file, additional_services: additional_services, update_existing: true)
+      described_class.call(file_set, file, additional_services: additional_services)
+      described_class.call(file_set, updated_file, additional_services: additional_services, update_existing: true)
     end
 
     describe 'the new file' do
-      subject { generic_file.original_file }
+      subject { file_set.original_file }
       it 'has updated properties' do
         updated_file.rewind
         expect(subject.content).to eql updated_file.read