curation_concerns 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 645a0115a0467d0f30efdb1f3a0ed2cde1805831
-  data.tar.gz: 04a720d015cc23c6537bfc5c603c8db8fba6d80c
+  metadata.gz: 486de7c9666ed5692b30a092358a383d973ba26e
+  data.tar.gz: 0e6d9c42e6ac2d775beb079586d49cd29786ea1e
 SHA512:
-  metadata.gz: 2cd5bad72161b60b7c83e52ccaf80082ffaeb24c912f522a1586273b74ed0cbc40923afd3336f0e991259d7c5076f788b275c0abb3b3594e88158d2eefac006c
-  data.tar.gz: db1f0f7b3de445a107da48e31d6755814437b5c194b683424c37fb2a9d2d65c66547f68d6136621bea2f54a2913d44046c60fac37897cc72850bf448fa35582d
+  metadata.gz: 43a18393765b33bf0d05993f2a3867e572901db5f25a4f6c6a373f515fe007c857d3ad4b21bab06c161964382b52f8f2deecd36fd64ce8742cb3305da981a745
+  data.tar.gz: 9a68911a9bac50570143d18bceaf09f2b6b1e15b556c588bedd14132a12bbe6871c812014b604ebe15b071bc04659cd301c8b1493e88d215fdeeb65e1c5f97ac

data/.rubocop.yml

@@ -56,8 +56,8 @@ Metrics/MethodLength:
 
 Metrics/ClassLength:
   Exclude:
+    - curation_concerns-models/lib/curation_concerns/configuration.rb
     - 'lib/generators/curation_concerns/templates/catalog_controller.rb'
-    - 'curation_concerns-models/app/models/datastreams/fits_datastream.rb'
     - 'curation_concerns-models/app/actors/curation_concerns/file_set_actor.rb'
 
 Metrics/ModuleLength:

data/README.md

@@ -46,8 +46,15 @@ To turn on virus detection, install clamav on your system and add the `clamav` g
 
 If you are modifying the curation_concerns gem and want to run the test suite, follow these steps to set up the test environment.
 
+    $ rake ci
+    
+Or you can do all the steps manually:
+
+    $ solr_wrapper -p 8985 -d solr/config/ --collection_name hydra-test
+    
+    # in another window
+    $ fcrepo_wrapper -p 8986 --no-jms
+    
+    # in another window
     $ rake engine_cart:generate
-    $ rake jetty:clean
-    $ rake jetty:config
-    $ rake jetty:start
-    $ rake spec
+    $ rake curation_concerns:spec

data/Rakefile

@@ -9,22 +9,29 @@ require 'active_fedora/rake_support'
 
 Dir.glob('tasks/*.rake').each { |r| import r }
 
-desc 'Run style checker'
-RuboCop::RakeTask.new(:rubocop) do |task|
-  task.requires << 'rubocop-rspec'
-  task.fail_on_error = true
+namespace :curation_concerns do
+  desc 'Run style checker'
+  RuboCop::RakeTask.new(:rubocop) do |task|
+    task.requires << 'rubocop-rspec'
+    task.fail_on_error = true
+  end
+
+  RSpec::Core::RakeTask.new(:rspec)
+
+  desc 'Run test suite'
+  task :spec do
+    with_test_server do
+      Rake::Task['curation_concerns:rspec'].invoke
+    end
+  end
 end
 
 desc 'Run test suite and style checker'
-task spec: :rubocop do
-  RSpec::Core::RakeTask.new(:spec)
-end
+task spec: ['curation_concerns:rubocop', 'curation_concerns:spec']
 
 desc 'Spin up Solr & Fedora and run the test suite'
 task ci: ['engine_cart:generate'] do
-  with_test_server do
-    Rake::Task['spec'].invoke
-  end
+  Rake::Task['spec'].invoke
 end
 
 task clean: 'engine_cart:clean'

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.9.0

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

@@ -34,9 +34,11 @@ module CurationConcerns::CurationConcernController
     if actor.create
       after_create_response
     else
-      setup_form
       respond_to do |wants|
-        wants.html { render 'new', status: :unprocessable_entity }
+        wants.html do
+          build_form
+          render 'new', status: :unprocessable_entity
+        end
         wants.json { render_json_response(response_type: :unprocessable_entity, options: { errors: curation_concern.errors }) }
       end
     end
@@ -68,7 +70,6 @@ module CurationConcerns::CurationConcernController
     if actor.update
       after_update_response
     else
-      setup_form
       respond_to do |wants|
         wants.html do
           build_form
@@ -117,12 +118,6 @@ module CurationConcerns::CurationConcernController
       @presenter ||= show_presenter.new(curation_concern_from_search_results, current_ability)
     end
 
-    # Override setup_form in concrete controllers to get the form ready for display
-    def setup_form
-      return unless curation_concern.respond_to?(:contributor) && curation_concern.contributor.blank?
-      curation_concern.contributor << current_user.user_key
-    end
-
     def _prefixes
       @_prefixes ||= super + ['curation_concerns/base']
     end

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

@@ -21,7 +21,7 @@ module CurationConcerns
         # For derivatives stored on the local file system
         response.headers['Accept-Ranges'] = 'bytes'
         response.headers['Content-Length'] = File.size(file).to_s
-        send_file file, type: mime_type_for(file), disposition: 'inline'
+        send_file file, derivative_download_options
       else
         render_404
       end
@@ -29,6 +29,12 @@ module CurationConcerns
 
     protected
 
+      # Override this method if you want to change the options sent when downloading
+      # a derivative file
+      def derivative_download_options
+        { type: mime_type_for(file), disposition: 'inline' }
+      end
+
       # Customize the :download ability in your Ability class, or override this method
       def authorize_download!
         # authorize! :download, file # can't use this because Hydra::Ability#download_permissions assumes that files are in Basic Container (and thus include the asset's uri)

data/app/forms/curation_concerns/forms/collection_edit_form.rb

@@ -18,6 +18,35 @@ module CurationConcerns
         model_class.validators_on(key).any? { |v| v.is_a? ActiveModel::Validations::PresenceValidator }
       end
 
+      # The form only supports a single value for title, so use the first
+      # @return [String] the first title
+      def title
+        model.title.first
+      end
+
+      # The form only supports a single value for description, so use the first
+      # @return [String] the first description
+      def description
+        model.description.first
+      end
+
+      # @param [Symbol] key the property to test for cardinality
+      # @return [FalseClass,TrueClass] whether the value on the form is singular or multipl
+      def self.multiple?(key)
+        return false if [:title, :description].include? key
+        super
+      end
+
+      # @param [ActiveSupport::Parameters]
+      # @return [Hash] a hash suitable for populating Collection attributes.
+      def self.model_attributes(_)
+        attrs = super
+        # cast title and description back to multivalued
+        attrs[:title] = Array(attrs[:title]) if attrs[:title]
+        attrs[:description] = Array(attrs[:description]) if attrs[:description]
+        attrs
+      end
+
       # @return [Hash] All generic files in the collection, file.to_s is the key, file.id is the value
       def select_files
         Hash[all_files]

data/app/helpers/curation_concerns/collections_helper.rb

@@ -1,8 +1,4 @@
 module CurationConcerns::CollectionsHelper
-  def has_collection_search_parameters?
-    params[:cq].present?
-  end
-
   def collection_modal_id(collectible)
     "#{collectible.to_param.tr(':', '-')}-modal"
   end

data/app/services/resource_types_service.rb

@@ -0,0 +1,20 @@
+module ResourceTypesService
+  mattr_accessor :authority
+  self.authority = Qa::Authorities::Local.subauthority_for('resource_types')
+
+  def self.select_options
+    authority.all.map do |element|
+      [element[:label], element[:id]]
+    end
+  end
+
+  def self.label(id)
+    authority.find(id).fetch('term')
+  end
+
+  # @param [String] id identifier of the resource type
+  def self.microdata_type(id)
+    I18n.t("curation_concerns.schema_org.resource_type.#{id}",
+           default: CurationConcerns.config.microdata_default_type)
+  end
+end

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

@@ -7,13 +7,13 @@
 <div id="content">
   <h1 class="lower"><%= @presenter.title %></h1>
 
-  <%= render 'curation_concerns/base/representative_media', work: @presenter %>
+  <%= render 'curation_concerns/base/representative_media', presenter: @presenter %>
 
   <h3><%= @presenter.description %> </h3>
 
   <% unless has_collection_search_parameters? %>
-    <%= render partial: 'collections/show_actions' %>
-    <%= render 'attributes', curation_concern: @presenter %>
+    <%= render 'collections/show_actions' %>
+    <%= render 'attributes', presenter: @presenter %>
   <% end %>
 
   <%= render 'search_form' %>

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

@@ -1,7 +1,7 @@
-  <%= @presenter.attribute_to_html(:description) %>
-  <%= @presenter.attribute_to_html(:creator, catalog_search_link: true ) %>
-  <%= @presenter.attribute_to_html(:contributor, label: 'Contributors', catalog_search_link: true) %>
-  <%= @presenter.attribute_to_html(:subject, catalog_search_link: true) %>
-  <%= @presenter.attribute_to_html(:publisher) %>
-  <%= @presenter.attribute_to_html(:language) %>
+  <%= presenter.attribute_to_html(:description) %>
+  <%= presenter.attribute_to_html(:creator, catalog_search_link: true ) %>
+  <%= presenter.attribute_to_html(:contributor, label: 'Contributors', catalog_search_link: true) %>
+  <%= presenter.attribute_to_html(:subject, catalog_search_link: true) %>
+  <%= presenter.attribute_to_html(:publisher) %>
+  <%= presenter.attribute_to_html(:language) %>
 

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

@@ -1,18 +1,18 @@
-<table class="table table-striped <%= dom_class(@presenter) %> attributes" <%= @presenter.microdata_type_to_html %>>
+<table class="table table-striped <%= dom_class(presenter) %> attributes" <%= presenter.microdata_type_to_html %>>
   <caption class="table-heading"><h2>Attributes</h2></caption>
   <thead>
     <tr><th>Attribute Name</th><th>Values</th></tr>
   </thead>
   <tbody>
-    <%= render 'attribute_rows' %>
+    <%= render 'attribute_rows', presenter: presenter %>
   <tr>
     <th>Visibility</th>
     <td>
-      <%= @presenter.permission_badge %>
+      <%= presenter.permission_badge %>
     </td>
   </tr>
-  <%= @presenter.attribute_to_html(:embargo_release_date) %>
-  <%= @presenter.attribute_to_html(:lease_expiration_date) %>
-  <%= @presenter.attribute_to_html(:rights) %>
+  <%= presenter.attribute_to_html(:embargo_release_date) %>
+  <%= presenter.attribute_to_html(:lease_expiration_date) %>
+  <%= presenter.attribute_to_html(:rights) %>
   </tbody>
 </table>

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

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

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

@@ -6,8 +6,8 @@
 <% collector = can?(:collect, @presenter.id) %>
 <% editor    = can?(:edit,    @presenter.id) %>
 
-<%= render 'representative_media', work: @presenter %>
-<%= render 'attributes', curation_concern: @presenter %>
+<%= render 'representative_media', presenter: @presenter %>
+<%= render "attributes", presenter: @presenter %>
 <%= render 'related_files', presenter: @presenter %>
 <% if editor %>
   <%= render 'multiple_upload', presenter: @presenter %>

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

@@ -0,0 +1,8 @@
+  <div class="form-actions">
+    <%= link_to "Download this File", main_app.download_path(presenter), class: 'btn btn-default' %>
+    <% if can? :edit, presenter.id %>
+      <%= link_to "Edit this File", edit_polymorphic_path([main_app, presenter]), class: 'btn btn-default'  %>
+    <% end %>
+
+    <%= link_to "Back to #{parent.human_readable_type}", parent_path(parent), class: 'btn btn-default' %>
+  </div>

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

@@ -3,13 +3,5 @@
   <h1>File Details <small><%= @presenter.title %></small></h1>
 <% end %>
 <%= media_display @presenter %>
-<%= render "attributes", curation_concern: @presenter %>
-
-  <div class="form-actions">
-    <%= link_to "Download this File", main_app.download_path(@presenter), class: 'btn btn-default' %>
-    <% if can? :edit, @presenter.id %>
-      <%= link_to "Edit this File", edit_polymorphic_path([main_app, @presenter]), class: 'btn btn-default'  %>
-    <% end %>
-
-    <%= link_to "Back to #{parent.human_readable_type}", parent_path(parent), class: 'btn btn-default' %>
-  </div>
+<%= render "attributes", presenter: @presenter %>
+<%= render "show_actions", presenter: @presenter, parent: parent %>

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

@@ -6,5 +6,5 @@
     </p>
   <h2> Descriptions:</h2>
 
-  <%= render 'attributes' %>
+  <%= render 'attributes', presenter: @presenter %>
 </div>

data/lib/curation_concerns/version.rb

@@ -1,3 +1,3 @@
 module CurationConcerns
-  VERSION = "0.8.0".freeze
+  VERSION = "0.9.0".freeze
 end

data/lib/generators/curation_concerns/install_generator.rb

@@ -14,6 +14,7 @@ module CurationConcerns
    6. Copies the catalog controller into the local app
    7. Adds CurationConcerns::SolrDocumentBehavior to app/models/solr_document.rb
    8. Adds config/authorities/rights.yml to the application
+   9. Adds config/authorities/resource_types.yml to the application
          '
 
     def run_required_generators
@@ -102,5 +103,9 @@ module CurationConcerns
     def rights_config
       copy_file "config/authorities/rights.yml", "config/authorities/rights.yml"
     end
+
+    def resource_types_config
+      copy_file "config/authorities/resource_types.yml", "config/authorities/resource_types.yml"
+    end
   end
 end

data/lib/generators/curation_concerns/templates/config/authorities/resource_types.yml

@@ -0,0 +1,41 @@
+terms:
+  - id: Article
+    term: Article
+  - id: Audio
+    term: Audio
+  - id: Book
+    term: Book
+  - id: Capstone Project
+    term: Capstone Project
+  - id: Conference Proceeding
+    term: Conference Proceeding
+  - id: Dataset
+    term: Dataset
+  - id: Dissertation
+    term: Dissertation
+  - id: Image
+    term: Image
+  - id: Journal
+    term: Journal
+  - id: Map or Cartographic Material
+    term: Map or Cartographic Material
+  - id: Masters Thesis
+    term: Masters Thesis
+  - id: Part of Book
+    term: Part of Book
+  - id: Poster
+    term: Poster
+  - id: Presentation
+    term: Presentation
+  - id: Project
+    term: Project
+  - id: Report
+    term: Report
+  - id: Research Paper
+    term: Research Paper
+  - id: Software or Program Code
+    term: Software or Program Code
+  - id: Video
+    term: Video
+  - id: Other
+    term: Other

data/lib/generators/curation_concerns/work/templates/README

@@ -8,6 +8,6 @@ After creating your work you may wish to:
       CurationConcerns::GenericWorksController; This means that it will use the
       views found in CurationConcerns::Engine.root/app/views/curation_concerns/base.
 
-  2. Modify the model and datastreams
+  2. Modify the model, actor, form or presenter.
 
 ===============================================================================

data/lib/tasks/curation_concerns.rake

@@ -0,0 +1,10 @@
+namespace :curation_concerns do
+  desc 'Print a count of each object type'
+  task count: [:environment] do
+    Rails.application.eager_load!
+    puts "Number of objects in fedora:"
+    ActiveFedora::Base.descendants.each do |model|
+      puts "  #{model}: #{model.count}"
+    end
+  end
+end

data/spec/actors/curation_concerns/file_actor_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe CurationConcerns::FileActor do
+  include ActionDispatch::TestProcess
+  let(:user) { create(:user) }
+  let(:file_set) { create(:file_set) }
+  let(:relation) { create(:file_set) }
+  let(:actor) { described_class.new(file_set, 'remastered', user) }
+  let(:uploaded_file) { fixture_file_upload('/world.png', 'image/png') }
+
+  describe '#ingest_file' do
+    it 'calls ingest file job' do
+      expect(CharacterizeJob).to receive(:perform_later)
+      expect(IngestFileJob).to receive(:perform_later).with(file_set.id, /world\.png$/, 'image/png', user.user_key, 'remastered')
+      actor.ingest_file(uploaded_file)
+    end
+  end
+end

data/spec/actors/curation_concerns/file_set_actor_spec.rb

@@ -22,7 +22,7 @@ describe CurationConcerns::FileSetActor do
 
     before do
       expect(CharacterizeJob).to receive(:perform_later)
-      expect(IngestFileJob).to receive(:perform_later).with(file_set.id, /world\.png$/, 'image/png', user.user_key)
+      expect(IngestFileJob).to receive(:perform_later).with(file_set.id, /world\.png$/, 'image/png', user.user_key, 'original_file')
       allow(actor).to receive(:acquire_lock_for).and_yield
       actor.create_metadata(work)
       actor.create_content(uploaded_file)
@@ -68,10 +68,18 @@ describe CurationConcerns::FileSetActor do
   describe '#create_content' do
     it 'calls ingest file job' do
       expect(CharacterizeJob).to receive(:perform_later)
-      expect(IngestFileJob).to receive(:perform_later).with(file_set.id, /world\.png$/, 'image/png', user.user_key)
+      expect(IngestFileJob).to receive(:perform_later).with(file_set.id, /world\.png$/, 'image/png', user.user_key, 'original_file')
       actor.create_content(uploaded_file)
     end
 
+    context 'when an alternative relationship is specified' do
+      it 'calls ingest file job' do
+        expect(CharacterizeJob).to receive(:perform_later)
+        expect(IngestFileJob).to receive(:perform_later).with(file_set.id, /world\.png$/, 'image/png', user.user_key, 'remastered')
+        actor.create_content(uploaded_file, 'remastered')
+      end
+    end
+
     context 'using ::File' do
       before do
         allow(CharacterizeJob).to receive(:perform_later)

data/spec/controllers/curation_concerns/collections_controller_spec.rb

@@ -6,14 +6,24 @@ describe CollectionsController do
     allow_any_instance_of(User).to receive(:groups).and_return([])
   end
 
-  let(:user) { FactoryGirl.create(:user) }
-  let(:asset1) { FactoryGirl.build(:generic_work, title: ['First of the Assets'], user: user) }
-  let(:asset2) { FactoryGirl.build(:generic_work, title: ['Second of the Assets'], user: user, depositor: user.user_key) }
-  let(:asset3) { FactoryGirl.build(:generic_work, title: ['Third of the Assets']) }
-  let!(:asset4) { FactoryGirl.create(:generic_work, title: ['Fourth of the Assets'], user: user) }
-  let(:bogus_depositor_asset) { FactoryGirl.create(:generic_work, title: ['Bogus Asset'], depositor: 'abc') }
-  let(:collection_attrs) { FactoryGirl.attributes_for(:collection, title: 'My First Collection ', description: "The Description\r\n\r\nand more") }
-  let(:collection) { FactoryGirl.create(:collection, title: 'Collection Title', user: user) }
+  let(:user) { create(:user) }
+  let(:asset1) { build(:generic_work, title: ['First of the Assets'], user: user) }
+  let(:asset2) { build(:generic_work,
+                       title: ['Second of the Assets'],
+                       user: user,
+                       depositor: user.user_key) }
+  let(:asset3) { build(:generic_work, title: ['Third of the Assets']) }
+  let!(:asset4) { create(:generic_work,
+                         title: ['Fourth of the Assets'],
+                         user: user) }
+  let(:bogus_depositor_asset) { create(:generic_work,
+                                       title: ['Bogus Asset'],
+                                       depositor: 'abc') }
+  let(:collection_attrs) do
+    { title: 'My First Collection', description: "The Description\r\n\r\nand more" }
+  end
+
+  let(:collection) { create(:collection, title: ['Collection Title'], user: user) }
 
   describe '#new' do
     before do
@@ -42,7 +52,7 @@ describe CollectionsController do
       expect do
         post :create, collection: collection_attrs.merge(creator: [''])
       end.to change { Collection.count }.by(1)
-      expect(assigns[:collection].title).to eq('My First Collection ')
+      expect(assigns[:collection].title).to eq ['My First Collection']
       expect(assigns[:collection].creator).to eq([])
     end
 
@@ -138,7 +148,7 @@ describe CollectionsController do
 
       it 'removes blank strings from params before updating Collection metadata' do
         put :update, id: collection, collection: collection_attrs.merge(creator: [''])
-        expect(assigns[:collection].title).to eq('My First Collection ')
+        expect(assigns[:collection].title).to eq ['My First Collection']
         expect(assigns[:collection].creator).to eq([])
       end
     end
@@ -160,7 +170,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].title).to eq 'Collection Title'
         expect(assigns[:member_docs].map(&:id)).to match_array [asset1, asset2, asset3].map(&:id)
       end
 
@@ -169,7 +179,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].title).to eq 'Collection Title'
         end
       end
     end

data/spec/controllers/curation_concerns/generic_works_controller_spec.rb

@@ -62,11 +62,24 @@ describe CurationConcerns::GenericWorksController do
   end
 
   describe '#create' do
-    it 'creates a work' do
-      expect do
+    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'] }
-      end.to change { GenericWork.count }.by(1)
-      expect(response).to redirect_to main_app.curation_concerns_generic_work_path(assigns[:curation_concern])
+        expect(response).to redirect_to main_app.curation_concerns_generic_work_path(work)
+      end
+    end
+
+    context 'when create fails' do
+      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
+        expect(response).to render_template 'new'
+      end
     end
 
     context 'when not authorized' do

data/spec/controllers/downloads_controller_spec.rb

@@ -73,4 +73,12 @@ describe DownloadsController do
       end
     end
   end
+
+  describe "derivative_download_options" do
+    before do
+      allow(controller).to receive(:default_file).and_return 'world.png'
+    end
+    subject { controller.send(:derivative_download_options) }
+    it { is_expected.to eq(disposition: 'inline', type: 'image/png') }
+  end
 end

data/spec/factories/collections.rb

@@ -6,7 +6,7 @@ FactoryGirl.define do
       user { FactoryGirl.create(:user) }
     end
 
-    title 'Test collection title'
+    title ['Test collection title']
 
     after(:build) do |collection, evaluator|
       collection.apply_depositor_metadata(evaluator.user.user_key)

data/spec/features/catalog_search_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 feature 'Catalog index page' do
   let!(:work) { create(:public_generic_work, title: ['My Work']) }
-  let!(:coll) { create(:collection, :public, title: 'My Collection') }
+  let!(:coll) { create(:collection, :public, title: ['My Collection']) }
 
   scenario 'Browse the catalog using filter tabs' do
     visit search_catalog_path

data/spec/features/collection_spec.rb

@@ -17,17 +17,10 @@ describe 'collection' do
   let(:title2) { 'Test Collection 2' }
   let(:description2) { 'Description for collection 2 we are testing.' }
 
-  let(:user) { FactoryGirl.create(:user, email: 'user1@example.com') }
+  let(:user) { create(:user, email: 'user1@example.com') }
   let(:user_key) { user.user_key }
-  let(:generic_works) do
-    (0..12).map do |x|
-      GenericWork.create!(title: ["title #{x}"]) do |f|
-        f.apply_depositor_metadata('user1@example.com')
-      end
-    end
-  end
-  let(:gw1) { generic_works[0] }
-  let(:gw2) { generic_works[1] }
+  let(:gw1) { create(:generic_work, user: user, title: ['First test work']) }
+  let(:gw2) { create(:generic_work, user: user, title: ['Second test work']) }
 
   before(:all) do
     @old_resque_inline_value = Resque.inline
@@ -64,91 +57,87 @@ describe 'collection' do
   end
 
   describe 'delete collection' do
+    let!(:collection) do
+      create(:collection, user: user)
+    end
+
     before do
-      @collection = Collection.new title: 'collection title'
-      @collection.description = 'collection description'
-      @collection.apply_depositor_metadata(user_key)
-      @collection.save
       sign_in user
       visit main_app.search_catalog_path('f[generic_type_sim][]' => 'Collection', works: 'mine')
     end
 
     it 'deletes a collection' do
-      expect(page).to have_content(@collection.title)
-      within("#document_#{@collection.id}") do
+      expect(page).to have_content 'Test collection title'
+      within("#document_#{collection.id}") do
         first('.itemtrash').click
       end
-      expect(page).to_not have_content(@collection.title)
+      expect(page).not_to have_content 'Test collection title'
       expect(page).to have_content('Collection was successfully deleted.')
     end
   end
 
   describe 'show collection' do
+    let!(:collection) do
+      create(:collection, user: user, description: ['collection description'], members: [gw1, gw2])
+    end
+
     before do
-      @collection = FactoryGirl.create(:collection, user: user, title: 'collection title', description: 'collection description')
-      # @collection = Collection.new title: 'collection title'
-      # @collection.description = ['collection description']
-      # @collection.apply_depositor_metadata(user_key)
-      @collection.members = [gw1, gw2]
-      @collection.save
       sign_in user
       visit search_path_for_my_collections
     end
 
     it 'shows a collection with a listing of Descriptive Metadata and catalog-style search results' do
-      expect(page).to have_content(@collection.title)
-      within('#document_' + @collection.id) do
+      expect(page).to have_content 'Test collection title'
+      within('#document_' + collection.id) do
         click_link('collection title')
       end
-      expect(page).to have_content(@collection.title)
-      expect(page).to have_content(@collection.description)
+      expect(page).to have_content 'Test collection title'
+      expect(page).to have_content 'collection description'
       # Should have search results / contents listing
       expect(page).to have_content(gw1.title.first)
       expect(page).to have_content(gw2.title.first)
-      expect(page).to_not have_css('.pager')
+      expect(page).not_to have_css('.pager')
     end
 
     it 'hides collection descriptive metadata when searching a collection' do
-      expect(page).to have_content(@collection.title)
-      within("#document_#{@collection.id}") do
+      expect(page).to have_content 'Test collection title'
+      within("#document_#{collection.id}") do
         click_link('collection title')
       end
-      expect(page).to have_content(@collection.title)
-      expect(page).to have_content(@collection.description)
+      expect(page).to have_content 'Test collection title'
+      expect(page).to have_content 'collection description'
       expect(page).to have_content(gw1.title.first)
       expect(page).to have_content(gw2.title.first)
       fill_in('collection_search', with: gw1.title.first)
       click_button('collection_submit')
       # Should not have Collection Descriptive metadata table
-      expect(page).to_not have_content('Descriptions')
-      expect(page).to have_content(@collection.title)
-      expect(page).to have_content(@collection.description)
+      expect(page).not_to have_content('Descriptions')
+      expect(page).to have_content 'Test collection title'
+      expect(page).to have_content 'collection description'
       # Should have search results / contents listing
       expect(page).to have_content(gw1.title.first)
-      expect(page).to_not have_content(gw2.title.first)
+      expect(page).to have_content(gw2.title.first)
       # Should not have Dashboard content in contents listing
-      expect(page).to_not have_content('Visibility')
+      expect(page).not_to have_content('Visibility')
     end
   end
 
   describe 'edit collection' do
+    let!(:collection) do
+      create(:collection, user: user, description: ['collection description'], members: [gw1, gw2])
+    end
     before do
-      @collection = Collection.new(title: 'Awesome Title')
-      @collection.description = 'collection description'
-      @collection.apply_depositor_metadata(user_key)
-      @collection.members = [gw1, gw2]
-      @collection.save
       sign_in user
       visit search_path_for_my_collections
     end
 
     it 'edits and update collection metadata' do
-      expect(page).to have_content(@collection.title)
-      within("#document_#{@collection.id}") do
+      expect(page).to have_content 'Test collection title'
+      within("#document_#{collection.id}") do
         click_link('Edit Collection')
       end
-      expect(page).to have_field('collection_title', with: @collection.title)
-      expect(page).to have_field('collection_description', with: @collection.description)
+      expect(page).to have_field('collection_title', with: 'Test collection title')
+      expect(page).to have_field('collection_description', with: 'collection description')
       new_title = 'Altered Title'
       new_description = 'Completely new Description text.'
       creators = ['Dorje Trollo', 'Vajrayogini']
@@ -158,8 +147,8 @@ describe 'collection' do
       # within('.form-actions') do
       click_button('Update Collection')
       # end
-      expect(page).to_not have_content(@collection.title)
-      expect(page).to_not have_content(@collection.description)
+      expect(page).not_to have_content 'Test collection title'
+      expect(page).not_to have_content 'collection description'
       expect(page).to have_content(new_title)
       expect(page).to have_content(new_description)
       expect(page).to have_content(creators.first)
@@ -167,7 +156,7 @@ describe 'collection' do
 
     context "when there are errors" do
       it "displays them" do
-        within("#document_#{@collection.id}") do
+        within("#document_#{collection.id}") do
           click_link('Edit Collection')
         end
         fill_in 'Title', with: ''
@@ -177,72 +166,74 @@ describe 'collection' do
     end
 
     it 'removes a work from a collection from edit page' do
-      expect(page).to have_content(@collection.title)
-      within("#document_#{@collection.id}") do
+      expect(page).to have_content 'Test collection title'
+      within("#document_#{collection.id}") do
         click_link('Edit Collection')
       end
-      expect(page).to have_field('collection_title', with: @collection.title)
-      expect(page).to have_field('collection_description', with: @collection.description)
+      expect(page).to have_field 'collection_title', with: 'Test collection title'
+      expect(page).to have_field 'collection_description', with: 'collection description'
       expect(page).to have_content(gw1.title.first)
       expect(page).to have_content(gw2.title.first)
       within("#document_#{gw1.id}") do
         click_link('Remove From Collection')
       end
-      expect(page).to have_content(@collection.title)
-      expect(page).to have_content(@collection.description)
-      expect(page).to_not have_content(gw1.title.first)
+      expect(page).to have_content 'Test collection title'
+      expect(page).to have_content 'collection description'
+      expect(page).not_to have_content(gw1.title.first)
       expect(page).to have_content(gw2.title.first)
     end
 
     it 'removes a work from a collection from show page' do
-      expect(page).to have_content(@collection.title)
-      within('#document_' + @collection.id) do
-        click_link(@collection.title)
+      expect(page).to have_content 'Test collection title'
+      within('#document_' + collection.id) do
+        click_link 'Test collection title'
       end
       expect(page).to have_content(gw1.title.first)
       expect(page).to have_content(gw2.title.first)
       within("#document_#{gw1.id}") do
         click_link('Remove From Collection')
       end
-      expect(page).to have_content(@collection.title)
-      expect(page).to have_content(@collection.description)
-      expect(page).to_not have_content(gw1.title.first)
+      expect(page).to have_content 'Test collection title'
+      expect(page).to have_content 'collection description'
+      expect(page).not_to have_content(gw1.title.first)
       expect(page).to have_content(gw2.title.first)
     end
 
     it 'removes all works from a collection' do
       skip 'This is from Sufia, not sure if it should be here.'
-      expect(page).to have_content(@collection.title)
-      within('#document_' + @collection.id) do
+      expect(page).to have_content 'Test collection title'
+      within('#document_' + collection.id) do
         click_link('Edit Collection')
       end
-      expect(page).to have_field('collection_title', with: @collection.title)
-      expect(page).to have_field('collection_description', with: @collection.description)
+      expect(page).to have_field 'collection_title', with: 'Test collection title'
+      expect(page).to have_field 'collection_description', with: 'collection description'
       expect(page).to have_content(gw1.title.first)
       expect(page).to have_content(gw2.title.first)
       first('input#check_all').click
       click_link('Remove From Collection')
-      expect(page).to have_content(@collection.title)
-      expect(page).to have_content(@collection.description)
-      expect(page).to_not have_content(gw1.title.first)
-      expect(page).to_not have_content(gw2.title.first)
+      expect(page).to have_content 'Test collection title'
+      expect(page).to have_content 'collection description'
+      expect(page).not_to have_content(gw1.title.first)
+      expect(page).not_to have_content(gw2.title.first)
     end
   end
 
   describe 'show pages of a collection' do
+    let(:generic_works) do
+      (0..12).map { create(:generic_work, user: user) }
+    end
+    let!(:collection) do
+      create(:collection, user: user, description: ['collection description'], members: generic_works)
+    end
+
     before do
-      @collection = Collection.new title: 'collection title'
-      @collection.description = 'collection description'
-      @collection.apply_depositor_metadata(user_key)
-      @collection.members = generic_works
-      @collection.save!
       sign_in user
       visit search_path_for_my_collections
     end
 
     it 'shows a collection with a listing of Descriptive Metadata and catalog-style search results' do
-      expect(page).to have_content(@collection.title)
-      within('#document_' + @collection.id) do
+      expect(page).to have_content 'Test collection title'
+      within('#document_' + collection.id) do
         click_link('collection title')
       end
       expect(page).to have_css('.pager')

data/spec/forms/collection_edit_form_spec.rb

@@ -65,9 +65,7 @@ describe CurationConcerns::Forms::CollectionEditForm do
       let(:title) { work.file_sets.first.title.first }
       let(:file_id) { work.file_sets.first.id }
       let(:collection_with_file) do
-        Collection.create!(title: 'foo', members: [work]) do |c|
-          c.apply_depositor_metadata('jcoyne')
-        end
+        create(:collection, members: [work])
       end
 
       it 'returns a hash of with file title as key and file id as value' do

data/spec/helpers/curation_concerns/collections_helper_spec.rb

@@ -35,14 +35,14 @@ describe CurationConcerns::CollectionsHelper do
     before do
       allow(helper).to receive(:current_user).and_return(user)
     end
-    let(:user) { FactoryGirl.create(:user) }
-    let!(:collection1) { FactoryGirl.create(:collection, user: user, title: 'One') }
-    let!(:collection2) { FactoryGirl.create(:collection, user: user, title: 'Two') }
-    let!(:collection3) { FactoryGirl.create(:collection, user: user, title: 'Three') }
+    let(:user) { create(:user) }
+    let!(:collection1) { create(:collection, user: user, title: ['One']) }
+    let!(:collection2) { create(:collection, user: user, title: ['Two']) }
+    let!(:collection3) { create(:collection, user: user, title: ['Three']) }
     subject { helper.collection_options_for_select(collection2) }
 
     it 'excludes the passed in collection' do
-      expect(subject).to eq "<option value=\"#{collection1.id}\">#{collection1.title}</option>\n<option value=\"#{collection3.id}\">#{collection3.title}</option>"
+      expect(subject).to eq "<option value=\"#{collection1.id}\">One</option>\n<option value=\"#{collection3.id}\">Three</option>"
     end
   end
 end

data/spec/helpers/url_helper_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe CurationConcerns::UrlHelper do
-  let(:profile) { ["{\"datastreams\":{}}"] }
+  let(:profile) { ["{}"] }
   let(:work) { create(:generic_work) }
   let(:document) { SolrDocument.new(work.to_solr) }
   subject { helper.url_for_document document }

data/spec/inputs/select_with_help_input_spec.rb

@@ -11,7 +11,7 @@ describe 'SelectWithHelpInput', type: :input do
     end
   end
   let(:form) { form_class.new(FileSet.new) }
-  let(:collection) { CurationConcerns.config.resource_types }
+  let(:collection) { ResourceTypesService.select_options }
   let(:base_options) do
     { as: :select_with_help, collection: collection,
       input_html: { class: 'form-control', multiple: true } }

data/spec/jobs/import_url_job_spec.rb

@@ -30,7 +30,7 @@ describe ImportUrlJob do
       allow(CurationConcerns::FileSetActor).to receive(:new).with(file_set, user).and_return(actor)
     end
 
-    it 'creates a content datastream' do
+    it 'creates the content' do
       expect_any_instance_of(Net::HTTP).to receive(:request_get).with(file_hash).and_yield(mock_response)
       expect(actor).to receive(:create_content).and_return(true)
       described_class.perform_now(file_set_id)

data/spec/jobs/ingest_file_job_spec.rb

@@ -5,8 +5,28 @@ describe IngestFileJob do
   let(:filename) { fixture_file_path('/world.png') }
   let(:user)     { create(:user) }
 
-  context 'when givin a mime_type' do
-    it 'uses a provided mime_type' do
+  context 'when given a relationship' do
+    before do
+      class FileSetWithExtras < FileSet
+        directly_contains_one :remastered, through: :files, type: ::RDF::URI('http://pcdm.org/use#IntermediateFile'), class_name: 'Hydra::PCDM::File'
+      end
+    end
+    let(:file_set) do
+      FileSetWithExtras.create!(attributes_for(:file_set)) do |file|
+        file.apply_depositor_metadata(user.user_key)
+      end
+    end
+    after do
+      Object.send(:remove_const, :FileSetWithExtras)
+    end
+    it 'uses the provided relationship' do
+      described_class.perform_now(file_set.id, filename, 'image/png', 'bob', 'remastered')
+      expect(file_set.reload.remastered.mime_type).to eq 'image/png'
+    end
+  end
+
+  context 'when given a mime_type' do
+    it 'uses the provided mime_type' do
       described_class.perform_now(file_set.id, filename, 'image/png', 'bob')
       expect(file_set.reload.original_file.mime_type).to eq 'image/png'
     end
@@ -48,7 +68,7 @@ describe IngestFileJob do
     end
   end
 
-  describe "the after_create_contentcallback" do
+  describe "the after_create_content callback" do
     subject { CurationConcerns.config.callback }
     it 'runs with file_set and user arguments' do
       expect(subject).to receive(:run).with(:after_create_content, file_set, user)

data/spec/models/checksum_audit_log_spec.rb

@@ -25,7 +25,7 @@ describe ChecksumAuditLog do
   let(:new) { described_class.create(file_set_id: f.id, file_id: content_id, version: version_uri, pass: 0, created_at: 1.minute.ago) }
 
   context 'a file with multiple checksums audits' do
-    specify 'should return a list of logs for this datastream sorted by date descending' do
+    it 'returns a list of logs for this FileSet sorted by date descending' do
       logs = described_class.logs_for(f.id, content_id)
       expect(logs).to eq([new, old])
     end

data/spec/presenters/curation_concerns/collection_presenter_spec.rb

@@ -1,8 +1,13 @@
 require 'spec_helper'
 
 describe CurationConcerns::CollectionPresenter do
-  let(:collection) { Collection.new(id: 'adc12v', description: 'a nice collection', title: 'A clever title') }
-  let(:work) { FactoryGirl.build(:work, title: ['unimaginitive title']) }
+  let(:collection) do
+    build(:collection,
+          id: 'adc12v',
+          description: ['a nice collection'],
+          title: ['A clever title'])
+  end
+  let(:work) { build(:work, title: ['unimaginitive title']) }
   let(:solr_document) { SolrDocument.new(collection.to_solr) }
   let(:ability) { double }
   let(:presenter) { described_class.new(solr_document, ability) }

data/spec/search_builders/resource_types_service_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe ResourceTypesService do
+  describe "select_options" do
+    subject { described_class.select_options }
+
+    it "has a select list" do
+      expect(subject.first).to eq ["Article", "Article"]
+      expect(subject.size).to eq 20
+    end
+  end
+
+  describe "label" do
+    subject { described_class.label("Video") }
+
+    it { is_expected.to eq 'Video' }
+  end
+
+  describe "microdata_type" do
+    subject { described_class.microdata_type(id) }
+
+    context "when the id is in the i18n" do
+      let(:id) { "Map or Cartographic Material" }
+      it { is_expected.to eq 'http://schema.org/Map' }
+    end
+
+    context "when the id is not in the i18n" do
+      let(:id) { "missing" }
+      it { is_expected.to eq 'http://schema.org/CreativeWork' }
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -33,6 +33,7 @@ if ENV['COVERAGE'] || $in_travis
   SimpleCov.start('rails') do
     add_filter '/spec'
     add_filter '/lib/generators/curation_concerns/templates'
+    add_filter '/lib/generators/curation_concerns/install_generator.rb'
     add_filter '/.internal_test_app'
   end
   SimpleCov.command_name('spec')

data/spec/views/catalog/index.html.erb_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'catalog/index.html.erb' do
-  let(:collection) { stub_model(Collection, title: 'collection1', id: 'abc123') }
+  let(:collection) { stub_model(Collection, title: ['collection1'], id: 'abc123') }
   let(:doc) { SolrDocument.new(collection.to_solr) }
   let(:search_state) { double('SearchState', to_h: {}) }
   let(:blacklight_configuration_context) do
@@ -44,7 +44,7 @@ describe 'catalog/index.html.erb' do
     it 'appears on page without error' do
       render
       page = Capybara::Node::Simple.new(rendered)
-      expect(page).to have_link(collection.title)
+      expect(page).to have_link 'collection1'
       expect(page).to have_content 'List of items deposited'
     end
   end
@@ -55,7 +55,7 @@ describe 'catalog/index.html.erb' do
     it 'appears on page without error' do
       render
       page = Capybara::Node::Simple.new(rendered)
-      expect(page).to have_link(collection.title)
+      expect(page).to have_link 'collection1'
       expect(page).to have_content 'List of items deposited'
     end
   end

data/spec/views/curation_concerns/base/_attributes.html.erb_spec.rb

@@ -19,8 +19,7 @@ describe 'curation_concerns/base/_attributes.html.erb' do
   before do
     allow(view).to receive(:dom_class) { '' }
 
-    assign(:presenter, presenter)
-    render
+    render 'curation_concerns/base/attributes', presenter: presenter
   end
 
   it 'has links to search for other objects with the same metadata' do

data/spec/views/curation_concerns/file_sets/show.html.erb_spec.rb

@@ -31,7 +31,7 @@ describe 'curation_concerns/file_sets/show.html.erb', type: :view do
   let(:presenter) { CurationConcerns::FileSetPresenter.new(solr_doc, ability) }
 
   before do
-    view.lookup_context.view_paths.push CurationConcerns::Engine.root + 'app/views/curation_concerns/base'
+    view.lookup_context.prefixes.push 'curation_concerns/base'
     allow(view).to receive(:can?).with(:edit, String).and_return(true)
     assign(:presenter, presenter)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curation_concerns
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-16 00:00:00.000000000 Z
+date: 2016-02-25 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.8.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: hydra-editor
   requirement: !ruby/object:Gem::Requirement
@@ -532,6 +532,7 @@ files:
 - app/services/curation_concerns/lease_service.rb
 - app/services/curation_concerns/parent_service.rb
 - app/services/curation_concerns/restriction_service.rb
+- app/services/resource_types_service.rb
 - app/services/rights_service.rb
 - app/views/catalog/_action_menu_partials/_collection.html.erb
 - app/views/catalog/_action_menu_partials/_default.html.erb
@@ -614,6 +615,7 @@ files:
 - app/views/curation_concerns/file_sets/_file_set.html.erb
 - app/views/curation_concerns/file_sets/_form.html.erb
 - app/views/curation_concerns/file_sets/_rights_modal.html.erb
+- app/views/curation_concerns/file_sets/_show_actions.html.erb
 - app/views/curation_concerns/file_sets/edit.html.erb
 - app/views/curation_concerns/file_sets/jq_upload.json.jbuilder
 - app/views/curation_concerns/file_sets/media_display/_audio.html.erb
@@ -681,6 +683,7 @@ files:
 - lib/curation_concerns/version.rb
 - lib/generators/curation_concerns/install_generator.rb
 - lib/generators/curation_concerns/templates/catalog_controller.rb
+- lib/generators/curation_concerns/templates/config/authorities/resource_types.yml
 - lib/generators/curation_concerns/templates/config/authorities/rights.yml
 - lib/generators/curation_concerns/templates/curation_concerns.js
 - lib/generators/curation_concerns/templates/curation_concerns.scss
@@ -696,6 +699,7 @@ files:
 - lib/generators/curation_concerns/work/templates/model.rb.erb
 - lib/generators/curation_concerns/work/templates/model_spec.rb.erb
 - lib/generators/curation_concerns/work/work_generator.rb
+- lib/tasks/curation_concerns.rake
 - solr/config/_rest_managed.json
 - solr/config/admin-extra.html
 - solr/config/elevate.xml
@@ -717,6 +721,7 @@ files:
 - spec/abilities/file_set_abilities_spec.rb
 - spec/abilities/generic_work_abilities_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/lease_actor_spec.rb
 - spec/actors/curation_concerns/manages_embargoes_actor_spec.rb
@@ -821,6 +826,7 @@ files:
 - spec/search_builders/curation_concerns/file_set_search_builder_spec.rb
 - spec/search_builders/curation_concerns/lease_search_builder_spec.rb
 - spec/search_builders/curation_concerns/search_builder_spec.rb
+- spec/search_builders/resource_types_service_spec.rb
 - spec/services/derivative_path_spec.rb
 - spec/services/embargo_service_spec.rb
 - spec/services/file_set_audit_service_spec.rb
@@ -898,7 +904,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Rails Engine that allows an application to CRUD CurationConcern objects
@@ -909,6 +915,7 @@ test_files:
 - spec/abilities/file_set_abilities_spec.rb
 - spec/abilities/generic_work_abilities_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/lease_actor_spec.rb
 - spec/actors/curation_concerns/manages_embargoes_actor_spec.rb
@@ -1013,6 +1020,7 @@ test_files:
 - spec/search_builders/curation_concerns/file_set_search_builder_spec.rb
 - spec/search_builders/curation_concerns/lease_search_builder_spec.rb
 - spec/search_builders/curation_concerns/search_builder_spec.rb
+- spec/search_builders/resource_types_service_spec.rb
 - spec/services/derivative_path_spec.rb
 - spec/services/embargo_service_spec.rb
 - spec/services/file_set_audit_service_spec.rb