sufia 6.0.0 → 6.1.0

data/spec/lib/sufia/arkivo/metadata_munger_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe Sufia::Arkivo::MetadataMunger do
+  subject { described_class.new(metadata) }
+
+  let(:metadata) { JSON.parse(FactoryGirl.json(:post_item))['metadata'] }
+
+  it 'makes camelCase symbols into underscored strings' do
+    expect(metadata).to include('resourceType', 'dateCreated', 'basedNear')
+    munged = subject.call
+    expect(munged).not_to include('resourceType', 'dateCreated', 'basedNear')
+    expect(munged).to include('resource_type', 'date_created', 'based_near')
+  end
+
+  it 'replaces url with related_url' do
+    expect(metadata).to include('url')
+    munged = subject.call
+    expect(munged).not_to include('url')
+    expect(munged).to include('related_url')
+  end
+
+  it 'replaces tags with tag' do
+    expect(metadata).to include('tags')
+    munged = subject.call
+    expect(munged).not_to include('tags')
+    expect(munged).to include('tag')
+  end
+
+  it 'replaces firstName and lastName with name' do
+    expect(name_parts(metadata['creators']).count).to eq 4
+    subject.call
+    expect(name_parts(metadata['creators']).count).to eq 0
+    expect(metadata['creators'].map { |c| c['name'] }.compact.count).to eq 4
+  end
+
+  it 'segregates creators and contributors' do
+  end
+
+  it 'deletes the original creators array' do
+    expect(metadata['creators']).not_to be_nil
+    munged = subject.call
+    expect(munged['creators']).to be_nil
+  end
+
+  def name_parts(creators)
+    creators.map { |c| c['firstName'] }.compact + creators.map { |c| c['lastName'] }.compact
+  end
+end

data/spec/lib/sufia/arkivo/schema_validator_spec.rb

@@ -0,0 +1,65 @@
+require 'spec_helper'
+
+describe Sufia::Arkivo::SchemaValidator do
+  let(:item) { JSON.parse(FactoryGirl.json(:post_item)) }
+
+  it 'ensures a token is included' do
+    expect {
+      described_class.new(item.except('token')).call
+    }.to raise_error(Sufia::Arkivo::InvalidItem, /required property of 'token'/)
+  end
+
+  it 'ensures a metadata section is included' do
+    expect {
+      described_class.new(item.except('metadata')).call
+    }.to raise_error(Sufia::Arkivo::InvalidItem, /required property of 'metadata'/)
+  end
+
+  it 'ensures a file section is included' do
+    expect {
+      described_class.new(item.except('file')).call
+    }.to raise_error(Sufia::Arkivo::InvalidItem, /required property of 'file'/)
+  end
+
+  it 'ensures the metadata has a title' do
+    item['metadata'].delete('title')
+    expect {
+      described_class.new(item).call
+    }.to raise_error(Sufia::Arkivo::InvalidItem, /required property of 'title'/)
+  end
+
+  it 'ensures the metadata has rights' do
+    item['metadata'].delete('rights')
+    expect {
+      described_class.new(item).call
+    }.to raise_error(Sufia::Arkivo::InvalidItem, /required property of 'rights'/)
+  end
+
+  it 'ensures the file has a b64-encoded content' do
+    item['file'].delete('base64')
+    expect {
+      described_class.new(item).call
+    }.to raise_error(Sufia::Arkivo::InvalidItem, /required property of 'base64'/)
+  end
+
+  it 'ensures the file has a checksum' do
+    item['file'].delete('md5')
+    expect {
+      described_class.new(item).call
+    }.to raise_error(Sufia::Arkivo::InvalidItem, /required property of 'md5'/)
+  end
+
+  it 'ensures the file has a filename' do
+    item['file'].delete('filename')
+    expect {
+      described_class.new(item).call
+    }.to raise_error(Sufia::Arkivo::InvalidItem, /required property of 'filename'/)
+  end
+
+  it 'ensures the file has a content type' do
+    item['file'].delete('contentType')
+    expect {
+      described_class.new(item).call
+    }.to raise_error(Sufia::Arkivo::InvalidItem, /required property of 'contentType'/)
+  end
+end

data/spec/lib/sufia/upload_complete_behavior_spec.rb

@@ -16,7 +16,7 @@ class UploadThingRedefine
 end
 
 describe Sufia::FilesController::UploadCompleteBehavior do
-  let (:test_id) {"123abc"}
+  let(:test_id) {"123abc"}
   context "Not overridden" do
     it "respond with the batch edit path" do
       expect(UploadThing.upload_complete_path(test_id)).to eq(Sufia::Engine.routes.url_helpers.batch_edit_path(test_id))

data/spec/lib/sufia/user_stat_importer_spec.rb

@@ -133,6 +133,50 @@ describe Sufia::UserStatImporter do
 
       expect(UserStat.count).to eq bilbos_stats.count + frodos_stats.count
     end
+
+    context "when Google analytics throws an error" do
+      let(:importer) { Sufia::UserStatImporter.new({number_of_retries: 4}) }
+
+      context "both error out completely" do
+        before do
+          expect(FileDownloadStat).to receive(:ga_statistics).exactly(12).times.and_raise(StandardError.new("GA error"))
+          expect(FileViewStat).to receive(:ga_statistics).exactly(12).times.and_raise(StandardError.new("GA error"))
+        end
+
+        it "stops after 4 tries on each of the 3 files" do
+          importer.import
+          expect(UserStat.count).to eq 0
+        end
+      end
+
+      context "Only View stats error out completely" do
+        before do
+          expect(FileViewStat).to receive(:ga_statistics).exactly(12).times.and_raise(StandardError.new("GA error"))
+        end
+        it "gathers the download stats even though the view stats are failing" do
+          importer.import
+          expect(UserStat.count).to eq 8 # 2 users for 4 days
+          UserStat.all.each do |stat|
+            expect(stat.file_views).to eq 0
+            expect(stat.file_downloads).not_to eq 0
+          end
+        end
+      end
+
+      context "Only Download stats error out completely" do
+        before do
+          expect(FileDownloadStat).to receive(:ga_statistics).exactly(12).times.and_raise(StandardError.new("GA error"))
+        end
+        it "gathers the view stats even though the download stats are failing" do
+          importer.import
+          expect(UserStat.count).to eq 8 # 2 users for 4 days
+          UserStat.all.each do |stat|
+            expect(stat.file_views).not_to eq 0
+            expect(stat.file_downloads).to eq 0
+          end
+        end
+      end
+    end
   end
 
   describe 'with existing data in cache' do
@@ -172,6 +216,22 @@ describe Sufia::UserStatImporter do
       sorted_ids = Sufia::UserStatImporter.new.sorted_users.map { |u| u.id }
       expect(sorted_ids).to eq([gollum.id, frodo.id, bilbo.id])
     end
+
+    context "a user is already up to date" do
+      let(:importer) {Sufia::UserStatImporter.new}
+      before do
+        allow(importer).to receive(:sorted_users).and_return([gollum, frodo, bilbo])
+        UserStat.create!(user_id: bilbo.id, date: dates[3], file_views: 999, file_downloads: 555)
+      end
+
+      it "skips if we already have uptodate information" do
+        expect(importer).to receive(:file_ids_for_user).with(gollum).and_call_original
+        expect(importer).to receive(:file_ids_for_user).with(frodo).and_call_original
+        #expect(importer).to receive(:file_ids_for_user).with(frodo.id).and_call_original
+        expect(importer).not_to receive(:file_ids_for_user).with(bilbo)
+        importer.import
+      end
+    end
   end
 end
 

data/spec/lib/sufia/zotero/config_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe Sufia::Zotero do
+  it { is_expected.to respond_to(:config) }
+
+  describe 'configuration' do
+    subject { Sufia::Zotero.reload_config! }
+
+    let(:client_key) { 'abc123' }
+    let(:client_secret) { '789xyz' }
+
+    before do
+      stub_const('ENV', {
+          'ZOTERO_CLIENT_KEY' => client_key,
+          'ZOTERO_CLIENT_SECRET' => client_secret
+        })
+    end
+
+    # Reload the config so other tests don't see the stub_const values
+    after(:context) { Sufia::Zotero.reload_config! }
+
+    it 'has a client key' do
+      expect(subject['client_key']).to eq(client_key)
+    end
+
+    it 'has a client secret' do
+      expect(subject['client_secret']).to eq(client_secret)
+    end
+  end
+end

data/spec/models/collection_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Collection, :type => :model do
   before do
     @user = FactoryGirl.create(:user)
-    @collection = Collection.new(title: "test collection").tap do |c|
+    @collection = Collection.new(id: 'mock-collection-with-members', title: "test collection") do |c|
       c.apply_depositor_metadata(@user.user_key)
     end
   end
@@ -21,15 +21,44 @@ describe Collection, :type => :model do
   describe "::bytes" do
     subject { @collection.bytes }
     context "with no items" do
-      before { @collection.save }
-      it { is_expected.to eq 0 }
+      it "gets zero without querying solr" do
+        expect(ActiveFedora::SolrService).not_to receive(:query)
+        is_expected.to eq 0
+      end
     end
 
-    context "with two 50 byte files" do
-      let(:bitstream) { double("content", size: "50")}
+    context "with three 33 byte files" do
+      let(:bitstream) { double("content", size: "33")}
       let(:file) { mock_model GenericFile, content: bitstream }
-      before { allow(@collection).to receive(:members).and_return([file, file]) }
-      it { is_expected.to eq 100 }
+      let(:documents) do
+        [{ 'id' => 'file-1', 'file_size_is' => 33 }, 
+         { 'id' => 'file-2', 'file_size_is' => 33 }, 
+         { 'id' => 'file-3', 'file_size_is' => 33 }]
+      end
+      let(:query) { ActiveFedora::SolrQueryBuilder.construct_query_for_rel(has_model: ::GenericFile.to_class_uri) }
+      let(:args) do
+        { fq: "{!join from=hasCollectionMember_ssim to=id}id:#{@collection.id}",
+        fl: "id, file_size_is",
+        rows: 3 }
+      end
+
+      before do
+        allow(@collection).to receive(:members).and_return([file, file, file])
+        allow(ActiveFedora::SolrService).to receive(:query).with(query, args).and_return(documents)
+      end
+
+      context "when saved" do
+        before do
+          allow(@collection).to receive(:new_record?).and_return(false)
+        end
+        it { is_expected.to eq 99 }
+      end
+
+      context "when not saved" do
+        it "raises an error" do
+          expect { subject }.to raise_error "Collection must be saved to query for bytes"
+        end
+      end
     end
 
   end

data/spec/models/file_download_stat_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
 RSpec.describe FileDownloadStat, :type => :model do
-  let (:file_id) {"99"}
-  let (:date) {DateTime.new}
-  let (:file_stat) {FileDownloadStat.create(downloads:"2", date: date, file_id: file_id)}
+  let(:file_id) {"99"}
+  let(:date) {DateTime.new}
+  let(:file_stat) {FileDownloadStat.create(downloads:"2", date: date, file_id: file_id)}
 
   it "has attributes" do
     expect(file_stat).to respond_to(:downloads)
@@ -46,7 +46,7 @@ RSpec.describe FileDownloadStat, :type => :model do
     }
 
     describe "cache empty" do
-      let (:stats) {
+      let(:stats) {
         expect(FileDownloadStat).to receive(:ga_statistics).and_return(sample_download_statistics)
         FileDownloadStat.statistics(file_id,Date.today-4.day)
       }
@@ -71,7 +71,7 @@ RSpec.describe FileDownloadStat, :type => :model do
 
       let!(:file_download_stat) { FileDownloadStat.create(date: (Date.today-5.day).to_datetime, file_id: file_id, downloads:"25")}
 
-      let (:stats) {
+      let(:stats) {
         expect(FileDownloadStat).to receive(:ga_statistics).and_return(sample_download_statistics)
         FileDownloadStat.statistics(file_id,Date.today-5.day)
       }

data/spec/models/file_usage_spec.rb

@@ -155,4 +155,27 @@ describe FileUsage, :type => :model do
 
     end
   end
+
+  describe "on a migrated file" do 
+    let(:date_uploaded) { "2014-12-31" }
+
+    let(:file_migrated) do
+      GenericFile.new.tap do |file|
+        file.apply_depositor_metadata("awead")
+        file.date_uploaded = date_uploaded
+        file.save
+      end
+    end
+
+    let(:usage) {
+      expect(FileDownloadStat).to receive(:ga_statistics).and_return(sample_download_statistics)
+      expect(FileViewStat).to receive(:ga_statistics).and_return(sample_pageview_statistics)
+      FileUsage.new(file_migrated.id)
+    }
+
+    it "should use the date_uploaded for analytics" do
+      expect(usage.created).to eq(date_uploaded)
+    end
+  end
+
 end

data/spec/models/file_view_stat_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
 RSpec.describe FileViewStat, :type => :model do
-  let (:file_id) {"99"}
-  let (:user_id) {123}
-  let (:date) {DateTime.new}
-  let (:file_stat) {FileViewStat.create(views:"25", date: date, file_id: file_id, user_id: user_id)}
+  let(:file_id) {"99"}
+  let(:user_id) {123}
+  let(:date) {DateTime.new}
+  let(:file_stat) {FileViewStat.create(views:"25", date: date, file_id: file_id, user_id: user_id)}
 
   it "has attributes" do
     expect(file_stat).to respond_to(:views)
@@ -46,7 +46,7 @@ RSpec.describe FileViewStat, :type => :model do
       ]
     }
     describe "cache empty" do
-      let (:stats) {
+      let(:stats) {
         expect(FileViewStat).to receive(:ga_statistics).and_return(sample_pageview_statistics)
         FileViewStat.statistics(file_id, Date.today-4.day, user_id)
       }
@@ -72,7 +72,7 @@ RSpec.describe FileViewStat, :type => :model do
 
       let!(:file_view_stat) { FileViewStat.create(date: (Date.today-5.day).to_datetime, file_id: file_id, views:"25")}
 
-      let (:stats) {
+      let(:stats) {
         expect(FileViewStat).to receive(:ga_statistics).and_return(sample_pageview_statistics)
         FileViewStat.statistics(file_id,Date.today-5.day)
       }

data/spec/models/fits_datastream_spec.rb

@@ -35,15 +35,10 @@ describe FitsDatastream, type: :model, unless: $in_travis do
     let(:datastream) { @file.characterization }
     let(:xml) { datastream.ng_xml }
     let(:namespace) { {'ns'=>'http://hul.harvard.edu/ois/xml/ns/fits/fits_output'} }
-    let(:solr_doc) { @file.to_solr }
 
     it "should make the fits XML" do
       expect(xml.xpath('//ns:imageWidth/text()', namespace).inner_text).to eq '50'
     end
-
-    it "should index into solr" do
-      expect(solr_doc[Solrizer.solr_name("mime_type")].first).to eq "image/png"
-    end
   end
 
   describe "video" do

data/spec/models/generic_file_spec.rb

@@ -8,6 +8,11 @@ describe GenericFile, :type => :model do
     @file.apply_depositor_metadata(user.user_key)
   end
 
+  describe "rdf type" do
+    subject { described_class.new.type }
+    it { is_expected.to eq [::RDF::URI.new('http://pcdm.org/models#Object')] }
+  end
+
   context "when it is initialized" do
     it "has empty arrays for all the properties" do
       subject.attributes.each do |k,v|
@@ -61,9 +66,21 @@ describe GenericFile, :type => :model do
   end
 
   describe "assign_id" do
-    it "should use the id service" do
-      expect(Sufia::IdService).to receive(:mint)
-      subject.assign_id
+    context "with noids enabled (by default)" do
+      it "uses the noid service" do
+        expect_any_instance_of(ActiveFedora::Noid::Service).to receive(:mint).once
+        subject.assign_id
+      end
+    end
+
+    context "with noids disabled" do
+      before { Sufia.config.enable_noids = false }
+      after { Sufia.config.enable_noids = true }
+
+      it "does not use the noid service" do
+        expect_any_instance_of(ActiveFedora::Noid::Service).not_to receive(:mint)
+        subject.assign_id
+      end
     end
   end
 
@@ -411,35 +428,32 @@ describe GenericFile, :type => :model do
 
   describe "noid integration" do
     before do
-      allow(Sufia::IdService).to receive(:mint).once.and_return(noid)
+      allow_any_instance_of(ActiveFedora::Noid::Service).to receive(:mint).and_return(noid)
     end
 
     let(:noid) { 'wd3763094' }
 
     subject do
-      GenericFile.create do |f|
-        f.apply_depositor_metadata('mjg36')
-      end
+      GenericFile.create { |f| f.apply_depositor_metadata('mjg36') }
     end
 
     it "runs the overridden #assign_id method" do
-      expect(Sufia::IdService).to receive(:mint).once
-      GenericFile.create do |f|
-        f.apply_depositor_metadata('mjg36')
-      end
+      expect_any_instance_of(ActiveFedora::Noid::Service).to receive(:mint).once
+      GenericFile.create { |f| f.apply_depositor_metadata('mjg36') }
     end
 
-    it "should return the expected identifier" do
+    it "returns the expected identifier" do
       expect(subject.id).to eq noid
     end
 
-    it "should have a tree-like URL" do
+    it "has a treeified URL" do
       expect(subject.uri).to eq 'http://localhost:8983/fedora/rest/test/wd/37/63/09/wd3763094'
     end
 
     context "when a url is provided" do
       let(:url) { 'http://localhost:8983/fedora/rest/test/wd/37/63/09/wd3763094' }
-      it "should be able to get the id" do
+
+      it "transforms the url into an id" do
         expect(GenericFile.uri_to_id(url)).to eq 'wd3763094'
       end
     end
@@ -491,6 +505,27 @@ describe GenericFile, :type => :model do
   describe "permissions validation" do
     before { subject.apply_depositor_metadata('mjg36') }
 
+    describe "overriding" do
+      let(:asset) { SampleKlass.new }
+      before do
+        class SampleKlass < GenericFile
+          def paranoid_edit_permissions
+            []
+          end
+        end
+        asset.apply_depositor_metadata('mjg36')
+      end
+      after do
+        Object.send(:remove_const, :SampleKlass)
+      end
+      context "when public has edit access" do
+        before { asset.edit_groups = ['public'] }
+        it "should be valid" do
+          expect(asset).to be_valid
+        end
+      end
+    end
+
     context "when the depositor does not have edit access" do
       before do
         subject.permissions = [ Hydra::AccessControls::Permission.new(type: 'person', name: 'mjg36', access: 'read')]