curation_concerns 1.7.6 → 1.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b30d38b53d476bbfc1cea73a8c9133349ceed15
-  data.tar.gz: 92b2af16e5151eac8855e9964574630497748b06
+  metadata.gz: 60d64b0327762c6a74445d94e7933ac8fe6003e7
+  data.tar.gz: 8af9f568602191a9afaaa3fcee090c1e88ed4f67
 SHA512:
-  metadata.gz: 65d9dc94b9086238326a41247bb27f20dcb5111efe60b2aeb2a57b23dcb4b0a5fff9e10c923dccc6611679a043231b2c14912c7b9b2ce720372b643535033051
-  data.tar.gz: 601036a1bd6a491062a0e8cfde977d46c08f915248d8811bf7555a9122bfcfd49779a045b52751732c7a30092107a338298b82c2fa2ce9538d36cce3b95e94d3
+  metadata.gz: f891d3bff4d44ed3a89b21911341304ac843466bda847cf5ba284e09690c708ee5e7efe069a2c99c36700342bf0ad211a15a4f5d077bdc9cf8ac99b99a1aba0d
+  data.tar.gz: 0819ec209d2471aec58f0c5c57cfc6cf16eaf28ec8fb61464653c400a873cfcd56aff481a3a60799a8fa0239c5cefb7f58aa04240782b1842d6d071779456366

data/.travis.yml

@@ -1,8 +1,12 @@
 language: ruby
 cache: bundler
 sudo: false
+
 rvm:
   - 2.3.1
+
+services: redis
+
 env:
   global:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
@@ -11,5 +15,6 @@ env:
       RDF_VERSION=1.99.1
     - RAILS_VERSION=5.0.0.1
       RDF_VERSION=2.1.1
+
 before_script:
   - jdk_switcher use oraclejdk8

data/app/jobs/characterize_job.rb

@@ -1,4 +1,6 @@
 class CharacterizeJob < ActiveJob::Base
+  include CurationConcerns::Lockable
+
   queue_as CurationConcerns.config.ingest_queue_name
 
   # @param [FileSet] file_set
@@ -7,11 +9,16 @@ class CharacterizeJob < ActiveJob::Base
   def perform(file_set, file_id, filepath = nil)
     filename = CurationConcerns::WorkingDirectory.find_or_retrieve(file_id, file_set.id, filepath)
     raise LoadError, "#{file_set.class.characterization_proxy} was not found" unless file_set.characterization_proxy?
-    Hydra::Works::CharacterizationService.run(file_set.characterization_proxy, filename)
-    Rails.logger.debug "Ran characterization on #{file_set.characterization_proxy.id} (#{file_set.characterization_proxy.mime_type})"
-    file_set.characterization_proxy.save!
-    file_set.update_index
-    file_set.parent.in_collections.each(&:update_index) if file_set.parent
+
+    # Prevent other jobs from trying to modify the FileSet at the same time
+    acquire_lock_for(file_set.id) do
+      Hydra::Works::CharacterizationService.run(file_set.characterization_proxy, filename)
+      Rails.logger.debug "Ran characterization on #{file_set.characterization_proxy.id} (#{file_set.characterization_proxy.mime_type})"
+      file_set.characterization_proxy.save!
+      file_set.update_index
+      file_set.parent.in_collections.each(&:update_index) if file_set.parent
+    end
+
     CreateDerivativesJob.perform_later(file_set, file_id, filename)
   end
 end

data/app/jobs/create_derivatives_job.rb

@@ -1,4 +1,6 @@
 class CreateDerivativesJob < ActiveJob::Base
+  include CurationConcerns::Lockable
+
   queue_as CurationConcerns.config.ingest_queue_name
 
   # @param [FileSet] file_set
@@ -8,12 +10,15 @@ class CreateDerivativesJob < ActiveJob::Base
     return if file_set.video? && !CurationConcerns.config.enable_ffmpeg
     filename = CurationConcerns::WorkingDirectory.find_or_retrieve(file_id, file_set.id, filepath)
 
-    file_set.create_derivatives(filename)
+    # Prevent other jobs from trying to modify the FileSet at the same time
+    acquire_lock_for(file_set.id) do
+      file_set.create_derivatives(filename)
 
-    # Reload from Fedora and reindex for thumbnail and extracted text
-    file_set.reload
-    file_set.update_index
-    file_set.parent.update_index if parent_needs_reindex?(file_set)
+      # Reload from Fedora and reindex for thumbnail and extracted text
+      file_set.reload
+      file_set.update_index
+      file_set.parent.update_index if parent_needs_reindex?(file_set)
+    end
   end
 
   # If this file_set is the thumbnail for the parent work,

data/app/jobs/ingest_file_job.rb

@@ -1,4 +1,6 @@
 class IngestFileJob < ActiveJob::Base
+  include CurationConcerns::Lockable
+
   queue_as CurationConcerns.config.ingest_queue_name
 
   # @param [FileSet] file_set
@@ -15,15 +17,17 @@ class IngestFileJob < ActiveJob::Base
     local_file.mime_type = opts.fetch(:mime_type, nil)
     local_file.original_name = opts.fetch(:filename, File.basename(filepath))
 
-    # Tell AddFileToFileSet service to skip versioning because versions will be minted by
-    # VersionCommitter when necessary during save_characterize_and_record_committer.
-    Hydra::Works::AddFileToFileSet.call(file_set,
-                                        local_file,
-                                        relation,
-                                        versioning: false)
-
-    # Persist changes to the file_set
-    file_set.save!
+    # Prevent other jobs from trying to modify the FileSet at the same time
+    acquire_lock_for(file_set.id) do
+      # Tell AddFileToFileSet service to skip versioning because versions will be minted by
+      # VersionCommitter when necessary during save_characterize_and_record_committer.
+      Hydra::Works::AddFileToFileSet.call(file_set,
+                                          local_file,
+                                          relation,
+                                          versioning: false)
+      # Persist changes to the file_set
+      file_set.save!
+    end
 
     repository_file = file_set.send(relation)
 

data/app/services/curation_concerns/workflow/grant_edit_to_depositor.rb

@@ -4,7 +4,7 @@ module CurationConcerns
     # grants the creator the ability to alter it.
     class GrantEditToDepositor
       def self.call(target:, **)
-        target.edit_users = [target.depositor]
+        target.edit_users += [target.depositor]
       end
     end
   end

data/lib/curation_concerns/version.rb

@@ -1,3 +1,3 @@
 module CurationConcerns
-  VERSION = '1.7.6'.freeze
+  VERSION = '1.7.7'.freeze
 end

data/spec/services/curation_concerns/workflow/grant_edit_to_depositor_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 
 RSpec.describe CurationConcerns::Workflow::GrantEditToDepositor do
   let(:depositor) { create(:user) }
-  let(:work) { create(:work_without_access, depositor: depositor.user_key) }
   let(:user) { User.new }
 
   describe ".call" do
@@ -12,9 +11,21 @@ RSpec.describe CurationConcerns::Workflow::GrantEditToDepositor do
                            user: user)
     end
 
-    it "adds edit access " do
-      expect { subject }.to change { work.edit_users }.from([]).to([depositor.user_key])
-      expect(work).to be_valid
+    context "with no additional editors" do
+      let(:work) { create(:work_without_access, depositor: depositor.user_key) }
+      it "adds edit access" do
+        expect { subject }.to change { work.edit_users }.from([]).to([depositor.user_key])
+        expect(work).to be_valid
+      end
+    end
+
+    context "with an additional editor" do
+      let(:editor) { create(:user) }
+      let(:work) { create(:work_without_access, depositor: depositor.user_key, edit_users: [editor.user_key]) }
+      it "adds edit access" do
+        expect { subject }.to change { work.edit_users }.from([editor.user_key]).to([editor.user_key, depositor.user_key])
+        expect(work).to be_valid
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curation_concerns
 version: !ruby/object:Gem::Version
-  version: 1.7.6
+  version: 1.7.7
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-10 00:00:00.000000000 Z
+date: 2017-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head