sufia 7.0.0.beta1 → 7.0.0.beta2

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = "7.0.0.beta1".freeze
+  VERSION = "7.0.0.beta2".freeze
 end

data/spec/controllers/my/shares_controller_spec.rb

@@ -1,4 +1,3 @@
-
 describe My::SharesController, type: :controller do
   describe "logged in user" do
     let(:user) { create(:user) }
@@ -11,11 +10,11 @@ describe My::SharesController, type: :controller do
       let(:other_user)   { create(:user) }
       let(:someone_else) { create(:user) }
 
-      let!(:my_file)                  { create(:file_set, user: user) }
-      let!(:unshared_file)            { create(:file_set, user: other_user) }
-      let!(:shared_with_me)           { create(:file_set, user: other_user, edit_users: [user, other_user]) }
-      let!(:read_shared_with_me)      { create(:file_set, user: other_user, read_users: [user, other_user]) }
-      let!(:shared_with_someone_else) { create(:file_set, user: other_user, edit_users: [someone_else, other_user]) }
+      let!(:my_work)                  { create(:work, user: user) }
+      let!(:unshared_work)            { create(:work, user: other_user) }
+      let!(:shared_with_me)           { create(:work, user: other_user, edit_users: [user, other_user]) }
+      let!(:read_shared_with_me)      { create(:work, user: other_user, read_users: [user, other_user]) }
+      let!(:shared_with_someone_else) { create(:work, user: other_user, edit_users: [someone_else, other_user]) }
       let!(:my_collection)            { create(:public_collection, user: user) }
 
       it "responds with success" do
@@ -24,7 +23,7 @@ describe My::SharesController, type: :controller do
       end
 
       context "with multiple pages of results" do
-        before { 2.times { create(:file_set, user: other_user, edit_users: [user, other_user]) } }
+        before { 2.times { create(:work, user: other_user, edit_users: [user, other_user]) } }
         it "paginates" do
           get :index, per_page: 2
           expect(assigns[:document_list].length).to eq 2

data/spec/controllers/transfers_controller_spec.rb

@@ -1,4 +1,14 @@
 describe TransfersController, type: :controller do
+  describe "without a signed in user" do
+    describe "#index" do
+      it "redirects to sign in" do
+        get :index
+        expect(flash[:alert]).to eq "You need to sign in or sign up before continuing."
+        expect(response).to redirect_to main_app.new_user_session_path
+      end
+    end
+  end
+
   describe "with a signed in user" do
     let(:another_user) { create(:user) }
     let(:user) { create(:user) }

data/spec/features/batch_edit_spec.rb

@@ -54,7 +54,7 @@ describe 'Batch management of works', type: :feature do
       expand("contributor")
       expect(page).to have_css "input#generic_work_contributor[value*='NEW contributor']"
       expand("description")
-      expect(page).to have_css "textarea#generic_work_description", 'NEW description'
+      expect(page).to have_css "textarea#generic_work_description", text: 'NEW description'
       expand("keyword")
       expect(page).to have_css "input#generic_work_keyword[value*='NEW keyword']"
       expand("publisher")

data/spec/lib/sufia/analytics_spec.rb

@@ -4,20 +4,28 @@ describe Sufia::Analytics do
     allow(subject).to receive(:token).and_return(token)
   end
 
-  it 'responds to :config' do
-    expect(subject).to respond_to(:config)
-  end
-
-  it 'reads its config from a yaml file' do
-    expect(subject.config.keys.sort).to eql ['app_name', 'app_version', 'client_email', 'privkey_path', 'privkey_secret']
-  end
+  describe "configuration" do
+    context "When the yaml file has values" do
+      it 'reads its config from a yaml file' do
+        expect(subject.send(:config).keys.sort).to eql ['app_name', 'app_version', 'client_email', 'privkey_path', 'privkey_secret']
+      end
+    end
 
-  it 'responds to :user' do
-    expect(subject).to respond_to(:user)
+    context "When the yaml file has no values" do
+      before do
+        described_class.send(:remove_instance_variable, :@config)
+        allow(File).to receive(:read).and_return("# Just comments\n# and comments\n")
+      end
+      it 'returns nil' do
+        expect(Rails.logger).to receive(:error)
+          .with(starting_with("Unable to fetch any keys from"))
+        expect(subject.send(:config)).to be nil
+      end
+    end
   end
 
   it 'instantiates a user' do
-    expect(subject.user).to be_a(Legato::User)
+    expect(subject.send(:user)).to be_a(Legato::User)
   end
 
   it 'responds to :profile' do

data/spec/presenters/sufia/admin_stats_presenter_spec.rb

@@ -26,7 +26,7 @@ describe Sufia::AdminStatsPresenter do
 
     subject { service.active_users }
     it "returns statistics" do
-      expect(subject).to eq(user1.user_key => 3, user2.user_key => 1)
+      expect(subject).to eq [{ label: user1.user_key, data: 3 }, { label: user2.user_key, data: 1 }]
     end
   end
 
@@ -48,11 +48,11 @@ describe Sufia::AdminStatsPresenter do
     subject { service.top_formats }
 
     it "gathers formats" do
-      expect(subject).to eq("png" => 2, "jpeg" => 1)
+      expect(subject).to eq [{ label: "png", data: 2 }, { label: "jpeg", data: 1 }]
     end
   end
 
-  describe "#files_count" do
+  describe "#works_count" do
     before do
       build(:generic_work, user: user1, id: "abc1223").update_index
       build(:public_generic_work, user: user1, id: "bbb1223").update_index
@@ -63,7 +63,7 @@ describe Sufia::AdminStatsPresenter do
     let(:one_day_ago)  { one_day_ago_date.strftime("%Y-%m-%d") }
     let(:two_days_ago) { two_days_ago_date.strftime("%Y-%m-%d") }
 
-    subject { service.files_count }
+    subject { service.works_count }
 
     it "includes files but not collections" do
       expect(subject[:total]).to eq(3)
@@ -73,22 +73,26 @@ describe Sufia::AdminStatsPresenter do
     end
 
     context "when there is uncommitted work" do
-      let(:original_files_count) do
+      let(:original_works_count) do
         work = create(:generic_work, user: user1)
         original_files_count = GenericWork.count
         ActiveFedora::SolrService.instance.conn.delete_by_id(work.id)
         original_files_count
       end
-      it "provides accurate files_count, ensuring that solr deletes have been expunged first" do
-        expect(subject[:total]).to eq(original_files_count - 1)
+
+      it "provides accurate count, ensuring that solr deletes have been expunged first" do
+        expect(subject[:total]).to eq(original_works_count - 1)
       end
     end
 
     context "when start date is provided" do
       let(:start_date) { one_day_ago }
-      let(:system_stats) { double(document_by_permission: {}) }
+      let(:system_stats) { double(by_permission: {}) }
       it "queries by start date" do
-        expect(Sufia::SystemStats).to receive(:new).with(5, start_date, end_date).and_return(system_stats)
+        expect(Sufia::Statistics::Works::Count).to receive(:new)
+          .with(one_day_ago_date.beginning_of_day,
+                nil)
+          .and_return(system_stats)
         subject
       end
     end
@@ -96,9 +100,12 @@ describe Sufia::AdminStatsPresenter do
     context "when start and end date is provided" do
       let(:start_date) { two_days_ago }
       let(:end_date) { one_day_ago }
-      let(:system_stats) { double(document_by_permission: {}) }
+      let(:system_stats) { double(by_permission: {}) }
       it "queries by start and date" do
-        expect(Sufia::SystemStats).to receive(:new).with(5, start_date, end_date).and_return(system_stats)
+        expect(Sufia::Statistics::Works::Count).to receive(:new)
+          .with(two_days_ago_date.beginning_of_day,
+                one_day_ago_date.end_of_day)
+          .and_return(system_stats)
         subject
       end
     end
@@ -151,15 +158,15 @@ describe Sufia::AdminStatsPresenter do
 
     context "with a start and no end date" do
       let(:start_date) { '2015-12-14' }
-      let(:today) { Time.zone.today.strftime("%Y-%m-%d") }
-      it { is_expected.to eq "2015-12-14 to #{today}" }
+      let(:today) { Time.zone.today.to_date.to_s(:standard) }
+      it { is_expected.to eq "12/14/2015 to #{today}" }
     end
 
     context 'with start and end dates' do
       let(:start_date) { '2015-12-14' }
       let(:end_date) { '2016-05-12' }
 
-      it { is_expected.to eq '2015-12-14 to 2016-05-12' }
+      it { is_expected.to eq '12/14/2015 to 05/12/2016' }
     end
   end
 end

data/spec/search_builder/{sufia_search_builder_spec.rb → sufia/catalog_search_builder_spec.rb}

@@ -1,4 +1,4 @@
-describe Sufia::SearchBuilder do
+describe Sufia::CatalogSearchBuilder do
   let(:builder) { described_class.new([], self) }
   let(:solr_params) { { q: user_query } }
 

data/spec/search_builder/sufia/my_shares_search_builder_spec.rb

@@ -0,0 +1,18 @@
+describe Sufia::MySharesSearchBuilder do
+  let(:me) { create(:user) }
+  let(:config) { CatalogController.blacklight_config }
+  let(:scope) { double('The scope',
+                       blacklight_config: config,
+                       params: {},
+                       current_ability: Ability.new(me),
+                       current_user: me) }
+  let(:builder) { described_class.new(scope) }
+
+  subject { builder.to_hash['fq'] }
+
+  it "filters things we have access to in which we are not the depositor" do
+    expect(subject).to eq ["edit_access_group_ssim:public OR edit_access_group_ssim:registered OR edit_access_person_ssim:#{me.user_key}",
+                           "{!terms f=has_model_ssim}GenericWork,Collection",
+                           "-_query_:\"{!field f=depositor_ssim}#{me.user_key}\""]
+  end
+end

data/spec/services/statistics/{collections_spec.rb → collections/over_time_spec.rb}

@@ -1,4 +1,4 @@
-RSpec.describe Sufia::Statistics::Collections do
+RSpec.describe Sufia::Statistics::Collections::OverTime do
   let(:service) { described_class.new }
 
   describe "#points" do

data/spec/services/{sufia/admin/depositor_stats_spec.rb → statistics/depositors/summary_spec.rb}

@@ -1,13 +1,11 @@
-require 'spec_helper'
-
-describe Sufia::Admin::DepositorStats do
+describe Sufia::Statistics::Depositors::Summary do
   let(:user1) { create(:user) }
   let(:user2) { create(:user) }
   let!(:old_work) { create(:work, user: user1) }
   let(:two_days_ago_date) { Time.zone.now - 2.days }
 
-  let(:start_date) { '' }
-  let(:end_date) { '' }
+  let(:start_date) { nil }
+  let(:end_date) { nil }
   let!(:work1) { create(:work, user: user1) }
   let!(:work2) { create(:work, user: user2) }
   let!(:collection1) { create(:public_collection, user: user1) }
@@ -30,8 +28,8 @@ describe Sufia::Admin::DepositorStats do
     end
 
     context "when dates are present" do
-      let(:start_date) { 1.day.ago.strftime("%Y-%m-%d") }
-      let(:end_date) { 0.days.ago.strftime("%Y-%m-%d") }
+      let(:start_date) { 1.day.ago.beginning_of_day }
+      let(:end_date) { 0.days.ago.end_of_day }
       it "gathers user deposits during a date range" do
         expect(subject).to eq [{ key: user1.user_key, deposits: 1, user: user1 },
                                { key: user2.user_key, deposits: 1, user: user2 }]

data/spec/services/statistics/file_sets/by_format_spec.rb

@@ -0,0 +1,30 @@
+RSpec.describe Sufia::Statistics::FileSets::ByFormat do
+  let(:service) { described_class.new }
+
+  describe "#query" do
+    let(:fs1) { build(:file_set, id: '1234567') }
+    let(:fs2) { build(:file_set, id: '2345678') }
+    let(:fs3) { build(:file_set, id: '3456789') }
+    let(:fs4) { build(:file_set, id: '4567890') }
+    before do
+      allow(fs1).to receive_messages(mime_type: 'text/plain', format_label: ["plain text"])
+      fs1.update_index
+      allow(fs2).to receive_messages(mime_type: 'image/jpg', format_label: ["JPEG image"])
+      fs2.update_index
+      allow(fs3).to receive_messages(mime_type: 'image/tiff', format_label: ["TIFF image"])
+      fs3.update_index
+      allow(fs4).to receive_messages(mime_type: 'image/jpg', format_label: ["JPEG image"])
+      fs4.update_index
+    end
+
+    subject { service.query }
+
+    it "is a list of categories" do
+      expect(subject).to eq [{ label: 'jpg (JPEG image)', data: 2 },
+                             { label: 'plain (plain text)', data: 1 },
+                             { label: 'tiff (TIFF image)', data: 1 }]
+      expect(subject.first.label).to eq 'jpg (JPEG image)'
+      expect(subject.first.value).to eq 2
+    end
+  end
+end

data/spec/services/statistics/system_stats_spec.rb

@@ -0,0 +1,54 @@
+describe Sufia::Statistics::SystemStats do
+  let(:user1) { create(:user) }
+  let(:start_date) { nil }
+  let(:end_date) { nil }
+  let(:stats) { described_class.new(depositor_count, start_date, end_date) }
+
+  describe "#recent_users" do
+    let!(:user2) { create(:user) }
+
+    let(:two_days_ago_date) { 2.days.ago.beginning_of_day }
+    let(:one_day_ago_date) { 1.day.ago.end_of_day }
+
+    let(:depositor_count) { nil }
+
+    subject { stats.recent_users }
+
+    context "without dates" do
+      let(:mock_order) { double }
+      let(:mock_limit) { double }
+      it "defaults to latest 5 users" do
+        expect(mock_order).to receive(:limit).with(5).and_return(mock_limit)
+        expect(User).to receive(:order).with('created_at DESC').and_return(mock_order)
+        is_expected.to eq mock_limit
+      end
+    end
+
+    context "with start date" do
+      let(:start_date) { two_days_ago_date }
+
+      it "allows queries  without an end date " do
+        expect(User).to receive(:recent_users).with(two_days_ago_date, nil).and_return([user2])
+        is_expected.to eq([user2])
+      end
+    end
+    context "with start date and end date" do
+      let(:start_date) { two_days_ago_date }
+      let(:end_date) { one_day_ago_date }
+      it "queries" do
+        expect(User).to receive(:recent_users).with(two_days_ago_date, one_day_ago_date).and_return([user2])
+        is_expected.to eq([user2])
+      end
+    end
+  end
+
+  describe "#users_count" do
+    let(:depositor_count) { nil }
+    let!(:user1) { create(:user) }
+    let!(:user2) { create(:user) }
+
+    subject { stats.users_count }
+
+    it { is_expected.to eq 2 }
+  end
+end

data/spec/services/statistics/works/by_depositor_spec.rb

@@ -0,0 +1,25 @@
+RSpec.describe Sufia::Statistics::Works::ByDepositor do
+  let(:service) { described_class.new }
+
+  describe "#query" do
+    let(:user1) { create(:user) }
+    let(:user2) { create(:user) }
+    before do
+      gf = build(:generic_work, user: user1, id: '1234567')
+      gf.update_index
+      gf = build(:generic_work, user: user2, id: '2345678')
+      gf.update_index
+      gf = build(:generic_work, user: user1, id: '3456789')
+      gf.update_index
+      gf = build(:generic_work, user: user1, id: '4567890')
+      gf.update_index
+    end
+
+    subject { service.query }
+
+    it "is a list of categories" do
+      expect(subject).to eq [{ label: user1.user_key, data: 3 },
+                             { label: user2.user_key, data: 1 }]
+    end
+  end
+end

data/spec/services/statistics/works/by_resource_type_spec.rb

@@ -0,0 +1,21 @@
+RSpec.describe Sufia::Statistics::Works::ByResourceType do
+  let(:service) { described_class.new }
+
+  describe "#query" do
+    before do
+      create(:generic_work, resource_type: ['Conference Proceeding'])
+      create(:generic_work, resource_type: ['Conference Proceeding'])
+      create(:generic_work, resource_type: ['Image'])
+      create(:generic_work, resource_type: ['Journal'])
+    end
+
+    subject { service.query }
+
+    it "is a list of categories" do
+      expect(subject).to eq [{ label: 'Conference Proceeding', data: 2 },
+                             { label: 'Image', data: 1 },
+                             { label: 'Journal', data: 1 }]
+      expect(subject.to_json).to eq "[{\"label\":\"Conference Proceeding\",\"data\":2},{\"label\":\"Image\",\"data\":1},{\"label\":\"Journal\",\"data\":1}]"
+    end
+  end
+end

data/spec/services/statistics/works/count_spec.rb

@@ -0,0 +1,42 @@
+RSpec.describe Sufia::Statistics::Works::Count do
+  let(:user1) { create(:user) }
+  let(:service) { described_class.new(start_date, end_date) }
+  let(:start_date) { nil }
+  let(:end_date) { nil }
+
+  describe "#by_permission" do
+    subject { service.by_permission }
+
+    before do
+      build(:public_generic_work, user: user1, id: "pdf1223").update_index
+      build(:public_generic_work, user: user1, id: "wav1223").update_index
+      build(:public_generic_work, user: user1, id: "mp31223", create_date: [2.days.ago]).update_index
+      build(:registered_generic_work, user: user1, id: "reg1223").update_index
+      build(:generic_work, user: user1, id: "private1223").update_index
+      Collection.new(id: "ccc123") do |c|
+        c.apply_depositor_metadata(user1)
+        c.update_index
+      end
+    end
+
+    it "retrieves all documents by permissions" do
+      expect(subject).to include(public: 3, private: 1, registered: 1, total: 5)
+    end
+
+    context "when passing a start date" do
+      let(:yesterday) { 1.day.ago }
+      let(:start_date) { yesterday.beginning_of_day }
+      it "gets documents after date by permissions" do
+        expect(subject).to include(public: 2, private: 1, registered: 1, total: 4)
+      end
+
+      context "when passing an end date" do
+        let(:start_date) { 2.days.ago.beginning_of_day }
+        let(:end_date) { yesterday.end_of_day }
+        it "get documents between dates by permissions" do
+          expect(subject).to include(public: 1, private: 0, registered: 0, total: 1)
+        end
+      end
+    end
+  end
+end

data/spec/services/statistics/{works_spec.rb → works/over_time_spec.rb}

@@ -1,4 +1,4 @@
-RSpec.describe Sufia::Statistics::Works do
+RSpec.describe Sufia::Statistics::Works::OverTime do
   let(:service) { described_class.new }
 
   describe "#points" do

data/spec/views/admin/stats/index.html.erb_spec.rb

@@ -11,9 +11,7 @@ describe "admin/stats/index.html.erb" do
 
   context "default depositors" do
     let(:top_5_active_users) do
-      users = {}
-      5.times { |i| users[i.to_s] = i }
-      users
+      (1..5).map { |i| double(label: i.to_s, value: i) }
     end
     before do
       allow(presenter).to receive(:active_users).and_return(top_5_active_users)
@@ -27,15 +25,14 @@ describe "admin/stats/index.html.erb" do
 
   context "top 20 depositors" do
     let(:top_20_active_users) do
-      users = {}
-      20.times { |i| users[i.to_s] = i }
-      users
+      (1..20).map { |i| double(label: i.to_s, value: i) }
     end
     before do
       allow(presenter).to receive(:active_users).and_return(top_20_active_users)
       allow(presenter).to receive(:limit).and_return(20)
       render
     end
+
     it "shows top 20 depositors, without an option to view more" do
       expect(rendered).to have_content("(top 20)")
       expect(rendered).to_not have_content("View top 20")