hyrax 2.6.0 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d5150722f3ca96a6fafde49d7cb079bc12e74ec0a535ff26ae2fb1e3b4e6ef6
-  data.tar.gz: 2d4dd842e2d4d0f11889c3b31a9d38935942b102af52ee01b4912a9e13075ed5
+  metadata.gz: c050894909dcdbe63b34640d24f9f665e3818850cf2f4c5a0d92af23ae51cf62
+  data.tar.gz: 42a5a185ee2d26c9ab54d544a8261fc2bd24c01b99903092e5d54a9c5dcee054
 SHA512:
-  metadata.gz: e1aeac1be9a34b0d656baba6757285d70d44ab47a46a9a0ab86196098c5c5c8f0e8548295386c624de94d8fe0f359c1a303226ae9fbb7fd2add8604621b6125c
-  data.tar.gz: 9e2e93f81be52b0ea3c7fadab04046de5d5e8f1ec23d02f65f00d7f342f2a0f4881e6fb66e83888f1f81446cb7ac8961740456aecd4f7c5cde405acffa698b63
+  metadata.gz: a0fab1e2979598561c1f4afd61e2434c0af3529005c7f6394f9605d5c30e4e95df45a7c23cf665ac6ee647360a27ef286870a7456b8b57a0ec17e905f8d474af
+  data.tar.gz: 55d6ffdace586396f41b327dceca10da11eeedbcee3d0be0abeafa3635574425e79fa6b8dd0ba831870b9f6d464e0067da889d46e5318051d63f00a502cff892

data/.circleci/config.yml

@@ -6,16 +6,13 @@ jobs:
     parameters:
       ruby_version:
         type: string
-        default: 2.5.5
+        default: 2.5.8
       bundler_version:
         type: string
         default: 1.17.3
       rails_version:
         type: string
-        default: '5.2.2'
-      cache_version:
-        type: string
-        default: '1-2.x'
+        default: '5.2.4.3'
     executor:
       name: 'samvera/ruby'
       ruby_version: << parameters.ruby_version >>
@@ -28,6 +25,7 @@ jobs:
       - samvera/bundle_for_gem:
           ruby_version: << parameters.ruby_version >>
           bundler_version: << parameters.bundler_version >>
+          cache_version: '{{ checksum ".regen" }}'
           project: hyrax
       - persist_to_workspace:
           root: ~/
@@ -40,9 +38,6 @@ jobs:
       ruby_version:
         type: string
         default: 2.5.5
-      cache_version:
-        type: string
-        default: '1-2.x'
     executor:
       name: 'samvera/ruby'
       ruby_version: << parameters.ruby_version >>
@@ -56,16 +51,13 @@ jobs:
     parameters:
       ruby_version:
         type: string
-        default: 2.5.5
+        default: 2.5.8
       bundler_version:
         type: string
         default: 1.17.3
       rails_version:
         type: string
-        default: '5.2.2'
-      cache_version:
-        type: string
-        default: '1-2.x'
+        default: '5.2.4.3'
     executor:
       name: 'samvera/ruby'
       ruby_version: << parameters.ruby_version >>
@@ -78,11 +70,11 @@ jobs:
       - attach_workspace:
           at: ~/
       - samvera/engine_cart_generate:
-          cache_key: v<< parameters.cache_version >>--internal-test-app-{{ checksum "hyrax.gemspec" }}-{{ checksum "spec/test_app_templates/lib/generators/test_app_generator.rb" }}-{{ checksum "lib/generators/hyrax/install_generator.rb" }}-<< parameters.rails_version >>-<< parameters.ruby_version >>
+          cache_key: v1-2.x-internal-test-app-{{ checksum "hyrax.gemspec" }}-{{ checksum ".regen" }}-<< parameters.rails_version >>-<< parameters.ruby_version >>
       - samvera/bundle_for_gem:
           ruby_version: << parameters.ruby_version >>
           bundler_version: << parameters.bundler_version >>
-          cache_version: << parameters.cache_version >>
+          cache_version: '{{ checksum ".regen" }}'
           project: hyrax
       - persist_to_workspace:
           root: ~/
@@ -94,13 +86,10 @@ jobs:
     parameters:
       ruby_version:
         type: string
-        default: 2.5.5
+        default: 2.5.8
       bundler_version:
         type: string
         default: 1.17.3
-      cache_version:
-        type: string
-        default: '1-2.x'
     executor:
       name: 'samvera/ruby_fcrepo_solr_redis'
       ruby_version: << parameters.ruby_version >>
@@ -117,39 +106,77 @@ jobs:
       - samvera/bundle_for_gem:
           ruby_version: << parameters.ruby_version >>
           bundler_version: << parameters.bundler_version >>
-          cache_version: << parameters.cache_version >>
+          cache_version: '{{ checksum ".regen" }}'
           project: hyrax
       - samvera/parallel_rspec
 
 workflows:
   version: 2
-  ci:
+  ruby2-5rails5-1:
     jobs:
       - bundle:
-          ruby_version: "2.5.5"
+          ruby_version: "2.5.8"
           rails_version: "5.1.7"
-          cache_version: "1-2.x"
       - lint:
-          ruby_version: "2.5.5"
-          cache_version: "1-2.x"
+          ruby_version: "2.5.8"
           requires:
             - bundle
       - build:
-          ruby_version: "2.5.5"
+          ruby_version: "2.5.8"
           rails_version: "5.1.7"
-          cache_version: "1-2.x"
           requires:
             - bundle
       - test:
-          name: "ruby2-5-5"
-          ruby_version: "2.5.5"
+          name: "rails5-1"
+          ruby_version: "2.5.8"
           requires:
             - build
             - lint
+  ruby2-5rails5-2:
+    jobs:
+      - bundle:
+          ruby_version: "2.5.8"
+          rails_version: "5.2.4.3"
+      - build:
+          ruby_version: "2.5.8"
+          rails_version: "5.2.4.3"
+          requires:
+            - bundle
       - test:
-          name: "ruby2-6-2"
-          ruby_version: "2.6.2"
-          cache_version: "1-2.x"
+          name: "ruby2-5-8"
+          ruby_version: "2.5.8"
+          requires:
+            - build
+  ruby2-6rails5-2:
+    jobs:
+      - bundle:
+          ruby_version: "2.6.6"
+          rails_version: "5.2.4.3"
+      - build:
+          ruby_version: "2.6.6"
+          rails_version: "5.2.4.3"
+          requires:
+            - bundle
+      - test:
+          name: "ruby2-6-6"
+          ruby_version: "2.6.6"
+          requires:
+            - build
+  ruby2-7rails5-2:
+    jobs:
+      - bundle:
+          ruby_version: "2.7.1"
+          rails_version: "5.2.4.3"
+          bundler_version: "2.1.2"
+      - build:
+          ruby_version: "2.7.1"
+          rails_version: "5.2.4.3"
+          bundler_version: "2.1.2"
+          requires:
+            - bundle
+      - test:
+          name: "ruby2-7-1"
+          ruby_version: "2.7.1"
+          bundler_version: "2.1.2"
           requires:
             - build
-            - lint

data/.gitignore

@@ -78,3 +78,4 @@ _yardoc
 lib/bundler/man
 spec/reports
 /spec/examples.txt
+node_modules

data/.regen

@@ -0,0 +1 @@
+3

data/README.md

@@ -128,7 +128,7 @@ Note here that the following commands assume you're setting up Hyrax in a develo
 
 First, you'll need a working Ruby installation. You can install this via your operating system's package manager -- you are likely to get farther with OSX, Linux, or UNIX than Windows but your mileage may vary -- but we recommend using a Ruby version manager such as [RVM](https://rvm.io/) or [rbenv](https://github.com/sstephenson/rbenv).
 
-Hyrax supports Ruby 2.3, 2.4 and 2.5. When starting a new project, we recommend using the latest Ruby 2.5 version.
+Hyrax supports Ruby 2.3 and up. When starting a new project, we recommend using the latest Ruby 2.7 version.
 
 ## Redis
 
@@ -138,11 +138,11 @@ Starting up Redis will depend on your operating system, and may in fact already
 
 ## Rails
 
-Hyrax requires Rails 5. We recommend the latest Rails 5.1 release.
+Hyrax 2.x supports Rails 5.1 and 5.2. We recommend the latest Rails 5.2 release.
 
 ```
 # If you don't already have Rails at your disposal...
-gem install rails -v 5.1.6
+gem install rails -v '5.2.4.3'
 ```
 
 ### JavaScript runtime
@@ -158,7 +158,7 @@ NOTE: The steps need to be done in order to create a new Hyrax based app.
 Generate a new Rails application using the template.
 
 ```
-rails _5.1.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v2.6.0/template.rb
+rails _5.2.4.3_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v2.9.0/template.rb
 ```
 
 Generating a new Rails application using Hyrax's template above takes cares of a number of steps for you, including:

data/app/actors/hyrax/actors/attach_members_actor.rb

@@ -30,11 +30,18 @@ module Hyrax
           # checking for existing works to avoid rewriting/loading works that are
           # already attached
           existing_works = env.curation_concern.member_ids
+          boolean_type_caster = ActiveModel::Type::Boolean.new
+
           attributes_collection.each do |attributes|
             next if attributes['id'].blank?
-            if existing_works.include?(attributes['id'])
-              remove(env.curation_concern, attributes['id']) if has_destroy_flag?(attributes)
+            if boolean_type_caster.cast(attributes['_destroy'])
+              # Likely someone in the UI sought to add the collection, then
+              # changed their mind and checked the "delete" checkbox and posted
+              # their update.
+              next unless existing_works.include?(attributes['id'])
+              remove(env.curation_concern, attributes['id'])
             else
+              next if existing_works.include?(attributes['id'])
               add(env, attributes['id'])
             end
           end

data/app/actors/hyrax/actors/collections_membership_actor.rb

@@ -31,7 +31,7 @@ module Hyrax
         # @param env [Hyrax::Actors::Enviornment]
         # @return [Boolean]
         #
-        # rubocop:disable Metrics/MethodLength
+        # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
         # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         def assign_nested_attributes_for_collection(env)
           attributes_collection = env.attributes.delete(:member_of_collections_attributes)
@@ -46,18 +46,24 @@ module Hyrax
           attributes_collection = attributes_collection.sort_by { |i, _| i.to_i }.map { |_, attributes| attributes }
           # checking for existing works to avoid rewriting/loading works that are already attached
           existing_collections = env.curation_concern.member_of_collection_ids
+          boolean_type_caster = ActiveModel::Type::Boolean.new
           attributes_collection.each do |attributes|
             next if attributes['id'].blank?
-            if existing_collections.include?(attributes['id'])
-              remove(env.curation_concern, attributes['id']) if has_destroy_flag?(attributes)
+            if boolean_type_caster.cast(attributes['_destroy'])
+              # Likely someone in the UI sought to add the collection, then
+              # changed their mind and checked the "delete" checkbox and posted
+              # their update.
+              next unless existing_collections.include?(attributes['id'])
+              remove(env.curation_concern, attributes['id'])
             else
+              next if existing_collections.include?(attributes['id'])
               add(env, attributes['id'])
             end
           end
 
           true
         end
-        # rubocop:enable Metrics/MethodLength
+        # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
         # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
         ##
@@ -115,13 +121,6 @@ module Hyrax
           curation_concern.member_of_collections.delete(collection)
         end
 
-        # Determines if a hash contains a truthy _destroy key.
-        # rubocop:disable Naming/PredicateName
-        def has_destroy_flag?(hash)
-          ActiveFedora::Type::Boolean.new.cast(hash['_destroy'])
-        end
-        # rubocop:enable Naming/PredicateName
-
         # Extact a singleton collection id from the collection attributes and save it in env.  Later in the actor stack,
         # in apply_permission_template_actor.rb, `env.attributes[:collection_id]` will be used to apply the
         # permissions of the collection to the created work.  With one and only one collection, the work is seen as

data/app/actors/hyrax/actors/file_set_actor.rb

@@ -129,12 +129,12 @@ module Hyrax
         # @note This is only useful for labeling the file_set, because of the recourse to import_url
         def label_for(file)
           if file.is_a?(Hyrax::UploadedFile) # filename not present for uncached remote file!
-            file.uploader.filename.present? ? file.uploader.filename : File.basename(Addressable::URI.parse(file.file_url).path)
+            file.uploader.filename.present? ? file.uploader.filename : File.basename(Addressable::URI.unencode(file.file_url))
           elsif file.respond_to?(:original_name) # e.g. Hydra::Derivatives::IoDecorator
             file.original_name
           elsif file_set.import_url.present?
             # This path is taken when file is a Tempfile (e.g. from ImportUrlJob)
-            File.basename(Addressable::URI.parse(file_set.import_url).path)
+            File.basename(Addressable::URI.unencode(file.file_url))
           else
             File.basename(file)
           end

data/app/assets/javascripts/hyrax/autocomplete.es6

@@ -10,6 +10,34 @@ export default class Autocomplete {
    * @param {string} url - The url for the autocompete search endpoint
    */
   setup (element, fieldName, url) {
+    if(element.data('autocomplete-type') && element.data('autocomplete-type').length > 0) {
+      this.byDataAttribute(element, url)
+    } else {
+      this.byFieldName(element, fieldName, url)
+    }
+  }
+
+  byDataAttribute(element, url) {
+    let type = element.data('autocomplete-type')
+    let exlude = element.data('exclude-work')
+    if(type === 'resource' && exclude.length > 0) {
+      new Resource(
+        element,
+        url,
+        { excluding: exclude }
+      )
+    } else if(type === 'resource' ) {
+      new Resource(
+        element,
+        url)
+    } else if(type === 'linked') {
+      new LinkedData(element, url)
+    } else {
+      new Default(element, url)
+    }
+  }
+
+  byFieldName(element, fieldName, url) {
     switch (fieldName) {
       case 'work':
         new Resource(
@@ -30,4 +58,5 @@ export default class Autocomplete {
         break
     }
   }
+
 }

data/app/assets/javascripts/hyrax/collections/editor.es6

@@ -4,14 +4,24 @@ import tabifyForm from 'hyrax/tabbed_form'
 
 // Controls the behavior of the Collections edit form
 // Add search for thumbnail to the edit descriptions
+// this method used to simply replace the string edit
+// but now replaces the last url part if and only if
+// that part is edit
 export default class {
   constructor(elem) {
-    let url =  window.location.pathname.replace('edit', 'files')
     let field = elem.find('#collection_thumbnail_id')
-    this.thumbnailSelect = new ThumbnailSelect(url, field)
+    this.thumbnailSelect = new ThumbnailSelect(this.url(), field)
     tabifyForm(elem.find('form.editor'))
 
     let participants = new Participants(elem.find('#participants'))
     participants.setup()
   }
+
+  url() {
+    let urlParts = window.location.pathname.split("/")
+    if(urlParts[urlParts.length - 1] === "edit") {
+      urlParts[urlParts.length - 1] = "files"
+    }
+    return urlParts.join("/") 
+  }
 }

data/app/assets/javascripts/hyrax/editor.es6

@@ -53,17 +53,16 @@ export default class {
       $('[data-autocomplete]').each((function() {
         var elem = $(this)
         autocomplete.setup(elem, elem.data('autocomplete'), elem.data('autocompleteUrl'))
+        elem.parents('.multi_value.form-group').manage_fields({
+          add: function(e, element) {
+            var elem = $(element)
+            // Don't mark an added element as readonly even if previous element was
+            // Enable before initializing, as otherwise LinkedData fields remain disabled
+            elem.attr('readonly', false)
+            autocomplete.setup(elem, elem.data('autocomplete'), elem.data('autocompleteUrl'))
+          }
+        })
       }))
-
-      $('.multi_value.form-group').manage_fields({
-        add: function(e, element) {
-          var elem = $(element)
-          // Don't mark an added element as readonly even if previous element was
-          // Enable before initializing, as otherwise LinkedData fields remain disabled
-          elem.attr('readonly', false)
-          autocomplete.setup(elem, elem.data('autocomplete'), elem.data('autocompleteUrl'))
-        }
-      })
   }
 
   // initialize any controlled vocabulary widgets

data/app/controllers/concerns/hyrax/local_file_downloads_controller_behavior.rb

@@ -29,6 +29,7 @@ module Hyrax
       end
 
       def send_local_file_contents
+        return unless stale?(last_modified: local_file_last_modified, template: false)
         self.status = 200
         prepare_local_file_headers
         # For derivatives stored on the local file system
@@ -65,7 +66,7 @@ module Hyrax
         response.headers['Content-Type'] = local_file_mime_type
         response.headers['Content-Length'] ||= local_file_size.to_s
         # Prevent Rack::ETag from calculating a digest over body
-        response.headers['Last-Modified'] = local_file_last_modified.utc.strftime("%a, %d %b %Y %T GMT")
+        response.headers['Last-Modified'] ||= local_file_last_modified.httpdate
         self.content_type = local_file_mime_type
       end
 

data/app/controllers/concerns/hyrax/works_controller_behavior.rb

@@ -10,10 +10,11 @@ module Hyrax
       with_themed_layout :decide_layout
       copy_blacklight_config_from(::CatalogController)
 
-      class_attribute :_curation_concern_type, :show_presenter, :work_form_service, :search_builder_class
+      class_attribute :_curation_concern_type, :show_presenter, :work_form_service, :search_builder_class, :iiif_manifest_builder
       self.show_presenter = Hyrax::WorkShowPresenter
       self.work_form_service = Hyrax::WorkFormService
       self.search_builder_class = WorkSearchBuilder
+      self.iiif_manifest_builder = (Flipflop.cache_work_iiif_manifest? ? Hyrax::CachingIiifManifestBuilder.new : Hyrax::ManifestBuilderService.new)
       attr_accessor :curation_concern
       helper_method :curation_concern, :contextual_path
 
@@ -127,14 +128,28 @@ module Hyrax
 
     def manifest
       headers['Access-Control-Allow-Origin'] = '*'
+
+      json = iiif_manifest_builder.manifest_for(presenter: iiif_manifest_presenter)
+
       respond_to do |wants|
-        wants.json { render json: manifest_builder.to_h }
-        wants.html { render json: manifest_builder.to_h }
+        wants.json { render json: json }
+        wants.html { render json: json }
       end
     end
 
     private
 
+      def iiif_manifest_builder
+        self.class.iiif_manifest_builder
+      end
+
+      def iiif_manifest_presenter
+        IiifManifestPresenter.new(curation_concern_from_search_results).tap do |p|
+          p.hostname = request.hostname
+          p.ability = current_ability
+        end
+      end
+
       def user_collections
         collections_service.search_results(:deposit)
       end
@@ -157,10 +172,6 @@ module Hyrax
         @form = work_form_service.build(curation_concern, current_ability, self)
       end
 
-      def manifest_builder
-        ::IIIFManifest::ManifestFactory.new(presenter)
-      end
-
       def actor
         @actor ||= Hyrax::CurationConcern.actor
       end