Update to curation_concerns 0.12.0.pre5

Fixes #1776

app/controllers/concerns/sufia/works_controller_behavior.rb

@@ -18,20 +18,6 @@ def new
       super
     end
 
-    def actor
-      @actor ||= CurationConcerns::CurationConcern::ActorStack.new(
-        curation_concern,
-        current_user,
-        [CreateWithFilesActor,
-         CurationConcerns::AddToCollectionActor,
-         CurationConcerns::AssignRepresentativeActor,
-         CurationConcerns::AttachFilesActor,
-         CurationConcerns::ApplyOrderActor,
-         CurationConcerns::InterpretVisibilityActor,
-         CurationConcerns::CurationConcern.model_actor(curation_concern),
-         CurationConcerns::AssignIdentifierActor])
-    end
-
     # Override the default behavior from curation_concerns in order to add uploaded_files to the parameters received by the actor.
     def attributes_for_actor
       super.merge(params.slice(:uploaded_files))

app/jobs/batch_create_job.rb

@@ -58,17 +58,6 @@ def create_work(user, attributes)
     end
 
     def work_actor(work, user)
-      # TODO: merge this with the actor method from works_controller.
-      CurationConcerns::CurationConcern::ActorStack.new(
-        work,
-        user,
-        [Sufia::CreateWithFilesActor,
-         CurationConcerns::AddToCollectionActor,
-         CurationConcerns::AssignRepresentativeActor,
-         CurationConcerns::AttachFilesActor,
-         CurationConcerns::ApplyOrderActor,
-         CurationConcerns::InterpretVisibilityActor,
-         CurationConcerns::CurationConcern.model_actor(work),
-         CurationConcerns::AssignIdentifierActor])
+      CurationConcerns::CurationConcern.actor(work, user)
     end
 end

app/services/sufia/actor_factory.rb

@@ -0,0 +1,14 @@
+module Sufia
+  class ActorFactory < CurationConcerns::ActorFactory
+    def self.stack_actors(curation_concern)
+      [CreateWithFilesActor,
+       CurationConcerns::AddToCollectionActor,
+       CurationConcerns::AssignRepresentativeActor,
+       CurationConcerns::AttachFilesActor,
+       CurationConcerns::ApplyOrderActor,
+       CurationConcerns::InterpretVisibilityActor,
+       model_actor(curation_concern),
+       CurationConcerns::AssignIdentifierActor]
+    end
+  end
+end

lib/sufia/engine.rb

@@ -44,6 +44,8 @@ class Engine < ::Rails::Engine
         ActiveFedora::Noid.config.template = c.noid_template
         ActiveFedora::Noid.config.statefile = c.minter_statefile
       end
+
+      CurationConcerns::CurationConcern.actor_factory = Sufia::ActorFactory
     end
 
     initializer 'sufia.assets.precompile' do |app|

spec/actors/create_with_files_actor_spec.rb

@@ -4,10 +4,8 @@
   let(:create_actor) { double('create actor', create: true,
                                               curation_concern: work,
                                               user: user) }
-  # let(:actor) { described_class.new(create_actor, uploaded_file_ids) }
   let(:actor) do
-    CurationConcerns::CurationConcern::ActorStack.new(
-      work, user, [described_class])
+    CurationConcerns::ActorStack.new(work, user, [described_class])
   end
   let(:user) { create(:user) }
   let(:uploaded_file1) { UploadedFile.create(user: user) }

spec/factories/sufia/actor_factory_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe Sufia::ActorFactory do
+  let(:work) { GenericWork.new }
+  let(:user) { double }
+
+  describe '.stack_actors' do
+    subject { described_class.stack_actors(work) }
+    it { is_expected.to eq [Sufia::CreateWithFilesActor,
+                            CurationConcerns::AddToCollectionActor,
+                            CurationConcerns::AssignRepresentativeActor,
+                            CurationConcerns::AttachFilesActor,
+                            CurationConcerns::ApplyOrderActor,
+                            CurationConcerns::InterpretVisibilityActor,
+                            CurationConcerns::GenericWorkActor,
+                            CurationConcerns::AssignIdentifierActor] }
+  end
+
+  describe '.build' do
+    subject { described_class.build(work, user) }
+    it "has the correct stack frames" do
+      expect(subject.more_actors).to eq [
+        CurationConcerns::AddToCollectionActor,
+        CurationConcerns::AssignRepresentativeActor,
+        CurationConcerns::AttachFilesActor,
+        CurationConcerns::ApplyOrderActor,
+        CurationConcerns::InterpretVisibilityActor,
+        CurationConcerns::GenericWorkActor,
+        CurationConcerns::AssignIdentifierActor]
+      expect(subject.first_actor_class).to eq Sufia::CreateWithFilesActor
+    end
+  end
+
+  describe 'CurationConcerns::CurationConcern.actor' do
+    it "calls the Sufia::ActorFactory" do
+      expect(described_class).to receive(:build)
+      CurationConcerns::CurationConcern.actor(work, user)
+    end
+  end
+end

spec/jobs/batch_create_job_spec.rb

@@ -29,7 +29,7 @@
     subject { described_class.perform_now(user, title, uploaded_files, metadata) }
 
     it "updates work metadata" do
-      expect(CurationConcerns::CurationConcern::ActorStack).to receive(:new).and_return(actor).twice
+      expect(CurationConcerns::CurationConcern).to receive(:actor).and_return(actor).twice
       expect(actor).to receive(:create).with(tag: [], title: ['File One'], uploaded_files: [1]).and_return(true)
       expect(actor).to receive(:create).with(tag: [], title: ['File Two'], uploaded_files: [2]).and_return(true)
       expect(CurationConcerns.config.callback).to receive(:run).with(:after_batch_create_success, user)
@@ -60,7 +60,7 @@
 
     context "when user does not have permission to edit all of the works" do
       it "sends the failure message" do
-        expect(CurationConcerns::CurationConcern::ActorStack).to receive(:new).and_return(actor).twice
+        expect(CurationConcerns::CurationConcern).to receive(:actor).and_return(actor).twice
         expect(actor).to receive(:create).and_return(true, false)
         expect(CurationConcerns.config.callback).to receive(:run).with(:after_batch_create_failure, user)
         subject

sufia.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.version       = Sufia::VERSION
   spec.license       = 'Apache2'
 
-  spec.add_dependency 'curation_concerns', '~> 0.12.0.pre4'
+  spec.add_dependency 'curation_concerns', '~> 0.12.0.pre5'
   spec.add_dependency 'active-fedora', '~> 9.10'
   spec.add_dependency 'hydra-works', '~> 0.7'
   spec.add_dependency 'hydra-batch-edit', '~> 1.1'