curation_concerns 1.7.8 → 2.0.0.rc1

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

@@ -2,7 +2,7 @@
   <h2 class="non lower">Actions</h2>
   <p>
       <%= link_to "Edit", edit_collection_path, class: 'btn btn-default' %> &nbsp;&nbsp;
-      <%= link_to "Add files from your dashboard",  search_path_for_my_works, class: 'btn btn-default' %>
+      <%= link_to "Delete", [main_app, @presenter], class: 'btn btn-danger pull-right', data: { confirm: "Delete this Collection?" }, method: :delete %>
   </p>
 <%end %>
 

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

@@ -1,7 +1,6 @@
 <% provide :page_title, curation_concern_page_title(@collection) %>
 
-<h1>Edit <%= @collection %> <span class="human_readable_type">(<%= @collection.human_readable_type %>)</span></h1>
-
+<h1>Edit <%= @collection.to_s %> <span class="human_readable_type">(<%= @collection.human_readable_type %>)</span></h1>
 
 <% unless has_collection_search_parameters? %>
   <%= render 'collections/edit_actions' %>
@@ -15,3 +14,4 @@
 <%= render 'catalog/constraints', localized_params: params %>
 <%= render 'document_list', documents: @member_docs, document_list_format: "dashboard" %>
 <%= render 'paginate' %>
+

data/app/views/curation_concerns/admin/workflow_roles/index.html.erb

@@ -11,7 +11,7 @@
           <tr>
             <td><%= user.user_key %></td>
             <% agent_presenter = @presenter.presenter_for(user) %>
-            <% if agent_presenter && agent_presenter.responsibilities_present? %>
+            <% if agent_presenter %>
               <td>
                 <ul>
                   <% agent_presenter.responsibilities do |responsibility_presenter| %>
@@ -42,3 +42,4 @@
     </div>
   </div>
 </div>
+

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

@@ -9,5 +9,8 @@
     <%= presenter.attribute_to_html(:embargo_release_date, render_as: :date) %>
     <%= presenter.attribute_to_html(:lease_expiration_date, render_as: :date) %>
     <%= presenter.attribute_to_html(:rights, render_as: :rights) %>
+    <% if defined?(presenter.member_of_collection_presenters) && presenter.member_of_collection_presenters.size > 0 %>
+      <%= render 'member_of_collections', presenter: presenter %>
+    <% end %>
   </tbody>
 </table>

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

@@ -1,10 +1,10 @@
       <div class="form-group radio_buttons member_resource_options">
         <span class="radio">
-          <%= radio_button_tag "thumbnail_id", node.id, @form.thumbnail_id == node.id, id: "thumbnail_id_#{node.id}", class: "radio_buttons" %>
+          <%= radio_button_tag "thumbnail_id", node.id, @presenter.thumbnail_id == node.id, id: "thumbnail_id_#{node.id}", class: "radio_buttons" %>
           <%= label_tag "thumbnail_id_#{node.id}", "Thumbnail" %>
         </span>
         <span class="radio">
-          <%= radio_button_tag "representative_id", node.id, @form.representative_id == node.id, id: "representative_id_#{node.id}", class: "radio_buttons" %>
+          <%= radio_button_tag "representative_id", node.id, @presenter.representative_id == node.id, id: "representative_id_#{node.id}", class: "radio_buttons" %>
           <%= label_tag "representative_id_#{node.id}", "Representative Media" %>
         </span>
       </div>

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

@@ -1,13 +1,5 @@
-<%= content_tag :ul,
-                id: "sortable",
-                class: "list-unstyled grid clearfix",
-                data: {
-                  id: @form.id,
-                  "class-name" => @form.model_name.plural,
-                  "singular-class-name" => @form.model_name.singular,
-                  version: @form.version
-                } do %>
-  <% @form.member_presenters.each do |member| %>
-    <%= render "file_manager_member", node: member %>
-  <% end %>
-<% end %>
+<ul id="sortable" data-id="<%= @presenter.id %>" data-class-name="<%= @presenter.model_name.plural %>" data-singular-class-name="<%= @presenter.model_name.singular %>" class="list-unstyled grid clearfix">
+ <% @presenter.member_presenters.each do |member| %>
+   <%= render "file_manager_member", node: member %>
+ <% end %>
+</ul>

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

@@ -1,5 +1,5 @@
 <div class="resource-form-container">
-  <%= simple_form_for [main_app, @form], remote: true, html: { id: 'resource-form', 'data-type': 'json' } do |f| %>
+  <%= simple_form_for [main_app, @presenter], remote: true, html: { id: 'resource-form', 'data-type': 'json' } do |f| %>
     <%= f.input :thumbnail_id, as: :hidden, input_html: { data: {member_link: 'thumbnail_id'}} %>
     <%= f.input :representative_id, as: :hidden, input_html: { data: {member_link: 'representative_id'}} %>
   <% end %>

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

@@ -4,8 +4,6 @@
     <div class="alert alert-danger fade in">
       <strong>Wait don't go!</strong> There was a problem with your submission. Please review the errors below:
       <a class="close" data-dismiss="alert" href="#">&times;</a>
-      <%= render 'form_in_works_error', f: f %>
-      <%= render 'form_ordered_members_error', f: f %>
     </div>
   <% end %>
 
@@ -14,9 +12,6 @@
 
   <div class="row">
     <div class="col-md-12 form-actions">
-      <%# TODO: If we start using ActionCable, we could listen for object updates and
-                alert the user that the object has changed by someone else %>
-      <%= f.input CurationConcerns::OptimisticLockValidator.version_field, as: :hidden unless f.object.new_record? %>
       <%= f.submit class: 'btn btn-primary require-contributor-agreement' %>
       <% if curation_concern.new_record? %>
         <%= link_to 'Cancel', main_app.root_path, class: 'btn btn-link' %>

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

@@ -0,0 +1,4 @@
+<div class="row with-headroom">
+  <legend>Member of Collections</legend>
+  <%= f.input :member_of_collection_ids, collection: @form.collections_for_select, label: false, input_html: { multiple: true } %>
+</div>

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

@@ -9,3 +9,4 @@
 
 <%= render "form_rights", f: f %>
 <%= render "form_in_works", f: f %>
+<%= render "form_member_of_collections", f: f %>

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

@@ -0,0 +1,10 @@
+<tr>
+  <td>Member of Collections</td>
+  <td>
+    <ul class="member_of_collections">
+      <% presenter.member_of_collection_presenters.each do |p| %>
+        <li><%= link_to p.to_s, main_app.collection_path(p.id), class: 'collection-link' %></li>
+      <% end %>
+    </ul>
+  </td>
+</tr>

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

@@ -20,9 +20,5 @@
       <% end %>
       <%= 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-default' %>
-    <% end %>
   </div>
 <% end %>

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

@@ -1,11 +1,11 @@
 <h1><%= t("file_manager.link_text") %></h1>
 <ul class="breadcrumb">
   <li>
-    Back to <%= link_to @form.to_s, [main_app, @form] %>
+    Back to <%= link_to @presenter.to_s, [main_app, @presenter] %>
   </li>
 </ul>
 
-<% if !@form.member_presenters.empty? %>
+<% if !@presenter.member_presenters.empty? %>
   <div data-action="file-manager">
     <div class="col-md-3" id="file-manager-tools">
       <h2>Toolbar</h2>

data/app/views/curation_concerns/base/show.json.jbuilder

@@ -1,2 +1 @@
-json.extract! @curation_concern, *[:id] + @curation_concern.class.fields.select {|f| ![:has_model].include? f}
-json.version @curation_concern.etag
+json.extract! @curation_concern, *[:id] + @curation_concern.class.fields.select {|f| ![:has_model].include? f}

data/config/locales/curation_concerns.en.yml

@@ -1,8 +1,4 @@
 en:
-  activemodel:
-    errors:
-      messages:
-        conflict: "Another user has made a change to that %{model} since you accessed the edit form."
   curation_concerns:
     admin:
       workflow_roles:

data/curation_concerns.gemspec

@@ -27,9 +27,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'hydra-editor', '>= 2', '< 4'
   spec.add_dependency 'rails_autolink'
   spec.add_dependency 'sprockets-es6'
-  spec.add_dependency 'kaminari_route_prefix', "< 2"
+  spec.add_dependency 'kaminari_route_prefix', '~> 0.0.1'
   spec.add_dependency 'active_attr'
-  spec.add_dependency 'hydra-works', '>= 0.14.0'
+  spec.add_dependency 'hydra-works', '>= 0.15.0'
   spec.add_dependency 'active_fedora-noid', '~> 2.0.0.beta5'
   spec.add_dependency 'qa', '~> 0.5'
   spec.add_dependency 'redlock', '~> 0.1.2'
@@ -45,6 +45,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'dry-struct', '~> 0.1'
   spec.add_dependency 'flot-rails', '~> 0.0.7'
   spec.add_dependency 'highcharts-rails'
+  spec.add_dependency 'hydra-pcdm', '~> 0.9.0'
 
   spec.add_development_dependency 'solr_wrapper', '~> 0.16'
   spec.add_development_dependency 'fcrepo_wrapper', '~> 0.1'

data/lib/curation_concerns/version.rb

@@ -1,3 +1,3 @@
 module CurationConcerns
-  VERSION = '1.7.8'.freeze
+  VERSION = '2.0.0.rc1'.freeze
 end

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

@@ -30,6 +30,7 @@ class CatalogController < ApplicationController
     config.add_facet_field solr_name('language', :facetable), limit: 5
     config.add_facet_field solr_name('based_near', :facetable), limit: 5
     config.add_facet_field solr_name('publisher', :facetable), limit: 5
+    config.add_facet_field solr_name('member_of_collections', :symbol), limit: 5, label: 'Collections'
     config.add_facet_field 'generic_type_sim', show: false, single: true
 
     # Have BL send all facet field names to Solr, which has been the default

data/spec/actors/curation_concerns/apply_order_actor_spec.rb

@@ -78,25 +78,5 @@ describe CurationConcerns::Actors::ApplyOrderActor do
         expect(curation_concern.ordered_member_ids.size).to eq(1)
       end
     end
-
-    context 'with ordered_member_ids that include a work owned by a different user' do
-      # set user not a non-admin for this test to ensure the actor disallows adding the child
-      let(:user) { create(:user) }
-      let(:other_user) { create(:user) }
-      let(:child) { create(:generic_work, user: other_user) }
-      let(:attributes) { { ordered_member_ids: [child.id] } }
-      let(:root_actor) { double }
-
-      before do
-        allow(CurationConcerns::Actors::RootActor).to receive(:new).and_return(root_actor)
-        allow(root_actor).to receive(:update).with({}).and_return(true)
-        curation_concern.apply_depositor_metadata(user.user_key)
-        curation_concern.save!
-      end
-
-      it "does not attach the work" do
-        expect(subject.update(attributes)).to be false
-      end
-    end
   end
 end

data/spec/actors/curation_concerns/work_actor_spec.rb

@@ -81,7 +81,7 @@ describe CurationConcerns::Actors::GenericWorkActor do
       end
 
       context 'with in_work_ids' do
-        let(:parent) { create(:generic_work, user: user) }
+        let(:parent) { FactoryGirl.create(:generic_work) }
         let(:attributes) do
           FactoryGirl.attributes_for(:generic_work, visibility: visibility).merge(
             in_works_ids: [parent.id]
@@ -91,11 +91,6 @@ describe CurationConcerns::Actors::GenericWorkActor do
           expect(subject.create(attributes)).to be true
           expect(curation_concern.in_works).to eq [parent]
         end
-        it "does not attach the parent" do
-          allow(curation_concern).to receive(:depositor).and_return("blahblahblah")
-          expect(subject.create(attributes)).to be false
-          expect(curation_concern.in_works).to eq []
-        end
       end
 
       context 'with a file' do
@@ -195,20 +190,23 @@ describe CurationConcerns::Actors::GenericWorkActor do
     end
 
     context 'with in_works_ids' do
-      let(:parent) { create(:generic_work, user: user) }
-      let(:old_parent) { create(:generic_work, user: user) }
+      let(:parent) { FactoryGirl.create(:generic_work) }
+      let(:old_parent) { FactoryGirl.create(:generic_work) }
       let(:attributes) do
         FactoryGirl.attributes_for(:generic_work).merge(
           in_works_ids: [parent.id]
         )
       end
       before do
+        curation_concern.apply_depositor_metadata(user.user_key)
+        curation_concern.save!
         old_parent.ordered_members << curation_concern
         old_parent.save!
       end
       it "attaches the parent" do
         expect(subject.update(attributes)).to be true
         expect(curation_concern.in_works).to eq [parent]
+
         expect(old_parent.reload.members).to eq []
       end
     end
@@ -226,7 +224,6 @@ describe CurationConcerns::Actors::GenericWorkActor do
         old_parent.save!
       end
       it "removes the old parent" do
-        allow(curation_concern).to receive(:depositor).and_return(old_parent.depositor)
         expect(subject.update(attributes)).to be true
         expect(curation_concern.in_works).to eq []
         expect(old_parent.reload.members).to eq []
@@ -254,18 +251,17 @@ describe CurationConcerns::Actors::GenericWorkActor do
       let!(:collection1) { create(:collection, user: user) }
       let!(:collection2) { create(:collection, user: user) }
       let(:attributes) do
-        FactoryGirl.attributes_for(:generic_work, collection_ids: [collection2.id])
+        FactoryGirl.attributes_for(:generic_work, member_of_collection_ids: [collection2.id])
       end
       before do
         curation_concern.apply_depositor_metadata(user.user_key)
+        curation_concern.member_of_collections = [collection1]
         curation_concern.save!
-        collection1.members << curation_concern
-        collection1.save!
       end
 
       it 'remove from the old collection and adds to the new collection' do
         curation_concern.reload
-        expect(curation_concern.in_collections).to eq [collection1]
+        expect(curation_concern.member_of_collection_ids).to eq [collection1.id]
         # before running actor.update, the work is in collection1
 
         expect(subject.update(attributes)).to be true
@@ -274,7 +270,7 @@ describe CurationConcerns::Actors::GenericWorkActor do
         expect(curation_concern.identifier).to be_blank
         expect(curation_concern).to be_persisted
         # after running actor.update, the work is in collection2 and no longer in collection1
-        expect(curation_concern.in_collections).to eq [collection2]
+        expect(curation_concern.member_of_collections).to eq [collection2]
       end
     end
 

data/spec/controllers/curation_concerns/collections_controller_spec.rb

@@ -59,13 +59,13 @@ describe CollectionsController do
                               }
       end.to change { Collection.count }.by(1)
       collection = assigns(:collection)
-      expect(collection.members).to match_array [asset1, asset2]
+      expect(collection.member_objects).to match_array [asset1, asset2]
     end
 
     it 'adds docs to the collection if a batch id is provided and add the collection id to the documents in the collection' do
       asset1.save
       post :create, params: { batch_document_ids: [asset1.id], collection: collection_attrs }
-      expect(assigns[:collection].members).to eq [asset1]
+      expect(assigns[:collection].member_objects).to eq [asset1]
 
       asset_results = ActiveFedora::SolrService.instance.conn.get 'select', params: { fq: ["id:\"#{asset1.id}\""], fl: ['id'] }
       expect(asset_results['response']['numFound']).to eq 1
@@ -93,9 +93,10 @@ describe CollectionsController do
 
     context 'collection members' do
       before do
-        [asset1, asset2].map(&:save) # bogus_depositor_asset is already saved
-        collection.members = [asset1, asset2]
-        collection.save!
+        [asset1, asset2].each do |asset|
+          asset.member_of_collections << collection
+          asset.save!
+        end
       end
 
       # Collections are unordered by default, which disallows duplicates.
@@ -123,9 +124,9 @@ describe CollectionsController do
                                  collection: { members: 'add' },
                                  batch_document_ids: [asset4.id]
                                }
-        }.to change { collection.reload.members.size }.by(1)
+        }.to change { collection.reload.member_objects.size }.by(1)
         expect(response).to redirect_to routes.url_helpers.collection_path(collection)
-        expect(assigns[:collection].members).to match_array [asset1, asset2, asset4]
+        expect(assigns[:collection].member_objects).to match_array [asset1, asset2, asset4]
 
         asset_results = ActiveFedora::SolrService.instance.conn.get 'select', params: { fq: ["id:\"#{asset2.id}\""], fl: ['id'] }
         expect(asset_results['response']['numFound']).to eq 1
@@ -141,7 +142,7 @@ describe CollectionsController do
                                  collection: { members: 'remove' },
                                  batch_document_ids: [asset2]
                                }
-        }.to change { collection.reload.members.size }.by(-1)
+        }.to change { asset2.reload.member_of_collections.size }.by(-1)
         asset_results = ActiveFedora::SolrService.instance.conn.get 'select', params: { fq: ["id:\"#{asset2.id}\""], fl: ['id'] }
         expect(asset_results['response']['numFound']).to eq 1
 
@@ -160,8 +161,10 @@ describe CollectionsController do
         end
       end
       before do
-        collection.members = [asset1, asset2, asset3]
-        collection.save!
+        [asset1, asset2, asset3].each do |asset|
+          asset.member_of_collections << collection
+          asset.save
+        end
       end
 
       it 'moves the members' do
@@ -172,8 +175,8 @@ describe CollectionsController do
               destination_collection_id: collection2,
               batch_document_ids: [asset2, asset3]
             }
-        expect(collection.reload.members).to eq [asset1]
-        expect(collection2.reload.members).to match_array [asset2, asset3]
+        expect(collection.reload.member_objects).to eq [asset1]
+        expect(collection2.reload.member_objects).to match_array [asset2, asset3]
       end
     end
 
@@ -201,8 +204,10 @@ describe CollectionsController do
           a.apply_depositor_metadata(user)
           a.save
         end
-        collection.members = [asset1, asset2, asset3]
-        collection.save
+        [asset1, asset2, asset3].each do |asset|
+          asset.member_of_collections = [collection]
+          asset.save
+        end
       end
 
       it 'returns the collection and its members' do

data/spec/controllers/curation_concerns/generic_works_controller_spec.rb

@@ -20,7 +20,6 @@ describe CurationConcerns::GenericWorksController do
       get :show, params: { id: work }
       expect(response.code).to eq '401'
       expect(response).to render_template(:unavailable)
-      expect(assigns[:presenter]).to be_instance_of CurationConcerns::WorkShowPresenter
       expect(flash[:notice]).to eq 'The work is not currently available because it has not yet completed the approval process'
     end
   end
@@ -341,7 +340,7 @@ describe CurationConcerns::GenericWorksController do
     it "is successful" do
       get :file_manager, params: { id: work.id }
       expect(response).to be_success
-      expect(assigns(:form)).not_to be_blank
+      expect(assigns(:presenter)).not_to be_blank
     end
   end
 

data/spec/controllers/downloads_controller_spec.rb

@@ -6,7 +6,6 @@ describe DownloadsController do
     let(:file_set) do
       FactoryGirl.create(:file_with_work, user: user, content: File.open(fixture_file_path('files/image.png')))
     end
-    let(:default_image) { ActionController::Base.helpers.image_path 'default.png' }
     it 'calls render_404 if the object does not exist' do
       expect(controller).to receive(:render_404) { controller.render body: nil }
       get :show, params: { id: '8675309' }
@@ -16,16 +15,18 @@ describe DownloadsController do
       let(:another_user) { FactoryGirl.create(:user) }
       before { sign_in another_user }
 
-      it 'redirects to the default image' do
+      it 'redirects to root' do
         get :show, params: { id: file_set.to_param }
-        expect(response).to redirect_to default_image
+        expect(response).to redirect_to root_path
+        expect(flash['alert']).to eq 'You are not authorized to access this page.'
       end
     end
 
     context "when user isn't logged in" do
-      it 'redirects to the default image' do
+      it 'redirects to sign in' do
         get :show, params: { id: file_set.to_param }
-        expect(response).to redirect_to default_image
+        expect(response).to redirect_to new_user_session_path
+        expect(flash['alert']).to eq 'You are not authorized to access this page.'
       end
 
       it 'authorizes the resource using only the id' do