sufia 7.0.0 → 7.1.0

data/lib/generators/sufia/templates/config/sufia.rb

@@ -75,6 +75,11 @@ Sufia.config do |config|
   # The default is true.
   # config.active_deposit_agreement_acceptance = true
 
+  # Should work creation require file upload, or can a work be created first
+  # and a file added at a later time?
+  # The default is true.
+  # config.work_requires_files = true
+
   # Should a button with "Share my work" show on the front page to all users (even those not logged in)?
   # config.always_display_share_button = true
 

data/lib/sufia/configuration.rb

@@ -63,6 +63,12 @@ module Sufia
       @active_deposit_agreement_acceptance
     end
 
+    attr_writer :work_requires_files
+    def work_requires_files
+      return true if @work_requires_files.nil?
+      @work_requires_files
+    end
+
     attr_writer :batch_user_key
     def batch_user_key
       @batch_user_key ||= 'batchuser@example.com'

data/lib/sufia/engine.rb

@@ -7,7 +7,6 @@ module Sufia
     require 'jquery-ui-rails'
     require 'flot-rails'
     require 'almond-rails'
-    require 'zeroclipboard-rails'
 
     config.autoload_paths += %W(
       #{config.root}/app/controllers/concerns
@@ -58,7 +57,6 @@ module Sufia
       app.config.assets.paths << config.root.join('app', 'assets', 'images', 'site_images')
 
       app.config.assets.precompile << /fontawesome-webfont\.(?:svg|ttf|woff)$/
-      app.config.assets.precompile += %w( ZeroClipboard.swf )
       app.config.assets.precompile += %w(*.png *.jpg *.ico *.gif *.svg)
 
       Sprockets::ES6.configuration = { 'modules' => 'amd', 'moduleIds' => true }

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = '7.0.0'.freeze
+  VERSION = '7.1.0'.freeze
 end

data/spec/features/search_spec.rb

@@ -1,8 +1,11 @@
 describe 'searching' do
   let(:user) { create :user }
-  let(:subject_value) { 'fffzzz' }
+  let(:subject_value) { 'mustache' }
   let!(:work) do
-    create(:public_work, title: ["Toothbrush"], keyword: [subject_value], user: user)
+    create(:public_work,
+           title: ["Toothbrush"],
+           keyword: [subject_value, 'taco'],
+           user: user)
   end
 
   let!(:collection) do
@@ -44,6 +47,8 @@ describe 'searching' do
       expect(page).to have_content "Toothbrush"
       expect(page).to have_content('collection title abc')
       expect(page).to have_css("span.collection-icon-search")
+
+      expect(page.body).to include "<span itemprop=\"keywords\"><a href=\"/catalog?f%5Bkeyword_sim%5D%5B%5D=taco\">taco</a></span> and <span itemprop=\"keywords\"><a href=\"/catalog?f%5Bkeyword_sim%5D%5B%5D=mustache\">mustache</a></span>"
     end
 
     it "does not display search options for dashboard files" do

data/spec/forms/sufia/forms/work_form_spec.rb

@@ -0,0 +1,20 @@
+describe Sufia::Forms::WorkForm do
+  let(:work) { GenericWork.new }
+  let(:form) { described_class.new(work, nil) }
+  let(:works) { [GenericWork.new, FileSet.new, GenericWork.new] }
+  let(:files) { [FileSet.new, GenericWork.new, FileSet.new] }
+
+  describe "#ordered_fileset_members" do
+    it "expects ordered fileset members" do
+      allow(work).to receive(:ordered_members).and_return(files)
+      expect(form.ordered_fileset_members.size).to eq(2)
+    end
+  end
+
+  describe "#ordered_work_members" do
+    it "expects ordered work members" do
+      allow(work).to receive(:ordered_members).and_return(works)
+      expect(form.ordered_work_members.size).to eq(2)
+    end
+  end
+end

data/spec/javascripts/helpers/test_fixtures.js.coffee

@@ -0,0 +1,9 @@
+window.TestFixtures = {
+  relationships_table: {
+    child_id: 'child1234',
+    parent_id: 'parent5678'
+  }
+}
+
+window.TestFixtures.relationships_table["html"] = "<form action='/concern/generic_works/#{TestFixtures.relationships_table.child_id}'><table class='table table-striped related-files relationships-ajax-enabled' data-query-url='/concern/generic_works/$id'> <thead> <tr> <th>Parent Work</th> <th>Actions</th> </tr> </thead> <tbody> <tr class='new-row'> <td> <a href='' class='title hidden'></a> <input class='new-form-control string multi_value optional related_works_ids form-control multi-text-field' name='generic_work[in_works_ids][]' value='' aria-labelledby='generic_work_in_works_ids_label' type='text'> <div class='message has-warning hidden'></div> </td> <td> <div class='child-actions'> <a href='' class='edit hidden btn btn-default' target='_blank'>Edit</a> <a class='btn btn-danger btn-remove-row hidden'>Remove</a> <a class='btn btn-primary btn-add-row'>Add</a></div></td></tr></tbody></table></form>"
+

data/spec/javascripts/helpers/test_responses.js

@@ -1,8 +1,13 @@
 var TestResponses = {
-  single_use_link: {
-    success: {
-      status: 200,
-      responseText: "http://test.host/single_use_linkabc123"
-    }
+  relationships_table: {
+    query_url_success: {
+        id: "parent5678",
+        title: ["Parent"]
+    },
+    ajax_add_success:{},
+    ajax_remove_success:{},
+    ajax_error: {
+      responseText: "Error"
+    },
   }
 }

data/spec/javascripts/relationships_table_spec.js.coffee

@@ -0,0 +1,83 @@
+describe 'RelationshipsTable', ->
+  control = require('sufia/relationships/table')
+  form = null
+  element = null
+  btn_remove = null
+  btn_add = null
+  btn_edit = null
+  input = null
+  message = null
+  test_fixtures = TestFixtures
+  test_responses = TestResponses
+  deferred_ajax = null
+
+  beforeEach ->
+    form = $(test_fixtures.relationships_table.html)
+    element = form.find("table")
+    btn_remove = element.find('.btn-remove-row')
+    btn_add = element.find('.btn-add-row')
+    btn_edit = element.find('.edit')
+    input = element.find('.new-form-control')
+    message = element.find('.message')
+    target = new control.RelationshipsTable(element)
+    jasmine.Ajax.install()
+    deferred_ajax = new jQuery.Deferred()
+    spyOn($,'ajax').and.returnValue(deferred_ajax)
+    spyOn($,'getJSON').and.callFake((url, success) ->
+      success(test_responses.relationships_table.query_url_success))
+
+  afterEach ->
+    jasmine.Ajax.uninstall()
+
+  describe 'when adding/removing a row', ->
+    # the new-row is properly rendered
+    it 'only displays one new row with an add button visible', ->
+      expect(btn_remove.hasClass("hidden")).toBeTruthy()
+      expect(btn_edit.hasClass("hidden")).toBeTruthy()
+      expect(btn_add.hasClass("hidden")).toBeFalsy()
+
+    it 'clicks add with a valid id', ->
+      input.val(test_fixtures.relationships_table.parent_id)
+      btn_add.click()
+      deferred_ajax.resolve(test_responses.relationships_table.ajax_add_success)
+      expect(message.hasClass("hidden")).toBeTruthy()
+      expect(element.find("tbody tr").length).toEqual(2)
+
+    it 'clicks add with an invalid id', ->
+      input.val('invalid')
+      btn_add.click()
+      deferred_ajax.reject(test_responses.relationships_table.ajax_error)
+      expect(message.hasClass("hidden")).toBeFalsy()
+      expect(element.find("tbody tr").length).toEqual(1)
+
+    it 'clicks add without an id', ->
+      expect(message.hasClass("hidden")).toBeTruthy()
+      btn_add.click()
+      expect(message.hasClass("hidden")).toBeFalsy()
+      expect(message.text()).toContain("ID cannot be empty")
+      expect(element.find("tbody tr").length).toEqual(1)
+
+    it 'clicks remove to remove a work', ->
+      input.val(test_fixtures.relationships_table.parent_id)
+      btn_add.click()
+      deferred_ajax.resolve(test_responses.relationships_table.ajax_add_success)
+      expect(element.find("tbody tr").length).toEqual(2)
+      parent_row = element.find("tbody tr:first")
+      parent_delete = parent_row.find(".btn-remove-row")
+      parent_delete.click()
+      deferred_ajax.resolve(test_responses.relationships_table.ajax_remove_success)
+      expect(element.find("tbody tr").length).toEqual(1)
+
+    it 'clicks add with a duplicate id', ->
+      input.val(test_fixtures.relationships_table.parent_id)
+      btn_add.click()
+      deferred_ajax.resolve(test_responses.relationships_table.ajax_add_success)
+      expect(element.find("tbody tr").length).toEqual(2)
+      input = element.find("tbody tr:nth-child(2) .new-form-control")
+      input.val(test_fixtures.relationships_table.parent_id)
+      btn_add = element.find("tbody tr:nth-child(2) .btn-add-row")
+      btn_add.click()
+      message = element.find("tbody tr:nth-child(2) .message")
+      expect(element.find("tbody tr").length).toEqual(2)
+      expect(message.hasClass("hidden")).toBeFalsy()
+      expect(message.text()).toContain("Work is already related")

data/spec/javascripts/save_work_spec.js

@@ -98,7 +98,8 @@ describe("SaveWorkControl", function() {
       beforeEach(function() {
         target = buildTarget(form_id)
         target.uploads = {
-          hasFiles: true
+          hasFiles: true,
+          hasFileRequirement: true
         };
       });
       it("is complete", function() {
@@ -112,7 +113,8 @@ describe("SaveWorkControl", function() {
       beforeEach(function() {
         target = buildTarget(form_id)
         target.uploads = {
-          hasFiles: false
+          hasFiles: false,
+          hasFileRequirement: true
         };
       });
 

data/spec/javascripts/support/jasmine.yml

@@ -38,7 +38,7 @@ stylesheets:
 #   - helpers/**/*.js
 #
 helpers:
-  - 'helpers/**/*.js'
+  - 'helpers/**/*.{js,coffee,js.coffee}'
 
 # spec_files
 #

data/spec/javascripts/uploaded_files_spec.js

@@ -0,0 +1,23 @@
+describe("UploadedFiles", function() {
+  var control = require('sufia/save_work/uploaded_files');
+
+  describe("hasFileRequirement", function() {
+    describe("with required file element", function() {
+      it("returns true", function() {
+        var fixture = setFixtures('<form><ul class="requirements"><li class="incomplete" id="required-files">Add files</li></ul></form>');
+        var element = fixture.find('form');
+        target = new control.UploadedFiles(element);
+        expect(target.hasFileRequirement).toBe(true);
+      });
+    });
+
+    describe("without required file element", function() {
+      it("returns false", function() {
+        var fixture = setFixtures('<form><ul class="requirements"><li>Not files</li></ul></form>');
+        var element = fixture.find('form');
+        target = new control.UploadedFiles(element);
+        expect(target.hasFileRequirement).toBe(false);
+      });
+    });
+  });
+});

data/spec/views/batch_edits/edit.html.erb_spec.rb

@@ -4,7 +4,7 @@ describe 'batch_edits/edit.html.erb', type: :view do
   let(:form) { Sufia::Forms::BatchEditForm.new(generic_work, nil, batch) }
 
   before do
-    allow(GenericWork).to receive(:load_instance_from_solr).and_return(generic_work)
+    allow(GenericWork).to receive(:find).and_return(generic_work)
 
     # this prevents AF from hitting Fedora (permissions is a related object)
     allow(generic_work).to receive(:permissions_attributes=)

data/spec/views/catalog/index.html.erb_spec.rb

@@ -1,4 +1,3 @@
-
 describe 'catalog/index.html.erb', type: :view do
   let(:collection) { build(:collection, id: "abc123") }
   let(:doc) { SolrDocument.new(collection.to_solr) }
@@ -32,9 +31,6 @@ describe 'catalog/index.html.erb', type: :view do
     allow(resp).to receive(:limit_value).and_return(10)
     allow(resp).to receive(:empty?).and_return(false)
 
-    # This stubs out the SolrDocument#to_model
-    allow(ActiveFedora::Base).to receive(:load_instance_from_solr).with('abc123', doc).and_return(collection)
-
     assign(:document_list, [doc])
   end
 

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

@@ -0,0 +1,113 @@
+require 'spec_helper'
+
+describe "curation_concerns/base/_form_child_work_relationships.html.erb", type: :view do
+  let(:work) do
+    stub_model(GenericWork, id: '456', title: ["MyWork"])
+  end
+
+  let(:work_2) do
+    stub_model(GenericWork, id: '567', title: ["Child Work"])
+  end
+
+  let(:ability) { double }
+
+  let(:form) do
+    Sufia::Forms::WorkForm.new(work, ability)
+  end
+
+  let(:f) { double }
+
+  let(:page) do
+    render
+    Capybara::Node::Simple.new(rendered)
+  end
+
+  before do
+    view.lookup_context.view_paths.push 'app/views/curation_concerns'
+    allow(view).to receive(:params).and_return(id: work.id)
+    allow(view).to receive(:curation_concern).and_return(work)
+    allow(view).to receive(:f).and_return(f)
+    allow(f).to receive(:object).and_return(form)
+    allow(controller).to receive(:current_user).and_return(stub_model(User))
+    assign(:form, form)
+  end
+
+  context "When editing a work" do
+    context "and no children works are present" do
+      before do
+        allow(work).to receive(:ordered_members).and_return([])
+      end
+      it "has 1 empty child work input" do
+        expect(page).to have_selector("input[value='']", count: 1)
+      end
+
+      it "will not display the remove button in the actions" do
+        expect(page).to have_selector(".btn-remove-row", visible: false)
+      end
+
+      it "will display the add button in the actions" do
+        expect(page).to have_selector(".btn-add-row", visible: true, count: 1)
+      end
+    end
+    context "When 1 child work is present" do
+      let(:work_2) do
+        stub_model(GenericWork, id: '567', title: ["Test Child Work"])
+      end
+
+      before do
+        allow(work).to receive(:ordered_members).and_return([work_2])
+      end
+      it "has 1 empty child work input with add button" do
+        expect(page).to have_selector("input[value='']", count: 1)
+        expect(page).to have_selector(".btn-add-row", visible: true, count: 1)
+      end
+
+      it "has an input box that is filled in with the child id" do
+        expect(page).to have_selector("input[value='#{work_2.id}']", count: 1)
+      end
+
+      it "generates a link for the childs first title" do
+        expect(page).to have_link("Test Child Work")
+      end
+
+      it "has an edit and remove button" do
+        within ".old-row" do
+          expect(page).to have_selector(".btn-remove-row", visible: true, count: 1)
+          expect(page).to have_selector(".btn-edit-row", visible: true, count: 1)
+        end
+      end
+    end
+    context "When multiple child works are present" do
+      let(:work_2) do
+        stub_model(GenericWork, id: '567', title: ["Test Child Work"])
+      end
+      let(:work_3) do
+        stub_model(GenericWork, id: '789', title: ["Test Child Work 2"])
+      end
+      before do
+        allow(work).to receive(:ordered_members).and_return([work_2, work_3])
+      end
+      it "has 1 empty child work input with add button" do
+        expect(page).to have_selector("input[value='']", count: 1)
+        expect(page).to have_selector(".btn-add-row", visible: true, count: 1)
+      end
+
+      it "has an input box that is filled in with the child ids" do
+        expect(page).to have_selector("input[value='#{work_2.id}']", count: 1)
+        expect(page).to have_selector("input[value='#{work_3.id}']", count: 1)
+      end
+
+      it "generates a link for the childs first title" do
+        expect(page).to have_link("Test Child Work")
+        expect(page).to have_link("Test Child Work 2")
+      end
+
+      it "has an edit and remove button" do
+        within ".old-row" do
+          expect(page).to have_selector(".btn-remove-row", visible: true, count: 2)
+          expect(page).to have_selector(".btn-edit-row", visible: true, count: 2)
+        end
+      end
+    end
+  end
+end

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

@@ -4,20 +4,41 @@ describe 'curation_concerns/base/relationships', type: :view do
   let(:ability) { double }
   let(:solr_doc) { double(id: '123', human_readable_type: 'Work') }
   let(:presenter) { Sufia::WorkShowPresenter.new(solr_doc, ability) }
+  let(:generic_work) { GenericWork.new(id: '456', title: ['Containing work', 'barbaz']) }
+  let(:collection) { Collection.new(id: '345', title: ['Containing collection', 'foobar']) }
 
   context "when collections are not present" do
     before do
       render 'curation_concerns/base/relationships', presenter: presenter
     end
     it "shows the message" do
-      expect(rendered).to match %r{This Work is not currently in any collections\.}
+      expect(rendered).to match %r{There are no Collection relationships\.}
     end
   end
 
-  context "when collections are present" do
-    let(:collection_presenters) { [double(id: '456', title: ['Containing collection', 'foobar'], to_s: 'Containing collection')] }
+  context "when children are not present" do
+    before do
+      render 'curation_concerns/base/relationships', presenter: presenter
+    end
+    it "shows the message" do
+      expect(rendered).to match %r{This Work does not have any related works\.}
+    end
+  end
+
+  context "when parents are not present" do
+    before do
+      render 'curation_concerns/base/relationships', presenter: presenter
+    end
+    it "shows the message" do
+      expect(rendered).to match %r{There are no Generic work relationships\.}
+    end
+  end
+
+  context "when collections are present and no parents are present" do
+    let(:collection_presenters) { [collection] }
     let(:page) { Capybara::Node::Simple.new(rendered) }
     before do
+      allow(view).to receive(:contextual_path).and_return("/collections/456")
       allow(presenter).to receive(:collection_presenters).and_return(collection_presenters)
       render 'curation_concerns/base/relationships', presenter: presenter
     end
@@ -27,5 +48,70 @@ describe 'curation_concerns/base/relationships', type: :view do
     it "labels the link using the presenter's #to_s method" do
       expect(page).not_to have_content 'foobar'
     end
+    it "shows the empty messages for parents" do
+      expect(page).not_to have_content "There are no Collection relationships."
+      expect(page).to have_content "There are no Generic work relationships."
+    end
+  end
+
+  context "when parents are present and no collections are present" do
+    let(:collection_presenters) { [generic_work] }
+    let(:page) { Capybara::Node::Simple.new(rendered) }
+    before do
+      allow(view).to receive(:contextual_path).and_return("/concern/generic_works/456")
+      allow(presenter).to receive(:collection_presenters).and_return(collection_presenters)
+      render 'curation_concerns/base/relationships', presenter: presenter
+    end
+    it "links to work" do
+      expect(page).to have_link 'Containing work'
+    end
+    it "labels the link using the presenter's #to_s method" do
+      expect(page).not_to have_content 'barbaz'
+    end
+    it "shows the empty messages for collections" do
+      expect(page).to have_content "There are no Collection relationships."
+      expect(page).not_to have_content "There are no Generic work relationships."
+    end
+  end
+
+  context "when parents are present and collections are present" do
+    let(:collection_presenters) { [generic_work, collection] }
+    let(:page) { Capybara::Node::Simple.new(rendered) }
+    before do
+      allow(view).to receive(:contextual_path).and_return("/concern/generic_works/456")
+      allow(presenter).to receive(:collection_presenters).and_return(collection_presenters)
+      render 'curation_concerns/base/relationships', presenter: presenter
+    end
+    it "links to work and collection" do
+      expect(page).to have_link 'Containing work'
+      expect(page).to have_link 'Containing collection'
+    end
+    it "labels the link using the presenter's #to_s method" do
+      expect(page).not_to have_content 'barbaz'
+      expect(page).not_to have_content 'foobar'
+    end
+    it "does not show the empty messages" do
+      expect(page).not_to have_content "There are no Collection relationships."
+      expect(page).not_to have_content "There are no Generic work relationships."
+    end
+  end
+
+  context "when children are present" do
+    let(:member_presenters) { [generic_work] }
+    let(:page) { Capybara::Node::Simple.new(rendered) }
+    before do
+      allow(view).to receive(:contextual_path).and_return("/concern/generic_works/456")
+      allow(presenter).to receive(:member_presenters).and_return(member_presenters)
+      render 'curation_concerns/base/relationships', presenter: presenter
+    end
+    it "links to child work" do
+      expect(page).to have_link 'Containing work'
+    end
+    it "labels the link using the presenter's #to_s method" do
+      expect(page).not_to have_content 'barbaz'
+    end
+    it "does not show the empty message" do
+      expect(page).not_to have_content "This Work does not have any related works."
+    end
   end
 end