hyrax 2.1.0 → 2.2.0

data/spec/services/hyrax/tolerant_select_service_spec.rb

@@ -0,0 +1,80 @@
+RSpec.describe Hyrax::TolerantSelectService do
+  subject(:select_service) { described_class.new(authority_name) }
+
+  let(:authority) { FakeAuthority }
+  let(:authority_name) { 'fake_authority' }
+  let(:authority_map) { [] }
+
+  before do
+    allow(Qa::Authorities::Local)
+      .to receive(:subauthority_for)
+      .with(authority_name)
+      .and_return(authority.new(authority_map))
+  end
+
+  shared_context 'with terms' do
+    let(:authority_map) do
+      [HashWithIndifferentAccess.new(term: 'Active Label', label: 'Active Label', id: 'active-id', active: true),
+       HashWithIndifferentAccess.new(term: 'Inactive Label', label: 'Inactive Label', id: 'inactive-id', active: false),
+       HashWithIndifferentAccess.new(label: 'Active No Term', id: 'active-no-term-id', active: true),
+       HashWithIndifferentAccess.new(term: 'No Active Flag Term', label: 'No Active Flag Label', id: 'no-active-flag-id')]
+    end
+  end
+
+  describe '#active?' do
+    it 'is false for missing id' do
+      expect(select_service.active?('fake_id')).to be_falsey
+    end
+
+    context 'with terms' do
+      include_context 'with terms'
+
+      it 'is true for an active term' do
+        expect(select_service.active?('active-id')).to be true
+      end
+
+      it 'is false for an inactive term' do
+        expect(select_service.active?('inactive-id')).to be_falsey
+      end
+
+      it 'defaults to true for a term with no flag' do
+        expect(select_service.active?('no-active-flag-id')).to be true
+      end
+    end
+  end
+
+  describe '#select_all_options' do
+    it 'is empty' do
+      expect(select_service.select_all_options).to be_empty
+    end
+
+    context 'with terms' do
+      include_context 'with terms'
+
+      it 'contains all labels and ids' do
+        expect(select_service.select_all_options)
+          .to contain_exactly(['Active Label', 'active-id'],
+                              ['Inactive Label', 'inactive-id'],
+                              ['Active No Term', 'active-no-term-id'],
+                              ['No Active Flag Label', 'no-active-flag-id'])
+      end
+    end
+  end
+
+  describe '#select_active_options' do
+    it 'is empty' do
+      expect(select_service.select_active_options).to be_empty
+    end
+
+    context 'with terms' do
+      include_context 'with terms'
+
+      it 'contains active labels and ids' do
+        expect(select_service.select_active_options)
+          .to contain_exactly(['Active Label', 'active-id'],
+                              ['Active No Term', 'active-no-term-id'],
+                              ['No Active Flag Label', 'no-active-flag-id'])
+      end
+    end
+  end
+end

data/spec/support/fakes/fake_authority.rb

@@ -0,0 +1,13 @@
+class FakeAuthority
+  def initialize(map)
+    @map = map
+  end
+
+  def all
+    @map
+  end
+
+  def find(id)
+    @map.detect { |item| item[:id] == id }
+  end
+end

data/spec/support/logging_formatter.rb

@@ -47,7 +47,7 @@ class LoggingFormatter < RSpec::Core::Formatters::ProgressFormatter
       output.puts "Examples with the most LDP requests"
       top = @profile.sort_by { |hash| hash[:count] }.last(10)
       top.each do |hash|
-        result = hash[:count_by_name].select { |_, v| v > 0 }
+        result = hash[:count_by_name].select { |_, v| v.positive? }
         next if result.empty?
         output.puts "  #{hash[:description]}"
         output.puts "    #{hash[:location]}"

data/spec/support/matchers/collection_type_property_matchers.rb

@@ -1,29 +1,29 @@
 RSpec::Matchers.define :require_membership do
   match do |actual|
-    actual && actual.require_membership?
+    actual&.require_membership?
   end
 end
 
 RSpec::Matchers.define :allow_multiple_membership do
   match do |actual|
-    actual && actual.allow_multiple_membership?
+    actual&.allow_multiple_membership?
   end
 end
 
 RSpec::Matchers.define :assign_visibility do
   match do |actual|
-    actual && actual.assigns_visibility?
+    actual&.assigns_visibility?
   end
 end
 
 RSpec::Matchers.define :assign_workflow do
   match do |actual|
-    actual && actual.assigns_workflow?
+    actual&.assigns_workflow?
   end
 end
 
 RSpec::Matchers.define :have_collections do
   match do |actual|
-    actual && actual.collections?
+    actual&.collections?
   end
 end

data/spec/views/hyrax/base/_form_progress.html.erb_spec.rb

@@ -99,6 +99,17 @@ RSpec.describe 'hyrax/base/_form_progress.html.erb', type: :view do
         expect(page).not_to have_link 'Deposit Agreement', href: '/agreement'
       end
     end
+
+    context "with active deposit acceptance but no show deposit agreement" do
+      before do
+        allow(Flipflop).to receive(:show_deposit_agreement?).and_return(false)
+        allow(Flipflop).to receive(:active_deposit_agreement_acceptance?)
+          .and_return(true)
+      end
+      it "does not display the deposit agreement in the requirements" do
+        expect(page).not_to have_selector("#required-agreement")
+      end
+    end
   end
 
   context "when the work has been saved before" do
@@ -115,7 +126,6 @@ RSpec.describe 'hyrax/base/_form_progress.html.erb', type: :view do
     it "renders the deposit agreement already checked and the version" do
       expect(page).to have_selector("#agreement[checked]")
       expect(page).to have_selector("input#generic_work_version[value=\"123456\"]", visible: false)
-      expect(page).to have_link("Cancel", href: polymorphic_path([main_app, work]))
     end
   end
 end

data/spec/views/hyrax/file_sets/_show_actions.html.erb_spec.rb

@@ -57,7 +57,6 @@ RSpec.describe 'hyrax/file_sets/_show_actions.html.erb', type: :view do
     it 'renders actions for the user' do
       expect(page).to have_link("Edit This File")
       expect(page).to have_link("Delete This File")
-      expect(page).to have_link("Single-Use Link to File")
     end
   end
 end

data/spec/views/hyrax/file_sets/_single_use_links.html.erb_spec.rb

@@ -27,5 +27,9 @@ RSpec.describe 'hyrax/file_sets/_single_use_links.html.erb', type: :view do
     it "renders a table with links" do
       expect(rendered).to include("Link sha2ha expires in 23 hours")
     end
+
+    it "renders the single use link button" do
+      expect(rendered).to have_link("Create Single-Use Link")
+    end
   end
 end

data/spec/views/hyrax/single_use_links_viewer/show.html.erb_spec.rb

@@ -14,8 +14,4 @@ RSpec.describe 'hyrax/single_use_links_viewer/show.html.erb' do
   it "contains a download link" do
     expect(rendered).to have_selector "a[href^='/single_use_link/download/']"
   end
-
-  it "has turbolinks disabled in the download link" do
-    expect(rendered).to have_selector "a[data-turbolinks^='false'][href^='/single_use_link/download/']"
-  end
 end

data/template.rb

@@ -1,4 +1,4 @@
-gem 'hyrax', '2.1.0'
+gem 'hyrax', '2.2.0'
 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.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Justin Coyne
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-31 00:00:00.000000000 Z
+date: 2018-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -124,16 +124,16 @@ dependencies:
   name: browse-everything
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.10.5
+        version: '0.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.10.5
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
@@ -914,16 +914,22 @@ dependencies:
   name: solr_wrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: i18n_yaml_sorter
   requirement: !ruby/object:Gem::Requirement
@@ -1184,6 +1190,7 @@ files:
 - app/assets/stylesheets/fileupload/jquery.fileupload-ui.scss
 - app/assets/stylesheets/hyrax/_accessibility.scss
 - app/assets/stylesheets/hyrax/_batch-edit.scss
+- app/assets/stylesheets/hyrax/_breadcrumbs.scss
 - app/assets/stylesheets/hyrax/_browse_everything_overrides.scss
 - app/assets/stylesheets/hyrax/_buttons.scss
 - app/assets/stylesheets/hyrax/_catalog.scss
@@ -1664,6 +1671,7 @@ files:
 - app/services/hyrax/statistics/works/over_time.rb
 - app/services/hyrax/thumbnail_path_service.rb
 - app/services/hyrax/time_service.rb
+- app/services/hyrax/tolerant_select_service.rb
 - app/services/hyrax/user_stat_importer.rb
 - app/services/hyrax/versioning_service.rb
 - app/services/hyrax/work_form_service.rb
@@ -2053,7 +2061,6 @@ files:
 - app/views/hyrax/users/index.html.erb
 - app/views/hyrax/users/index.json.jbuilder
 - app/views/hyrax/users/show.html.erb
-- app/views/kaminari/blacklight_compact/_paginator.html.erb
 - app/views/layouts/_head_tag_content.html.erb
 - app/views/layouts/error.html.erb
 - app/views/layouts/homepage.html.erb
@@ -2581,6 +2588,7 @@ files:
 - spec/lib/hyrax/search_state_spec.rb
 - spec/lib/hyrax/zotero/config_spec.rb
 - spec/lib/hyrax/zotero_spec.rb
+- spec/lib/hyrax_spec.rb
 - spec/models/admin_set_spec.rb
 - spec/models/batch_upload_item_spec.rb
 - spec/models/checksum_audit_log_spec.rb
@@ -2773,6 +2781,7 @@ files:
 - spec/services/hyrax/statistics/works/count_spec.rb
 - spec/services/hyrax/statistics/works/over_time_spec.rb
 - spec/services/hyrax/thumbnail_path_service_spec.rb
+- spec/services/hyrax/tolerant_select_service_spec.rb
 - spec/services/hyrax/user_stat_importer_spec.rb
 - spec/services/hyrax/versioning_service_spec.rb
 - spec/services/hyrax/work_query_service_spec.rb
@@ -2804,6 +2813,7 @@ files:
 - spec/strategies/hyrax/strategies/yaml_strategy_spec.rb
 - spec/support/controller_level_helpers.rb
 - spec/support/factory_helpers.rb
+- spec/support/fakes/fake_authority.rb
 - spec/support/features.rb
 - spec/support/features/batch_edit_actions.rb
 - spec/support/features/session_helpers.rb
@@ -2987,7 +2997,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -2995,7 +3005,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Hyrax is a front-end based on the robust Samvera framework, providing a user
@@ -3309,6 +3319,7 @@ test_files:
 - spec/lib/hyrax/search_state_spec.rb
 - spec/lib/hyrax/zotero/config_spec.rb
 - spec/lib/hyrax/zotero_spec.rb
+- spec/lib/hyrax_spec.rb
 - spec/models/admin_set_spec.rb
 - spec/models/batch_upload_item_spec.rb
 - spec/models/checksum_audit_log_spec.rb
@@ -3501,6 +3512,7 @@ test_files:
 - spec/services/hyrax/statistics/works/count_spec.rb
 - spec/services/hyrax/statistics/works/over_time_spec.rb
 - spec/services/hyrax/thumbnail_path_service_spec.rb
+- spec/services/hyrax/tolerant_select_service_spec.rb
 - spec/services/hyrax/user_stat_importer_spec.rb
 - spec/services/hyrax/versioning_service_spec.rb
 - spec/services/hyrax/work_query_service_spec.rb
@@ -3532,6 +3544,7 @@ test_files:
 - spec/strategies/hyrax/strategies/yaml_strategy_spec.rb
 - spec/support/controller_level_helpers.rb
 - spec/support/factory_helpers.rb
+- spec/support/fakes/fake_authority.rb
 - spec/support/features.rb
 - spec/support/features/batch_edit_actions.rb
 - spec/support/features/session_helpers.rb

data/app/views/kaminari/blacklight_compact/_paginator.html.erb

@@ -1,22 +0,0 @@
-<%# This is copied from blacklight-5.5.3/app/views/kaminari/blacklight_compact/_paginator.html.erb
-so we can add a aria-hidden="true" attribute around it. If that gets added into
-Blacklight, this file can be removed -%>
-<% if total_pages > 1 -%>
-  <%# #render checks if total_pages > 1, so we can't put our fallback
-  in here .. -%>
-  <%= paginator.render do -%>
-    <div aria-hidden="true" class="page_links">
-      <%= prev_page_tag %> |
-      <span class="page_entries">
-        <%= page_entries_info %>
-      </span> |
-      <%= next_page_tag %>
-    </div>
-  <% end -%>
-<% else -%>
-    <div aria-hidden="true" class="page_links">
-      <span class="page_entries">
-        <%= page_entries_info %>
-      </span>
-    </div>
-<% end -%>