curation_concerns 0.12.0.pre1 → 0.12.0.pre2

data/lib/generators/curation_concerns/templates/config/curation_concerns.rb

@@ -0,0 +1,61 @@
+CurationConcerns.configure do |config|
+  # Should schema.org microdata be displayed?
+  # config.display_microdata = true
+
+  # What default microdata type should be used if a more appropriate
+  # type can not be found in the locale file?
+  # config.microdata_default_type = 'http://schema.org/CreativeWork'
+
+  # How frequently should a file be audited.
+  # Note: In CurationConcerns you must trigger the FileSetAuditService manually.
+  # config.max_days_between_audits = 7
+
+  # Enable displaying usage statistics in the UI
+  # Requires a Google Analytics id and OAuth2 keyfile.  See README for more info
+  # config.analytics = false
+
+  # Specify a Google Analytics tracking ID to gather usage statistics
+  # config.google_analytics_id = 'UA-99999999-1'
+
+  # Specify a date you wish to start collecting Google Analytic statistics for.
+  # config.analytic_start_date = DateTime.new(2014,9,10)
+
+  # Where to store tempfiles, leave blank for the system temp directory (e.g. /tmp)
+  # config.temp_file_base = '/home/developer1'
+
+  # Location on local file system where derivatives will be stored.
+  # If you use a multi-server architecture, this MUST be a shared volume.
+  # config.derivatives_path = File.join(Rails.root, 'tmp', 'derivatives')
+
+  # Location on local file system where uploaded files will be staged
+  # prior to being ingested into the repository or having derivatives generated.
+  # If you use a multi-server architecture, this MUST be a shared volume.
+  # config.working_path = File.join(Rails.root, 'tmp', 'uploads')
+
+  # If you have ffmpeg installed and want to transcode audio and video uncomment this line
+  # config.enable_ffmpeg = true
+
+  # CurationConcerns uses NOIDs for files and collections instead of Fedora UUIDs
+  # where NOID = 10-character string and UUID = 32-character string w/ hyphens
+  # config.enable_noids = true
+
+  # Specify a different template for your repository's NOID IDs
+  # config.noid_template = ".reeddeeddk"
+
+  # Store identifier minter's state in a file for later replayability
+  # If you use a multi-server architecture, this MUST be on a shared volume.
+  # config.minter_statefile = '/tmp/minter-state'
+
+  # Specify the prefix for Redis keys:
+  # config.redis_namespace = "curation_concerns"
+
+  # Specify the path to the file characterization tool:
+  # config.fits_path = "fits.sh"
+
+  # Specify a date you wish to start collecting Google Analytic statistics for.
+  # Leaving it blank will set the start date to when ever the file was uploaded by
+  # NOTE: if you have always sent analytics to GA for downloads and page views leave this commented out
+  # config.analytic_start_date = DateTime.new(2014,9,10)
+end
+
+Date::DATE_FORMATS[:standard] = '%m/%d/%Y'

data/lib/generators/curation_concerns/templates/config/mime_types.rb

@@ -0,0 +1,6 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new mime types for use in respond_to blocks:
+# Mime::Type.register "text/richtext", :rtf
+# Mime::Type.register_alias "text/html", :iphone
+Mime::Type.register 'application/x-endnote-refer', :endnote

data/lib/generators/curation_concerns/templates/config/redis.yml

@@ -0,0 +1,9 @@
+development:
+  host: localhost
+  port: 6379
+test:
+  host: localhost
+  port: 6379
+production:
+  host: localhost
+  port: 6379

data/lib/generators/curation_concerns/templates/config/redis_config.rb

@@ -0,0 +1,29 @@
+if defined?(PhusionPassenger)
+  PhusionPassenger.on_event(:starting_worker_process) do |forked|
+    # We're in smart spawning mode.
+    if forked
+      # Re-establish redis connection
+      require 'redis'
+      config = YAML.load(ERB.new(IO.read(File.join(Rails.root, 'config', 'redis.yml'))).result)[Rails.env].with_indifferent_access
+
+      # The important two lines
+      Redis.current.disconnect!
+      Redis.current = begin
+                        Redis.new(config.merge(thread_safe: true))
+                      rescue
+                        nil
+                      end
+      Resque.redis = Redis.current
+      Resque.redis.namespace = "#{CurationConcerns.config.redis_namespace}:#{Rails.env}"
+      Resque.redis.client.reconnect if Resque.redis
+    end
+  end
+else
+  config = YAML.load(ERB.new(IO.read(File.join(Rails.root, 'config', 'redis.yml'))).result)[Rails.env].with_indifferent_access
+  require 'redis'
+  Redis.current = begin
+             Redis.new(config.merge(thread_safe: true))
+           rescue
+             nil
+           end
+end

data/lib/generators/curation_concerns/templates/config/resque-pool.yml

@@ -0,0 +1 @@
+ "*": 1

data/lib/generators/curation_concerns/templates/config/resque_config.rb

@@ -0,0 +1,6 @@
+require 'resque'
+config = YAML.load(ERB.new(IO.read(File.join(Rails.root, 'config', 'redis.yml'))).result)[Rails.env].with_indifferent_access
+Resque.redis = Redis.new(host: config[:host], port: config[:port], thread_safe: true)
+
+Resque.inline = Rails.env.test?
+Resque.redis.namespace = "#{CurationConcerns.config.redis_namespace}:#{Rails.env}"

data/lib/generators/curation_concerns/templates/curation_concerns.scss

@@ -1,3 +1,4 @@
-//@import 'blacklight/blacklight';
-@import 'curation_concerns/curation_concerns';
+@import 'bootstrap-sprockets';
+@import 'bootstrap';
 
+@import 'curation_concerns/curation_concerns';

data/lib/generators/curation_concerns/templates/migrations/create_checksum_audit_logs.rb

@@ -0,0 +1,19 @@
+class CreateChecksumAuditLogs < ActiveRecord::Migration
+  def self.up
+    create_table :checksum_audit_logs do |t|
+      t.string :file_set_id
+      t.string :file_id
+      t.string :version
+      t.integer :pass
+      t.string :expected_result
+      t.string :actual_result
+      t.timestamps
+    end
+    add_index :checksum_audit_logs, [:file_set_id, :file_id], name: 'by_file_set_id_and_file_id', order: { created_at: 'DESC' }
+  end
+
+  def self.down
+    remove_index(:checksum_audit_logs, name: 'by_file_set_id_and_file_id')
+    drop_table :checksum_audit_logs
+  end
+end

data/lib/generators/curation_concerns/templates/migrations/create_single_use_links.rb

@@ -0,0 +1,12 @@
+class CreateSingleUseLinks < ActiveRecord::Migration
+  def change
+    create_table :single_use_links do |t|
+      t.string :downloadKey
+      t.string :path
+      t.string :itemId
+      t.datetime :expires
+
+      t.timestamps
+    end
+  end
+end

data/lib/generators/curation_concerns/templates/migrations/create_version_committers.rb

@@ -0,0 +1,15 @@
+class CreateVersionCommitters < ActiveRecord::Migration
+  def self.up
+    create_table :version_committers do |t|
+      t.string :obj_id
+      t.string :datastream_id
+      t.string :version_id
+      t.string :committer_login
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :version_committers
+  end
+end

data/lib/tasks/migrate.rake

@@ -0,0 +1,11 @@
+namespace :curation_concerns do
+  namespace :migrate do
+    desc "Migrate audit logs"
+    task audit_logs: :environment do
+      ChecksumAuditLog.all.each do |cs|
+        cs.file_set_id = cs.file_set_id.delete "#{CurationConcerns.config.redis_namespace}:"
+        cs.save
+      end
+    end
+  end
+end

data/lib/tasks/resque.rake

@@ -0,0 +1,14 @@
+require 'resque/pool/tasks'
+
+# This provides access to the Rails env within all Resque workers
+task 'resque:setup' => :environment
+
+# Set up resque-pool
+task 'resque:pool:setup' do
+  ActiveRecord::Base.connection.disconnect!
+  require 'resque/pool'
+  Resque::Pool.after_prefork do |job|
+    ActiveRecord::Base.establish_connection
+    Resque.redis.client.reconnect
+  end
+end

data/lib/tasks/solr_reindex.rake

@@ -0,0 +1,8 @@
+namespace :curation_concerns do
+  namespace :solr do
+    desc "Enqueue a job to resolrize the repository objects"
+    task reindex: :environment do
+      ResolrizeJob.perform_later
+    end
+  end
+end

data/spec/actors/curation_concerns/file_set_actor_spec.rb

@@ -253,4 +253,35 @@ describe CurationConcerns::FileSetActor do
       end
     end
   end
+
+  describe "#file_actor_class" do
+    context "default" do
+      it "is a FileActor" do
+        expect(actor.file_actor_class).to eq(CurationConcerns::FileActor)
+      end
+    end
+
+    context "overridden" do
+      let(:actor) { CustomFileSetActor.new(file_set, user) }
+
+      before do
+        class CustomFileActor < CurationConcerns::FileActor
+        end
+        class CustomFileSetActor < CurationConcerns::FileSetActor
+          def file_actor_class
+            CustomFileActor
+          end
+        end
+      end
+
+      after do
+        Object.send(:remove_const, :CustomFileActor)
+        Object.send(:remove_const, :CustomFileSetActor)
+      end
+
+      it "is a custom class" do
+        expect(actor.file_actor_class).to eq(CustomFileActor)
+      end
+    end
+  end
 end

data/spec/controllers/accepts_batches_controller_spec.rb

@@ -0,0 +1,65 @@
+require 'spec_helper'
+
+class AcceptsBatchesController < ApplicationController
+  include CurationConcerns::Collections::AcceptsBatches
+end
+
+describe AcceptsBatchesController, type: :controller do
+  describe 'batch' do
+    it 'accepts batch from parameters' do
+      controller.params['batch_document_ids'] = %w(abc xyz)
+      expect(controller.batch).to eq(%w(abc xyz))
+    end
+    describe ':all' do
+      let(:current_user) { double(user_key: 'vanessa') }
+      before do
+        doc1 = double(id: 123)
+        doc2 = double(id: 456)
+        expect_any_instance_of(CurationConcerns::Collections::SearchService).to receive(:last_search_documents).and_return([doc1, doc2])
+        allow(controller).to receive(:current_user).and_return(current_user)
+      end
+      it 'adds every document in the current resultset to the batch' do
+        controller.params['batch_document_ids'] = 'all'
+        expect(controller.batch).to eq([123, 456])
+      end
+    end
+  end
+
+  describe 'should allow filtering for access' do
+    before do
+      @allowed = [1, 2, 3]
+      @disallowed = [5, 6, 7]
+      subject.batch = @allowed + @disallowed
+    end
+    it 'using filter_docs_with_access!' do
+      @allowed.each { |doc_id| expect(subject).to receive(:can?).with(:foo, doc_id).and_return(true) }
+      @disallowed.each { |doc_id| expect(subject).to receive(:can?).with(:foo, doc_id).and_return(false) }
+      subject.send(:filter_docs_with_access!, :foo)
+      expect(flash[:notice]).to eq("You do not have permission to edit the documents: #{@disallowed.join(', ')}")
+    end
+    it 'using filter_docs_with_edit_access!' do
+      @allowed.each { |doc_id| expect(subject).to receive(:can?).with(:edit, doc_id).and_return(true) }
+      @disallowed.each { |doc_id| expect(subject).to receive(:can?).with(:edit, doc_id).and_return(false) }
+      subject.send(:filter_docs_with_edit_access!)
+      expect(flash[:notice]).to eq("You do not have permission to edit the documents: #{@disallowed.join(', ')}")
+    end
+    it 'using filter_docs_with_read_access!' do
+      @allowed.each { |doc_id| expect(subject).to receive(:can?).with(:read, doc_id).and_return(true) }
+      @disallowed.each { |doc_id| expect(subject).to receive(:can?).with(:read, doc_id).and_return(false) }
+      subject.send(:filter_docs_with_read_access!)
+      expect(flash[:notice]).to eq("You do not have permission to edit the documents: #{@disallowed.join(', ')}")
+    end
+    it "and be sassy if you didn't select anything" do
+      subject.batch = []
+      subject.send(:filter_docs_with_read_access!)
+      expect(flash[:notice]).to eq('Select something first')
+    end
+  end
+
+  it 'checks for empty' do
+    controller.batch = %w(77826928 94120425)
+    expect(controller.check_for_empty_batch?).to eq(false)
+    controller.batch = []
+    expect(controller.check_for_empty_batch?).to eq(true)
+  end
+end

data/spec/controllers/collections_controller_spec.rb

@@ -0,0 +1,272 @@
+require 'spec_helper'
+
+describe CollectionsController, type: :controller do
+  let(:user) { FactoryGirl.create(:user) }
+
+  before do
+    allow(controller).to receive(:has_access?).and_return(true)
+
+    sign_in user
+    allow_any_instance_of(User).to receive(:groups).and_return([])
+    allow(controller).to receive(:clear_session_user) ## Don't clear out the authenticated session
+  end
+
+  describe '#index' do
+    let!(:collection1) { FactoryGirl.create(:collection, title: ['Beta'], user: user) }
+    let!(:collection2) { FactoryGirl.create(:collection, title: ['Alpha'], user: user) }
+    let!(:generic_file) { create(:generic_work, user: user) }
+
+    it 'shows a list of collections sorted alphabetically' do
+      get :index
+      expect(response).to be_successful
+      expect(assigns[:document_list].map(&:id)).not_to include generic_file.id
+      expect(assigns[:document_list].map(&:id)).to match_array [collection2.id, collection1.id]
+    end
+  end
+
+  describe '#new' do
+    it 'assigns @collection' do
+      get :new
+      expect(assigns(:collection)).to be_kind_of(Collection)
+    end
+  end
+
+  describe '#create' do
+    it 'creates a Collection' do
+      expect do
+        post :create, collection: { title: ['My First Collection'],
+                                    description: ["The Description\r\n\r\nand more"] }
+      end.to change { Collection.count }.by(1)
+      expect(assigns[:collection].title).to eq ['My First Collection']
+      expect(assigns[:collection].description).to eq ["The Description\r\n\r\nand more"]
+      expect(assigns[:collection].depositor).to eq(user.user_key)
+      expect(response).to redirect_to collection_path(assigns[:collection])
+    end
+
+    it 'adds docs to collection if batch ids provided' do
+      @asset1 = create(:generic_work, user: user)
+      @asset2 = create(:generic_work, user: user)
+      post :create, batch_document_ids: [@asset1, @asset2],
+                    collection: { title: ['My Secong Collection'],
+                                  description: ["The Description\r\n\r\nand more"] }
+      expect(assigns[:collection].members).to eq [@asset1, @asset2]
+    end
+
+    it 'calls after_create' do
+      expect(controller).to receive(:after_create).and_call_original
+      post :create, collection: { title: ['My First Collection'],
+                                  description: ["The Description\r\n\r\nand more"] }
+    end
+
+    it 'adds one doc to collection if batch ids provided and add the collection id to the document in the colledction' do
+      @asset1 = create(:generic_work, user: user)
+      post :create, batch_document_ids: [@asset1],
+                    collection: { title: ['My Second Collection'],
+                                  description: ["The Description\r\n\r\nand more"] }
+      expect(assigns[:collection].members).to eq [@asset1]
+      asset_results = ActiveFedora::SolrService.instance.conn.get 'select', params: { fq: ["id:\"#{@asset1.id}\""], fl: ['id', Solrizer.solr_name(:collection)] }
+      expect(asset_results['response']['numFound']).to eq(1)
+      doc = asset_results['response']['docs'].first
+      expect(doc['id']).to eq @asset1.id
+      afterupdate = GenericWork.find(@asset1.id)
+      expect(doc[Solrizer.solr_name(:collection)]).to eq(afterupdate.to_solr[Solrizer.solr_name(:collection)])
+    end
+
+    it 'adds docs to collection if batch ids provided and add the collection id to the documents int he colledction' do
+      @asset1 = create(:generic_work, user: user)
+      @asset2 = create(:generic_work, user: user)
+      post :create, batch_document_ids: [@asset1, @asset2],
+                    collection: { title: ['My Secong Collection'],
+                                  description: ["The Description\r\n\r\nand more"] }
+      expect(assigns[:collection].members).to eq [@asset1, @asset2]
+      asset_results = ActiveFedora::SolrService.instance.conn.get 'select', params: { fq: ["id:\"#{@asset1.id}\""], fl: ['id', Solrizer.solr_name(:collection)] }
+      expect(asset_results['response']['numFound']).to eq(1)
+      doc = asset_results['response']['docs'].first
+      expect(doc['id']).to eq(@asset1.id)
+      afterupdate = GenericWork.find(@asset1.id)
+      expect(doc[Solrizer.solr_name(:collection)]).to eq(afterupdate.to_solr[Solrizer.solr_name(:collection)])
+    end
+  end
+
+  describe '#update' do
+    let(:collection) { FactoryGirl.create(:collection, user: user) }
+    before do
+      @asset1 = create(:generic_work, user: user)
+      @asset2 = create(:generic_work, user: user)
+      @asset3 = create(:generic_work, user: user)
+    end
+
+    it 'updates collection metadata' do
+      put :update, id: collection.id, collection: { title: ['New Title'], description: ['New Description'] }
+      expect(response).to redirect_to collection_path(collection)
+      expect(assigns[:collection].title).to eq(['New Title'])
+      expect(assigns[:collection].description).to eq(['New Description'])
+    end
+
+    it 'calls after_update' do
+      expect(controller).to receive(:after_update).and_call_original
+      put :update, id: collection.id, collection: { title: ['New Title'], description: ['New Description'] }
+    end
+
+    context 'when updating fails' do
+      before do
+        allow_any_instance_of(Collection).to receive(:save).and_return(false)
+      end
+      it 'renders edit succesfully' do
+        put :update, id: collection.id, collection: { title: ['New Title'] }
+        expect(response).to render_template 'edit'
+      end
+    end
+
+    context 'when there are existing members in the collection' do
+      it 'supports adding batches of members' do
+        collection.members << @asset1
+        collection.save!
+        put :update, id: collection, collection: { members: 'add' }, batch_document_ids: [@asset2, @asset3]
+        expect(response).to redirect_to collection_path(collection)
+        expect(assigns[:collection].members).to match_array [@asset2, @asset3, @asset1]
+      end
+
+      it 'supports removing batches of members' do
+        collection.members = [@asset1, @asset2, @asset3]
+        collection.save!
+        put :update, id: collection, collection: { members: 'remove' }, batch_document_ids: [@asset1, @asset3]
+        expect(response).to redirect_to collection_path(collection)
+        expect(assigns[:collection].members).to eq([@asset2])
+      end
+    end
+
+    it 'supports setting members array' do
+      put :update, id: collection, collection: { members: 'add' }, batch_document_ids: [@asset2, @asset3, @asset1]
+      expect(response).to redirect_to collection_path(collection)
+      expect(assigns[:collection].members).to match_array [@asset2, @asset3, @asset1]
+    end
+
+    it 'set/un-sets collection on members' do
+      # Add to collection (sets collection on members)
+      put :update, id: collection, collection: { members: 'add' }, batch_document_ids: [@asset2, @asset3]
+      expect(assigns[:collection].members).to match_array [@asset2, @asset3]
+
+      # Remove from collection (un-sets collection on members)
+      put :update, id: collection, collection: { members: 'remove' }, batch_document_ids: [@asset2]
+      expect(assigns[:collection].members).not_to include(@asset2)
+    end
+
+    context 'when moving members between collections' do
+      before do
+        collection.members = [@asset1, @asset2, @asset3]
+        collection.save!
+      end
+      let(:collection2) do
+        Collection.create(title: ['Some Collection']) do |col|
+          col.apply_depositor_metadata(user.user_key)
+        end
+      end
+
+      it 'moves the members' do
+        put :update, id: collection, collection: { members: 'move' },
+                     destination_collection_id: collection2, batch_document_ids: [@asset2, @asset3]
+        expect(collection.reload.members).to eq [@asset1]
+        expect(collection2.reload.members).to match_array [@asset2, @asset3]
+      end
+    end
+  end
+
+  describe '#destroy' do
+    describe 'valid collection' do
+      let!(:collection) { FactoryGirl.create(:collection, user: user) }
+      before do
+        expect(controller).to receive(:authorize!).and_return(true)
+      end
+
+      it 'deletes the collection' do
+        delete :destroy, id: collection
+        expect(response).to redirect_to Rails.application.routes.url_helpers.search_catalog_path
+        expect(flash[:notice]).to eq('Collection was successfully deleted.')
+      end
+
+      it 'calls after_destroy' do
+        expect(controller).to receive(:after_destroy).and_call_original
+        delete :destroy, id: collection
+      end
+
+      it 'updates members' do
+        asset1 = create(:generic_work, user: user)
+        collection.members << asset1
+        collection.save!
+        expect(asset1.in_collections).to eq [collection]
+
+        delete :destroy, id: collection
+        expect(asset1.in_collections).to eq []
+      end
+    end
+
+    it 'does not delete an invalid collection' do
+      expect { delete :destroy, id: 'zz:-1' }.to raise_error
+    end
+  end
+
+  describe '#show' do
+    context 'when there are no assets in the collection' do
+      let(:collection) { FactoryGirl.create(:collection, user: user) }
+      it 'shows no assets' do
+        get :show, id: collection
+        expect(response).to be_successful
+        expect(assigns[:presenter].id).to eq collection.id
+        expect(assigns[:member_docs]).to be_empty
+      end
+    end
+
+    context 'with a number of assets' do
+      let(:asset1) { create(:generic_work, title: ['First of the Assets'], read_users: [user.user_key]) }
+      let(:asset2) { create(:generic_work, title: ['Second of the Assets'], read_users: [user.user_key]) }
+      let(:asset3) { create(:generic_work, title: ['Third of the Assets'], read_users: [user.user_key]) }
+      let!(:collection) do
+        FactoryGirl.create(:collection, members: [asset1, asset2, asset3], user: user)
+      end
+
+      it 'queries the collections' do
+        get :show, id: collection, cq: 'First'
+        expect(assigns[:presenter].id).to eq collection.id
+        expect(assigns[:member_docs].map(&:id)).to match_array [asset1.id]
+      end
+
+      it 'returns the specified number of rows' do
+        get :show, id: collection, rows: '2'
+        expect(assigns[:presenter].id).to eq collection.id
+        expect(assigns[:member_docs].size).to eq 2
+      end
+
+      describe 'additional collections' do
+        let(:asset4) { create(:generic_work, user: user, title: [asset1.id.to_s], read_users: [user.user_key]) }
+        let!(:collection2) do
+          FactoryGirl.create(:collection, members: [asset4], user: user)
+        end
+        it 'shows only the collections assets' do
+          get :show, id: collection
+          expect(assigns[:presenter].id).to eq collection.id
+          expect(assigns[:member_docs].map(&:id)).to match_array [asset1.id, asset2.id, asset3.id]
+        end
+
+        it 'shows only the other collections assets' do
+          get :show, id: collection2
+          expect(assigns[:presenter].id).to eq collection2.id
+          expect(assigns[:member_docs].map(&:id)).to match_array [asset4.id]
+        end
+      end
+
+      context 'When there are search matches that are not in the collection' do
+        let!(:bad_asset1) { create(:generic_work, user: user, title: ["#{asset1.id} #{asset1.title.first}"]) }
+        let!(:bad_asset2) { create(:generic_work, user: user, title: ["#{asset1.id} #{asset1.title.first}"]) }
+
+        # NOTE: This test depends on title_tesim being in the qf in solrconfig.xml
+        it 'only shows the collection assets' do
+          get :show, id: collection, cq: "\"#{asset1.title.first}\""
+          expect(assigns[:presenter].id).to eq collection.id
+          expect(assigns[:member_docs].map(&:id)).not_to include bad_asset1.id, bad_asset2.id
+          expect(assigns[:member_docs].map(&:id)).to match_array [asset1.id]
+        end
+      end
+    end
+  end
+end

data/spec/controllers/curation_concerns/collections_controller_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe CollectionsController do
-  routes { Hydra::Collections::Engine.routes }
   before do
     allow_any_instance_of(User).to receive(:groups).and_return([])
   end
@@ -20,7 +19,7 @@ describe CollectionsController do
                                        title: ['Bogus Asset'],
                                        depositor: 'abc') }
   let(:collection_attrs) do
-    { title: 'My First Collection', description: "The Description\r\n\r\nand more" }
+    { title: ['My First Collection'], description: ["The Description\r\n\r\nand more"] }
   end
 
   let(:collection) { create(:collection, title: ['Collection Title'], user: user) }