curation_concerns-models 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3519b3ed462c460a07f19055e6c852cc5a062b33
-  data.tar.gz: 4e3956164fe04bc1209f6dbe683c1c8a0ab245c9
+  metadata.gz: a1dc6348bb2734470db744f9c7b4532f6410890c
+  data.tar.gz: 424331ad60e04ccad8f5bb7f3d917231707e8fa1
 SHA512:
-  metadata.gz: d79cdcb836c3e8d6dc60da0074bcf763652311b774373bb7f3db77157868d3fb162df850e23f1a9b0376717176b636f444cb5ab4eb25d85402bddcec8258161a
-  data.tar.gz: c7262a624b1f4d52c52cc371480513fe1520b87091be157d8f180cb711cdf34da9c45846c56b28c390015110b70032f8f028f64683d9ebfa53c40c2a92d5fc80
+  metadata.gz: 5e4cb52ebf896972e4a735c237c913ddb8cadebb801f49ae4746fedcd15ce34c61d178ce1b577561dbd3504d8e53c55ad71ce8b582231b599d6d80099ec0bceb
+  data.tar.gz: 39528c6857a9c92c36e16119c3ec1d95a35f8969feeadde030b1ae97f86b9de6288400dc586e56f159862c030f0a042837e283de73876201655f33497f0b1c05

data/app/actors/curation_concerns/file_set_actor.rb

@@ -2,6 +2,7 @@ module CurationConcerns
   # Actions are decoupled from controller logic so that they may be called from a controller or a background job.
   class FileSetActor
     include CurationConcerns::ManagesEmbargoesActor
+    include CurationConcerns::Lockable
 
     attr_reader :file_set, :user, :attributes, :curation_concern
 
@@ -169,17 +170,6 @@ module CurationConcerns
         end
       end
 
-      def acquire_lock_for(lock_key, &block)
-        lock_manager.lock(lock_key, &block)
-      end
-
-      def lock_manager
-        @lock_manager ||= CurationConcerns::LockManager.new(
-          CurationConcerns.config.lock_time_to_live,
-          CurationConcerns.config.lock_retry_count,
-          CurationConcerns.config.lock_retry_delay)
-      end
-
       def assign_visibility?(file_set_params = {})
         !((file_set_params || {}).keys & %w(visibility embargo_release_date lease_expiration_date)).empty?
       end

data/app/indexers/curation_concerns/collection_indexer.rb

@@ -1,12 +1,15 @@
 module CurationConcerns
   class CollectionIndexer < Hydra::PCDM::CollectionIndexer
+    include IndexesThumbnails
     STORED_INTEGER = Solrizer::Descriptor.new(:integer, :stored)
+
     def generate_solr_document
       super.tap do |solr_doc|
         # Makes Collections show under the "Collections" tab
         Solrizer.set_field(solr_doc, 'generic_type', 'Collection', :facetable)
         # Index the size of the collection in bytes
         solr_doc[Solrizer.solr_name(:bytes, STORED_INTEGER)] = object.bytes
+        solr_doc['thumbnail_path_ss'] = thumbnail_path
       end
     end
   end

data/app/models/concerns/curation_concerns/with_file_sets.rb

@@ -5,7 +5,7 @@ module CurationConcerns
 
     included do
       # The file_sets association and its accessor methods comes from Hydra::Works::AggregatesFileSets
-      before_destroy :before_destroy_cleanup_file_sets
+      before_destroy :cleanup_file_sets
     end
 
     # Stopgap unil ActiveFedora ContainerAssociation includes an *_ids accessor.
@@ -14,7 +14,11 @@ module CurationConcerns
       file_sets.map(&:id)
     end
 
-    def before_destroy_cleanup_file_sets
+    def cleanup_file_sets
+      # Destroy the list source first.  This prevents each file_set from attemping to
+      # remove itself individually from the work. If hundreds of files are attached,
+      # this would take too long.
+      list_source.destroy
       file_sets.each(&:destroy)
     end
 

data/app/models/concerns/curation_concerns/work_behavior.rb

@@ -12,7 +12,6 @@ module CurationConcerns::WorkBehavior
   include CurationConcerns::WithFileSets
   include CurationConcerns::Naming
   include CurationConcerns::RequiredMetadata
-  include CurationConcerns::BelongsToUploadSets
   include Hydra::AccessControls::Embargoable
 
   included do

data/app/services/curation_concerns/lock_manager.rb

@@ -15,13 +15,15 @@ module CurationConcerns
 
     # Blocks until lock is acquired or timeout.
     def lock(key)
+      returned_from_block = nil
       client.lock(key, @ttl) do |locked|
         if locked
-          yield
+          returned_from_block = yield
         else
           raise UnableToAcquireLockError
         end
       end
+      returned_from_block
     end
 
     private

data/app/services/curation_concerns/lockable.rb

@@ -0,0 +1,16 @@
+module CurationConcerns
+  module Lockable
+    extend ActiveSupport::Concern
+
+    def acquire_lock_for(lock_key, &block)
+      lock_manager.lock(lock_key, &block)
+    end
+
+    def lock_manager
+      @lock_manager ||= CurationConcerns::LockManager.new(
+        CurationConcerns.config.lock_time_to_live,
+        CurationConcerns.config.lock_retry_count,
+        CurationConcerns.config.lock_retry_delay)
+    end
+  end
+end

data/curation_concerns-models.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'active_attr'
-  spec.add_dependency 'hydra-collections', '~> 6.0.0.rc1'
+  spec.add_dependency 'hydra-collections', '~> 6.0.0'
   spec.add_dependency 'hydra-head', '~> 9.3'
   spec.add_dependency 'hydra-works', '~> 0.6'
   spec.add_dependency 'active_fedora-noid', '~> 1.0'

data/lib/curation_concerns/models/engine.rb

@@ -11,6 +11,7 @@ module CurationConcerns
         require 'active_fedora/noid'
         require 'curation_concerns/noid'
         require 'curation_concerns/permissions'
+        require 'curation_concerns/lockable'
       end
 
       initializer 'configure' do

data/lib/curation_concerns/models/version.rb

@@ -1,5 +1,5 @@
 module CurationConcerns
   module Models
-    VERSION = "0.4.0"
+    VERSION = "0.5.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: curation_concerns-models
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Justin Coyne
 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: active_attr
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc1
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc1
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: hydra-head
   requirement: !ruby/object:Gem::Requirement
@@ -194,11 +194,9 @@ files:
 - app/jobs/ingest_file_job.rb
 - app/jobs/ingest_local_file_job.rb
 - app/jobs/resolrize_job.rb
-- app/jobs/upload_set_update_job.rb
 - app/models/checksum_audit_log.rb
 - app/models/concerns/curation_concerns/ability.rb
 - app/models/concerns/curation_concerns/basic_metadata.rb
-- app/models/concerns/curation_concerns/belongs_to_upload_sets.rb
 - app/models/concerns/curation_concerns/collection_behavior.rb
 - app/models/concerns/curation_concerns/file_set/belongs_to_works.rb
 - app/models/concerns/curation_concerns/file_set/derivatives.rb
@@ -216,20 +214,19 @@ files:
 - app/models/concerns/curation_concerns/required_metadata.rb
 - app/models/concerns/curation_concerns/serializers.rb
 - app/models/concerns/curation_concerns/solr_document_behavior.rb
-- app/models/concerns/curation_concerns/upload_set_behavior.rb
 - app/models/concerns/curation_concerns/user.rb
 - app/models/concerns/curation_concerns/with_file_sets.rb
 - app/models/concerns/curation_concerns/work_behavior.rb
 - app/models/curation_concerns/classify_concern.rb
 - app/models/curation_concerns/quick_classification_query.rb
 - app/models/single_use_link.rb
-- app/models/upload_set.rb
 - app/models/version_committer.rb
 - app/services/curation_concerns/derivative_path.rb
 - app/services/curation_concerns/file_set_audit_service.rb
 - app/services/curation_concerns/indexes_thumbnails.rb
 - app/services/curation_concerns/local_file_service.rb
 - app/services/curation_concerns/lock_manager.rb
+- app/services/curation_concerns/lockable.rb
 - app/services/curation_concerns/noid.rb
 - app/services/curation_concerns/persist_derivatives.rb
 - app/services/curation_concerns/persist_directly_contained_output_file_service.rb
@@ -286,7 +283,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: Simple institutional repository models for Hydra

data/app/jobs/upload_set_update_job.rb

@@ -1,77 +0,0 @@
-class UploadSetUpdateJob < ActiveJob::Base
-  include Hydra::PermissionsQuery
-  include CurationConcerns::Messages
-
-  queue_as :upload_set_update
-
-  attr_accessor :saved, :denied
-
-  # This copies metadata from the passed in attribute to all of the works that
-  # are members of the given upload set
-  def perform(login, upload_set_id, titles, attributes, visibility)
-    @login = login
-    @saved = []
-    @denied = []
-    @upload_set_id = upload_set_id
-
-    titles ||= {}
-    attributes = attributes.merge(visibility: visibility)
-
-    update(upload_set, titles, attributes)
-    send_user_message
-  end
-
-  private
-
-    def upload_set
-      @upload_set ||= UploadSet.find_or_create(@upload_set_id)
-    end
-
-    def update(upload_set, titles, attributes)
-      upload_set.works.each do |work|
-        title = titles[work.id] if titles[work.id]
-        next unless update_work(work, title, attributes)
-        # TODO: stop assuming that files only belong to one work
-        saved << work
-      end
-
-      upload_set.update(status: ["Complete"])
-    end
-
-    def send_user_success_message
-      return unless CurationConcerns.config.callback.set?(:after_upload_set_update_success)
-      CurationConcerns.config.callback.run(:after_upload_set_update_success, user, upload_set)
-    end
-
-    def send_user_failure_message
-      return unless CurationConcerns.config.callback.set?(:after_upload_set_update_failure)
-      CurationConcerns.config.callback.run(:after_upload_set_update_failure, user, upload_set)
-    end
-
-    def send_user_message
-      if denied.empty?
-        send_user_success_message unless saved.empty?
-      else
-        send_user_failure_message
-      end
-    end
-
-    def user
-      @user ||= User.find_by_user_key(@login)
-    end
-
-    def update_work(work, title, attributes)
-      unless user.can? :edit, work
-        ActiveFedora::Base.logger.error "User #{user.user_key} DENIED access to #{work.id}!"
-        denied << work
-        return
-      end
-
-      work.title = title if title
-      work_actor(work, attributes).update
-    end
-
-    def work_actor(work, attributes)
-      CurationConcerns::GenericWorkActor.new(work, user, attributes)
-    end
-end

data/app/models/concerns/curation_concerns/belongs_to_upload_sets.rb

@@ -1,13 +0,0 @@
-module CurationConcerns
-  module BelongsToUploadSets
-    extend ActiveSupport::Concern
-    included do
-      belongs_to :upload_set, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf
-    end
-
-    # Is this file in the middle of being processed by an UploadSet?
-    def processing?
-      try(:upload_set).try(:status) == ['processing'.freeze]
-    end
-  end
-end

data/app/models/concerns/curation_concerns/upload_set_behavior.rb

@@ -1,37 +0,0 @@
-module CurationConcerns
-  module UploadSetBehavior
-    extend ActiveSupport::Concern
-    include Hydra::AccessControls::Permissions
-    include CurationConcerns::Noid
-
-    included do
-      has_many :works, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
-
-      property :title, predicate: ::RDF::DC.title
-      property :status, predicate: ::RDF::DC.type
-    end
-
-    module ClassMethods
-      def find_or_create(id)
-        UploadSet.find(id)
-      rescue ActiveFedora::ObjectNotFoundError
-        safe_create(id)
-      end
-
-      private
-
-        # This method handles most race conditions gracefully.
-        # If an upload_set with the same ID is created by another thread
-        # we fetch the upload_set that was created (rather than throwing
-        # an error) and continute.
-        def safe_create(id)
-          UploadSet.create(id: id)
-        rescue ActiveFedora::IllegalOperation
-          # This is the exception thrown by LDP when we attempt to
-          # create a duplicate object. If we can find the object
-          # then we are good to go.
-          UploadSet.find(id)
-        end
-    end
-  end
-end

data/app/models/upload_set.rb

@@ -1,3 +0,0 @@
-class UploadSet < ActiveFedora::Base
-  include CurationConcerns::UploadSetBehavior
-end