hyrax 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92a018038d9094f92a85088a61ff697aba139a326cfa96a95a7d4cdbeca98a0a
-  data.tar.gz: 8ca7c54444ba58ba89f2fc977ddcb8597122b985c9d7a7dda21d64fdcc87e648
+  metadata.gz: '081daeb5064ca757527e98cfbbea41846b8a15440a26a2d152b1ad7a1c7f395b'
+  data.tar.gz: 70e52823ff8ef7546510db08f28c22207488952f146be3bb63b9ecba440ebb81
 SHA512:
-  metadata.gz: d5a60ae3e20bead1941c72d241bfa4fbee221eb6bf4637ad1bf58a53edd07eaaa741108707d06ece69b096b83132512875555fc64c6128b3a0c1046b079cbf9a
-  data.tar.gz: 64b2ef5c948183fa190b4f20adfae67ef22a8abc83df98c4e4581cbe83d960b3dc8d67b0453c062da5940d76f915a496fcb16f3b3a29aa63ffdeb2f0b443dab3
+  metadata.gz: a36054d54da990c0ea0ab03ce538a903ceed121026e1ac160b1dc2226a21fc12a8b8d422d99b71e545048af33318ab86ae90e8e3a906b6bcb1061983059ac4d4
+  data.tar.gz: 5b8b6759915c77982125b0c33b6f8681dd7ea61c0cce63b0665567fd00e47be468d097e6653cdfd65df5db35ff1ac4f01c98cb39b12d774c741b8cd6ff086e1a

data/.dassie/config/initializers/riiif.rb

@@ -1,27 +1,29 @@
 # frozen_string_literal: true
-Riiif::Image.file_resolver = Riiif::HttpFileResolver.new
-Riiif::Image.info_service = lambda do |id, _file|
-  # id will look like a path to a pcdm:file
-  # (e.g. rv042t299%2Ffiles%2F6d71677a-4f80-42f1-ae58-ed1063fd79c7)
-  # but we just want the id for the FileSet it's attached to.
+ActiveSupport::Reloader.to_prepare do
+  Riiif::Image.file_resolver = Riiif::HttpFileResolver.new
+  Riiif::Image.info_service = lambda do |id, _file|
+    # id will look like a path to a pcdm:file
+    # (e.g. rv042t299%2Ffiles%2F6d71677a-4f80-42f1-ae58-ed1063fd79c7)
+    # but we just want the id for the FileSet it's attached to.
 
-  # Capture everything before the first slash
-  fs_id = id.sub(/\A([^\/]*)\/.*/, '\1')
-  resp = Hyrax::SolrService.get("id:#{fs_id}")
-  doc = resp['response']['docs'].first
-  raise "Unable to find solr document with id:#{fs_id}" unless doc
-  { height: doc['height_is'], width: doc['width_is'], format: doc['mime_type_ssi'], channels: doc['alpha_channels_ssi'] }
-end
+    # Capture everything before the first slash
+    fs_id = id.sub(/\A([^\/]*)\/.*/, '\1')
+    resp = Hyrax::SolrService.get("id:#{fs_id}")
+    doc = resp['response']['docs'].first
+    raise "Unable to find solr document with id:#{fs_id}" unless doc
+    { height: doc['height_is'], width: doc['width_is'], format: doc['mime_type_ssi'], channels: doc['alpha_channels_ssi'] }
+  end
 
-Riiif::Image.file_resolver.id_to_uri = lambda do |id|
-  Hyrax::Base.id_to_uri(CGI.unescape(id)).tap do |url|
-    Rails.logger.info "Riiif resolved #{id} to #{url}"
+  Riiif::Image.file_resolver.id_to_uri = lambda do |id|
+    Hyrax::Base.id_to_uri(CGI.unescape(id)).tap do |url|
+      Rails.logger.info "Riiif resolved #{id} to #{url}"
+    end
   end
-end
 
-Riiif::Image.authorization_service = Hyrax::IIIFAuthorizationService
+  Riiif::Image.authorization_service = Hyrax::IIIFAuthorizationService
 
-Riiif.not_found_image = Rails.root.join('app', 'assets', 'images', 'us_404.svg')
-Riiif.unauthorized_image = Rails.root.join('app', 'assets', 'images', 'us_404.svg')
+  Riiif.not_found_image = Rails.root.join('app', 'assets', 'images', 'us_404.svg')
+  Riiif.unauthorized_image = Rails.root.join('app', 'assets', 'images', 'us_404.svg')
 
-Riiif::Engine.config.cache_duration = 365.days
+  Riiif::Engine.config.cache_duration = 365.days
+end

data/.dassie/package.json

@@ -8,10 +8,8 @@
 "scripts": {
   "preinstall": "rm -rf ./public/uv",
   "postinstall": "yarn run uv-install && yarn run uv-config",
-  "uv-install": "shx cp -r ./node_modules/universalviewer/dist ./public/uv",
-  "uv-config": "shx cp ./config/uv/uv.html ./public/uv/uv.html & shx cp ./config/uv/uv-config.json ./public/uv/"
+  "uv-install": "cp -r ./node_modules/universalviewer/dist ./public/uv",
+  "uv-config": "cp ./config/uv/uv.html ./public/uv/uv.html & cp ./config/uv/uv-config.json ./public/uv/"
   },
-  "devDependencies": {
-  "shx": "^0.3.2"
-  }
+  "devDependencies": {}
 }

data/Dockerfile

@@ -43,21 +43,8 @@ ONBUILD COPY --chown=1001:101 $APP_PATH /app/samvera/hyrax-webapp
 ONBUILD RUN bundle install --jobs "$(nproc)"
 ONBUILD RUN RAILS_ENV=production SECRET_KEY_BASE=`bin/rake secret` DB_ADAPTER=nulldb DATABASE_URL='postgresql://fake' bundle exec rake assets:precompile
 
-FROM hyrax-base as hyrax-engine-dev
-
-ARG APP_PATH=.dassie
-ARG BUNDLE_WITHOUT=
-
-ENV HYRAX_ENGINE_PATH /app/samvera/hyrax-engine
-
-COPY --chown=1001:101 $APP_PATH /app/samvera/hyrax-webapp
-COPY --chown=1001:101 . /app/samvera/hyrax-engine
-
-RUN cd /app/samvera/hyrax-engine && bundle install --jobs "$(nproc)"
-RUN RAILS_ENV=production SECRET_KEY_BASE='fakesecret1234' DB_ADAPTER=nulldb DATABASE_URL='postgresql://fake' bundle exec rake assets:precompile
 
-
-FROM hyrax-engine-dev as hyrax-engine-dev-worker
+FROM hyrax-base as hyrax-worker
 
 ENV MALLOC_ARENA_MAX=2
 
@@ -77,4 +64,37 @@ RUN mkdir -p /app/fits && \
     chmod a+x /app/fits/fits.sh
 ENV PATH="${PATH}:/app/fits"
 
+ARG APP_PATH=.
+ARG BUNDLE_WITHOUT="development test"
+
+ONBUILD COPY --chown=1001:101 $APP_PATH /app/samvera/hyrax-webapp
+ONBUILD RUN bundle install --jobs "$(nproc)"
+
 CMD bundle exec sidekiq
+
+
+FROM hyrax-base as hyrax-engine-dev
+
+ARG APP_PATH=.dassie
+ARG BUNDLE_WITHOUT=
+
+ENV HYRAX_ENGINE_PATH /app/samvera/hyrax-engine
+
+COPY --chown=1001:101 $APP_PATH /app/samvera/hyrax-webapp
+COPY --chown=1001:101 . /app/samvera/hyrax-engine
+
+RUN cd /app/samvera/hyrax-engine && bundle install --jobs "$(nproc)"
+RUN RAILS_ENV=production SECRET_KEY_BASE='fakesecret1234' DB_ADAPTER=nulldb DATABASE_URL='postgresql://fake' bundle exec rake assets:precompile
+
+
+FROM hyrax-worker as hyrax-engine-dev-worker
+
+ARG APP_PATH=.dassie
+ARG BUNDLE_WITHOUT=
+
+ENV HYRAX_ENGINE_PATH /app/samvera/hyrax-engine
+
+COPY --chown=1001:101 $APP_PATH /app/samvera/hyrax-webapp
+COPY --chown=1001:101 . /app/samvera/hyrax-engine
+
+RUN cd /app/samvera/hyrax-engine && bundle install --jobs "$(nproc)"

data/app/controllers/hyrax/dashboard/collections_controller.rb

@@ -69,10 +69,8 @@ module Hyrax
       end
 
       def show
-        if @collection.collection_type.brandable?
-          banner_info = CollectionBrandingInfo.where(collection_id: @collection.id.to_s).where(role: "banner")
-          @banner_file = "/" + banner_info.first.local_path.split("/")[-4..-1].join("/") unless banner_info.empty?
-        end
+        # @todo: remove this unused assignment in 4.0.0
+        @banner_file = presenter.banner_file if @collection.collection_type.brandable?
 
         presenter
         query_collection_members

data/app/forms/hyrax/forms/collection_form.rb

@@ -80,18 +80,20 @@ module Hyrax
       def banner_info
         @banner_info ||= begin
           # Find Banner filename
-          banner_info = CollectionBrandingInfo.where(collection_id: id).where(role: "banner")
+          banner_info = CollectionBrandingInfo.where(collection_id: id, role: "banner")
           banner_file = File.split(banner_info.first.local_path).last unless banner_info.empty?
+          alttext = banner_info.first.alt_text unless banner_info.empty?
           file_location = banner_info.first.local_path unless banner_info.empty?
           relative_path = "/" + banner_info.first.local_path.split("/")[-4..-1].join("/") unless banner_info.empty?
-          { file: banner_file, full_path: file_location, relative_path: relative_path }
+          { file: banner_file, full_path: file_location, relative_path: relative_path, alttext: alttext }
         end
       end
 
       def logo_info
         @logo_info ||= begin
           # Find Logo filename, alttext, linktext
-          logos_info = CollectionBrandingInfo.where(collection_id: id).where(role: "logo")
+          logos_info = CollectionBrandingInfo.where(collection_id: id, role: "logo")
+
           logos_info.map do |logo_info|
             logo_file = File.split(logo_info.local_path).last
             relative_path = "/" + logo_info.local_path.split("/")[-4..-1].join("/")

data/app/indexers/hyrax/valkyrie_indexer.rb

@@ -69,7 +69,8 @@ module Hyrax
       {
         "id": resource.id.to_s,
         "created_at_dtsi": resource.created_at,
-        "updated_at_dtsi": resource.updated_at
+        "updated_at_dtsi": resource.updated_at,
+        "has_model_ssim": resource.internal_resource
       }
     end
 

data/app/presenters/hyrax/collection_presenter.rb

@@ -119,25 +119,21 @@ module Hyrax
       Hyrax::Engine.routes.url_helpers.dashboard_collection_path(id, locale: I18n.locale)
     end
 
+    ##
+    # @return [#to_s, nil] a download path for the banner file
     def banner_file
-      # Find Banner filename
-      ci = CollectionBrandingInfo.where(collection_id: id, role: "banner")
-      "/" + ci[0].local_path.split("/")[-4..-1].join("/") unless ci.empty?
+      banner = CollectionBrandingInfo.find_by(collection_id: id, role: "banner")
+      "/" + banner.local_path.split("/")[-4..-1].join("/") if banner
     end
 
     def logo_record
-      logo_info = []
-      # Find Logo filename, alttext, linktext
-      cis = CollectionBrandingInfo.where(collection_id: id, role: "logo")
-      return if cis.empty?
-      cis.each do |coll_info|
-        logo_file = File.split(coll_info.local_path).last
-        file_location = "/" + coll_info.local_path.split("/")[-4..-1].join("/") unless logo_file.empty?
-        alttext = coll_info.alt_text
-        linkurl = coll_info.target_url
-        logo_info << { file: logo_file, file_location: file_location, alttext: alttext, linkurl: linkurl }
+      CollectionBrandingInfo.where(collection_id: id, role: "logo")
+                            .select(:local_path, :alt_text, :target_url).map do |logo|
+        { alttext: logo.alt_text,
+          file: File.split(logo.local_path).last,
+          file_location: "/#{logo.local_path.split('/')[-4..-1].join('/')}",
+          linkurl: logo.target_url }
       end
-      logo_info
     end
 
     # A presenter for selecting a work type to create

data/app/services/hyrax/listeners.rb

@@ -14,9 +14,11 @@ module Hyrax
     autoload :BatchNotificationListener
     autoload :FileSetLifecycleListener
     autoload :FileSetLifecycleNotificationListener
+    autoload :MemberCleanupListener
     autoload :MetadataIndexListener
     autoload :ObjectLifecycleListener
     autoload :ProxyDepositListener
+    autoload :TrophyCleanupListener
     autoload :WorkflowListener
   end
 end

data/app/services/hyrax/listeners/member_cleanup_listener.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Hyrax
+  module Listeners
+    ##
+    # Listens for object deleted events and cleans up associated members
+    class MemberCleanupListener
+      def on_object_deleted(event)
+        return unless event.payload.key?(:object) # legacy callback
+        return if event[:object].is_a?(ActiveFedora::Base) # handled by legacy code
+
+        Hyrax.custom_queries.find_child_filesets(resource: event[:object]).each do |file_set|
+          begin
+            Hyrax.persister.delete(resource: file_set)
+            Hyrax.publisher
+                 .publish('object.deleted', object: file_set, id: file_set.id, user: user)
+          rescue StandardError # we don't uncaught errors looping filesets
+            Hyrax.logger.warn "Failed to delete #{file_set.class}:#{file_set.id} " \
+                              "during cleanup for resource: #{event[:object]}. " \
+                              'This member may now be orphaned.'
+          end
+        end
+      end
+    end
+  end
+end

data/app/services/hyrax/listeners/object_lifecycle_listener.rb

@@ -8,7 +8,7 @@ module Hyrax
       ##
       # @param event [Dry::Event]
       def on_object_deleted(event)
-        ContentDeleteEventJob.perform_later(event[:id], event[:user])
+        ContentDeleteEventJob.perform_later(event[:id].to_s, event[:user])
       end
 
       ##

data/app/services/hyrax/listeners/trophy_cleanup_listener.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Hyrax
+  module Listeners
+    ##
+    # Listens for object deleted events and cleans up associated members
+    class TrophyCleanupListener
+      def on_object_deleted(event)
+        Trophy.where(work_id: event[:id]).destroy_all
+      rescue StandardError => err
+        Hyrax.logger.warn "Failed to delete trophies for #{event[:id]}. " \
+                          'These trophies might be orphaned.' \
+                          "\n\t#{err.message}"
+      end
+    end
+  end
+end

data/app/services/hyrax/persist_derivatives.rb

@@ -18,7 +18,6 @@ module Hyrax
     # Open the output file to write and yield the block to the
     # file. It makes the directories in the path if necessary.
     def self.output_file(directives, &blk)
-      # name = derivative_path_factory.derivative_path_for_reference(object, destination_name)
       raise ArgumentError, "No :url was provided in the transcoding directives" unless directives.key?(:url)
       uri = URI(directives.fetch(:url))
       raise ArgumentError, "Must provide a file uri" unless uri.scheme == 'file'
@@ -27,7 +26,10 @@ module Hyrax
       File.open(uri.path, 'wb', &blk)
     end
 
+    ##
+    # @deprecated
     def self.derivative_path_factory
+      Deprecation.warn("Use 'Hyrax::DerivativePath' instead.")
       DerivativePath
     end
   end

data/app/services/hyrax/thumbnail_path_service.rb

@@ -30,7 +30,7 @@ module Hyrax
       def fetch_thumbnail(object)
         return object if object.thumbnail_id == object.id
         Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: object.thumbnail_id)
-      rescue Hyrax::ObjectNotFoundError
+      rescue Valkyrie::Persistence::ObjectNotFoundError, Hyrax::ObjectNotFoundError
         Rails.logger.error("Couldn't find thumbnail #{object.thumbnail_id} for #{object.id}")
         nil
       end

data/app/services/hyrax/visibility_propagator.rb

@@ -2,7 +2,7 @@
 module Hyrax
   ##
   # @abstract Propagates visibility from a provided object (e.g. a Work) to some
-  # group of its members (e.g. file_sets).
+  #   group of its members (e.g. file_sets).
   class VisibilityPropagator
     ##
     # @param source [#visibility] the object to propagate visibility from
@@ -14,6 +14,35 @@ module Hyrax
         FileSetVisibilityPropagator.new(source: source)
       when Hyrax::Resource # Valkyrie
         ResourceVisibilityPropagator.new(source: source)
+      else
+        NullVisibilityPropogator.new(source: source)
+      end
+    end
+
+    ##
+    # Provides a null/logging implementation of the visibility propogator.
+    class NullVisibilityPropogator
+      ##
+      # @!attribute [rw] source
+      #   @return [#visibility]
+      attr_accessor :source
+
+      ##
+      # @param source [#visibility] the object to propagate visibility from
+      def initialize(source:)
+        self.source = source
+      end
+
+      ##
+      # @return [void]
+      # @raise [RuntimeError] if we're in development mode
+      def propogate
+        message =  "Tried to propogate visibility to members of #{source} " \
+                   "but didn't know what kind of object it is. Model " \
+                   "name #{source.try(:model_name)}. Called from #{caller[0]}."
+
+        Hyrax.logger.warn(message)
+        Rails.env.development? ? raise(message) : :noop
       end
     end
   end

data/app/views/hyrax/collections/show.html.erb

@@ -3,7 +3,7 @@
   <div class="row hyc-header">
     <div class="col-md-12">
 
-      <% unless @presenter.banner_file.blank? %>
+      <% if @presenter.banner_file.present? %>
           <div class="hyc-banner" style="background-image:url(<%= @presenter.banner_file %>)">
       <% else %>
           <div class="hyc-generic">

data/app/views/hyrax/dashboard/collections/_form_branding.html.erb

@@ -60,7 +60,7 @@
             <div class="banner-image">
               <i><%= image_tag(f.object.banner_info[:relative_path],
                                size: "800x100",
-                               alt: "Unable to display banner: #{f.object.banner_info[:file]}") %></i>
+                               alt: f.object.banner_info[:alttext].presence || f.object.banner_info[:file]) %></i>
             </div>
             <% end %>
           </div> <!-- end banner -->

data/app/views/hyrax/file_sets/_actions.html.erb

@@ -1,4 +1,13 @@
 <% if (can?(:download, file_set.id) || can?(:destroy, file_set.id) || can?(:edit, file_set.id)) && !workflow_restriction?(file_set.parent) %>
+  <% if can?(:download, file_set.id) && !(can?(:edit, file_set.id) || can?(:destroy, file_set.id)) %>
+  <%= link_to t('.download'),
+              hyrax.download_path(file_set),
+              class: 'btn btn-default btn-sm',
+              title: t('.download_title', file_set: file_set),
+              target: "_blank",
+              id: "file_download",
+              data: { label: file_set.id } %>
+  <% else %>
   <div class="btn-group">
     <button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button" id="dropdownMenu_<%= file_set.id %>" aria-haspopup="true" aria-expanded="false">
       <span class="sr-only"><%= t('.press_to') %> </span>
@@ -40,4 +49,5 @@
 
     </ul>
   </div>
+  <% end %>
 <% end %>

data/chart/hyrax/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: hyrax
 description: An open-source, Samvera-powered digital repository system
 type: application
-version: 0.6.0
-appVersion: 3.0.0
+version: 0.7.0
+appVersion: 3.0.1
 dependencies:
   - name: fcrepo
     version: 0.6.0

data/chart/hyrax/templates/_helpers.tpl

@@ -166,3 +166,11 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- define "hyrax.zk.fullname" -}}
 {{- printf "%s-%s" .Release.Name "zookeeper" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+
+{{- define "hyrax.redis.host" -}}
+{{- printf "%s-master" (include "hyrax.redis.fullname" .) -}}
+{{- end -}}
+
+{{- define "hyrax.redis.url" -}}
+{{- printf "redis://:%s@%s:%s" .Values.redis.password (include "hyrax.redis.host" .) "6379/0" -}}
+{{- end -}}

data/chart/hyrax/templates/branding-pvc.yaml

@@ -0,0 +1,14 @@
+{{- if and .Values.brandingVolume.enabled (not .Values.brandingVolume.existingClaim) }}
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: {{ template "hyrax.fullname" . }}-branding
+  labels:
+    {{- include "hyrax.labels" . | nindent 4 }}
+spec:
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: {{ .Values.brandingVolume.size }}
+{{- end }}