sufia 5.0.0 → 6.0.0.beta1

data/spec/models/local_authority_spec.rb

@@ -13,15 +13,11 @@ describe LocalAuthority, :type => :model do
   before :all do
     class MyTestRdfDatastream; end
   end
+
   after :all do
     Object.send(:remove_const, :MyTestRdfDatastream)
   end
-  after do
-    DomainTerm.destroy_all
-    LocalAuthority.destroy_all
-    LocalAuthorityEntry.destroy_all
-  end
-  
+
   it "should harvest an ntriples RDF vocab" do
     harvest_nt
     expect(LocalAuthority.count).to eq(1)
@@ -30,7 +26,7 @@ describe LocalAuthority, :type => :model do
   it "should harvest an RDF/XML vocab (w/ an alt predicate)" do
     LocalAuthority.harvest_rdf("langs", [fixture_path + '/lexvo.rdf'],
                                format: 'rdfxml',
-                               predicate: RDF::URI("http://www.w3.org/2008/05/skos#prefLabel"))
+                               predicate: ::RDF::URI("http://www.w3.org/2008/05/skos#prefLabel"))
     expect(LocalAuthority.count).to eq(1)
     expect(LocalAuthorityEntry.count).to eq(35)
   end
@@ -41,9 +37,9 @@ describe LocalAuthority, :type => :model do
     expect(LocalAuthorityEntry.where(local_authority_id: auth.id).first.uri).to start_with('http://sws.geonames.org/')
     expect(LocalAuthorityEntry.count).to eq(149)
   end
-  
+
   describe "when vocabs are harvested" do
-    
+
     let(:num_auths)   { LocalAuthority.count }
     let(:num_entries) { LocalAuthorityEntry.count }
 
@@ -70,9 +66,9 @@ describe LocalAuthority, :type => :model do
       LocalAuthority.register_vocabulary(MyTestRdfDatastream, "geographic", "geo")
       expect(DomainTerm.count).to eq(1)
     end
-    
+
     describe "when vocabs are registered" do
-      
+
       before do
         LocalAuthority.register_vocabulary(MyTestRdfDatastream, "geographic", "geo")
         LocalAuthority.register_vocabulary(MyTestRdfDatastream, "genre", "genres")
@@ -81,7 +77,7 @@ describe LocalAuthority, :type => :model do
       it "should have some doamin terms" do
         expect(DomainTerm.count).to eq(2)
       end
-      
+
       it "should return nil for empty queries" do
         expect(LocalAuthority.entries_by_term("my_test", "geographic", "")).to be_nil
       end
@@ -97,7 +93,6 @@ describe LocalAuthority, :type => :model do
         hits = LocalAuthorityEntry.where("local_authority_id in (?)", authorities).where("label like ?", "A%").select("label, uri").limit(25)
         expect(LocalAuthority.entries_by_term("my_tests", "genre", "A").count).to eq(6)
       end
-   
     end
   end
 end

data/spec/models/proxy_deposit_request_spec.rb

@@ -13,14 +13,10 @@ describe ProxyDepositRequest, type: :model do
   end
 
   subject do
-    ProxyDepositRequest.new(pid: file.pid, sending_user: sender,
+    ProxyDepositRequest.new(pid: file.id, sending_user: sender,
       receiving_user: receiver, sender_comment: "please take this")
   end
 
-  after do
-    subject.destroy if subject.persisted?
-  end
-
   its(:status) { is_expected.to eq 'pending' }
   it { is_expected.to be_pending }
   its(:fulfillment_date) { is_expected.to be_nil }
@@ -82,7 +78,7 @@ describe ProxyDepositRequest, type: :model do
         subject.transfer_to = receiver.user_key
         subject.save!
         proxy_request = receiver.proxy_deposit_requests.first
-        expect(proxy_request.pid).to eq(file.pid)
+        expect(proxy_request.pid).to eq(file.id)
         expect(proxy_request.sending_user).to eq(sender)
       end
     end
@@ -98,7 +94,7 @@ describe ProxyDepositRequest, type: :model do
     context 'when the file is already being transferred' do
       it 'raises an error' do
         subject.save!
-        subject2 = ProxyDepositRequest.new(pid: file.pid, sending_user: sender, receiving_user: receiver2, sender_comment: 'please take this')
+        subject2 = ProxyDepositRequest.new(pid: file.id, sending_user: sender, receiving_user: receiver2, sender_comment: 'please take this')
         expect(subject2).not_to be_valid
         expect(subject2.errors[:open_transfer]).to eq(['must close open transfer on the file before creating a new one'])
       end

data/spec/models/single_use_link_spec.rb

@@ -1,16 +1,12 @@
 require 'spec_helper'
 
-describe SingleUseLink, :type => :model do
-  before(:all) do
+describe SingleUseLink do
+  before do
     @file = GenericFile.new
     @file.apply_depositor_metadata('mjg36')
     @file.save
   end
 
-  after(:all) do
-    @file.destroy
-  end
-
   let(:file) { @file }
 
   describe "create" do
@@ -21,32 +17,32 @@ describe SingleUseLink, :type => :model do
       expect(Digest::SHA2).to receive(:new).and_return(@hash)
      end
      it "should create show link" do
-      su = SingleUseLink.create itemId: file.pid, path: Sufia::Engine.routes.url_helpers.generic_file_path(file.pid)
+      su = SingleUseLink.create itemId: file.id, path: Sufia::Engine.routes.url_helpers.generic_file_path(file.id)
       expect(su.downloadKey).to eq(@hash)
-      expect(su.itemId).to eq(file.pid)
-      expect(su.path).to eq(Sufia::Engine.routes.url_helpers.generic_file_path(file.pid))
+      expect(su.itemId).to eq(file.id)
+      expect(su.path).to eq(Sufia::Engine.routes.url_helpers.generic_file_path(file.id))
       su.delete
      end
      it "should create show download link" do
-      su = SingleUseLink.create itemId: file.pid, path: Sufia::Engine.routes.url_helpers.download_path(file.pid)
+      su = SingleUseLink.create itemId: file.id, path: Sufia::Engine.routes.url_helpers.download_path(file.id)
       expect(su.downloadKey).to eq(@hash)
-      expect(su.itemId).to eq(file.pid)
-      expect(su.path).to eq(Sufia::Engine.routes.url_helpers.download_path(file.pid))
+      expect(su.itemId).to eq(file.id)
+      expect(su.path).to eq(Sufia::Engine.routes.url_helpers.download_path(file.id))
       su.delete
      end
   end
   describe "find" do
      describe "not expired" do
        before do
-          @su = SingleUseLink.create(downloadKey: 'sha2hashb', itemId: file.pid, path: Sufia::Engine.routes.url_helpers.download_path(file.noid), expires: DateTime.now.advance(hours: 1))
+          @su = SingleUseLink.create(downloadKey: 'sha2hashb', itemId: file.id, path: Sufia::Engine.routes.url_helpers.download_path(file.noid), expires: DateTime.now.advance(hours: 1))
        end
        it "should retrieve link" do
           link = SingleUseLink.where(downloadKey: 'sha2hashb').first
-          expect(link.itemId).to eq(file.pid)
+          expect(link.itemId).to eq(file.id)
        end
        it "should retrieve link with find_by" do
           link = SingleUseLink.find_by_downloadKey('sha2hashb')
-          expect(link.itemId).to eq(file.pid)
+          expect(link.itemId).to eq(file.id)
        end
        it "should expire link" do
           link = SingleUseLink.where(downloadKey: 'sha2hashb').first
@@ -55,7 +51,7 @@ describe SingleUseLink, :type => :model do
      end
      describe "expired" do
        before do
-          @su = SingleUseLink.create!(downloadKey: 'sha2hashb', itemId:file.pid, path:Sufia::Engine.routes.url_helpers.download_path(file.noid))
+          @su = SingleUseLink.create!(downloadKey: 'sha2hashb', itemId:file.id, path:Sufia::Engine.routes.url_helpers.download_path(file.noid))
 
           @su.update_attribute :expires, DateTime.now.advance(hours: -1)
        end

data/spec/models/solr_document_spec.rb

@@ -4,7 +4,7 @@ describe SolrDocument, :type => :model do
 
   describe "date_uploaded" do
     before do
-      subject['desc_metadata__date_uploaded_dtsi'] = '2013-03-14T00:00:00Z'
+      subject['date_uploaded_dtsi'] = '2013-03-14T00:00:00Z'
     end
     it "should be a date" do
       expect(subject.date_uploaded).to eq '03/14/2013'

data/spec/models/trophy_spec.rb

@@ -4,14 +4,12 @@ describe Trophy, :type => :model do
    before(:all) do
     @trophy = Trophy.create(user_id:99,generic_file_id:"99")
   end
-  after(:all) do
-    @trophy.delete
-  end
 
   it "should have a user" do
      expect(@trophy).to respond_to(:user_id)
      expect(@trophy.user_id).to eq(99)
   end
+
   it "should have a file" do
      expect(@trophy).to respond_to(:generic_file_id)
      expect(@trophy.generic_file_id).to eq("99")

data/spec/models/user_spec.rb

@@ -1,92 +1,67 @@
 require 'spec_helper'
 
 describe User, :type => :model do
-  before(:all) do
-    @user = FactoryGirl.find_or_create(:jill)
-    @another_user = FactoryGirl.find_or_create(:archivist)
-  end
-  after(:all) do
-    @user.destroy
-    @another_user.destroy
-  end
+  let(:user) { FactoryGirl.build(:user) }
+  let(:another_user) { FactoryGirl.build(:user) }
+
   it "should have an email" do
-    expect(@user.user_key).to eq("jilluser@example.com")
+    expect(user.user_key).to be_kind_of String
   end
   it "should have activity stream-related methods defined" do
-    expect(@user).to respond_to(:stream)
-    expect(@user).to respond_to(:events)
-    expect(@user).to respond_to(:profile_events)
-    expect(@user).to respond_to(:create_event)
-    expect(@user).to respond_to(:log_event)
-    expect(@user).to respond_to(:log_profile_event)
+    expect(user).to respond_to(:stream)
+    expect(user).to respond_to(:events)
+    expect(user).to respond_to(:profile_events)
+    expect(user).to respond_to(:create_event)
+    expect(user).to respond_to(:log_event)
+    expect(user).to respond_to(:log_profile_event)
   end
   it "should have social attributes" do
-    expect(@user).to respond_to(:twitter_handle)
-    expect(@user).to respond_to(:facebook_handle)
-    expect(@user).to respond_to(:googleplus_handle)
-    expect(@user).to respond_to(:linkedin_handle)
-    expect(@user).to respond_to(:orcid)
+    expect(user).to respond_to(:twitter_handle)
+    expect(user).to respond_to(:facebook_handle)
+    expect(user).to respond_to(:googleplus_handle)
+    expect(user).to respond_to(:linkedin_handle)
   end
-  describe 'ORCID validation and normalization' do
-    it 'saves when a valid bare ORCID is supplied' do
-      @user.orcid = '0000-0000-1111-2222'
-      expect(@user).to be_valid
-      expect(@user.save).to be true
-    end
-    it 'saves when a valid ORCID URI is supplied' do
-      @user.orcid = 'http://orcid.org/0000-0000-1111-2222'
-      expect(@user).to be_valid
-      expect(@user.save).to be true
-    end
-    it 'normalizes bare ORCIDs to URIs' do
-      @user.orcid = '0000-0000-1111-2222'
-      @user.save
-      expect(@user.orcid).to eq 'http://orcid.org/0000-0000-1111-2222'
-    end
-    it 'marks bad ORCIDs as invalid' do
-      @user.orcid = '000-000-111-222'
-      expect(@user).not_to be_valid
-      expect(@user.save).to be false
+
+  describe "#to_param" do
+    let(:user) { User.new(email: 'jilluser@example.com') }
+
+    it "should override to_param to make keys more recognizable in redis (and useable within Rails URLs)" do
+      expect(user.to_param).to eq("jilluser@example-dot-com")
     end
   end
-  it "should redefine to_param to make redis keys more recognizable (and useable within Rails URLs)" do
-    expect(@user.to_param).to eq("jilluser@example-dot-com")
-  end
+
   it "should have a cancan ability defined" do
-    expect(@user).to respond_to(:can?)
+    expect(user).to respond_to(:can?)
   end
   it "should not have any followers" do
-    expect(@user.followers_count).to eq(0)
-    expect(@another_user.follow_count).to eq(0)
+    expect(user.followers_count).to eq(0)
+    expect(another_user.follow_count).to eq(0)
   end
   describe "follow/unfollow" do
-    before(:all) do
-      @user = FactoryGirl.find_or_create(:jill)
-      @another_user = FactoryGirl.find_or_create(:archivist)
-      @user.follow(@another_user)
-    end
-    after do
-      @user.delete
-      @another_user.delete
+    let(:user) { FactoryGirl.create(:user) }
+    let(:another_user) { FactoryGirl.create(:user) }
+    before do
+      user.follow(another_user)
     end
+
     it "should be able to follow another user" do
-      expect(@user).to be_following(@another_user)
-      expect(@another_user).to_not be_following(@user)
-      expect(@another_user).to be_followed_by(@user)
-      expect(@user).to_not be_followed_by(@another_user)
+      expect(user).to be_following(another_user)
+      expect(another_user).to_not be_following(user)
+      expect(another_user).to be_followed_by(user)
+      expect(user).to_not be_followed_by(another_user)
     end
     it "should be able to unfollow another user" do
-      @user.stop_following(@another_user)
-      expect(@user).to_not be_following(@another_user)
-      expect(@another_user).to_not be_followed_by(@user)
+      user.stop_following(another_user)
+      expect(user).to_not be_following(another_user)
+      expect(another_user).to_not be_followed_by(user)
     end
   end
 
   describe "trophy_files" do
-    let(:user) { @user }
-    let(:file1) { GenericFile.new.tap { |f| f.apply_depositor_metadata(user); f.save! } }
-    let(:file2) { GenericFile.new.tap { |f| f.apply_depositor_metadata(user); f.save! } }
-    let(:file3) { GenericFile.new.tap { |f| f.apply_depositor_metadata(user); f.save! } }
+    let(:user) { FactoryGirl.create(:user) }
+    let(:file1) { GenericFile.create { |f| f.apply_depositor_metadata(user) } }
+    let(:file2) { GenericFile.create { |f| f.apply_depositor_metadata(user) } }
+    let(:file3) { GenericFile.create { |f| f.apply_depositor_metadata(user) } }
     let!(:trophy1) { user.trophies.create!(generic_file_id: file1.noid) }
     let!(:trophy2) { user.trophies.create!(generic_file_id: file2.noid) }
     let!(:trophy3) { user.trophies.create!(generic_file_id: file3.noid) }
@@ -98,8 +73,7 @@ describe User, :type => :model do
   end
 
   describe "activity streams" do
-    let(:now){DateTime.now.to_i}
-    let(:user) { @user }
+    let(:now) { DateTime.now.to_i }
     let(:activities) {
         [{ action: 'so and so edited their profile', timestamp: now },
         { action: 'so and so uploaded a file', timestamp: (now - 360 ) }]
@@ -124,19 +98,17 @@ describe User, :type => :model do
   describe "proxy_deposit_rights" do
     before do
       @subject = FactoryGirl.create :curator
-      @user1 = FactoryGirl.create :jill
-      @user2 = FactoryGirl.create :archivist
-      @subject.can_receive_deposits_from << @user1
-      @subject.can_make_deposits_for << @user2
+      @subject.can_receive_deposits_from << user
+      @subject.can_make_deposits_for << another_user
       @subject.save!
     end
     it "can_receive_deposits_from" do
-      expect(@subject.can_receive_deposits_from.to_a).to eq [@user1]
-      expect(@user1.can_make_deposits_for.to_a).to eq [@subject]
+      expect(@subject.can_receive_deposits_from.to_a).to eq [user]
+      expect(user.can_make_deposits_for.to_a).to eq [@subject]
     end
     it "can_make_deposits_for" do
-      expect(@subject.can_make_deposits_for.to_a).to eq [@user2]
-      expect(@user2.can_receive_deposits_from.to_a).to eq [@subject]
+      expect(@subject.can_make_deposits_for.to_a).to eq [another_user]
+      expect(another_user.can_receive_deposits_from.to_a).to eq [@subject]
     end
   end
 end

data/spec/presenters/sufia/version_list_presenter_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe Sufia::VersionListPresenter, :no_clean do
+  let(:resource_version) do
+    ActiveFedora::VersionsGraph::ResourceVersion.new.tap do |v|
+      v.uri = 'http://example.com/version1'
+      v.label = 'version1'
+      v.created = '2014-12-09T02:03:18.296Z'
+    end
+  end
+
+  subject { Sufia::VersionListPresenter.new([resource_version]) }
+
+  describe "#each" do
+    it "should yield version_presenters" do
+      subject.each do |v|
+        expect(v).to be_kind_of Sufia::VersionPresenter
+        expect(v.label).to eq 'version1'
+      end
+    end
+  end
+end

data/spec/presenters/sufia/version_presenter_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+describe Sufia::VersionPresenter, :no_clean do
+  let(:resource_version) do
+    ActiveFedora::VersionsGraph::ResourceVersion.new.tap do |v|
+      v.uri = 'http://example.com/version1'
+      v.label = 'version1'
+      v.created = '2014-12-09T02:03:18.296Z'
+    end
+  end
+
+  let(:presenter) { Sufia::VersionPresenter.new(resource_version) }
+
+  describe "#label" do
+    subject { presenter.label }
+    it { is_expected.to eq 'version1' }
+  end
+
+  describe "#uri" do
+    subject { presenter.uri }
+    it { is_expected.to eq 'http://example.com/version1' }
+  end
+
+  describe "#created" do
+    before do
+      # Stub out the local timezone to (+08:00)
+      t2 = Time.new(2014, 12, 8, 18, 3, 18, 8)
+      allow_any_instance_of(Time).to receive(:getlocal).and_return(t2)
+    end
+    subject { presenter.created }
+    it { is_expected.to eq "December 8th, 2014 18:03" }
+  end
+
+  describe "#current?" do
+    subject { presenter.current? }
+    it { is_expected.to be false }
+
+    context "when current! is set" do
+      before { presenter.current! }
+      it { is_expected.to be true }
+    end
+  end
+
+  describe "#committer" do
+    before do
+      VersionCommitter.create(version_id: resource_version.uri, committer_login: 'jill')
+    end
+    subject { presenter.committer }
+    it { is_expected.to eq 'jill' }
+  end
+end

data/spec/services/generic_file_audit_service_spec.rb

@@ -0,0 +1,85 @@
+require 'spec_helper'
+
+describe Sufia::GenericFileAuditService do
+  let(:f) do
+    GenericFile.create do |f|
+      f.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
+      f.apply_depositor_metadata('mjg36')
+    end
+  end
+
+  let(:service) { Sufia::GenericFileAuditService.new(f) }
+
+  describe "#audit" do
+    before do
+      # force a second version
+      gf = GenericFile.find(f.id)
+      gf.add_file('hello two', 'content', 'hello2.txt')
+      gf.save!
+    end
+
+    context "force an audit on a file with two versions" do
+      subject { service.audit }
+      specify "should return two log results" do
+        expect(subject.length).to eq(2)
+      end
+    end
+  end
+
+  describe "#audit_file" do
+    before do
+      # force a second version
+      gf = GenericFile.find(f.id)
+      gf.add_file('hello two', 'content', 'hello2.txt')
+      gf.save!
+    end
+
+    context "force an audit on a specific version" do
+      subject { service.send(:audit_file, "content", f.content.versions.first.uri) }
+      specify "should return a single log result" do
+        expect(subject).to_not be_nil
+      end
+    end
+  end
+
+  describe "#audit_stat" do
+    subject { service.send(:audit_stat) }
+    context "when no audits have been run" do
+      it "should report that audits have not been run" do
+        expect(subject).to eq "Audits have not yet been run on this file."
+      end
+    end
+
+    context "when no audit is pasing" do
+      before do
+       ChecksumAuditLog.create!(pass: 1, pid: f.id, version: f.content.versions.first.label, dsid: 'content')
+      end
+
+      it "should report that audits have not been run" do
+        expect(subject).to eq 1
+      end
+    end
+  end
+
+  describe "#human_readable_audit_status" do
+    subject do
+      expect(service).to receive(:audit_stat).and_return(audit_stat)
+      service.human_readable_audit_status
+    end
+
+    context "when audit_stat is 0" do
+      let(:audit_stat) { 0 }
+      it { is_expected.to eq 'failing' }
+    end
+
+    context "when audit_stat is 1" do
+      let(:audit_stat) { 1 }
+      it { is_expected.to eq 'passing' }
+    end
+
+    context "when audit_stat is something else" do
+      let(:audit_stat) { 'something else' }
+      it { is_expected.to eq 'something else' }
+    end
+  end
+end