hyrax 3.0.0.pre.rc1 → 3.0.0.pre.rc2

data/app/services/hyrax/working_directory.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   # @deprecated Use JobIoWrapper instead
   class WorkingDirectory
@@ -19,7 +20,7 @@ module Hyrax
         copy_repository_resource_to_working_directory(repository_file, id)
       end
 
-      # @param [ActiveFedora::File] file the resource in the repo
+      # @param [#original_name, #id] file the resource in the repo
       # @param [String] id the identifier of the FileSet
       # @return [String] path of the working file
       def copy_repository_resource_to_working_directory(file, id)
@@ -30,22 +31,22 @@ module Hyrax
 
       private
 
-        # @param [String] id the identifier
-        # @param [String] name the file name
-        # @param [#read] stream the stream to copy to the working directory
-        # @return [String] path of the working file
-        def copy_stream_to_working_directory(id, name, stream)
-          working_path = full_filename(id, name)
-          Rails.logger.debug "Writing #{name} to the working directory at #{working_path}"
-          FileUtils.mkdir_p(File.dirname(working_path))
-          IO.copy_stream(stream, working_path)
-          working_path
-        end
+      # @param [String] id the identifier
+      # @param [String] name the file name
+      # @param [#read] stream the stream to copy to the working directory
+      # @return [String] path of the working file
+      def copy_stream_to_working_directory(id, name, stream)
+        working_path = full_filename(id, name)
+        Rails.logger.debug "Writing #{name} to the working directory at #{working_path}"
+        FileUtils.mkdir_p(File.dirname(working_path))
+        IO.copy_stream(stream, working_path)
+        working_path
+      end
 
-        def full_filename(id, original_name)
-          pair = id.scan(/..?/).first(4).push(id)
-          File.join(Hyrax.config.working_path, *pair, original_name)
-        end
+      def full_filename(id, original_name)
+        pair = id.scan(/..?/).first(4).push(id)
+        File.join(Hyrax.config.working_path, *pair, original_name)
+      end
     end
   end
 end

data/app/services/hyrax/works/managed_works_service.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   module Works
     module ManagedWorksService

data/app/services/hyrax/works/migration_service.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   module Works
     class MigrationService

data/app/strategies/hyrax/strategies/yaml_strategy.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax::Strategies
   class YamlStrategy < Flipflop::Strategies::AbstractStrategy
     class << self
@@ -27,19 +28,19 @@ module Hyrax::Strategies
 
     private
 
-      def key_exists?(feature)
-        yaml_file[feature.to_s]&.key?("enabled")
-      end
+    def key_exists?(feature)
+      yaml_file[feature.to_s]&.key?("enabled")
+    end
 
-      def yaml_file
-        @yaml_file ||=
-          begin
-            if File.exist?(@config_file)
-              YAML.load_file(@config_file)
-            else
-              {}
-            end
+    def yaml_file
+      @yaml_file ||=
+        begin
+          if File.exist?(@config_file)
+            YAML.load_file(@config_file)
+          else
+            {}
           end
-      end
+        end
+    end
   end
 end

data/app/uploaders/hyrax/avatar_uploader.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Hyrax::AvatarUploader < CarrierWave::Uploader::Base
   include CarrierWave::MiniMagick
   include CarrierWave::Compatibility::Paperclip

data/app/uploaders/hyrax/uploaded_file_uploader.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   class UploadedFileUploader < CarrierWave::Uploader::Base
     # Override the directory where uploaded files will be stored.
@@ -12,12 +13,12 @@ module Hyrax
 
     private
 
-      def configured_upload_path
-        Hyrax.config.upload_path.call
-      end
+    def configured_upload_path
+      Hyrax.config.upload_path.call
+    end
 
-      def configured_cache_path
-        Hyrax.config.cache_path.call
-      end
+    def configured_cache_path
+      Hyrax.config.cache_path.call
+    end
   end
 end

data/app/validators/hyrax/has_one_title_validator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   # validates that the title has at least one title
   class HasOneTitleValidator < ActiveModel::Validator

data/app/values/hyrax/chart_data.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   class ChartData
     attr_reader :data
@@ -42,20 +43,20 @@ module Hyrax
 
       private
 
-        def drilldown_hash
-          {
-            name: @key,
-            y: @value.values.inject(&:+),
-            drilldown: @key
-          }
-        end
+      def drilldown_hash
+        {
+          name: @key,
+          y: @value.values.inject(&:+),
+          drilldown: @key
+        }
+      end
 
-        def series_hash
-          {
-            name: @key,
-            y: @value
-          }
-        end
+      def series_hash
+        {
+          name: @key,
+          y: @value
+        }
+      end
     end
   end
 end

data/app/views/_masthead.html.erb

@@ -1,5 +1,6 @@
-<header>
-  <nav id="masthead" class="navbar navbar-inverse navbar-static-top" role="navigation">
+<header aria-label="header">
+  <nav id="masthead" class="navbar navbar-inverse navbar-static-top" role="navigation" aria-label="masthead">
+    <h1 class="sr-only"><%= application_name %></h1>
     <div class="container-fluid">
       <!-- Brand and toggle get grouped for better mobile display -->
       <div class="navbar-header">

data/app/views/hyrax/admin/admin_sets/_form_visibility.html.erb

@@ -30,7 +30,7 @@
                           <%= f.radio_button :release_varies, Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_BEFORE_DATE %>
                           <%= t('.release.varies.between') %>
                         </label>
-                        <%= f.date_field :release_date, wrapper: :inline, class: 'datepicker form-control' %>
+                        <%= f.date_field :release_date, wrapper: :inline, class: 'datepicker form-control', placeholder: 'mm/dd/yyyy' %>
                       </li>
                       <li class="radio form-inline">
                         <label>
@@ -46,7 +46,7 @@
                       <%= f.radio_button :release_period, Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_FIXED %>
                       <%= t('.release.fixed') %>
                     </label>
-                    <%= f.date_field :release_date, wrapper: :inline, class: 'datepicker form-control' %>
+                    <%= f.date_field :release_date, wrapper: :inline, class: 'datepicker form-control', placeholder: 'mm/dd/yyyy' %>
                   </div>
                   <h3><%= t('.visibility.title') %></h3>
                   <p><%= t('.visibility.description') %></p>
@@ -62,4 +62,4 @@
                 </div>
               <% end %>
             </div>
-          </div>
+          </div>

data/app/views/hyrax/admin/admin_sets/_show_actions.html.erb

@@ -1,9 +1,10 @@
-    <% if can? :edit, presenter.solr_document %>
+
       <div class="panel-heading">
         <div class="row">
           <div class="col-sm-8">
             <h2 class="panel-title display-page"><%= presenter.to_s %></h2>
           </div>
+          <% if can? :edit, presenter.solr_document %>
           <div class="col-sm-4">
             <div class="pull-right">
               <%= link_to edit_admin_admin_set_path(presenter), class: 'btn btn-primary' do %>
@@ -22,6 +23,6 @@
               <% end %>
             </div>
           </div>
+          <% end %>
         </div>
       </div>
-    <% end %>

data/app/views/hyrax/admin/admin_sets/index.json.jbuilder

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 json.admin_sets @admin_sets do |admin_set|
   json.id admin_set['id']
   json.title admin_set['title_tesim']

data/app/views/hyrax/base/_form.html.erb

@@ -16,10 +16,10 @@
   <% end %>
   <% if Flipflop.batch_upload? && f.object.new_record? %>
     <% provide :metadata_tab do %>
-      <p class="switch-upload-type"><%= t('.batch_upload_hint') %> <%= link_to t('.batch_link'), hyrax.new_batch_upload_path %></p>
+      <p class="switch-upload-type"><%= t('.batch_upload_hint') %> <%= link_to t('.batch_link'), hyrax.new_batch_upload_path(payload_concern: @form.model.class) %></p>
     <% end %>
   <% end %>
-  <%= render 'hyrax/base/guts4form', f: f %>
+  <%= render 'hyrax/base/guts4form', f: f, tabs: form_tabs_for(form: f.object) %>
 <% end %>
 
 <script type="text/javascript">

data/app/views/hyrax/base/_form_child_work_relationships.html.erb

@@ -9,7 +9,7 @@ HTML Properties:
   table:
     [data-behavior="child-relationships"] : allows the javascript to be initialized
     data-param-key : the parameter key value for this model type %>
-<div class="form-group" data-behavior="child-relationships" data-param-key="<%= f.object.model_name.param_key %>" data-members="<%= f.object.work_members_json %>">
+<div class="form-group" data-behavior="child-relationships" data-param-key="<%= f.object.model_name.param_key %>" data-members="<%= work_members_json(f.object) %>">
   <div class="form-inline">
       <%= f.label :find_child_work %>
       <%= f.input_field :find_child_work,

data/app/views/hyrax/base/_form_member_of_collections.html.erb

@@ -11,7 +11,7 @@ HTML Properties:
     data-param-key : the parameter key value for this model type %>
 <h2><%= t("hyrax.works.form.in_collections") %></h2>
 
-<div class="form-group" data-behavior="collection-relationships" data-param-key="<%= f.object.model_name.param_key %>" data-members="<%= f.object.member_of_collections_json %>">
+<div class="form-group" data-behavior="collection-relationships" data-param-key="<%= f.object.model_name.param_key %>" data-members="<%= member_of_collections_json(f.object) %>">
 
   <div class="form-inline">
       <%= f.label :member_of_collection_ids %>

data/app/views/hyrax/base/_form_permission.html.erb

@@ -1,12 +1,12 @@
 <% # This is used by works and by FileSet and the layout (col-6 vs col-12) is different for both %>
-<% if f.object.embargo_release_date %>
+<% if embargo_enforced?(f.object) %>
   <%= render 'form_permission_under_embargo', f: f %>
-<% elsif f.object.lease_expiration_date %>
+<% elsif lease_enforced?(f.object) %>
   <%= render 'form_permission_under_lease', f: f %>
 <% else %>
   <fieldset class="set-access-controls">
     <legend>
-      <%= t('.visibility') %>
+      <%= raw(t('.visibility')) %>
     </legend>
 
     <div class="form-group">

data/app/views/hyrax/base/_form_progress.html.erb

@@ -23,9 +23,13 @@
     </div>
     <% if Flipflop.proxy_deposit? && current_user.can_make_deposits_for.any? %>
         <div class="list-group-item">
-          <%= f.input :on_behalf_of, collection: current_user.can_make_deposits_for, prompt: t(".yourself"), value_method: :user_key %>
+          <%= f.input :on_behalf_of, label: t(".proxy_depositors"), collection: current_user.can_make_deposits_for, prompt: t(".yourself"), value_method: :user_key %>
         </div>
     <% end %>
+
+    <% form_progress_sections_for(form: f.object).each do |section| %>
+      <%= render "form_progress_#{section}", f: f %>
+    <% end %>
   </div>
   <div class="panel-footer text-center">
     <% if ::Flipflop.show_deposit_agreement? %>

data/app/views/hyrax/base/_form_relationships.html.erb

@@ -1,5 +1,5 @@
 <% if Flipflop.assign_admin_set? %>
-  <%# TODO: consider `Hyrax::AdminSetOptionsPresenter.select_options_for(controller: controller)` instead %>
+  <%# TODO: avoid direct dependency on AdminSetService and AdminSetOptionsPresenter in the view!! make the controller provide the options! %>
   <%= f.input :admin_set_id, as: :select,
       include_blank: false,
       collection: Hyrax::AdminSetOptionsPresenter.new(Hyrax::AdminSetService.new(controller)).select_options,

data/app/views/hyrax/base/_form_share.html.erb

@@ -3,7 +3,7 @@
 
 <% depositor = f.object.depositor %>
 
-<div class="alert alert-info hidden" id="save_perm_note"><%= t('.permissions_save_note') %></div>
+<div class="alert alert-info hidden" id="save_perm_note"><%= t('.permissions_save_note_html') %></div>
 
 <div class="alert alert-warning hidden" role="alert" id="permissions_error">
   <span id="permissions_error_text"></span>
@@ -18,12 +18,16 @@
   </legend>
   <div class="col-sm-9 form-inline">
     <label for="new_group_name_skel" class="sr-only"><%= t(".group") %></label>
-    <%= select_tag 'new_group_name_skel', options_for_select(["Select a group"] + current_user.groups), class: 'form-control' %>
+    <% if current_ability.admin? %>
+      <%= select_tag 'new_group_name_skel', options_for_select(["Select a group"] + current_user.group_service.map.keys), class: 'form-control' %>
+    <% else %>
+      <%= select_tag 'new_group_name_skel', options_for_select(["Select a group"] + current_user.groups), class: 'form-control' %>
+    <% end %>
     <label for="new_group_permission_skel" class="sr-only"><%= t(".access_type_to_grant") %></label>
-    <%= select_tag 'new_group_permission_skel', options_for_select(Hyrax.config.permission_options), class: 'form-control' %>
+    <%= select_tag 'new_group_permission_skel', options_for_select(configured_permission_options), class: 'form-control' %>
 
     <button class="btn btn-default" id="add_new_group_skel">
-      <span><%= t(".add_this_group") %></span>
+      <span><%= t(".add_this_group_html") %></span>
     </button>
     <br /><span id="directory_group_result"></span>
   </div>
@@ -37,7 +41,7 @@
     <label for="new_user_name_skel" class="sr-only"><%= t('.account_label_without_suffix', account_label: t('hyrax.account_label'), suffix: t('hyrax.directory.suffix')) %> </label>
     <%= text_field_tag 'new_user_name_skel', nil %>
     <label for="new_user_permission_skel" class="sr-only"><%= t('.access_type_to_grant') %></label>
-    <%= select_tag 'new_user_permission_skel', options_for_select(Hyrax.config.permission_options), class: 'form-control' %>
+    <%= select_tag 'new_user_permission_skel', options_for_select(configured_permission_options), class: 'form-control' %>
     <button class="btn btn-default" id="add_new_user_skel">
       <span>Add<span class="sr-only"> this <%= t('hyrax.account_label') %></span></span>
     </button>
@@ -50,11 +54,11 @@
 <table class="table">
   <tr id="file_permissions">
     <td width="20%">
-      <%= Hyrax.config.owner_permission_levels.keys[0] %>
+      <%= configured_owner_permission_levels.keys.first %>
     </td>
     <td width="60%">
       <%= label_tag :owner_access, class: "control-label" do %>
-        t('.depositor') (<span id="file_owner" data-depositor="<%= depositor %>"><%= link_to_profile depositor %></span>)
+        <%= t('.depositor') %>(<span id="file_owner" data-depositor="<%= depositor %>"><%= link_to_profile depositor %></span>)
       <% end %>
     </td>
   </tr>
@@ -63,7 +67,7 @@
     <% next if ['public', 'registered', depositor].include? permission_fields.object.agent_name.downcase %>
     <tr>
       <td>
-        <%= permission_fields.select :access, Hyrax.config.permission_levels, {}, class: 'form-control select_perm' %>
+        <%= permission_fields.select :access, configured_permission_levels, {}, class: 'form-control select_perm' %>
       </td>
       <td>
         <%= permission_fields.label :agent_name, class: "control-label" do %>

data/app/views/hyrax/base/_form_visibility_component.html.erb

@@ -1,6 +1,6 @@
-<% if f.object.embargo_release_date %>
+<% if embargo_enforced?(f.object) %>
   <%= render 'form_permission_under_embargo', f: f %>
-<% elsif f.object.lease_expiration_date %>
+<% elsif lease_enforced?(f.object) %>
   <%= render 'form_permission_under_lease', f: f %>
 <% else %>
     <fieldset>

data/app/views/hyrax/base/_guts4form.html.erb

@@ -1,5 +1,4 @@
 <% # we will yield to content_for for each tab, e.g. :files_tab %>
-<% tabs ||= %w[metadata files relationships] # default tab order %>
 <div class="row">
   <div class="col-xs-12 col-sm-8">
     <div class="panel panel-default tabs" role="main">

data/app/views/hyrax/base/_show_actions.html.erb

@@ -16,7 +16,9 @@
           class: presenter.display_unfeature_link? ? 'btn btn-default' : 'btn btn-default collapse' %>
     <% end %>
     <% if Hyrax.config.analytics? %>
-      <%= link_to t('.analytics'), presenter.stats_path, id: 'stats', class: 'btn btn-default' %>
+      <% # turbolinks needs to be turned off or the page will use the cache and the %>
+      <% # analytics graph will not show unless the page is refreshed. %>
+      <%= link_to t('.analytics'), presenter.stats_path, id: 'stats', class: 'btn btn-default', data: { turbolinks: false } %>
     <% end %>
   </div>
 

data/app/views/hyrax/base/_social_media.html.erb

@@ -2,9 +2,10 @@
 <% share_url ||= request.original_url %>
 <div class="social-media">
   <!-- Sharingbutton Facebook -->
-  <%= link_to "https://facebook.com/sharer/sharer.php?#{{u: share_url}.to_param}", class: 'resp-sharing-button__link', target: '_blank', rel: 'noopener noreferrer', title: t('hyrax.base.social_media.facebook') do %>
+  <%= link_to "https://facebook.com/sharer/sharer.php?#{{u: share_url}.to_param}", 'aria-label': t(:'hyrax.base.social_media.facebook_share'), class: 'resp-sharing-button__link', target: '_blank', rel: 'noopener noreferrer', title: t('hyrax.base.social_media.facebook') do %>
     <div class="resp-sharing-button resp-sharing-button--facebook resp-sharing-button--small"><div aria-hidden="true" class="resp-sharing-button__icon resp-sharing-button__icon--solid">
       <svg version="1.1" x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+        <title><%= t(:'hyrax.base.social_media.facebook_share') %></title>
           <g>
               <path d="M18.768,7.465H14.5V5.56c0-0.896,0.594-1.105,1.012-1.105s2.988,0,2.988,0V0.513L14.171,0.5C10.244,0.5,9.5,3.438,9.5,5.32 v2.145h-3v4h3c0,5.212,0,12,0,12h5c0,0,0-6.85,0-12h3.851L18.768,7.465z" />
           </g>
@@ -14,9 +15,10 @@
   <% end %>
 
   <!-- Sharingbutton Twitter -->
-  <%= link_to "https://twitter.com/intent/tweet/?#{{text: page_title, url: share_url}.to_param}", class: 'resp-sharing-button__link', target: '_blank', rel: 'noopener noreferrer', title: t('hyrax.base.social_media.twitter') do %>
+  <%= link_to "https://twitter.com/intent/tweet/?#{{text: page_title, url: share_url}.to_param}", 'aria-label': t(:'hyrax.base.social_media.twitter_share'), class: 'resp-sharing-button__link', target: '_blank', rel: 'noopener noreferrer', title: t('hyrax.base.social_media.twitter') do %>
     <div class="resp-sharing-button resp-sharing-button--twitter resp-sharing-button--small"><div aria-hidden="true" class="resp-sharing-button__icon resp-sharing-button__icon--solid">
       <svg version="1.1" x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+          <title><%= t(:'hyrax.base.social_media.twitter_share') %></title>
           <g>
               <path d="M23.444,4.834c-0.814,0.363-1.5,0.375-2.228,0.016c0.938-0.562,0.981-0.957,1.32-2.019c-0.878,0.521-1.851,0.9-2.886,1.104 C18.823,3.053,17.642,2.5,16.335,2.5c-2.51,0-4.544,2.036-4.544,4.544c0,0.356,0.04,0.703,0.117,1.036 C8.132,7.891,4.783,6.082,2.542,3.332C2.151,4.003,1.927,4.784,1.927,5.617c0,1.577,0.803,2.967,2.021,3.782 C3.203,9.375,2.503,9.171,1.891,8.831C1.89,8.85,1.89,8.868,1.89,8.888c0,2.202,1.566,4.038,3.646,4.456 c-0.666,0.181-1.368,0.209-2.053,0.079c0.579,1.804,2.257,3.118,4.245,3.155C5.783,18.102,3.372,18.737,1,18.459 C3.012,19.748,5.399,20.5,7.966,20.5c8.358,0,12.928-6.924,12.928-12.929c0-0.198-0.003-0.393-0.012-0.588 C21.769,6.343,22.835,5.746,23.444,4.834z" />
           </g>
@@ -26,9 +28,10 @@
   <% end %>
 
   <!-- Sharingbutton Tumblr -->
-  <%= link_to "https://www.tumblr.com/widgets/share/tool?#{{posttype: 'link', canonicalUrl: share_url, shareSource: 'tumblr_share_button'}.to_param}", class: 'resp-sharing-button__link', target: '_blank', rel: 'noopener noreferrer', title: t('hyrax.base.social_media.tumblr') do %>
+  <%= link_to "https://www.tumblr.com/widgets/share/tool?#{{posttype: 'link', canonicalUrl: share_url, shareSource: 'tumblr_share_button'}.to_param}", 'aria-label': t(:'hyrax.base.social_media.tumblr_share'), class: 'resp-sharing-button__link', target: '_blank', rel: 'noopener noreferrer', title: t('hyrax.base.social_media.tumblr') do %>
     <div class="resp-sharing-button resp-sharing-button--tumblr resp-sharing-button--small"><div aria-hidden="true" class="resp-sharing-button__icon resp-sharing-button__icon--solid">
       <svg version="1.1" x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+          <title><%= t(:'hyrax.base.social_media.tumblr_share') %></title>
           <g>
               <path d="M13.5,0.5v5h5v4h-5v5.515c0,5.028,3.52,4.427,6,2.798v4.433c-6.728,3.172-12-0.064-12-4.255V9.5h-3V6.668 c0.903-0.293,2.245-0.714,2.889-1.261c0.646-0.551,1.162-1.208,1.551-1.976C9.331,2.664,9.6,1.686,9.746,0.5H13.5z" />
           </g>

data/app/views/hyrax/base/edit.html.erb

@@ -1,4 +1,4 @@
-<% provide :page_title, curation_concern_page_title(curation_concern) %>
+<% provide :page_title, title_presenter(curation_concern).page_title %>
 <% provide :page_header do %>
   <h1><span class="fa fa-edit" aria-hidden="true"></span><%= t("hyrax.works.update.header") %></h1>
 <% end %>

data/app/views/hyrax/base/new.html.erb

@@ -1,4 +1,4 @@
-<% provide :page_title, curation_concern_page_title(curation_concern) %>
+<% provide :page_title, title_presenter(curation_concern).page_title %>
 <% provide :page_header do %>
   <h1><%= t("hyrax.works.create.header", type: curation_concern.human_readable_type) %></h1>
 <% end %>