RubyGems - hyrax - Versions diffs - 2.1.0 → 2.2.0 - Mend

hyrax 2.1.0 → 2.2.0

Files changed (153) hide show

data/app/views/layouts/_head_tag_content.html.erb CHANGED

@@ -7,7 +7,7 @@ signed in %>
     <%= tag :meta, name: 'current-user', data: { user_key: current_user.user_key } %>
 <% end %>
 <!-- added for use on small devices like phones -->
-<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 <link rel="resourcesync" href="<%= hyrax.capability_list_url %>" />
 <!-- Twitter card metadata -->

data/app/views/layouts/hyrax.html.erb CHANGED

@@ -7,7 +7,7 @@
   <body>
     <div class="skip-to-content">
-      <%= link_to "Skip to Content", "#skip-to-content", data: { turbolinks: false } %>
+      <%= link_to "Skip to Content", "#skip-to-content" %>
     </div>
     <%= render '/masthead' %>
     <%= content_for(:navbar) %>

data/app/views/layouts/hyrax/dashboard.html.erb CHANGED

@@ -7,7 +7,7 @@
   <body class="dashboard">
     <div class="skip-to-content">
-      <%= link_to "Skip to Content", "#skip-to-content", data: { turbolinks: false } %>
+      <%= link_to "Skip to Content", "#skip-to-content" %>
     </div>
     <%= render '/masthead' %>
     <%= content_for(:navbar) %>

data/app/views/records/edit_fields/_license.html.erb CHANGED

@@ -1,4 +1,4 @@
-<% license_service = Hyrax::LicenseService.new %>
+<% license_service = Hyrax.config.license_service_class.new %>
 <%= f.input :license, as: :multi_value_select,
     collection: license_service.select_active_options,
     include_blank: true,

data/app/views/records/edit_fields/_rights_statement.html.erb CHANGED

@@ -1,5 +1,6 @@
-<% rights_statements = Hyrax::RightsStatementService.new %>
+<% rights_statements = Hyrax.config.rights_statement_service_class.new %>
 <%= f.input :rights_statement,
     collection: rights_statements.select_active_options,
     include_blank: true,
+    item_helper: rights_statements.method(:include_current_value),
     input_html: { class: 'form-control' } %>

data/config/features.rb CHANGED

@@ -38,4 +38,8 @@ Flipflop.configure do
   feature :hide_private_items,
           default: false,
           description: "Do not show the private items."
+  feature :hide_users_list,
+          default: true,
+          description: "Do not show users list unless user has authenticated."
 end

data/config/locales/hyrax.de.yml CHANGED

@@ -314,6 +314,7 @@ de:
           delete:
             confirm: Sind Sie sich sicher?
           header:
+            name: Name
             roles: Rollen
             user: Benutzer
           new_role: Rolle zuweisen

data/config/locales/hyrax.en.yml CHANGED

@@ -314,6 +314,7 @@ en:
           delete:
             confirm: Are you sure?
           header:
+            name: Name
             roles: Roles
             user: User
           new_role: Assign Role
@@ -420,6 +421,11 @@ en:
         header: Relationships
       relationships_parent_row:
         label: 'In %{type}:'
+      share_with:
+        definitions_html: "<strong>View/Download:</strong> this file (both contents and metadata) is accessible from within %{application_name}.<br />
+          <strong>Edit:</strong> this file (both contents and metadata) can be edited. You may only grant this permission to %{institution_name} users and/or groups."
+        definition_heading: "Permission Definitions"
+        share_with_html: "You may grant &quot;View/Download&quot; or &quot;Edit&quot; access for specific users and/or groups to files. Enter a valid %{account_name}, one at a time, select the access level for that user, and click +Add."
       show:
         last_modified: Last modified
       social_media:
@@ -842,8 +848,39 @@ en:
         header: Select an action
         versions: Versions
         versions_title: Display previous versions
+      edit:
+        header: "Edit %{file_set}"
+        descriptions: "Descriptions"
+        versions: "Versions"
+        permissions: "Permissions"
+      form:
+        attach_to: "Attach to %{parent}"
+        cancel: "Cancel"
+        save: "Save"
+        title: "Title"
       groups_description:
         description_html: The list of groups in the drop-down marked "Select a group" is a list of User Managed Groups that you are a member of.  You may select a specific group and assign an access level for a file within %{application_name}, similarly to adding user access levels.
+      permission_form:
+        applied_to: "(applied to all files just uploaded)"
+        depositor: "Depositor"
+        enter: "Enter %{account_label} (one at a time)"
+        header: "Permissions"
+        optional: "(optional)"
+        save_note_html: "Permissions are <strong>not</strong> saved until the &quot;Save&quot; button is pressed at the bottom of the page."
+        select_group: "Select a group"
+        share_with: "Share With"
+        table_title_access: "Access Level"
+        table_title_user: "Person/Group"
+        user_search: "Search for a user"
+      permission:
+        save: "Save"
+      versioning:
+        current: "Current Version"
+        header: "Versions"
+        upload: "Upload New Version"
+        restore: "Restore Previous Version"
+        restore_from: "Restore From"
+        save: "Save Revision"
     help:
       header: User Support
       override_text: Use app/views/static/help.html.erb to override this file.
@@ -984,7 +1021,7 @@ en:
       name: Work
     share_button: Share Your Work
     single_use_links:
-      button: Single-Use Link to File
+      button: Create Single-Use Link
       copy:
         button: Copy
         tooltip: Copied!
@@ -1199,6 +1236,7 @@ en:
         transfer_to: User
     placeholders:
       defaults:
+        file: 'xxx'
         find_child_work: Search for a work…
         member_of_collection_ids: Select a collection…
     required:

data/config/locales/hyrax.es.yml CHANGED

@@ -314,6 +314,7 @@ es:
           delete:
             confirm: "¿Estás seguro?"
           header:
+            name: Nombre
             roles: Roles
             user: Usuario
           new_role: Asignar Rol

data/config/locales/hyrax.fr.yml CHANGED

@@ -314,6 +314,7 @@ fr:
           delete:
             confirm: Êtes-vous sûr?
           header:
+            name: Nom
             roles: Les rôles
             user: Utilisateur
           new_role: Attribuer un rôle

data/config/locales/hyrax.it.yml CHANGED

@@ -314,6 +314,7 @@ it:
           delete:
             confirm: Sei sicuro?
           header:
+            name: Nome
             roles: ruoli
             user: Utente
           new_role: Assegna ruolo

data/config/locales/hyrax.pt-BR.yml CHANGED

@@ -314,6 +314,7 @@ pt-BR:
           delete:
             confirm: Você tem certeza?
           header:
+            name: Nome
             roles: Roles
             user: Do utilizador
           new_role: Atribuir papel

data/config/locales/hyrax.zh.yml CHANGED

@@ -314,6 +314,7 @@ zh:
           delete:
             confirm: 您肯定要删除?
           header:
+            name: 名称
             roles: 角色
             user: 用户
           new_role: '授予角色:'

data/hyrax.gemspec CHANGED

@@ -24,6 +24,8 @@ SUMMARY
   spec.version       = Hyrax::VERSION
   spec.license       = 'Apache-2.0'
+  spec.required_ruby_version = '>= 2.3'
   # Note: rails does not follow sem-ver conventions, it's
   # minor version releases can include breaking changes; see
   # http://guides.rubyonrails.org/maintenance_policy.html
@@ -35,7 +37,8 @@ SUMMARY
   spec.add_dependency 'blacklight', '~> 6.14'
   spec.add_dependency 'blacklight-gallery', '~> 0.7'
   spec.add_dependency 'breadcrumbs_on_rails', '~> 3.0'
-  spec.add_dependency 'browse-everything', '>= 0.10.5'
+  # Pin browse-everything to stable version
+  spec.add_dependency 'browse-everything', '< 0.16'
   spec.add_dependency 'carrierwave', '~> 1.0'
   spec.add_dependency 'clipboard-rails', '~> 1.5'
   spec.add_dependency 'dry-equalizer', '~> 0.2'
@@ -92,7 +95,7 @@ SUMMARY
   spec.add_development_dependency 'rspec-its', '~> 1.1'
   spec.add_development_dependency 'rspec-rails', '~> 3.1'
   spec.add_development_dependency "selenium-webdriver"
-  spec.add_development_dependency 'solr_wrapper', '~> 1.1'
+  spec.add_development_dependency 'solr_wrapper', '>= 1.1', '< 3.0'
   spec.add_development_dependency 'i18n-debug' if ENV['I18N_DEBUG']
   spec.add_development_dependency 'i18n_yaml_sorter' unless ENV['TRAVIS']
   spec.add_development_dependency 'rails-controller-testing', '~> 1'

data/lib/generators/hyrax/templates/mediated_deposit_workflow.json.erb CHANGED

@@ -18,6 +18,7 @@
                         }
                     ],
                     "methods": [
+                        "Hyrax::Workflow::GrantReadToDepositor",
                         "Hyrax::Workflow::DeactivateObject"
                     ]
                 }, {

data/lib/hyrax.rb CHANGED

@@ -46,7 +46,13 @@ module Hyrax
     @config
   end
+  ##
+  # @return [Logger]
+  def self.logger
+    @logger ||= ActiveFedora::Base.logger
+  end
   def self.primary_work_type
-    Hyrax::WorkRelation::DummyModel.primary_concern
+    config.curation_concerns.first
   end
 end

data/lib/hyrax/arkivo/create_subscription_job.rb CHANGED

@@ -22,7 +22,7 @@ module Hyrax
       private
         def logger
-          ActiveFedora::Base.logger
+          Hyrax.logger
         end
         def validate_user!

data/lib/hyrax/redis_event_store.rb CHANGED

@@ -15,7 +15,7 @@ module Hyrax
         nil
       end
-      delegate :logger, to: ActiveFedora::Base
+      delegate :logger, to: Hyrax
       def instance
         if Redis.current.is_a? Redis::Namespace

data/lib/hyrax/resource_sync/change_list_writer.rb CHANGED

@@ -8,8 +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
+      MODIFIED_DATE_FIELD = 'system_modified_dtsi'
+      BEGINNING_OF_TIME = '1970-01-01T00:00:00Z'
       def initialize(resource_host:, capability_list_url:)
         @resource_host = resource_host

data/lib/hyrax/version.rb CHANGED

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

data/spec/actors/hyrax/actors/file_set_actor_spec.rb CHANGED

@@ -275,7 +275,7 @@ RSpec.describe Hyrax::Actors::FileSetActor do
         actor.attach_to_work(work)
         expect(work.representative).to eq(file_set)
         expect(work.thumbnail).to eq(file_set)
-        expect { work.reload }.not_to change { [work.representative, work.thumbnail] }
+        expect { work.reload }.not_to change { [work.representative.id, work.thumbnail.id] }
       end
     end

data/spec/controllers/hyrax/admin/stats_controller_spec.rb CHANGED

@@ -21,10 +21,40 @@ RSpec.describe Hyrax::Admin::StatsController, type: :controller do
       end
       it 'allows an authorized user to view the page' do
-        expect(Hyrax::AdminStatsPresenter).to receive(:new).with(expected_params, 5).and_call_original
         get :show
         expect(response).to be_success
         expect(assigns[:presenter]).to be_kind_of Hyrax::AdminStatsPresenter
+        expect(assigns[:presenter])
+          .to have_attributes(limit: 5, stats_filters: {})
+      end
+      context 'with a custom presenter' do
+        let(:presenter_class) { Class.new(Hyrax::AdminStatsPresenter) }
+        before { described_class.admin_stats_presenter = presenter_class }
+        it 'allows an authorized user to view the page' do
+          get :show
+          expect(assigns[:presenter]).to be_kind_of presenter_class
+          expect(assigns[:presenter])
+            .to have_attributes(limit: 5, stats_filters: {})
+        end
+      end
+      context 'with custom stats services' do
+        let(:by_depositor_class) { Class.new(Hyrax::Statistics::Works::ByDepositor) }
+        let(:service_config)     { { by_depositor: by_depositor_class } }
+        before { described_class.admin_stats_services = service_config }
+        it 'allows an authorized user to view the page' do
+          get :show
+          expect(assigns[:presenter])
+            .to have_attributes(by_depositor: by_depositor_class)
+        end
       end
     end
   end

data/spec/controllers/hyrax/collections_controller_spec.rb CHANGED

@@ -83,7 +83,7 @@ RSpec.describe Hyrax::CollectionsController do
           expect(controller).to receive(:add_breadcrumb).with('Home', Hyrax::Engine.routes.url_helpers.root_path(locale: 'en'))
           expect(controller).to receive(:add_breadcrumb).with('Dashboard', Hyrax::Engine.routes.url_helpers.dashboard_path(locale: 'en'))
           expect(controller).to receive(:add_breadcrumb).with('Collections', Hyrax::Engine.routes.url_helpers.my_collections_path(locale: 'en'))
-          expect(controller).to receive(:add_breadcrumb).with('My collection', collection_path(collection.id, locale: 'en'))
+          expect(controller).to receive(:add_breadcrumb).with('My collection', collection_path(collection.id, locale: 'en'), "aria-current" => "page")
           get :show, params: { id: collection }
           expect(response).to be_successful
         end
@@ -117,7 +117,7 @@ RSpec.describe Hyrax::CollectionsController do
       it "sets breadcrumbs" do
         expect(controller).not_to receive(:add_breadcrumb).with(I18n.t('hyrax.dashboard.title'), Hyrax::Engine.routes.url_helpers.dashboard_path(locale: 'en'))
         expect(controller).not_to receive(:add_breadcrumb).with('Your Collections', Hyrax::Engine.routes.url_helpers.my_collections_path(locale: 'en'))
-        expect(controller).to receive(:add_breadcrumb).with('My collection', collection_path(collection.id, locale: 'en'))
+        expect(controller).to receive(:add_breadcrumb).with('My collection', collection_path(collection.id, locale: 'en'), "aria-current" => "page")
         get :show, params: { id: collection }
         expect(response).to be_successful
       end

data/spec/controllers/hyrax/dashboard/collections_controller_spec.rb CHANGED

@@ -359,7 +359,7 @@ RSpec.describe Hyrax::Dashboard::CollectionsController, :clean_repo do
           expect(controller).to receive(:add_breadcrumb).with('Home', Hyrax::Engine.routes.url_helpers.root_path(locale: 'en'))
           expect(controller).to receive(:add_breadcrumb).with('Dashboard', Hyrax::Engine.routes.url_helpers.dashboard_path(locale: 'en'))
           expect(controller).to receive(:add_breadcrumb).with('Collections', Hyrax::Engine.routes.url_helpers.my_collections_path(locale: 'en'))
-          expect(controller).to receive(:add_breadcrumb).with('My collection', collection_path(collection.id, locale: 'en'))
+          expect(controller).to receive(:add_breadcrumb).with('My collection', collection_path(collection.id, locale: 'en'), "aria-current" => "page")
           get :show, params: { id: collection }
           expect(response).to be_successful
         end
@@ -457,7 +457,7 @@ RSpec.describe Hyrax::Dashboard::CollectionsController, :clean_repo do
         expect(controller).to receive(:add_breadcrumb).with('Home', Hyrax::Engine.routes.url_helpers.root_path(locale: 'en'))
         expect(controller).to receive(:add_breadcrumb).with('Dashboard', Hyrax::Engine.routes.url_helpers.dashboard_path(locale: 'en'))
         expect(controller).to receive(:add_breadcrumb).with('Collections', Hyrax::Engine.routes.url_helpers.my_collections_path(locale: 'en'))
-        expect(controller).to receive(:add_breadcrumb).with(I18n.t("hyrax.collection.browse_view"), collection_path(collection.id, locale: 'en'))
+        expect(controller).to receive(:add_breadcrumb).with(I18n.t("hyrax.collection.browse_view"), collection_path(collection.id, locale: 'en'), "aria-current" => "page")
         get :edit, params: { id: collection }
         expect(response).to be_successful
       end

data/spec/controllers/hyrax/generic_works_controller_spec.rb CHANGED

@@ -199,9 +199,10 @@ RSpec.describe Hyrax::GenericWorksController do
       end
       let(:work) { instance_double(GenericWork, id: '99999', to_global_id: '99999') }
-      context 'with a user lacking workflow permission' do
+      context 'with a user lacking both workflow permission and read access' do
         before do
           allow(SolrDocument).to receive(:find).and_return(document)
+          allow(controller.current_ability).to receive(:can?).with(:read, document).and_return(false)
         end
         let(:document_list) { [] }
         let(:document) { instance_double(SolrDocument, suppressed?: true) }
@@ -209,8 +210,23 @@ RSpec.describe Hyrax::GenericWorksController do
         it 'shows the unauthorized message' do
           get :show, params: { id: work.id }
           expect(response.code).to eq '401'
-          expect(response).to render_template(:unavailable)
-          expect(flash[:notice]).to eq 'The work is not currently available because it has not yet completed the approval process'
+          expect(response).to render_template(:unauthorized)
+        end
+        context 'with a user who lacks workflow permission but has read access' do
+          before do
+            allow(SolrDocument).to receive(:find).and_return(document)
+            allow(controller.current_ability).to receive(:can?).with(:read, document).and_return(true)
+          end
+          let(:document_list) { [] }
+          let(:document) { instance_double(SolrDocument, suppressed?: true) }
+          it 'shows the unavailable message' do
+            get :show, params: { id: work.id }
+            expect(response.code).to eq '401'
+            expect(response).to render_template(:unavailable)
+            expect(flash[:notice]).to eq 'The work is not currently available because it has not yet completed the approval process'
+          end
         end
       end

data/spec/controllers/hyrax/homepage_controller_spec.rb CHANGED

@@ -70,7 +70,7 @@ RSpec.describe Hyrax::HomepageController, type: :controller do
         get :index
         expect(response).to be_success
         expect(assigns(:recent_documents).length).to be <= 4
-        create_times = assigns(:recent_documents).map { |d| d['system_create_dtsi'] }
+        create_times = assigns(:recent_documents).map { |d| d['date_uploaded_dtsi'] }
         expect(create_times).to eq create_times.sort.reverse
       end
     end

data/spec/controllers/hyrax/users_controller_spec.rb CHANGED

@@ -21,6 +21,10 @@ RSpec.describe Hyrax::UsersController, type: :controller do
     let!(:u1) { create(:user) }
     let!(:u2) { create(:user) }
+    before do
+      allow(Flipflop).to receive(:hide_users_list?).and_return(false)
+    end
     describe "requesting html" do
       before do
         # These user types are excluded:
@@ -90,4 +94,58 @@ RSpec.describe Hyrax::UsersController, type: :controller do
       end
     end
   end
+  describe 'user list access' do
+    context 'with hide_users_list?=enabled' do
+      before do
+        allow(Flipflop).to receive(:hide_users_list?).and_return(true)
+      end
+      describe 'with registered user' do
+        it 'renders the user list' do
+          get :index
+          expect(response.code).to eq '200'
+          expect(response).to render_template(:index)
+        end
+        it 'does return .json results' do
+          get :index, params: { format: :json }
+          expect(response).to be_successful
+        end
+      end
+      describe 'with unauthenticated user' do
+        before do
+          sign_out user
+        end
+        it 'does not render the user list' do
+          get :index
+          expect(flash[:alert]).to eq 'You need to sign in or sign up before continuing.'
+          expect(response).to have_http_status(302)
+          expect(response).to redirect_to('/users/sign_in')
+        end
+        it 'does not return .json results' do
+          get :index, params: { format: :json }
+          expect(response).not_to be_successful
+        end
+      end
+    end
+    context 'with hide_users_list?=disabled' do
+      before do
+        sign_out user
+        allow(Flipflop).to receive(:hide_users_list?).and_return(false)
+      end
+      describe 'with unauthenticated user' do
+        it 'renders the user list' do
+          get :index
+          expect(response.code).to eq '200'
+          expect(response).to render_template(:index)
+        end
+      end
+    end
+  end
 end