curation_concerns 0.14.0.pre1 → 0.14.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f74821b31213e7a844b8f8e5314eac62b792ccba
-  data.tar.gz: 3d63bba8d048b922a52e544b6296a58622137cf5
+  metadata.gz: 57de72e25be5af57715ccfdb367577a5ebd9b98b
+  data.tar.gz: 278a1dcc3a79d15ba8472222b04877c7c804aa5c
 SHA512:
-  metadata.gz: 07a68173b77edab2e48638220ce12435e500aae53c28cb634bbe80a3ceec77e0eaba25bf722e3ad02836e0d9b4d955320247b749f035eeefe2c145bbaa60a6ba
-  data.tar.gz: dcd8ca994910c1f326147e3a5d261a3d4e5afbec84fb3884d09801921c80463bd6435762a54fc8cbd9116d205c60ad537857a47bbe9414b112739238db75a1e4
+  metadata.gz: 03414390a8504f7001eaeea69c5929a41c27d3db1c191ea19266bd056a8e8666931c7e0a897e0a3a6f6519325a1aaae9c9ca33a4423f50af7bfe185c76a64e3a
+  data.tar.gz: 3d0b2327008ca3ce0b866d5faa07b8ddbde751e072f68b2126c6b222ef74e89f5fb03e7bb44d6b1cb4c4cae18519fbd45be2bfdc408216089c52c6354ce0e48b

data/app/actors/curation_concerns/base_actor.rb

@@ -11,17 +11,22 @@ module CurationConcerns
       @cloud_resources = attributes.delete(:cloud_resources.to_s)
       apply_creation_data_to_curation_concern
       apply_save_data_to_curation_concern(attributes)
-      next_actor.create(attributes) && save
+      next_actor.create(attributes) && save && run_callbacks(:after_create_concern)
     end
 
     def update(attributes)
       apply_update_data_to_curation_concern
       apply_save_data_to_curation_concern(attributes)
-      next_actor.update(attributes) && save
+      next_actor.update(attributes) && save && run_callbacks(:after_update_metadata)
     end
 
     protected
 
+      def run_callbacks(hook)
+        CurationConcerns.config.callback.run(hook, curation_concern, user)
+        true
+      end
+
       def apply_creation_data_to_curation_concern
         apply_depositor_metadata
         apply_deposit_date

data/app/assets/stylesheets/curation_concerns/_positioning.scss

@@ -1,5 +1,4 @@
 #brand-bar {
-  margin-bottom :0;
   z-index: $zindex-navbar + 1;
 }
 

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

@@ -93,6 +93,7 @@ module CurationConcerns::CurationConcernController
   def destroy
     title = curation_concern.to_s
     curation_concern.destroy
+    CurationConcerns.config.callback.run(:after_destroy, curation_concern.id, current_user)
     after_destroy_response(title)
   end
 

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

@@ -92,6 +92,7 @@ module CurationConcerns
         respond_to do |wants|
           wants.html do
             initialize_edit_form
+            flash[:error] = "There was a problem processing your request."
             render 'edit', status: :unprocessable_entity
           end
           wants.json { render_json_response(response_type: :unprocessable_entity, options: { errors: @file_set.errors }) }

data/app/jobs/ingest_file_job.rb

@@ -24,6 +24,6 @@ class IngestFileJob < ActiveJob::Base
 
     # Do post file ingest actions
     CurationConcerns::VersioningService.create(file_set.send(relation.to_sym), user)
-    CurationConcerns.config.callback.run(:after_create_content, file_set, user)
+    CurationConcerns.config.callback.run(:after_create_fileset, file_set, user)
   end
 end

data/app/presenters/curation_concerns/work_show_presenter.rb

@@ -4,7 +4,7 @@ module CurationConcerns
     include PresentsAttributes
     attr_accessor :solr_document, :current_ability
 
-    class_attribute :collection_presenter_class, :file_presenter_class
+    class_attribute :collection_presenter_class, :file_presenter_class, :work_presenter_class
 
     # modify this attribute to use an alternate presenter class for the collections
     self.collection_presenter_class = CollectionPresenter
@@ -12,6 +12,9 @@ module CurationConcerns
     # modify this attribute to use an alternate presenter class for the files
     self.file_presenter_class = FileSetPresenter
 
+    # modify this attribute to use an alternate presenter class for the child works
+    self.work_presenter_class = self
+
     # @param [SolrDocument] solr_document
     # @param [Ability] current_ability
     def initialize(solr_document, current_ability)
@@ -37,6 +40,11 @@ module CurationConcerns
       @file_set_presenters ||= member_presenters(ordered_ids & file_set_ids)
     end
 
+    # @return [Array<WorkShowPresenter>] presenters for the ordered_members that are not FileSets
+    def work_presenters
+      @work_presenters ||= member_presenters(ordered_ids - file_set_ids, work_presenter_class)
+    end
+
     # @deprecated
     # @return [Array<FileSetPresenter>] presenters for the orderd_members that are FileSets
     def file_presenters
@@ -44,10 +52,12 @@ module CurationConcerns
       member_presenters
     end
 
-    # @return [Array<FileSetPresenter>] presenters for the ordered_members (not filtered by class)
-    def member_presenters(ids = ordered_ids)
+    # @param [Array<String>] ids a list of ids to build presenters for
+    # @param [Class] presenter_class the type of presenter to build
+    # @return [Array<presenter_class>] presenters for the ordered_members (not filtered by class)
+    def member_presenters(ids = ordered_ids, presenter_class = file_presenter_class)
       PresenterFactory.build_presenters(ids,
-                                        file_presenter_class,
+                                        presenter_class,
                                         current_ability)
     end
 
@@ -69,18 +79,22 @@ module CurationConcerns
 
       # 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", []) }
+        @ordered_ids ||= begin
+                           ActiveFedora::SolrService.query("proxy_in_ssi:#{id}",
+                                                           fl: "ordered_targets_ssim")
+                                                    .flat_map { |x| x.fetch("ordered_targets_ssim", []) }
+                         end
       end
 
       # These are the file sets that belong to this work, but not necessarily
       # in order.
       def file_set_ids
-        ActiveFedora::SolrService.query("{!field f=has_model_ssim}FileSet",
-                                        fl: ActiveFedora.id_field,
-                                        fq: "{!join from=ordered_targets_ssim to=id}id:\"#{id}/list_source\"")
-                                 .flat_map { |x| x.fetch(ActiveFedora.id_field, []) }
+        @file_set_ids ||= begin
+                            ActiveFedora::SolrService.query("{!field f=has_model_ssim}FileSet",
+                                                            fl: ActiveFedora.id_field,
+                                                            fq: "{!join from=ordered_targets_ssim to=id}id:\"#{id}/list_source\"")
+                                                     .flat_map { |x| x.fetch(ActiveFedora.id_field, []) }
+                          end
       end
   end
 end

data/curation_concerns.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "breadcrumbs_on_rails", "~> 2.3"
   spec.add_dependency "jquery-ui-rails"
   spec.add_dependency "simple_form", '~> 3.1'
-  spec.add_dependency 'hydra-editor', '~> 1.1'
+  spec.add_dependency 'hydra-editor', '~> 2.0'
   spec.add_dependency 'blacklight_advanced_search', '~> 6.0'
   spec.add_dependency 'rails_autolink'
   spec.add_dependency 'sprockets-es6'

data/lib/curation_concerns/configuration.rb

@@ -132,11 +132,12 @@ module CurationConcerns
       @lock_retry_delay ||= 200 # milliseconds
     end
 
-    callback.enable :after_create_content, :after_update_content,
-                    :after_revert_content, :after_update_metadata,
-                    :after_import_local_file_success,
+    callback.enable :after_create_concern, :after_create_fileset,
+                    :after_update_content, :after_revert_content,
+                    :after_update_metadata, :after_import_local_file_success,
                     :after_import_local_file_failure, :after_audit_failure,
-                    :after_destroy, :after_import_url_success, :after_import_url_failure
+                    :after_destroy, :after_import_url_success,
+                    :after_import_url_failure
 
     # Registers the given curation concern model in the configuration
     # @param [Array<Symbol>,Symbol] curation_concern_types

data/lib/curation_concerns/version.rb

@@ -1,3 +1,3 @@
 module CurationConcerns
-  VERSION = "0.14.0.pre1".freeze
+  VERSION = "0.14.0.pre2".freeze
 end

data/lib/generators/curation_concerns/install_generator.rb

@@ -17,6 +17,7 @@ module CurationConcerns
    7. Adds CurationConcerns::SolrDocumentBehavior to app/models/solr_document.rb
    8. Adds config/authorities/rights.yml to the application
    9. Adds config/authorities/resource_types.yml to the application
+   10. Runs simple_form:install --bootstrap
          '
 
     def run_required_generators
@@ -99,5 +100,9 @@ module CurationConcerns
     def resource_types_config
       copy_file "config/authorities/resource_types.yml", "config/authorities/resource_types.yml"
     end
+
+    def simple_form_bootstrap
+      generate 'simple_form:install --bootstrap'
+    end
   end
 end

data/spec/actors/curation_concerns/work_actor_spec.rb

@@ -7,12 +7,13 @@ describe CurationConcerns::GenericWorkActor do
   let(:user) { create(:user) }
   let(:file) { curation_concerns_fixture_file_upload('files/image.png', 'image/png') }
 
-  let(:redlock_client_stub) { # stub out redis connection
+  # stub out redis connection
+  let(:redlock_client_stub) do
     client = double('redlock client')
     allow(client).to receive(:lock).and_yield(true)
     allow(Redlock::Client).to receive(:new).and_return(client)
     client
-  }
+  end
 
   subject do
     CurationConcerns::CurationConcern.actor(curation_concern, user)
@@ -32,6 +33,17 @@ describe CurationConcerns::GenericWorkActor do
       end
     end
 
+    context 'success' do
+      before { redlock_client_stub }
+
+      it "invokes the after_create_concern callback" do
+        allow(CharacterizeJob).to receive(:perform_later).and_return(true)
+        expect(CurationConcerns.config.callback).to receive(:run)
+          .with(:after_create_concern, curation_concern, user)
+        subject.create(title: ['Foo Bar'])
+      end
+    end
+
     context 'valid attributes' do
       let(:visibility) { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED }
 
@@ -151,6 +163,14 @@ describe CurationConcerns::GenericWorkActor do
       end
     end
 
+    context 'success' do
+      it "invokes the after_update_metadata callback" do
+        expect(CurationConcerns.config.callback).to receive(:run)
+          .with(:after_update_metadata, curation_concern, user)
+        subject.update(title: ['Other Title'])
+      end
+    end
+
     context 'adding to collections' do
       let!(:collection1) { create(:collection, user: user) }
       let!(:collection2) { create(:collection, user: user) }

data/spec/controllers/curation_concerns/file_sets_controller_spec.rb

@@ -135,6 +135,7 @@ describe CurationConcerns::FileSetsController do
           expect(response).to render_template('edit')
           expect(assigns[:groups]).to be_kind_of Array
           expect(assigns[:file_set]).to eq file_set
+          expect(flash[:error]).to eq "There was a problem processing your request."
         end
 
         context 'updating visibility' do

data/spec/controllers/curation_concerns/generic_works_controller_spec.rb

@@ -215,6 +215,12 @@ describe CurationConcerns::GenericWorksController do
       expect(GenericWork).not_to exist(work_to_be_deleted.id)
     end
 
+    it "invokes the after_destroy callback" do
+      expect(CurationConcerns.config.callback).to receive(:run)
+        .with(:after_destroy, work_to_be_deleted.id, user)
+      delete :destroy, id: work_to_be_deleted
+    end
+
     context 'someone elses public work' do
       let(:work_to_be_deleted) { create(:private_generic_work) }
       it 'shows unauthorized message' do

data/spec/controllers/selects_collections_controller_spec.rb

@@ -21,21 +21,6 @@ describe SelectsCollectionsController, type: :controller do
     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
@@ -59,8 +44,9 @@ describe SelectsCollectionsController, type: :controller do
 
     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
+        it "redirects the user to sign in" do
+          expect(subject).to receive(:authenticate_user!)
+          subject.find_collections_with_read_access
         end
       end
       describe "signed in" do
@@ -75,8 +61,9 @@ describe SelectsCollectionsController, type: :controller do
 
     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
+        it "redirects the user to sign in" do
+          expect(subject).to receive(:authenticate_user!)
+          subject.find_collections_with_edit_access
         end
       end
 

data/spec/factories/generic_works.rb

@@ -23,6 +23,13 @@ FactoryGirl.define do
       end
     end
 
+    factory :work_with_file_and_work do
+      before(:create) do |work, evaluator|
+        work.ordered_members << FactoryGirl.create(:file_set, user: evaluator.user)
+        work.ordered_members << FactoryGirl.create(:generic_work, user: evaluator.user)
+      end
+    end
+
     factory :work_with_files do
       before(:create) { |work, evaluator| 2.times { work.ordered_members << FactoryGirl.create(:file_set, user: evaluator.user) } }
     end

data/spec/jobs/ingest_file_job_spec.rb

@@ -68,10 +68,10 @@ describe IngestFileJob do
     end
   end
 
-  describe "the after_create_content callback" do
+  describe "the after_create_fileset callback" do
     subject { CurationConcerns.config.callback }
     it 'runs with file_set and user arguments' do
-      expect(subject).to receive(:run).with(:after_create_content, file_set, user)
+      expect(subject).to receive(:run).with(:after_create_fileset, file_set, user)
       described_class.perform_now(file_set, filename, 'image/png', user)
     end
   end

data/spec/presenters/curation_concerns/work_show_presenter_spec.rb

@@ -61,6 +61,16 @@ describe CurationConcerns::WorkShowPresenter do
     end
   end
 
+  describe "#work_presenters" do
+    let(:obj) { create(:work_with_file_and_work) }
+    let(:attributes) { obj.to_solr }
+
+    it "filters out members that are file sets" do
+      expect(presenter.work_presenters.size).to eq 1
+      expect(presenter.work_presenters.first).to be_instance_of(described_class)
+    end
+  end
+
   describe "#file_set_presenters" do
     let(:obj) { create(:work_with_ordered_files) }
     let(:attributes) { obj.to_solr }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curation_concerns
 version: !ruby/object:Gem::Version
-  version: 0.14.0.pre1
+  version: 0.14.0.pre2
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-25 00:00:00.000000000 Z
+date: 2016-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -88,14 +88,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: blacklight_advanced_search
   requirement: !ruby/object:Gem::Requirement