curation_concerns 0.12.0.pre1 → 0.12.0.pre2

data/spec/controllers/selects_collections_controller_spec.rb

@@ -0,0 +1,109 @@
+require "spec_helper"
+
+class SelectsCollectionsController < ApplicationController
+  include Blacklight::Catalog
+  include Hydra::Controller::ControllerBehavior
+  include CurationConcerns::SelectsCollections
+end
+
+describe SelectsCollectionsController, type: :controller do
+  describe "#find_collections" do
+    it "uses the search builder" do
+      expect(subject.collections_search_builder_class.default_processor_chain).to eq [:default_solr_parameters, :add_query_to_solr, :add_access_controls_to_solr_params, :add_collection_filter, :some_rows, :sort_by_title]
+      expect(CurationConcerns::CollectionSearchBuilder).to receive(:new).with(subject).and_call_original
+      subject.find_collections
+    end
+  end
+
+  describe "Select Collections" do
+    let(:user) { FactoryGirl.create(:user) }
+    let!(:collection) { FactoryGirl.create(:collection, read_groups: ['public'], user: user) }
+    let!(:collection2) { FactoryGirl.create(:collection, read_users: [user.user_key]) }
+    let!(:collection3) { FactoryGirl.create(:collection, edit_users: [user.user_key]) }
+    let!(:collection4) { FactoryGirl.create(:collection) }
+    # # collection = Collection.new title:"Test Public"
+    # # collection.apply_depositor_metadata(@user.user_key)
+    # # collection.read_groups = ["public"]
+    # # collection.save
+    # collection2 = Collection.new title:"Test Read"
+    # collection2.apply_depositor_metadata('abc123@test.com')
+    # collection2.read_users = [@user.user_key]
+    # collection2.save
+    # collection3 = Collection.new title:"Test Edit"
+    # collection3.apply_depositor_metadata('abc123@test.com')
+    # collection3.edit_users = [@user.user_key]
+    # collection3.save
+    # collection4 = Collection.new title:"Test No Access"
+    # collection4.apply_depositor_metadata('abc123@test.com')
+    # collection4.save
+
+    describe "Public Access" do
+      it "only returns public collections" do
+        subject.find_collections
+        expect(assigns[:user_collections].map(&:id)).to match_array [collection.id]
+      end
+
+      context "when there are more than 10" do
+        before do
+          11.times do
+            FactoryGirl.create(:collection, read_groups: ["public"], user: user)
+          end
+        end
+
+        it "returns all public collections" do
+          subject.find_collections
+          expect(assigns[:user_collections].count).to eq(12)
+        end
+      end
+    end
+
+    describe "Read Access" do
+      describe "not signed in" do
+        it "errors if the user is not signed in" do
+          expect { subject.find_collections_with_read_access }.to raise_error
+        end
+      end
+      describe "signed in" do
+        before { sign_in user }
+
+        it "only returns public and read access (edit access implies read) collections" do
+          subject.find_collections_with_read_access
+          expect(assigns[:user_collections].map(&:id)).to match_array [collection.id, collection2.id, collection3.id]
+        end
+      end
+    end
+
+    describe "Edit Access" do
+      describe "not signed in" do
+        it "errors if the user is not signed in" do
+          expect { subject.find_collections_with_edit_access }.to raise_error
+        end
+      end
+
+      describe "signed in" do
+        before { sign_in user }
+
+        it "only returns public or editable collections" do
+          subject.find_collections_with_edit_access
+          expect(assigns[:user_collections].map(&:id)).to match_array [collection.id, collection3.id]
+        end
+
+        it "only returns public or editable collections & instructions" do
+          subject.find_collections_with_edit_access(true)
+          expect(assigns[:user_collections].map(&:id)).to match_array [-1, collection.id, collection3.id]
+        end
+
+        context "after querying for read access" do
+          before do
+            subject.find_collections
+            subject.find_collections_with_edit_access
+          end
+
+          it "returns collections with edit access" do
+            expect(assigns[:user_collections].map(&:id)).to match_array [collection.id, collection3.id]
+          end
+        end
+      end
+    end
+  end
+end

data/spec/features/create_work_spec.rb

@@ -25,7 +25,7 @@ feature 'Creating a new Work' do
     within('form.new_generic_work') do
       fill_in('Title', with: work_title)
       attach_file('Upload a file', fixture_file_path('files/image.png'))
-      choose('visibility_open')
+      choose('generic_work_visibility_open')
       click_on('Create Generic work')
     end
     within '.related_files' do

data/spec/features/work_generator_spec.rb

@@ -42,7 +42,7 @@ feature 'Creating a new Work' do
     within('form.new_catapult') do
       fill_in('Title', with: catapult_title)
       attach_file('Upload a file', fixture_file_path('files/image.png'))
-      choose('visibility_open')
+      choose('catapult_visibility_open')
       click_on('Create Catapult')
     end
     click_on('Edit This Catapult')

data/spec/forms/collection_edit_form_spec.rb

@@ -29,10 +29,10 @@ describe CurationConcerns::Forms::CollectionEditForm do
   describe ".build_permitted_params" do
     subject { described_class.build_permitted_params }
     it { is_expected.to eq [{ resource_type: [] },
-                            :title,
+                            { title: [] },
                             { creator: [] },
                             { contributor: [] },
-                            :description,
+                            { description: [] },
                             { tag: [] },
                             { rights: [] },
                             { publisher: [] },
@@ -47,13 +47,6 @@ describe CurationConcerns::Forms::CollectionEditForm do
                             :visibility] }
   end
 
-  describe 'multiple?' do
-    context 'with :title' do
-      subject { described_class.multiple?(:title) }
-      it { is_expected.to be false }
-    end
-  end
-
   describe '#select_files' do
     context 'without any works/files attached' do
       subject { form.select_files }

data/spec/forms/work_form_spec.rb

@@ -75,6 +75,11 @@ describe CurationConcerns::Forms::WorkForm do
     end
   end
 
+  describe '#visibility' do
+    subject { form.visibility }
+    it { is_expected.to eq 'restricted' }
+  end
+
   describe '#human_readable_type' do
     subject { form.human_readable_type }
     it { is_expected.to eq 'Generic Work' }

data/spec/helpers/collections_helper_spec.rb

@@ -0,0 +1,129 @@
+require 'spec_helper'
+
+describe CollectionsHelper, type: :helper do
+  describe "has_collection_search_parameters?" do
+    subject { helper }
+
+    context "when cq is set" do
+      before { allow(helper).to receive(:params).and_return(cq: 'foo') }
+      it { is_expected.to have_collection_search_parameters }
+    end
+
+    context "when cq is not set" do
+      before { allow(helper).to receive(:params).and_return(cq: '') }
+      it { is_expected.not_to have_collection_search_parameters }
+    end
+  end
+
+  describe "button_for_create_collection" do
+    it "creates a button to the collections new path" do
+      str = String.new(helper.button_for_create_collection)
+      doc = Nokogiri::HTML(str)
+      form = doc.xpath('//form').first
+      expect(form.attr('action')).to eq(new_collection_path.to_s)
+      i = form.xpath('.//input').first
+      expect(i.attr('type')).to eq('submit')
+    end
+
+    it "creates a button with my text" do
+      str = String.new(helper.button_for_create_collection("Create My Button"))
+      doc = Nokogiri::HTML(str)
+      form = doc.xpath('//form').first
+      expect(form.attr('action')).to eq(new_collection_path.to_s)
+      i = form.xpath('.//input').first
+      expect(i.attr('value')).to eq('Create My Button')
+    end
+  end
+
+  describe "button_for_delete_collection" do
+    let(:collection) { FactoryGirl.create(:collection) }
+
+    it "creates a button to the collections delete path" do
+      str = button_for_delete_collection collection
+      doc = Nokogiri::HTML(str)
+      form = doc.xpath('//form').first
+      expect(form.attr('action')).to eq collection_path(collection)
+      i = form.xpath('.//input')[1]
+      expect(i.attr('type')).to eq('submit')
+    end
+    it "creates a button with my text" do
+      str = button_for_delete_collection collection, "Delete My Button"
+      doc = Nokogiri::HTML(str)
+      form = doc.xpath('//form').first
+      expect(form.attr('action')).to eq collection_path(collection)
+      i = form.xpath('.//input')[1]
+      expect(i.attr('value')).to eq("Delete My Button")
+    end
+  end
+
+  describe "button_for_remove_from_collection" do
+    let(:item) { double(id: 'changeme:123') }
+    let(:collection) { FactoryGirl.create(:collection) }
+
+    it "generates a form that can remove the item" do
+      str = button_for_remove_from_collection collection, item
+      doc = Nokogiri::HTML(str)
+      form = doc.xpath('//form').first
+      expect(form.attr('action')).to eq collection_path(collection)
+      expect(form.css('input#collection_members[type="hidden"][value="remove"]')).not_to be_empty
+      expect(form.css('input[type="hidden"][name="batch_document_ids[]"][value="changeme:123"]')).not_to be_empty
+    end
+
+    describe "for a collection of another name" do
+      before(:all) do
+        class OtherCollection < ActiveFedora::Base
+          include CurationConcerns::Collection
+          include Hydra::Works::WorkBehavior
+        end
+      end
+
+      let!(:collection) { OtherCollection.create! }
+
+      after(:all) do
+        Object.send(:remove_const, :OtherCollection)
+      end
+
+      it "generates a form that can remove the item" do
+        str = button_for_remove_from_collection collection, item
+        doc = Nokogiri::HTML(str)
+        form = doc.xpath('//form').first
+        expect(form.attr('action')).to eq collection_path(collection)
+        expect(form.css('input#collection_members[type="hidden"][value="remove"]')).not_to be_empty
+        expect(form.css('input[type="hidden"][name="batch_document_ids[]"][value="changeme:123"]')).not_to be_empty
+      end
+    end
+  end
+
+  describe "button_for_remove_selected_from_collection" do
+    let(:collection) { FactoryGirl.create(:collection) }
+
+    it "creates a button to the collections delete path" do
+      str = button_for_remove_selected_from_collection collection
+      doc = Nokogiri::HTML(str)
+      form = doc.xpath('//form').first
+      expect(form.attr('action')).to eq collection_path(collection)
+      i = form.xpath('.//input')[2]
+      expect(i.attr('value')).to eq("remove")
+      expect(i.attr('name')).to eq("collection[members]")
+    end
+
+    it "creates a button with my text" do
+      str = button_for_remove_selected_from_collection collection, "Remove My Button"
+      doc = Nokogiri::HTML(str)
+      form = doc.css('form').first
+      expect(form.attr('action')).to eq collection_path(collection)
+      expect(form.css('input[type="submit"]').attr('value').value).to eq "Remove My Button"
+    end
+  end
+
+  describe "hidden_collection_members" do
+    before { helper.params[:batch_document_ids] = ['foo:12', 'foo:23'] }
+    it "makes hidden fields" do
+      doc = Nokogiri::HTML(hidden_collection_members)
+      inputs = doc.xpath('//input[@type="hidden"][@name="batch_document_ids[]"]')
+      expect(inputs.length).to eq(2)
+      expect(inputs[0].attr('value')).to eq('foo:12')
+      expect(inputs[1].attr('value')).to eq('foo:23')
+    end
+  end
+end

data/spec/helpers/curation_concerns/collections_helper_spec.rb

@@ -26,8 +26,8 @@ describe CurationConcerns::CollectionsHelper do
     it 'has a form that routes to remove the collectible' do
       expect(subject).to have_selector 'a[data-method=put]'
       expect(subject).to have_link 'Remove From Collection',
-                                   href: collections.collection_path('123', collection: { members: 'remove' },
-                                                                            batch_document_ids: ['456'])
+                                   href: collection_path('123', collection: { members: 'remove' },
+                                                                batch_document_ids: ['456'])
     end
   end
 

data/spec/helpers/render_constraints_helper_spec.rb

@@ -1,6 +1,11 @@
 require 'spec_helper'
 
 describe CurationConcernsHelper do
+  let(:search_params) do
+    ActionController::Parameters.new(q: 'Simon',
+                                     search_field: 'publisher',
+                                     controller: 'catalog')
+  end
   describe 'render_constraints_query' do
     before do
       # Stub methods from Blacklight::SearchFields
@@ -8,12 +13,29 @@ describe CurationConcernsHelper do
       allow(helper).to receive(:label_for_search_field).and_return('Foo')
     end
 
-    let(:search_params) { { q: 'Simon', search_field: 'publisher', controller: 'catalog' } }
     subject { helper.render_constraints_query(search_params) }
 
     it 'removes search_field' do
       node = Capybara::Node::Simple.new(subject)
       expect(node).to have_link 'Remove constraint Foo: Simon', href: search_catalog_path
     end
+
+    it 'calls remove_constraint_url' do
+      expect(helper).to receive(:remove_constraint_url).and_return('/hello')
+      expect(subject).to include 'href="/hello"'
+    end
+  end
+
+  describe 'remove_constraint_url' do
+    subject { helper.remove_constraint_url(search_params) }
+    it 'calls fields_to_exclude_from_constraint_element' do
+      expect(helper).to receive(:fields_to_exclude_from_constraint_element).and_return([])
+      expect(subject).to eq "/catalog?search_field=publisher"
+    end
+  end
+
+  describe 'fields_to_exclude_from_constraint_element' do
+    subject { helper.fields_to_exclude_from_constraint_element }
+    it { is_expected.to eq [:search_field] }
   end
 end

data/spec/lib/curation_concerns/collections/search_service_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe CurationConcerns::Collections::SearchService do
+  before do
+    @login = 'vanessa'
+    @session = { history: [17, 14, 12, 9] }
+    @service = described_class.new(@session, @login)
+  end
+
+  it "gets the documents for the first history entry" do
+    expect(Search).to receive(:find).with(17).and_return(Search.new(query_params: { q: "World Peace" }))
+    expect(@service).to receive(:get_search_results).and_return([:one, [:doc1, :doc2]])
+    expect(@service.last_search_documents).to eq([:doc1, :doc2])
+  end
+
+  describe 'apply_gated_search' do
+    before(:each) do
+      allow(RoleMapper).to receive(:roles).with(@login).and_return(['umg/test.group.1'])
+      params = @service.apply_gated_search({}, {})
+      @group_query = params[:fq].first.split(' OR ')[1]
+    end
+    it "escapes slashes in groups" do
+      expect(@group_query).to eq('edit_access_group_ssim:umg\/test.group.1')
+    end
+    it "allows overriding Solr's access control suffix" do
+      allow_any_instance_of(described_class).to receive(:solr_access_control_suffix).and_return("edit_group_customfield")
+      @service = described_class.new({}, '')
+      params = @service.apply_gated_search({}, {})
+      @public_query = params[:fq].first.split(' OR ')[0]
+      expect(@public_query).to eq('edit_group_customfield:public')
+    end
+  end
+end

data/spec/models/collection_spec.rb

@@ -0,0 +1,165 @@
+require 'spec_helper'
+
+describe Collection, type: :model do
+  let(:gf1) { create(:generic_work, user: user) }
+  let(:gf2) { create(:generic_work, user: user) }
+  let(:gf3) { create(:generic_work, user: user) }
+
+  let(:user) { FactoryGirl.create(:user) }
+
+  before do
+    subject.title = ['Some title']
+    subject.apply_depositor_metadata(user)
+  end
+
+  describe "#to_solr" do
+    let(:collection) { FactoryGirl.build(:collection, user: user, title: ['A good title']) }
+
+    let(:solr_document) { collection.to_solr }
+
+    it "has title information" do
+      expect(solr_document).to include 'title_tesim' => ['A good title'],
+                                       'title_sim' => ['A good title']
+    end
+
+    it "has depositor information" do
+      expect(solr_document).to include 'depositor_tesim' => [user.user_key],
+                                       'depositor_ssim' => [user.user_key]
+    end
+
+    context "with members" do
+      before do
+        collection.members << gf1
+      end
+    end
+  end
+
+  describe "#depositor" do
+    before do
+      subject.apply_depositor_metadata(user)
+    end
+
+    it "has a depositor" do
+      expect(subject.depositor).to eq(user.user_key)
+    end
+  end
+
+  describe "the ability" do
+    let(:collection) { described_class.create(title: ['Some title']) { |c| c.apply_depositor_metadata(user) } }
+
+    let(:ability) { Ability.new(user) }
+
+    it "allows the depositor to edit and read" do
+      expect(ability.can?(:read, collection)).to be true
+      expect(ability.can?(:edit, collection)).to be true
+    end
+  end
+
+  describe "#members" do
+    it "is empty by default" do
+      expect(subject.members).to be_empty
+    end
+
+    context "adding members" do
+      context "using assignment" do
+        subject { described_class.create!(title: ['Some title'], members: [gf1, gf2]) { |c| c.apply_depositor_metadata(user) } }
+
+        it "has many files" do
+          expect(subject.reload.members).to eq [gf1, gf2]
+        end
+      end
+
+      context "using append" do
+        before do
+          subject.members = [gf1]
+          subject.save
+        end
+        it "allows new files to be added" do
+          subject.reload
+          subject.members << gf2
+          subject.save
+          expect(subject.reload.members).to eq [gf1, gf2]
+        end
+
+        it "allows multiple files to be added" do
+          subject.reload
+          subject.add_members [gf2.id, gf3.id]
+          subject.save
+          expect(subject.reload.members).to eq [gf1, gf2, gf3]
+        end
+      end
+    end
+
+    context "removing members" do
+      before do
+        subject.members = [gf1, gf2]
+        subject.save!
+      end
+
+      it "allows files to be removed" do
+        # force the "in_collections" to be cached:
+        expect(gf1.in_collections).to eq [subject]
+
+        # We need to ensure that deleting causes the collection to be flushed.
+        subject.reload.members.delete(gf1)
+        subject.save
+        expect(subject.reload.members).to eq [gf2]
+      end
+    end
+  end
+
+  it "has a title" do
+    subject.title = ["title"]
+    subject.save
+    expect(subject.reload.title).to eq ["title"]
+  end
+
+  it "has a description" do
+    subject.title = ["title"]
+    subject.description = ["description"]
+    subject.save
+    expect(subject.reload.description).to eq ["description"]
+  end
+
+  describe "#destroy" do
+    before do
+      subject.members = [gf1, gf2]
+      subject.save
+      subject.destroy
+    end
+
+    it "does not delete member files when deleted" do
+      expect(GenericWork.exists?(gf1.id)).to be true
+      expect(GenericWork.exists?(gf2.id)).to be true
+    end
+  end
+
+  describe "Collection by another name" do
+    before do
+      class OtherCollection < ActiveFedora::Base
+        include CurationConcerns::Collection
+      end
+
+      class Member < ActiveFedora::Base
+        include Hydra::Works::WorkBehavior
+      end
+    end
+    after do
+      Object.send(:remove_const, :OtherCollection)
+      Object.send(:remove_const, :Member)
+    end
+
+    let(:member) { Member.create }
+    let(:collection) { OtherCollection.new }
+
+    before do
+      collection.members << member
+      collection.save
+    end
+
+    it "have members that know about the collection" do
+      member.reload
+      expect(member.in_collections).to eq [collection]
+    end
+  end
+end

data/spec/tasks/rake_spec.rb

@@ -6,7 +6,7 @@ describe 'Rake tasks' do
     let(:namespaced_id) { 'curation_concerns:123' }
     let(:corrected_id)  { '123' }
     before do
-      load File.expand_path('../../../curation_concerns-models/lib/tasks/migrate.rake', __FILE__)
+      load File.expand_path('../../../lib/tasks/migrate.rake', __FILE__)
       Rake::Task.define_task(:environment)
     end
 

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -1,7 +1,7 @@
 require 'rails/generators'
 
 class TestAppGenerator < Rails::Generators::Base
-  source_root '../../spec/test_app_templates'
+  source_root File.expand_path("../../../../spec/test_app_templates", __FILE__)
 
   def install_engine
     generate 'curation_concerns:install', '-f'

data/spec/views/curation_concerns/base/_form_permission.html.erb_spec.rb

@@ -3,7 +3,10 @@ require 'spec_helper'
 describe 'curation_concerns/base/_form_permission.html.erb' do
   let(:curation_concern) { GenericWork.new }
   before do
-    f = double('form', object: curation_concern, object_name: nil, input: nil)
+    f = double('form', object: curation_concern,
+                       object_name: nil,
+                       input: nil,
+                       radio_button: nil)
     render partial: "curation_concerns/base/form_permission", locals: { f: f }
   end
 

data/spec/views/curation_concerns/file_sets/show.html.erb_spec.rb

@@ -38,6 +38,7 @@ describe 'curation_concerns/file_sets/show.html.erb', type: :view do
 
   describe 'title heading' do
     before do
+      stub_template 'shared/_brand_bar.html.erb' => 'Brand Bar'
       stub_template 'shared/_title_bar.html.erb' => 'Title Bar'
       render template: 'curation_concerns/file_sets/show.html.erb', layout: 'layouts/curation_concerns'
     end

data/spec/views/shared/_add_content.html.erb_spec.rb

@@ -16,7 +16,7 @@ describe 'shared/_add_content.html.erb' do
       CurationConcerns.config.curation_concerns.each do |curation_concern_type|
         expect(rendered).to have_link("New #{curation_concern_type.human_readable_type}", href: new_polymorphic_path(curation_concern_type))
       end
-      expect(rendered).to have_link('Add a Collection', href: collections.new_collection_path)
+      expect(rendered).to have_link('Add a Collection', href: new_collection_path)
     end
   end
 
@@ -32,7 +32,7 @@ describe 'shared/_add_content.html.erb' do
       CurationConcerns.config.curation_concerns.each do |curation_concern_type|
         expect(rendered).not_to have_link("New #{curation_concern_type.human_readable_type}", href: new_polymorphic_path(curation_concern_type))
       end
-      expect(rendered).to have_link('Add a Collection', href: collections.new_collection_path)
+      expect(rendered).to have_link('Add a Collection', href: new_collection_path)
     end
   end
 
@@ -49,7 +49,7 @@ describe 'shared/_add_content.html.erb' do
       CurationConcerns.config.curation_concerns.each do |curation_concern_type|
         expect(rendered).not_to have_link("New #{curation_concern_type.human_readable_type}", href: new_polymorphic_path(curation_concern_type))
       end
-      expect(rendered).not_to have_link('Add a Collection', href: collections.new_collection_path)
+      expect(rendered).not_to have_link('Add a Collection', href: new_collection_path)
     end
   end
 end