curation_concerns-models 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf5fe8cfb43b91b4bf4b0603bfdbf427c872e442
-  data.tar.gz: da3f9e9f7e522fcce530eb0aa5f0d26289ff6b28
+  metadata.gz: 3519b3ed462c460a07f19055e6c852cc5a062b33
+  data.tar.gz: 4e3956164fe04bc1209f6dbe683c1c8a0ab245c9
 SHA512:
-  metadata.gz: b190960f8aee8224d04d027a23347dc487efeb83bf86f752c8f5eae55c79488b3a1a8d85ba1109b9fa08a1fceed7ab87dbbef6da63666fdcbd88772e8e1e48dc
-  data.tar.gz: e1f4a3d671a906437afec2d3d8c331b60d1bfce1d9407d6742c98bacb6c4ff736ec2facd7afe002a81fff49f66b77941103d6470e66d97e513bca33aeb8dbd78
+  metadata.gz: d79cdcb836c3e8d6dc60da0074bcf763652311b774373bb7f3db77157868d3fb162df850e23f1a9b0376717176b636f444cb5ab4eb25d85402bddcec8258161a
+  data.tar.gz: c7262a624b1f4d52c52cc371480513fe1520b87091be157d8f180cb711cdf34da9c45846c56b28c390015110b70032f8f028f64683d9ebfa53c40c2a92d5fc80

data/app/actors/curation_concerns/file_set_actor.rb

@@ -19,28 +19,17 @@ module CurationConcerns
     # create_content, which also performs a save.  However, due to the relationship between Hydra::PCDM objects,
     # we have to save both the parent work and the file_set in order to record the "metadata" relationship
     # between them.
-    # @param [String] upload_set_id id of the batch of files that the file was uploaded with
     # @param [ActiveFedora::Base] work the parent work that will contain the file_set.
     # @param [Hash] file_set specifying the visibility, lease and/or embargo of the file set.  If you don't provide at least one of visibility, embargo_release_date or lease_expiration_date, visibility will be copied from the parent.
 
-    def create_metadata(upload_set_id, work, file_set_params = {})
+    def create_metadata(work, file_set_params = {})
       file_set.apply_depositor_metadata(user)
       now = CurationConcerns::TimeService.time_in_utc
       file_set.date_uploaded = now
       file_set.date_modified = now
       file_set.creator = [user.user_key]
 
-      if upload_set_id && file_set.respond_to?(:upload_set_id=)
-        UploadSet.create(id: upload_set_id) unless UploadSet.exists?(upload_set_id)
-        file_set.upload_set_id = upload_set_id
-      else
-        ActiveFedora::Base.logger.warn 'unable to find UploadSet to attach to'
-      end
-
-      if assign_visibility?(file_set_params)
-        interpret_visibility file_set_params
-      end
-      # TODO: Why do we need to check if work is nil? Shoudn't that raise an error?
+      interpret_visibility file_set_params if assign_visibility?(file_set_params)
       attach_file_to_work(work, file_set, file_set_params) if work
       yield(file_set) if block_given?
     end
@@ -50,14 +39,18 @@ module CurationConcerns
     # Simultaneously moving a preservation copy to the repostiory.
     # TODO: create a job to monitor this directory and prune old files that
     # have made it to the repo
-    # @param [ActionDigest::HTTP::UploadedFile, Tempfile] file the file uploaded by the user.
+    # @param [File, ActionDigest::HTTP::UploadedFile, Tempfile] file the file uploaded by the user.
     def create_content(file)
-      file_set.label ||= file.original_filename
+      # Assign label and title of File Set is necessary.
+      file_set.label ||= file.respond_to?(:original_filename) ? file.original_filename : ::File.basename(file)
       file_set.title = [file_set.label] if file_set.title.blank?
+
+      # Need to save the file_set in order to get an id
       return false unless file_set.save
 
       working_file = copy_file_to_working_directory(file, file_set.id)
-      IngestFileJob.perform_later(file_set.id, working_file, file.content_type, user.user_key)
+      mime_type = file.respond_to?(:content_type) ? file.content_type : nil
+      IngestFileJob.perform_later(file_set.id, working_file, mime_type, user.user_key)
       make_derivative(file_set.id, working_file)
       true
     end
@@ -97,7 +90,6 @@ module CurationConcerns
 
     def destroy
       file_set.destroy
-      # TODO: need to mend the linked list of proxies (possibly wrap with a lock)
       CurationConcerns.config.callback.run(:after_destroy, file_set.id, user)
     end
 
@@ -107,11 +99,13 @@ module CurationConcerns
         CharacterizeJob.perform_later(file_set_id, working_file)
       end
 
-      # @param [ActionDispatch::Http::UploadedFile] file
+      # @param [File, ActionDispatch::Http::UploadedFile] file
       # @param [String] id the identifer
       # @return [String] path of the working file
       def copy_file_to_working_directory(file, id)
-        copy_stream_to_working_directory(id, file.original_filename, file)
+        # file_set.label not gaurunteed to be set at this point (e.g. if called from update_content)
+        file_set.label ||= file.respond_to?(:original_filename) ? file.original_filename : ::File.basename(file)
+        copy_stream_to_working_directory(id, file_set.label, file)
       end
 
       # @param [FileSet] file_set the resource

data/app/actors/curation_concerns/work_actor_behavior.rb

@@ -71,7 +71,7 @@ module CurationConcerns::WorkActorBehavior
     def attach_file(file)
       file_set = ::FileSet.new
       file_set_actor = CurationConcerns::FileSetActor.new(file_set, user)
-      file_set_actor.create_metadata(curation_concern.id, curation_concern, visibility_attributes)
+      file_set_actor.create_metadata(curation_concern, visibility_attributes)
       file_set_actor.create_content(file)
       @file_sets ||= []
       @file_sets << file_set # This is so that other methods like assign_representative can access the file_sets without reloading them from fedora

data/app/indexers/curation_concerns/collection_indexer.rb

@@ -1,9 +1,12 @@
 module CurationConcerns
   class CollectionIndexer < Hydra::PCDM::CollectionIndexer
+    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
       end
     end
   end

data/app/indexers/curation_concerns/{file_set_indexing_service.rb → file_set_indexer.rb}

@@ -1,6 +1,7 @@
 module CurationConcerns
-  class FileSetIndexingService < ActiveFedora::IndexingService
+  class FileSetIndexer < ActiveFedora::IndexingService
     include IndexesThumbnails
+    STORED_INTEGER = Solrizer::Descriptor.new(:integer, :stored)
 
     def generate_solr_document
       super.tap do |solr_doc|
@@ -9,16 +10,37 @@ module CurationConcerns
         # Label is the actual file name. It's not editable by the user.
         solr_doc[Solrizer.solr_name('label')] = object.label
         solr_doc[Solrizer.solr_name('label', :stored_sortable)] = object.label
-        solr_doc[Solrizer.solr_name('file_format')] = object.file_format
-        solr_doc[Solrizer.solr_name('file_format', :facetable)] = object.file_format
-        solr_doc[Solrizer.solr_name(:file_size, :symbol)] = object.file_size[0]
+        solr_doc[Solrizer.solr_name('file_format')] = file_format
+        solr_doc[Solrizer.solr_name('file_format', :facetable)] = file_format
+        solr_doc[Solrizer.solr_name(:file_size, STORED_INTEGER)] = object.file_size[0]
         solr_doc['all_text_timv'] = object.full_text.content
         solr_doc[Solrizer.solr_name('generic_work_ids', :symbol)] = object.generic_work_ids unless object.generic_work_ids.empty?
         solr_doc['height_is'] = Integer(object.height.first) if object.height.present?
         solr_doc['width_is'] = Integer(object.width.first) if object.width.present?
         solr_doc[Solrizer.solr_name('mime_type', :stored_sortable)] = object.mime_type
         solr_doc['thumbnail_path_ss'] = thumbnail_path
+        # Index the Fedora-generated SHA1 digest to create a linkage
+        # between files on disk (in fcrepo.binary-store-path) and objects
+        # in the repository.
+        solr_doc[Solrizer.solr_name('digest', :symbol)] = digest_from_content
       end
     end
+
+    private
+
+      def digest_from_content
+        return unless object.original_file
+        object.original_file.digest.first.to_s
+      end
+
+      def file_format
+        if object.mime_type.present? && object.format_label.present?
+          "#{object.mime_type.split('/').last} (#{object.format_label.join(', ')})"
+        elsif object.mime_type.present?
+          object.mime_type.split('/').last
+        elsif object.format_label.present?
+          object.format_label
+        end
+      end
   end
 end

data/app/indexers/curation_concerns/{work_indexing_service.rb → work_indexer.rb}

@@ -1,9 +1,9 @@
 module CurationConcerns
-  class WorkIndexingService < ActiveFedora::IndexingService
+  class WorkIndexer < ActiveFedora::IndexingService
     include IndexesThumbnails
     def generate_solr_document
       super.tap do |solr_doc|
-        # We know that all the members of GenericWorks are GenericFiles so we can use
+        # We know that all the members of GenericWorks are FileSets so we can use
         # member_ids which requires fewer Fedora API calls than file_set_ids.
         # file_set_ids requires loading all the members from Fedora but member_ids
         # looks just at solr

data/app/jobs/audit_job.rb

@@ -46,7 +46,9 @@ class AuditJob < ActiveFedoraIdBasedJob
       ChecksumAuditLog.create!(pass: passing, file_set_id: id, version: uri, file_id: file_id)
     end
 
+  private
+
     def logger
-      ActiveFedora::Base.logger
+      ActiveFedora::Base.logger || CurationConcerns::NullLogger.new
     end
 end

data/app/jobs/import_url_job.rb

@@ -11,6 +11,10 @@ class ImportUrlJob < ActiveFedoraIdBasedJob
 
     Tempfile.open(id.tr('/', '_')) do |f|
       copy_remote_file(file_set.import_url, f)
+
+      # reload the generic file once the data is copied since this is a long running task
+      file_set.reload
+
       # attach downloaded file to generic file stubbed out
       if CurationConcerns::FileSetActor.new(file_set, user).create_content(f)
         # send message to user on download success

data/app/jobs/ingest_file_job.rb

@@ -3,14 +3,25 @@ class IngestFileJob < ActiveJob::Base
 
   def perform(file_set_id, filename, mime_type, user_key)
     file_set = FileSet.find(file_set_id)
-    file = Hydra::Derivatives::IoDecorator.new(File.open(filename, "rb"))
-    file.mime_type = mime_type
-    file.original_name = File.basename(filename)
 
-    # Tell UploadFileToGenericFile service to skip versioning because versions will be minted by VersionCommitter (called by save_characterize_and_record_committer) when necessary
-    Hydra::Works::UploadFileToFileSet.call(file_set, file, versioning: false)
+    file = File.open(filename, "rb")
+    # If mime-type is known, wrap in an IO decorator
+    # Otherwise allow Hydra::Works service to determine mime_type
+    if mime_type
+      file = Hydra::Derivatives::IoDecorator.new(file)
+      file.mime_type = mime_type
+      file.original_name = File.basename(filename)
+    end
+
+    # Tell AddFileToFileSet service to skip versioning because versions will be minted by VersionCommitter (called by save_characterize_and_record_committer) when necessary
+    Hydra::Works::AddFileToFileSet.call(file_set, file, :original_file, versioning: false)
+
+    # Persist changes to the file_set
     file_set.save!
-    CurationConcerns::VersioningService.create(file_set.original_file, user_key)
-    CurationConcerns.config.callback.run(:after_create_content, file_set, user_key)
+
+    # Do post file ingest actions
+    user = User.find_by_user_key(user_key)
+    CurationConcerns::VersioningService.create(file_set.original_file, user)
+    CurationConcerns.config.callback.run(:after_create_content, file_set, user)
   end
 end

data/app/jobs/ingest_local_file_job.rb

@@ -1,14 +1,7 @@
 class IngestLocalFileJob < ActiveJob::Base
-  attr_accessor :directory, :filename, :user_key, :file_set_id
-
   queue_as :ingest_local
 
   def perform(file_set_id, directory, filename, user_key)
-    @file_set_id = file_set_id
-    @directory = directory
-    @filename = filename
-    @user_key = user_key
-
     user = User.find_by_user_key(user_key)
     fail "Unable to find user for #{user_key}" unless user
     file_set = FileSet.find(file_set_id)

data/app/jobs/upload_set_update_job.rb

@@ -4,65 +4,74 @@ class UploadSetUpdateJob < ActiveJob::Base
 
   queue_as :upload_set_update
 
-  attr_accessor :login, :title, :file_attributes, :upload_set_id, :visibility, :saved, :denied, :work_attributes
+  attr_accessor :saved, :denied
 
-  def perform(login, upload_set_id, title, file_attributes, visibility)
+  # 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
-    @title = title || {}
-    @file_attributes = file_attributes
-    @visibility = visibility
-    @work_attributes = file_attributes.merge(visibility: visibility)
-    @upload_set_id = upload_set_id
     @saved = []
     @denied = []
+    @upload_set_id = upload_set_id
 
-    upload_set = UploadSet.find_or_create(self.upload_set_id)
-    user = User.find_by_user_key(self.login)
+    titles ||= {}
+    attributes = attributes.merge(visibility: visibility)
 
-    upload_set.file_sets.each do |file|
-      update_file(file, user)
-    end
+    update(upload_set, titles, attributes)
+    send_user_message
+  end
+
+  private
 
-    upload_set.update(status: ["Complete"])
+    def upload_set
+      @upload_set ||= UploadSet.find_or_create(@upload_set_id)
+    end
 
-    if denied.empty?
-      unless saved.empty?
-        if CurationConcerns.config.callback.set?(:after_upload_set_update_success)
-          login = upload_set.depositor
-          user = User.find_by_user_key(login)
-          CurationConcerns.config.callback.run(:after_upload_set_update_success, user, upload_set, log.created_at)
-        end
-        return true
+    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
-    else
-      if CurationConcerns.config.callback.set?(:after_upload_set_update_failure)
-        login = upload_set.depositor
-        user = User.find_by_user_key(login)
-        CurationConcerns.config.callback.run(:after_upload_set_update_failure. user, upload_set, log.created_at)
+
+      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
-      return false
     end
-  end
 
-  def update_file(file, user)
-    unless user.can? :edit, file
-      ActiveFedora::Base.logger.error "User #{user.user_key} DENIED access to #{file.id}!"
-      denied << file
-      return
+    def user
+      @user ||= User.find_by_user_key(@login)
     end
-    # update the file using the actor after setting the title
-    file.title = title[file.id] if title[file.id]
-    CurationConcerns::FileSetActor.new(file, user).update_metadata(file_attributes.merge(visibility: visibility))
-
-    # update the work to the same metadata as the file.
-    # NOTE: For the moment we are assuming copied metadata.  This is likely to change.
-    # NOTE2: TODO: stop assuming that files only belong to one work
-    work = file.in_works.first
-    unless work.nil?
-      work.title = title[file.id] if title[file.id]
-      CurationConcerns::GenericWorkActor.new(work, user, work_attributes).update
+
+    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
 
-    saved << file
-  end
+    def work_actor(work, attributes)
+      CurationConcerns::GenericWorkActor.new(work, user, attributes)
+    end
 end

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

@@ -34,10 +34,14 @@ module CurationConcerns
       can :collect, :all
     end
 
+    def registered_user?
+      user_groups.include? 'registered'
+    end
+
     # Add this to your ability_logic if you want all logged in users to be able
     # to submit content
     def everyone_can_create_curation_concerns
-      return if current_user.new_record?
+      return unless registered_user?
       can :create, [::FileSet, ::Collection]
       can :create, [CurationConcerns.config.curation_concerns]
     end

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

@@ -5,10 +5,6 @@ module CurationConcerns
     included do
       property :label, predicate: ActiveFedora::RDF::Fcrepo::Model.downloadFilename, multiple: false
 
-      property :depositor, predicate: ::RDF::URI.new('http://id.loc.gov/vocabulary/relators/dpt'), multiple: false do |index|
-        index.as :symbol, :stored_searchable
-      end
-
       property :relative_path, predicate: ::RDF::URI.new('http://scholarsphere.psu.edu/ns#relativePath'), multiple: false
 
       property :import_url, predicate: ::RDF::URI.new('http://scholarsphere.psu.edu/ns#importUrl'), multiple: false do |index|
@@ -19,9 +15,6 @@ module CurationConcerns
       property :resource_type, predicate: ::RDF::Vocab::DC.type do |index|
         index.as :stored_searchable, :facetable
       end
-      property :title, predicate: ::RDF::Vocab::DC.title do |index|
-        index.as :stored_searchable, :facetable
-      end
       property :creator, predicate: ::RDF::Vocab::DC.creator do |index|
         index.as :stored_searchable, :facetable
       end

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

@@ -0,0 +1,13 @@
+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/collection_behavior.rb

@@ -23,10 +23,6 @@ module CurationConcerns
       title.present? ? title : 'No Title'
     end
 
-    def bytes
-      members.reduce(0) { |sum, gf| sum + gf.content.size.to_i }
-    end
-
     def can_be_member_of_collection?(collection)
       collection != self
     end
@@ -37,8 +33,42 @@ module CurationConcerns
       end
     end
 
+    # Compute the sum of each file in the collection using Solr to
+    # avoid having to access Fedora
+    #
+    # @return [Fixnum] size of collection in bytes
+    # @raise [RuntimeError] unsaved record does not exist in solr
+    def bytes
+      return 0 if member_ids.count == 0
+
+      raise "Collection must be saved to query for bytes" if new_record?
+
+      # One query per member_id because Solr is not a relational database
+      sizes = member_ids.collect do |work_id|
+        query = ActiveFedora::SolrQueryBuilder.construct_query_for_rel(has_model: ::FileSet.to_class_uri)
+        argz = { fl: "id, #{file_size_field}",
+                 fq: "{!join from=#{member_ids_field} to=id}id:#{work_id}"
+        }
+        files = ActiveFedora::SolrService.query(query, argz)
+        files.reduce(0) { |sum, f| sum + f[file_size_field].to_i }
+      end
+
+      sizes.reduce(0, :+)
+    end
+
     private
 
+      # Field name to look up when locating the size of each file in Solr.
+      # Override for your own installation if using something different
+      def file_size_field
+        Solrizer.solr_name(:file_size, FileSetIndexer::STORED_INTEGER)
+      end
+
+      # Solr field name collections and works use to index member ids
+      def member_ids_field
+        Solrizer.solr_name('member_ids', :symbol)
+      end
+
       def can_add_to_members?(collectible)
         collectible.try(:can_be_member_of_collection?, self)
       end

data/app/models/concerns/curation_concerns/file_set/belongs_to_works.rb

@@ -17,17 +17,17 @@ module CurationConcerns
       end
 
       # Returns the first parent object
-      # This is a hack to handle things like GenericFiles inheriting access controls from their parent.  (see CurationConcerns::ParentContainer in app/controllers/concerns/curation_concers/parent_container.rb)
+      # This is a hack to handle things like FileSets inheriting access controls from their parent.  (see CurationConcerns::ParentContainer in app/controllers/concerns/curation_concers/parent_container.rb)
       def parent
         in_objects.first
       end
 
       # Returns the id of first parent object
-      # This is a hack to handle things like GenericFiles inheriting access controls from their parent.  (see CurationConcerns::ParentContainer in app/controllers/concerns/curation_concers/parent_container.rb)
+      # This is a hack to handle things like FileSets inheriting access controls from their parent.  (see CurationConcerns::ParentContainer in app/controllers/concerns/curation_concers/parent_container.rb)
       delegate :id, to: :parent, prefix: true
 
       # Files with sibling relationships
-      # Returns all GenericFiles aggregated by any of the GenericWorks that aggregate the current object
+      # Returns all FileSets aggregated by any of the GenericWorks that aggregate the current object
       def related_files
         generic_works = self.generic_works
         return [] if generic_works.empty?

data/app/models/concerns/curation_concerns/file_set/indexing.rb

@@ -6,7 +6,7 @@ module CurationConcerns
       module ClassMethods
         # override the default indexing service
         def indexer
-          CurationConcerns::FileSetIndexingService
+          CurationConcerns::FileSetIndexer
         end
       end
     end

data/app/models/concerns/curation_concerns/file_set/querying.rb

@@ -0,0 +1,17 @@
+module CurationConcerns
+  module FileSet
+    module Querying
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        def where_digest_is(digest_string)
+          where Solrizer.solr_name('digest', :symbol) => urnify(digest_string)
+        end
+
+        def urnify(digest_string)
+          "urn:sha1:#{digest_string}"
+        end
+      end
+    end
+  end
+end

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

@@ -13,16 +13,15 @@ module CurationConcerns
     include CurationConcerns::FileSet::FullTextIndexing
     include CurationConcerns::FileSet::Indexing
     include CurationConcerns::FileSet::BelongsToWorks
-    include CurationConcerns::FileSet::BelongsToUploadSets
+    include CurationConcerns::FileSet::Querying
     include CurationConcerns::HumanReadableType
+    include CurationConcerns::RequiredMetadata
+    include CurationConcerns::Naming
     include Hydra::AccessControls::Embargoable
 
     included do
       attr_accessor :file
-    end
-
-    def human_readable_type
-      self.class.to_s.demodulize.titleize
+      self.human_readable_type = 'File'
     end
 
     def representative_id

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

@@ -0,0 +1,17 @@
+module CurationConcerns
+  module Naming
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      # Override of ActiveModel::Model name that allows us to use our custom name class
+      def model_name
+        @_model_name ||= begin
+          namespace = parents.detect do |n|
+            n.respond_to?(:use_relative_model_naming?) && n.use_relative_model_naming?
+          end
+          CurationConcerns::Name.new(self, namespace)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+module CurationConcerns
+  module RequiredMetadata
+    extend ActiveSupport::Concern
+
+    included do
+      property :depositor, predicate: ::RDF::URI.new('http://id.loc.gov/vocabulary/relators/dpt'), multiple: false do |index|
+        index.as :symbol, :stored_searchable
+      end
+      property :title, predicate: ::RDF::Vocab::DC.title do |index|
+        index.as :stored_searchable, :facetable
+      end
+    end
+  end
+end

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

@@ -44,14 +44,16 @@ module CurationConcerns
       fetch(Solrizer.solr_name('hasRelatedMediaFragment', :symbol), []).first
     end
 
+    def date_created
+      date_field('date_created')
+    end
+
+    def date_modified
+      date_field('date_modified')
+    end
+
     def date_uploaded
-      field = self[Solrizer.solr_name('date_uploaded', :stored_sortable, type: :date)]
-      return unless field.present?
-      begin
-        Date.parse(field).to_formatted_s(:standard)
-      rescue
-        Rails.logger.info "Unable to parse date: #{field.first.inspect} for #{self['id']}"
-      end
+      date_field('date_uploaded')
     end
 
     def depositor(default = '')
@@ -128,5 +130,17 @@ module CurationConcerns
                         Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
                       end
     end
+
+    private
+
+      def date_field(field_name)
+        field = self[Solrizer.solr_name(field_name, :stored_sortable, type: :date)]
+        return unless field.present?
+        begin
+          Date.parse(field).to_formatted_s(:standard)
+        rescue
+          Rails.logger.info "Unable to parse date: #{field.first.inspect} for #{self['id']}"
+        end
+      end
   end
 end

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

@@ -5,9 +5,8 @@ module CurationConcerns
     include CurationConcerns::Noid
 
     included do
-      has_many :file_sets, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf
+      has_many :works, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
 
-      property :creator, predicate: ::RDF::DC.creator
       property :title, predicate: ::RDF::DC.title
       property :status, predicate: ::RDF::DC.type
     end

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

@@ -2,14 +2,17 @@ module CurationConcerns::WorkBehavior
   extend ActiveSupport::Concern
 
   include Hydra::Works::WorkBehavior
-  include ::CurationConcerns::HumanReadableType
+  include CurationConcerns::HumanReadableType
   include CurationConcerns::Noid
   include CurationConcerns::Permissions
   include CurationConcerns::Serializers
   include Hydra::WithDepositor
   include Solrizer::Common
-  include ::CurationConcerns::HasRepresentative
-  include ::CurationConcerns::WithFileSets
+  include CurationConcerns::HasRepresentative
+  include CurationConcerns::WithFileSets
+  include CurationConcerns::Naming
+  include CurationConcerns::RequiredMetadata
+  include CurationConcerns::BelongsToUploadSets
   include Hydra::AccessControls::Embargoable
 
   included do
@@ -19,25 +22,18 @@ module CurationConcerns::WorkBehavior
 
   module ClassMethods
     def indexer
-      CurationConcerns::WorkIndexingService
+      CurationConcerns::WorkIndexer
     end
   end
 
   def to_s
     if title.present?
       Array(title).join(' | ')
-    elsif label.present?
-      Array(label).join(' | ')
     else
       'No Title'
     end
   end
 
-  # Returns a string identifying the path associated with the object. ActionPack uses this to find a suitable partial to represent the object.
-  def to_partial_path
-    "curation_concerns/#{super}"
-  end
-
   def can_be_member_of_collection?(_collection)
     true
   end

data/app/models/curation_concerns/classify_concern.rb

@@ -34,6 +34,8 @@ module CurationConcerns
       end
     end
 
+    # @option [String] type name of the model
+    # @return [Class] the model class
     def self.to_class(type)
       # TODO: we may want to allow a different (or nil) namespace
       type.camelize.constantize

data/app/models/curation_concerns/quick_classification_query.rb

@@ -1,30 +1,38 @@
 module CurationConcerns
   class QuickClassificationQuery
-    def self.each_for_context(*args, &block)
-      new(*args).all.each(&block)
-    end
-
     attr_reader :user
 
+    # @param [User] user the current user
+    # @param [Hash] options
+    # @option options [#call] :concern_name_normalizer (ClassifyConcern.to_class) a proc that translates names to classes
+    # @option options [Array<String>] :models the options to display, defaults to everything.
     def initialize(user, options = {})
       @user = user
       @concern_name_normalizer = options.fetch(:concern_name_normalizer, ClassifyConcern.method(:to_class))
-      @registered_curation_concern_names = options.fetch(:registered_curation_concern_names, CurationConcerns.config.registered_curation_concern_types)
+      @models = options.fetch(:models, CurationConcerns.config.registered_curation_concern_types)
+    end
+
+    def each(&block)
+      authorized_models.each(&block)
+    end
+
+    # @return true if the requested concerns is same as all avaliable concerns
+    def all?
+      models == CurationConcerns.config.registered_curation_concern_types
     end
 
-    def all
-      ActiveFedora::Base.logger.debug "User is #{user}"
-      ActiveFedora::Base.logger.debug "try is #{normalized_curation_concern_names.first}"
-      ActiveFedora::Base.logger.debug "can is  #{user.can?(:create, normalized_curation_concern_names.first)}"
-      normalized_curation_concern_names.select { |klass| user.can?(:create, klass) }
+    # @return [Array] a list of all the requested concerns that the user can create
+    def authorized_models
+      normalized_model_names.select { |klass| user.can?(:create, klass) }
     end
 
     private
 
-      attr_reader :concern_name_normalizer, :registered_curation_concern_names
+      attr_reader :concern_name_normalizer, :models
 
-      def normalized_curation_concern_names
-        registered_curation_concern_names.collect { |name| concern_name_normalizer.call(name) }
+      # Transform the list of requested model names into a list of class names
+      def normalized_model_names
+        models.map { |name| concern_name_normalizer.call(name) }
       end
   end
 end

data/app/services/curation_concerns/file_set_audit_service.rb

@@ -1,21 +1,30 @@
 module CurationConcerns
   class FileSetAuditService
     attr_reader :file_set
-    def initialize(file)
-      @file_set = file
+    def initialize(file_set)
+      @file_set = file_set
     end
 
     NO_RUNS = 999
 
     # provides a human readable version of the audit status
-    def human_readable_audit_status(stat)
-      case stat
-      when 0
-        'failing'
-      when 1
-        'passing'
+    # This may trigger audits to be run if required
+    # @param [Hydra::PCDM::File] file the file to get the audit status for, defaults to the original_file.
+    def human_readable_audit_status(file = file_set.original_file)
+      audit_stat(file)
+    end
+
+    # Check the file by only what is in the audit log.
+    # Do not try to access the versions if we do not have access to them.
+    # Use this when a file_set is loaded from solr instead of fedora
+    def logged_audit_status
+      audit_results = ChecksumAuditLog.logs_for(file_set.id, "original_file")
+                      .collect { |result| result["pass"] }
+
+      if audit_results.length > 0
+        stat_to_string(audit_results.reduce(true) { |sum, value| sum && value })
       else
-        stat
+        'Audits have not yet been run on this file.'
       end
     end
 
@@ -29,6 +38,17 @@ module CurationConcerns
 
     private
 
+      def stat_to_string(stat)
+        case stat
+        when 0
+          'failing'
+        when 1
+          'passing'
+        else
+          fail ArgumentError, "Unknown status `#{stat}'"
+        end
+      end
+
       # Retrieve or generate the audit check for a file (all versions are checked for versioned files)
       # @param [ActiveFedora::File] file to audit
       # @param [Array] log container for messages
@@ -45,10 +65,11 @@ module CurationConcerns
         # check how many non runs we had
         non_runs = audit_results.reduce(0) { |sum, value| value == NO_RUNS ? sum + 1 : sum }
         if non_runs == 0
-          audit_results.reduce(true) { |sum, value| sum && value }
+          result = audit_results.reduce(true) { |sum, value| sum && value }
+          stat_to_string(result)
         elsif non_runs < audit_results.length
           result = audit_results.reduce(true) { |sum, value| value == NO_RUNS ? sum : sum && value }
-          "Some audits have not been run, but the ones run were #{human_readable_audit_status(result)}."
+          "Some audits have not been run, but the ones run were #{stat_to_string(result)}."
         else
           'Audits have not yet been run on this file.'
         end

data/config/locales/curation_concerns.en.yml

@@ -2,5 +2,21 @@ en:
   curation_concerns:
     product_name:       "CurationConcerns"
     product_twitter_handle: "@HydraSphere"
-    institution_name:   "Institution Name"
+    institution_name:  &INSTITUTION_NAME "Institution Name"
     institution_name_full: "The Institution Name"
+    visibility:
+      open:
+        text: "Open Access"
+        class: "label-success"
+      authenticated:
+        text: *INSTITUTION_NAME
+        class: "label-info"
+      restricted:
+        text: "Private"
+        class: "label-danger"
+      embargo:
+        text: "Embargo"
+        class: "label-warning"
+      lease:
+        text: "Lease"
+        class: "label-warning"

data/curation_concerns-models.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'active_attr'
   spec.add_dependency 'hydra-collections', '~> 6.0.0.rc1'
   spec.add_dependency 'hydra-head', '~> 9.3'
-  spec.add_dependency 'hydra-works', '~> 0.3'
+  spec.add_dependency 'hydra-works', '~> 0.6'
   spec.add_dependency 'active_fedora-noid', '~> 1.0'
   spec.add_dependency 'resque', '~> 1.23'
   spec.add_dependency 'resque-pool', '~> 0.3'

data/lib/curation_concerns/configuration.rb

@@ -11,13 +11,6 @@ module CurationConcerns
     yield(config)
   end
 
-  # Keep this deprecated class here so that anyone that references it in their config gets a deprecation rather than uninitialized constant.
-  # Remove when Configuration#queue= is removed
-  module Resque
-    class Queue
-    end
-  end
-
   class Configuration
     include Callbacks
 
@@ -62,7 +55,8 @@ module CurationConcerns
     attr_accessor :temp_file_base, :enable_local_ingest, :analytic_start_date,
                   :fits_to_desc_mapping, :max_days_between_audits,
                   :resource_types, :resource_types_to_schema,
-                  :permission_levels, :owner_permission_levels, :analytics
+                  :permission_levels, :owner_permission_levels, :analytics,
+                  :display_microdata, :microdata_default_type
 
     attr_writer :enable_noids
     def enable_noids
@@ -85,9 +79,6 @@ module CurationConcerns
       @redis_namespace ||= 'curation_concerns'
     end
 
-    attr_writer :queue
-    deprecation_deprecate :queue=
-
     attr_writer :fits_path
     def fits_path
       @fits_path ||= 'fits.sh'
@@ -124,6 +115,8 @@ module CurationConcerns
                     :after_import_local_file_failure, :after_audit_failure,
                     :after_destroy, :after_import_url_success, :after_import_url_failure
 
+    # Registers the given curation concern model in the configuration
+    # @param [Array<Symbol>,Symbol] curation_concern_types
     def register_curation_concern(*curation_concern_types)
       Array(curation_concern_types).flatten.compact.each do |cc_type|
         class_name = normalize_concern_name(cc_type)
@@ -145,6 +138,8 @@ module CurationConcerns
 
     private
 
+      # @param [Symbol] the symbol representing the model
+      # @return [String] the class name for the model
       def normalize_concern_name(c)
         c.to_s.camelize
       end

data/lib/curation_concerns/messages.rb

@@ -40,9 +40,9 @@ module CurationConcerns
     end
 
     # Double-quotes are replaced with single ones so this list can be included in a data block. Ex:
-    #   <a href="#" data-content="<a href='#'>embedded link</a>" rel="popover">Click me</a>
+    #   <a href="#" data-content="<a href='#'>embedded link</a>" data-toggle="popover">Click me</a>
     def file_list(files)
-      files.map { |gf| link_to_file(gf) }.join(', ').tr("\"", "'")
+      files.map { |fs| link_to_file(fs) }.join(', ').tr("\"", "'")
     end
 
     def link_to_file(file)
@@ -53,14 +53,16 @@ module CurationConcerns
 
       def success_link(files)
         link_to I18n.t('curation_concerns.messages.success.multiple.link'), '#',
-                rel: 'popover',
-                data: { content: file_list(files).html_safe, title: I18n.t('curation_concerns.messages.success.title') }
+                data: { toggle: 'popover',
+                        content: file_list(files).html_safe,
+                        title: I18n.t('curation_concerns.messages.success.title') }
       end
 
       def failure_link(files)
         link_to I18n.t('curation_concerns.messages.failure.multiple.link'), '#',
-                rel: 'popover',
-                data: { content: file_list(files).html_safe, title: I18n.t('curation_concerns.messages.failure.title') }
+                data: { toggle: 'popover',
+                        content: file_list(files).html_safe,
+                        title: I18n.t('curation_concerns.messages.failure.title') }
       end
   end
 end

data/lib/curation_concerns/models.rb

@@ -11,8 +11,10 @@ module CurationConcerns
   autoload :Utils, 'curation_concerns/models/utils'
   autoload :Permissions
   autoload :Messages
+  autoload :NullLogger
   eager_autoload do
     autoload :Configuration
+    autoload :Name
   end
 
   attr_writer :queue

data/lib/curation_concerns/models/version.rb

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

data/lib/curation_concerns/name.rb

@@ -0,0 +1,20 @@
+module CurationConcerns
+  # A model name that provides routes that are namespaced to CurationConcerns,
+  # without changing the param key.
+  #
+  # Example:
+  #   name = CurationConcerns::Name.new(GenericWork)
+  #   name.param_key
+  #   # => 'generic_work'
+  #   name.route_key
+  #   # => 'curation_concerns_generic_works'
+  #
+  class Name < ActiveModel::Name
+    def initialize(klass, namespace = nil, name = nil)
+      super
+      @route_key          = "curation_concerns_#{ActiveSupport::Inflector.pluralize(@param_key)}"
+      @singular_route_key = ActiveSupport::Inflector.singularize(@route_key)
+      @route_key << "_index" if @plural == @singular
+    end
+  end
+end

data/lib/curation_concerns/null_logger.rb

@@ -0,0 +1,10 @@
+module CurationConcerns
+  class NullLogger < Logger
+    def initialize(*args)
+    end
+
+    # allows all the usual logger method calls (warn, info, error, etc.)
+    def add(*args, &block)
+    end
+  end
+end

data/lib/generators/curation_concerns/models/install_generator.rb

@@ -8,7 +8,6 @@ This generator makes the following changes to your application:
  1. Creates several database migrations if they do not exist in /db/migrate
  2. Creates the curation_concerns.rb configuration file and several others
  3. Creates the file_set.rb and collection.rb models
- 4. Runs full-text generator
        "''
   def banner
     say_status('warning', 'GENERATING CURATION_CONCERNS MODELS', :yellow)

data/lib/generators/curation_concerns/models/templates/config/curation_concerns.rb

@@ -29,28 +29,12 @@ CurationConcerns.configure do |config|
     'Other' => 'Other'
   }
 
-  config.resource_types_to_schema = {
-    'Article' => 'http://schema.org/Article',
-    'Audio' => 'http://schema.org/AudioObject',
-    'Book' => 'http://schema.org/Book',
-    'Capstone Project' => 'http://schema.org/CreativeWork',
-    'Conference Proceeding' => 'http://schema.org/ScholarlyArticle',
-    'Dataset' => 'http://schema.org/Dataset',
-    'Dissertation' => 'http://schema.org/ScholarlyArticle',
-    'Image' => 'http://schema.org/ImageObject',
-    'Journal' => 'http://schema.org/CreativeWork',
-    'Map or Cartographic Material' => 'http://schema.org/Map',
-    'Masters Thesis' => 'http://schema.org/ScholarlyArticle',
-    'Part of Book' => 'http://schema.org/Book',
-    'Poster' => 'http://schema.org/CreativeWork',
-    'Presentation' => 'http://schema.org/CreativeWork',
-    'Project' => 'http://schema.org/CreativeWork',
-    'Report' => 'http://schema.org/CreativeWork',
-    'Research Paper' => 'http://schema.org/ScholarlyArticle',
-    'Software or Program Code' => 'http://schema.org/Code',
-    'Video' => 'http://schema.org/VideoObject',
-    'Other' => 'http://schema.org/CreativeWork'
-  }
+  config.display_microdata = true
+  config.microdata_default_type = 'http://schema.org/CreativeWork'
+
+  config.resource_types_to_schema = config.resource_types.map do |k, v|
+    [k, I18n.t("curation_concerns.schema_org.resource_type.#{v}", default: config.microdata_default_type)]
+  end.to_h
 
   config.permission_levels = {
     'Choose Access' => 'none',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: curation_concerns-models
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-09 00:00:00.000000000 Z
+date: 2015-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: active_fedora-noid
   requirement: !ruby/object:Gem::Requirement
@@ -184,8 +184,8 @@ files:
 - app/actors/curation_concerns/lease_actor.rb
 - app/actors/curation_concerns/work_actor_behavior.rb
 - app/indexers/curation_concerns/collection_indexer.rb
-- app/indexers/curation_concerns/file_set_indexing_service.rb
-- app/indexers/curation_concerns/work_indexing_service.rb
+- app/indexers/curation_concerns/file_set_indexer.rb
+- app/indexers/curation_concerns/work_indexer.rb
 - app/jobs/active_fedora_id_based_job.rb
 - app/jobs/audit_job.rb
 - app/jobs/characterize_job.rb
@@ -198,20 +198,22 @@ files:
 - 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_upload_sets.rb
 - app/models/concerns/curation_concerns/file_set/belongs_to_works.rb
 - app/models/concerns/curation_concerns/file_set/derivatives.rb
 - app/models/concerns/curation_concerns/file_set/full_text_indexing.rb
 - app/models/concerns/curation_concerns/file_set/indexing.rb
+- app/models/concerns/curation_concerns/file_set/querying.rb
 - app/models/concerns/curation_concerns/file_set/versions.rb
 - app/models/concerns/curation_concerns/file_set_behavior.rb
-- app/models/concerns/curation_concerns/generic_file.rb
 - app/models/concerns/curation_concerns/has_representative.rb
 - app/models/concerns/curation_concerns/human_readable_type.rb
+- app/models/concerns/curation_concerns/naming.rb
 - app/models/concerns/curation_concerns/permissions.rb
 - app/models/concerns/curation_concerns/permissions/readable.rb
 - app/models/concerns/curation_concerns/permissions/writable.rb
+- 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
@@ -243,6 +245,8 @@ files:
 - lib/curation_concerns/models/engine.rb
 - lib/curation_concerns/models/utils.rb
 - lib/curation_concerns/models/version.rb
+- lib/curation_concerns/name.rb
+- lib/curation_concerns/null_logger.rb
 - lib/generators/curation_concerns/models/abstract_migration_generator.rb
 - lib/generators/curation_concerns/models/clamav_generator.rb
 - lib/generators/curation_concerns/models/install_generator.rb
@@ -282,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Simple institutional repository models for Hydra

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

@@ -1,15 +0,0 @@
-module CurationConcerns
-  module FileSet
-    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
-end

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

@@ -1,5 +0,0 @@
-module CurationConcerns
-  # Base namespace for GenericFile Behavior modules
-  module GenericFile
-  end
-end