hyrax 3.0.0.pre.beta2 → 3.0.0.pre.beta3

data/app/jobs/characterize_job.rb

@@ -9,11 +9,26 @@ class CharacterizeJob < Hyrax::ApplicationJob
   def perform(file_set, file_id, filepath = nil)
     raise "#{file_set.class.characterization_proxy} was not found for FileSet #{file_set.id}" unless file_set.characterization_proxy?
     filepath = Hyrax::WorkingDirectory.find_or_retrieve(file_id, file_set.id) unless filepath && File.exist?(filepath)
-    Hydra::Works::CharacterizationService.run(file_set.characterization_proxy, filepath)
-    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)
+    characterize(file_set, file_id, filepath)
     CreateDerivativesJob.perform_later(file_set, file_id, filepath)
   end
+
+  private
+
+    def characterize(file_set, _file_id, filepath)
+      Hydra::Works::CharacterizationService.run(file_set.characterization_proxy, filepath)
+      Rails.logger.debug "Ran characterization on #{file_set.characterization_proxy.id} (#{file_set.characterization_proxy.mime_type})"
+      file_set.characterization_proxy.alpha_channels = channels(filepath) if file_set.image? && Hyrax.config.iiif_image_server?
+      file_set.characterization_proxy.save!
+      file_set.update_index
+      file_set.parent&.in_collections&.each(&:update_index)
+    end
+
+    def channels(filepath)
+      ch = MiniMagick::Tool::Identify.new do |cmd|
+        cmd.format '%[channels]'
+        cmd << filepath
+      end
+      [ch]
+    end
 end

data/app/jobs/import_url_job.rb

@@ -21,17 +21,19 @@ class ImportUrlJob < Hyrax::ApplicationJob
     operation.performing!
     user = User.find_by_user_key(file_set.depositor)
     uri = URI(file_set.import_url)
+    name = file_set.label
+
     @file_set = file_set
     @operation = operation
 
-    unless can_retrieve?(uri)
+    unless BrowseEverything::Retriever.can_retrieve?(uri, headers)
       send_error('Expired URL')
       return false
     end
 
     # @todo Use Hydra::Works::AddExternalFileToFileSet instead of manually
     #       copying the file here. This will be gnarly.
-    copy_remote_file(uri, headers) do |f|
+    copy_remote_file(uri, name, headers) do |f|
       # reload the FileSet once the data is copied since this is a long running task
       file_set.reload
 
@@ -44,25 +46,16 @@ class ImportUrlJob < Hyrax::ApplicationJob
 
   private
 
-    # The previous strategy of using only a HEAD request to check the validity of a
-    # remote URL fails for Amazon S3 pre-signed URLs. S3 URLs are generated for a single
-    # verb only (in this case, GET), and will return a 403 Forbidden response if any
-    # other verb is used. The workaround is to issue a GET request instead, with a
-    # Range: header requesting only the first byte. The successful response status
-    # code is 206 instead of 200, but that is enough to satisfy the #success? method.
-    # @param uri [URI] the uri of the file to be downloaded
-    def can_retrieve?(uri)
-      HTTParty.get(uri, headers: { Range: 'bytes=0-0' }).success?
-    end
-
     # Download file from uri, yields a block with a file in a temporary directory.
     # It is important that the file on disk has the same file name as the URL,
     # because when the file in added into Fedora the file name will get persisted in the
     # metadata.
     # @param uri [URI] the uri of the file to download
+    # @param name [String] the human-readable name of the file
+    # @param headers [Hash] the HTTP headers for the GET request (these may contain an authentication token)
     # @yield [IO] the stream to write to
-    def copy_remote_file(uri, headers = {})
-      filename = File.basename(uri.path)
+    def copy_remote_file(uri, name, headers = {})
+      filename = File.basename(name)
       dir = Dir.mktmpdir
       Rails.logger.debug("ImportUrlJob: Copying <#{uri}> to #{dir}")
 
@@ -92,7 +85,7 @@ class ImportUrlJob < Hyrax::ApplicationJob
     # @param f [IO] the stream to write to
     def write_file(uri, f, headers)
       retriever = BrowseEverything::Retriever.new
-      uri_spec = { 'url' => uri }.merge(headers)
+      uri_spec = ActiveSupport::HashWithIndifferentAccess.new(url: uri, headers: headers)
       retriever.retrieve(uri_spec) do |chunk|
         f.write(chunk)
       end

data/app/jobs/ingest_local_file_job.rb

@@ -14,5 +14,9 @@ class IngestLocalFileJob < Hyrax::ApplicationJob
     else
       Hyrax.config.callback.run(:after_import_local_file_failure, file_set, user, path)
     end
+  rescue SystemCallError
+    # This is generic in order to handle Errno constants raised when accessing files
+    # @see https://ruby-doc.org/core-2.5.3/Errno.html
+    Hyrax.config.callback.run(:after_import_local_file_failure, file_set, user, path)
   end
 end

data/app/jobs/visibility_copy_job.rb

@@ -5,23 +5,9 @@
 # * embargo
 class VisibilityCopyJob < Hyrax::ApplicationJob
   # @api public
-  # @param [#file_sets, #visibility, #lease, #embargo] work - a Work model
+  # @param [Hyrax::WorkBehavior, Hyrax::Resource] work - a Work model,
+  #   using ActiveFedora or Valkyrie
   def perform(work)
-    work.file_sets.each do |file|
-      file.visibility = work.visibility # visibility must come first, because it can clear an embargo/lease
-      copy_visibility_modifier(work: work, file: file, modifier: :lease)
-      copy_visibility_modifier(work: work, file: file, modifier: :embargo)
-      file.save!
-    end
+    Hyrax::VisibilityPropagator.for(source: work).propagate
   end
-
-  private
-
-    def copy_visibility_modifier(work:, file:, modifier:)
-      work_modifier = work.public_send(modifier)
-      return unless work_modifier
-      file.public_send("build_#{modifier}") unless file.public_send(modifier)
-      file.public_send(modifier).attributes = work_modifier.attributes.except('id')
-      file.public_send(modifier).save
-    end
 end

data/app/models/admin_set.rb

@@ -31,6 +31,11 @@ class AdminSet < ActiveFedora::Base
   property :title, predicate: ::RDF::Vocab::DC.title do |index|
     index.as :stored_searchable, :facetable
   end
+
+  property :alt_title, predicate: ::RDF::Vocab::DC.alternative do |index|
+    index.as :stored_searchable
+  end
+
   property :description, predicate: ::RDF::Vocab::DC.description do |index|
     index.as :stored_searchable
   end

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

@@ -73,9 +73,9 @@ module Hyrax
         ids = PermissionTemplateAccess.for_user(ability: self,
                                                 access: ['deposit', 'manage'])
                                       .joins(:permission_template)
-                                      .pluck('DISTINCT source_id')
+                                      .pluck(Arel.sql('DISTINCT source_id'))
         query = "_query_:\"{!raw f=has_model_ssim}AdminSet\" AND {!terms f=id}#{ids.join(',')}"
-        ActiveFedora::SolrService.count(query).positive?
+        Hyrax::SolrService.count(query).positive?
       end
 
       # This overrides hydra-head, (and restores the method from blacklight-access-controls)
@@ -113,7 +113,7 @@ module Hyrax
           end
         end
 
-        can :create, ProxyDepositRequest if Flipflop.proxy_deposit? && registered_user?
+        can :create, ProxyDepositRequest if (Flipflop.proxy_deposit? || Flipflop.transfer_works?) && registered_user?
 
         can :accept, ProxyDepositRequest, receiving_user_id: current_user.id, status: 'pending'
         can :reject, ProxyDepositRequest, receiving_user_id: current_user.id, status: 'pending'

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

@@ -6,6 +6,8 @@ module Hyrax
     extend ActiveSupport::Concern
 
     included do
+      property :alt_title, predicate: ::RDF::Vocab::DC.alternative
+
       property :label, predicate: ActiveFedora::RDF::Fcrepo::Model.downloadFilename, multiple: false
 
       property :relative_path, predicate: ::RDF::URI.new('http://scholarsphere.psu.edu/ns#relativePath'), multiple: false
@@ -15,14 +17,16 @@ module Hyrax
       property :creator, predicate: ::RDF::Vocab::DC11.creator
       property :contributor, predicate: ::RDF::Vocab::DC11.contributor
       property :description, predicate: ::RDF::Vocab::DC11.description
-      property :keyword, predicate: ::RDF::Vocab::DC11.relation
+      property :abstract, predicate: ::RDF::Vocab::DC.abstract
+      property :keyword, predicate: ::RDF::Vocab::SCHEMA.keywords
       # Used for a license
-      property :license, predicate: ::RDF::Vocab::DC.rights
+      property :license, predicate: ::RDF::URI.new('http://dublincore.org/documents/dcmi-terms/#terms-license'), multiple: true
 
       property :rights_notes, predicate: ::RDF::URI.new('http://purl.org/dc/elements/1.1/rights'), multiple: true
 
       # This is for the rights statement
       property :rights_statement, predicate: ::RDF::Vocab::EDM.rights
+      property :access_right, predicate: ::RDF::Vocab::DC.accessRights
       property :publisher, predicate: ::RDF::Vocab::DC11.publisher
       property :date_created, predicate: ::RDF::Vocab::DC.created
       property :subject, predicate: ::RDF::Vocab::DC11.subject

data/app/models/concerns/hyrax/collection_behavior.rb

@@ -50,15 +50,20 @@ module Hyrax
     end
 
     # Add members using the members association.
+    # TODO: Confirm if this is ever used.  I believe all relationships are done through
+    #       add_member_objects using the member_of_collections relationship.  Deprecate?
     def add_members(new_member_ids)
       return if new_member_ids.blank?
-      members << ActiveFedora::Base.find(new_member_ids)
+      members << Hyrax.query_service.custom_queries.find_many_by_alternate_ids(alternate_ids: new_member_ids, use_valkyrie: false)
     end
 
     # Add member objects by adding this collection to the objects' member_of_collection association.
+    # @param [Enumerable<String>] the ids of the new child collections and works collection ids
+    # Valkyrie Version: Wings::CollectionBehavior#add_collections_and_works aliased to #add_member_objects
+    #                   lib/wings/models/concerns/collection_behavior.rb
     def add_member_objects(new_member_ids)
       Array(new_member_ids).collect do |member_id|
-        member = ActiveFedora::Base.find(member_id)
+        member = Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: member_id, use_valkyrie: false)
         message = Hyrax::MultipleMembershipChecker.new(item: member).check(collection_ids: id, include_current_members: true)
         if message
           member.errors.add(:collections, message)
@@ -70,10 +75,22 @@ module Hyrax
       end
     end
 
+    # @return [Enumerable<ActiveFedora::Base>] an enumerable over the children of this collection
+    # Valkyrie Version: Wings::CollectionBehavior#child_collections_and_works aliased to #member_objects
+    #                   lib/wings/models/concerns/collection_behavior.rb
     def member_objects
       ActiveFedora::Base.where("member_of_collection_ids_ssim:#{id}")
     end
 
+    # Use this query to get the ids of the member objects (since the containment
+    # association has been flipped)
+    # Valkyrie Version: Wings::CollectionBehavior#child_collections_and_works_ids aliased to #member_object_ids
+    #                   lib/wings/models/concerns/collection_behavior.rb
+    def member_object_ids
+      return [] unless id
+      member_objects.map(&:id)
+    end
+
     def to_s
       title.present? ? title.join(' | ') : 'No Title'
     end
@@ -89,7 +106,7 @@ module Hyrax
       end
 
       def collection_type_gid_document_field_name
-        ActiveFedora.index_field_mapper.solr_name('collection_type_gid', *index_collection_type_gid_as)
+        "collection_type_gid_ssim"
       end
     end
 
@@ -107,13 +124,6 @@ module Hyrax
       member_object_ids.collect { |work_id| size_for_work(work_id) }.sum
     end
 
-    # Use this query to get the ids of the member objects (since the containment
-    # association has been flipped)
-    def member_object_ids
-      return [] unless id
-      ActiveFedora::Base.search_with_conditions("member_of_collection_ids_ssim:#{id}").map(&:id)
-    end
-
     # @api public
     # Retrieve the permission template for this collection.
     # @return [Hyrax::PermissionTemplate]
@@ -171,12 +181,12 @@ module Hyrax
       # 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
-        ActiveFedora.index_field_mapper.solr_name(:file_size, Hyrax::FileSetIndexer::STORED_LONG)
+        "file_size_lts"
       end
 
       # Solr field name works use to index member ids
       def member_ids_field
-        ActiveFedora.index_field_mapper.solr_name('member_ids', :symbol)
+        "member_ids_ssim"
       end
 
       def destroy_permission_template

data/app/models/concerns/hyrax/collection_nesting.rb

@@ -43,7 +43,7 @@ module Hyrax
     end
 
     def find_children_of(destroyed_id:)
-      ActiveFedora::SolrService.query(ActiveFedora::SolrQueryBuilder.construct_query(member_of_collection_ids_ssim: destroyed_id))
+      Hyrax::SolrService.query(Hyrax::SolrQueryBuilderService.construct_query(member_of_collection_ids_ssim: destroyed_id))
     end
 
     # Only models which include Hyrax::CollectionNesting will respond to this method.

data/app/models/concerns/hyrax/file_set/characterization.rb

@@ -20,7 +20,7 @@ module Hyrax
         self.characterization_terms = [
           :format_label, :file_size, :height, :width, :filename, :well_formed,
           :page_count, :file_title, :last_modified, :original_checksum,
-          :duration, :sample_rate
+          :duration, :sample_rate, :alpha_channels
         ]
         self.characterization_proxy = :original_file
 
@@ -50,6 +50,13 @@ module Hyrax
 
         def mime_type; end
       end
+
+      # Add Alpha Channels to the Schema
+      class AlphaChannelsSchema < ActiveTriples::Schema
+        property :alpha_channels, predicate: ::RDF::URI.new('http://vocabulary.samvera.org/ns#alphaChannels')
+      end
+
+      ActiveFedora::WithMetadata::DefaultMetadataClassFactory.file_metadata_schemas << AlphaChannelsSchema
     end
   end
 end

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

@@ -5,7 +5,7 @@ module Hyrax
 
       module ClassMethods
         def where_digest_is(digest_string)
-          where ActiveFedora.index_field_mapper.solr_name('digest', :symbol) => urnify(digest_string)
+          where "digest_ssim" => urnify(digest_string)
         end
 
         def urnify(digest_string)

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

@@ -3,7 +3,7 @@ module Hyrax
     extend ActiveSupport::Concern
     include Hyrax::WithEvents
     include Hydra::Works::FileSetBehavior
-    include Hydra::Works::VirusCheck
+    include Hyrax::VirusCheck
     include Hyrax::FileSet::Characterization
     include Hydra::WithDepositor
     include Serializers

data/app/models/concerns/hyrax/human_readable_type.rb

@@ -22,8 +22,8 @@ module Hyrax
 
     def to_solr(solr_doc = {})
       super(solr_doc).tap do |doc|
-        doc[ActiveFedora.index_field_mapper.solr_name('human_readable_type', :facetable)] = human_readable_type
-        doc[ActiveFedora.index_field_mapper.solr_name('human_readable_type', :stored_searchable)] = human_readable_type
+        doc["human_readable_type_sim"] = human_readable_type
+        doc["human_readable_type_tesim"] = human_readable_type
       end
     end
   end

data/app/models/concerns/hyrax/solr_document/characterization.rb

@@ -3,27 +3,27 @@ module Hyrax
     # TODO: aside from height and width, I don't think any of these other terms are indexed by default. - Justin 3/2016
     module Characterization
       def byte_order
-        self[ActiveFedora.index_field_mapper.solr_name("byte_order")]
+        self["byte_order_tesim"]
       end
 
       def capture_device
-        self[ActiveFedora.index_field_mapper.solr_name("capture_device")]
+        self["capture_device_tesim"]
       end
 
       def color_map
-        self[ActiveFedora.index_field_mapper.solr_name("color_map")]
+        self["color_map_tesim"]
       end
 
       def color_space
-        self[ActiveFedora.index_field_mapper.solr_name("color_space")]
+        self["color_space_tesim"]
       end
 
       def compression
-        self[ActiveFedora.index_field_mapper.solr_name("compression")]
+        self["compression_tesim"]
       end
 
       def gps_timestamp
-        self[ActiveFedora.index_field_mapper.solr_name("gps_timestamp")]
+        self["gps_timestamp_tesim"]
       end
 
       def height
@@ -31,31 +31,31 @@ module Hyrax
       end
 
       def image_producer
-        self[ActiveFedora.index_field_mapper.solr_name("image_producer")]
+        self["image_producer_tesim"]
       end
 
       def latitude
-        self[ActiveFedora.index_field_mapper.solr_name("latitude")]
+        self["latitude_tesim"]
       end
 
       def longitude
-        self[ActiveFedora.index_field_mapper.solr_name("longitude")]
+        self["longitude_tesim"]
       end
 
       def orientation
-        self[ActiveFedora.index_field_mapper.solr_name("orientation")]
+        self["orientation_tesim"]
       end
 
       def profile_name
-        self[ActiveFedora.index_field_mapper.solr_name("profile_name")]
+        self["profile_name_tesim"]
       end
 
       def profile_version
-        self[ActiveFedora.index_field_mapper.solr_name("profile_version")]
+        self["profile_version_tesim"]
       end
 
       def scanning_software
-        self[ActiveFedora.index_field_mapper.solr_name("scanning_software")]
+        self["scanning_software_tesim"]
       end
 
       def width
@@ -63,43 +63,47 @@ module Hyrax
       end
 
       def format_label
-        self[ActiveFedora.index_field_mapper.solr_name("format_label")]
+        self["format_label_tesim"]
       end
 
       def file_size
-        self[ActiveFedora.index_field_mapper.solr_name("file_size")]
+        self["file_size_tesim"]
       end
 
       def filename
-        self[ActiveFedora.index_field_mapper.solr_name("filename")]
+        self["filename_tesim"]
       end
 
       def well_formed
-        self[ActiveFedora.index_field_mapper.solr_name("well_formed")]
+        self["well_formed_tesim"]
       end
 
       def page_count
-        self[ActiveFedora.index_field_mapper.solr_name("page_count")]
+        self["page_count_tesim"]
       end
 
       def file_title
-        self[ActiveFedora.index_field_mapper.solr_name("file_title")]
+        self["file_title_tesim"]
       end
 
       def duration
-        self[ActiveFedora.index_field_mapper.solr_name("duration")]
+        self["duration_tesim"]
       end
 
       def sample_rate
-        self[ActiveFedora.index_field_mapper.solr_name("sample_rate")]
+        self["sample_rate_tesim"]
       end
 
       def last_modified
-        self[ActiveFedora.index_field_mapper.solr_name("last_modified")]
+        self["last_modified_tesim"]
       end
 
       def original_checksum
-        self[ActiveFedora.index_field_mapper.solr_name("original_checksum")]
+        self["original_checksum_tesim"]
+      end
+
+      def alpha_channels
+        self["alpha_channels_ssi"]
       end
     end
   end