sufia 7.0.0 → 7.1.0

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

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe 'curation_concerns/file_sets/_single_use_links.html.erb', type: :view do
+  let(:user)          { create(:user) }
+  let(:file_set)      { build(:file_set, user: user, id: "1234") }
+  let(:solr_document) { SolrDocument.new(file_set.to_solr) }
+  let(:ability)       { Ability.new(user) }
+  let(:presenter)     { Sufia::FileSetPresenter.new(solr_document, ability) }
+
+  context "with no single-use links" do
+    before do
+      allow(presenter).to receive(:single_use_links).and_return([])
+      render 'curation_concerns/file_sets/single_use_links.html.erb', presenter: presenter
+    end
+    it "renders a table with no links" do
+      expect(rendered).to include("<tr><td>No links have been generated</td></tr>")
+    end
+  end
+
+  context "with single use links" do
+    let(:link)           { SingleUseLink.create(itemId: "1234", downloadKey: "sha2hashb") }
+    let(:link_presenter) { CurationConcerns::SingleUseLinkPresenter.new(link) }
+    before do
+      controller.params = { id: "1234" }
+      allow(presenter).to receive(:single_use_links).and_return([link_presenter])
+      render 'curation_concerns/file_sets/single_use_links.html.erb', presenter: presenter
+    end
+    it "renders a table with links" do
+      expect(rendered).to include("Link sha2ha expires in 23 hours")
+    end
+  end
+end

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

@@ -35,4 +35,8 @@ describe 'curation_concerns/file_sets/show.html.erb', type: :view do
       expect(rendered).to have_selector 'h1', text: 'My Title'
     end
   end
+
+  it "does not render single-use links" do
+    expect(rendered).not_to have_selector('table.single-use-links')
+  end
 end

data/spec/views/records/edit_fields/_in_works_ids.html.erb_spec.rb

@@ -0,0 +1,113 @@
+require 'spec_helper'
+
+describe "records/edit_fields/_in_works_ids.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
+    CurationConcerns::GenericWorkForm.new(work, ability)
+  end
+
+  let(:f) { double(object: form) }
+
+  let(:page) do
+    render
+    Capybara::Node::Simple.new(rendered)
+  end
+
+  before do
+    view.lookup_context.view_paths.push 'app/views/curation_concerns'
+    allow(::ActiveFedora::Base).to receive(:find).and_return(work_2)
+    allow(view).to receive(:curation_concern).and_return(work)
+    allow(view).to receive(:f).and_return(f)
+    allow(view).to receive(:key).and_return(:in_works_ids)
+    allow(controller).to receive(:current_user).and_return(stub_model(User))
+    assign(:form, form)
+  end
+
+  context "When editing a work" do
+    context "and no parents are present" do
+      before do
+        allow(work).to receive(:in_works).and_return([])
+      end
+      it "has 1 empty parent work input" do
+        expect(page).to have_selector("input[value='']", count: 1)
+      end
+
+      it "does not display the remove button in the actions" do
+        expect(page).to have_selector(".btn-remove-row", visible: false)
+      end
+
+      it "displays the add button in the actions" do
+        expect(page).to have_selector(".btn-add-row", visible: true, count: 1)
+      end
+    end
+    context "When 1 parent work is present" do
+      let(:work_2) do
+        stub_model(GenericWork, id: '567', title: ["Test Parent Work"])
+      end
+
+      before do
+        allow(work).to receive(:in_works).and_return([work_2])
+      end
+      it "has 1 empty parent 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 parent id" do
+        expect(page).to have_selector("input[value='#{work_2.id}']", count: 1)
+      end
+
+      it "generates a link for the parents first title" do
+        expect(page).to have_link("Test Parent 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 parent works are present" do
+      let(:work_2) do
+        stub_model(GenericWork, id: '567', title: ["Test Parent Work"])
+      end
+      let(:work_3) do
+        stub_model(GenericWork, id: '789', title: ["Test Parent Work 2"])
+      end
+      before do
+        allow(work).to receive(:in_works).and_return([work_2, work_3])
+      end
+      it "has 1 empty parent 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 parent 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 parents first title" do
+        expect(page).to have_link("Test Parent Work")
+        expect(page).to have_link("Test Parent 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/sufia.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.version       = Sufia::VERSION
   spec.license       = 'Apache2'
 
-  spec.add_dependency 'curation_concerns', '~> 1.1'
+  spec.add_dependency 'curation_concerns', '~> 1.3', '>= 1.3.3'
   spec.add_dependency 'hydra-batch-edit', '~> 2.0'
   spec.add_dependency 'browse-everything', '>= 0.10.3'
   spec.add_dependency 'blacklight-gallery', '~> 0.1'
@@ -40,7 +40,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'legato', '~> 0.3'
   spec.add_dependency 'posix-spawn'
   spec.add_dependency 'jquery-ui-rails', '~> 5.0'
-  spec.add_dependency 'zeroclipboard-rails', '~> 0.0.13'
   spec.add_dependency 'redis-namespace', '~> 1.5.2'
   spec.add_dependency 'flot-rails', '~> 0.0.6'
   spec.add_dependency 'almond-rails', '~> 0.0.1'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sufia
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.1.0
 platform: ruby
 authors:
 - Justin Coyne
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-01 00:00:00.000000000 Z
+date: 2016-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curation_concerns
@@ -20,14 +20,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: hydra-batch-edit
   requirement: !ruby/object:Gem::Requirement
@@ -334,20 +340,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: zeroclipboard-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.13
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.13
 - !ruby/object:Gem::Dependency
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
@@ -700,6 +692,9 @@ files:
 - app/assets/javascripts/sufia/permissions/registry_entry.es6
 - app/assets/javascripts/sufia/permissions/user_controls.es6
 - app/assets/javascripts/sufia/proxy_rights.js
+- app/assets/javascripts/sufia/relationships.js
+- app/assets/javascripts/sufia/relationships/table.es6
+- app/assets/javascripts/sufia/relationships/table_row.es6
 - app/assets/javascripts/sufia/save_work.es6
 - app/assets/javascripts/sufia/save_work/checklist_item.es6
 - app/assets/javascripts/sufia/save_work/deposit_agreement.es6
@@ -709,7 +704,6 @@ files:
 - app/assets/javascripts/sufia/save_work/visibility_component.es6
 - app/assets/javascripts/sufia/search.js
 - app/assets/javascripts/sufia/select_submit.js
-- app/assets/javascripts/sufia/single_use_link.js
 - app/assets/javascripts/sufia/sorting.js
 - app/assets/javascripts/sufia/tabs.js
 - app/assets/javascripts/sufia/trophy.js
@@ -1000,6 +994,7 @@ files:
 - app/views/curation_concerns/base/_browse_everything.html.erb
 - app/views/curation_concerns/base/_citations.html.erb
 - app/views/curation_concerns/base/_form.html.erb
+- app/views/curation_concerns/base/_form_child_work_relationships.html.erb
 - app/views/curation_concerns/base/_form_files.html.erb
 - app/views/curation_concerns/base/_form_metadata.html.erb
 - app/views/curation_concerns/base/_form_progress.html.erb
@@ -1010,6 +1005,10 @@ files:
 - app/views/curation_concerns/base/_items.html.erb
 - app/views/curation_concerns/base/_metadata.html.erb
 - app/views/curation_concerns/base/_relationships.html.erb
+- app/views/curation_concerns/base/_relationships_member_rows.html.erb
+- app/views/curation_concerns/base/_relationships_parent_row.html.erb
+- app/views/curation_concerns/base/_relationships_parent_row_empty.html.erb
+- app/views/curation_concerns/base/_relationships_parent_rows.html.erb
 - app/views/curation_concerns/base/_share_with.html.erb
 - app/views/curation_concerns/base/_show_actions.html.erb
 - app/views/curation_concerns/base/_social_media.html.erb
@@ -1033,6 +1032,8 @@ files:
 - app/views/curation_concerns/file_sets/_show_actions.html.erb
 - app/views/curation_concerns/file_sets/_show_characterization_details.html.erb
 - app/views/curation_concerns/file_sets/_show_details.html.erb
+- app/views/curation_concerns/file_sets/_single_use_link_rows.html.erb
+- app/views/curation_concerns/file_sets/_single_use_links.html.erb
 - app/views/curation_concerns/file_sets/_versioning.html.erb
 - app/views/curation_concerns/file_sets/edit.html.erb
 - app/views/curation_concerns/file_sets/jq_upload.json.jbuilder
@@ -1087,6 +1088,7 @@ files:
 - app/views/records/edit_fields/_based_near.html.erb
 - app/views/records/edit_fields/_default.html.erb
 - app/views/records/edit_fields/_description.html.erb
+- app/views/records/edit_fields/_in_works_ids.html.erb
 - app/views/records/edit_fields/_language.html.erb
 - app/views/records/edit_fields/_resource_type.html.erb
 - app/views/records/edit_fields/_rights.html.erb
@@ -1336,6 +1338,7 @@ files:
 - spec/forms/sufia/forms/batch_edit_form_spec.rb
 - spec/forms/sufia/forms/batch_upload_form_spec.rb
 - spec/forms/sufia/forms/collection_form_spec.rb
+- spec/forms/sufia/forms/work_form_spec.rb
 - spec/helpers/batch_edits_helper_spec.rb
 - spec/helpers/blacklight_helper_spec.rb
 - spec/helpers/content_block_helper_spec.rb
@@ -1349,13 +1352,15 @@ files:
 - spec/javascripts/grant_spec.js
 - spec/javascripts/helpers/jasmine-ajax.js
 - spec/javascripts/helpers/jasmine-jquery.js
+- spec/javascripts/helpers/test_fixtures.js.coffee
 - spec/javascripts/helpers/test_responses.js
 - spec/javascripts/jasmine_spec.rb
+- spec/javascripts/relationships_table_spec.js.coffee
 - spec/javascripts/save_work_spec.js
-- spec/javascripts/single_use_link_spec.js.coffee
 - spec/javascripts/support/jasmine.yml
 - spec/javascripts/support/jasmine_helper.rb
 - spec/javascripts/tabs_spec.js.coffee
+- spec/javascripts/uploaded_files_spec.js
 - spec/jobs/attach_files_to_work_job_spec.rb
 - spec/jobs/batch_create_job_spec.rb
 - spec/jobs/content_delete_event_job_spec.rb
@@ -1470,6 +1475,7 @@ files:
 - spec/views/curation_concerns/base/_browse_everything.html.erb_spec.rb
 - spec/views/curation_concerns/base/_citations.html.erb_spec.rb
 - spec/views/curation_concerns/base/_form.html.erb_spec.rb
+- spec/views/curation_concerns/base/_form_child_work_relationships.html.erb_spec.rb
 - spec/views/curation_concerns/base/_form_progress.html.erb_spec.rb
 - spec/views/curation_concerns/base/_relationships.html.erb_spec.rb
 - spec/views/curation_concerns/base/edit.html.erb_spec.rb
@@ -1478,6 +1484,7 @@ files:
 - spec/views/curation_concerns/file_sets/_permission_form.html.erb_spec.rb
 - spec/views/curation_concerns/file_sets/_show_actions.html.erb_spec.rb
 - spec/views/curation_concerns/file_sets/_show_characterization_details.html.erb_spec.rb
+- spec/views/curation_concerns/file_sets/_single_use_links.html.erb_spec.rb
 - spec/views/curation_concerns/file_sets/_versioning.html.erb_spec.rb
 - spec/views/curation_concerns/file_sets/show.html.erb_spec.rb
 - spec/views/curation_concerns/permissions/confirm.html.erb_spec.rb
@@ -1486,6 +1493,7 @@ files:
 - spec/views/my/_list_works.html.erb_spec.rb
 - spec/views/my/facet.html.erb_spec.rb
 - spec/views/records/edit_fields/_based_near.html.erb_spec.rb
+- spec/views/records/edit_fields/_in_works_ids.html.erb_spec.rb
 - spec/views/records/edit_fields/_language.html.erb_spec.rb
 - spec/views/records/edit_fields/_subject.html.erb_spec.rb
 - spec/views/stats_file.html.erb_spec.rb
@@ -1641,6 +1649,7 @@ test_files:
 - spec/forms/sufia/forms/batch_edit_form_spec.rb
 - spec/forms/sufia/forms/batch_upload_form_spec.rb
 - spec/forms/sufia/forms/collection_form_spec.rb
+- spec/forms/sufia/forms/work_form_spec.rb
 - spec/helpers/batch_edits_helper_spec.rb
 - spec/helpers/blacklight_helper_spec.rb
 - spec/helpers/content_block_helper_spec.rb
@@ -1654,13 +1663,15 @@ test_files:
 - spec/javascripts/grant_spec.js
 - spec/javascripts/helpers/jasmine-ajax.js
 - spec/javascripts/helpers/jasmine-jquery.js
+- spec/javascripts/helpers/test_fixtures.js.coffee
 - spec/javascripts/helpers/test_responses.js
 - spec/javascripts/jasmine_spec.rb
+- spec/javascripts/relationships_table_spec.js.coffee
 - spec/javascripts/save_work_spec.js
-- spec/javascripts/single_use_link_spec.js.coffee
 - spec/javascripts/support/jasmine.yml
 - spec/javascripts/support/jasmine_helper.rb
 - spec/javascripts/tabs_spec.js.coffee
+- spec/javascripts/uploaded_files_spec.js
 - spec/jobs/attach_files_to_work_job_spec.rb
 - spec/jobs/batch_create_job_spec.rb
 - spec/jobs/content_delete_event_job_spec.rb
@@ -1775,6 +1786,7 @@ test_files:
 - spec/views/curation_concerns/base/_browse_everything.html.erb_spec.rb
 - spec/views/curation_concerns/base/_citations.html.erb_spec.rb
 - spec/views/curation_concerns/base/_form.html.erb_spec.rb
+- spec/views/curation_concerns/base/_form_child_work_relationships.html.erb_spec.rb
 - spec/views/curation_concerns/base/_form_progress.html.erb_spec.rb
 - spec/views/curation_concerns/base/_relationships.html.erb_spec.rb
 - spec/views/curation_concerns/base/edit.html.erb_spec.rb
@@ -1783,6 +1795,7 @@ test_files:
 - spec/views/curation_concerns/file_sets/_permission_form.html.erb_spec.rb
 - spec/views/curation_concerns/file_sets/_show_actions.html.erb_spec.rb
 - spec/views/curation_concerns/file_sets/_show_characterization_details.html.erb_spec.rb
+- spec/views/curation_concerns/file_sets/_single_use_links.html.erb_spec.rb
 - spec/views/curation_concerns/file_sets/_versioning.html.erb_spec.rb
 - spec/views/curation_concerns/file_sets/show.html.erb_spec.rb
 - spec/views/curation_concerns/permissions/confirm.html.erb_spec.rb
@@ -1791,6 +1804,7 @@ test_files:
 - spec/views/my/_list_works.html.erb_spec.rb
 - spec/views/my/facet.html.erb_spec.rb
 - spec/views/records/edit_fields/_based_near.html.erb_spec.rb
+- spec/views/records/edit_fields/_in_works_ids.html.erb_spec.rb
 - spec/views/records/edit_fields/_language.html.erb_spec.rb
 - spec/views/records/edit_fields/_subject.html.erb_spec.rb
 - spec/views/stats_file.html.erb_spec.rb

data/app/assets/javascripts/sufia/single_use_link.js

@@ -1,30 +0,0 @@
-function getSingleUse(item, fn) {
-  var url = $(item).data('generate-single-use-link-url');
-  if (!url) {
-    alert("No url was provided for generating a single use link");
-    return;
-  }
-  
-  $.post(url, null, null, 'text').done(function(data) { fn(data) })
-}
-
-// A Turbolinks-enabled link has been clicked 
-document.addEventListener("page:before-change", function(){
-  ZeroClipboard.destroy();
-});
-
-Blacklight.onLoad(function() {
-  $.each($(".copypaste"), function(idx, item) {
-    var clip = new ZeroClipboard(this);
-
-    clip.on("dataRequested", function(client, args) {
-      getSingleUse(item, function(data) { 
-        client.setText(data)
-      });
-    });
-
-    clip.on("complete", function(client, args) {
-      alert("A single use link to " + args.text + " was copied to your clipboard.");
-    });
-  });
-});

data/spec/javascripts/single_use_link_spec.js.coffee

@@ -1,21 +0,0 @@
-describe "single use link", ->
-
-    beforeEach ->
-      # setup two inputs for us to attach  auto complete to
-      setFixtures  '<a id="test_link" data-generate-single-use-link-url="/single_use_link/generate_show/abc123" />'
-      jasmine.Ajax.install();
-
-    # call ajax to get a link
-    it "calls for the expected link", ->
-      onSuccess = jasmine.createSpy('onSuccess')
-      # get the single use link
-      getSingleUse $('#test_link'), onSuccess
-
-      request = jasmine.Ajax.requests.mostRecent()
-      request.respondWith(TestResponses.single_use_link.success)
-
-
-      # verify the correct request was made
-      expect(request.url).toBe('/single_use_link/generate_show/abc123')
-      expect(request.method).toBe('POST')
-      expect(onSuccess).toHaveBeenCalledWith('http://test.host/single_use_linkabc123')