curation_concerns 0.12.0.pre8 → 0.12.0.pre9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e81fd9998236bbf1d83f58c8260bd58792a2761
-  data.tar.gz: e5687797edb64acd557ecb35efe1cc98b0697434
+  metadata.gz: 6eab5f25a1495de88c62656c40d9261594057c45
+  data.tar.gz: d2cc26ee39bd02be81ade88945c8ef17082f6eb1
 SHA512:
-  metadata.gz: d7612adacda225e98429b99365ff1893b4941140f94acf23a94d79583e4bc93e0403fb358712d36ff6a43356859773772c4f410d63cb807fab86fc804bde3502
-  data.tar.gz: 21c5c4454f410f260015a7457cc05babc47617452f776fede66c7697ca6d881c99f113b6414669eb9c38f5941d720d323ab7936b26611bef3042db38f961dd05
+  metadata.gz: cdb783ae9f39849fe73f11ececb03330d491632dc0cec1e9d522070d547ebd06bc28728d7162d61907660361b88e59f25fc1571fbed711945415244f66c9b8e6
+  data.tar.gz: b042084b5e0fe0509620b6b6fe42b82f595b22317df8b1a664591e7f6885e97ca4d9c0b3abd15a7aa1e9380acdaad8f73aa796136453a463b499024cc7fa2f4d

data/app/actors/curation_concerns/file_set_actor.rb

@@ -76,6 +76,7 @@ module CurationConcerns
     end
 
     def destroy
+      unlink_from_work
       file_set.destroy
       CurationConcerns.config.callback.run(:after_destroy, file_set.id, user)
     end
@@ -142,5 +143,17 @@ module CurationConcerns
         return unless work.thumbnail_id.blank?
         work.thumbnail = file_set
       end
+
+      def unlink_from_work
+        work = file_set.in_works.first
+        return unless work && (work.thumbnail_id == file_set.id || work.representative_id == file_set.id)
+        # This is required to clear the thumbnail_id and representative_id fields on the work
+        # and force it to be re-solrized. Although ActiveFedora::Aggregation clears the
+        # children nodes it leaves the GenericWork.thumbnail_id and GenericWork.representative_id
+        # fields in Solr populated.
+        work.thumbnail = nil if work.thumbnail_id == file_set.id
+        work.representative = nil if work.representative_id == file_set.id
+        work.save!
+      end
   end
 end

data/app/controllers/concerns/curation_concerns/single_use_links_controller_behavior.rb

@@ -15,24 +15,14 @@ module CurationConcerns
       end
     end
 
-    def new_download
+    def create_download
       @su = SingleUseLink.create itemId: params[:id], path: main_app.download_path(id: asset)
-      @link = curation_concerns.download_single_use_link_path(@su.downloadKey)
-
-      respond_to do |format|
-        format.html
-        format.js { render js: @link }
-      end
+      render text: curation_concerns.download_single_use_link_url(@su.downloadKey)
     end
 
-    def new_show
+    def create_show
       @su = SingleUseLink.create itemId: params[:id], path: polymorphic_path([main_app, asset])
-      @link = curation_concerns.show_single_use_link_path(@su.downloadKey)
-
-      respond_to do |format|
-        format.html
-        format.js { render js: @link }
-      end
+      render text: curation_concerns.show_single_use_link_url(@su.downloadKey)
     end
 
     protected

data/config/routes.rb

@@ -1,8 +1,8 @@
 CurationConcerns::Engine.routes.draw do
   get 'single_use_link/show/:id' => 'single_use_links_viewer#show', as: :show_single_use_link
   get 'single_use_link/download/:id' => 'single_use_links_viewer#download', as: :download_single_use_link
-  get 'single_use_link/generate_download/:id' => 'single_use_links#new_download', as: :generate_download_single_use_link
-  get 'single_use_link/generate_show/:id' => 'single_use_links#new_show', as: :generate_show_single_use_link
+  post 'single_use_link/generate_download/:id' => 'single_use_links#create_download', as: :generate_download_single_use_link
+  post 'single_use_link/generate_show/:id' => 'single_use_links#create_show', as: :generate_show_single_use_link
 
   # mount BrowseEverything::Engine => '/remote_files/browse'
   resources :classify_concerns, only: [:new, :create]

data/lib/curation_concerns/version.rb

@@ -1,3 +1,3 @@
 module CurationConcerns
-  VERSION = "0.12.0.pre8".freeze
+  VERSION = "0.12.0.pre9".freeze
 end

data/spec/actors/curation_concerns/file_set_actor_spec.rb

@@ -151,21 +151,26 @@ describe CurationConcerns::FileSetActor do
       expect { file_set.reload }.to raise_error ActiveFedora::ObjectNotFoundError
     end
 
-    context "representative of a work" do
+    context "representative and thumbnail of a work" do
       let!(:work) do
         work = create(:generic_work)
         # this is not part of a block on the create, since the work must be saved
         # before the representative can be assigned
         work.ordered_members << file_set
         work.representative = file_set
+        work.thumbnail = file_set
         work.save
         work
       end
 
-      it "removes representative and the proxy association" do
-        expect(work.reload.representative_id).to eq(file_set.id)
+      it "removes representative, thumbnail, and the proxy association" do
+        gw = GenericWork.load_instance_from_solr(work.id)
+        expect(gw.representative_id).to eq(file_set.id)
+        expect(gw.thumbnail_id).to eq(file_set.id)
         expect { actor.destroy }.to change { ActiveFedora::Aggregation::Proxy.count }.by(-1)
-        expect(work.reload.representative_id).to be_nil
+        gw = GenericWork.load_instance_from_solr(work.id)
+        expect(gw.representative_id).to be_nil
+        expect(gw.thumbnail_id).to be_nil
       end
     end
   end

data/spec/controllers/curation_concerns/single_use_links_controller_spec.rb

@@ -21,17 +21,17 @@ describe CurationConcerns::SingleUseLinksController, type: :controller do
 
     describe "GET 'download'" do
       it "and_return http success" do
-        get 'new_download', id: file
+        post 'create_download', id: file
         expect(response).to be_success
-        expect(assigns[:link]).to eq routes.url_helpers.download_single_use_link_path(hash)
+        expect(response.body).to eq download_single_use_link_url(hash)
       end
     end
 
     describe "GET 'show'" do
       it "and_return http success" do
-        get 'new_show', id: file
+        post 'create_show', id: file
         expect(response).to be_success
-        expect(assigns[:link]).to eq routes.url_helpers.show_single_use_link_path(hash)
+        expect(response.body).to eq show_single_use_link_url(hash)
       end
     end
   end
@@ -40,22 +40,22 @@ describe CurationConcerns::SingleUseLinksController, type: :controller do
     before do
       @other_user = create(:user)
       file.read_users << @other_user
-      file.save
+      file.save!
       sign_in @other_user
       file.read_users << @other_user
-      file.save
+      file.save!
     end
 
     describe "GET 'download'" do
       it "and_return http success" do
-        get 'new_download', id: file
+        post 'create_download', id: file
         expect(response).not_to be_success
       end
     end
 
     describe "GET 'show'" do
       it "and_return http success" do
-        get 'new_show', id: file
+        post 'create_show', id: file
         expect(response).not_to be_success
       end
     end
@@ -64,14 +64,14 @@ describe CurationConcerns::SingleUseLinksController, type: :controller do
   describe "unknown user" do
     describe "GET 'download'" do
       it "and_return http failure" do
-        get 'new_download', id: file
+        post 'create_download', id: file
         expect(response).not_to be_success
       end
     end
 
     describe "GET 'show'" do
       it "and_return http failure" do
-        get 'new_show', id: file
+        post 'create_show', id: file
         expect(response).not_to be_success
       end
     end

data/spec/routing/curation_concerns/routes_spec.rb

@@ -29,14 +29,14 @@ module CurationConcerns
 
     describe 'Single Use Link Generator' do
       routes { CurationConcerns::Engine.routes }
-      it 'routes to #show' do
+      it 'routes to #create_show' do
         expect(generate_show_single_use_link_path('abc123')).to eq '/single_use_link/generate_show/abc123'
-        expect(get("/single_use_link/generate_show/abc123")).to route_to("curation_concerns/single_use_links#new_show", id: 'abc123')
+        expect(post("/single_use_link/generate_show/abc123")).to route_to("curation_concerns/single_use_links#create_show", id: 'abc123')
       end
 
-      it 'routes to #download' do
+      it 'routes to #create_download' do
         expect(generate_download_single_use_link_path('abc123')).to eq '/single_use_link/generate_download/abc123'
-        expect(get("/single_use_link/generate_download/abc123")).to route_to("curation_concerns/single_use_links#new_download", id: 'abc123')
+        expect(post("/single_use_link/generate_download/abc123")).to route_to("curation_concerns/single_use_links#create_download", id: 'abc123')
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curation_concerns
 version: !ruby/object:Gem::Version
-  version: 0.12.0.pre8
+  version: 0.12.0.pre9
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -924,8 +924,6 @@ files:
 - app/views/curation_concerns/file_sets/upload/_form_fields.html.erb
 - app/views/curation_concerns/file_sets/upload/_script_templates.html.erb
 - app/views/curation_concerns/permissions/confirm.html.erb
-- app/views/curation_concerns/single_use_links/new_download.html.erb
-- app/views/curation_concerns/single_use_links/new_show.html.erb
 - app/views/curation_concerns/single_use_links_viewer/show.html.erb
 - app/views/embargoes/_embargo_history.html.erb
 - app/views/embargoes/_list_active_embargoes.html.erb
@@ -1198,7 +1196,6 @@ files:
 - spec/views/layouts/error.html.erb_spec.rb
 - spec/views/shared/_add_content.html.erb_spec.rb
 - spec/views/shared/_my_actions.html.erb_spec.rb
-- spec/views/single_use_links/new_download.html.erb_spec.rb
 - spec/views/single_use_links_viewer/show.html.erb_spec.rb
 - tasks/jasmine.rake
 - vendor/assets/images/ui-bg_glass_100_fdf5ce_1x400.png
@@ -1398,5 +1395,4 @@ test_files:
 - spec/views/layouts/error.html.erb_spec.rb
 - spec/views/shared/_add_content.html.erb_spec.rb
 - spec/views/shared/_my_actions.html.erb_spec.rb
-- spec/views/single_use_links/new_download.html.erb_spec.rb
 - spec/views/single_use_links_viewer/show.html.erb_spec.rb

data/app/views/curation_concerns/single_use_links/new_download.html.erb

@@ -1,5 +0,0 @@
-<div class="single-use-link">
-<h1>Single Use Link</h1>
-<p>Anyone can use the following link once to download the file</p>
-<%= link_to @asset, @link, class: 'download-link', data: { 'no-turbolink' => ''}, target: '_blank' %>
-</div>

data/app/views/curation_concerns/single_use_links/new_show.html.erb

@@ -1,5 +0,0 @@
-<div class="single-use-link">
-<h1>Single Use Link</h1>
-<p>Anyone can use the following link once to view the file metadata</p>
-<%= link_to @asset, @link, target: '_blank' %>
-</div>

data/spec/views/single_use_links/new_download.html.erb_spec.rb

@@ -1,29 +0,0 @@
-require 'spec_helper'
-
-describe 'curation_concerns/single_use_links/new_download.html.erb' do
-  let(:user) { create(:user) }
-
-  let(:f) do
-    file = FileSet.create do |gf|
-      gf.apply_depositor_metadata(user)
-    end
-    Hydra::Works::AddFileToFileSet.call(file, File.open(fixture_path + '/world.png'), :original_file)
-    file
-  end
-
-  let(:hash) { "some-dummy-sha2-hash" }
-
-  before do
-    assign :asset, f
-    assign :link, CurationConcerns::Engine.routes.url_helpers.download_single_use_link_path(hash)
-    render
-  end
-
-  it "has the download link" do
-    expect(rendered).to have_selector "a.download-link"
-  end
-
-  it "has turbolinks disabled in the download link" do
-    expect(rendered).to have_selector "a.download-link[data-no-turbolink]"
-  end
-end