sufia 6.3.0 → 6.4.0

data/spec/models/user_spec.rb

@@ -189,7 +189,7 @@ describe User, type: :model do
       end
 
       context "when has start and end date" do
-        subject { described_class.recent_users(Date.today - 2.days, Date.today - 1.days) }
+        subject { described_class.recent_users(Date.today - 2.days, Date.today - 1.day) }
         it "returns valid data" do
           expect(subject.count).to eq 1
           is_expected.to include(new_users[1])

data/spec/models/user_usage_stats_spec.rb

@@ -4,7 +4,7 @@ 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.days.ago, file_views: 3, file_downloads: 2) }
+    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!(:someone_elses_user_id) { subject.id + 1 }

data/spec/services/generic_file_csv_service_spec.rb

@@ -0,0 +1,66 @@
+require 'spec_helper'
+
+describe Sufia::GenericFileCSVService do
+  let(:file) do
+    GenericFile.new(id: '123abc', title: ['My Title'], creator: ['Von, Creator'],
+                    resource_type: ['Book', 'Other'], rights: ['Mine'], mime_type: 'application/pdf') do |f|
+      f.apply_depositor_metadata('jilluser@example.com')
+    end
+  end
+
+  context "when using the defaults" do
+    let(:csv_service) { described_class.new(file) }
+
+    describe "csv" do
+      subject { csv_service.csv }
+
+      it { is_expected.to eq "123abc,My Title,jilluser@example.com,\"Von, Creator\",restricted,Book|Other,Mine,pdf\n" }
+      it "parses as valid csv" do
+        expect(CSV.parse(subject)).to eq([["123abc", "My Title", "jilluser@example.com", "Von, Creator", "restricted", "Book|Other", "Mine", "pdf"]])
+      end
+    end
+
+    describe "csv_header" do
+      subject { csv_service.csv_header }
+      it { is_expected.to eq "id,title,depositor,creator,visibility,resource_type,rights,file_format\n" }
+    end
+  end
+
+  context "when specifying terms" do
+    let(:csv_service) { described_class.new(file, [:id, :title, :resource_type]) }
+    describe "csv" do
+      subject { csv_service.csv }
+      it { is_expected.to eq "123abc,My Title,Book|Other\n" }
+    end
+    describe "csv_header" do
+      subject { csv_service.csv_header }
+      it { is_expected.to eq "id,title,resource_type\n" }
+    end
+  end
+
+  context "when specifying separator" do
+    let(:csv_service) { described_class.new(file, nil, '&&') }
+    describe "csv" do
+      subject { csv_service.csv }
+
+      it { is_expected.to eq "123abc,My Title,jilluser@example.com,\"Von, Creator\",restricted,Book&&Other,Mine,pdf\n" }
+    end
+
+    describe "csv_header" do
+      subject { csv_service.csv_header }
+      it { is_expected.to eq "id,title,depositor,creator,visibility,resource_type,rights,file_format\n" }
+    end
+  end
+
+  context "when specifying terms and separator" do
+    let(:csv_service) { described_class.new(file, [:id, :title, :resource_type], '*$*') }
+    describe "csv" do
+      subject { csv_service.csv }
+      it { is_expected.to eq "123abc,My Title,Book*$*Other\n" }
+    end
+    describe "csv_header" do
+      subject { csv_service.csv_header }
+      it { is_expected.to eq "id,title,resource_type\n" }
+    end
+  end
+end

data/spec/services/generic_file_indexing_service_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe Sufia::GenericFileIndexingService do
+  let(:indexer) { described_class.new(object) }
+  let(:object) do
+    GenericFile.create do |f|
+      f.add_file(File.open(fixture_path + '/world.png'), path: 'content', original_name: 'world.png')
+      f.apply_depositor_metadata('mjg36')
+    end
+  end
+
+  describe '#generate_solr_document' do
+    context 'when GenericFile has no content' do
+      it 'does not try to index Fedora-generated SHA1 digests' do
+        expect(indexer).to receive(:digest_from_content) { nil }
+        indexer.generate_solr_document
+      end
+    end
+    context 'when GenericFile has content' do
+      subject { indexer.generate_solr_document }
+      it 'indexes the Fedora-generated SHA1 digest' do
+        expect(subject[Solrizer.solr_name('digest', :symbol)]).to eq 'urn:sha1:f794b23c0c6fe1083d0ca8b58261a078cd968967'
+      end
+      context 'when a subsequent version is uploaded' do
+        before do
+          object.add_file(File.open(fixture_path + '/xml_fits.xml'), path: 'content', original_name: 'xml_fits.xml')
+          object.save!
+        end
+        it 'reindexes the Fedora-generated SHA1 digest' do
+          expect(object.to_solr[Solrizer.solr_name('digest', :symbol)]).to eq 'urn:sha1:15fa208cb92483eca11253a56e370d96fbced075'
+        end
+      end
+    end
+  end
+end

data/spec/services/lock_manager_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe Sufia::LockManager do
+  subject { described_class.new(Sufia.config.lock_time_to_live,
+                                Sufia.config.lock_retry_count,
+                                Sufia.config.lock_retry_delay) }
+  describe "lock", unless: $in_travis do
+    it "calls the block" do
+      expect { |probe| subject.lock('foobar', &probe) }.to yield_with_no_args
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -37,7 +37,7 @@ end
 
 Capybara.default_driver = :rack_test      # This is a faster driver
 Capybara.javascript_driver = :poltergeist # This is slower
-Capybara.default_wait_time = ENV['TRAVIS'] ? 30 : 15
+Capybara.default_max_wait_time = ENV['TRAVIS'] ? 30 : 15
 # HttpLogger.logger = Logger.new(STDOUT)
 # HttpLogger.ignore = [/localhost:8983\/solr/]
 # HttpLogger.colorize = false
@@ -100,6 +100,7 @@ module EngineRoutes
   def self.included(base)
     base.routes { Sufia::Engine.routes }
   end
+
   def main_app
     Rails.application.class.routes.url_helpers
   end

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

@@ -1,13 +1,14 @@
 require 'spec_helper'
 
 describe "admin/stats/index.html.erb" do
+  let(:presenter) do
+    Sufia::AdminStatsPresenter.new({}, 5).tap do |p|
+      p.deposit_stats = {}
+      p.depositors = []
+    end
+  end
   before do
-    assign(:files_count, {})
-    assign(:top_formats, [])
-    assign(:users_stats, {})
-    assign(:recent_users, [])
-    assign(:deposit_stats, {})
-    assign(:depositors, [])
+    assign(:presenter, presenter)
   end
 
   context "default depositors" do
@@ -17,12 +18,12 @@ describe "admin/stats/index.html.erb" do
       users
     end
     before do
-      assign(:active_users, top_5_active_users)
+      allow(presenter).to receive(:active_users).and_return(top_5_active_users)
       render
     end
     it "shows top 5 depositors and option to view more" do
       expect(rendered).to have_content("(top 5)")
-      expect(rendered).to have_content("View top 20")
+      expect(rendered).to have_link("View top 20", href: "/admin/stats?limit=20")
     end
   end
 
@@ -33,8 +34,8 @@ describe "admin/stats/index.html.erb" do
       users
     end
     before do
-      assign(:active_users, top_20_active_users)
-      params[:dep_count] = 20
+      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

data/spec/views/catalog/sort_and_per_page.html.erb_spec.rb

@@ -24,6 +24,6 @@ describe 'catalog/_sort_and_per_page.html.erb', type: :view do
 
   it 'displays the relevance option for sorting' do
     render
-    expect(rendered).to include("<li><a href=\"/catalog?sort=score+desc%2C+date_uploaded_dtsi+desc\">relevance</a></li>")
+    expect(rendered).to include("<li><a href=\"/catalog?sort=score+desc%2C+system_create_dtsi+desc\">relevance</a></li>")
   end
 end

data/spec/views/collections/_form_for_select_collection.html.erb_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+describe 'collections/_form_for_select_collection.html.erb' do
+  let(:collections) {
+    [
+      Collection.new(id: '1234', title: 'collection 1', create_date: DateTime.parse('Thu, 13 Aug 2015 14:20:22 +0100')),
+      Collection.new(id: '1235', title: 'collection 2', create_date: DateTime.parse('Thu, 13 Aug 2015 14:18:22 +0100')),
+      Collection.new(id: '1236', title: 'collection 3', create_date: DateTime.parse('Thu, 13 Aug 2015 14:16:22 +0100')),
+      Collection.new(id: '1237', title: 'collection 4', create_date: DateTime.parse('Thu, 13 Aug 2015 14:29:22 +0100'))
+    ]
+  }
+  let(:solr_collections) {
+    collections.map do |c|
+      SolrDocument.new(c.to_solr).tap do |sd|
+        sd['system_create_dtsi'] = c.create_date.to_s
+      end
+    end
+  }
+
+  let(:doc) {
+    Nokogiri::HTML(rendered)
+  }
+
+  before do
+    allow(view).to receive(:user_collections).and_return(solr_collections)
+  end
+
+  it "sorts the collections" do
+    render
+    collection_ids = doc.xpath("//input[@class='collection-selector']/@id").map(&:to_s)
+    expect(collection_ids).to eql(["id_1237", "id_1234", "id_1235", "id_1236"])
+  end
+
+  it "selects the right collection when instructed to do so" do
+    assign(:add_files_to_collection, collections[2].id)
+    render
+    expect(rendered).not_to have_selector "#id_#{collections[0].id}[checked='checked']"
+    expect(rendered).not_to have_selector "#id_#{collections[1].id}[checked='checked']"
+    expect(rendered).not_to have_selector "#id_#{collections[3].id}[checked='checked']"
+    expect(rendered).to have_selector "#id_#{collections[2].id}[checked='checked']"
+  end
+
+  it "selects the first collection when nothing else specified" do
+    # first when sorted by create date, so not index 0
+    render
+    expect(rendered).not_to have_selector "#id_#{collections[0].id}[checked='checked']"
+    expect(rendered).not_to have_selector "#id_#{collections[1].id}[checked='checked']"
+    expect(rendered).not_to have_selector "#id_#{collections[2].id}[checked='checked']"
+    expect(rendered).to have_selector "#id_#{collections[3].id}[checked='checked']"
+  end
+end

data/spec/views/generic_file/_browse_everything.html.erb_spec.rb

@@ -1,6 +1,10 @@
 require 'spec_helper'
 
 describe 'generic_files/_browse_everything.html.erb', type: :view do
+  before do
+    assign(:user_collections, [])
+  end
+
   it 'shows user timing warning' do
     render
     page = Capybara::Node::Simple.new(rendered)

data/spec/views/generic_file/edit.html.erb_spec.rb

@@ -1,6 +1,35 @@
 require 'spec_helper'
 
 describe 'generic_files/edit.html.erb', :no_clean do
+  let(:content) { double('content', mimeType: 'application/pdf') }
+
+  let(:generic_file) do
+    stub_model(GenericFile, id: '123',
+                            depositor: 'bob',
+                            resource_type: ['Book', 'Dataset'])
+  end
+
+  let(:form) do
+    Sufia::Forms::GenericFileEditForm.new(generic_file)
+  end
+
+  let(:page) do
+    render
+    Capybara::Node::Simple.new(rendered)
+  end
+
+  subject { page }
+
+  before do
+    allow(generic_file).to receive(:content).and_return(content)
+    allow(controller).to receive(:current_user).and_return(stub_model(User))
+    assign(:generic_file, generic_file)
+    assign(:form, form)
+    assign(:version_list, [])
+  end
+
+  it { is_expected.to have_button('Save Descriptions') }
+
   describe 'when the file has two or more resource types' do
     let(:resource_version) do
       ActiveFedora::VersionsGraph::ResourceVersion.new.tap do |v|
@@ -9,34 +38,12 @@ describe 'generic_files/edit.html.erb', :no_clean do
         v.created = '2014-12-09T02:03:18.296Z'
       end
     end
+
     let(:version_list) { Sufia::VersionListPresenter.new([resource_version]) }
     let(:versions_graph) { double(all: [version1]) }
-    let(:content) { double('content', mimeType: 'application/pdf') }
-
-    let(:generic_file) do
-      stub_model(GenericFile, id: '123',
-                              depositor: 'bob',
-                              resource_type: ['Book', 'Dataset'])
-    end
-
-    let(:form) do
-      Sufia::Forms::GenericFileEditForm.new(generic_file)
-    end
 
-    before do
-      allow(generic_file).to receive(:content).and_return(content)
-      allow(controller).to receive(:current_user).and_return(stub_model(User))
-      assign(:generic_file, generic_file)
-      assign(:form, form)
+    it "only draws one resource_type multiselect" do
       assign(:version_list, version_list)
-    end
-
-    let(:page) do
-      render
-      Capybara::Node::Simple.new(rendered)
-    end
-
-    it "onlies draw one resource_type multiselect" do
       expect(page).to have_selector("select#generic_file_resource_type", count: 1)
     end
   end

data/spec/views/generic_file/new.html.erb_spec.rb

@@ -0,0 +1,70 @@
+require 'spec_helper'
+
+describe 'generic_files/new.html.erb', type: :view do
+  let(:user_collections) do
+    default_option = SolrDocument.new(id: -1, title_tesim: 'Select collection...')
+    col1 = SolrDocument.new(id: 'c1', title_tesim: 'col1')
+    col2 = SolrDocument.new(id: 'c2', title_tesim: 'col2')
+    [default_option, col1, col2]
+  end
+  let(:generic_file) { stub_model(GenericFile, id: '123') }
+  let(:batch_id) { 'bi1' }
+
+  describe 'upload_to_collection' do
+    before do
+      assign(:generic_file, generic_file)
+      assign(:batch_id, batch_id)
+      assign(:user_collections, user_collections)
+      allow(controller).to receive(:current_user).and_return(stub_model(User))
+      Sufia.config.upload_to_collection = upload_to_collection
+    end
+
+    context 'when enabled' do
+      let(:upload_to_collection) { true }
+
+      it 'appears on page' do
+        render
+        page = Capybara::Node::Simple.new(rendered)
+        expect(page).to have_selector('select#collection', count: 2) # one per tab
+        expect(page).to have_select('collection', options: ['Select collection...', 'col1', 'col2'])
+      end
+
+      context 'and passed a default collection' do
+        context "and the collection is on the user's list of editable collections" do
+          before do
+            assign(:collection_id, 'c2')
+          end
+
+          it 'has default collection selected' do
+            render
+            page = Capybara::Node::Simple.new(rendered)
+            expect(page).to have_select('collection', options: ['Select collection...', 'col1', 'col2'], selected: 'col2')
+          end
+        end
+
+        context "and the collection is NOT on the user's list of editable collections" do
+          before do
+            assign(:collection_id, 'c3_noedit')
+          end
+
+          it 'has instructions selected' do
+            render
+            page = Capybara::Node::Simple.new(rendered)
+            expect(page).to have_select('collection', options: ['Select collection...', 'col1', 'col2'])
+            expect(page).not_to have_select('collection', selected: 'col3_noedit')
+          end
+        end
+      end
+    end
+
+    context 'when disabled' do
+      let(:upload_to_collection) { false }
+
+      it 'does not appear on page' do
+        render
+        page = Capybara::Node::Simple.new(rendered)
+        expect(page).to have_no_selector('select#collection')
+      end
+    end
+  end
+end

data/spec/views/generic_file/show.html.erb_spec.rb

@@ -216,6 +216,29 @@ describe 'generic_files/show.html.erb', type: :view do
     end
   end
 
+  describe 'citations' do
+    let(:page) { Capybara::Node::Simple.new(rendered) }
+    before do
+      Sufia.config.citations = citations
+      render
+    end
+    context 'when enabled' do
+      let(:citations) { true }
+
+      it 'appears on page' do
+        expect(page).to have_selector('a#citations', count: 1)
+      end
+    end
+
+    context 'when disabled' do
+      let(:citations) { false }
+
+      it 'does not appear on page' do
+        expect(page).to have_no_selector('a#citations')
+      end
+    end
+  end
+
   describe 'featured' do
     before do
       allow(generic_file).to receive(:public?).and_return(public)