sufia 7.2.0 → 7.3.0.rc1

data/spec/jobs/batch_create_job_spec.rb

@@ -1,30 +1,24 @@
 describe BatchCreateJob do
   let(:user) { create(:user) }
-  let(:log) { create(:batch_create_operation, user: user) }
+  let(:log)  { create(:batch_create_operation, user: user) }
 
   before do
     allow(CharacterizeJob).to receive(:perform_later)
     allow(CurationConcerns.config.callback).to receive(:run)
-    allow(CurationConcerns.config.callback).to receive(:set?)
-      .with(:after_batch_create_success)
-      .and_return(true)
-    allow(CurationConcerns.config.callback).to receive(:set?)
-      .with(:after_batch_create_failure)
-      .and_return(true)
+    allow(CurationConcerns.config.callback).to receive(:set?).with(:after_batch_create_success).and_return(true)
+    allow(CurationConcerns.config.callback).to receive(:set?).with(:after_batch_create_failure).and_return(true)
   end
 
   describe "#perform" do
-    let(:file1) { File.open(fixture_path + '/world.png') }
-    let(:file2) { File.open(fixture_path + '/image.jp2') }
-    let(:upload1) { Sufia::UploadedFile.create(user: user, file: file1) }
-    let(:upload2) { Sufia::UploadedFile.create(user: user, file: file2) }
-    let(:title) { { upload1.id.to_s => 'File One', upload2.id.to_s => 'File Two' } }
-    let(:resource_types) { { upload1.id.to_s => 'Article', upload2.id.to_s => 'Image' } }
-    let(:metadata) { { keyword: [] } }
+    let(:upload1) { Sufia::UploadedFile.create(user: user, file: File.open(fixture_path + '/world.png')) }
+    let(:upload2) { Sufia::UploadedFile.create(user: user, file: File.open(fixture_path + '/image.jp2')) }
+    let(:title)          { { upload1.id.to_s => 'File One', upload2.id.to_s => 'File Two' } }
+    let(:resource_types) { { upload1.id.to_s => 'Article',  upload2.id.to_s => 'Image'    } }
+    let(:metadata)       { { keyword: [], model: 'GenericWork' } }
     let(:uploaded_files) { [upload1.id.to_s, upload2.id.to_s] }
-    let(:errors) { double(full_messages: "It's broke!") }
-    let(:work) { double(errors: errors) }
-    let(:actor) { double(curation_concern: work) }
+    # let(:errors) { double(full_messages: "It's broke!") }
+    let(:work)   { build(:generic_work) }
+    let(:actor)  { double(curation_concern: work) }
 
     subject do
       described_class.perform_later(user,
@@ -36,7 +30,7 @@ describe BatchCreateJob do
     end
 
     it "updates work metadata" do
-      expect(CurationConcerns::CurationConcern).to receive(:actor).and_return(actor).twice
+      expect(CurationConcerns::CurationConcern).to receive(:actor).with(an_instance_of(GenericWork), user).and_return(actor).twice
       expect(actor).to receive(:create).with(keyword: [], title: ['File One'], resource_type: ["Article"], uploaded_files: ['1']).and_return(true)
       expect(actor).to receive(:create).with(keyword: [], title: ['File Two'], resource_type: ["Image"], uploaded_files: ['2']).and_return(true)
       expect(CurationConcerns.config.callback).to receive(:run).with(:after_batch_create_success, user)
@@ -46,24 +40,19 @@ describe BatchCreateJob do
     end
 
     context "when permissions_attributes are passed" do
-      let(:metadata) do
-        { "permissions_attributes" => [{ "type" => "group", "name" => "public", "access" => "read" }] }
-      end
+      let(:permissions) { { 'permissions_attributes' => [{ 'type' => 'group', 'name' => 'public', 'access' => 'read' }] } }
+      let(:metadata) { super().merge(permissions) }
       it "sets the groups" do
         subject
-        work = GenericWork.last
-        expect(work.read_groups).to include "public"
+        expect(GenericWork.last.read_groups).to include "public"
       end
     end
 
     context "when visibility is passed" do
-      let(:metadata) do
-        { "visibility" => 'open' }
-      end
+      let(:metadata) { super().merge('visibility' => 'open') }
       it "sets public read access" do
         subject
-        work = GenericWork.last
-        expect(work.reload.read_groups).to eq ['public']
+        expect(GenericWork.last.reload.read_groups).to eq ['public']
       end
     end
 
@@ -76,5 +65,15 @@ describe BatchCreateJob do
         expect(log.reload.status).to eq 'failure'
       end
     end
+
+    context "when multiple resource types are passed" do
+      let(:resource_types) { { upload1.id.to_s => ['Image', 'Text'], upload2.id.to_s => ['Image', 'Text'] } }
+      it "sets them all on the record" do
+        subject
+        resource_types = GenericWork.last.reload.resource_type
+        expect(resource_types).to include 'Image'
+        expect(resource_types).to include 'Text'
+      end
+    end
   end
 end

data/spec/lib/sufia/arkivo_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe Sufia::Arkivo do
+  describe '.config' do
+    it 'returns a hash with the :url key' do
+      expect(described_class.config).to have_key(:url)
+    end
+  end
+  describe '.new_subscription_url' do
+    it 'returns a string' do
+      expect(described_class.new_subscription_url).to eq '/api/subscription'
+    end
+  end
+end

data/spec/lib/sufia/controlled_vocabulary/importer/downloader_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+require 'sufia/controlled_vocabulary/importer/downloader'
+
+RSpec.describe Sufia::ControlledVocabulary::Importer::Downloader do
+  describe '.fetch' do
+    let(:url) { 'http://example.org/' }
+    let(:output) { double('output') }
+    context 'when connection is successful' do
+      let(:io) { double('io') }
+      let(:stream) { 'foo' }
+      before do
+        allow(IO).to receive(:copy_stream).with(io, output).and_return(stream)
+        allow(described_class).to receive(:open).with(url).and_yield(io)
+      end
+      it 'returns an IO stream' do
+        expect(described_class.fetch(url, output)).to eq stream
+      end
+    end
+    context 'when connection is unsuccessful' do
+      let(:exception_io) { double('io', read: '') }
+      before do
+        allow(described_class).to receive(:open).with(url) do
+          raise OpenURI::HTTPError.new('', exception_io)
+        end
+      end
+      it 'raises an exception' do
+        expect { described_class.fetch(url, output) }.to raise_error(RuntimeError, "Unable to download from #{url}\n: ")
+      end
+    end
+  end
+end

data/spec/lib/sufia/move_all_works_to_admin_set_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+require 'sufia/move_all_works_to_admin_set'
+
+describe MoveAllWorksToAdminSet do
+  subject { described_class.run(admin_set) }
+  let(:admin_set) { create(:admin_set) }
+  let!(:work) { create(:work) }
+
+  it "moves the work into the admin set" do
+    subject
+    expect(work.reload.admin_set).to eq admin_set
+  end
+end

data/spec/lib/sufia/zotero_spec.rb

@@ -0,0 +1,8 @@
+describe Sufia::Zotero do
+  describe '.publications_url' do
+    let(:user_id) { 'foobar' }
+    it 'returns a string' do
+      expect(described_class.publications_url(user_id)).to eq "/users/#{user_id}/publications/items"
+    end
+  end
+end

data/spec/models/sufia/ability_spec.rb

@@ -39,6 +39,46 @@ describe Sufia::Ability, type: :model do
     it { is_expected.to be_able_to(:read, Sufia::Statistics) }
     it { is_expected.to be_able_to(:read, :admin_dashboard) }
     it { is_expected.to be_able_to(:manage, AdminSet) }
+    it { is_expected.to be_able_to(:create, AdminSet) }
+  end
+
+  describe "AdminSets and PermissionTemplates" do
+    let(:permission_template) { build(:permission_template, admin_set_id: admin_set.id) }
+    let(:permission_template_access) { build(:permission_template_access, permission_template: permission_template) }
+    let(:user) { create(:user) }
+    let(:admin_set) { create(:admin_set) }
+
+    RSpec.shared_examples 'A user with additional access' do
+      it { is_expected.to be_able_to(:edit, admin_set) }
+      it { is_expected.to be_able_to(:update, admin_set) }
+      it { is_expected.to be_able_to(:destroy, admin_set) }
+      it { is_expected.to be_able_to(:create, permission_template) }
+      it { is_expected.to be_able_to(:create, permission_template_access) }
+    end
+
+    describe 'as admin' do
+      before { expect(RoleMapper).to receive(:byname).and_return(user.user_key => ['admin']).at_least(1).times }
+      it '#admin? is true' do
+        expect(ability).to be_admin
+      end
+      it_behaves_like 'A user with additional access'
+    end
+
+    describe 'via AdminSet-specific edit_users' do
+      let(:admin_set) { create(:admin_set, edit_users: [user]) }
+      it '#admin? is false' do
+        expect(ability).not_to be_admin
+      end
+      it_behaves_like 'A user with additional access'
+    end
+
+    describe "a user without edit access" do
+      it { is_expected.not_to be_able_to(:edit, admin_set) }
+      it { is_expected.not_to be_able_to(:update, admin_set) }
+      it { is_expected.not_to be_able_to(:destroy, admin_set) }
+      it { is_expected.not_to be_able_to(:create, permission_template) }
+      it { is_expected.not_to be_able_to(:create, permission_template_access) }
+    end
   end
 
   describe "proxies and transfers" do
@@ -46,7 +86,7 @@ describe Sufia::Ability, type: :model do
     let(:user) { create(:user) }
     let(:work) { create(:work, user: sender) }
 
-    it { should_not be_able_to(:transfer, work.id) }
+    it { is_expected.not_to be_able_to(:transfer, work.id) }
 
     describe "user_is_depositor?" do
       subject { ability.send(:user_is_depositor?, work.id) }
@@ -55,34 +95,34 @@ describe Sufia::Ability, type: :model do
 
     context "with a ProxyDepositRequest for a work they have deposited" do
       subject { Ability.new(sender) }
-      it { should be_able_to(:transfer, work.id) }
+      it { is_expected.to be_able_to(:transfer, work.id) }
     end
 
     context "with a ProxyDepositRequest that they receive" do
       let(:request) { ProxyDepositRequest.create!(work_id: work.id, receiving_user: user, sending_user: sender) }
-      it { should be_able_to(:accept, request) }
-      it { should be_able_to(:reject, request) }
-      it { should_not be_able_to(:destroy, request) }
+      it { is_expected.to be_able_to(:accept, request) }
+      it { is_expected.to be_able_to(:reject, request) }
+      it { is_expected.not_to be_able_to(:destroy, request) }
 
       context "and the request has already been accepted" do
         let(:request) { ProxyDepositRequest.create!(work_id: work.id, receiving_user: user, sending_user: sender, status: 'accepted') }
-        it { should_not be_able_to(:accept, request) }
-        it { should_not be_able_to(:reject, request) }
-        it { should_not be_able_to(:destroy, request) }
+        it { is_expected.not_to be_able_to(:accept, request) }
+        it { is_expected.not_to be_able_to(:reject, request) }
+        it { is_expected.not_to be_able_to(:destroy, request) }
       end
     end
 
     context "with a ProxyDepositRequest they are the sender of" do
       let(:request) { ProxyDepositRequest.create!(work_id: work.id, receiving_user: sender, sending_user: user) }
-      it { should_not be_able_to(:accept, request) }
-      it { should_not be_able_to(:reject, request) }
-      it { should be_able_to(:destroy, request) }
+      it { is_expected.not_to be_able_to(:accept, request) }
+      it { is_expected.not_to be_able_to(:reject, request) }
+      it { is_expected.to be_able_to(:destroy, request) }
 
       context "and the request has already been accepted" do
         let(:request) { ProxyDepositRequest.create!(work_id: work.id, receiving_user: sender, sending_user: user, status: 'accepted') }
-        it { should_not be_able_to(:accept, request) }
-        it { should_not be_able_to(:reject, request) }
-        it { should_not be_able_to(:destroy, request) }
+        it { is_expected.not_to be_able_to(:accept, request) }
+        it { is_expected.not_to be_able_to(:reject, request) }
+        it { is_expected.not_to be_able_to(:destroy, request) }
       end
     end
   end

data/spec/models/sufia/permission_template_spec.rb

@@ -0,0 +1,144 @@
+describe Sufia::PermissionTemplate do
+  let(:admin_set) { create(:admin_set) }
+  let(:permission_template) { described_class.new(attributes) }
+  let(:attibutes) { { admin_set_id: admin_set.id } }
+
+  describe "#release_fixed_date?" do
+    subject { permission_template.release_fixed_date? }
+    context "with release_period='fixed'" do
+      let(:attributes) { { admin_set_id: admin_set.id, release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_FIXED } }
+      it { is_expected.to be true }
+    end
+    context "with other release_period" do
+      let(:attributes) { { admin_set_id: admin_set.id, release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY } }
+      it { is_expected.to be false }
+    end
+  end
+
+  describe "#release_no_delay?" do
+    subject { permission_template.release_no_delay? }
+    context "with release_period='now'" do
+      let(:attributes) { { admin_set_id: admin_set.id, release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY } }
+      it { is_expected.to be true }
+    end
+    context "with other release_period" do
+      let(:attributes) { { admin_set_id: admin_set.id, release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_FIXED } }
+      it { is_expected.to be false }
+    end
+  end
+
+  describe "#release_before_date?" do
+    subject { permission_template.release_before_date? }
+    context "with release_period='before'" do
+      let(:attributes) { { admin_set_id: admin_set.id, release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_BEFORE_DATE } }
+      it { is_expected.to be true }
+    end
+    context "with maximum embargo period (release_period of 1 year)" do
+      let(:attributes) { { admin_set_id: admin_set.id, release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_1_YEAR } }
+      it { is_expected.to be true }
+    end
+    context "with other release_period" do
+      let(:attributes) { { admin_set_id: admin_set.id, release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_FIXED } }
+      it { is_expected.to be false }
+    end
+  end
+
+  describe "#release_max_embargo?" do
+    subject { permission_template.release_max_embargo? }
+    context "with release_period of 1 year" do
+      let(:attributes) { { admin_set_id: admin_set.id, release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_1_YEAR } }
+      it { is_expected.to be true }
+    end
+    context "with release_period of 2 years" do
+      let(:attributes) { { admin_set_id: admin_set.id, release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_2_YEARS } }
+      it { is_expected.to be true }
+    end
+    context "with other release_period" do
+      let(:attributes) { { admin_set_id: admin_set.id, release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_FIXED } }
+      it { is_expected.to be false }
+    end
+  end
+
+  describe "#release_date" do
+    subject { permission_template.release_date }
+    let(:today) { Time.zone.today }
+    context "with today and release_fixed_date?" do
+      let(:attributes) { { admin_set_id: admin_set.id, release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_FIXED, release_date: today } }
+      it { is_expected.to eq today }
+    end
+    context "with today and release_before_date?" do
+      let(:attributes) { { admin_set_id: admin_set.id, release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_BEFORE_DATE, release_date: today } }
+      it { is_expected.to eq today }
+    end
+    context "with release_period of 6 months" do
+      let(:attributes) { { admin_set_id: admin_set.id, release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_6_MONTHS } }
+      it { is_expected.to eq today + 6.months }
+    end
+    context "with release_period of 1 year" do
+      let(:attributes) { { admin_set_id: admin_set.id, release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_1_YEAR } }
+      it { is_expected.to eq today + 1.year }
+    end
+    context "with release_no_delay?" do
+      let(:attributes) { { admin_set_id: admin_set.id, release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY } }
+      it { is_expected.to eq today }
+    end
+  end
+
+  describe "#valid_release_date?" do
+    let(:date) { Time.zone.today + 6.months }
+    subject { permission_template.valid_release_date?(date) }
+    context "with any release date and one is not required" do
+      let(:attributes) { { admin_set_id: admin_set.id } }
+      it { is_expected.to eq true }
+    end
+    context "with matching date and release_fixed_date?" do
+      let(:attributes) { { admin_set_id: admin_set.id, release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_FIXED, release_date: date } }
+      it { is_expected.to eq true }
+    end
+    context "with non-matching date and release_fixed_date?" do
+      let(:attributes) { { admin_set_id: admin_set.id, release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_FIXED, release_date: date + 1.day } }
+      it { is_expected.to eq false }
+    end
+    context "with exact match date and release_before_date?" do
+      let(:attributes) { { admin_set_id: admin_set.id, release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_BEFORE_DATE, release_date: date } }
+      it { is_expected.to eq true }
+    end
+    context "with future, valid date and release_before_date?" do
+      let(:date) { Time.zone.today + 1.day }
+      let(:attributes) { { admin_set_id: admin_set.id, release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_BEFORE_DATE, release_date: Time.zone.today + 1.month } }
+      it { is_expected.to eq true }
+    end
+    context "with future, invalid date and release_before_date?" do
+      let(:date) { Time.zone.today + 1.year }
+      let(:attributes) { { admin_set_id: admin_set.id, release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_BEFORE_DATE, release_date: Time.zone.today + 1.month } }
+      it { is_expected.to eq false }
+    end
+    context "with today release and release_no_delay?" do
+      let(:date) { Time.zone.today }
+      let(:attributes) { { admin_set_id: admin_set.id, release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY } }
+      it { is_expected.to eq true }
+    end
+    context "with tomorrow release and release_no_delay?" do
+      let(:date) { Time.zone.today + 1.day }
+      let(:attributes) { { admin_set_id: admin_set.id, release_period: Sufia::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY } }
+      it { is_expected.to eq false }
+    end
+  end
+
+  describe "#valid_visibility?" do
+    let(:visibility) { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC }
+    subject { permission_template.valid_visibility?(visibility) }
+    context "with matching visibility" do
+      let(:attributes) { { admin_set_id: admin_set.id, visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC } }
+      it { is_expected.to eq true }
+    end
+    context "with non-matching visibility" do
+      let(:attributes) { { admin_set_id: admin_set.id, visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED } }
+      it { is_expected.to eq false }
+    end
+    context "with visibility when none required" do
+      let(:attributes) { { admin_set_id: admin_set.id } }
+      it { is_expected.to eq true }
+    end
+  end
+end

data/spec/models/sufia/user_usage_stats_spec.rb

@@ -2,8 +2,8 @@ describe Sufia::UserUsageStats do
   subject { FactoryGirl.create(:user) }
 
   describe 'with cached stats' do
-    let!(:stat_1_day_ago) { UserStat.create!(user_id: subject.id, date: 1.day.ago, file_views: 3, file_downloads: 2) }
-    let!(:stat_2_days_ago) { UserStat.create!(user_id: subject.id, date: 2.days.ago, file_views: 2, file_downloads: 1) }
+    let!(:stat_1_day_ago) { UserStat.create!(user_id: subject.id, date: 1.day.ago, file_views: 3, file_downloads: 2, work_views: 5) }
+    let!(:stat_2_days_ago) { UserStat.create!(user_id: subject.id, date: 2.days.ago, file_views: 2, file_downloads: 1, work_views: 7) }
 
     let!(:someone_elses_user_id) { subject.id + 1 }
     let!(:not_my_stat) { UserStat.create!(user_id: someone_elses_user_id, date: 2.days.ago, file_views: 10, file_downloads: 11) }
@@ -19,6 +19,12 @@ describe Sufia::UserUsageStats do
         expect(subject.total_file_downloads).to eq 3
       end
     end
+
+    describe '#total_work_views' do
+      it 'returns the total work views for that user' do
+        expect(subject.total_work_views).to eq 12
+      end
+    end
   end
 
   describe 'with empty cache' do

data/spec/presenters/sufia/homepage_presenter_spec.rb

@@ -12,7 +12,7 @@ describe Sufia::HomepagePresenter do
     context "when config is not set to always_display_share_button" do
       before do
         allow(Sufia.config).to receive(:always_display_share_button).and_return(false)
-        allow(ability).to receive(:can?).with(:create, GenericWork).and_return(false)
+        allow(ability).to receive(:can?).with(:create, an_instance_of(Class)).and_return(false)
       end
       it { is_expected.to be false }
     end