sufia 6.2.0 → 6.3.0

data/spec/lib/sufia/user_stat_importer_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 require_relative '../../../sufia-models/lib/sufia/models/stats/user_stat_importer'
 
 describe Sufia::UserStatImporter do
-
   before do
     allow(Sufia.config).to receive(:analytic_start_date) { dates[0] }
     stub_out_call_to_google_analytics
@@ -33,20 +32,20 @@ describe Sufia::UserStatImporter do
     end
   end
 
-  let(:dates) {
+  let(:dates) do
     ldates = []
-    4.downto(0) {|idx| ldates << (Date.today-idx.day) }
+    4.downto(0) { |idx| ldates << (Date.today - idx.day) }
     ldates
-  }
+  end
 
-  let(:date_strs) {
+  let(:date_strs) do
     ldate_strs = []
-    dates.each {|date| ldate_strs << date.strftime("%Y%m%d") }
+    dates.each { |date| ldate_strs << date.strftime("%Y%m%d") }
     ldate_strs
-  }
+  end
 
   # This is what the data looks like that's returned from Google Analytics via the Legato gem.
-  let(:bilbo_file_1_pageview_stats) {
+  let(:bilbo_file_1_pageview_stats) do
     [
       OpenStruct.new(date: date_strs[0], pageviews: 1),
       OpenStruct.new(date: date_strs[1], pageviews: 2),
@@ -54,9 +53,9 @@ describe Sufia::UserStatImporter do
       OpenStruct.new(date: date_strs[3], pageviews: 4),
       OpenStruct.new(date: date_strs[4], pageviews: 5)
     ]
-  }
+  end
 
-  let(:bilbo_file_2_pageview_stats) {
+  let(:bilbo_file_2_pageview_stats) do
     [
       OpenStruct.new(date: date_strs[0], pageviews: 11),
       OpenStruct.new(date: date_strs[1], pageviews: 12),
@@ -64,9 +63,9 @@ describe Sufia::UserStatImporter do
       OpenStruct.new(date: date_strs[3], pageviews: 14),
       OpenStruct.new(date: date_strs[4], pageviews: 15)
     ]
-  }
+  end
 
-  let(:frodo_file_1_pageview_stats) {
+  let(:frodo_file_1_pageview_stats) do
     [
       OpenStruct.new(date: date_strs[0], pageviews: 2),
       OpenStruct.new(date: date_strs[1], pageviews: 4),
@@ -74,42 +73,41 @@ describe Sufia::UserStatImporter do
       OpenStruct.new(date: date_strs[3], pageviews: 1),
       OpenStruct.new(date: date_strs[4], pageviews: 9)
     ]
-  }
+  end
 
-  let(:bilbo_file_1_download_stats) {
+  let(:bilbo_file_1_download_stats) do
     [
       OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "bilbo1", date: date_strs[0], totalEvents: "2"),
       OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "bilbo1", date: date_strs[1], totalEvents: "3"),
       OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "bilbo1", date: date_strs[2], totalEvents: "5"),
       OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "bilbo1", date: date_strs[3], totalEvents: "3"),
-      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "bilbo1", date: date_strs[4], totalEvents: "7"),
+      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "bilbo1", date: date_strs[4], totalEvents: "7")
     ]
-  }
+  end
 
-  let(:bilbo_file_2_download_stats) {
+  let(:bilbo_file_2_download_stats) do
     [
       OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "bilbo2", date: date_strs[0], totalEvents: "1"),
       OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "bilbo2", date: date_strs[1], totalEvents: "4"),
       OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "bilbo2", date: date_strs[2], totalEvents: "3"),
       OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "bilbo2", date: date_strs[3], totalEvents: "2"),
-      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "bilbo2", date: date_strs[4], totalEvents: "3"),
+      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "bilbo2", date: date_strs[4], totalEvents: "3")
     ]
-  }
+  end
 
-  let(:frodo_file_1_download_stats) {
+  let(:frodo_file_1_download_stats) do
     [
       OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "frodo1", date: date_strs[0], totalEvents: "5"),
       OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "frodo1", date: date_strs[1], totalEvents: "4"),
       OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "frodo1", date: date_strs[2], totalEvents: "2"),
       OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "frodo1", date: date_strs[3], totalEvents: "1"),
-      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "frodo1", date: date_strs[4], totalEvents: "6"),
+      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "frodo1", date: date_strs[4], totalEvents: "6")
     ]
-  }
-
+  end
 
   describe 'with empty cache' do
     it 'for each user it adds one entry per day to the cache' do
-      Sufia::UserStatImporter.new.import
+      described_class.new.import
 
       bilbos_stats = UserStat.where(user_id: bilbo.id).order(date: :asc)
       expect(bilbos_stats.count).to eq 4
@@ -135,7 +133,7 @@ describe Sufia::UserStatImporter do
     end
 
     context "when Google analytics throws an error" do
-      let(:importer) { Sufia::UserStatImporter.new({number_of_retries: 4}) }
+      let(:importer) { described_class.new(number_of_retries: 4) }
 
       context "both error out completely" do
         before do
@@ -191,7 +189,7 @@ describe Sufia::UserStatImporter do
       expect(User.count).to eq 3
       expect(UserStat.count).to eq 3
 
-      Sufia::UserStatImporter.new.import
+      described_class.new.import
 
       bilbos_stats = UserStat.where(user_id: bilbo.id).order(date: :asc)
       expect(bilbos_stats.count).to eq 4
@@ -211,14 +209,14 @@ describe Sufia::UserStatImporter do
     end
 
     it "processes the oldest records first" do
-      # Since Gollum has no stats it will be the first one processed. 
+      # Since Gollum has no stats it will be the first one processed.
       # Followed by Frodo and Bilbo.
-      sorted_ids = Sufia::UserStatImporter.new.sorted_users.map { |u| u.id }
+      sorted_ids = described_class.new.sorted_users.map(&: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}
+      let(:importer) { described_class.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)
@@ -227,7 +225,7 @@ describe Sufia::UserStatImporter do
       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).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
@@ -235,9 +233,8 @@ describe Sufia::UserStatImporter do
   end
 end
 
-
 def stub_out_call_to_google_analytics
-  allow(FileViewStat).to receive(:ga_statistics) do |date, file_id|
+  allow(FileViewStat).to receive(:ga_statistics) do |_date, file_id|
     case file_id
     when bilbo_file_1.id
       bilbo_file_1_pageview_stats
@@ -248,7 +245,7 @@ def stub_out_call_to_google_analytics
     end
   end
 
-  allow(FileDownloadStat).to receive(:ga_statistics) do |date, file_id|
+  allow(FileDownloadStat).to receive(:ga_statistics) do |_date, file_id|
     case file_id
     when bilbo_file_1.id
       bilbo_file_1_download_stats

data/spec/lib/sufia/writable_permissions_spec.rb

@@ -1,16 +1,14 @@
 require 'spec_helper'
 
 describe Sufia::Permissions::Writable do
-
   class SampleModel < ActiveFedora::Base
     include Sufia::Permissions::Writable
   end
   let(:subject) { SampleModel.new }
 
   describe "#permissions" do
-    it "should initialize with nothing specified" do
+    it "initializes with nothing specified" do
       expect(subject.permissions).to be_empty
     end
   end
-
 end

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

@@ -4,20 +4,18 @@ describe Sufia::Zotero do
   it { is_expected.to respond_to(:config) }
 
   describe 'configuration' do
-    subject { Sufia::Zotero.reload_config! }
+    subject { described_class.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
-        })
+      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! }
+    after(:context) { described_class.reload_config! }
 
     it 'has a client key' do
       expect(subject['client_key']).to eq(client_key)

data/spec/models/ability_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'cancan/matchers'
 
-describe Sufia::Ability, :type => :model do
+describe Sufia::Ability, type: :model do
   describe "a user with no roles" do
     let(:user) { nil }
     subject { Ability.new(user) }
@@ -9,8 +9,11 @@ describe Sufia::Ability, :type => :model do
     it { is_expected.not_to be_able_to(:create, TinymceAsset) }
     it { is_expected.not_to be_able_to(:create, ContentBlock) }
     it { is_expected.not_to be_able_to(:update, ContentBlock) }
-    it { is_expected.to     be_able_to(:read,  ContentBlock) }
-    it { is_expected.to     be_able_to(:view_share_work, GenericFile) }
+    it { is_expected.to be_able_to(:read, GenericFile) }
+    it { is_expected.to be_able_to(:stats, GenericFile) }
+    it { is_expected.to be_able_to(:citation, GenericFile) }
+    it { is_expected.to be_able_to(:read, ContentBlock) }
+    it { is_expected.to be_able_to(:view_share_work, GenericFile) }
   end
 
   describe "a registered user" do
@@ -20,8 +23,8 @@ describe Sufia::Ability, :type => :model do
     it { is_expected.not_to be_able_to(:create, TinymceAsset) }
     it { is_expected.not_to be_able_to(:create, ContentBlock) }
     it { is_expected.not_to be_able_to(:update, ContentBlock) }
-    it { is_expected.to     be_able_to(:read,  ContentBlock) }
-    it { is_expected.to     be_able_to(:view_share_work, GenericFile) }
+    it { is_expected.to be_able_to(:read, ContentBlock) }
+    it { is_expected.to be_able_to(:view_share_work, GenericFile) }
   end
 
   describe "a user in the admin group" do
@@ -32,11 +35,10 @@ describe Sufia::Ability, :type => :model do
     it { is_expected.to be_able_to(:create, TinymceAsset) }
     it { is_expected.to be_able_to(:create, ContentBlock) }
     it { is_expected.to be_able_to(:update, ContentBlock) }
-    it { is_expected.to be_able_to(:read,  ContentBlock) }
-    it { is_expected.to     be_able_to(:view_share_work, GenericFile) }
+    it { is_expected.to be_able_to(:read, ContentBlock) }
+    it { is_expected.to be_able_to(:view_share_work, GenericFile) }
   end
 
-
   describe "proxies and transfers" do
     let(:sender) { FactoryGirl.find_or_create(:jill) }
     let(:user) { FactoryGirl.find_or_create(:archivist) }
@@ -50,7 +52,7 @@ describe Sufia::Ability, :type => :model do
     it { should_not be_able_to(:transfer, file.id) }
 
     describe "depositor_for_document" do
-      it "should return the depositor" do
+      it "returns the depositor" do
         expect(subject.send(:depositor_for_document, file.id)).to eq sender.user_key
       end
     end

data/spec/models/batch_spec.rb

@@ -2,36 +2,36 @@ require 'spec_helper'
 
 describe Batch do
   let(:user) { FactoryGirl.find_or_create(:jill) }
-  let(:batch) { Batch.create(title: ["test collection"], creator: [user.user_key]) }
+  let(:batch) { described_class.create(title: ["test collection"], creator: [user.user_key]) }
 
-  it "should belong to testuser" do
+  it "belongs to testuser" do
     expect(batch.creator).to eq [user.user_key]
   end
-  it "should be titled 'test collection'" do
+  it "is titled 'test collection'" do
     expect(batch.title).to eq ["test collection"]
   end
-  it "should have generic_files defined" do
+  it "has generic_files defined" do
     expect(batch).to respond_to(:generic_files)
   end
 
-  it "should support to_solr" do
+  it "supports to_solr" do
     expect(batch.to_solr).to_not be_nil
     expect(batch.to_solr["batch__title_t"]).to be_nil
     expect(batch.to_solr["batch__creator_t"]).to be_nil
   end
   describe "find_or_create" do
     describe "when the object exists" do
-      let! (:batch) { Batch.create(title: ["test collection"], creator: [user.user_key]) }
-      it "should find batch instead of creating" do
-        expect(Batch).to_not receive(:create)
-        Batch.find_or_create(batch.id)
+      let!(:batch) { described_class.create(title: ["test collection"], creator: [user.user_key]) }
+      it "finds batch instead of creating" do
+        expect(described_class).to_not receive(:create)
+        described_class.find_or_create(batch.id)
       end
     end
     describe "when the object does not exist" do
-      it "should create" do
-        expect { Batch.find("batch-123") }.to raise_error(ActiveFedora::ObjectNotFoundError)
-        expect(Batch).to receive(:create).once.and_return("the batch")
-        expect(Batch.find_or_create("batch-123")).to eq "the batch"
+      it "creates" do
+        expect { described_class.find("batch-123") }.to raise_error(ActiveFedora::ObjectNotFoundError)
+        expect(described_class).to receive(:create).once.and_return("the batch")
+        expect(described_class.find_or_create("batch-123")).to eq "the batch"
       end
     end
   end

data/spec/models/characterization_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Sufia::GenericFile::Characterization, :type => :model do
+describe Sufia::GenericFile::Characterization, type: :model do
   before do
     class TestClass < ActiveFedora::Base
       include Sufia::GenericFile::Characterization
@@ -16,8 +16,7 @@ describe Sufia::GenericFile::Characterization, :type => :model do
 
   subject { TestClass.new }
 
-  it "should not depend on anything except a file datastream and some property accessors" do
+  it "does not depend on anything except a file datastream and some property accessors" do
     expect { subject.characterize }.to_not raise_error
   end
-
 end

data/spec/models/checksum_audit_log_spec.rb

@@ -14,52 +14,51 @@ describe ChecksumAuditLog do
 
   let(:version_uri) { f.content.versions.first.uri }
   let(:version_path) { 'content' }
-  let(:old) { ChecksumAuditLog.create(generic_file_id: f.id, dsid: version_path, version: version_uri, pass: 1, created_at: 2.minutes.ago) }
-  let(:new) { ChecksumAuditLog.create(generic_file_id: f.id, dsid: version_path, version: version_uri, pass: 0, created_at: 1.minute.ago) }
+  let(:old) { described_class.create(generic_file_id: f.id, dsid: version_path, version: version_uri, pass: 1, created_at: 2.minutes.ago) }
+  let(:new) { described_class.create(generic_file_id: f.id, dsid: version_path, version: version_uri, pass: 0, created_at: 1.minute.ago) }
 
   context "a file with multiple checksums audits" do
     specify "should return a list of logs for this datastream sorted by date descending" do
-      logs = ChecksumAuditLog.logs_for(f.id, version_path)
+      logs = described_class.logs_for(f.id, version_path)
       expect(logs).to eq([new, old])
     end
   end
 
   context "after multiple checksum audits where the checksum does not change" do
     specify "only one of them should be kept" do
-      success1 = ChecksumAuditLog.create(generic_file_id: f.id, dsid: version_path, version: version_uri, pass: 1)
-      ChecksumAuditLog.prune_history(f.id, version_path)
-      success2 = ChecksumAuditLog.create(generic_file_id: f.id, dsid: version_path, version: version_uri, pass: 1)
-      ChecksumAuditLog.prune_history(f.id, version_path)
-      success3 = ChecksumAuditLog.create(generic_file_id: f.id, dsid: version_path, version: version_uri, pass: 1)
-      ChecksumAuditLog.prune_history(f.id, version_path)
+      success1 = described_class.create(generic_file_id: f.id, dsid: version_path, version: version_uri, pass: 1)
+      described_class.prune_history(f.id, version_path)
+      success2 = described_class.create(generic_file_id: f.id, dsid: version_path, version: version_uri, pass: 1)
+      described_class.prune_history(f.id, version_path)
+      success3 = described_class.create(generic_file_id: f.id, dsid: version_path, version: version_uri, pass: 1)
+      described_class.prune_history(f.id, version_path)
 
-      expect { ChecksumAuditLog.find(success2.id) }.to raise_exception ActiveRecord::RecordNotFound
-      expect { ChecksumAuditLog.find(success3.id) }.to raise_exception ActiveRecord::RecordNotFound
-      expect(ChecksumAuditLog.find(success1.id)).not_to be_nil
-      logs = ChecksumAuditLog.logs_for(f.id, version_path)
+      expect { described_class.find(success2.id) }.to raise_exception ActiveRecord::RecordNotFound
+      expect { described_class.find(success3.id) }.to raise_exception ActiveRecord::RecordNotFound
+      expect(described_class.find(success1.id)).not_to be_nil
+      logs = described_class.logs_for(f.id, version_path)
       expect(logs).to eq([success1, new, old])
     end
   end
 
   context "should have an audit log history" do
     before do
-      ChecksumAuditLog.create(generic_file_id: f.id, dsid: 'content', version: 'v2', pass: 1)
-      ChecksumAuditLog.create(generic_file_id: f.id, dsid: 'thumbnail', version: 'v1', pass: 1)
+      described_class.create(generic_file_id: f.id, dsid: 'content', version: 'v2', pass: 1)
+      described_class.create(generic_file_id: f.id, dsid: 'thumbnail', version: 'v1', pass: 1)
     end
 
     specify "should have an audit log history" do
-      audit = ChecksumAuditLog.get_audit_log(f.id, 'content', version_uri)
+      audit = described_class.get_audit_log(f.id, 'content', version_uri)
       expect(audit.generic_file_id).to eq(f.id)
       expect(audit.version).to eq(version_uri)
 
-      audit = ChecksumAuditLog.get_audit_log(f.id, 'content', 'v2')
+      audit = described_class.get_audit_log(f.id, 'content', 'v2')
       expect(audit.generic_file_id).to eq(f.id)
       expect(audit.version).to eq('v2')
 
-      audit = ChecksumAuditLog.get_audit_log(f.id, 'thumbnail', 'v1')
+      audit = described_class.get_audit_log(f.id, 'thumbnail', 'v1')
       expect(audit.generic_file_id).to eq(f.id)
       expect(audit.version).to eq('v1')
-
     end
   end
 end

data/spec/models/collection_spec.rb

@@ -1,21 +1,21 @@
 require 'spec_helper'
 
-describe Collection, :type => :model do
+describe Collection, type: :model do
   before do
     @user = FactoryGirl.create(:user)
-    @collection = Collection.new(id: 'mock-collection-with-members', title: "test collection") do |c|
+    @collection = described_class.new(id: 'mock-collection-with-members', title: "test collection") do |c|
       c.apply_depositor_metadata(@user.user_key)
     end
   end
 
-  it "should have open visibility" do
+  it "has open visibility" do
     @collection.save
     expect(@collection.read_groups).to eq ['public']
   end
 
-  it "should not allow a collection to be saved without a title" do
-     @collection.title = nil
-     expect{ @collection.save! }.to raise_error(ActiveFedora::RecordInvalid)
+  it "does not allow a collection to be saved without a title" do
+    @collection.title = nil
+    expect { @collection.save! }.to raise_error(ActiveFedora::RecordInvalid)
   end
 
   describe "::bytes" do
@@ -28,18 +28,18 @@ describe Collection, :type => :model do
     end
 
     context "with three 33 byte files" do
-      let(:bitstream) { double("content", size: "33")}
+      let(:bitstream) { double("content", size: "33") }
       let(:file) { mock_model GenericFile, content: bitstream }
       let(:documents) do
-        [{ 'id' => 'file-1', 'file_size_is' => 33 }, 
-         { 'id' => 'file-2', 'file_size_is' => 33 }, 
+        [{ '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 }
+          fl: "id, file_size_is",
+          rows: 3 }
       end
 
       before do
@@ -60,6 +60,5 @@ describe Collection, :type => :model do
         end
       end
     end
-
   end
 end