hyrax 2.0.3 → 2.1.0.beta1

data/spec/renderers/hyrax/renderers/date_attribute_renderer_spec.rb

@@ -11,7 +11,7 @@ RSpec.describe Hyrax::Renderers::DateAttributeRenderer do
         %(
       <tr><th>Embargo release date</th>
       <td><ul class="tabular">
-      <li class="attribute embargo_release_date">03/14/2013</li>
+      <li class="attribute attribute-embargo_release_date">03/14/2013</li>
       </ul></td></tr>
       )
       end
@@ -27,7 +27,7 @@ RSpec.describe Hyrax::Renderers::DateAttributeRenderer do
         %(
       <tr><th>Lease expiration date</th>
       <td><ul class="tabular">
-      <li class="attribute lease_expiration_date">03/14/2013</li>
+      <li class="attribute attribute-lease_expiration_date">03/14/2013</li>
       </ul></td></tr>
       )
       end

data/spec/renderers/hyrax/renderers/external_link_attribute_renderer_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe Hyrax::Renderers::ExternalLinkAttributeRenderer do
     let(:tr_content) do
       "<tr><th>Name</th>\n" \
        "<td><ul class='tabular'>" \
-       "<li class=\"attribute name\">"\
+       "<li class=\"attribute attribute-name\">"\
        "<a href=\"http://example.com\">"\
        "<span class='glyphicon glyphicon-new-window'></span>&nbsp;"\
        "http://example.com</a></li>\n" \

data/spec/renderers/hyrax/renderers/faceted_attribute_renderer_spec.rb

@@ -11,8 +11,8 @@ RSpec.describe Hyrax::Renderers::FacetedAttributeRenderer do
       %(
       <tr><th>Name</th>
       <td><ul class='tabular'>
-      <li class="attribute name"><a href="/catalog?f%5Bname_sim%5D%5B%5D=Bob">Bob</a></li>
-      <li class="attribute name"><a href="/catalog?f%5Bname_sim%5D%5B%5D=Jessica">Jessica</a></li>
+      <li class="attribute attribute-name"><a href="/catalog?f%5Bname_sim%5D%5B%5D=Bob">Bob</a></li>
+      <li class="attribute attribute-name"><a href="/catalog?f%5Bname_sim%5D%5B%5D=Jessica">Jessica</a></li>
       </ul></td></tr>
     )
     end

data/spec/renderers/hyrax/renderers/license_attribute_renderer_spec.rb

@@ -10,8 +10,8 @@ RSpec.describe Hyrax::Renderers::LicenseAttributeRenderer do
     let(:tr_content) do
       "<tr><th>License</th>\n" \
        "<td><ul class='tabular'>\n" \
-       "<li class=\"attribute license\"><a href=\"http://creativecommons.org/licenses/by/3.0/us/\" target=\"_blank\">Attribution 3.0 United States</a></li>\n" \
-       "<li class=\"attribute license\"><a href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\" target=\"_blank\">Attribution-NoDerivs 3.0 United States</a></li>\n" \
+       "<li class=\"attribute attribute-license\"><a href=\"http://creativecommons.org/licenses/by/3.0/us/\" target=\"_blank\">Attribution 3.0 United States</a></li>\n" \
+       "<li class=\"attribute attribute-license\"><a href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\" target=\"_blank\">Attribution-NoDerivs 3.0 United States</a></li>\n" \
        "</ul></td></tr>"
     end
 

data/spec/renderers/hyrax/renderers/linked_attribute_renderer_spec.rb

@@ -10,8 +10,8 @@ RSpec.describe Hyrax::Renderers::LinkedAttributeRenderer do
     let(:tr_content) do
       "<tr><th>Name</th>\n" \
        "<td><ul class='tabular'>" \
-       "<li class=\"attribute name\"><a href=\"/catalog?q=Bob&amp;search_field=name\">Bob</a></li>\n" \
-       "<li class=\"attribute name\"><a href=\"/catalog?q=Jessica&amp;search_field=name\">Jessica</a></li>\n" \
+       "<li class=\"attribute attribute-name\"><a href=\"/catalog?q=Bob&amp;search_field=name\">Bob</a></li>\n" \
+       "<li class=\"attribute attribute-name\"><a href=\"/catalog?q=Jessica&amp;search_field=name\">Jessica</a></li>\n" \
        "</ul></td></tr>"
     end
 

data/spec/renderers/hyrax/renderers/rights_statement_attribute_renderer_spec.rb

@@ -10,11 +10,20 @@ RSpec.describe Hyrax::Renderers::RightsStatementAttributeRenderer do
     let(:tr_content) do
       "<tr><th>Rights statement</th>\n" \
        "<td><ul class='tabular'>" \
-       "<li class=\"attribute rights_statement\"><a href=\"http://rightsstatements.org/vocab/InC/1.0/\" target=\"_blank\">In Copyright</a></li>" \
+       "<li class=\"attribute attribute-rights_statement\"><a href=\"http://rightsstatements.org/vocab/InC/1.0/\" target=\"_blank\">In Copyright</a></li>" \
        "</ul></td></tr>"
     end
 
     it { expect(renderer).not_to be_microdata(field) }
     it { expect(subject).to be_equivalent_to(expected) }
+
+    context 'with off-authority term' do
+      let(:renderer) { described_class.new(field, [value]) }
+      let(:value)    { 'moomin' }
+
+      it 'renders a value' do
+        expect(subject.to_s).to include value
+      end
+    end
   end
 end

data/spec/requests/riiif_spec.rb

@@ -0,0 +1,32 @@
+RSpec.describe 'IIIF image API', type: :request do
+  let(:user) { create(:user) }
+  let(:work) { create(:work_with_one_file, user: user) }
+  let(:file_set) { work.ordered_members.to_a.first }
+  let(:file) { file_set.original_file }
+  let(:size) { '300,' }
+
+  before do
+    Hydra::Works::AddFileToFileSet.call(file_set,
+                                        File.open(fixture_path + '/world.png'),
+                                        :original_file)
+  end
+
+  describe 'GET /images/:id' do
+    context "when the user is authorized" do
+      it "returns an image" do
+        login_as user
+        get Riiif::Engine.routes.url_helpers.image_path(file.id, size: size)
+        expect(response).to have_http_status(:ok)
+        expect(response.content_type).to eq 'image/jpeg'
+      end
+    end
+
+    context "when the user is not authorized" do
+      it "returns an image" do
+        get Riiif::Engine.routes.url_helpers.image_path(file.id, size: size)
+        expect(response).to have_http_status(:unauthorized)
+        expect(response.content_type).to eq 'image/jpeg'
+      end
+    end
+  end
+end

data/spec/routing/collection_permission_templates_routes_spec.rb

@@ -0,0 +1,31 @@
+RSpec.describe 'Collection Permission Templates Routes', type: :routing do
+  routes { Hyrax::Engine.routes }
+
+  it 'routes to #create' do
+    expect(post: '/dashboard/collections/1/permission_template').to route_to(controller: 'hyrax/admin/permission_templates', action: 'create', collection_id: '1')
+  end
+
+  it 'routes to #new' do
+    expect(get: '/dashboard/collections/permission_template/new').to route_to(controller: 'hyrax/admin/permission_templates', action: 'new')
+  end
+
+  it 'routes to #edit' do
+    expect(get: '/dashboard/collections/1/permission_template/edit').to route_to(controller: 'hyrax/admin/permission_templates', action: 'edit', collection_id: '1')
+  end
+
+  it 'routes to #show' do
+    expect(get: '/dashboard/collections/1/permission_template').to route_to(controller: 'hyrax/admin/permission_templates', action: 'show', collection_id: '1')
+  end
+
+  it 'routes to #update (patch)' do
+    expect(patch: '/dashboard/collections/1/permission_template').to route_to(controller: 'hyrax/admin/permission_templates', action: 'update', collection_id: '1')
+  end
+
+  it 'routes to #update (put)' do
+    expect(put: '/dashboard/collections/1/permission_template').to route_to(controller: 'hyrax/admin/permission_templates', action: 'update', collection_id: '1')
+  end
+
+  it 'routes to #destroy' do
+    expect(delete: '/dashboard/collections/1/permission_template').to route_to(controller: 'hyrax/admin/permission_templates', action: 'destroy', collection_id: '1')
+  end
+end

data/spec/routing/collection_types_routes.rb

@@ -0,0 +1,35 @@
+RSpec.describe 'Collection Types Routes', type: :routing do
+  routes { Hyrax::Engine.routes }
+
+  it 'routes to #index' do
+    expect(get: '/admin/collection_types').to route_to(controller: 'hyrax/admin/collection_types', action: 'index')
+  end
+
+  it 'routes to #create' do
+    expect(post: '/admin/collection_types').to route_to(controller: 'hyrax/admin/collection_types', action: 'create')
+  end
+
+  it 'routes to #new' do
+    expect(get: '/admin/collection_types/new').to route_to(controller: 'hyrax/admin/collection_types', action: 'new')
+  end
+
+  it 'routes to #edit' do
+    expect(get: '/admin/collection_types/1/edit').to route_to(controller: 'hyrax/admin/collection_types', action: 'edit', id: '1')
+  end
+
+  it 'routes to #update (patch)' do
+    expect(patch: '/admin/collection_types/1').to route_to(controller: 'hyrax/admin/collection_types', action: 'update', id: '1')
+  end
+
+  it 'routes to #update (put)' do
+    expect(put: '/admin/collection_types/1').to route_to(controller: 'hyrax/admin/collection_types', action: 'update', id: '1')
+  end
+
+  it 'routes to #destroy' do
+    expect(delete: '/admin/collection_types/1').to route_to(controller: 'hyrax/admin/collection_types', action: 'destroy', id: '1')
+  end
+
+  it 'does not route to #show' do
+    expect(get: '/admin/collection_types/1').not_to route_to(controller: 'hyrax/admin/collection_types', action: 'show', id: '1')
+  end
+end

data/spec/routing/dashboard_routes_spec.rb

@@ -0,0 +1,37 @@
+RSpec.describe 'Dashboard Routes', type: :routing do
+  routes { Hyrax::Engine.routes }
+
+  it 'routes GET /dashboard/collections/:parent_id/under' do
+    expect(get: '/dashboard/collections/parent1/under').to route_to(controller: 'hyrax/dashboard/nest_collections', action: 'create_collection_under', parent_id: 'parent1')
+  end
+
+  it 'routes POST /dashboard/collections/:parent_id/under' do
+    expect(post: '/dashboard/collections/parent1/under').to route_to(controller: 'hyrax/dashboard/nest_collections', action: 'create_relationship_under', parent_id: 'parent1')
+  end
+
+  it 'routes POST /dashboard/collections/:child_id/within' do
+    expect(post: '/dashboard/collections/child1/within').to route_to(controller: 'hyrax/dashboard/nest_collections', action: 'create_relationship_within', child_id: 'child1')
+  end
+
+  it 'routes POST /dashboard/collections/:child_id/remove_parent/:parent_id' do
+    expect(post: '/dashboard/collections/child1/remove_parent/parent1').to route_to(
+      controller: 'hyrax/dashboard/nest_collections',
+      action: 'remove_relationship_above',
+      child_id: 'child1',
+      parent_id: 'parent1'
+    )
+  end
+
+  it 'routes POST /dashboard/collections/:parent_id/remove_child/:child_id' do
+    expect(post: '/dashboard/collections/parent1/remove_child/child1').to route_to(
+      controller: 'hyrax/dashboard/nest_collections',
+      action: 'remove_relationship_under',
+      child_id: 'child1',
+      parent_id: 'parent1'
+    )
+  end
+
+  it 'routes POST /dashboard/collections/:id' do
+    expect(post: '/dashboard/collections/id').to route_to(controller: 'hyrax/dashboard/collection_members', action: 'update_members', id: 'id')
+  end
+end

data/spec/routing/route_spec.rb

@@ -30,16 +30,6 @@ RSpec.describe 'Routes', type: :routing do
     context "main app routes" do
       routes { Rails.application.routes }
 
-      context "with a file_set" do
-        it 'routes to create' do
-          expect(post: '/concern/container/12/file_sets').to route_to(controller: 'hyrax/file_sets', action: 'create', parent_id: '12')
-        end
-
-        it 'routes to new' do
-          expect(get: '/concern/container/12/file_sets/new').to route_to(controller: 'hyrax/file_sets', action: 'new', parent_id: '12')
-        end
-      end
-
       it 'routes to edit' do
         expect(get: '/concern/file_sets/3/edit').to route_to(controller: 'hyrax/file_sets', action: 'edit', id: '3')
       end
@@ -206,6 +196,10 @@ RSpec.describe 'Routes', type: :routing do
       it 'routes to inspect_work' do
         expect(get: 'concern/generic_works/6/inspect_work').to route_to(controller: 'hyrax/generic_works', action: 'inspect_work', id: '6')
       end
+
+      it 'routes to manifest' do
+        expect(get: 'concern/generic_works/6/manifest').to route_to(controller: 'hyrax/generic_works', action: 'manifest', id: '6')
+      end
     end
   end
 end

data/spec/search_builders/hyrax/admin_admin_set_member_search_builder_spec.rb

@@ -11,7 +11,8 @@ RSpec.describe Hyrax::AdminAdminSetMemberSearchBuilder do
                     current_user: user)
   end
   let(:user) { create(:user) }
-  let(:builder) { described_class.new(context, access) }
+  let(:admin_set) { double(id: '123') }
+  let(:builder) { described_class.new(scope: context, collection: admin_set) }
 
   describe '#filter_models' do
     before do
@@ -19,7 +20,6 @@ RSpec.describe Hyrax::AdminAdminSetMemberSearchBuilder do
       allow(builder).to receive(:work_classes).and_return([GenericWork])
       builder.filter_models(solr_params)
     end
-    let(:access) { :read }
     let(:solr_params) { { fq: [] } }
 
     it 'searches for valid work types' do

data/spec/search_builders/hyrax/admin_set_search_builder_spec.rb

@@ -24,31 +24,13 @@ RSpec.describe Hyrax::AdminSetSearchBuilder do
 
     context "when access is :deposit" do
       let(:access) { :deposit }
-      let(:admin_set) { create(:admin_set) }
-      let(:permission_template) { create(:permission_template, admin_set_id: admin_set.id) }
 
       context "and user has access" do
         before do
-          create(:permission_template_access,
-                 permission_template: permission_template,
-                 agent_type: 'user',
-                 agent_id: user.user_key,
-                 access: 'deposit')
+          allow(Hyrax::Collections::PermissionsService).to receive(:source_ids_for_deposit).and_return([7, 8])
         end
 
-        it { is_expected.to eq ["{!terms f=id}#{admin_set.id}"] }
-      end
-
-      context "and group has access" do
-        before do
-          create(:permission_template_access,
-                 permission_template: permission_template,
-                 agent_type: 'group',
-                 agent_id: 'registered',
-                 access: 'deposit')
-        end
-
-        it { is_expected.to eq ["{!terms f=id}#{admin_set.id}"] }
+        it { is_expected.to eq ["{!terms f=id}7,8"] }
       end
 
       context "and user has no access" do
@@ -60,7 +42,7 @@ RSpec.describe Hyrax::AdminSetSearchBuilder do
   describe ".default_processor_chain" do
     subject { described_class.default_processor_chain }
 
-    it { is_expected.to include :filter_models }
+    it { is_expected.to include(:filter_models, :add_access_controls_to_solr_params) }
   end
 
   describe "#to_h" do
@@ -83,27 +65,9 @@ RSpec.describe Hyrax::AdminSetSearchBuilder do
 
     context "when searching for deposit access" do
       let(:access) { :deposit }
-      let(:permission_template1) { create(:permission_template, admin_set_id: 7) }
-      let(:permission_template2) { create(:permission_template, admin_set_id: 8) }
-      let(:permission_template3) { create(:permission_template, admin_set_id: 9) }
 
       before do
-        create(:permission_template_access,
-               :manage,
-               permission_template: permission_template1,
-               agent_type: 'user',
-               agent_id: user.user_key,
-               access: 'deposit')
-        create(:permission_template_access,
-               :manage,
-               permission_template: permission_template2,
-               agent_type: 'user',
-               agent_id: user.user_key)
-        create(:permission_template_access,
-               :view,
-               permission_template: permission_template3,
-               agent_type: 'user',
-               agent_id: user.user_key)
+        allow(Hyrax::Collections::PermissionsService).to receive(:source_ids_for_deposit).and_return([7, 8])
       end
 
       it 'is successful' do

data/spec/search_builders/hyrax/collection_member_search_builder_spec.rb

@@ -0,0 +1,53 @@
+RSpec.describe Hyrax::CollectionMemberSearchBuilder do
+  let(:context) { double("context", blacklight_config: CatalogController.blacklight_config) }
+  let(:solr_params) { { fq: [] } }
+  let(:include_models) { :both }
+  let(:collection) { build(:collection, id: '12345') }
+  let(:builder) { described_class.new(scope: context, collection: collection, search_includes_models: include_models) }
+
+  describe ".default_processor_chain" do
+    subject { builder.default_processor_chain }
+
+    it { is_expected.to include :member_of_collection }
+  end
+
+  describe '#member_of_collection' do
+    let(:subject) { builder.member_of_collection(solr_params) }
+
+    it 'updates solr_parameters[:fq]' do
+      subject
+      expect(solr_params[:fq]).to include("#{builder.collection_membership_field}:#{collection.id}")
+    end
+  end
+
+  describe '#models' do
+    let(:work_classes) { [GenericWork] }
+    let(:collection_classes) { [Collection] }
+    let(:subject) { builder.models }
+
+    context 'when search_include_models: :works' do
+      let(:include_models) { :works }
+
+      it 'returns only work members' do
+        expect(subject).to eq(Hyrax.config.curation_concerns)
+      end
+    end
+
+    context 'when search_include_models: :collections' do
+      let(:include_models) { :collections }
+
+      it 'returns only collection members' do
+        expect(subject).to eq(collection_classes)
+      end
+    end
+
+    context 'when search_include_models anything else' do
+      let(:search_includes_models) { "anything" }
+
+      it 'returns both work and collection members' do
+        expect(subject).to include(*work_classes)
+        expect(subject).to include(*collection_classes)
+      end
+    end
+  end
+end

data/spec/search_builders/hyrax/collection_search_builder_spec.rb

@@ -0,0 +1,74 @@
+RSpec.describe Hyrax::CollectionSearchBuilder do
+  let(:scope) do
+    double(blacklight_config: CatalogController.blacklight_config,
+           current_ability: ability)
+  end
+  let(:user) { create(:user) }
+  let(:ability) { ::Ability.new(user) }
+  let(:builder) { described_class.new(scope).with_access(access) }
+
+  describe '#sort_field' do
+    let(:access) { :read }
+
+    subject { builder.sort_field }
+
+    it { is_expected.to eq('title_si') }
+  end
+
+  describe '#models' do
+    let(:access) { :read }
+
+    subject { builder.models }
+
+    it { is_expected.to eq([Collection]) }
+  end
+
+  describe '#discovery_permissions' do
+    subject { builder.discovery_permissions }
+
+    context 'when access is read' do
+      let(:access) { :read }
+
+      it { is_expected.to eq %w[edit read] }
+    end
+
+    context 'when access is edit' do
+      let(:access) { :edit }
+
+      it { is_expected.to eq %w[edit] }
+    end
+
+    context 'when access is deposit' do
+      let(:access) { :deposit }
+
+      it { is_expected.to eq %w[deposit] }
+    end
+  end
+
+  describe '#gated_discovery_filters' do
+    subject { builder.gated_discovery_filters(access, ability) }
+
+    context 'when access is :deposit' do
+      let(:access) { "deposit" }
+      let!(:collection) { create(:collection, with_permission_template: attributes) }
+
+      context 'and user has access' do
+        let(:attributes) { { deposit_users: [user.user_key] } }
+
+        it { is_expected.to eq ["{!terms f=id}#{collection.id}"] }
+      end
+
+      context 'and group has access' do
+        let(:attributes) { { deposit_groups: ['registered'] } }
+
+        it { is_expected.to eq ["{!terms f=id}#{collection.id}"] }
+      end
+
+      context "and user has no access" do
+        let(:attributes) { true }
+
+        it { is_expected.to eq ["{!terms f=id}"] }
+      end
+    end
+  end
+end