curation_concerns 1.0.0.beta1 → 1.0.0.beta2

data/app/renderers/renderers.rb

@@ -0,0 +1,11 @@
+module CurationConcerns
+  # Module that will containing Renderers
+  # @since 0.14.0
+  # Renderers are used to display Ruby objects to users.
+  # Renderers take the Ruby object supplied by a
+  # CurationConcerns::Presenter object Renderers are typically  # used to respond to read requests from the controller.
+  # Renderers may apply some level of HTML or may just supply
+  # human readable values for object attributes.
+  module Renderers
+  end
+end

data/app/services/curation_concerns/actors/actor_factory.rb

@@ -0,0 +1,26 @@
+module CurationConcerns
+  module Actors
+    class ActorFactory
+      def self.build(curation_concern, current_user)
+        Actors::ActorStack.new(curation_concern,
+                               current_user,
+                               stack_actors(curation_concern))
+      end
+
+      def self.stack_actors(curation_concern)
+        [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
+        "CurationConcerns::Actors::#{actor_identifier}Actor".constantize
+      end
+    end
+  end
+end

data/app/services/curation_concerns/curation_concern.rb

@@ -1,7 +1,7 @@
 module CurationConcerns
   class CurationConcern
     class_attribute :actor_factory
-    self.actor_factory = CurationConcerns::ActorFactory
+    self.actor_factory = CurationConcerns::Actors::ActorFactory
 
     # A consumer of this method can inject a different factory
     # into this class in order to change the behavior of this method.

data/app/services/curation_concerns/thumbnail_path_service.rb

@@ -19,7 +19,7 @@ module CurationConcerns
 
       def fetch_thumbnail(object)
         return object if object.thumbnail_id == object.id
-        ::FileSet.load_instance_from_solr(object.thumbnail_id)
+        ::FileSet.find(object.thumbnail_id)
       rescue ActiveFedora::ObjectNotFoundError
         Rails.logger.error("Couldn't find thumbnail #{object.thumbnail_id} for #{object.id}")
         nil

data/app/views/collections/show.html.erb

@@ -1,15 +1,19 @@
-<% provide :page_title, "#{@presenter.title} - #{application_name}" %>
+<% provide :page_title, "#{@presenter.title.join(', ')} - #{application_name}" %>
 
 <% provide :sidebar do %>
   <%= render 'search_sidebar' %>
 <% end %>
 
 <div id="content">
-  <h1 class="lower"><%= @presenter.title %></h1>
+  <% @presenter.title.each do |title| %>
+    <h1 class="lower"><%= title %></h1>
+  <% end %>
 
   <%= render 'curation_concerns/base/representative_media', presenter: @presenter %>
 
-  <h3><%= @presenter.description %> </h3>
+  <%= @presenter.description.each do |description| %>
+    <h3><%= description %></h3>
+  <% end %>
 
   <% unless has_collection_search_parameters? %>
     <%= render 'collections/show_actions' %>

data/app/views/curation_concerns/base/_representative_media.html.erb

@@ -1,4 +1,4 @@
-<% if presenter.representative_id.present? && (fs = ::FileSet.load_instance_from_solr(presenter.representative_id)) %>
+<% if presenter.representative_id.present? && (fs = ::FileSet.find(presenter.representative_id)) %>
   <%= media_display fs %>
 <% else %>
   <%= image_tag 'nope.png', class: "canonical-image" %>

data/app/views/curation_concerns/file_sets/show.html.erb

@@ -1,6 +1,6 @@
 <% provide :page_title, @presenter.page_title %>
 <% provide :page_header do %>
-  <h1>File Details <small><%= @presenter.title %></small></h1>
+  <h1>File Details <small><%= @presenter %></small></h1>
 <% end %>
 <%= media_display @presenter %>
 <%= render "attributes", presenter: @presenter %>

data/config/locales/curation_concerns.en.yml

@@ -83,7 +83,7 @@ en:
         type: "http://schema.org/Thing"
         property: about
         value: name
-      tag:
+      keyword:
         property: keywords
       title:
         property: name
@@ -116,7 +116,7 @@ en:
         facet:
           human_readable_type_sim: Type of Work
           creator_sim: Creator
-          tag_sim: Keyword
+          keyword_sim: Keyword
           subject_sim: Subject
           language_sim: Language
           based_near_sim: Location
@@ -125,7 +125,7 @@ en:
           generic_type_sim: Type
         index:
           description_tesim: "Description"
-          tag_tesim: "Keyword"
+          keyword_tesim: "Keyword"
           subject_tesim: "Subject"
           creator_tesim: "Creator"
           contributor_tesim: "Contributor"
@@ -142,7 +142,7 @@ en:
         show:
           title_tesim: "Title"
           description_tesim: "Description"
-          tag_tesim: "Keyword"
+          keyword_tesim: "Keyword"
           subject_tesim: "Subject"
           creator_tesim: "Creator"
           contributor_tesim: "Contributor"

data/curation_concerns.gemspec

@@ -29,10 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'sprockets-es6'
   spec.add_dependency 'kaminari_route_prefix', '~> 0.0.1'
   spec.add_dependency 'active_attr'
-  spec.add_dependency 'hydra-works', '~> 0.8', '>= 0.8.1'
-  # This allows bundler to resolve a dependency tree.
-  # TODO: I suspect we can remove it when hydra-pcdm 0.8.0 is released.
-  spec.add_dependency 'hydra-pcdm', '>= 0.8.0.beta1', '< 1'
+  spec.add_dependency 'hydra-works', '>= 0.10.0'
   spec.add_dependency 'active_fedora-noid', '~> 1.0'
   spec.add_dependency 'qa', '~> 0.5'
   spec.add_dependency 'redlock', '~> 0.1.2'

data/lib/curation_concerns/configuration.rb

@@ -127,6 +127,13 @@ module CurationConcerns
       @lock_retry_delay ||= 200 # milliseconds
     end
 
+    # @!attribute [w] ingest_queue_name
+    #   ActiveJob queue to handle ingest-like jobs.
+    attr_writer :ingest_queue_name
+    def ingest_queue_name
+      @ingest_queue_name ||= :ingest
+    end
+
     callback.enable :after_create_concern, :after_create_fileset,
                     :after_update_content, :after_revert_content,
                     :after_update_metadata, :after_import_local_file_success,

data/lib/curation_concerns/version.rb

@@ -1,3 +1,3 @@
 module CurationConcerns
-  VERSION = "1.0.0.beta1".freeze
+  VERSION = "1.0.0.beta2".freeze
 end

data/lib/generators/curation_concerns/templates/catalog_controller.rb

@@ -25,7 +25,7 @@ class CatalogController < ApplicationController
     #   The ordering of the field names is the order of the display
     config.add_facet_field solr_name('human_readable_type', :facetable)
     config.add_facet_field solr_name('creator', :facetable), limit: 5
-    config.add_facet_field solr_name('tag', :facetable), limit: 5
+    config.add_facet_field solr_name('keyword', :facetable), limit: 5
     config.add_facet_field solr_name('subject', :facetable), limit: 5
     config.add_facet_field solr_name('language', :facetable), limit: 5
     config.add_facet_field solr_name('based_near', :facetable), limit: 5
@@ -41,7 +41,7 @@ class CatalogController < ApplicationController
     # solr fields to be displayed in the index (search results) view
     #   The ordering of the field names is the order of the display
     config.add_index_field solr_name('description', :stored_searchable)
-    config.add_index_field solr_name('tag', :stored_searchable)
+    config.add_index_field solr_name('keyword', :stored_searchable)
     config.add_index_field solr_name('subject', :stored_searchable)
     config.add_index_field solr_name('creator', :stored_searchable)
     config.add_index_field solr_name('contributor', :stored_searchable)
@@ -194,8 +194,8 @@ class CatalogController < ApplicationController
       }
     end
 
-    config.add_search_field('tag') do |field|
-      solr_name = solr_name('tag', :stored_searchable, type: :string)
+    config.add_search_field('keyword') do |field|
+      solr_name = solr_name('keyword', :stored_searchable, type: :string)
       field.solr_local_parameters = {
         qf: solr_name,
         pf: solr_name

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

@@ -1,6 +1,6 @@
 # Generated via
 #  `rails generate curation_concerns:work <%= class_name %>`
-module CurationConcerns
-  class <%= class_name %>Actor < CurationConcerns::BaseActor
+module CurationConcerns::Actors
+  class <%= class_name %>Actor < CurationConcerns::Actors::BaseActor
   end
 end

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

@@ -2,7 +2,7 @@
 #  `rails generate curation_concerns:work <%= class_name %>`
 require 'rails_helper'
 
-describe CurationConcerns::<%= class_name %>Actor do
+describe CurationConcerns::Actors::<%= class_name %>Actor do
   it "has tests" do
     skip "Add your tests here"
   end

data/lib/generators/curation_concerns/work/work_generator.rb

@@ -37,7 +37,7 @@ class CurationConcerns::WorkGenerator < Rails::Generators::NamedBase
 
   def create_actor_spec
     return unless rspec_installed?
-    template('actor_spec.rb.erb', "spec/actors/curation_concerns/#{file_name}_actor_spec.rb")
+    template('actor_spec.rb.erb', "spec/actors/curation_concerns/actors/#{file_name}_actor_spec.rb")
   end
 
   def create_form_spec
@@ -55,7 +55,7 @@ class CurationConcerns::WorkGenerator < Rails::Generators::NamedBase
   end
 
   def create_actor
-    template('actor.rb.erb', "app/actors/curation_concerns/#{file_name}_actor.rb")
+    template('actor.rb.erb', "app/actors/curation_concerns/actors/#{file_name}_actor.rb")
   end
 
   def create_form

data/spec/actors/curation_concerns/add_to_collections_actor_spec.rb

@@ -1,18 +1,18 @@
 require 'spec_helper'
-describe CurationConcerns::AddToCollectionActor do
+describe CurationConcerns::Actors::AddToCollectionActor do
   let(:user) { create(:user) }
   let(:curation_concern) { GenericWork.new }
   let(:attributes) { {} }
   subject do
-    CurationConcerns::ActorStack.new(curation_concern,
-                                     user,
-                                     [described_class,
-                                      CurationConcerns::GenericWorkActor])
+    CurationConcerns::Actors::ActorStack.new(curation_concern,
+                                             user,
+                                             [described_class,
+                                              CurationConcerns::Actors::GenericWorkActor])
   end
   describe 'the next actor' do
     let(:root_actor) { double }
     before do
-      allow(CurationConcerns::RootActor).to receive(:new).and_return(root_actor)
+      allow(CurationConcerns::Actors::RootActor).to receive(:new).and_return(root_actor)
     end
 
     let(:attributes) do

data/spec/actors/curation_concerns/embargo_actor_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe CurationConcerns::EmbargoActor do
+describe CurationConcerns::Actors::EmbargoActor do
   let(:actor) { described_class.new(work) }
 
   let(:work) do

data/spec/actors/curation_concerns/file_actor_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe CurationConcerns::FileActor do
+describe CurationConcerns::Actors::FileActor do
   include ActionDispatch::TestProcess
   let(:user) { create(:user) }
   let(:file_set) { create(:file_set) }

data/spec/actors/curation_concerns/file_set_actor_spec.rb

@@ -1,14 +1,14 @@
 require 'spec_helper'
 require 'redlock'
 
-describe CurationConcerns::FileSetActor do
+describe CurationConcerns::Actors::FileSetActor do
   include ActionDispatch::TestProcess
 
-  let(:user) { create(:user) }
-  let(:file_set) { create(:file_set) }
-  let(:actor) { described_class.new(file_set, user) }
+  let(:user)          { create(:user) }
   let(:uploaded_file) { fixture_file_upload('/world.png', 'image/png') }
-  let(:local_file) { File.open(File.join(fixture_path, 'world.png')) }
+  let(:local_file)    { File.open(File.join(fixture_path, 'world.png')) }
+  let(:file_set)      { create(:file_set, content: local_file) }
+  let(:actor)         { described_class.new(file_set, user) }
 
   describe 'creating metadata and content' do
     let(:upload_set_id) { nil }
@@ -92,8 +92,8 @@ describe CurationConcerns::FileSetActor do
         expect(file_set.title).to eq([File.basename(local_file)])
       end
 
-      it 'does not set the mime_type' do
-        expect(file_set.mime_type).to be_nil
+      it 'gets the mime_type from original_file' do
+        expect(file_set.mime_type).to eq('image/png')
       end
     end
 
@@ -105,6 +105,7 @@ describe CurationConcerns::FileSetActor do
 
       before do
         allow(CharacterizeJob).to receive(:perform_later)
+        allow(IngestFileJob).to receive(:perform_later)
         allow(file_set).to receive(:label).and_return(short_name)
         # TODO: we should allow/expect call to IngestJob
         actor.create_content(fixture_file_upload(file))
@@ -263,7 +264,7 @@ describe CurationConcerns::FileSetActor do
   describe "#file_actor_class" do
     context "default" do
       it "is a FileActor" do
-        expect(actor.file_actor_class).to eq(CurationConcerns::FileActor)
+        expect(actor.file_actor_class).to eq(CurationConcerns::Actors::FileActor)
       end
     end
 
@@ -271,9 +272,9 @@ describe CurationConcerns::FileSetActor do
       let(:actor) { CustomFileSetActor.new(file_set, user) }
 
       before do
-        class CustomFileActor < CurationConcerns::FileActor
+        class CustomFileActor < CurationConcerns::Actors::FileActor
         end
-        class CustomFileSetActor < CurationConcerns::FileSetActor
+        class CustomFileSetActor < CurationConcerns::Actors::FileSetActor
           def file_actor_class
             CustomFileActor
           end

data/spec/actors/curation_concerns/interpret_visibility_actor_spec.rb

@@ -1,20 +1,20 @@
 require 'spec_helper'
-describe CurationConcerns::InterpretVisibilityActor do
+describe CurationConcerns::Actors::InterpretVisibilityActor do
   let(:user) { create(:user) }
   let(:curation_concern) { GenericWork.new }
   let(:attributes) { {} }
   subject do
-    CurationConcerns::ActorStack.new(curation_concern,
-                                     user,
-                                     [described_class,
-                                      CurationConcerns::GenericWorkActor])
+    CurationConcerns::Actors::ActorStack.new(curation_concern,
+                                             user,
+                                             [described_class,
+                                              CurationConcerns::Actors::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)
+      allow(CurationConcerns::Actors::RootActor).to receive(:new).and_return(root_actor)
     end
 
     context 'when visibility is  set to open' do

data/spec/actors/curation_concerns/lease_actor_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe CurationConcerns::LeaseActor do
+describe CurationConcerns::Actors::LeaseActor do
   let(:actor) { described_class.new(work) }
 
   let(:work) do

data/spec/actors/curation_concerns/work_actor_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'redlock'
 
-describe CurationConcerns::GenericWorkActor do
+describe CurationConcerns::Actors::GenericWorkActor do
   include ActionDispatch::TestProcess
 
   let(:user) { create(:user) }

data/spec/controllers/curation_concerns/collections_controller_spec.rb

@@ -205,7 +205,7 @@ describe CollectionsController do
         get :show, id: collection
         expect(response).to be_successful
         expect(assigns[:presenter]).to be_kind_of CurationConcerns::CollectionPresenter
-        expect(assigns[:presenter].title).to eq 'Collection Title'
+        expect(assigns[:presenter].to_s).to eq 'Collection Title'
         expect(assigns[:member_docs].map(&:id)).to match_array [asset1, asset2, asset3].map(&:id)
       end
 
@@ -214,7 +214,7 @@ describe CollectionsController do
           get :show, id: collection, q: 'no matches'
           expect(response).to be_successful
           expect(assigns[:presenter]).to be_kind_of CurationConcerns::CollectionPresenter
-          expect(assigns[:presenter].title).to eq 'Collection Title'
+          expect(assigns[:presenter].to_s).to eq 'Collection Title'
         end
       end
       context 'when the page parameter is passed' do
@@ -222,7 +222,7 @@ describe CollectionsController do
           get :show, id: collection, page: '2'
           expect(response).to be_successful
           expect(assigns[:presenter]).to be_kind_of CurationConcerns::CollectionPresenter
-          expect(assigns[:presenter].title).to eq 'Collection Title'
+          expect(assigns[:presenter].to_s).to eq 'Collection Title'
         end
       end
     end

data/spec/controllers/curation_concerns/file_sets_controller_spec.rb

@@ -49,13 +49,13 @@ describe CurationConcerns::FileSetsController do
       context 'when the file has a virus' do
         before do
           allow(subject).to receive(:warn) # suppress virus warnings
-          allow(ClamAV.instance).to receive(:scanfile).and_return('EL CRAPO VIRUS')
+          allow(Hydra::Works::VirusCheckerService).to receive(:file_has_virus?) { true }
           of = subject.build_original_file
           of.content = File.open(file_path)
         end
         it 'populates the errors hash during validation' do
           expect(subject).to_not be_valid
-          expect(subject.errors.messages[:base].first).to match(/A virus was found in .*: EL CRAPO VIRUS/)
+          expect(subject.errors.messages[:base].first).to eq "Failed to verify uploaded file is not a virus"
         end
       end
 
@@ -122,7 +122,7 @@ describe CurationConcerns::FileSetsController do
       context 'updating metadata' do
         it 'is successful and update attributes' do
           post :update, id: file_set, file_set:
-            { title: ['new_title'], tag: [''], permissions_attributes: [{ type: 'person', name: 'archivist1', access: 'edit' }] }
+            { title: ['new_title'], keyword: [''], permissions_attributes: [{ type: 'person', name: 'archivist1', access: 'edit' }] }
           expect(response).to redirect_to main_app.curation_concerns_file_set_path(file_set)
           expect(assigns[:file_set].title).to eq(['new_title'])
         end
@@ -130,7 +130,7 @@ describe CurationConcerns::FileSetsController do
         it 'goes back to edit on an error' do
           allow_any_instance_of(FileSet).to receive(:valid?).and_return(false)
           post :update, id: file_set, file_set:
-            { title: ['new_title'], tag: [''], permissions_attributes: [{ type: 'person', name: 'archivist1', access: 'edit' }] }
+            { title: ['new_title'], keyword: [''], permissions_attributes: [{ type: 'person', name: 'archivist1', access: 'edit' }] }
           expect(response.status).to eq 422
           expect(response).to render_template('edit')
           expect(assigns[:groups]).to be_kind_of Array

data/spec/controllers/embargoes_controller_spec.rb

@@ -49,7 +49,7 @@ describe EmbargoesController do
 
     context 'when I have permission to edit the object' do
       before do
-        expect(CurationConcerns::EmbargoActor).to receive(:new).with(a_work).and_return(actor)
+        expect(CurationConcerns::Actors::EmbargoActor).to receive(:new).with(a_work).and_return(actor)
       end
 
       let(:actor) { double }

data/spec/controllers/leases_controller_spec.rb

@@ -50,7 +50,7 @@ describe LeasesController do
     context 'when I have permission to edit the object' do
       let(:actor) { double('lease actor') }
       before do
-        allow(CurationConcerns::LeaseActor).to receive(:new).with(a_work).and_return(actor)
+        allow(CurationConcerns::Actors::LeaseActor).to receive(:new).with(a_work).and_return(actor)
       end
 
       context 'that has no files' do

data/spec/factories/generic_works.rb

@@ -19,7 +19,7 @@ FactoryGirl.define do
 
     factory :work_with_one_file do
       before(:create) do |work, evaluator|
-        work.ordered_members << FactoryGirl.create(:file_set, user: evaluator.user, title: ['A Contained FileSet'], filename: 'filename.pdf')
+        work.ordered_members << FactoryGirl.create(:file_set, user: evaluator.user, title: ['A Contained FileSet'])
       end
     end
 

data/spec/features/add_file_spec.rb

@@ -8,7 +8,7 @@ feature 'Add an attached file' do
     sign_in user
     # stub out characterization. Travis doesn't have fits installed, and it's not relevant to the test.
     allow(CharacterizeJob).to receive(:perform_later)
-    allow_any_instance_of(CurationConcerns::FileSetActor).to receive(:acquire_lock_for).and_yield
+    allow_any_instance_of(CurationConcerns::Actors::FileSetActor).to receive(:acquire_lock_for).and_yield
   end
 
   it 'updates the file' do

data/spec/features/work_generator_spec.rb

@@ -16,7 +16,7 @@ feature 'Creating a new Work' do
     Rails::Generators.invoke('curation_concerns:work', ['Catapult'], destination_root: Rails.root)
     load "#{EngineCart.destination}/app/models/catapult.rb"
     load "#{EngineCart.destination}/app/controllers/curation_concerns/catapults_controller.rb"
-    load "#{EngineCart.destination}/app/actors/curation_concerns/catapult_actor.rb"
+    load "#{EngineCart.destination}/app/actors/curation_concerns/actors/catapult_actor.rb"
     load "#{EngineCart.destination}/app/forms/curation_concerns/catapult_form.rb"
     load "#{EngineCart.destination}/config/initializers/curation_concerns.rb"
     load "#{EngineCart.destination}/config/routes.rb"

data/spec/forms/collection_edit_form_spec.rb

@@ -8,7 +8,7 @@ describe CurationConcerns::Forms::CollectionEditForm do
     subject { form.terms }
     it do
       is_expected.to eq [:resource_type, :title, :creator, :contributor, :description,
-                         :tag, :rights, :publisher, :date_created, :subject, :language,
+                         :keyword, :rights, :publisher, :date_created, :subject, :language,
                          :representative_id, :thumbnail_id, :identifier, :based_near, :related_url, :visibility]
     end
   end
@@ -33,7 +33,7 @@ describe CurationConcerns::Forms::CollectionEditForm do
                             { creator: [] },
                             { contributor: [] },
                             { description: [] },
-                            { tag: [] },
+                            { keyword: [] },
                             { rights: [] },
                             { publisher: [] },
                             { date_created: [] },

data/spec/forms/file_set_edit_form_spec.rb

@@ -6,7 +6,7 @@ describe CurationConcerns::Forms::FileSetEditForm do
   describe '#terms' do
     it 'returns a list' do
       expect(subject.terms).to eq(
-        [:resource_type, :title, :creator, :contributor, :description, :tag,
+        [:resource_type, :title, :creator, :contributor, :description, :keyword,
          :rights, :publisher, :date_created, :subject, :language, :identifier,
          :based_near, :related_url,
          :visibility_during_embargo, :visibility_after_embargo, :embargo_release_date,

data/spec/forms/work_form_spec.rb

@@ -45,7 +45,7 @@ describe CurationConcerns::Forms::WorkForm do
       admin_set_id: '123',
       representative_id: '456',
       thumbnail_id: '789',
-      tag: ['derp'],
+      keyword: ['derp'],
       rights: 'http://creativecommons.org/licenses/by/3.0/us/')
     }
     subject { PirateShipForm.model_attributes(params) }
@@ -55,7 +55,7 @@ describe CurationConcerns::Forms::WorkForm do
       expect(subject['description']).to be_empty
       expect(subject['visibility']).to eq 'open'
       expect(subject['rights']).to eq ['http://creativecommons.org/licenses/by/3.0/us/']
-      expect(subject['tag']).to eq ['derp']
+      expect(subject['keyword']).to eq ['derp']
     end
 
     it 'excludes non-permitted params' do

data/spec/indexers/file_set_indexer_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe CurationConcerns::FileSetIndexer do
+  include CurationConcerns::FactoryHelpers
+
   let(:file_set) do
     FileSet.new(
       id: 'foo123',
@@ -19,20 +21,21 @@ describe CurationConcerns::FileSetIndexer do
       resource_type: ['Book'],
       identifier: ['urn:isbn:1234567890'],
       based_near: ['Medina, Saudi Arabia'],
-      related_url: ['http://example.org/TheWork/'],
-      mime_type: 'image/jpeg',
-      format_label: ['JPEG Image']) do |gf|
+      related_url: ['http://example.org/TheWork/']) do |gf|
         gf.full_text.content = 'abcxyz'
-        gf.height = ['500']
-        gf.width = ['600']
       end
   end
 
   let(:mock_file) do
-    mock_model("MockFile",
-               content: "asdf",
-               digest: ["urn:sha1:f794b23c0c6fe1083d0ca8b58261a078cd968967"]
-              )
+    mock_file_factory(
+      content: "asdf",
+      digest: ["urn:sha1:f794b23c0c6fe1083d0ca8b58261a078cd968967"],
+      mime_type: 'image/jpeg',
+      format_label: ['JPEG Image'],
+      height: ['500'],
+      width: ['600'],
+      file_size: ['12']
+    )
   end
   let(:indexer) { described_class.new(file_set) }
 

data/spec/jobs/import_url_job_spec.rb

@@ -28,7 +28,7 @@ describe ImportUrlJob do
     before do
       file_set.id = 'abc123'
       allow(file_set).to receive(:reload)
-      allow(CurationConcerns::FileSetActor).to receive(:new).with(file_set, user).and_return(actor)
+      allow(CurationConcerns::Actors::FileSetActor).to receive(:new).with(file_set, user).and_return(actor)
     end
 
     it 'creates the content' do
@@ -49,7 +49,7 @@ describe ImportUrlJob do
       file_set.save!
       allow(ActiveFedora::Base).to receive(:find).and_call_original
       allow(ActiveFedora::Base).to receive(:find).with(file_set_id).and_return(file_set)
-      allow_any_instance_of(CurationConcerns::FileSetActor).to receive(:create_content)
+      allow_any_instance_of(CurationConcerns::Actors::FileSetActor).to receive(:create_content)
       allow_any_instance_of(Ability).to receive(:can?).and_return(true)
       expect_any_instance_of(Net::HTTP).to receive(:request_get).with(file_hash).and_yield(mock_response)
     end

data/spec/jobs/ingest_local_file_job_spec.rb

@@ -11,7 +11,7 @@ describe IngestLocalFileJob do
   before do
     Dir.mkdir mock_upload_directory unless File.exist? mock_upload_directory
     FileUtils.copy(File.expand_path('../../fixtures/world.png', __FILE__), mock_upload_directory)
-    allow(CurationConcerns::FileSetActor).to receive(:new).with(file_set, user).and_return(actor)
+    allow(CurationConcerns::Actors::FileSetActor).to receive(:new).with(file_set, user).and_return(actor)
   end
 
   it 'has attached a file' do