sufia 6.3.0 → 6.4.0

data/lib/generators/sufia/templates/catalog_controller.rb

@@ -20,11 +20,11 @@ class CatalogController < ApplicationController
   skip_before_filter :default_html_head
 
   def self.uploaded_field
-    solr_name('date_uploaded', :stored_sortable, type: :date)
+    solr_name('system_create', :stored_sortable, type: :date)
   end
 
   def self.modified_field
-    solr_name('date_modified', :stored_sortable, type: :date)
+    solr_name('system_modified', :stored_sortable, type: :date)
   end
 
   configure_blacklight do |config|

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = "6.3.0"
+  VERSION = "6.4.0"
 end

data/spec/actors/generic_file/actor_spec.rb

@@ -69,6 +69,41 @@ describe Sufia::GenericFile::Actor do
         expect(VersionCommitter.where(version_id: versions.last.uri).pluck(:committer_login)).to eq [second_user.user_key]
       end
     end
+
+    context "with collection" do
+      let(:file)       { "world.png" }
+      let(:actor)      { described_class.new(generic_file, user) }
+      let(:col_editable) do
+        Collection.new(title: 'editable', description: 'user can edit this collection') do |c|
+          c.apply_depositor_metadata(user)
+        end
+      end
+      let(:col_editable_id) { col_editable.id }
+      let(:col_not_editable) { Collection.new(title: 'not editable', description: 'user cannot edit this collection') }
+      let(:col_not_editable_id) { col_not_editable.id }
+      before do
+        allow(generic_file).to receive(:label).and_return(file)
+        allow(col_editable).to receive(:id).and_return('ce')
+        allow(Collection).to receive(:find).with(col_editable_id).and_return(col_editable)
+        allow(user).to receive(:can?).with(:edit, col_editable).and_return(true)
+        allow(col_not_editable).to receive(:id).and_return('cne')
+        allow(Collection).to receive(:find).with(col_not_editable_id).and_return(col_not_editable)
+        allow(user).to receive(:can?).with(:edit, col_not_editable).and_return(false)
+        allow(Sufia.queue).to receive(:push)
+      end
+
+      it "adds file to collection when user can edit the collection" do
+        actor.create_content(fixture_file_upload(file), file, 'content', 'image/png', col_editable_id)
+        updated_collection = Collection.find(col_editable_id)
+        expect(updated_collection.member_ids).to eq [generic_file.id]
+      end
+
+      it "does not add file to collection when user can NOT edit the collection" do
+        actor.create_content(fixture_file_upload(file), file, 'content', 'image/png', col_not_editable_id)
+        updated_collection = Collection.find(col_not_editable_id)
+        expect(updated_collection.member_ids).to eq []
+      end
+    end
   end
 
   describe "#virus_check" do

data/spec/controllers/admin_stats_controller_spec.rb

@@ -14,6 +14,10 @@ describe Admin::StatsController, type: :controller do
     before do
       sign_in user1
     end
+    it "counts the users" do
+      get :index
+      expect(assigns[:presenter].users_count).to eq 2
+    end
 
     it 'allows an authorized user to view the page' do
       get :index
@@ -22,26 +26,26 @@ describe Admin::StatsController, type: :controller do
       expect(response.body).to include('Total Blacklight Users')
     end
 
-    describe "querying user_stats" do
-      let(:one_day_ago_date) { 1.days.ago.to_datetime }
+    describe "querying stats_filters" do
+      let(:one_day_ago_date) { 1.day.ago.to_datetime }
       let(:two_days_ago_date) { 2.days.ago.to_datetime.end_of_day }
       let(:one_day_ago) { one_day_ago_date.strftime("%Y-%m-%d") }
       let(:two_days_ago) { two_days_ago_date.strftime("%Y-%m-%d") }
 
       it "defaults to latest 5 users" do
         get :index
-        expect(assigns[:recent_users]).to eq(User.order('created_at DESC').limit(5))
+        expect(assigns[:presenter].recent_users).to eq(User.order('created_at DESC').limit(5))
       end
-      it "allows queries against user_stats without an end date " do
+      it "allows queries against stats_filters without an end date " do
         expect(User).to receive(:where).with('id' => user1.id).once.and_return([user1])
         expect(User).to receive(:recent_users).with(one_day_ago_date, nil).and_return([user2])
-        get :index, users_stats: { start_date: one_day_ago }
-        expect(assigns[:recent_users]).to eq([user2])
+        get :index, stats_filters: { start_date: one_day_ago }
+        expect(assigns[:presenter].recent_users).to eq([user2])
       end
-      it "allows queries against user_stats with an end date" do
+      it "allows queries against stats_filters with an end date" do
         expect(User).to receive(:recent_users).with(two_days_ago_date, one_day_ago_date).and_return([user2])
-        get :index, users_stats: { start_date: two_days_ago, end_date: one_day_ago }
-        expect(assigns[:recent_users]).to eq([user2])
+        get :index, stats_filters: { start_date: two_days_ago, end_date: one_day_ago }
+        expect(assigns[:presenter].recent_users).to eq([user2])
       end
     end
 
@@ -56,7 +60,7 @@ describe Admin::StatsController, type: :controller do
       end
       it "provides accurate files_count, ensuring that solr deletes have been expunged first" do
         get :index
-        expect(assigns[:files_count][:total]).to eq(original_files_count - 1)
+        expect(assigns[:presenter].files_count[:total]).to eq(original_files_count - 1)
       end
     end
 
@@ -72,28 +76,28 @@ describe Admin::StatsController, type: :controller do
         end
         it "includes files but not collections" do
           get :index
-          expect(assigns[:files_count][:total]).to eq(3)
-          expect(assigns[:files_count][:public]).to eq(1)
-          expect(assigns[:files_count][:registered]).to eq(1)
-          expect(assigns[:files_count][:private]).to eq(1)
+          expect(assigns[:presenter].files_count[:total]).to eq(3)
+          expect(assigns[:presenter].files_count[:public]).to eq(1)
+          expect(assigns[:presenter].files_count[:registered]).to eq(1)
+          expect(assigns[:presenter].files_count[:private]).to eq(1)
         end
       end
 
       context "when start date set" do
         it "queries by start date" do
-          expect(GenericFile).to receive(:find_by_date_created).exactly(3).times.with(1.days.ago.to_datetime, nil).and_call_original
+          expect(GenericFile).to receive(:find_by_date_created).exactly(3).times.with(1.day.ago.to_datetime, nil).and_call_original
           expect(GenericFile).to receive(:where_public).and_call_original
           expect(GenericFile).to receive(:where_registered).and_call_original
-          get :index, users_stats: { file_start_date: 1.days.ago.strftime("%Y-%m-%d") }
+          get :index, stats_filters: { start_date: 1.day.ago.strftime("%Y-%m-%d") }
         end
       end
 
       context "when date range set" do
         it "queries by start and date" do
-          expect(GenericFile).to receive(:find_by_date_created).exactly(3).times.with(1.days.ago.to_datetime, 0.days.ago.to_datetime.end_of_day).and_call_original
+          expect(GenericFile).to receive(:find_by_date_created).exactly(3).times.with(1.day.ago.to_datetime, 0.days.ago.to_datetime.end_of_day).and_call_original
           expect(GenericFile).to receive(:where_public).and_call_original
           expect(GenericFile).to receive(:where_registered).and_call_original
-          get :index, users_stats: { file_start_date: 1.days.ago.strftime("%Y-%m-%d"), file_end_date: 0.days.ago.strftime("%Y-%m-%d") }
+          get :index, stats_filters: { start_date: 1.day.ago.strftime("%Y-%m-%d"), end_date: 0.days.ago.strftime("%Y-%m-%d") }
         end
       end
     end
@@ -121,12 +125,13 @@ describe Admin::StatsController, type: :controller do
 
       it "gathers user deposits" do
         get :index
-        expect(assigns[:depositors]).to include({ key: user1.user_key, deposits: 2, user: user1 }, key: user2.user_key, deposits: 1, user: user2)
+        expect(assigns[:presenter].depositors).to include({ key: user1.user_key, deposits: 2, user: user1 }, key: user2.user_key, deposits: 1, user: user2)
+        expect(assigns[:presenter].active_users).to eq("example.com" => 4, user1.user_key.split('@')[0] => 3, user2.user_key.split('@')[0] => 1)
       end
 
       it "gathers user deposits during a date range" do
-        get :index, deposit_stats: { start_date: 1.days.ago.strftime("%Y-%m-%d"), end_date: 0.days.ago.strftime("%Y-%m-%d") }
-        expect(assigns[:depositors]).to include({ key: user1.user_key, deposits: 1, user: user1 }, key: user2.user_key, deposits: 1, user: user2)
+        get :index, stats_filters: { start_date: 1.day.ago.strftime("%Y-%m-%d"), end_date: 0.days.ago.strftime("%Y-%m-%d") }
+        expect(assigns[:presenter].depositors).to include({ key: user1.user_key, deposits: 1, user: user1 }, key: user2.user_key, deposits: 1, user: user2)
       end
 
       context "more than 10 users" do
@@ -144,10 +149,35 @@ describe Admin::StatsController, type: :controller do
 
         it "gathers user deposits" do
           get :index
-          expect(assigns[:depositors]).to include({ key: user1.user_key, deposits: 2, user: user1 }, key: user2.user_key, deposits: 1, user: user2)
-          users.each { |user| expect(assigns[:depositors]).to include(key: user.user_key, deposits: 1, user: user) }
+          expect(assigns[:presenter].depositors).to include({ key: user1.user_key, deposits: 2, user: user1 }, key: user2.user_key, deposits: 1, user: user2)
+          users.each { |user| expect(assigns[:presenter].depositors).to include(key: user.user_key, deposits: 1, user: user) }
         end
       end
     end
+    describe "top formats" do
+      before do
+        GenericFile.new(id: "abc123") do |gf|
+          gf.apply_depositor_metadata(user1)
+          gf.mime_type = 'image/png'
+          gf.update_index
+        end
+        GenericFile.new(id: "def123") do |gf|
+          gf.apply_depositor_metadata(user2)
+          gf.mime_type = 'image/png'
+          gf.update_index
+        end
+        GenericFile.new(id: "zzz123") do |gf|
+          gf.create_date = [2.days.ago]
+          gf.apply_depositor_metadata(user1)
+          gf.mime_type = 'image/jpeg'
+          gf.update_index
+        end
+      end
+
+      it "gathers formats" do
+        get :index
+        expect(assigns[:presenter].top_formats).to eq("png" => 2, "jpeg" => 1)
+      end
+    end
   end
 end

data/spec/controllers/api/items_controller_spec.rb

@@ -7,19 +7,25 @@ describe API::ItemsController, type: :controller do
   end
 
   let(:user) { FactoryGirl.find_or_create(:jill) }
+  let!(:default_file) do
+    GenericFile.create(title: ['Foo Bar']) do |gf|
+      gf.apply_depositor_metadata(user)
+      gf.arkivo_checksum = '6872d21557992f6ad1d07375f19fbfaf'
+    end
+  end
 
   context 'with an HTTP GET or HEAD' do
     before do
-      post :create, format: :json, item: item
+      post :create, item, format: :json
     end
 
-    let(:deposited_file) { GenericFile.where(label: item['file']['filename']).take }
     let(:token) { user.arkivo_token }
     let(:item) { FactoryGirl.json(:post_item, token: token) }
+    let(:item_hash) { JSON.parse(item) }
 
     context 'with a missing token' do
       before do
-        get :show, format: :json, id: deposited_file.id
+        get :show, format: :json, id: default_file.id
       end
 
       subject { response }
@@ -33,7 +39,7 @@ describe API::ItemsController, type: :controller do
 
     context 'with an unfamiliar token' do
       before do
-        get :show, format: :json, id: deposited_file.id, token: get_token
+        get :show, format: :json, id: default_file.id, token: get_token
       end
 
       let(:get_token) { 'foobar' }
@@ -49,8 +55,8 @@ describe API::ItemsController, type: :controller do
 
     context 'with an unauthorized resource' do
       before do
-        allow_any_instance_of(User).to receive(:can?).with(:edit, deposited_file) { false }
-        get :show, format: :json, id: deposited_file.id, token: token
+        allow_any_instance_of(User).to receive(:can?).with(:edit, default_file) { false }
+        get :show, format: :json, id: default_file.id, token: token
       end
 
       subject { response }
@@ -58,18 +64,18 @@ describe API::ItemsController, type: :controller do
       it { is_expected.to have_http_status(401) }
 
       it 'loads the file' do
-        expect(assigns[:file]).to eq deposited_file
+        expect(assigns[:file]).to eq default_file
       end
 
       it 'provides a reason for refusing to act' do
-        expect(subject.body).to include("#{user} lacks access to #{deposited_file}")
+        expect(subject.body).to include("#{user} lacks access to #{default_file}")
       end
     end
 
     context 'with a resource not deposited via Arkivo' do
       before do
         allow_any_instance_of(GenericFile).to receive(:arkivo_checksum) { nil }
-        get :show, format: :json, id: deposited_file.id, token: token
+        get :show, format: :json, id: default_file.id, token: token
       end
 
       subject { response }
@@ -77,14 +83,14 @@ describe API::ItemsController, type: :controller do
       it { is_expected.to have_http_status(403) }
 
       it 'provides a reason for refusing to act' do
-        expect(subject.body).to include("Forbidden: #{deposited_file} not deposited via Arkivo")
+        expect(subject.body).to include("Forbidden: #{default_file} not deposited via Arkivo")
       end
     end
 
     context 'with a resource not found in the repository' do
       before do
-        allow(GenericFile).to receive(:find).with(deposited_file.id).and_raise(ActiveFedora::ObjectNotFoundError)
-        get :show, format: :json, id: deposited_file.id, token: token
+        allow(GenericFile).to receive(:find).with(default_file.id).and_raise(ActiveFedora::ObjectNotFoundError)
+        get :show, format: :json, id: default_file.id, token: token
       end
 
       subject { response }
@@ -92,13 +98,13 @@ describe API::ItemsController, type: :controller do
       it { is_expected.to have_http_status(404) }
 
       it 'provides a reason for refusing to act' do
-        expect(subject.body).to include("id '#{deposited_file.id}' not found")
+        expect(subject.body).to include("id '#{default_file.id}' not found")
       end
     end
 
     context 'with an authorized Arkivo-deposited resource' do
       before do
-        get :show, format: :json, id: deposited_file.id, token: token
+        get :show, format: :json, id: default_file.id, token: token
       end
 
       subject { response }
@@ -128,7 +134,7 @@ describe API::ItemsController, type: :controller do
 
     context 'with an invalid item' do
       before do
-        post :create, format: :json, item: item
+        post :create, item, format: :json
       end
 
       let(:item) { { foo: 'bar' }.to_json }
@@ -144,10 +150,10 @@ describe API::ItemsController, type: :controller do
 
     context 'with a valid item and matching token' do
       before do
-        expect { post :create, format: :json, item: item }.to change { GenericFile.count }.by(1)
+        expect { post :create, item, format: :json }.to change { GenericFile.count }.by(1)
       end
 
-      let(:deposited_file) { GenericFile.where(label: item['file']['filename']).take }
+      let!(:deposited_file) { GenericFile.where(label: item_hash['file']['filename']).take }
       let(:token) { user.arkivo_token }
       let(:item) { FactoryGirl.json(:post_item, token: token) }
       let(:item_hash) { JSON.parse(item) }
@@ -195,7 +201,7 @@ describe API::ItemsController, type: :controller do
 
     context 'with a valid item and unfamiliar token' do
       before do
-        post :create, format: :json, item: item
+        post :create, item, format: :json
       end
 
       let(:token) { 'unfamiliar_token' }
@@ -216,21 +222,21 @@ describe API::ItemsController, type: :controller do
   end
 
   context 'with an HTTP PUT' do
-    let(:post_deposited_file) { GenericFile.where(label: post_item['file']['filename']).take }
+    let(:post_deposited_file) { GenericFile.where(label: post_item_hash['file']['filename']).take }
     let(:post_token) { user.arkivo_token }
     let(:post_item) { FactoryGirl.json(:post_item, token: post_token) }
     let(:post_item_hash) { JSON.parse(post_item) }
 
     before do
-      expect { post :create, format: :json, item: post_item }.to change { GenericFile.count }.by(1)
+      expect { post :create, post_item, format: :json }.to change { GenericFile.count }.by(1)
     end
 
     context 'with a valid item, matching token, and authorized resource' do
       before do
-        put :update, id: post_deposited_file.id, format: :json, item: put_item
+        put :update, put_item, id: post_deposited_file.id, format: :json
       end
 
-      let(:put_deposited_file) { GenericFile.where(label: put_item['file']['filename']).take }
+      let(:put_deposited_file) { post_deposited_file.reload }
       let(:put_token) { user.arkivo_token }
       let(:put_item) { FactoryGirl.json(:put_item, token: put_token) }
       let(:put_item_hash) { JSON.parse(put_item) }
@@ -272,7 +278,7 @@ describe API::ItemsController, type: :controller do
     context 'with a valid item, matching token, authorized resource, but not Arkivo-deposited' do
       before do
         allow_any_instance_of(GenericFile).to receive(:arkivo_checksum) { nil }
-        put :update, id: post_deposited_file.id, format: :json, item: item
+        put :update, item, id: post_deposited_file.id, format: :json
       end
 
       let(:item) { FactoryGirl.json(:put_item, token: post_token) }
@@ -295,7 +301,7 @@ describe API::ItemsController, type: :controller do
         allow(GenericFile).to receive(:find).with(post_deposited_file.id) do
           raise(ActiveFedora::ObjectNotFoundError)
         end
-        put :update, id: post_deposited_file.id, format: :json, item: item
+        put :update, item, id: post_deposited_file.id, format: :json
       end
 
       subject { response }
@@ -311,7 +317,7 @@ describe API::ItemsController, type: :controller do
     context 'with a valid item, matching token, and unauthorized resource' do
       before do
         allow_any_instance_of(User).to receive(:can?).with(:edit, post_deposited_file) { false }
-        put :update, id: post_deposited_file.id, format: :json, item: item
+        put :update, item, id: post_deposited_file.id, format: :json
       end
 
       let(:item) { FactoryGirl.json(:put_item, token: post_token) }
@@ -335,7 +341,7 @@ describe API::ItemsController, type: :controller do
 
     context 'with a valid item and unfamiliar token' do
       before do
-        put :update, id: post_deposited_file.id, format: :json, item: item
+        put :update, item, id: post_deposited_file.id, format: :json
       end
 
       let(:token) { 'unfamiliar_token' }
@@ -356,7 +362,7 @@ describe API::ItemsController, type: :controller do
 
     context 'with an invalid item' do
       before do
-        put :update, id: post_deposited_file.id, format: :json, item: item
+        put :update, item, id: post_deposited_file.id, format: :json
       end
 
       let(:item) { { foo: 'bar' }.to_json }
@@ -373,16 +379,16 @@ describe API::ItemsController, type: :controller do
 
   context 'with an HTTP DELETE' do
     before do
-      post :create, format: :json, item: item
+      post :create, item, format: :json
     end
 
-    let(:deposited_file) { GenericFile.where(label: item['file']['filename']).take }
     let(:token) { user.arkivo_token }
     let(:item) { FactoryGirl.json(:post_item, token: token) }
+    let(:item_hash) { JSON.parse(item) }
 
     context 'with a missing token' do
       before do
-        delete :destroy, format: :json, id: deposited_file.id
+        delete :destroy, format: :json, id: default_file.id
       end
 
       subject { response }
@@ -396,7 +402,7 @@ describe API::ItemsController, type: :controller do
 
     context 'with an unfamiliar token' do
       before do
-        delete :destroy, format: :json, id: deposited_file.id, token: delete_token
+        delete :destroy, format: :json, id: default_file.id, token: delete_token
       end
 
       let(:delete_token) { 'foobar' }
@@ -412,8 +418,8 @@ describe API::ItemsController, type: :controller do
 
     context 'with an unauthorized resource' do
       before do
-        allow_any_instance_of(User).to receive(:can?).with(:edit, deposited_file) { false }
-        delete :destroy, format: :json, id: deposited_file.id, token: token
+        allow_any_instance_of(User).to receive(:can?).with(:edit, default_file) { false }
+        delete :destroy, format: :json, id: default_file.id, token: token
       end
 
       subject { response }
@@ -421,18 +427,18 @@ describe API::ItemsController, type: :controller do
       it { is_expected.to have_http_status(401) }
 
       it 'loads the file' do
-        expect(assigns[:file]).to eq deposited_file
+        expect(assigns[:file]).to eq default_file
       end
 
       it 'provides a reason for refusing to act' do
-        expect(subject.body).to include("#{user} lacks access to #{deposited_file}")
+        expect(subject.body).to include("#{user} lacks access to #{default_file}")
       end
     end
 
     context 'with a resource not deposited via Arkivo' do
       before do
         allow_any_instance_of(GenericFile).to receive(:arkivo_checksum) { nil }
-        delete :destroy, format: :json, id: deposited_file.id, token: token
+        delete :destroy, format: :json, id: default_file.id, token: token
       end
 
       subject { response }
@@ -440,14 +446,14 @@ describe API::ItemsController, type: :controller do
       it { is_expected.to have_http_status(403) }
 
       it 'provides a reason for refusing to act' do
-        expect(subject.body).to include("Forbidden: #{deposited_file} not deposited via Arkivo")
+        expect(subject.body).to include("Forbidden: #{default_file} not deposited via Arkivo")
       end
     end
 
     context 'with a resource not found in the repository' do
       before do
-        allow(GenericFile).to receive(:find).with(deposited_file.id).and_raise(ActiveFedora::ObjectNotFoundError)
-        delete :destroy, format: :json, id: deposited_file.id, token: token
+        allow(GenericFile).to receive(:find).with(default_file.id).and_raise(ActiveFedora::ObjectNotFoundError)
+        delete :destroy, format: :json, id: default_file.id, token: token
       end
 
       subject { response }
@@ -455,13 +461,13 @@ describe API::ItemsController, type: :controller do
       it { is_expected.to have_http_status(404) }
 
       it 'provides a reason for refusing to act' do
-        expect(subject.body).to include("id '#{deposited_file.id}' not found")
+        expect(subject.body).to include("id '#{default_file.id}' not found")
       end
     end
 
     context 'with an authorized Arkivo-deposited resource' do
       before do
-        expect { delete :destroy, format: :json, id: deposited_file.id, token: token }.to change { GenericFile.count }.by(-1)
+        expect { delete :destroy, format: :json, id: default_file.id, token: token }.to change { GenericFile.count }.by(-1)
       end
 
       subject { response }