curation_concerns 0.12.0.pre5 → 0.12.0.pre6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cc5f2766beec4a47127cd43e76cd15789ea7edf
-  data.tar.gz: 0d1eccaf7b536f7a4c7d51d575f9828e4f2f7ad6
+  metadata.gz: 7f36dfe3aa91727d022c395d9ecf77afab2d5843
+  data.tar.gz: 3d33f42c2909c683f78f23557b70a121649fdc59
 SHA512:
-  metadata.gz: 775fd8bd118db29f56b3a12b8aee3f36e02dcb108cefcd4da104413b042c0b38fd3983102cd55b49824b26acc0c2fdd3448909edcb734cb89018f8fccf0d7d12
-  data.tar.gz: 697fe8253127b5cfa3ab326458b944a44d09693af59710d629d1a65f59fa5ff49ae558fe5ef82848f18fc0fbc7221cdf37c60390e08f5b9c48dfd949c4e7cd4d
+  metadata.gz: 7f89a1474a4e438832ce73090e9ca5bdc1d88a705305b6a276d87685e21392ee8bb079034da146f9f8e7b0854d738b314a51d2cce43c433095653bf153676205
+  data.tar.gz: 9f726193ec1c8ac22c741a8ce7ecb4a272c1491781c5d83f2e53c129aca5b33d9618f95d0b2876dc98559a6c36b0e1c289734b6c6c0e9e9399a012486404a1f5

data/app/actors/curation_concerns/file_actor.rb

@@ -21,7 +21,7 @@ module CurationConcerns
     def ingest_file(file)
       working_file = copy_file_to_working_directory(file, file_set.id)
       mime_type = file.respond_to?(:content_type) ? file.content_type : nil
-      IngestFileJob.perform_later(file_set, working_file, mime_type, user.user_key, relation)
+      IngestFileJob.perform_later(file_set, working_file, mime_type, user, relation)
       make_derivative(file_set, working_file)
       true
     end

data/app/jobs/ingest_file_job.rb

@@ -4,9 +4,9 @@ class IngestFileJob < ActiveJob::Base
   # @param [FileSet] file_set
   # @param [String] filename
   # @param [String,NilClass] mime_type
-  # @param [String] user_key
+  # @param [User] user
   # @param [String] relation ('original_file')
-  def perform(file_set, filename, mime_type, user_key, relation = 'original_file')
+  def perform(file_set, filename, mime_type, user, relation = 'original_file')
     file = File.open(filename, "rb")
     # If mime-type is known, wrap in an IO decorator
     # Otherwise allow Hydra::Works service to determine mime_type
@@ -23,7 +23,6 @@ class IngestFileJob < ActiveJob::Base
     file_set.save!
 
     # Do post file ingest actions
-    user = User.find_by_user_key(user_key)
     CurationConcerns::VersioningService.create(file_set.send(relation.to_sym), user)
     CurationConcerns.config.callback.run(:after_create_content, file_set, user)
   end

data/app/jobs/ingest_local_file_job.rb

@@ -1,20 +1,19 @@
 class IngestLocalFileJob < ActiveJob::Base
   queue_as :ingest_local
 
-  def perform(file_set_id, directory, filename, user_key)
-    user = User.find_by_user_key(user_key)
-    fail "Unable to find user for #{user_key}" unless user
-    file_set = FileSet.find(file_set_id)
-    file_set.label ||= filename
-    path = File.join(directory, filename)
+  # @param [FileSet] file_set
+  # @param [String] path
+  # @param [User] user
+  def perform(file_set, path, user)
+    file_set.label ||= File.basename(path)
 
     actor = CurationConcerns::FileSetActor.new(file_set, user)
 
     if actor.create_content(File.open(path))
       FileUtils.rm(path)
-      CurationConcerns.config.callback.run(:after_import_local_file_success, file_set, user, filename)
+      CurationConcerns.config.callback.run(:after_import_local_file_success, file_set, user, path)
     else
-      CurationConcerns.config.callback.run(:after_import_local_file_failure, file_set, user, filename)
+      CurationConcerns.config.callback.run(:after_import_local_file_failure, file_set, user, path)
     end
   end
 end

data/app/models/concerns/curation_concerns/ability.rb

@@ -29,6 +29,8 @@ module CurationConcerns
       can :manage, curation_concerns_models
     end
 
+    # Override this method in your ability model if you use a different group
+    # or other logic to designate an administrator.
     def admin?
       user_groups.include? 'admin'
     end

data/app/presenters/curation_concerns/work_show_presenter.rb

@@ -4,6 +4,14 @@ module CurationConcerns
     include PresentsAttributes
     attr_accessor :solr_document, :current_ability
 
+    class_attribute :collection_presenter_class, :file_presenter_class
+
+    # modify this attribute to use an alternate presenter class for the collections
+    self.collection_presenter_class = CollectionPresenter
+
+    # modify this attribute to use an alternate presenter class for the files
+    self.file_presenter_class = FileSetPresenter
+
     # @param [SolrDocument] solr_document
     # @param [Ability] current_ability
     def initialize(solr_document, current_ability)
@@ -43,8 +51,22 @@ module CurationConcerns
                                         current_ability)
     end
 
+    # @return [Array<CollectionPresenter>] presenters for the collections that this work is a member of
+    def collection_presenters
+      PresenterFactory.build_presenters(in_collection_ids,
+                                        collection_presenter_class,
+                                        current_ability)
+    end
+
     private
 
+      # @return [Array<String>] ids of the collections that this work is a member of
+      def in_collection_ids
+        ActiveFedora::SolrService.query("{!field f=ordered_targets_ssim}#{id}",
+                                        fl: 'proxy_in_ssi')
+                                 .map { |x| x.fetch('proxy_in_ssi') }
+      end
+
       # TODO: Extract this to ActiveFedora::Aggregations::ListSource
       def ordered_ids
         ActiveFedora::SolrService.query("proxy_in_ssi:#{id}",
@@ -60,10 +82,5 @@ module CurationConcerns
                                         fq: "{!join from=ordered_targets_ssim to=id}id:\"#{id}/list_source\"")
                                  .flat_map { |x| x.fetch("id", []) }
       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/search_builders/curation_concerns/search_filters.rb

@@ -6,7 +6,7 @@ module CurationConcerns::SearchFilters
   # Override Hydra::AccessControlsEnforcement (or Hydra::PolicyAwareAccessControlsEnforcement)
   # Allows admin users to see everything (don't apply any gated_discovery_filters for those users)
   def gated_discovery_filters(permission_types = discovery_permissions, ability = current_ability)
-    return [] if ability.current_user.groups.include? 'admin'
+    return [] if ability.admin?
     super
   end
 

data/lib/curation_concerns/version.rb

@@ -1,3 +1,3 @@
 module CurationConcerns
-  VERSION = "0.12.0.pre5".freeze
+  VERSION = "0.12.0.pre6".freeze
 end

data/spec/actors/curation_concerns/file_actor_spec.rb

@@ -11,7 +11,7 @@ describe CurationConcerns::FileActor do
   describe '#ingest_file' do
     it 'calls ingest file job' do
       expect(CharacterizeJob).to receive(:perform_later)
-      expect(IngestFileJob).to receive(:perform_later).with(file_set, /world\.png$/, 'image/png', user.user_key, 'remastered')
+      expect(IngestFileJob).to receive(:perform_later).with(file_set, /world\.png$/, 'image/png', user, 'remastered')
       actor.ingest_file(uploaded_file)
     end
   end

data/spec/actors/curation_concerns/file_set_actor_spec.rb

@@ -22,7 +22,7 @@ describe CurationConcerns::FileSetActor do
 
     before do
       expect(CharacterizeJob).to receive(:perform_later)
-      expect(IngestFileJob).to receive(:perform_later).with(file_set, /world\.png$/, 'image/png', user.user_key, 'original_file')
+      expect(IngestFileJob).to receive(:perform_later).with(file_set, /world\.png$/, 'image/png', user, 'original_file')
       allow(actor).to receive(:acquire_lock_for).and_yield
       actor.create_metadata(work)
       actor.create_content(uploaded_file)
@@ -68,14 +68,14 @@ describe CurationConcerns::FileSetActor do
   describe '#create_content' do
     it 'calls ingest file job' do
       expect(CharacterizeJob).to receive(:perform_later)
-      expect(IngestFileJob).to receive(:perform_later).with(file_set, /world\.png$/, 'image/png', user.user_key, 'original_file')
+      expect(IngestFileJob).to receive(:perform_later).with(file_set, /world\.png$/, 'image/png', user, 'original_file')
       actor.create_content(uploaded_file)
     end
 
     context 'when an alternative relationship is specified' do
       it 'calls ingest file job' do
         expect(CharacterizeJob).to receive(:perform_later)
-        expect(IngestFileJob).to receive(:perform_later).with(file_set, /world\.png$/, 'image/png', user.user_key, 'remastered')
+        expect(IngestFileJob).to receive(:perform_later).with(file_set, /world\.png$/, 'image/png', user, 'remastered')
         actor.create_content(uploaded_file, 'remastered')
       end
     end

data/spec/jobs/ingest_file_job_spec.rb

@@ -72,7 +72,7 @@ describe IngestFileJob 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)
-      described_class.perform_now(file_set, filename, 'image/png', user.user_key)
+      described_class.perform_now(file_set, filename, 'image/png', user)
     end
   end
 end

data/spec/jobs/ingest_local_file_job_spec.rb

@@ -4,7 +4,6 @@ describe IngestLocalFileJob do
   let(:user) { create(:user) }
 
   let(:file_set) { FileSet.new }
-  let(:file_set_id) { 'abc123' }
   let(:actor) { double }
 
   let(:mock_upload_directory) { 'spec/mock_upload_directory' }
@@ -12,12 +11,11 @@ describe IngestLocalFileJob do
   before do
     Dir.mkdir mock_upload_directory unless File.exist? mock_upload_directory
     FileUtils.copy(File.expand_path('../../fixtures/world.png', __FILE__), mock_upload_directory)
-    allow(FileSet).to receive(:find).with(file_set_id).and_return(file_set)
     allow(CurationConcerns::FileSetActor).to receive(:new).with(file_set, user).and_return(actor)
   end
 
   it 'has attached a file' do
     expect(actor).to receive(:create_content).and_return(true)
-    described_class.perform_now(file_set_id, mock_upload_directory, 'world.png', user.user_key)
+    described_class.perform_now(file_set, File.join(mock_upload_directory, 'world.png'), user)
   end
 end

data/spec/presenters/curation_concerns/work_show_presenter_spec.rb

@@ -99,6 +99,22 @@ describe CurationConcerns::WorkShowPresenter do
     end
   end
 
+  describe "#collection_presenters" do
+    let(:collection) { create(:collection) }
+    let(:obj) { create(:work) }
+    let(:attributes) { obj.to_solr }
+
+    before do
+      collection.ordered_members << obj
+      collection.save!
+      obj.save!
+    end
+
+    it "filters out members that are not file sets" do
+      expect(presenter.collection_presenters.map(&:id)).to eq [collection.id]
+    end
+  end
+
   describe "#attribute_to_html" do
     let(:presenter) { described_class.new(solr_document, ability) }
     let(:renderer) { double('renderer') }

data/spec/search_builders/curation_concerns/search_builder_spec.rb

@@ -12,8 +12,7 @@ describe CurationConcerns::SearchBuilder do
   describe '#gated_discovery_filters' do
     before do
       allow(subject).to receive(:current_ability).and_return(ability)
-      allow(ability).to receive(:current_user).and_return(user)
-      allow(user).to receive(:groups).and_return(['admin'])
+      allow(ability).to receive(:admin?).and_return(true)
     end
 
     it 'does not filter results for admin users' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curation_concerns
 version: !ruby/object:Gem::Version
-  version: 0.12.0.pre5
+  version: 0.12.0.pre6
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-13 00:00:00.000000000 Z
+date: 2016-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head