hyrax 2.0.3 → 2.1.0.beta1

data/lib/generators/hyrax/work/templates/controller.rb.erb

@@ -1,7 +1,7 @@
 # Generated via
 #  `rails generate hyrax:work <%= class_name %>`
-
 module Hyrax
+  # Generated controller for <%= class_name %>
   class <%= class_name.pluralize %>Controller < ApplicationController
     # Adds Hyrax behaviors to the controller.
     include Hyrax::WorksControllerBehavior

data/lib/generators/hyrax/work/templates/feature_spec.rb.erb

@@ -12,9 +12,21 @@ RSpec.feature 'Create a <%= class_name %>', js: false do
     let(:user) do
       User.new(user_attributes) { |u| u.save(validate: false) }
     end
+    let(:admin_set_id) { AdminSet.find_or_create_default_admin_set_id }
+    let(:permission_template) { Hyrax::PermissionTemplate.find_or_create_by!(admin_set_id: admin_set_id) }
+    let(:workflow) { Sipity::Workflow.create!(active: true, name: 'test-workflow', permission_template: permission_template) }
 
     before do
-      AdminSet.find_or_create_default_admin_set_id
+      # Create a single action that can be taken
+      Sipity::WorkflowAction.create!(name: 'submit', workflow: workflow)
+
+      # Grant the user access to deposit into the admin set.
+      Hyrax::PermissionTemplateAccess.create!(
+        permission_template_id: permission_template.id,
+        agent_type: 'user',
+        agent_id: user.user_key,
+        access: 'deposit'
+      )
       login_as user
     end
 
@@ -28,6 +40,30 @@ RSpec.feature 'Create a <%= class_name %>', js: false do
       # click_button "Create work"
 
       expect(page).to have_content "Add New <%= human_name %>"
+      click_link "Files" # switch tab
+      expect(page).to have_content "Add files"
+      expect(page).to have_content "Add folder"
+      within('span#addfiles') do
+        attach_file("files[]", "#{Hyrax::Engine.root}/spec/fixtures/image.jp2", visible: false)
+        attach_file("files[]", "#{Hyrax::Engine.root}/spec/fixtures/jp2_fits.xml", visible: false)
+      end
+      click_link "Descriptions" # switch tab
+      fill_in('Title', with: 'My Test Work')
+      fill_in('Creator', with: 'Doe, Jane')
+      fill_in('Keyword', with: 'testing')
+      select('In Copyright', from: 'Rights statement')
+
+      # With selenium and the chrome driver, focus remains on the
+      # select box. Click outside the box so the next line can't find
+      # its element
+      find('body').click
+      choose('<%= file_name %>_visibility_open')
+      expect(page).to have_content('Please note, making something visible to the world (i.e. marking this as Public) may be viewed as publishing which could impact your ability to')
+      check('agreement')
+
+      click_on('Save')
+      expect(page).to have_content('My Test Work')
+      expect(page).to have_content "Your files are being processed by Hyrax in the background."
     end
   end
 end

data/lib/generators/hyrax/work/templates/form.rb.erb

@@ -1,6 +1,7 @@
 # Generated via
 #  `rails generate hyrax:work <%= class_name %>`
 module Hyrax
+  # Generated form for <%= class_name %>
   class <%= class_name %>Form < Hyrax::Forms::WorkForm
     self.model_class = ::<%= class_name %>
     self.terms += [:resource_type]

data/lib/generators/hyrax/work/templates/indexer.rb.erb

@@ -9,7 +9,6 @@ class <%= class_name %>Indexer < Hyrax::WorkIndexer
   # this behavior
   include Hyrax::IndexesLinkedMetadata
 
-
   # Uncomment this block if you want to add custom indexing behavior:
   # def generate_solr_document
   #  super.tap do |solr_doc|

data/lib/generators/hyrax/work/templates/locale.de.yml.erb

@@ -4,5 +4,5 @@ de:
       <%= file_name %>:     'fa fa-file-text-o'
     select_type:
       <%= file_name %>:
-        name:               "<%= human_name.titleize %>"
         description:        "<%= human_name %> Werke"
+        name:               "<%= human_name.titleize %>"

data/lib/generators/hyrax/work/templates/locale.en.yml.erb

@@ -4,5 +4,5 @@ en:
       <%= file_name %>:     'fa fa-file-text-o'
     select_type:
       <%= file_name %>:
-        name:               "<%= human_name.titleize %>"
         description:        "<%= human_name %> works"
+        name:               "<%= human_name.titleize %>"

data/lib/generators/hyrax/work/templates/locale.es.yml.erb

@@ -5,6 +5,6 @@ es:
     select_type:
       <%= file_name %>:
         # TODO: translate `human_name` into Spanish
+        description:        "<%= human_name %> trabajos"
         name:               "<%= human_name.titleize %>"
         # TODO: translate `human_name` into Spanish
-        description:        "<%= human_name %> trabajos"

data/lib/generators/hyrax/work/templates/locale.fr.yml.erb

@@ -4,5 +4,5 @@ fr:
       <%= file_name %>:     'fa fa-file-text-o'
     select_type:
       <%= file_name %>:
-        name:               "<%= human_name.titleize %>"
         description:        "<%= human_name %> œuvres"
+        name:               "<%= human_name.titleize %>"

data/lib/generators/hyrax/work/templates/locale.it.yml.erb

@@ -4,5 +4,5 @@ it:
       <%= file_name %>:     'fa fa-file-text-o'
     select_type:
       <%= file_name %>:
-        name:               "<%= human_name.titleize %>"
         description:        "<%= human_name %> opere"
+        name:               "<%= human_name.titleize %>"

data/lib/generators/hyrax/work/templates/locale.pt-BR.yml.erb

@@ -4,5 +4,5 @@ pt-BR:
       <%= file_name %>:     'fa fa-file-text-o'
     select_type:
       <%= file_name %>:
-        name:               "<%= human_name.titleize %>"
         description:        "<%= human_name %> trabalhos"
+        name:               "<%= human_name.titleize %>"

data/lib/generators/hyrax/work/templates/locale.zh.yml.erb

@@ -5,6 +5,6 @@ zh:
     select_type:
       <%= file_name %>:
         # TODO: translate `human_name` into Chinese
+        description:        "<%= human_name %> 作品"
         name:               "<%= human_name.titleize %>"
         # TODO: translate `human_name` into Chinese
-        description:        "<%= human_name %> 作品"

data/lib/generators/hyrax/work/templates/model.rb.erb

@@ -8,8 +8,6 @@ class <%= class_name %> < ActiveFedora::Base
   # self.valid_child_concerns = []
   validates :title, presence: { message: 'Your work must have a title.' }
 
-  self.human_readable_type = '<%= name.underscore.titleize %>'
-
   # This must be included at the end, because it finalizes the metadata
   # schema (by adding accepts_nested_attributes)
   include ::Hyrax::BasicMetadata

data/lib/hyrax.rb

@@ -8,7 +8,7 @@ require 'font-awesome-rails'
 require 'tinymce-rails'
 require 'blacklight'
 require 'blacklight/gallery'
-require 'active_fedora/noid'
+require 'noid-rails'
 require 'hydra/head'
 require 'hydra-editor'
 require 'browse-everything'

data/lib/hyrax/configuration.rb

@@ -1,5 +1,6 @@
 require 'hyrax/callbacks'
 require 'hyrax/role_registry'
+require 'samvera/nesting_indexer'
 
 module Hyrax
   class Configuration
@@ -9,6 +10,7 @@ module Hyrax
       @registered_concerns = []
       @role_registry = Hyrax::RoleRegistry.new
       @default_active_workflow_name = DEFAULT_ACTIVE_WORKFLOW_NAME
+      @nested_relationship_reindexer = default_nested_relationship_reindexer
     end
 
     DEFAULT_ACTIVE_WORKFLOW_NAME = 'default'.freeze
@@ -58,6 +60,12 @@ module Hyrax
       @working_path ||= Rails.root.join('tmp', 'uploads')
     end
 
+    # Path on the local file system where where log and banners will be stored.
+    attr_writer :branding_path
+    def branding_path
+      @branding_path ||= Rails.root.join('public', 'branding')
+    end
+
     attr_writer :enable_ffmpeg
     def enable_ffmpeg
       return @enable_ffmpeg unless @enable_ffmpeg.nil?
@@ -79,8 +87,7 @@ module Hyrax
       @feature_config_path ||= Rails.root.join('config', 'features.yml')
     end
 
-    attr_accessor :temp_file_base, :enable_local_ingest,
-                  :analytics, :analytic_start_date
+    attr_accessor :temp_file_base, :enable_local_ingest
 
     attr_writer :display_microdata
     def display_microdata?
@@ -111,7 +118,7 @@ module Hyrax
 
     attr_writer :noid_minter_class
     def noid_minter_class
-      @noid_minter_class ||= ActiveFedora::Noid::Minter::Db
+      @noid_minter_class ||= Noid::Rails::Minter::Db
     end
 
     attr_writer :minter_statefile
@@ -230,8 +237,8 @@ module Hyrax
 
     # A configuration point for changing the behavior of the rights statement service.
     #
-    # @!attribute [w] license_service_class
-    #   A configuration point for changing the behavior of the license service.
+    # @!attribute [w] rights_statement_service_class
+    #   A configuration point for changing the behavior of the rights statement service.
     #
     #   @see Hyrax::RightsStatementService for implementation details
     attr_writer :rights_statement_service_class
@@ -266,6 +273,7 @@ module Hyrax
     end
 
     attr_writer :analytics
+    attr_reader :analytics
     def analytics?
       @analytics ||= false
     end
@@ -321,6 +329,13 @@ module Hyrax
       @admin_set_predicate ||= ::RDF::Vocab::DC.isPartOf
     end
 
+    # Set predicate for rendering to dc:hasFormat as defined in
+    #   IIIF Presentation API context:  http://iiif.io/api/presentation/2/context.json
+    attr_writer :rendering_predicate
+    def rendering_predicate
+      @rendering_predicate ||= ::RDF::Vocab::DC.hasFormat
+    end
+
     attr_writer :work_requires_files
     def work_requires_files?
       return true if @work_requires_files.nil?
@@ -348,6 +363,68 @@ module Hyrax
       @cache_path ||= ->() { Rails.root + 'tmp' + 'uploads' + 'cache' }
     end
 
+    # Enable IIIF image service. This is required to use the
+    # UniversalViewer-enabled show page
+    #
+    # If you have run the hyrax:riiif generator, an embedded riiif service
+    # will be used to deliver images via IIIF. If you have not, you will
+    # need to configure the following other configuration values to work
+    # with your image server.
+    #
+    # @see config.iiif_image_url_builder
+    # @see config.iiif_info_url_builder
+    # @see config.iiif_image_compliance_level_uri
+    # @see config.iiif_image_size_default
+    #
+    # @note Default is false
+    #
+    # @return [Boolean] true to enable, false to disable
+    def iiif_image_server?
+      return @iiif_image_server unless @iiif_image_server.nil?
+      @iiif_image_server = false
+    end
+    attr_writer :iiif_image_server
+
+    # URL that resolves to an image provided by a IIIF image server
+    #
+    # @return [#call] lambda/proc that generates a URL to an image
+    def iiif_image_url_builder
+      @iiif_image_url_builder ||= ->(file_id, base_url, _size) { "#{base_url}/downloads/#{file_id.split('/').first}" }
+    end
+    attr_writer :iiif_image_url_builder
+
+    # URL that resolves to an info.json file provided by a IIIF image server
+    #
+    # @return [#call] lambda/proc that generates a URL to image info
+    def iiif_info_url_builder
+      @iiif_info_url_builder ||= ->(_file_id, _base_url) { '' }
+    end
+    attr_writer :iiif_info_url_builder
+
+    # URL that indicates your IIIF image server compliance level
+    #
+    # @return [String] valid IIIF image compliance level URI
+    def iiif_image_compliance_level_uri
+      @iiif_image_compliance_level_uri ||= 'http://iiif.io/api/image/2/level2.json'
+    end
+    attr_writer :iiif_image_compliance_level_uri
+
+    # IIIF image size default
+    #
+    # @return [#String] valid IIIF image size parameter
+    def iiif_image_size_default
+      @iiif_image_size_default ||= '600,'
+    end
+    attr_writer :iiif_image_size_default
+
+    # IIIF metadata - fields to display in the metadata section
+    #
+    # @return [#Array] fields
+    def iiif_metadata_fields
+      @iiif_metadata_fields ||= Hyrax::Forms::WorkForm.required_fields
+    end
+    attr_writer :iiif_metadata_fields
+
     # Should a button with "Share my work" show on the front page to users who are not logged in?
     attr_writer :display_share_button_when_not_logged_in
     def display_share_button_when_not_logged_in?
@@ -384,13 +461,19 @@ module Hyrax
     end
 
     attr_writer :translate_uri_to_id
+
     def translate_uri_to_id
-      @translate_uri_to_id ||= ActiveFedora::Noid.config.translate_uri_to_id
+      @translate_uri_to_id ||= lambda do |uri|
+        baseparts = 2 + [(::Noid::Rails.config.template.gsub(/\.[rsz]/, '').length.to_f / 2).ceil, 4].min
+        uri.to_s.sub("#{ActiveFedora.fedora.host}#{ActiveFedora.fedora.base_path}", '').split('/', baseparts).last
+      end
     end
 
     attr_writer :translate_id_to_uri
     def translate_id_to_uri
-      @translate_id_to_uri ||= ActiveFedora::Noid.config.translate_id_to_uri
+      @translate_id_to_uri ||= lambda do |id|
+        "#{ActiveFedora.fedora.host}#{ActiveFedora.fedora.base_path}/#{::Noid::Rails.treeify(id)}"
+      end
     end
 
     attr_writer :contact_email
@@ -419,6 +502,12 @@ module Hyrax
                     end
     end
 
+    attr_accessor :nested_relationship_reindexer
+
+    def default_nested_relationship_reindexer
+      ->(id:) { Samvera::NestingIndexer.reindex_relationships(id: id) }
+    end
+
     private
 
       # @param [Symbol, #to_s] model_name - symbol representing the model

data/lib/hyrax/engine.rb

@@ -13,6 +13,7 @@ module Hyrax
     require 'qa'
     require 'clipboard/rails'
     require 'legato'
+    require 'pul_uv_rails'
 
     # Force these models to be added to Legato's registry in development mode
     config.eager_load_paths += %W[
@@ -34,7 +35,7 @@ module Hyrax
       begin
         Hyrax.config.persist_registered_roles!
         Rails.logger.info("Hyrax::Engine.after_initialize - persisting registered roles!")
-      rescue
+      rescue ActiveRecord::StatementInvalid
         message = "Hyrax::Engine.after_initialize - unable to persist registered roles.\n"
         message += "It is expected during the application installation - during integration tests, rails install.\n"
         message += "It is UNEXPECTED if you are booting up a Hyrax powered application via `rails server'"
@@ -71,9 +72,9 @@ module Hyrax
         ActiveFedora::Base.translate_uri_to_id = c.translate_uri_to_id
         ActiveFedora::Base.translate_id_to_uri = c.translate_id_to_uri
 
-        ActiveFedora::Noid.config.template = c.noid_template
-        ActiveFedora::Noid.config.minter_class = c.noid_minter_class
-        ActiveFedora::Noid.config.statefile = c.minter_statefile
+        Noid::Rails.config.template = c.noid_template
+        Noid::Rails.config.minter_class = c.noid_minter_class
+        Noid::Rails.config.statefile = c.minter_statefile
       end
     end
 

data/lib/hyrax/rails/routes.rb

@@ -14,6 +14,7 @@ module ActionDispatch::Routing
           namespaced_resources curation_concern_name, except: [:index], &block
           namespaced_resources curation_concern_name, only: [] do
             member do
+              get :manifest
               get :file_manager
               get :inspect_work
             end
@@ -36,7 +37,6 @@ module ActionDispatch::Routing
             post :copy
           end
         end
-        resources :file_sets, only: [:new, :create], path: 'container/:parent_id/file_sets'
         resources :file_sets, only: [:show, :edit, :update, :destroy] do
           member do
             get :versions

data/lib/hyrax/version.rb

@@ -1,3 +1,3 @@
 module Hyrax
-  VERSION = '2.0.3'.freeze
+  VERSION = '2.1.0.beta1'.freeze
 end

data/lib/tasks/default_admin_set.rake

@@ -3,13 +3,15 @@ namespace :hyrax do
     desc "Create the Default Admin Set"
     task create: :environment do
       id = AdminSet.find_or_create_default_admin_set_id
-      unless Hyrax::PermissionTemplate.find_by(admin_set_id: id)
-        $stderr.puts "ERROR: Default admin set exists but it does not have an " \
+      if Hyrax::PermissionTemplate.find_by(source_id: id)
+        puts "Successfully created default admin set"
+      else
+        warn "ERROR: Default admin set exists but it does not have an " \
           "associated permission template.\n\nThis may happen if you cleared your " \
           "database but you did not clear out Fedora and Solr.\n\n" \
           "You could manually create the permission template in the rails console" \
           " (non-destructive):\n\n" \
-          "    Hyrax::PermissionTemplate.create!(admin_set_id: AdminSet::DEFAULT_ID)\n\n" \
+          "    Hyrax::PermissionTemplate.create!(source_id: AdminSet::DEFAULT_ID)\n\n" \
           "OR you could start fresh by clearing Fedora and Solr (destructive):\n\n" \
           "    require 'active_fedora/cleaner'\n" \
           "    ActiveFedora::Cleaner.clean!\n\n"

data/lib/tasks/default_collection_type.rake

@@ -0,0 +1,19 @@
+namespace :hyrax do
+  namespace :default_collection_types do
+    desc "Create Default Collection Types"
+    task create: :environment do
+      default = Hyrax::CollectionType.find_or_create_default_collection_type
+      admin_set = Hyrax::CollectionType.find_or_create_admin_set_type
+      if Hyrax::CollectionType.exists?(machine_id: default.machine_id)
+        puts "Default collection type is #{default.machine_id}"
+      else
+        warn "ERROR: A default collection type did not get created."
+      end
+      if Hyrax::CollectionType.exists?(machine_id: admin_set.machine_id)
+        puts "Default collection type is #{admin_set.machine_id}"
+      else
+        warn "ERROR: The Admin Set collection type did not get created."
+      end
+    end
+  end
+end

data/lib/tasks/migrate.rake

@@ -26,5 +26,13 @@ namespace :hyrax do
         end
       end
     end
+
+    task add_collection_type_and_permissions_to_collections: :environment do
+      # Run collection migration which sets the collection_type of legacy collections to User Collection and adds
+      # a permission template assigning users/groups with edit_access to the Manager role and users/groups with
+      # read_access to the Viewer role.  Legacy collections are those created prior to collections extensions
+      # added in Hyrax 2.1.0
+      Hyrax::Collections::MigrationService.migrate_all_collections
+    end
   end
 end