curation_concerns 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 782489cf38f83c30ac855fbe3a965604bc2a4169
-  data.tar.gz: db4129b1a303be1a6e1e7adc3ed000b72eb90220
+  metadata.gz: 7a6a05c11364b9cc72ba7f97963f9a3c32252d17
+  data.tar.gz: 61ad7ed57f29b8661b302527f9c2634eef19a52d
 SHA512:
-  metadata.gz: e94379134b788b2a80094661da85dec7ad9ab23094203b604e3ca229d4417a26d41a80a13b986ce907721541a503e857656abc08e651b7cfa013a94b2237c1a0
-  data.tar.gz: c77a0a7b3980c1dcd74542986d6e52041846ae11ed90afea9fd98c2b654b35a57198bbfc0a3cbf19fd102c4c7265288b6fb0bed9294efa61da8193cabe750308
+  metadata.gz: f79451b81f8820ee146a1438136f9bb3c526be5ed1e2d50922278c841d77cfb4ec276e6a7442c7c24b8172fa368775b2a500ea9752f4a3ac63a63922a29a101e
+  data.tar.gz: d5cba535b0c5d4279402f0b3709b0cc333c691e49713c150ac5110077c95b5e28074c58e01f9c3f10fe2f39cd2d73fa5ecae9c27d1f9de55954746bbbdc8f682

data/.gitignore

@@ -9,4 +9,5 @@ jetty
 /.ruby-gemset
 solr_conf/
 spec/internal
+.internal_test_app
 spec/mock_upload_directory

data/.rspec

@@ -1,2 +1,2 @@
 --colour
---exclude-pattern spec/internal/**/*
+--exclude-pattern .internal_test_app/**/*

data/.rubocop.yml

@@ -10,7 +10,7 @@ AllCops:
     - 'db/**/*'
     - 'script/**/*'
     - 'vendor/**/*'
-    - 'spec/internal/**/*'
+    - '.internal_test_app/**/*'
     - 'curation_concerns-models/app/models/concerns/curation_concerns/file_set/export.rb'
 
 Lint/AssignmentInCondition:

data/Gemfile

@@ -17,18 +17,27 @@ group :development, :test do
   gem 'pry-byebug' unless ENV['CI']
 end
 
-file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path("../spec/internal", __FILE__))
+
+# BEGIN ENGINE_CART BLOCK
+# engine_cart: 0.8.0
+# engine_cart stanza: 0.8.0
+# the below comes from engine_cart, a gem used to test this Rails engine gem in the context of a Rails app.
+file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path(".internal_test_app", File.dirname(__FILE__)))
 if File.exists?(file)
-  puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
-  instance_eval File.read(file)
+  begin
+    eval_gemfile file
+  rescue Bundler::GemfileError => e
+    Bundler.ui.warn '[EngineCart] Skipping Rails application dependencies:'
+    Bundler.ui.warn e.message
+  end
 else
+  Bundler.ui.warn "[EngineCart] Unable to find test application dependencies in #{file}, using placeholder dependencies"
   gem 'rails', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
-  if ENV['RAILS_VERSION'] and ENV['RAILS_VERSION'] !~ /^4.2/
-    gem 'sass-rails', "< 5.0"
-  else
+  if ENV['RAILS_VERSION'].nil? || ENV['RAILS_VERSION'] =~ /^4.2/
+    gem 'responders', "~> 2.0"
     gem 'sass-rails', ">= 5.0"
+  else
+    gem 'sass-rails', "< 5.0"
   end
-
-  extra_file = File.expand_path("../spec/test_app_templates/Gemfile.extra", __FILE__)
-  instance_eval File.read(extra_file)
 end
+# END ENGINE_CART BLOCK

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

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

@@ -127,7 +127,7 @@ module CurationConcerns::CurationConcernController
 
     def after_update_response
       # TODO: visibility or lease/embargo status
-      if actor.visibility_changed?
+      if actor.visibility_changed? && curation_concern.file_sets.present?
         redirect_to main_app.confirm_curation_concerns_permission_path(curation_concern)
       else
         respond_to do |wants|

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

@@ -157,6 +157,12 @@ module CurationConcerns
         @_prefixes ||= super + ['curation_concerns/base']
       end
 
+      def json_error(error, name = nil, additional_arguments = {})
+        args = { error: error }
+        args[:name] = name if name
+        render additional_arguments.merge(json: [args])
+      end
+
       def empty_file?(file)
         (file.respond_to?(:tempfile) && file.tempfile.size == 0) || (file.respond_to?(:size) && file.size == 0)
       end

data/app/presenters/curation_concerns/work_show_presenter.rb

@@ -24,10 +24,22 @@ module CurationConcerns
              :embargo_release_date, :lease_expiration_date, :rights, to: :solr_document
 
     def file_presenters
-      @file_sets ||= begin
-        ids = solr_document.fetch('file_set_ids_ssim', [])
-        PresenterFactory.build_presenters(ids, FileSetPresenter, current_ability)
-      end
+      @file_sets ||= PresenterFactory.build_presenters(ordered_ids,
+                                                       file_presenter_class,
+                                                       current_ability)
     end
+
+    private
+
+      # TODO: Extract this to ActiveFedora::Aggregations::ListSource
+      def ordered_ids
+        ActiveFedora::SolrService.query("proxy_in_ssi:#{id}", fl: "ordered_targets_ssim")
+          .flat_map { |x| x.fetch("ordered_targets_ssim", []) }
+      end
+
+      # Override this method if you want to use an alternate presenter class for the files
+      def file_presenter_class
+        FileSetPresenter
+      end
   end
 end

data/app/views/catalog/_action_menu_partials/_default.html.erb

@@ -1,29 +1,31 @@
-<div class="btn-group">
-  <button class="btn btn-default btn-small dropdown-toggle" data-toggle="dropdown" href="#">Select an action <span class="caret"></span></button>
-  <ul class="dropdown-menu">
-    <% if can? :edit, document %>
-      <li>
-        <%= link_to [:edit, :curation_concerns, document], class: 'itemicon itemedit' do %><i class="glyphicon glyphicon-pencil"></i> Edit <%= document.human_readable_type %>
-        <% end %>
-      </li>
-      <li>
-        <% if @collection || (@presenter and @presenter.collection?) # We're on the view page for @collection. -%>
-          <%= link_to_remove_from_collection(document) %>
-        <% else %>
-          <%= link_to [:curation_concerns, document], class: 'itemicon itemtrash',
-                      title: "Delete #{document.human_readable_type}", method: :delete,
-                      data: {
-                        confirm: "Deleting a #{document.human_readable_type} from #{t('curation_concerns.product_name')} is permanent. Click OK to delete this #{document.human_readable_type} from #{t('curation_concerns.product_name')}, or Cancel to cancel this operation" } do %>
-                          <i class="glyphicon glyphicon-trash"></i> Delete <%= document.human_readable_type %>
+<% if can?(:edit, document) || can?(:collect, document) %>
+  <div class="btn-group">
+    <button class="btn btn-default btn-small dropdown-toggle" data-toggle="dropdown" href="#">Select an action <span class="caret"></span></button>
+    <ul class="dropdown-menu">
+      <% if can? :edit, document %>
+        <li>
+          <%= link_to [:edit, :curation_concerns, document], class: 'itemicon itemedit' do %><i class="glyphicon glyphicon-pencil"></i> Edit <%= document.human_readable_type %>
           <% end %>
-        <% end %>
-      </li>
-    <% end %>
-    <% if can? :collect, document %>
-      <li>
-        <%= link_to_select_collection document %>
-      </li>
-    <% end %>
-  </ul>
-  <%= render 'collections/add_to_collection_modal', collectible: document if can? :collect, document %>
-</div>
+        </li>
+        <li>
+          <% if @collection || (@presenter and @presenter.collection?) # We're on the view page for @collection. -%>
+            <%= link_to_remove_from_collection(document) %>
+          <% else %>
+            <%= link_to [:curation_concerns, document], class: 'itemicon itemtrash',
+                        title: "Delete #{document.human_readable_type}", method: :delete,
+                        data: {
+                          confirm: "Deleting a #{document.human_readable_type} from #{t('curation_concerns.product_name')} is permanent. Click OK to delete this #{document.human_readable_type} from #{t('curation_concerns.product_name')}, or Cancel to cancel this operation" } do %>
+                            <i class="glyphicon glyphicon-trash"></i> Delete <%= document.human_readable_type %>
+            <% end %>
+          <% end %>
+        </li>
+      <% end %>
+      <% if can? :collect, document %>
+        <li>
+          <%= link_to_select_collection document %>
+        </li>
+      <% end %>
+    </ul>
+    <%= render 'collections/add_to_collection_modal', collectible: document if can? :collect, document %>
+  </div>
+<% end %>

data/app/views/collections/_form.html.erb

@@ -10,7 +10,7 @@
   <%= render 'form_descriptive_fields', curation_concern: @collection, f: f %>
   <%= render 'form_permission', f: f %>
 
-  <%= render "curation_concerns/base/form_representative_image", f: f %>
+  <%= render "curation_concerns/base/form_media", f: f %>
 
   <div class="row">
     <div class="col-md-12 form-actions">

data/app/views/collections/_form_permission.html.erb

@@ -1,7 +1,7 @@
 <div id="set-access-controls">
   <fieldset>
     <legend>
-      Access Rights
+      Visibility
       <small>Who should be able to view your collection?</small>
     </legend>
 

data/app/views/collections/_form_to_add_member.html.erb

@@ -9,7 +9,7 @@
     <div class="form-group collection_id">
       <div class="controls">
         <%= select_tag :id, collection_options_for_select(collectible), prompt: 'Make a Selection',
-          class: 'form-control', :'aria-labelledby' => select_label_id %>
+          class: 'form-control', :'aria-labelledby' => select_label_id, required: 'required' %>
       </div>
     </div>
 

data/app/views/curation_concerns/base/_attributes.html.erb

@@ -6,7 +6,7 @@
   <tbody>
     <%= render 'attribute_rows' %>
   <tr>
-    <th>Access Rights</th>
+    <th>Visibility</th>
     <td>
       <%= @presenter.permission_badge %>
     </td>

data/app/views/curation_concerns/base/_form_media.html.erb

@@ -0,0 +1,4 @@
+<% if f.object.persisted? && f.object.member_ids.present? %>
+  <%= render 'form_representative', f: f %>
+  <%= render 'form_thumbnail', f: f %>
+<% end %>

data/app/views/curation_concerns/base/_form_permission.html.erb

@@ -6,7 +6,7 @@
 <% else %>
   <fieldset id="set-access-controls">
     <legend>
-      Access Rights
+      Visibility
       <small>Who should be able to view or download this content?</small>
     </legend>
 

data/app/views/curation_concerns/base/_form_permission_under_embargo.html.erb

@@ -1,6 +1,6 @@
 <fieldset id="set-access-controls">
   <legend>
-    Access Rights
+    Visibility
     <small>Who should be able to view or download this content?</small>
   </legend>
 

data/app/views/curation_concerns/base/_form_permission_under_lease.html.erb

@@ -1,6 +1,6 @@
 <fieldset id="set-access-controls">
   <legend>
-    Access Rights
+    Visibility
     <small>Who should be able to view or download this content?</small>
   </legend>
 

data/app/views/curation_concerns/base/_form_representative.html.erb

@@ -0,0 +1,12 @@
+  <div class="row">
+    <div class="col-md-12">
+      <fieldset id="representative-media">
+        <legend>
+          Representative Media
+        </legend>
+        <p>Select the file with media that represents this <%= f.object.human_readable_type %>.</p>
+        <%= f.select :representative_id, @form.select_files, {}, { class: 'form-control' } %>
+      </fieldset>
+    </div>
+  </div>
+

data/app/views/curation_concerns/base/_form_supplementary_fields.html.erb

@@ -1,5 +1,5 @@
 <%= render "form_files_and_links", f: f %>
-<%= render "form_representative_image", f: f %>
+<%= render "form_media", f: f %>
 
 <div class="row with-headroom">
   <div class="col-md-12">

data/app/views/curation_concerns/base/_form_thumbnail.html.erb

@@ -0,0 +1,12 @@
+  <div class="row">
+    <div class="col-md-12">
+      <fieldset id="representative-image">
+        <legend>
+           Thumbnail
+        </legend>
+        <p>Select the file to be used as the thumbnail for this <%= f.object.human_readable_type %>.</p>
+        <%= f.select :thumbnail_id, @form.select_files, {}, { class: 'form-control' } %>
+      </fieldset>
+    </div>
+  </div>
+

data/app/views/curation_concerns/base/_show_actions.html.erb

@@ -0,0 +1,9 @@
+<% if collector || editor %>
+  <div class="form-actions">
+    <% if editor %>
+      <%= link_to "Edit This #{@presenter.human_readable_type}", edit_polymorphic_path([main_app, :curation_concerns, @presenter]), class: 'btn btn-default' %>
+      <%= link_to "Attach a File", main_app.new_curation_concerns_file_set_path(@presenter), class: 'btn btn-default' %>
+      <%= link_to "Delete This #{@presenter.human_readable_type}", [main_app, :curation_concerns, @presenter], class: 'btn btn-danger pull-right', data: { confirm: "Delete this #{@presenter.human_readable_type}?" }, method: :delete %>
+    <% end %>
+  </div>
+<% end %>

data/app/views/curation_concerns/base/show.html.erb

@@ -13,12 +13,4 @@
     <%= render partial: 'curation_concerns/file_sets/multiple_upload', presenter: @presenter %>
 <% end %>
 
-<% if collector || editor %>
-  <div class="form-actions">
-    <% if editor %>
-      <%= link_to "Edit This #{@presenter.human_readable_type}", edit_polymorphic_path([main_app, :curation_concerns, @presenter]), class: 'btn btn-default' %>
-      <%= link_to "Attach a File", main_app.new_curation_concerns_file_set_path(@presenter), class: 'btn btn-default' %>
-      <%= link_to "Delete This #{@presenter.human_readable_type}", [main_app, :curation_concerns, @presenter], class: 'btn btn-danger pull-right', data: { confirm: "Delete this #{@presenter.human_readable_type}?" }, method: :delete %>
-    <% end %>
-  </div>
-<% end %>
+<%= render "show_actions", collector: collector, editor: editor%>

data/app/views/curation_concerns/file_sets/show.html.erb

@@ -6,10 +6,10 @@
 <%= render "attributes", curation_concern: @presenter %>
 
   <div class="form-actions">
-    <%= link_to "Download this File", main_app.download_path(@presenter), class: 'btn btn-primary' %>
+    <%= link_to "Download this File", main_app.download_path(@presenter), class: 'btn btn-default' %>
     <% if can? :edit, @presenter.id %>
-      <%= link_to "Edit this File", edit_polymorphic_path([main_app, :curation_concerns, @presenter]), class: 'btn btn-primary'  %>
+      <%= link_to "Edit this File", edit_polymorphic_path([main_app, :curation_concerns, @presenter]), class: 'btn btn-default'  %>
     <% end %>
 
-    <%= link_to "Back to #{parent.human_readable_type}", parent_path(parent), class: 'btn btn-primary' %>
+    <%= link_to "Back to #{parent.human_readable_type}", parent_path(parent), class: 'btn btn-default' %>
   </div>

data/curation_concerns.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "devise", "~> 3.0"
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "engine_cart", "~> 0.7"
+  spec.add_development_dependency "engine_cart", "~> 0.8"
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "rspec-its"
   spec.add_development_dependency "rspec-rails"

data/lib/curation_concerns/version.rb

@@ -1,3 +1,3 @@
 module CurationConcerns
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/spec/abilities/generic_work_abilities_spec.rb

@@ -40,6 +40,7 @@ describe 'User' do
           should_not be_able_to(:read, generic_work)
           should_not be_able_to(:update, generic_work)
           should_not be_able_to(:destroy, generic_work)
+          should be_able_to(:collect, generic_work)
         end
       end
 
@@ -51,6 +52,7 @@ describe 'User' do
           should_not be_able_to(:read, generic_work)
           should_not be_able_to(:update, generic_work)
           should_not be_able_to(:destroy, generic_work)
+          should_not be_able_to(:collect, generic_work)
         end
       end
     end

data/spec/actors/curation_concerns/file_set_actor_spec.rb

@@ -177,4 +177,54 @@ describe CurationConcerns::FileSetActor do
       expect(work_v1.members.size).to eq 3
     end
   end
+
+  describe "#set_representative" do
+    let!(:work) { build(:generic_work, representative: rep) }
+    let!(:file_set) { build(:file_set) }
+
+    before do
+      actor.send(:set_representative, work, file_set)
+    end
+
+    context "when the representative isn't set" do
+      let(:rep) { nil }
+
+      it 'sets the representative' do
+        expect(work.representative).to eq file_set
+      end
+    end
+
+    context 'when the representative is already set' do
+      let(:rep) { build(:file_set, id: '123') }
+
+      it 'keeps the existing representative' do
+        expect(work.representative).to eq rep
+      end
+    end
+  end
+
+  describe "#set_thumbnail" do
+    let!(:work) { build(:generic_work, thumbnail: thumb) }
+    let!(:file_set) { build(:file_set) }
+
+    before do
+      actor.send(:set_thumbnail, work, file_set)
+    end
+
+    context "when the thumbnail isn't set" do
+      let(:thumb) { nil }
+
+      it 'sets the thumbnail' do
+        expect(work.thumbnail).to eq file_set
+      end
+    end
+
+    context 'when the thumbnail is already set' do
+      let(:thumb) { build(:file_set, id: '123') }
+
+      it 'keeps the existing thumbnail' do
+        expect(work.thumbnail).to eq thumb
+      end
+    end
+  end
 end

data/spec/controllers/curation_concerns/generic_works_controller_json_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 # This tests the CurationConcerns::CurationConcernController module
-# which is included into spec/internal/app/controllers/generic_works_controller.rb
+# which is included into .internal_test_app/app/controllers/generic_works_controller.rb
 describe CurationConcerns::GenericWorksController do
   let(:user) { create(:user) }
   before { sign_in user }

data/spec/controllers/curation_concerns/generic_works_controller_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 # This tests the CurationConcerns::CurationConcernController module
-# which is included into spec/internal/app/controllers/generic_works_controller.rb
+# which is included into .internal_test_app/app/controllers/generic_works_controller.rb
 describe CurationConcerns::GenericWorksController do
   let(:user) { create(:user) }
   before { sign_in user }
@@ -100,7 +100,7 @@ describe CurationConcerns::GenericWorksController do
   end
 
   describe '#update' do
-    let(:a_work) { FactoryGirl.create(:private_generic_work, user: user) }
+    let(:a_work) { create(:private_generic_work, user: user) }
     before do
       allow(controller).to receive(:actor).and_return(actor)
     end
@@ -114,9 +114,20 @@ describe CurationConcerns::GenericWorksController do
     describe 'changing rights' do
       let(:actor) { double(update: true, visibility_changed?: true) }
 
-      it 'prompts to change the files access' do
-        patch :update, id: a_work
-        expect(response).to redirect_to main_app.confirm_curation_concerns_permission_path(controller.curation_concern)
+      context 'when there are children' do
+        let(:a_work) { create(:work_with_one_file, user: user) }
+
+        it 'prompts to change the files access' do
+          patch :update, id: a_work
+          expect(response).to redirect_to main_app.confirm_curation_concerns_permission_path(controller.curation_concern)
+        end
+      end
+
+      context 'without children' do
+        it "doesn't prompt to change the files access" do
+          patch :update, id: a_work
+          expect(response).to redirect_to main_app.curation_concerns_generic_work_path(a_work)
+        end
       end
     end
 

data/spec/factories/collections.rb

@@ -1,5 +1,5 @@
 FactoryGirl.define do
-  # The ::Collection model is defined in spec/internal/app/models by the
+  # The ::Collection model is defined in .internal_test_app/app/models by the
   # curation_concerns:install generator.
   factory :collection do
     transient do

data/spec/factories/file_sets.rb

@@ -1,5 +1,5 @@
 FactoryGirl.define do
-  # The ::FileSet model is defined in spec/internal/app/models by the
+  # The ::FileSet model is defined in .internal_test_app/app/models by the
   # curation_concerns:install generator.
   factory :file_set, class: FileSet do
     transient do

data/spec/factories/generic_works.rb

@@ -1,6 +1,6 @@
 FactoryGirl.define do
-  # The ::GenericWork model is defined in spec/internal/app/models by the
-  # curation_concerns:install generator.
+  # The ::GenericWork model is defined in .internal_test_app/app/models by the
+  # curation_concerns:test_app generator.
   factory :generic_work, aliases: [:work, :private_generic_work], class: GenericWork do
     transient do
       user { FactoryGirl.create(:user) }
@@ -26,6 +26,12 @@ FactoryGirl.define do
     factory :work_with_files do
       before(:create) { |work, evaluator| 2.times { work.ordered_members << FactoryGirl.create(:file_set, user: evaluator.user) } }
     end
+    factory :work_with_ordered_files do
+      before(:create) do |work, evaluator|
+        work.ordered_members << FactoryGirl.create(:file_set, user: evaluator.user)
+        work.ordered_member_proxies.insert_target_at(0, FactoryGirl.create(:file_set, user: evaluator.user))
+      end
+    end
 
     factory :with_embargo_date do
       transient do

data/spec/features/embargo_spec.rb

@@ -34,7 +34,7 @@ describe 'embargo' do
       fill_in 'until', with: later_future_date.to_s
 
       click_button 'Update Embargo'
-      expect(page).to have_content(later_future_date.to_date.to_formatted_s(:long_ordinal))
+      expect(page).to have_content(later_future_date.iso8601)
     end
   end
 

data/spec/features/lease_spec.rb

@@ -31,7 +31,7 @@ describe 'leases' do
       fill_in 'until', with: later_future_date.to_s
 
       click_button 'Update Lease'
-      expect(page).to have_content(later_future_date.to_date.to_formatted_s(:long_ordinal)) # new lease date is displayed in message
+      expect(page).to have_content(later_future_date.iso8601) # new lease date is displayed in message
     end
   end
 

data/spec/features/work_generator_spec.rb

@@ -14,13 +14,13 @@ describe 'Creating a new Work' do
 
   before do
     Rails::Generators.invoke('curation_concerns:work', ['Catapult'], destination_root: Rails.root)
-    load 'spec/internal/app/models/catapult.rb'
-    load 'spec/internal/app/controllers/curation_concerns/catapults_controller.rb'
-    load 'spec/internal/app/actors/curation_concerns/catapult_actor.rb'
-    load 'spec/internal/app/forms/curation_concerns/catapult_form.rb'
-    load 'spec/internal/config/initializers/curation_concerns.rb'
-    load 'spec/internal/config/routes.rb'
-    load 'app/helpers/curation_concerns/url_helper.rb'
+    load "#{EngineCart.destination}/app/models/catapult.rb"
+    load "#{EngineCart.destination}/app/controllers/curation_concerns/catapults_controller.rb"
+    load "#{EngineCart.destination}/app/actors/curation_concerns/catapult_actor.rb"
+    load "#{EngineCart.destination}/app/forms/curation_concerns/catapult_form.rb"
+    load "#{EngineCart.destination}/config/initializers/curation_concerns.rb"
+    load "#{EngineCart.destination}/config/routes.rb"
+    load "app/helpers/curation_concerns/url_helper.rb"
     sign_in user
 
     # stub out characterization. Travis doesn't have fits installed, and it's not relevant to the test.

data/spec/indexers/generic_work_indexing_service_spec.rb

@@ -4,18 +4,20 @@ describe CurationConcerns::WorkIndexingService do
   # TODO: file_set_ids returns an empty set unless you persist the work
   let(:user) { create(:user) }
   let!(:generic_work) { create(:work_with_one_file, user: user) }
+  let!(:child_work) { create(:generic_work, user: user) }
   let(:service) { described_class.new(generic_work) }
   let(:file) { generic_work.file_sets.first }
 
   before do
+    generic_work.works << child_work
     allow(CurationConcerns::ThumbnailPathService).to receive(:call).and_return("/downloads/#{file.id}?file=thumbnail")
     generic_work.representative_id = file.id
   end
 
   subject { service.generate_solr_document }
 
-  it 'indexes files' do
-    expect(subject['file_set_ids_ssim']).to eq generic_work.member_ids
+  it 'indexes member work and file_set ids' do
+    expect(subject['member_ids_ssim']).to eq generic_work.member_ids
     expect(subject['generic_type_sim']).to eq ['Work']
     expect(subject.fetch('thumbnail_path_ss')).to eq "/downloads/#{file.id}?file=thumbnail"
   end

data/spec/jobs/create_derivatives_job_spec.rb

@@ -1,12 +1,14 @@
 require 'spec_helper'
 
 describe CurationConcerns::CreateDerivativesJob do
+  let(:id) { '123' }
+
   before do
     @ffmpeg_enabled = CurationConcerns.config.enable_ffmpeg
     CurationConcerns.config.enable_ffmpeg = true
-    allow(ActiveFedora::Base).to receive(:find).with('123').and_return(file_set)
+    allow(ActiveFedora::Base).to receive(:find).with(id).and_return(file_set)
     allow(file_set).to receive(:mime_type).and_return('audio/x-wav')
-    allow(file_set).to receive(:id).and_return('123')
+    allow(file_set).to receive(:id).and_return(id)
   end
 
   let(:file_set) { FileSet.new }
@@ -19,7 +21,33 @@ describe CurationConcerns::CreateDerivativesJob do
     it 'calls create_derivatives and save on a file set' do
       expect(Hydra::Derivatives::AudioDerivatives).to receive(:create)
       expect(file_set).to receive(:update_index)
-      CreateDerivativesJob.perform_now('123', 'spec/fixtures/piano_note.wav')
+      CreateDerivativesJob.perform_now(id, 'spec/fixtures/piano_note.wav')
+    end
+  end
+
+  context 'with a parent object' do
+    before do
+      allow(file_set).to receive(:parent).and_return(parent)
+      # Stub out the actual derivative creation
+      expect(file_set).to receive(:create_derivatives)
+    end
+
+    context 'when the file_set is the thumbnail of the parent' do
+      let(:parent) { GenericWork.new(thumbnail_id: id) }
+
+      it 'updates the index of the parent object' do
+        expect(parent).to receive(:update_index)
+        CreateDerivativesJob.perform_now(id, 'spec/fixtures/piano_note.wav')
+      end
+    end
+
+    context "when the file_set isn't the parent's thumbnail" do
+      let(:parent) { GenericWork.new }
+
+      it "doesn't update the parent's index" do
+        expect(parent).to_not receive(:update_index)
+        CreateDerivativesJob.perform_now(id, 'spec/fixtures/piano_note.wav')
+      end
     end
   end
 end

data/spec/presenters/curation_concerns/work_show_presenter_spec.rb

@@ -32,4 +32,29 @@ describe CurationConcerns::WorkShowPresenter do
       presenter.permission_badge
     end
   end
+
+  describe "#file_presenters" do
+    let(:obj) { create(:work_with_ordered_files) }
+    let(:attributes) { obj.to_solr }
+
+    it "displays them in order" do
+      expect(obj.ordered_member_ids).not_to eq obj.member_ids
+      expect(presenter.file_presenters.map(&:id)).to eq obj.ordered_member_ids
+    end
+
+    describe "getting presenters from factory" do
+      let(:attributes) { {} }
+      let(:presenter_class) { double }
+      before do
+        allow(presenter).to receive(:file_presenter_class).and_return(presenter_class)
+        allow(presenter).to receive(:ordered_ids).and_return(['12', '33'])
+      end
+
+      it "uses the set class" do
+        expect(CurationConcerns::PresenterFactory).to receive(:build_presenters)
+          .with(['12', '33'], presenter_class, ability)
+        presenter.file_presenters
+      end
+    end
+  end
 end

data/spec/views/catalog/_action_menu_partials/_default.html.erb_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe 'catalog/_action_menu_partials/_default.html.erb' do
+  let(:document) { double }
+  subject { rendered }
+
+  context "when neither a editor or a collector" do
+    before do
+      allow(view).to receive(:can?).and_return(false)
+      render 'catalog/_action_menu_partials/default.html.erb', document: document
+    end
+    it { is_expected.to eq '' }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curation_concerns
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-21 00:00:00.000000000 Z
+date: 2015-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -74,14 +74,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: hydra-editor
   requirement: !ruby/object:Gem::Requirement
@@ -164,14 +164,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -471,19 +471,22 @@ files:
 - app/views/curation_concerns/base/_form_additional_information.html.erb
 - app/views/curation_concerns/base/_form_descriptive_fields.erb
 - app/views/curation_concerns/base/_form_files_and_links.html.erb
+- app/views/curation_concerns/base/_form_media.html.erb
 - app/views/curation_concerns/base/_form_permission.html.erb
 - app/views/curation_concerns/base/_form_permission_embargo.html.erb
 - app/views/curation_concerns/base/_form_permission_lease.html.erb
 - app/views/curation_concerns/base/_form_permission_note.html.erb
 - app/views/curation_concerns/base/_form_permission_under_embargo.html.erb
 - app/views/curation_concerns/base/_form_permission_under_lease.html.erb
-- app/views/curation_concerns/base/_form_representative_image.html.erb
+- app/views/curation_concerns/base/_form_representative.html.erb
 - app/views/curation_concerns/base/_form_required_information.html.erb
 - app/views/curation_concerns/base/_form_rights.html.erb
 - app/views/curation_concerns/base/_form_supplementary_fields.html.erb
+- app/views/curation_concerns/base/_form_thumbnail.html.erb
 - app/views/curation_concerns/base/_legally_binding_text.html.erb
 - app/views/curation_concerns/base/_related_files.html.erb
 - app/views/curation_concerns/base/_representative_media.html.erb
+- app/views/curation_concerns/base/_show_actions.html.erb
 - app/views/curation_concerns/base/_versioning.html.erb
 - app/views/curation_concerns/base/edit.html.erb
 - app/views/curation_concerns/base/new.html.erb
@@ -717,6 +720,7 @@ files:
 - spec/tasks/rake_spec.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
+- spec/views/catalog/_action_menu_partials/_default.html.erb_spec.rb
 - spec/views/catalog/index.html.erb_spec.rb
 - spec/views/curation_concerns/base/_attributes.html.erb_spec.rb
 - spec/views/curation_concerns/base/_form_permission.html.erb_spec.rb
@@ -901,6 +905,7 @@ test_files:
 - spec/tasks/rake_spec.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
+- spec/views/catalog/_action_menu_partials/_default.html.erb_spec.rb
 - spec/views/catalog/index.html.erb_spec.rb
 - spec/views/curation_concerns/base/_attributes.html.erb_spec.rb
 - spec/views/curation_concerns/base/_form_permission.html.erb_spec.rb

data/app/views/curation_concerns/base/_form_representative_image.html.erb

@@ -1,25 +0,0 @@
-<% if f.object.persisted? && f.object.member_ids.present? %>
-  <div class="row">
-    <div class="col-md-12">
-      <fieldset id="representative-media">
-        <legend>
-          Representative Media
-        </legend>
-        <p>Select the file with media that represents this <%= f.object.human_readable_type %>.</p>
-        <%= f.select :representative_id, @form.select_files, {}, { class: 'form-control' } %>
-      </fieldset>
-    </div>
-  </div>
-
-  <div class="row">
-    <div class="col-md-12">
-      <fieldset id="representative-image">
-        <legend>
-           Thumbnail
-        </legend>
-        <p>Select the file to be used as the thumbnail for this <%= f.object.human_readable_type %>.</p>
-        <%= f.select :thumbnail_id, @form.select_files, {}, { class: 'form-control' } %>
-      </fieldset>
-    </div>
-  </div>
-<% end %>