curation_concerns 0.11.0 → 0.12.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5316df9b39e54e4daa22c70a6c3b29792b5c34f5
-  data.tar.gz: 3bfc5ebcffca4b90f451bc5ff6939f7ba710b6ab
+  metadata.gz: e539e04a127fef5b331cbc4b51495b386f473ab8
+  data.tar.gz: 2706ea39d092ae8ae4e7a969ec5f0d6ac40e8f75
 SHA512:
-  metadata.gz: 999744a175fde9f98b998ecb7da9a6ebd617d93ecac848d5ddeb8c5d0ebaf314e838dc6914bbf7619b191b4cfefd66ff8900948b8a7c3c186e0af0e6921491c5
-  data.tar.gz: 25caa2a90d520913508b28b7a7e695100ed53ed1257f1a88d1eead24e8869e0dd5612776ff0c5a6fb4c0d0aadbdd579661ef962744492ee033b9ff2956e5d045
+  metadata.gz: 4cb327b7af8c5e54d1b42ce2fc0784541e8f1aaaea7b19b172cc77615bec6ea8f7ffd49fa059e38a8132d6f759dcac3aca1c220d72b2ae5aedb65abc55e78f47
+  data.tar.gz: 806dad8e1e5ed014956c1c9df81eaf3c7f43117081b9877a017e08509988ae5c2eeaf038dd5220fabc14c8e8a6e27ef8dd113a3025ab2c7f02791dbe19fd32b1

data/.rubocop.yml

@@ -26,6 +26,7 @@ Performance/RedundantMerge:
 Lint/AssignmentInCondition:
   Exclude:
     - 'curation_concerns-models/app/services/curation_concerns/persist_derivatives.rb'
+    - 'curation_concerns-models/app/actors/curation_concerns/file_set_actor.rb'
 
 Metrics/LineLength:
   Enabled: false

data/VERSION

@@ -1 +1 @@
-0.11.0
+0.12.0.pre1

data/app/controllers/concerns/curation_concerns/curation_concern_controller.rb

@@ -41,7 +41,7 @@ module CurationConcerns::CurationConcernController
 
   def create
     # return unless verify_acceptance_of_user_agreement!
-    if actor.create
+    if actor.create(attributes_for_actor)
       after_create_response
     else
       respond_to do |wants|
@@ -77,7 +77,7 @@ module CurationConcerns::CurationConcernController
   end
 
   def update
-    if actor.update
+    if actor.update(attributes_for_actor)
       after_update_response
     else
       respond_to do |wants|
@@ -115,7 +115,7 @@ module CurationConcerns::CurationConcernController
     end
 
     def actor
-      @actor ||= CurationConcerns::CurationConcern.actor(curation_concern, current_user, attributes_for_actor)
+      @actor ||= CurationConcerns::CurationConcern.actor(curation_concern, current_user)
     end
 
     def presenter
@@ -135,7 +135,7 @@ module CurationConcerns::CurationConcernController
 
     def after_update_response
       # TODO: visibility or lease/embargo status
-      if actor.visibility_changed? && curation_concern.file_sets.present?
+      if curation_concern.visibility_changed? && curation_concern.file_sets.present?
         redirect_to main_app.confirm_curation_concerns_permission_path(curation_concern)
       else
         respond_to do |wants|

data/app/services/curation_concerns/curation_concern.rb

@@ -1,9 +1,46 @@
 module CurationConcerns
   module CurationConcern
-    def self.actor(curation_concern, *args)
+    # Returns the top-level actor on the stack
+    def self.actor(curation_concern, current_user)
+      ActorStack.new(curation_concern, current_user,
+                     [AddToCollectionActor,
+                      AssignRepresentativeActor,
+                      AttachFilesActor,
+                      ApplyOrderActor,
+                      InterpretVisibilityActor,
+                      model_actor(curation_concern),
+                      AssignIdentifierActor])
+    end
+
+    def self.model_actor(curation_concern)
       actor_identifier = curation_concern.class.to_s.split('::').last
-      klass = "CurationConcerns::#{actor_identifier}Actor".constantize
-      klass.new(curation_concern, *args)
+      "CurationConcerns::#{actor_identifier}Actor".constantize
+    end
+
+    class ActorStack
+      attr_reader :curation_concern, :user, :first_actor_class, :more_actors
+      def initialize(curation_concern, user, more_actors)
+        @curation_concern = curation_concern
+        @user = user
+        @more_actors = more_actors
+        @first_actor_class = @more_actors.shift || RootActor
+      end
+
+      def inner_stack
+        ActorStack.new(curation_concern, user, more_actors)
+      end
+
+      def actor
+        first_actor_class.new(curation_concern, user, inner_stack)
+      end
+
+      def create(attributes)
+        actor.create(attributes.with_indifferent_access)
+      end
+
+      def update(attributes)
+        actor.update(attributes.with_indifferent_access)
+      end
     end
   end
 end

data/lib/curation_concerns/version.rb

@@ -1,3 +1,3 @@
 module CurationConcerns
-  VERSION = "0.11.0".freeze
+  VERSION = "0.12.0.pre1".freeze
 end

data/lib/generators/curation_concerns/work/templates/actor.rb.erb

@@ -2,6 +2,5 @@
 #  `rails generate curation_concerns:work <%= class_name %>`
 module CurationConcerns
   class <%= class_name %>Actor < CurationConcerns::BaseActor
-    include ::CurationConcerns::WorkActorBehavior
   end
 end

data/spec/actors/curation_concerns/add_to_collections_actor_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+describe CurationConcerns::AddToCollectionActor do
+  let(:user) { create(:user) }
+  let(:curation_concern) { GenericWork.new }
+  let(:attributes) { {} }
+  subject do
+    CurationConcerns::CurationConcern::ActorStack.new(curation_concern,
+                                                      user,
+                                                      [described_class,
+                                                       CurationConcerns::GenericWorkActor])
+  end
+  describe 'the next actor' do
+    let(:root_actor) { double }
+    before do
+      allow(CurationConcerns::RootActor).to receive(:new).and_return(root_actor)
+    end
+
+    let(:attributes) do
+      { collection_ids: ['123'], title: ['test'] }
+    end
+
+    it 'does not receive the collection_ids' do
+      expect(root_actor).to receive(:create).with(title: ['test'])
+      subject.create(attributes)
+    end
+  end
+
+  describe 'create' do
+    let(:collection) { create(:collection) }
+    let(:attributes) do
+      { collection_ids: [collection.id], title: ['test'] }
+    end
+
+    it 'adds it to the collection' do
+      expect(subject.create(attributes)).to be true
+      expect(collection.reload.members).to eq [curation_concern]
+    end
+  end
+end

data/spec/actors/curation_concerns/file_set_actor_spec.rb

@@ -138,6 +138,13 @@ describe CurationConcerns::FileSetActor do
     end
   end
 
+  describe "#update_metadata" do
+    it "is successful" do
+      expect(actor.update_metadata("title" => ["updated title"])).to be true
+      expect(file_set.reload.title).to eq ["updated title"]
+    end
+  end
+
   describe "#destroy" do
     it "destroys the object" do
       actor.destroy

data/spec/actors/curation_concerns/interpret_visibility_actor_spec.rb

@@ -0,0 +1,137 @@
+require 'spec_helper'
+describe CurationConcerns::InterpretVisibilityActor do
+  let(:user) { create(:user) }
+  let(:curation_concern) { GenericWork.new }
+  let(:attributes) { {} }
+  subject do
+    CurationConcerns::CurationConcern::ActorStack.new(curation_concern,
+                                                      user,
+                                                      [described_class,
+                                                       CurationConcerns::GenericWorkActor])
+  end
+  let(:date) { Date.today + 2 }
+
+  describe 'the next actor' do
+    let(:root_actor) { double }
+    before do
+      allow(CurationConcerns::RootActor).to receive(:new).and_return(root_actor)
+    end
+
+    context 'when visibility is  set to open' do
+      let(:attributes) do
+        { visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC,
+          visibility_during_embargo: 'restricted',
+          visibility_after_embargo: 'open',
+          embargo_release_date: date.to_s }
+      end
+
+      it 'does not receive the embargo attributes' do
+        expect(root_actor).to receive(:create).with(visibility: 'open')
+        subject.create(attributes)
+      end
+    end
+
+    context 'when visibility is set to embargo' do
+      let(:attributes) do
+        { visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO,
+          visibility_during_embargo: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE,
+          visibility_after_embargo: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC,
+          embargo_release_date: date.to_s }
+      end
+
+      it 'does not receive the visibility attribute' do
+        expect(root_actor).to receive(:create).with(hash_excluding(:visibility))
+        subject.create(attributes)
+      end
+
+      context 'when embargo_release_date is not set' do
+        let(:attributes) { { visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO } }
+        it 'does not clear the visibility attributes' do
+          expect(subject.create(attributes)).to be false
+          expect(attributes).to eq(visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO)
+        end
+      end
+    end
+
+    context 'when visibility is set to lease' do
+      let(:attributes) do
+        { visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_LEASE,
+          visibility_during_lease: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE,
+          visibility_after_lease: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC,
+          lease_expiration_date: date.to_s }
+      end
+
+      it 'removes lease attributes' do
+        expect(root_actor).to receive(:create).with(hash_excluding(:visibility))
+        subject.create(attributes)
+      end
+
+      context 'when lease_expiration_date is not set' do
+        let(:attributes) { { visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_LEASE } }
+        it 'sets error on curation_concern and return false' do
+          expect(subject.create(attributes)).to be false
+          expect(attributes).to eq(visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_LEASE)
+        end
+      end
+    end
+  end
+
+  describe 'create' do
+    context 'with embargo' do
+      let(:attributes) do
+        { title: ['New embargo'], visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO,
+          visibility_during_embargo: 'authenticated', embargo_release_date: date.to_s,
+          visibility_after_embargo: 'open', visibility_during_lease: 'open',
+          lease_expiration_date: '2014-06-12', visibility_after_lease: 'restricted',
+          rights: ['http://creativecommons.org/licenses/by/3.0/us/'] }
+      end
+
+      context 'with a valid embargo date' do
+        let(:date) { Date.today + 2 }
+        it 'interprets and apply embargo and lease visibility settings' do
+          subject.create(attributes)
+          expect(curation_concern.visibility_during_embargo).to eq 'authenticated'
+          expect(curation_concern.visibility_after_embargo).to eq 'open'
+          expect(curation_concern.visibility).to eq 'authenticated'
+        end
+      end
+
+      context 'when embargo_release_date is in the past' do
+        let(:date) { Date.today - 2 }
+        it 'sets error on curation_concern and return false' do
+          expect(subject.create(attributes)).to be false
+          expect(subject.curation_concern.errors[:embargo_release_date].first).to eq 'Must be a future date'
+        end
+      end
+    end
+
+    context 'with lease' do
+      let(:attributes) do
+        { title: ['New embargo'], visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_LEASE,
+          visibility_during_embargo: 'authenticated', embargo_release_date: '2099-05-12',
+          visibility_after_embargo: 'open', visibility_during_lease: 'open',
+          lease_expiration_date: date.to_s, visibility_after_lease: 'restricted',
+          rights: ['http://creativecommons.org/licenses/by/3.0/us/'] }
+      end
+
+      context 'with a valid lease date' do
+        let(:date) { Date.today + 2 }
+        it 'interprets and apply embargo and lease visibility settings' do
+          subject.create(attributes)
+          expect(curation_concern.embargo_release_date).to be_nil
+          expect(curation_concern.visibility_during_lease).to eq 'open'
+          expect(curation_concern.visibility_after_lease).to eq 'restricted'
+          expect(curation_concern.visibility).to eq 'open'
+        end
+      end
+
+      context 'when lease_expiration_date is in the past' do
+        let(:date) { Date.today - 2 }
+        it 'sets error on curation_concern and return false' do
+          expect(subject.create(attributes)).to be false
+          expect(subject.curation_concern.errors[:lease_expiration_date].first).to eq 'Must be a future date'
+        end
+      end
+    end
+  end
+end

data/spec/actors/curation_concerns/work_actor_spec.rb

@@ -4,7 +4,7 @@ require 'redlock'
 describe CurationConcerns::GenericWorkActor do
   include ActionDispatch::TestProcess
 
-  let(:user) { FactoryGirl.create(:user) }
+  let(:user) { create(:user) }
   let(:file) { curation_concerns_fixture_file_upload('files/image.png', 'image/png') }
 
   let(:redlock_client_stub) { # stub out redis connection
@@ -15,7 +15,7 @@ describe CurationConcerns::GenericWorkActor do
   }
 
   subject do
-    CurationConcerns::CurationConcern.actor(curation_concern, user, attributes)
+    CurationConcerns::CurationConcern.actor(curation_concern, user)
   end
 
   describe '#create' do
@@ -28,7 +28,7 @@ describe CurationConcerns::GenericWorkActor do
       it 'returns false' do
         expect_any_instance_of(described_class).to receive(:save).and_return(false)
         allow(subject).to receive(:attach_files).and_return(true)
-        expect(subject.create).to be false
+        expect(subject.create(attributes)).to be false
       end
     end
 
@@ -36,88 +36,32 @@ describe CurationConcerns::GenericWorkActor do
       let(:visibility) { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED }
 
       context 'with embargo' do
-        let(:attributes) do
-          { title: ['New embargo'], visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO,
-            visibility_during_embargo: 'authenticated', embargo_release_date: date.to_s,
-            visibility_after_embargo: 'open', visibility_during_lease: 'open',
-            lease_expiration_date: '2014-06-12', visibility_after_lease: 'restricted',
-            rights: ['http://creativecommons.org/licenses/by/3.0/us/'] }
-        end
-
-        context 'with a valid embargo date' do
+        context "with attached files" do
           let(:date) { Date.today + 2 }
-          it 'interprets and apply embargo and lease visibility settings' do
-            subject.create
-            expect(curation_concern).to be_persisted
-            expect(curation_concern.visibility_during_embargo).to eq 'authenticated'
-            expect(curation_concern.visibility_after_embargo).to eq 'open'
-            expect(curation_concern.visibility).to eq 'authenticated'
-          end
-          context "with attached files" do
-            let(:attributes) do
-              { title: ['New embargo'], visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO,
-                visibility_during_embargo: 'authenticated', embargo_release_date: date.to_s,
-                visibility_after_embargo: 'open', visibility_during_lease: 'open',
-                lease_expiration_date: '2014-06-12', visibility_after_lease: 'restricted',
-                files: [
-                  file
-                ],
-                rights: ['http://creativecommons.org/licenses/by/3.0/us/'] }
-            end
-
-            before { redlock_client_stub }
-
-            it "applies it to attached files" do
-              allow(CharacterizeJob).to receive(:perform_later).and_return(true)
-              subject.create
-              file = curation_concern.file_sets.first
-              expect(file).to be_persisted
-              expect(file.visibility_during_embargo).to eq 'authenticated'
-              expect(file.visibility_after_embargo).to eq 'open'
-              expect(file.visibility).to eq 'authenticated'
-            end
-          end
-        end
-
-        context 'when embargo_release_date is in the past' do
-          let(:date) { Date.today - 2 }
-          it 'sets error on curation_concern and return false' do
-            expect(subject.create).to be false
-            expect(subject.curation_concern.errors[:embargo_release_date].first).to eq 'Must be a future date'
+          let(:attributes) do
+            { title: ['New embargo'], visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO,
+              visibility_during_embargo: 'authenticated', embargo_release_date: date.to_s,
+              visibility_after_embargo: 'open', visibility_during_lease: 'open',
+              lease_expiration_date: '2014-06-12', visibility_after_lease: 'restricted',
+              files: [
+                file
+              ],
+              rights: ['http://creativecommons.org/licenses/by/3.0/us/'] }
           end
-        end
-      end
-
-      context 'with lease' do
-        let(:attributes) do
-          { title: ['New embargo'], visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_LEASE,
-            visibility_during_embargo: 'authenticated', embargo_release_date: '2099-05-12',
-            visibility_after_embargo: 'open', visibility_during_lease: 'open',
-            lease_expiration_date: date.to_s, visibility_after_lease: 'restricted',
-            rights: ['http://creativecommons.org/licenses/by/3.0/us/'] }
-        end
 
-        context 'with a valid lease date' do
-          let(:date) { Date.today + 2 }
-          it 'interprets and apply embargo and lease visibility settings' do
-            subject.create
-            expect(curation_concern).to be_persisted
-            expect(curation_concern.embargo_release_date).to be_nil
-            expect(curation_concern.visibility_during_lease).to eq 'open'
-            expect(curation_concern.visibility_after_lease).to eq 'restricted'
-            expect(curation_concern.visibility).to eq 'open'
-          end
-        end
+          before { redlock_client_stub }
 
-        context 'when lease_expiration_date is in the past' do
-          let(:date) { Date.today - 2 }
-          it 'sets error on curation_concern and return false' do
-            expect(subject.create).to be false
-            expect(subject.curation_concern.errors[:lease_expiration_date].first).to eq 'Must be a future date'
+          it "applies embargo to attached files" do
+            allow(CharacterizeJob).to receive(:perform_later).and_return(true)
+            subject.create(attributes)
+            file = curation_concern.file_sets.first
+            expect(file).to be_persisted
+            expect(file.visibility_during_embargo).to eq 'authenticated'
+            expect(file.visibility_after_embargo).to eq 'open'
+            expect(file.visibility).to eq 'authenticated'
           end
         end
       end
-
       context 'with a file' do
         let(:attributes) do
           FactoryGirl.attributes_for(:generic_work, visibility: visibility).tap do |a|
@@ -133,7 +77,7 @@ describe CurationConcerns::GenericWorkActor do
 
           it 'stamps each file with the access rights' do
             expect(CharacterizeJob).to receive(:perform_later)
-            expect(subject.create).to be true
+            expect(subject.create(attributes)).to be true
             expect(curation_concern).to be_persisted
             expect(curation_concern.date_uploaded).to eq xmas
             expect(curation_concern.date_modified).to eq xmas
@@ -167,7 +111,7 @@ describe CurationConcerns::GenericWorkActor do
           it 'stamps each file with the access rights' do
             expect(CharacterizeJob).to receive(:perform_later).twice
 
-            expect(subject.create).to be true
+            expect(subject.create(attributes)).to be true
             expect(curation_concern).to be_persisted
             expect(curation_concern.date_uploaded).to eq xmas
             expect(curation_concern.date_modified).to eq xmas
@@ -187,7 +131,7 @@ describe CurationConcerns::GenericWorkActor do
         end
 
         it 'stamps each link with the access rights' do
-          expect(subject.create).to be true
+          expect(subject.create(attributes)).to be true
           expect(curation_concern).to be_persisted
           expect(curation_concern.title).to eq ['this is present']
         end
@@ -196,29 +140,20 @@ describe CurationConcerns::GenericWorkActor do
   end
 
   describe '#update' do
-    let(:curation_concern) { FactoryGirl.create(:generic_work, user: user) }
+    let(:curation_concern) { create(:generic_work, user: user) }
 
     context 'failure' do
       let(:attributes) { {} }
 
       it 'returns false' do
         expect_any_instance_of(described_class).to receive(:save).and_return(false)
-        expect(subject.update).to be false
-      end
-    end
-
-    context 'valid attributes' do
-      let(:attributes) { {} }
-      it 'interprets and apply embargo and lease visibility settings' do
-        expect(subject).to receive(:interpret_lease_visibility).and_return(true)
-        expect(subject).to receive(:interpret_embargo_visibility).and_return(true)
-        subject.update
+        expect(subject.update(attributes)).to be false
       end
     end
 
     context 'adding to collections' do
-      let!(:collection1) { FactoryGirl.create(:collection, user: user) }
-      let!(:collection2) { FactoryGirl.create(:collection, user: user) }
+      let!(:collection1) { create(:collection, user: user) }
+      let!(:collection2) { create(:collection, user: user) }
       let(:attributes) do
         FactoryGirl.attributes_for(:generic_work, collection_ids: [collection2.id])
       end
@@ -234,7 +169,7 @@ describe CurationConcerns::GenericWorkActor do
         expect(curation_concern.in_collections).to eq [collection1]
         # before running actor.update, the work is in collection1
 
-        expect(subject.update).to be true
+        expect(subject.update(attributes)).to be true
 
         curation_concern.reload
         expect(curation_concern.identifier).to be_blank
@@ -247,14 +182,13 @@ describe CurationConcerns::GenericWorkActor do
     context 'with multiple file sets' do
       let(:file_set1) { create(:file_set) }
       let(:file_set2) { create(:file_set) }
-      let(:curation_concern) { FactoryGirl.create(:generic_work, user: user, ordered_members: [file_set1, file_set2]) }
+      let(:curation_concern) { create(:generic_work, user: user, ordered_members: [file_set1, file_set2]) }
       let(:attributes) do
         FactoryGirl.attributes_for(:generic_work, ordered_member_ids: [file_set2.id, file_set1.id])
       end
       it 'updates the order of file sets' do
         expect(curation_concern.ordered_members.to_a).to eq [file_set1, file_set2]
-
-        expect(subject.update).to be true
+        expect(subject.update(attributes)).to be true
 
         curation_concern.reload
         expect(curation_concern.ordered_members.to_a).to eq [file_set2, file_set1]
@@ -267,7 +201,7 @@ describe CurationConcerns::GenericWorkActor do
         it "works" do
           expect(curation_concern.ordered_members.to_a).to eq [file_set1, file_set2]
 
-          expect(subject.update).to be true
+          expect(subject.update(attributes)).to be true
 
           curation_concern.reload
           expect(curation_concern.ordered_members.to_a).to eq [file_set2]

data/spec/controllers/curation_concerns/file_sets_controller_json_spec.rb

@@ -90,11 +90,16 @@ describe CurationConcerns::FileSetsController do
     end
 
     describe 'updated' do
-      before { put :update, id: resource, file_set: { title: ['updated title'] }, format: :json }
+      let(:actor) { double }
+      before do
+        allow(controller).to receive(:actor).and_return(actor)
+      end
       it "returns json of updated work and sets location header" do
+        expect(actor).to receive(:update_metadata).with(title: ['updated title']).and_return(true)
+        put :update, id: resource, file_set: { title: ['updated title'] }, format: :json
         expect(assigns[:file_set]).to be_instance_of ::FileSet # this object is used by the jbuilder template
-        expect(controller).to render_template('curation_concerns/file_sets/show')
         expect(response.status).to eq 200
+        expect(controller).to render_template('curation_concerns/file_sets/show')
         created_resource = assigns[:file_set]
         expect(response.location).to eq main_app.curation_concerns_file_set_path(created_resource)
       end

data/spec/controllers/curation_concerns/file_sets_controller_spec.rb

@@ -106,10 +106,9 @@ describe CurationConcerns::FileSetsController do
 
     describe 'update' do
       let!(:file_set) do
-        file_set = FileSet.new.tap do |gf|
+        file_set = FileSet.create do |gf|
           gf.apply_depositor_metadata(user)
           gf.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
-          gf.save!
         end
         parent.ordered_members << file_set
         parent.save

data/spec/controllers/curation_concerns/generic_works_controller_spec.rb

@@ -62,19 +62,24 @@ describe CurationConcerns::GenericWorksController do
   end
 
   describe '#create' do
+    let(:actor) { double(create: create_status) }
+    before do
+      allow(CurationConcerns::CurationConcern).to receive(:actor).and_return(actor)
+    end
+    let(:create_status) { true }
+
     context 'when create is successful' do
       let(:work) { stub_model(GenericWork) }
       it 'creates a work' do
         allow(controller).to receive(:curation_concern).and_return(work)
-        expect_any_instance_of(CurationConcerns::GenericWorkActor).to receive(:create).and_return(true)
         post :create, generic_work: { title: ['a title'] }
         expect(response).to redirect_to main_app.curation_concerns_generic_work_path(work)
       end
     end
 
     context 'when create fails' do
+      let(:create_status) { false }
       it 'draws the form again' do
-        expect_any_instance_of(CurationConcerns::GenericWorkActor).to receive(:create).and_return(false)
         post :create, generic_work: { title: ['a title'] }
         expect(response.status).to eq 422
         expect(assigns[:form]).to be_kind_of CurationConcerns::GenericWorkForm
@@ -136,8 +141,10 @@ describe CurationConcerns::GenericWorksController do
     let(:a_work) { create(:private_generic_work, user: user) }
     before do
       allow(CurationConcerns::CurationConcern).to receive(:actor).and_return(actor)
+      allow_any_instance_of(GenericWork).to receive(:visibility_changed?).and_return(visibility_changed)
     end
-    let(:actor) { double(update: true, visibility_changed?: false) }
+    let(:visibility_changed) { false }
+    let(:actor) { double(update: true) }
 
     it 'updates the work' do
       patch :update, id: a_work, generic_work: {}
@@ -145,14 +152,13 @@ describe CurationConcerns::GenericWorksController do
     end
 
     it "can update file membership" do
-      file = create(:file_set, user: user)
-
-      patch :update, id: a_work, generic_work: { ordered_member_ids: [file.id] }
-      expect(CurationConcerns::CurationConcern).to have_received(:actor).with(anything, anything, ordered_member_ids: [file.id])
+      patch :update, id: a_work, generic_work: { ordered_member_ids: ['foo_123'] }
+      expect(actor).to have_received(:update).with(ordered_member_ids: ['foo_123'])
     end
 
     describe 'changing rights' do
-      let(:actor) { double(update: true, visibility_changed?: true) }
+      let(:visibility_changed) { true }
+      let(:actor) { double(update: true) }
 
       context 'when there are children' do
         let(:a_work) { create(:work_with_one_file, user: user) }
@@ -172,7 +178,7 @@ describe CurationConcerns::GenericWorksController do
     end
 
     describe 'failure' do
-      let(:actor) { double(update: false, visibility_changed?: false) }
+      let(:actor) { double(update: false) }
 
       it 'renders the form' do
         patch :update, id: a_work, generic_work: {}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curation_concerns
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0.pre1
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-31 00:00:00.000000000 Z
+date: 2016-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -88,14 +88,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0.pre1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0.pre1
 - !ruby/object:Gem::Dependency
   name: hydra-editor
   requirement: !ruby/object:Gem::Requirement
@@ -733,11 +733,12 @@ files:
 - spec/abilities/embargo_and_lease_ability_spec.rb
 - spec/abilities/file_set_abilities_spec.rb
 - spec/abilities/generic_work_abilities_spec.rb
+- spec/actors/curation_concerns/add_to_collections_actor_spec.rb
 - spec/actors/curation_concerns/embargo_actor_spec.rb
 - spec/actors/curation_concerns/file_actor_spec.rb
 - spec/actors/curation_concerns/file_set_actor_spec.rb
+- spec/actors/curation_concerns/interpret_visibility_actor_spec.rb
 - spec/actors/curation_concerns/lease_actor_spec.rb
-- spec/actors/curation_concerns/manages_embargoes_actor_spec.rb
 - spec/actors/curation_concerns/work_actor_spec.rb
 - spec/controllers/catalog_controller_spec.rb
 - spec/controllers/curation_concerns/classify_concerns_controller_spec.rb
@@ -912,9 +913,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1
@@ -927,11 +928,12 @@ test_files:
 - spec/abilities/embargo_and_lease_ability_spec.rb
 - spec/abilities/file_set_abilities_spec.rb
 - spec/abilities/generic_work_abilities_spec.rb
+- spec/actors/curation_concerns/add_to_collections_actor_spec.rb
 - spec/actors/curation_concerns/embargo_actor_spec.rb
 - spec/actors/curation_concerns/file_actor_spec.rb
 - spec/actors/curation_concerns/file_set_actor_spec.rb
+- spec/actors/curation_concerns/interpret_visibility_actor_spec.rb
 - spec/actors/curation_concerns/lease_actor_spec.rb
-- spec/actors/curation_concerns/manages_embargoes_actor_spec.rb
 - spec/actors/curation_concerns/work_actor_spec.rb
 - spec/controllers/catalog_controller_spec.rb
 - spec/controllers/curation_concerns/classify_concerns_controller_spec.rb

data/spec/actors/curation_concerns/manages_embargoes_actor_spec.rb

@@ -1,101 +0,0 @@
-require 'spec_helper'
-describe CurationConcerns::ManagesEmbargoesActor do
-  let(:model) do
-    Class.new(CurationConcerns::BaseActor) do
-      include CurationConcerns::ManagesEmbargoesActor
-    end
-  end
-
-  let(:user) { User.new }
-  let(:curation_concern) { GenericWork.new }
-  let(:attributes) { {} }
-  subject do
-    model.new(curation_concern, user, attributes)
-  end
-  let(:date) { Date.today + 2 }
-
-  context '#interpret_visibility' do
-    it 'interprets lease and embargo visibility' do
-      expect(subject).to receive(:interpret_lease_visibility).and_return(true)
-      expect(subject).to receive(:interpret_embargo_visibility).and_return(true)
-      expect(subject.interpret_visibility).to be true
-    end
-    it 'collects failures from interpreting lease & embargo visibility' do
-      expect(subject).to receive(:interpret_embargo_visibility).and_return(true)
-      expect(subject).to receive(:interpret_lease_visibility).and_return(false)
-      expect(subject.interpret_visibility).to be false
-    end
-  end
-
-  context '#interpret_embargo_visibility' do
-    context 'when visibility is not set to embargo' do
-      let(:attributes) do
-        { visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC,
-          visibility_during_embargo: 'restricted', visibility_after_embargo: 'open' }
-      end
-      it 'removes the embargo attributes and returns true' do
-        expect(subject.interpret_embargo_visibility).to be true
-        expect(subject.attributes.keys).to eq ['visibility']
-      end
-    end
-
-    context 'when visibility is set to embargo' do
-      let(:attributes) do
-        { visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO,
-          visibility_during_embargo: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE,
-          visibility_after_embargo: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC,
-          embargo_release_date: date.to_s }
-      end
-
-      it 'applies the embargo remove embargo attributes except for embargo_release_date and return true' do
-        expect(subject.curation_concern).to receive(:apply_embargo).with(date.to_s, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC)
-        expect(subject.interpret_embargo_visibility).to be true
-        expect(subject.attributes.keys).to eq ['embargo_release_date']
-      end
-
-      context 'when embargo_release_date is not set' do
-        let(:attributes) { { visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO } }
-        it 'sets error on curation_concern and return false' do
-          expect(subject.interpret_embargo_visibility).to be false
-          expect(subject.curation_concern.errors[:visibility].first).to eq 'When setting visibility to "embargo" you must also specify embargo release date.'
-        end
-      end
-    end
-  end
-
-  context '#interpret_lease_visibility' do
-    context 'when visibility is not set to lease' do
-      let(:attributes) do
-        { visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC,
-          visibility_during_lease: 'open', visibility_after_lease: 'restricted' }
-      end
-      it 'removes the lease attributes and returns true' do
-        expect(subject.interpret_lease_visibility).to be true
-        expect(subject.attributes.keys).to eq ['visibility']
-      end
-    end
-
-    context 'when visibility is set to lease' do
-      let(:attributes) do
-        { visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_LEASE,
-          visibility_during_lease: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE,
-          visibility_after_lease: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC,
-          lease_expiration_date: date.to_s }
-      end
-
-      it 'applies the lease, remove lease attributes except for lease_expiration_date and return true' do
-        expect(subject.curation_concern).to receive(:apply_lease).with(date.to_s, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC)
-        expect(subject.interpret_lease_visibility).to be true
-        expect(subject.attributes.keys).to eq ['lease_expiration_date']
-      end
-
-      context 'when lease_expiration_date is not set' do
-        let(:attributes) { { visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_LEASE } }
-        it 'sets error on curation_concern and return false' do
-          expect(subject.interpret_lease_visibility).to be false
-          expect(subject.curation_concern.errors[:visibility].first).to eq 'When setting visibility to "lease" you must also specify lease expiration date.'
-        end
-      end
-    end
-  end
-end