hyrax 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d34c51d077dddcd6a5932d22a633104906b17e30
-  data.tar.gz: f61e880d0705b2863c0edf50e0066b8cf4df41c3
+  metadata.gz: 675c6cf986dd38320e1f9c76caa0e707bfdfd34b
+  data.tar.gz: 21487889ed825af87053b8ca78ad9a629f5ea0f1
 SHA512:
-  metadata.gz: bcda312829b2581af6d701b0a57cc11e99d26e12c4405fc5f8ecb814328cdc94a5ed74cb5deb0583b995b8ffd64127f806c4b7fb64a37372610ddf2d0e477d44
-  data.tar.gz: 70e85336f1286e3749f22f8cd4ee8d3607a4f06bc9dda48429cf37f53041b7d9012ddb1628bc97ae1de8d17622019e6f20d37f66bd920adb272fe1996a96954c
+  metadata.gz: 2cc13e4c761febbcc6d71a5f2169695d8723878198458bb6c024de8e92820e8f83cbd2dd18def0bd4fdc848d2b3efd56854f1d93afb758c80044c0fe19c53580
+  data.tar.gz: 38ef4eca1f3c896f65bae3df9923a1d40888cc458d1bf1431858ac41c71474a2b250044cf4f33a227d7f512c45224a2f91bd5d16ea2367af7f55ad9147691b06

data/README.md

@@ -64,7 +64,7 @@ The Samvera community is here to help. Please see our [support guide](./.github/
 # Getting started
 
 This document contains instructions specific to setting up an app with __Hyrax
-v2.4.0__. If you are looking for instructions on installing a different
+v2.4.1__. If you are looking for instructions on installing a different
 version, be sure to select the appropriate branch or tag from the drop-down
 menu above.
 
@@ -163,7 +163,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.4.0/template.rb
+rails _5.1.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v2.4.1/template.rb
 ```
 
 Generating a new Rails application using Hyrax's template above takes cares of a number of steps for you, including:

data/app/assets/stylesheets/hyrax/_header.scss

@@ -17,10 +17,6 @@ header > .navbar {
 
 .searchbar-right {
   margin-right: 0;
-
-  label {
-    color: #ffffff;
-  }
 }
 
 // We need these ancestor selectors to override Bootstrap and push

data/app/assets/stylesheets/hyrax/_home-page.scss

@@ -40,6 +40,7 @@
 
   .navbar {
     background-color: $navbar-transparent-bg;
+    color: #fff;
     margin-bottom: 0;
 
     .navbar-nav {

data/app/jobs/attach_files_to_work_job.rb

@@ -11,12 +11,14 @@ class AttachFilesToWorkJob < Hyrax::ApplicationJob
     work_permissions = work.permissions.map(&:to_hash)
     metadata = visibility_attributes(work_attributes)
     uploaded_files.each do |uploaded_file|
+      next if uploaded_file.file_set_uri.present?
+
       actor = Hyrax::Actors::FileSetActor.new(FileSet.create, user)
+      uploaded_file.update(file_set_uri: actor.file_set.uri)
       actor.file_set.permissions_attributes = work_permissions
       actor.create_metadata(metadata)
       actor.create_content(uploaded_file)
       actor.attach_to_work(work)
-      uploaded_file.update(file_set_uri: actor.file_set.uri)
     end
   end
 

data/app/views/hyrax/collections/show.html.erb

@@ -70,7 +70,7 @@
     </div>
     <div class="col-md-4 hyc-metadata">
       <% unless has_collection_search_parameters? %>
-          <h2>Collection Details</h2>
+          <h2><%= t('hyrax.dashboard.collections.show.metadata_header') %></h2>
           <%= render 'show_descriptions' %>
       <% end %>
     </div>

data/app/views/hyrax/users/_user.html.erb

@@ -2,10 +2,7 @@
   <div class="panel-heading">
     <%= image_tag user.avatar.url(:thumb), width: 100 if user.avatar.present? %>
     <h3>
-      <% if user.name != user.user_key %>
-        <%= user.name %><br />
-      <% end %>
-      <%= user.user_key %>
+      <%= user.name %>
     </h3>
   </div>
 

data/config/locales/hyrax.de.yml

@@ -654,6 +654,7 @@ de:
         show:
           header: Sammlung
           item_count: Arbeiten
+          metadata_header: Details zur Sammlung
           parent_collection_header: Übergeordnete Sammlungen
           public_view_label: Öffentliche Sicht der Sammlung
           search_results: Suchergebnisse innerhalb dieser Sammlung

data/config/locales/hyrax.en.yml

@@ -653,6 +653,7 @@ en:
         show:
           header: Collection
           item_count: Works
+          metadata_header: Collection Details
           parent_collection_header: Parent Collections
           public_view_label: Public view of Collection
           search_results: Search Results within this Collection

data/config/locales/hyrax.es.yml

@@ -652,6 +652,7 @@ es:
         show:
           header: Colección
           item_count: Trabajos
+          metadata_header: Detalles de la colección
           parent_collection_header: Colecciones de padres
           public_view_label: Vista pública de la colección
           search_results: Resultados de búsqueda dentro de esta colección

data/config/locales/hyrax.fr.yml

@@ -653,6 +653,7 @@ fr:
         show:
           header: Collection
           item_count: Travaux
+          metadata_header: Détails de la collection
           parent_collection_header: Collections de parents
           public_view_label: Vue publique de la collection
           search_results: Résultats de la recherche dans cette collection

data/config/locales/hyrax.it.yml

@@ -652,6 +652,7 @@ it:
         show:
           header: Collezione
           item_count: Lavori
+          metadata_header: Dettagli della collezione
           parent_collection_header: Collezioni principali
           public_view_label: Visione pubblica della collezione
           search_results: Risultati della ricerca all'interno di questa raccolta

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

@@ -647,6 +647,7 @@ pt-BR:
         show:
           header: Coleção
           item_count: Obras
+          metadata_header: Detalhes da coleção
           parent_collection_header: Coleções mães
           public_view_label: Vista pública da Coleção
           search_results: Resultados da pesquisa dentro desta coleção

data/config/locales/hyrax.zh.yml

@@ -650,6 +650,7 @@ zh:
         show:
           header: 采集
           item_count: 作品
+          metadata_header: 收集细节
           parent_collection_header: 家长集合
           public_view_label: 公众对收藏的看法
           search_results: 搜索此集合中的结果

data/hyrax.gemspec

@@ -82,7 +82,7 @@ SUMMARY
 
   # temporary pin to 2.17 due to failures caused in 2.18.0
   spec.add_development_dependency "capybara", '~> 2.4', '< 2.18.0'
-  spec.add_development_dependency 'capybara-maleficent', '~> 0.2'
+  spec.add_development_dependency 'capybara-maleficent', '~> 0.3.0'
   spec.add_development_dependency 'database_cleaner', '~> 1.3'
   spec.add_development_dependency 'engine_cart', '~> 2.0'
   spec.add_development_dependency "equivalent-xml", '~> 0.5'

data/lib/generators/hyrax/riiif_generator.rb

@@ -16,7 +16,7 @@ class Hyrax::RiiifGenerator < Rails::Generators::Base
   end
 
   def add_to_gemfile
-    gem 'riiif', '~> 1.1'
+    gem 'riiif', '~> 2.0'
 
     Bundler.with_clean_env do
       run "bundle install"

data/lib/hyrax/version.rb

@@ -1,3 +1,3 @@
 module Hyrax
-  VERSION = '2.4.0'.freeze
+  VERSION = '2.4.1'.freeze
 end

data/spec/jobs/attach_files_to_work_job_spec.rb

@@ -1,71 +1,79 @@
 RSpec.describe AttachFilesToWorkJob, perform_enqueued: [AttachFilesToWorkJob] do
-  context "happy path" do
-    let(:file1) { File.open(fixture_path + '/world.png') }
-    let(:file2) { File.open(fixture_path + '/image.jp2') }
-    let(:uploaded_file1) { build(:uploaded_file, file: file1) }
-    let(:uploaded_file2) { build(:uploaded_file, file: file2) }
-    let(:generic_work) { create(:public_generic_work) }
-    let(:user) { create(:user) }
+  let(:file1) { File.open(fixture_path + '/world.png') }
+  let(:file2) { File.open(fixture_path + '/image.jp2') }
+  let(:uploaded_file1) { build(:uploaded_file, file: file1) }
+  let(:uploaded_file2) { build(:uploaded_file, file: file2) }
+  let(:generic_work) { create(:public_generic_work) }
+  let(:user) { create(:user) }
 
-    shared_examples 'a file attacher', perform_enqueued: [AttachFilesToWorkJob, IngestJob] do
-      it 'attaches files, copies visibility and permissions and updates the uploaded files' do
-        expect(CharacterizeJob).to receive(:perform_later).twice
-        described_class.perform_now(generic_work, [uploaded_file1, uploaded_file2])
-        generic_work.reload
-        expect(generic_work.file_sets.count).to eq 2
-        expect(generic_work.file_sets.map(&:visibility)).to all(eq 'open')
-        expect(uploaded_file1.reload.file_set_uri).not_to be_nil
-        expect(ImportUrlJob).not_to have_been_enqueued
-      end
+  shared_examples 'a file attacher', perform_enqueued: [AttachFilesToWorkJob, IngestJob] do
+    it 'attaches files, copies visibility and permissions and updates the uploaded files' do
+      expect(CharacterizeJob).to receive(:perform_later).twice
+      described_class.perform_now(generic_work, [uploaded_file1, uploaded_file2])
+      generic_work.reload
+      expect(generic_work.file_sets.count).to eq 2
+      expect(generic_work.file_sets.map(&:visibility)).to all(eq 'open')
+      expect(uploaded_file1.reload.file_set_uri).not_to be_nil
+      expect(ImportUrlJob).not_to have_been_enqueued
     end
+  end
 
-    context "with uploaded files on the filesystem" do
-      before do
-        generic_work.permissions.build(name: 'userz@bbb.ddd', type: 'person', access: 'edit')
-        generic_work.save
+  context "with uploaded files on the filesystem" do
+    before do
+      generic_work.permissions.build(name: 'userz@bbb.ddd', type: 'person', access: 'edit')
+      generic_work.save
+    end
+    it_behaves_like 'a file attacher' do
+      it 'records the depositor(s) in edit_users' do
+        expect(generic_work.file_sets.map(&:edit_users)).to all(match_array([generic_work.depositor, 'userz@bbb.ddd']))
       end
-      it_behaves_like 'a file attacher' do
-        it 'records the depositor(s) in edit_users' do
-          expect(generic_work.file_sets.map(&:edit_users)).to all(match_array([generic_work.depositor, 'userz@bbb.ddd']))
+
+      describe 'with existing files' do
+        let(:file_set)       { create(:file_set) }
+        let(:uploaded_file1) { build(:uploaded_file, file: file1, file_set_uri: 'http://example.com/file_set') }
+
+        it 'skips files that already have a FileSet' do
+          expect { described_class.perform_now(generic_work, [uploaded_file1, uploaded_file2]) }
+            .to change { generic_work.file_sets.count }.to eq 1
         end
       end
     end
+  end
 
-    context "with uploaded files at remote URLs" do
-      let(:url1) { 'https://example.com/my/img.png' }
-      let(:url2) { URI('https://example.com/other/img.png') }
-      let(:fog_file1) { double(CarrierWave::Storage::Abstract, url: url1) }
-      let(:fog_file2) { double(CarrierWave::Storage::Abstract, url: url2) }
-
-      before do
-        allow(uploaded_file1.file).to receive(:file).and_return(fog_file1)
-        allow(uploaded_file2.file).to receive(:file).and_return(fog_file2)
-      end
+  context "with uploaded files at remote URLs" do
+    let(:url1) { 'https://example.com/my/img.png' }
+    let(:url2) { URI('https://example.com/other/img.png') }
+    let(:fog_file1) { double(CarrierWave::Storage::Abstract, url: url1) }
+    let(:fog_file2) { double(CarrierWave::Storage::Abstract, url: url2) }
 
-      it_behaves_like 'a file attacher'
+    before do
+      allow(uploaded_file1.file).to receive(:file).and_return(fog_file1)
+      allow(uploaded_file2.file).to receive(:file).and_return(fog_file2)
     end
 
-    context "deposited on behalf of another user" do
-      before do
-        generic_work.on_behalf_of = user.user_key
-        generic_work.save
-      end
-      it_behaves_like 'a file attacher' do
-        it 'records the depositor(s) in edit_users' do
-          expect(generic_work.file_sets.map(&:edit_users)).to all(match_array([user.user_key]))
-        end
+    it_behaves_like 'a file attacher'
+  end
+
+  context "deposited on behalf of another user" do
+    before do
+      generic_work.on_behalf_of = user.user_key
+      generic_work.save
+    end
+    it_behaves_like 'a file attacher' do
+      it 'records the depositor(s) in edit_users' do
+        expect(generic_work.file_sets.map(&:edit_users)).to all(match_array([user.user_key]))
       end
     end
+  end
 
-    context "deposited as 'Yourself' selected in on behalf of list" do
-      before do
-        generic_work.on_behalf_of = ''
-        generic_work.save
-      end
-      it_behaves_like 'a file attacher' do
-        it 'records the depositor(s) in edit_users' do
-          expect(generic_work.file_sets.map(&:edit_users)).to all(match_array([generic_work.depositor]))
-        end
+  context "deposited as 'Yourself' selected in on behalf of list" do
+    before do
+      generic_work.on_behalf_of = ''
+      generic_work.save
+    end
+    it_behaves_like 'a file attacher' do
+      it 'records the depositor(s) in edit_users' do
+        expect(generic_work.file_sets.map(&:edit_users)).to all(match_array([generic_work.depositor]))
       end
     end
   end

data/spec/spec_helper.rb

@@ -49,7 +49,7 @@ unless ENV['SKIP_MALEFICENT']
   # Wrap Capybara matchers with sleep intervals to reduce fragility of specs.
   require 'capybara/maleficent/spindle'
 
-  Capybara::Maleficent.config do |c|
+  Capybara::Maleficent.configure do |c|
     # Quieting down maleficent's logging
     logger = Logger.new(STDOUT)
     logger.level = Logger::INFO

data/template.rb

@@ -1,4 +1,4 @@
-gem 'hyrax', '2.4.0'
+gem 'hyrax', '2.4.1'
 run 'bundle install'
 generate 'hyrax:install', '-f'
 rails_command 'db:migrate'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyrax
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Justin Coyne
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-06 00:00:00.000000000 Z
+date: 2018-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -722,14 +722,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement