curation_concerns 2.0.0.rc1 → 2.0.0.rc2

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

@@ -4,6 +4,8 @@
     <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 %>
 
@@ -12,6 +14,9 @@
 
   <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_in_works_error.html.erb

@@ -0,0 +1,3 @@
+<% unless f.object.model.errors[:in_works_ids].empty? %>
+  <%= f.full_error(:in_works_ids) %>
+<% end %>

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

@@ -0,0 +1,3 @@
+<% unless f.object.model.errors[:ordered_member_ids].empty? %>
+  <%= f.full_error(:ordered_member_ids) %>
+<% 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 @presenter.to_s, [main_app, @presenter] %>
+    Back to <%= link_to @form.to_s, [main_app, @form] %>
   </li>
 </ul>
 
-<% if !@presenter.member_presenters.empty? %>
+<% if !@form.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 +1,2 @@
-json.extract! @curation_concern, *[:id] + @curation_concern.class.fields.select {|f| ![:has_model].include? f}
+json.extract! @curation_concern, *[:id] + @curation_concern.class.fields.select {|f| ![:has_model].include? f}
+json.version @curation_concern.etag

data/config/locales/curation_concerns.en.yml

@@ -1,4 +1,8 @@
 en:
+  activemodel:
+    errors:
+      messages:
+        conflict: "Your changes could not be saved because another user (or background job) updated this %{model} after you began editing. Please make sure all file attachments have completed successfully and try again. This form has refreshed with the most recent saved copy of the %{model}."
   curation_concerns:
     admin:
       workflow_roles:

data/curation_concerns.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'hydra-head', '>= 10.3.0', '< 11'
-  spec.add_dependency 'active-fedora', '>= 10.3.0.rc1'
+  spec.add_dependency 'active-fedora', '>= 10.3.0'
   spec.add_dependency 'blacklight', '~> 6.3'
   spec.add_dependency 'breadcrumbs_on_rails', '>= 3.0.1', '< 4'
   spec.add_dependency 'jquery-ui-rails', '~> 5.0.5'

data/db/migrate/20170308175556_add_allows_access_grant_to_workflow.rb

@@ -0,0 +1,5 @@
+class AddAllowsAccessGrantToWorkflow < ActiveRecord::Migration
+  def change
+    add_column :sipity_workflows, :allows_access_grant, :boolean
+  end
+end

data/lib/curation_concerns/data_migration/collections_migration.rb

@@ -0,0 +1,16 @@
+module CurationConcerns
+  module DataMigration
+    class CollectionsMigration
+      def self.run
+        ::Collection.all.each do |collection|
+          collection.members.each do |member|
+            member.member_of_collections << collection
+            member.save
+          end
+          collection.members = []
+          collection.save
+        end
+      end
+    end
+  end
+end

data/lib/curation_concerns/version.rb

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

data/lib/generators/curation_concerns/templates/workflow.json.erb

@@ -4,6 +4,7 @@
             "name": "default",
             "label": "Default workflow",
             "description": "A single submission step, default workflow",
+            "allows_access_grant": true,
             "actions": [
                 {
                     "name": "deposit",

data/lib/tasks/curation_concerns.rake

@@ -7,4 +7,16 @@ namespace :curation_concerns do
       puts "  #{model}: #{model.count}"
     end
   end
+  namespace :migrate do
+    desc "Migrate collections"
+    task collections: :environment do
+      CurationConcerns::DataMigration::CollectionsMigration.run
+    end
+  end
+  namespace :solr do
+    desc "Enqueue a job to resolrize the repository objects"
+    task reindex: :environment do
+      ResolrizeJob.perform_later
+    end
+  end
 end

data/spec/actors/curation_concerns/add_as_member_of_collections_actor_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+describe CurationConcerns::Actors::AddAsMemberOfCollectionsActor do
+  let(:user) { create(:user) }
+  let(:curation_concern) { GenericWork.new }
+  let(:attributes) { {} }
+  let(:collection) { FactoryGirl.create(:collection, user: user, title: ['A good title']) }
+  subject do
+    CurationConcerns::Actors::ActorStack.new(curation_concern,
+                                             user,
+                                             [described_class,
+                                              CurationConcerns::Actors::GenericWorkActor])
+  end
+  describe 'the next actor' do
+    let(:root_actor) { double }
+    before do
+      allow(CurationConcerns::Actors::RootActor).to receive(:new).and_return(root_actor)
+    end
+
+    let(:attributes) do
+      { member_of_collection_ids: [collection.id], title: ['test'] }
+    end
+
+    it 'does not receive the member_of_collection_ids' do
+      expect(root_actor).to receive(:create).with(title: ['test'])
+      subject.create(attributes)
+    end
+  end
+
+  describe 'create' do
+    let(:attributes) do
+      { member_of_collection_ids: [collection.id], title: ['test'] }
+    end
+
+    it 'adds it to the collection' do
+      expect(subject.create(attributes)).to be true
+      expect(curation_concern.member_of_collections).to eq [collection]
+    end
+
+    describe "when work is in user's own collection" do
+      it "removes the work from that collection" do
+        subject.create(attributes)
+        expect(subject.create(member_of_collection_ids: [])).to be true
+        expect(curation_concern.member_of_collections).to eq []
+      end
+    end
+
+    describe "when work is in another user's collection" do
+      let(:other_user) { create(:user) }
+      let(:collection) { FactoryGirl.create(:collection, user: other_user, title: ['A good title']) }
+
+      it "doesn't remove the work from that collection" do
+        subject.create(attributes)
+        expect(subject.create(member_of_collection_ids: [])).to be true
+        expect(curation_concern.member_of_collections).to eq [collection]
+      end
+    end
+  end
+end

data/spec/actors/curation_concerns/apply_order_actor_spec.rb

@@ -78,5 +78,25 @@ 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/optimistic_lock_validator_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+RSpec.describe CurationConcerns::OptimisticLockValidator do
+  let(:update_actor) do
+    double('update actor', update: true,
+                           curation_concern: work,
+                           user: depositor)
+  end
+
+  let(:actor) do
+    CurationConcerns::Actors::ActorStack.new(work, depositor, [described_class])
+  end
+
+  let(:depositor) { create(:user) }
+  let(:work) { create(:generic_work) }
+
+  describe "update" do
+    before do
+      allow(CurationConcerns::Actors::RootActor).to receive(:new).and_return(update_actor)
+      allow(update_actor).to receive(:update).and_return(true)
+    end
+
+    subject { actor.update(attributes) }
+
+    context "when version is blank" do
+      let(:attributes) { { version: '' } }
+      it { is_expected.to be true }
+    end
+
+    context "when version is provided" do
+      context "and the version is current" do
+        let(:attributes) { { version: work.etag } }
+
+        it "returns true and calls the next actor without the version attribute" do
+          expect(update_actor).to receive(:update).with({}).and_return(true)
+          expect(subject).to be true
+        end
+      end
+
+      context "and the version is not current" do
+        let(:attributes) { { version: "W/\"ab2e8552cb5f7f00f91d2b223eca45849c722301\"" } }
+
+        it "returns false and sets an error" do
+          expect(subject).to be false
+          expect(work.errors[:base]).to include "Your changes could not be saved because another user (or background job) updated this Generic work after you began editing. Please make sure all file attachments have completed successfully and try again. This form has refreshed with the most recent saved copy of the Generic work."
+        end
+      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) { FactoryGirl.create(:generic_work) }
+        let(:parent) { create(:generic_work, user: user) }
         let(:attributes) do
           FactoryGirl.attributes_for(:generic_work, visibility: visibility).merge(
             in_works_ids: [parent.id]
@@ -91,6 +91,11 @@ 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
@@ -190,23 +195,20 @@ describe CurationConcerns::Actors::GenericWorkActor do
     end
 
     context 'with in_works_ids' do
-      let(:parent) { FactoryGirl.create(:generic_work) }
-      let(:old_parent) { FactoryGirl.create(:generic_work) }
+      let(:parent) { create(:generic_work, user: user) }
+      let(:old_parent) { create(:generic_work, user: user) }
       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
@@ -224,6 +226,7 @@ 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 []

data/spec/controllers/curation_concerns/generic_works_controller_spec.rb

@@ -20,6 +20,7 @@ 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
@@ -340,7 +341,7 @@ describe CurationConcerns::GenericWorksController do
     it "is successful" do
       get :file_manager, params: { id: work.id }
       expect(response).to be_success
-      expect(assigns(:presenter)).not_to be_blank
+      expect(assigns(:form)).not_to be_blank
     end
   end
 

data/spec/controllers/downloads_controller_spec.rb

@@ -6,6 +6,7 @@ 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' }
@@ -15,18 +16,16 @@ describe DownloadsController do
       let(:another_user) { FactoryGirl.create(:user) }
       before { sign_in another_user }
 
-      it 'redirects to root' do
+      it 'redirects to the default image' do
         get :show, params: { id: file_set.to_param }
-        expect(response).to redirect_to root_path
-        expect(flash['alert']).to eq 'You are not authorized to access this page.'
+        expect(response).to redirect_to default_image
       end
     end
 
     context "when user isn't logged in" do
-      it 'redirects to sign in' do
+      it 'redirects to the default image' do
         get :show, params: { id: file_set.to_param }
-        expect(response).to redirect_to new_user_session_path
-        expect(flash['alert']).to eq 'You are not authorized to access this page.'
+        expect(response).to redirect_to default_image
       end
 
       it 'authorizes the resource using only the id' do

data/spec/features/create_child_work_spec.rb

@@ -6,12 +6,12 @@ feature 'Creating a new child Work', :workflow do
   let!(:sipity_entity) do
     create(:sipity_entity, proxy_for_global_id: parent.to_global_id.to_s)
   end
-  let(:redlock_client_stub) { # stub out redis connection
+  let(:redlock_client_stub) do # stub out redis connection
     client = double('redlock client')
     allow(client).to receive(:lock).and_yield(true)
     allow(Redlock::Client).to receive(:new).and_return(client)
     client
-  }
+  end
   let!(:parent) { create(:generic_work, user: user, title: ["Parent First"]) }
 
   before do
@@ -64,5 +64,19 @@ feature 'Creating a new child Work', :workflow do
 
       expect(curation_concern.reload.in_works_ids.length).to eq 2
     end
+
+    context "with a parent that doesn't belong to this user" do
+      let(:new_user) { create(:user) }
+      let(:new_parent) { create(:generic_work, user: new_user) }
+      it "fails to update" do
+        visit "/concern/parent/#{parent.id}/generic_works/#{curation_concern.id}/edit"
+        first("input#generic_work_in_works_ids", visible: false).set new_parent.id
+        first("input#parent_id", visible: false).set new_parent.id
+        click_on "Update Generic work"
+
+        expect(new_parent.reload.ordered_members.to_a.length).to eq 0
+        expect(page).to have_content "Works can only be related to each other if user has ability to edit both."
+      end
+    end
   end
 end

data/spec/forms/curation_concerns/forms/file_manager_form_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+RSpec.describe CurationConcerns::Forms::FileManagerForm do
+  let(:work) { create(:work) }
+  let(:ability) { instance_double Ability }
+  let(:form) { described_class.new(work, ability) }
+
+  describe "#member_presenters" do
+    subject { form.member_presenters }
+    let(:factory) { instance_double(CurationConcerns::MemberPresenterFactory, member_presenters: result) }
+    let(:result) { double }
+    before do
+      allow(CurationConcerns::MemberPresenterFactory).to receive(:new).with(work, ability).and_return(factory)
+    end
+    it "is delegated to the MemberPresenterFactory" do
+      expect(subject).to eq result
+    end
+  end
+end

data/spec/forms/work_form_spec.rb

@@ -22,6 +22,14 @@ describe CurationConcerns::Forms::WorkForm do
   let(:ability) { nil }
   let(:form) { PirateShipForm.new(curation_concern, ability) }
 
+  describe "#version" do
+    before do
+      allow(curation_concern).to receive(:etag).and_return('123456')
+    end
+    subject { form.version }
+    it { is_expected.to eq '123456' }
+  end
+
   describe "#select_files" do
     let(:curation_concern) { create(:work_with_one_file) }
     let(:title) { curation_concern.file_sets.first.title.first }

data/spec/lib/curation_concerns/data_migration/collections_migration_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+RSpec.describe CurationConcerns::DataMigration::CollectionsMigration do
+  let(:collection1) { create(:collection, id: 'alien', title: ['alien movies']) }
+  let(:collection2) { create(:collection, id: 'predator', title: ['predator movies']) }
+  let(:work1) { create(:work, title: ['alien resurrection']) }
+  let(:work2) { create(:work, title: ['the predator']) }
+  let(:work3) { create(:work, title: ['alien vs. predator']) }
+
+  before do
+    collection1.members = [work1, work3]
+    collection2.members = [work2, work3]
+  end
+
+  describe '.run' do
+    it 'moves relationship from collection#members to curation_concern#member_of_collections' do
+      expect(collection1.members.to_a.size).to eq 2
+      expect(collection2.members.to_a.size).to eq 2
+      expect(work1.member_of_collections.to_a.size).to eq 0
+      expect(work2.member_of_collections.to_a.size).to eq 0
+      expect(work3.member_of_collections.to_a.size).to eq 0
+      described_class.run
+      expect(collection1.reload.members.to_a.size).to eq 0
+      expect(collection2.reload.members.to_a.size).to eq 0
+      expect(work1.reload.member_of_collections.to_a.size).to eq 1
+      expect(work1.member_of_collection_ids.first).to eq 'alien'
+      expect(work2.reload.member_of_collections.to_a.size).to eq 1
+      expect(work2.member_of_collection_ids.first).to eq 'predator'
+      expect(work3.reload.member_of_collections.to_a.size).to eq 2
+      expect(work3.member_of_collection_ids).to include 'predator'
+      expect(work3.member_of_collection_ids).to include 'alien'
+    end
+  end
+end