hyrax 1.1.1 → 2.0.0.beta1

data/lib/hyrax/controller_resource.rb

@@ -2,7 +2,7 @@ module Hyrax
   # Overrides CanCan so that attributes are not automatically assigned
   # to loaded resources
   class ControllerResource < CanCan::ControllerResource
-    protected
+    private
 
       # Override resource_params to make this a nop. Hyrax uses actors to assign attributes
       def resource_params

data/lib/hyrax/engine.rb

@@ -15,9 +15,14 @@ module Hyrax
     require 'legato'
 
     # Force these models to be added to Legato's registry in development mode
-    config.eager_load_paths += %W(
+    config.eager_load_paths += %W[
       #{config.root}/app/models/hyrax/download.rb
       #{config.root}/app/models/hyrax/pageview.rb
+    ]
+
+    config.action_dispatch.rescue_responses.merge!(
+      "ActiveFedora::ObjectNotFoundError" =>     :not_found, # We can remove this when we use ActiveFedora 11.2
+      "Blacklight::Exceptions::RecordNotFound" => :not_found
     )
 
     config.after_initialize do
@@ -34,7 +39,6 @@ module Hyrax
 
     initializer 'requires' do
       require 'hydra/derivatives'
-      require 'hyrax/name'
       require 'hyrax/controller_resource'
       require 'hyrax/search_state'
       require 'hyrax/errors'
@@ -76,8 +80,7 @@ module Hyrax
       app.config.assets.paths << config.root.join('app', 'assets', 'images', 'site_images')
 
       app.config.assets.precompile << /fontawesome-webfont\.(?:svg|ttf|woff)$/
-      app.config.assets.precompile += %w(*.png *.jpg *.ico *.gif *.svg)
-      app.config.assets.precompile += %w(hyrax/admin.css)
+      app.config.assets.precompile += %w[*.png *.jpg *.ico *.gif *.svg]
 
       Sprockets::ES6.configuration = { 'modules' => 'amd', 'moduleIds' => true }
       # When we upgrade to Sprockets 4, we can ditch sprockets-es6 and config AMD

data/lib/hyrax/rails/routes.rb

@@ -46,25 +46,9 @@ module ActionDispatch::Routing
       end
     end
 
-    # Adds routes for doing paginated searches within a collection's contents
-    # @example in routes.rb:
-    #     curation_concerns_collections
-    def curation_concerns_collections
-      Deprecation.warn(self, "curation_concerns_collections is deprecated and will be removed")
-    end
-
-    # kmr added :show to make tests pass
     def curation_concerns_embargo_management
-      resources :embargoes, only: [:index, :edit, :destroy] do
-        collection do
-          patch :update
-        end
-      end
-      resources :leases, only: [:index, :edit, :destroy] do
-        collection do
-          patch :update
-        end
-      end
+      # routes moved to config/routes.rb
+      Deprecation.warn(self, '#curation_concerns_embargo_management is deprecated and has no effect. It will be removed in Hyrax 3.0')
     end
 
     private

data/lib/hyrax/resource_sync/capability_list_writer.rb

@@ -12,6 +12,8 @@ module Hyrax
         builder.to_xml
       end
 
+      # I would like this to be above the builder declaration, but Rubocop can't figure out if it should be indented at the method depth or the private declaration depth
+      # rubocop:disable Metrics/MethodLength
       private
 
         def builder
@@ -33,6 +35,7 @@ module Hyrax
             end
           end
         end
+      # rubocop:enable Metrics/MethodLength
     end
   end
 end

data/lib/hyrax/resource_sync/change_list_writer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Hyrax
   module ResourceSync
     # TODO: the big assumption I'm making here is that the repository has fewer
@@ -6,6 +8,8 @@ module Hyrax
     # lists and add a Change List Index to point to all of them.
     class ChangeListWriter
       attr_reader :resource_host, :capability_list_url
+      MODIFIED_DATE_FIELD = 'system_modified_dtsi'.freeze
+      BEGINNING_OF_TIME = '1970-01-01T00:00:00Z'.freeze
 
       def initialize(resource_host:, capability_list_url:)
         @resource_host = resource_host
@@ -29,12 +33,20 @@ module Hyrax
           end
         end
 
+        # return the earliest change. Otherwise BEGINNING_OF_TIME
         def from
-          @from ||= relation.search_with_conditions(public_access, rows: 1, sort: 'system_modified_dtsi asc').first.fetch('system_modified_dtsi')
+          @from ||= begin
+                      results = relation.search_with_conditions(public_access, rows: 1, sort: MODIFIED_DATE_FIELD + ' asc')
+                      if results.present?
+                        results.first.fetch(MODIFIED_DATE_FIELD)
+                      else
+                        BEGINNING_OF_TIME
+                      end
+                    end
         end
 
         def sort
-          { sort: 'system_modified_dtsi desc' }
+          { sort: MODIFIED_DATE_FIELD + ' desc' }
         end
 
         def relation

data/lib/hyrax/role_registry.rb

@@ -8,6 +8,10 @@ module Hyrax
     # You may develop your application assuming that the 'managing' role will always be present and valid
     MANAGING = 'managing'.freeze
 
+    # @api public
+    # You may develop your application assuming that the 'approving' role will always be present and valid
+    APPROVING = 'approving'.freeze
+
     # @api public
     # You may develop your application assuming that the 'depositing' role will always be present and valid
     DEPOSITING = 'depositing'.freeze
@@ -20,6 +24,7 @@ module Hyrax
     # @see Sipity::Role for data integrity enforcement
     MAGIC_ROLES = {
       MANAGING => 'Grants access to management tasks'.freeze,
+      APPROVING => 'Grants access to approval tasks'.freeze,
       DEPOSITING => 'Grants access to depositing tasks'.freeze
     }.freeze
 

data/lib/hyrax/version.rb

@@ -1,3 +1,3 @@
 module Hyrax
-  VERSION = '1.1.1'.freeze
+  VERSION = '2.0.0.beta1'.freeze
 end

data/lib/tasks/default_admin_set.rake

@@ -2,7 +2,18 @@ namespace :hyrax do
   namespace :default_admin_set do
     desc "Create the Default Admin Set"
     task create: :environment do
-      AdminSet.find_or_create_default_admin_set_id
+      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 " \
+          "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" \
+          "OR you could start fresh by clearing Fedora and Solr (destructive):\n\n" \
+          "    require 'active_fedora/cleaner'\n" \
+          "    ActiveFedora::Cleaner.clean!\n\n"
+      end
     end
   end
 end

data/lib/tasks/migrate.rake

@@ -4,10 +4,27 @@ namespace :hyrax do
       require 'hyrax/move_all_works_to_admin_set'
       MoveAllWorksToAdminSet.run(AdminSet.find(AdminSet::DEFAULT_ID))
     end
-    desc "Move membership from collection#members work#member_of_collections"
-    task collections: :environment do
-      require 'hyrax/collections_migration'
-      Hyrax::CollectionsMigration.run
+
+    task add_admin_group_to_admin_sets: :environment do
+      # Force creation of registered MANAGING role if it doesn't exist
+      # This code must be invoked before calling `Sipity::Role.all` or the managing role won't be there
+      Sipity::Role[Hyrax::RoleRegistry::MANAGING]
+
+      AdminSet.all.each do |admin_set|
+        permission_template = admin_set.permission_template
+        if permission_template.access_grants.where(agent_type: 'group', agent_id: ::Ability.admin_group_name).none?
+          Hyrax::PermissionTemplateAccess.create!(permission_template: permission_template,
+                                                  agent_type: 'group',
+                                                  agent_id: ::Ability.admin_group_name,
+                                                  access: Hyrax::PermissionTemplateAccess::MANAGE)
+        end
+        permission_template.available_workflows.each do |workflow|
+          Sipity::Role.all.each do |role|
+            workflow.update_responsibilities(role: role,
+                                             agents: Hyrax::Group.new(::Ability.admin_group_name))
+          end
+        end
+      end
     end
   end
 end

data/spec/abilities/ability_spec.rb

@@ -1,21 +1,98 @@
 require 'cancan/matchers'
 
-describe 'Hyrax::Ability', type: :model do
+RSpec.describe 'Hyrax::Ability', type: :model do
   let(:ability) { Ability.new(user) }
+
   subject { ability }
 
+  describe '.admin_group_name' do
+    let(:user) { create(:user) }
+
+    it 'returns the admin group name' do
+      expect(subject.admin_group_name).to eq 'admin'
+    end
+  end
+
   describe "#registered_user?" do
     subject { ability.send :registered_user? }
+
     context "with a guest user" do
       let(:user) { create(:user, :guest) }
+
       it { is_expected.to be false }
     end
   end
 
+  describe "#can_create_any_work?" do
+    subject { ability.can_create_any_work? }
+
+    let(:user) { create(:user) }
+
+    context "when user doesn't have deposit into any admin set" do
+      it { is_expected.to be false }
+    end
+
+    context "when user can deposit into an admin set" do
+      before do
+        # Grant the user access to deposit into an admin set.
+        create(:permission_template_access,
+               :deposit,
+               agent_type: 'user',
+               agent_id: user.user_key)
+      end
+      it { is_expected.to be true }
+    end
+  end
+
+  describe "can?(:review, :submissions)" do
+    subject { ability.can?(:review, :submissions) }
+
+    let(:role) { Sipity::Role.create(name: role_name) }
+    let(:user) { create(:user) }
+    let(:permission_template) { create(:permission_template, with_active_workflow: true) }
+    let(:workflow) { permission_template.active_workflow }
+
+    before do
+      workflow.workflow_roles.create(role: role)
+      # We are testing that this workflow role is removed
+      Hyrax::Workflow::PermissionGenerator.call(roles: role,
+                                                workflow: workflow,
+                                                agents: user)
+    end
+
+    context "as an administrator" do
+      # Assign a role that should not grant review ability
+      let(:role_name) { 'depositing' }
+
+      before do
+        Sipity::Role.create(name: 'approving')
+        # Admin-ify the user
+        allow(user).to receive_messages(groups: ['admin', 'registered'])
+      end
+
+      it { is_expected.to be true }
+    end
+
+    context "as a depositor" do
+      let(:role_name) { 'depositing' }
+
+      before do
+        Sipity::Role.create(name: 'approving')
+      end
+
+      it { is_expected.to be false }
+    end
+
+    context "as an approver" do
+      let(:role_name) { 'approving' }
+
+      it { is_expected.to be true }
+    end
+  end
+
   describe "a user with no roles" do
     let(:user) { nil }
-    it { is_expected.not_to be_able_to(:create, TinymceAsset) }
-    it { is_expected.not_to be_able_to(:create, ContentBlock) }
+
     it { is_expected.not_to be_able_to(:update, ContentBlock) }
     it { is_expected.not_to be_able_to(:create, AdminSet) }
     it { is_expected.to be_able_to(:read, ContentBlock) }
@@ -26,27 +103,29 @@ describe 'Hyrax::Ability', type: :model do
 
   describe "a registered user" do
     let(:user) { create(:user) }
-    it { is_expected.not_to be_able_to(:create, TinymceAsset) }
-    it { is_expected.not_to be_able_to(:create, ContentBlock) }
+
     it { is_expected.not_to be_able_to(:update, ContentBlock) }
     it { is_expected.to be_able_to(:read, ContentBlock) }
     it { is_expected.not_to be_able_to(:read, Hyrax::Statistics) }
     it { is_expected.not_to be_able_to(:read, :admin_dashboard) }
     it { is_expected.not_to be_able_to(:create, AdminSet) }
+    it { is_expected.not_to be_able_to(:update, :appearance) }
   end
 
   describe "a user in the admin group" do
     let(:user) { create(:user) }
+
     before { allow(user).to receive_messages(groups: ['admin', 'registered']) }
-    it { is_expected.to be_able_to(:create, TinymceAsset) }
-    it { is_expected.to be_able_to(:create, ContentBlock) }
     it { is_expected.to be_able_to(:update, ContentBlock) }
     it { is_expected.to be_able_to(:read, ContentBlock) }
     it { is_expected.to be_able_to(:read, Hyrax::Statistics) }
     it { is_expected.to be_able_to(:download, 'abcd123') } # an id for a work/FileSet
+    it { is_expected.to be_able_to(:edit, 'abcd123') } # an id for a work/FileSet
+    it { is_expected.to be_able_to(:destroy, 'abcd123') } # an id for a work/FileSet
     it { is_expected.to be_able_to(:read, :admin_dashboard) }
     it { is_expected.to be_able_to(:manage, AdminSet) }
     it { is_expected.to be_able_to(:create, AdminSet) }
+    it { is_expected.to be_able_to(:update, :appearance) }
   end
 
   describe "AdminSets and PermissionTemplates" do
@@ -65,6 +144,7 @@ describe 'Hyrax::Ability', type: :model do
 
     describe 'as admin' do
       let(:user) { create(:user, groups: ['admin']) }
+
       it '#admin? is true' do
         expect(ability).to be_admin
       end
@@ -72,10 +152,20 @@ describe 'Hyrax::Ability', type: :model do
     end
 
     describe 'via AdminSet-specific edit_users' do
-      let(:admin_set) { create(:admin_set, edit_users: [user]) }
+      let(:admin_set) { create(:admin_set, with_permission_template: true, edit_users: [user]) }
+
       it '#admin? is false' do
         expect(ability).not_to be_admin
       end
+
+      it 'A user who can manage an AdminSet' do
+        create(:permission_template_access,
+               :manage,
+               permission_template: admin_set.permission_template,
+               agent_type: 'user',
+               agent_id: user.user_key)
+        is_expected.to be_able_to(:manage_any, AdminSet)
+      end
       it_behaves_like 'A user with additional access'
     end
 

data/spec/abilities/admin_ability_spec.rb

@@ -1,15 +1,18 @@
-require 'spec_helper'
 require 'cancan/matchers'
 
-describe 'Hyrax::Ability', type: :model do
+RSpec.describe 'Hyrax::Ability', type: :model do
   context "with a registered user" do
     let(:user) { create(:user) }
+
     subject { Ability.new(user) }
+
     it { is_expected.not_to be_able_to(:read, :admin_dashboard) }
   end
   context "with an administrative user" do
     let(:user) { create(:admin) }
+
     subject { Ability.new(user) }
+
     it { is_expected.to be_able_to(:read, :admin_dashboard) }
   end
 end

data/spec/abilities/admin_set_abilities_spec.rb

@@ -1,8 +1,8 @@
-require 'spec_helper'
 require 'cancan/matchers'
 
-describe 'User Abilities' do
+RSpec.describe 'User Abilities' do
   subject { ability }
+
   let(:ability) { Ability.new(current_user) }
   let(:user) { create(:user) }
   let(:current_user) { user }

data/spec/abilities/collection_abilities_spec.rb

@@ -1,21 +1,23 @@
-require 'spec_helper'
 require 'cancan/matchers'
 
-describe 'User' do
+RSpec.describe 'User' do
   describe 'Abilities' do
     subject { ability }
+
     let(:ability) { Ability.new(current_user) }
     let(:visibility) { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE }
     let(:creating_user) { create(:user) }
     let(:user) { create(:user) }
     let(:current_user) { user }
     let(:collection) { create(:collection, visibility: visibility, user: creating_user) }
+
     before do
       collection.visibility = visibility
       collection.save
     end
     describe 'the collection creator' do
       let(:current_user) { creating_user }
+
       it do
         is_expected.to be_able_to(:create, ::Collection.new)
         is_expected.to be_able_to(:create, ::Collection)
@@ -37,6 +39,7 @@ describe 'User' do
 
     describe 'a nil user' do
       let(:current_user) { nil }
+
       it do
         is_expected.not_to be_able_to(:create, ::Collection.new)
         is_expected.not_to be_able_to(:read, collection)

data/spec/abilities/embargo_and_lease_ability_spec.rb

@@ -1,7 +1,6 @@
-require 'spec_helper'
 require 'cancan/matchers'
 
-describe "Ability on embargos and leases" do
+RSpec.describe "Ability on embargos and leases" do
   subject { Ability.new(current_user) }
 
   let(:current_user) { create(:user) }

data/spec/abilities/file_set_abilities_spec.rb

@@ -1,9 +1,9 @@
-require 'spec_helper'
 require 'cancan/matchers'
 
-describe 'User' do
+RSpec.describe 'User' do
   describe 'Abilities' do
     subject { ability }
+
     let(:ability) { Ability.new(current_user) }
     let(:visibility) { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE }
     let(:creating_user) { create(:user) }
@@ -16,6 +16,7 @@ describe 'User' do
       describe 'creator of object' do
         let(:creating_user) { user }
         let(:current_user) { user }
+
         it do
           is_expected.to be_able_to(:create, FileSet.new)
           is_expected.to be_able_to(:versions, file_set)
@@ -26,9 +27,10 @@ describe 'User' do
       end
 
       describe 'as a repository manager' do
-        let(:manager_user) { FactoryBot.create(:admin) }
+        let(:manager_user) { FactoryGirl.create(:admin) }
         let(:creating_user) { user }
         let(:current_user) { manager_user }
+
         it do
           is_expected.to be_able_to(:create, FileSet.new)
           is_expected.to be_able_to(:versions, file_set)
@@ -39,7 +41,7 @@ describe 'User' do
       end
 
       describe 'another authenticated user' do
-        let(:creating_user) { FactoryBot.create(:user) }
+        let(:creating_user) { FactoryGirl.create(:user) }
         let(:current_user) { user }
 
         it do
@@ -52,8 +54,9 @@ describe 'User' do
       end
 
       describe 'a nil user' do
-        let(:creating_user) { FactoryBot.create(:user) }
+        let(:creating_user) { FactoryGirl.create(:user) }
         let(:current_user) { nil }
+
         it do
           is_expected.not_to be_able_to(:create, FileSet.new)
           is_expected.not_to be_able_to(:versions, file_set)