curation_concerns 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 489a8d74c2cc2694cae734316ac806ccb728ba35
-  data.tar.gz: dc4312a11afa53f206991fe1777d9f5ea416e08c
+  metadata.gz: a85c8841cf6394c4589e461e3b59671377f44678
+  data.tar.gz: 575d68375d4f97744189ac4ab8183648b5483735
 SHA512:
-  metadata.gz: bbadbe42f6cb6b7153ad122fdd935ca085f7bfc9bae9fca0d5a0fc6390926063b8ac6f34693187a052c6ae56e7f9184942b6fa332a0e584e40e2eddd9de585a0
-  data.tar.gz: 8b029a62c46cdf9748048bed0b3d5f6eb1945f346ea165555253257f8dc87b9a4cb7235d00cbe0087667a53220f352ca1a473acf661152ca0676fb39f3f15568
+  metadata.gz: 0e737b868fcec75f9ed65e2c4361a786b28fdf4516062c04293c47b35c91f954797e5f68a3b0a2fa64ba1ecbf742f7987b3dd1dff3f6fc2e546fb53a4ed7740d
+  data.tar.gz: 29ed236e0bebabe08927012b07c83b960b3522285571fd4e42b06d2151f8de98c3e3ada3e61b58a51b2256e7d36fdf4db19fb7075c3c1e6dc13a0075ac2d06b7

data/Gemfile

@@ -1,6 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'hydra-works', github: 'projecthydra-labs/hydra-works'
 # Specify your gem's dependencies in curation_concerns.gemspec
 gemspec
 

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

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

@@ -61,6 +61,7 @@ module CurationConcerns
           authorize! :show, @file_set
           render :show, status: :ok
         end
+        additional_response_formats(wants)
       end
     end
 
@@ -140,6 +141,12 @@ module CurationConcerns
         @groups = current_user.groups
       end
 
+      # Override this method to add additional response
+      # formats to your local app
+      def additional_response_formats(_)
+        # nop
+      end
+
       def file_set_params
         params.require(:file_set).permit(
           :visibility_during_embargo, :embargo_release_date, :visibility_after_embargo, :visibility_during_lease, :lease_expiration_date, :visibility_after_lease, :visibility, title: [])

data/app/renderers/curation_concerns/attribute_renderer.rb

@@ -26,7 +26,7 @@ module CurationConcerns
       markup << %(<tr><th>#{label}</th>\n<td><ul class='tabular'>)
       attributes = microdata_object_attributes(field).merge(class: "attribute #{field}")
       Array(values).each do |value|
-        markup << "<li#{html_attributes(attributes)}>#{attribute_value_to_html(value)}</li>"
+        markup << "<li#{html_attributes(attributes)}>#{attribute_value_to_html(value.to_s)}</li>"
       end
       markup << %(</ul></td></tr>)
       markup.html_safe
@@ -43,8 +43,10 @@ module CurationConcerns
       def attribute_value_to_html(value)
         if field == :rights
           rights_attribute_to_html(value)
-        else
+        elsif microdata_value_attributes(field).present?
           "<span#{html_attributes(microdata_value_attributes(field))}>#{li_value(value)}</span>"
+        else
+          li_value(value)
         end
       end
 

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

@@ -16,6 +16,6 @@
   </fieldset>
   <div class="form-actions with-side-padding with-footroom">
     <%= submit_tag "Add to collection", class: 'btn btn-primary' %>
-    <%= link_to 'Cancel', root_path, class: 'btn btn-default', data: { dismiss: 'modal' } %>
+    <%= link_to 'Cancel', main_app.root_path, class: 'btn btn-default', data: { dismiss: 'modal' } %>
   </div>
 <% end %>

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

@@ -5,5 +5,9 @@
       <%= link_to "Attach a File", main_app.new_curation_concerns_file_set_path(@presenter), class: 'btn btn-default' %>
       <%= link_to "Delete This #{@presenter.human_readable_type}", [main_app, @presenter], class: 'btn btn-danger pull-right', data: { confirm: "Delete this #{@presenter.human_readable_type}?" }, method: :delete %>
     <% end %>
+    <% if collector %>
+      <%= render 'collections/add_to_collection_modal', collectible: @presenter %>
+      <%= link_to_select_collection @presenter, class: 'btn btn-primary' %>
+    <% end %>
   </div>
 <% end %>

data/lib/curation_concerns/engine.rb

@@ -23,5 +23,11 @@ module CurationConcerns
     initializer 'curation_concerns.initialize' do
       require 'curation_concerns/rails/routes'
     end
+
+    initializer 'curation_concerns.assets.precompile' do |app|
+      app.config.assets.paths << config.root.join('app', 'assets', 'images')
+
+      app.config.assets.precompile += %w(*.png *.gif)
+    end
   end
 end

data/lib/curation_concerns/version.rb

@@ -1,3 +1,3 @@
 module CurationConcerns
-  VERSION = "0.3.0"
+  VERSION = "0.5.0"
 end

data/spec/controllers/curation_concerns/file_sets_controller_spec.rb

@@ -222,6 +222,7 @@ describe CurationConcerns::FileSetsController do
       end
 
       it 'allows access to public files' do
+        expect(controller).to receive(:additional_response_formats).with(ActionController::MimeResponds::Collector)
         get :show, id: public_file_set
         expect(response).to be_success
       end

data/spec/indexers/collection_indexer_spec.rb

@@ -4,16 +4,17 @@ describe CurationConcerns::CollectionIndexer do
   let(:indexer) { described_class.new(collection) }
   let(:collection) { build(:collection) }
 
-  before { allow(collection).to receive(:bytes).and_return(1000) }
   describe "#generate_solr_document" do
+    before do
+      allow(collection).to receive(:bytes).and_return(1000)
+      allow(CurationConcerns::ThumbnailPathService).to receive(:call).and_return("/downloads/1234?file=thumbnail")
+    end
     subject { indexer.generate_solr_document }
 
-    it "has generic type" do
+    it "has required fields" do
       expect(subject.fetch('generic_type_sim')).to eq ["Collection"]
-    end
-
-    it "has bytes" do
       expect(subject.fetch('bytes_is')).to eq(1000)
+      expect(subject.fetch('thumbnail_path_ss')).to eq "/downloads/1234?file=thumbnail"
     end
   end
 end

data/spec/jobs/import_url_job_spec.rb

@@ -41,9 +41,6 @@ describe ImportUrlJob do
     let(:title) { { file_set.id => ['File One'] } }
     let(:metadata) { {} }
     let(:visibility) { nil }
-
-    let(:upload_set) { UploadSet.create }
-    let(:upload_set_job) { UploadSetUpdateJob.perform_now(user.user_key, upload_set.id, title, metadata, visibility) }
     let(:file_set_id) { file_set.id }
 
     before do

data/spec/models/generic_work_spec.rb

@@ -46,4 +46,14 @@ describe GenericWork do
     subject { work.to_partial_path }
     it { is_expected.to eq 'generic_works/generic_work' }
   end
+
+  describe "#destroy" do
+    let!(:work) { create(:work_with_files) }
+    it "doesn't save the work after removing each individual file" do
+      expect_any_instance_of(described_class).not_to receive(:save!)
+      expect {
+        work.destroy
+      }.to change { FileSet.count }.by(-2)
+    end
+  end
 end

data/spec/renderers/curation_concerns/attribute_renderer_spec.rb

@@ -12,22 +12,37 @@ describe CurationConcerns::AttributeRenderer do
     I18n.load_path -= Dir[File.join(yml_path)]
     I18n.reload!
   end
+
   describe "#attribute_to_html" do
     subject { Nokogiri::HTML(renderer.render) }
     let(:expected) { Nokogiri::HTML(tr_content) }
+
     context 'without microdata enabled' do
       before do
         CurationConcerns.config.display_microdata = false
       end
       let(:tr_content) {
         "<tr><th>Name</th>\n" \
-         "<td><ul class='tabular'><li class=\"attribute name\"><span>Bob</span></li>\n" \
-         "<li class=\"attribute name\"><span>Jessica</span></li>\n" \
+         "<td><ul class='tabular'><li class=\"attribute name\">Bob</li>\n" \
+         "<li class=\"attribute name\">Jessica</li>\n" \
          "</ul></td></tr>"
       }
       it { expect(renderer).not_to be_microdata(field) }
       it { expect(subject).to be_equivalent_to(expected) }
     end
+
+    context 'with an integer attribute' do
+      let(:field) { :height }
+      let(:renderer) { described_class.new(field, [567]) }
+      let(:tr_content) do
+        "<tr><th>Height</th>\n" \
+         "<td><ul class='tabular'><li class=\"attribute height\">567</li>\n" \
+         "</ul></td></tr>"
+      end
+
+      it { expect(subject).to be_equivalent_to(expected) }
+    end
+
     context 'with microdata enabled' do
       before do
         CurationConcerns.config.display_microdata = true

data/spec/services/thumbnail_path_service_spec.rb

@@ -15,11 +15,11 @@ describe CurationConcerns::ThumbnailPathService do
 
     context "that is an audio" do
       let(:mime_type) { 'audio/x-wav' }
-      it { is_expected.to eq '/assets/audio.png' }
+      it { is_expected.to match %r{/assets/audio-.+.png} }
     end
 
     context "that has no thumbnail" do
-      it { is_expected.to eq '/assets/default.png' }
+      it { is_expected.to match %r{/assets/default-.+.png} }
     end
   end
 
@@ -37,7 +37,7 @@ describe CurationConcerns::ThumbnailPathService do
 
     context "that doesn't have a representative" do
       let(:object) { FileSet.new }
-      it { is_expected.to eq '/assets/default.png' }
+      it { is_expected.to match %r{/assets/default-.+.png} }
     end
   end
 end

data/spec/test_app_templates/Gemfile.extra

@@ -2,3 +2,8 @@
 # gem 'hydra-works', github: 'projecthydra-labs/hydra-works', branch: 'master'
 # gem 'hydra-pcdm', github: 'projecthydra-labs/hydra-pcdm', branch: 'master'
 # gem 'activefedora-aggregation', github: 'projecthydra-labs/activefedora-aggregation', branch: 'master'
+
+group :development do
+  gem 'better_errors'
+  gem 'binding_of_caller'
+end

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

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe 'curation_concerns/base/show_actions' do
+  let(:model) { double('model', persisted?: true, to_param: '123', model_name: GenericWork.model_name) }
+  let(:presenter) { double("presenter", human_readable_type: 'Image', id: '123', to_model: model) }
+  before do
+    assign(:presenter, presenter)
+    render 'curation_concerns/base/show_actions.html.erb', collector: collector, editor: editor
+  end
+
+  context "as a collector" do
+    let(:editor) { true }
+    let(:collector) { true }
+    it "shows the add to collection link" do
+      expect(rendered).to have_link 'Add to a Collection'
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curation_concerns
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-11 00:00:00.000000000 Z
+date: 2016-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -74,14 +74,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: hydra-editor
   requirement: !ruby/object:Gem::Requirement
@@ -399,7 +399,6 @@ files:
 - app/controllers/concerns/curation_concerns/single_use_links_controller_behavior.rb
 - app/controllers/concerns/curation_concerns/single_use_links_viewer_controller_behavior.rb
 - app/controllers/concerns/curation_concerns/themed_layout_controller.rb
-- app/controllers/concerns/curation_concerns/upload_sets_controller_behavior.rb
 - app/controllers/concerns/curation_concerns/welcome_controller_behavior.rb
 - app/controllers/curation_concerns/application_controller.rb
 - app/controllers/curation_concerns/classify_concerns_controller.rb
@@ -410,12 +409,10 @@ files:
 - app/controllers/downloads_controller.rb
 - app/controllers/embargoes_controller.rb
 - app/controllers/leases_controller.rb
-- app/controllers/upload_sets_controller.rb
 - app/controllers/welcome_controller.rb
 - app/forms/curation_concerns/forms/collection_edit_form.rb
 - app/forms/curation_concerns/forms/file_set_edit_form.rb
 - app/forms/curation_concerns/forms/work_form.rb
-- app/forms/curation_concerns/upload_set_form.rb
 - app/helpers/curation_concerns/ability_helper.rb
 - app/helpers/curation_concerns/catalog_helper.rb
 - app/helpers/curation_concerns/collections_helper.rb
@@ -584,11 +581,6 @@ files:
 - app/views/shared/_site_actions.html.erb
 - app/views/shared/_site_search.html.erb
 - app/views/shared/_title_bar.html.erb
-- app/views/upload_sets/_base_metadata.html.erb
-- app/views/upload_sets/_edit.js.erb
-- app/views/upload_sets/_metadata.html.erb
-- app/views/upload_sets/_more_metadata.html.erb
-- app/views/upload_sets/edit.html.erb
 - app/views/welcome/index.html.erb
 - config/initializers/simple_form.rb
 - config/jetty.yml
@@ -644,7 +636,6 @@ files:
 - spec/controllers/downloads_controller_spec.rb
 - spec/controllers/embargoes_controller_spec.rb
 - spec/controllers/leases_controller_spec.rb
-- spec/controllers/upload_sets_controller_spec.rb
 - spec/controllers/welcome_controller_spec.rb
 - spec/factories/collections.rb
 - spec/factories/create_curation_concern.rb
@@ -661,7 +652,6 @@ files:
 - spec/features/work_generator_spec.rb
 - spec/forms/collection_edit_form_spec.rb
 - spec/forms/file_set_edit_form_spec.rb
-- spec/forms/upload_set_form_spec.rb
 - spec/forms/work_form_spec.rb
 - spec/helpers/catalog_helper_spec.rb
 - spec/helpers/configuration_helper_spec.rb
@@ -685,7 +675,6 @@ files:
 - spec/jobs/import_url_job_spec.rb
 - spec/jobs/ingest_file_job_spec.rb
 - spec/jobs/ingest_local_file_job_spec.rb
-- spec/jobs/upload_set_update_job_spec.rb
 - spec/jobs/visibility_copy_job_spec.rb
 - spec/lib/curation_concerns/callbacks/registry_spec.rb
 - spec/lib/curation_concerns/callbacks_spec.rb
@@ -706,7 +695,6 @@ files:
 - spec/models/quick_classification_query_spec.rb
 - spec/models/single_use_link_spec.rb
 - spec/models/solr_document_spec.rb
-- spec/models/upload_set_spec.rb
 - spec/models/user_spec.rb
 - spec/presenters/curation_concerns/collection_presenter_spec.rb
 - spec/presenters/curation_concerns/file_set_presenter_spec.rb
@@ -754,6 +742,7 @@ files:
 - spec/views/collections/_sort_and_per_page.html.erb_spec.rb
 - spec/views/curation_concerns/base/_attributes.html.erb_spec.rb
 - spec/views/curation_concerns/base/_form_permission.html.erb_spec.rb
+- spec/views/curation_concerns/base/_show_actions.html.erb_spec.rb
 - spec/views/curation_concerns/base/show.html.erb_spec.rb
 - spec/views/curation_concerns/base/show.json.jbuilder_spec.rb
 - spec/views/curation_concerns/file_sets/_file_set.html.erb_spec.rb
@@ -767,7 +756,6 @@ files:
 - spec/views/shared/_my_actions.html.erb_spec.rb
 - spec/views/single_use_links/new_download.html.erb_spec.rb
 - spec/views/single_use_links_viewer/show.html.erb_spec.rb
-- spec/views/upload_sets/_metadata.html.erb_spec.rb
 - tasks/jetty.rake
 - tasks/release.rake
 - vendor/assets/images/ui-bg_glass_100_fdf5ce_1x400.png
@@ -798,7 +786,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A Rails Engine that allows an application to CRUD CurationConcern objects
@@ -826,7 +814,6 @@ test_files:
 - spec/controllers/downloads_controller_spec.rb
 - spec/controllers/embargoes_controller_spec.rb
 - spec/controllers/leases_controller_spec.rb
-- spec/controllers/upload_sets_controller_spec.rb
 - spec/controllers/welcome_controller_spec.rb
 - spec/factories/collections.rb
 - spec/factories/create_curation_concern.rb
@@ -843,7 +830,6 @@ test_files:
 - spec/features/work_generator_spec.rb
 - spec/forms/collection_edit_form_spec.rb
 - spec/forms/file_set_edit_form_spec.rb
-- spec/forms/upload_set_form_spec.rb
 - spec/forms/work_form_spec.rb
 - spec/helpers/catalog_helper_spec.rb
 - spec/helpers/configuration_helper_spec.rb
@@ -867,7 +853,6 @@ test_files:
 - spec/jobs/import_url_job_spec.rb
 - spec/jobs/ingest_file_job_spec.rb
 - spec/jobs/ingest_local_file_job_spec.rb
-- spec/jobs/upload_set_update_job_spec.rb
 - spec/jobs/visibility_copy_job_spec.rb
 - spec/lib/curation_concerns/callbacks/registry_spec.rb
 - spec/lib/curation_concerns/callbacks_spec.rb
@@ -888,7 +873,6 @@ test_files:
 - spec/models/quick_classification_query_spec.rb
 - spec/models/single_use_link_spec.rb
 - spec/models/solr_document_spec.rb
-- spec/models/upload_set_spec.rb
 - spec/models/user_spec.rb
 - spec/presenters/curation_concerns/collection_presenter_spec.rb
 - spec/presenters/curation_concerns/file_set_presenter_spec.rb
@@ -936,6 +920,7 @@ test_files:
 - spec/views/collections/_sort_and_per_page.html.erb_spec.rb
 - spec/views/curation_concerns/base/_attributes.html.erb_spec.rb
 - spec/views/curation_concerns/base/_form_permission.html.erb_spec.rb
+- spec/views/curation_concerns/base/_show_actions.html.erb_spec.rb
 - spec/views/curation_concerns/base/show.html.erb_spec.rb
 - spec/views/curation_concerns/base/show.json.jbuilder_spec.rb
 - spec/views/curation_concerns/file_sets/_file_set.html.erb_spec.rb
@@ -949,4 +934,3 @@ test_files:
 - spec/views/shared/_my_actions.html.erb_spec.rb
 - spec/views/single_use_links/new_download.html.erb_spec.rb
 - spec/views/single_use_links_viewer/show.html.erb_spec.rb
-- spec/views/upload_sets/_metadata.html.erb_spec.rb

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

@@ -1,50 +0,0 @@
-module CurationConcerns
-  module UploadSetsControllerBehavior
-    extend ActiveSupport::Concern
-    include Hydra::Controller::ControllerBehavior
-
-    included do
-      include CurationConcerns::ThemedLayoutController
-      with_themed_layout '1_column'
-
-      class_attribute :edit_form_class
-      self.edit_form_class = CurationConcerns::UploadSetForm
-    end
-
-    def edit
-      # TODO: redlock this line so that two processes don't attempt to create at the same time.
-      @upload_set = UploadSet.find_or_create(params[:id])
-      @form = edit_form
-    end
-
-    def update
-      authenticate_user!
-      @upload_set = UploadSet.find(params[:id])
-      @upload_set.status = ["processing"]
-      @upload_set.save
-      create_update_job
-      flash[:notice] = 'Your files are being processed by ' + t('curation_concerns.product_name') + ' in the background. The metadata and access controls you specified are being applied. Files will be marked <span class="label label-danger" title="Private">Private</span> until this process is complete (shouldn\'t take too long, hang in there!). You may need to refresh your dashboard to see these updates.'
-
-      redirect_after_update
-    end
-
-    protected
-
-      # Override this method if you want to go elsewhere
-      def redirect_after_update
-        redirect_to main_app.curation_concerns_generic_works_path
-      end
-
-      def edit_form
-        edit_form_class.new(@upload_set, current_ability)
-      end
-
-      def create_update_job
-        UploadSetUpdateJob.perform_later(current_user.user_key,
-                                         params[:id],
-                                         params[:title],
-                                         edit_form_class.model_attributes(params[:upload_set]),
-                                         params[:visibility])
-      end
-  end
-end

data/app/controllers/upload_sets_controller.rb

@@ -1,3 +0,0 @@
-class UploadSetsController < ApplicationController
-  include CurationConcerns::UploadSetsControllerBehavior
-end

data/app/forms/curation_concerns/upload_set_form.rb

@@ -1,43 +0,0 @@
-module CurationConcerns
-  class UploadSetForm
-    include HydraEditor::Form
-
-    self.terms = CurationConcerns::GenericWorkForm.terms
-
-    delegate :creator, :human_readable_type, :open_access?, :authenticated_only_access?,
-             :open_access_with_embargo_release_date?, :private_access?,
-             :embargo_release_date, :lease_expiration_date, :member_ids, to: :exemplar_work
-
-    def initialize(upload_set, current_ability)
-      @current_ability = current_ability
-      super(upload_set)
-      # TODO: instead of using GenericWorkForm, this should be an UploadSetForm
-      # work = ::GenericWork.new(creator: [creator_display], title: titles)
-    end
-
-    def exemplar_work
-      @exemplar_work ||= GenericWork.new(creator: [creator_display])
-    end
-
-    # @return [Array] a list of the first titles for each of the works.
-    def works
-      @works ||= model.works.sort { |w1, w2| w1.title.first.downcase <=> w2.title.first.downcase }
-    end
-
-    def self.model_attributes(attrs)
-      CurationConcerns::GenericWorkForm.model_attributes(attrs)
-    end
-
-    def self.multiple?(attrs)
-      CurationConcerns::GenericWorkForm.multiple?(attrs)
-    end
-
-    private
-
-      # Override this method if you want the creator to display something other than
-      # the user_key, e.g. "current_user.name"
-      def creator_display
-        @current_ability.current_user.user_key
-      end
-  end
-end

data/app/views/upload_sets/_base_metadata.html.erb

@@ -1,12 +0,0 @@
-      <%#= f.input :resource_type, as: :select_with_help, collection: CurationConcerns.config.resource_types,
-          input_html: { class: 'form-control', multiple: true } %>
-
-      <%= f.input :tag, as: :multi_value_with_help %>
-
-      <%= f.input :creator, as: :multi_value_with_help %>
-
-      <%= f.input :rights, as: :select_with_modal_help, collection: RightsService.select_options,
-          input_html: { class: 'form-control', multiple: true } %>
-
-      <%= render "curation_concerns/file_sets/rights_modal" %>
-

data/app/views/upload_sets/_edit.js.erb

@@ -1,15 +0,0 @@
-if (navigator.userAgent.match("MSIE"))
-  $("#new_file_set").validate();
-
-$('#permissions_display').show();
-
-confirmation_needed = true;
-window.onbeforeunload = confirmExit;
-
-function confirmExit(){
-  if(confirmation_needed){
-    // if you return a string it will be displayed in between "don't navigate away"
-    // and "click Ok to navigate away or cancel to stay put" in the confirm dialog
-    return "Your metadata has not been saved.";
-  }
-}

data/app/views/upload_sets/_metadata.html.erb

@@ -1,40 +0,0 @@
-<h2>Individual Titles  </h2>
-<div id="" class="well">
-  <div class="row">
-    <div class="col-sm-8">
-      <h3>Applies to individual files uploaded</h3>
-      <%= content_tag :p, t('curation_concerns.upload_set.help.title'), class: "help-block" %>
-      <% f.object.works.each_with_index  do |work, index| %>
-        <div class="form-group">
-          <%= f.input_label :title, as: :multi_value_with_help, label: "Title #{index + 1}" %>
-          <div id="additional_title_clone">
-            <%= f.text_field :title, name: "title[#{work.id}][]", value: work.title, class: 'form-control', required: true %>
-          </div>
-        </div>
-      <% end %>
-    </div>
-
-    <div class="col-sm-4">
-      <!-- put metadata about file being edited here -->
-    </div>
-  </div>
-</div>
-
-<%= hidden_field_tag(:extra_description_count, "1") %>
-<div id="descriptions_display">
-  <h2>Bulk Descriptions</h2>
-  <div class="well">
-    <div class="row">
-      <div class="col-sm-6">
-      <h3>Applies to all files just uploaded</h3>
-      <%= render 'base_metadata', f: f %>
-
-      <button id="show_addl_descriptions" class="btn btn-default" aria-label="reveal additional metadata description fields">Show Additional Fields</button>
-      <!-- hidden on initial load -->
-
-      <%= render 'more_metadata', f: f %>
-
-      </div> <!-- /col-sm-8 -->
-    </div> <!-- /row -->
-  </div><!-- /well -->
-</div> <!-- /row -->

data/app/views/upload_sets/_more_metadata.html.erb

@@ -1,7 +0,0 @@
-<div id="more_descriptions">
-  <button id="hide_addl_descriptions" class="btn btn-default" aria-label="hide additional metadata description fields">Hide Additional Fields</button>
-  <% (f.object.terms - [:title, :creator, :rights, :tag, :resource_type]).each do |term| %>
-    <%# <%= f.input term, as: :multi_value_with_help, input_html: { required: false} %>
-    <%= render_edit_field_partial(term, f: f) %>
-  <% end %>
-</div> <!-- /more_descriptions -->

data/app/views/upload_sets/edit.html.erb

@@ -1,26 +0,0 @@
-<%= javascript_tag do %>
-  <%= render partial: "edit", formats: [:js] %>
-<% end %>
-
-<h1>Apply Metadata</h1>
-<p>
-  The information you provide for Title will be applied to the corresponding file only; however all other
-  information you provide will be applied <em>to the entire set of files that were uploaded together</em> you have just
-  deposited into <%= t('curation_concerns.product_name') %>. You may edit individual files from
-  <%= link_to "<i class='glyphicon glyphicon-dashboard'></i> #{t('curation_concerns.bread_crumb.works_list')}".html_safe, main_app.curation_concerns_generic_works_path %>
-  once this step is finished. <span class="required"><abbr title="required">*</abbr></span> indicates required fields.
-</p>
-<%= simple_form_for [main_app, @form], html: { multipart: true }, builder: CurationConcerns::FormBuilder do |f| %>
-
-  <%= render 'metadata', f: f %>
-
-  <%#= render 'file_sets/permission_form', f: f, upload_set: @upload_set %>
-
-  <div id="permissions_submit">
-    <%= button_tag type: 'submit', class: 'btn btn-primary btn-lg',
-        onclick: "confirmation_needed = false;", id: "upload_submit", name: "update_permission" do %>
-      <i class="glyphicon glyphicon-floppy-disk"></i> Save
-    <% end %>
-  </div>
-
-<% end %>

data/spec/controllers/upload_sets_controller_spec.rb

@@ -1,69 +0,0 @@
-require 'spec_helper'
-
-describe UploadSetsController do
-  let(:user) { create(:user) }
-  let(:other_user) { create(:user) }
-  before do
-    sign_in user
-    allow_any_instance_of(User).to receive(:groups).and_return([])
-  end
-  describe "#update" do
-    let(:upload_set_update_message) { double('upload_set update message') }
-    let(:upload_set) { UploadSet.create }
-    context "when successful" do
-      it "enqueues a upload_set job and redirects to generic_works list with a flash message" do
-        expect(UploadSetUpdateJob).to receive(:perform_later).with(user.user_key, upload_set.id, { '1' => 'foo' },
-                                                                   { tag: [] }, 'open').once
-        post :update, id: upload_set.id, title: { '1' => 'foo' }, visibility: 'open', upload_set: { tag: [""] }
-        expect(response).to redirect_to routes.url_helpers.curation_concerns_generic_works_path
-        expect(flash[:notice]).to include("Your files are being processed")
-      end
-    end
-
-    describe "when user has edit permissions on a file" do
-      # TODO: all these tests could move to upload_set_update_job_spec.rb
-      let!(:work) { create(:generic_work, user: user, upload_set: upload_set) }
-
-      it "they can set public read access" do
-        post :update, id: upload_set, visibility: "open", upload_set: { tag: [""] }
-        expect(work.reload.read_groups).to eq ['public']
-      end
-
-      it "they can set metadata like title" do
-        post :update, id: upload_set, upload_set: { tag: ["footag", "bartag"] }, title: { work.id => ["New Title"] }
-        work.reload
-        expect(work.title).to eq ["New Title"]
-        # TODO: is order important?
-        expect(work.tag).to include("footag", "bartag")
-      end
-
-      it "they cannot set any tags" do
-        post :update, id: upload_set, upload_set: { tag: [""] }
-        expect(work.reload.tag).to be_empty
-      end
-    end
-
-    describe "when user does not have edit permissions on a file" do
-      # TODO: all these tests could move to upload_set_update_job_spec.rb
-      let!(:work) { create(:generic_work, title: ['Original Title'], upload_set: upload_set) }
-
-      it "they cannot modify the object" do
-        post :update, id: upload_set, upload_set: { "tag" => [""] },
-                      title: { work.id => "Title Won't Change" }
-        work.reload
-        expect(work.title).to eq ["Original Title"]
-      end
-    end
-  end
-
-  describe "#edit" do
-    let(:us1) { UploadSet.create }
-
-    it "sets up attributes for the form" do
-      get :edit, id: us1
-      expect(assigns[:form]).to be_kind_of CurationConcerns::UploadSetForm
-      expect(assigns[:form].model).to eq us1
-      expect(response).to be_success
-    end
-  end
-end

data/spec/forms/upload_set_form_spec.rb

@@ -1,55 +0,0 @@
-require 'spec_helper'
-
-describe CurationConcerns::UploadSetForm do
-  let(:form) { described_class.new(upload_set, ability) }
-  let(:user) { build(:user) }
-  let(:ability) { Ability.new(user) }
-  let(:upload_set) { UploadSet.create }
-  let!(:work1) { create(:work, upload_set: upload_set) }
-  let!(:work2) { create(:work, upload_set: upload_set) }
-
-  describe "#to_param" do
-    subject { form.to_param }
-    it { is_expected.to eq upload_set.id }
-  end
-
-  describe "#terms" do
-    subject { form.terms }
-    it { is_expected.to eq [:title,
-                            :creator,
-                            :contributor,
-                            :description,
-                            :tag,
-                            :rights,
-                            :publisher,
-                            :date_created,
-                            :subject,
-                            :language,
-                            :identifier,
-                            :based_near,
-                            :related_url,
-                            :representative_id,
-                            :thumbnail_id,
-                            :files,
-                            :visibility_during_embargo,
-                            :embargo_release_date,
-                            :visibility_after_embargo,
-                            :visibility_during_lease,
-                            :lease_expiration_date,
-                            :visibility_after_lease,
-                            :visibility] }
-  end
-
-  describe "works" do
-    let!(:work1) { create(:work_with_one_file, upload_set: upload_set, title: ['B title']) }
-    let!(:work2) { create(:work_with_one_file, upload_set: upload_set, title: ['A title']) }
-    subject { form.works }
-    it { is_expected.to eq [work2, work1] }
-  end
-
-  describe "creator" do
-    let(:user) { build(:user, email: 'bob@example.com') }
-    subject { form.creator }
-    it { is_expected.to eq ['bob@example.com'] }
-  end
-end

data/spec/jobs/upload_set_update_job_spec.rb

@@ -1,43 +0,0 @@
-require 'spec_helper'
-
-describe UploadSetUpdateJob do
-  let(:user) { create(:user) }
-  let(:upload_set) { UploadSet.create }
-
-  let(:work)  { create(:work, user: user, upload_set: upload_set) }
-  let(:work2) { create(:work, user: user, upload_set: upload_set) }
-
-  before do
-    allow(CurationConcerns.config.callback).to receive(:run)
-    allow(CurationConcerns.config.callback).to receive(:set?)
-      .with(:after_upload_set_update_success)
-      .and_return(true)
-    allow(CurationConcerns.config.callback).to receive(:set?)
-      .with(:after_upload_set_update_failure)
-      .and_return(true)
-  end
-
-  describe "#perform" do
-    let(:title) { { work.id => ['File One'], work2.id => ['File Two'] } }
-    let(:metadata) { { tag: [''] } }
-    let(:visibility) { nil }
-
-    subject { described_class.perform_now(user.user_key, upload_set.id, title, metadata, visibility) }
-
-    it "updates work metadata" do
-      expect(CurationConcerns.config.callback).to receive(:run).with(:after_upload_set_update_success, user, upload_set)
-      subject
-      expect(work.reload.title).to eq ['File One']
-      expect(work2.reload.title).to eq ['File Two']
-    end
-
-    context "when user does not have permission to edit all of the works" do
-      it "sends the failure message" do
-        expect_any_instance_of(User).to receive(:can?).with(:edit, work).and_return(true)
-        expect_any_instance_of(User).to receive(:can?).with(:edit, work2).and_return(false)
-        expect(CurationConcerns.config.callback).to receive(:run).with(:after_upload_set_update_failure, user, upload_set)
-        subject
-      end
-    end
-  end
-end

data/spec/models/upload_set_spec.rb

@@ -1,37 +0,0 @@
-require 'spec_helper'
-
-describe UploadSet do
-  let(:user) { create(:user) }
-  let(:upload_set) { described_class.create(title: ["test collection"]) }
-  subject { upload_set }
-
-  it "has dc metadata" do
-    expect(subject.title).to eq ["test collection"]
-  end
-
-  it "responds to #works" do
-    expect(subject).to respond_to(:works)
-  end
-
-  it "supports to_solr" do
-    expect(subject.to_solr).to_not be_nil
-    expect(subject.to_solr["upload_set__title_t"]).to be_nil
-  end
-
-  describe "find_or_create" do
-    describe "when the object exists" do
-      let!(:upload_set) { described_class.create(title: ["test collection"]) }
-      it "finds upload_set instead of creating" do
-        expect(described_class).to_not receive(:create)
-        described_class.find_or_create(subject.id)
-      end
-    end
-    describe "when the object does not exist" do
-      it "creates a new Batch" do
-        expect { described_class.find("upload_set-123") }.to raise_error(ActiveFedora::ObjectNotFoundError)
-        expect(described_class).to receive(:create).once.and_return("the upload_set")
-        expect(described_class.find_or_create("upload_set-123")).to eq "the upload_set"
-      end
-    end
-  end
-end

data/spec/views/upload_sets/_metadata.html.erb_spec.rb

@@ -1,28 +0,0 @@
-require 'spec_helper'
-
-describe 'upload_sets/_metadata.html.erb' do
-  let(:user) { build(:user) }
-  let(:ability) { Ability.new(user) }
-  let(:upload_set) { UploadSet.create }
-  let(:form) { CurationConcerns::UploadSetForm.new(upload_set, ability) }
-  let(:work1) { build(:work, id: 'work1', title: ['First work']) }
-  let(:work2) { build(:work, id: 'work2', title: ['Second work']) }
-
-  let(:f) do
-    allow(upload_set).to receive(:works).and_return([work1, work2])
-    view.simple_form_for(form, url: '/update', builder: CurationConcerns::FormBuilder) do |fs_form|
-      return fs_form
-    end
-  end
-
-  before do
-    allow(view).to receive(:f).and_return(f)
-    render
-  end
-
-  it "draws the form" do
-    expect(rendered).to have_text 'Applies to all files just uploaded'
-    expect(rendered).to have_css 'input[name="title[work1][]"][value="First work"]'
-    expect(rendered).to have_css 'input[name="title[work2][]"][value="Second work"]'
-  end
-end