sufia 5.0.0 → 6.0.0.beta1

data/spec/services/repository_audit_service_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe Sufia::RepositoryAuditService do
+  let(:user) { FactoryGirl.create(:user) }
+  let!(:file) do
+    GenericFile.create! do |file|
+      file.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
+      file.apply_depositor_metadata(user)
+    end
+  end
+
+  describe "#audit_everything" do
+    it "should audit everything" do
+      expect_any_instance_of(GenericFile).to receive(:audit)
+      Sufia::RepositoryAuditService.audit_everything
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,14 +1,18 @@
 ENV["RAILS_ENV"] ||= 'test'
+require "bundler/setup"
 
+
+require 'factory_girl'
 require 'engine_cart'
 EngineCart.load_application!
 
+require 'devise'
+
 require 'mida'
 require 'rspec/rails'
 require 'rspec/its'
 require 'rspec/matchers'
 require 'rspec/active_model/mocks'
-require 'factory_girl_rails'
 require 'capybara/poltergeist'
 require 'capybara/rspec'
 require 'capybara/rails'
@@ -16,6 +20,7 @@ require 'equivalent-xml'
 require 'equivalent-xml/rspec_matchers'
 require 'database_cleaner'
 require 'support/features'
+require 'byebug' unless ENV['TRAVIS']
 
 if ENV['COVERAGE']
   require 'simplecov'
@@ -23,8 +28,12 @@ if ENV['COVERAGE']
   SimpleCov.command_name "spec"
 end
 
-Capybara.javascript_driver = :poltergeist
+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
+# HttpLogger.logger = Logger.new(STDOUT)
+# HttpLogger.ignore = [/localhost:8983\/solr/]
+# HttpLogger.colorize = false
 
 $in_travis = !ENV['TRAVIS'].nil? && ENV['TRAVIS'] == 'true'
 
@@ -63,6 +72,9 @@ end
 
 Resque.inline = Rails.env.test?
 
+FactoryGirl.definition_file_paths = [File.expand_path("../factories", __FILE__)]
+FactoryGirl.find_definitions
+
 module EngineRoutes
   def self.included(base)
     base.routes { Sufia::Engine.routes }
@@ -72,6 +84,7 @@ module EngineRoutes
   end
 end
 
+require 'active_fedora/cleaner'
 RSpec.configure do |config|
   config.expect_with :rspec do |c|
     c.syntax = :expect
@@ -82,13 +95,19 @@ RSpec.configure do |config|
 
   config.use_transactional_fixtures = false
 
-  config.before :each do
-    if Capybara.current_driver == :rack_test
-      DatabaseCleaner.strategy = :transaction
-    else
+  config.before :each do |example|
+    unless (example.metadata[:type] == :view || example.metadata[:no_clean])
+      ActiveFedora::Cleaner.clean!
+    end
+  end
+
+  config.before :each do |example|
+    if example.metadata[:type] == :feature && Capybara.current_driver != :rack_test
       DatabaseCleaner.strategy = :truncation
+    else
+      DatabaseCleaner.strategy = :transaction
+      DatabaseCleaner.start
     end
-    DatabaseCleaner.start
   end
 
   config.after do

data/spec/support/fixture_helpers.rb

@@ -1,10 +1,8 @@
 # spec/support/fixture_helpers.rb
 module FixtureHelpers
-  def find_or_create_file_fixtures
+  def create_file_fixtures(depositor="archivist1@example.com")
     handles = [:public_pdf, :public_mp3, :public_wav]
-    fixtures = []
-    handles.each {|handle| fixtures << FactoryGirl.create(handle) }
-    return fixtures
+    handles.map {|handle| FactoryGirl.create(handle, depositor: depositor) }
   end
 end
 

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -3,10 +3,6 @@ require 'rails/generators'
 class TestAppGenerator < Rails::Generators::Base
   source_root "./spec/test_app_templates"
 
-  # if you need to generate any additional configuration
-  # into the test app, this generator will be run immediately
-  # after setting up the application
-
   def install_engine
     generate 'sufia:install', '-f'
   end

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

@@ -5,15 +5,14 @@ describe 'batch/edit.html.erb', :type => :view do
     stub_model(Batch, id: '123')
   }
 
+  let(:content) { double('content', versions: [], mimeType: 'application/pdf') }
   let(:generic_file) {
-    content = double('content', versions: [], mimeType: 'application/pdf')
-    stub_model(GenericFile, noid: '123',
-               depositor: 'bob',
-               content: content)
+    stub_model(GenericFile, id: '321', noid: '321', depositor: 'bob', rights: [''])
   }
 
 
   before do
+    allow(generic_file).to receive(:content).and_return(content)
     allow(controller).to receive(:current_user).and_return(stub_model(User))
     controller.request.path_parameters[:id] = "123"
     assign :batch, batch
@@ -32,9 +31,20 @@ describe 'batch/edit.html.erb', :type => :view do
     expect(@page).to have_selector("a#generic_file_share_with_help", count: 1)
   end
 
-  it "should draw modal for rights" do
-    expect(@page).to have_selector("div#rightsModal .modal-dialog .modal-content", count: 1)
+  context "rights" do
+    it "should have a modal" do
+      expect(@page).to have_selector("div#rightsModal .modal-dialog .modal-content")
+    end
+
+    it "should allow setting many rights" do
+      expect(@page).to have_selector('select#generic_file_rights[name="generic_file[rights][]"]')
+    end
+  
+    it "should not have an empty rights element" do
+      @page.all('select#generic_file_rights option').each do |elem| 
+        expect(elem.value).to_not be_empty 
+      end
+    end
   end
-
 end
 

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

@@ -1,6 +1,10 @@
 require 'spec_helper'
 
-describe 'catalog/index.html.erb', :type => :view do
+describe 'catalog/index.html.erb' do
+
+  let(:collection) { Collection.new(title: 'collection1', id: 'abc123') }
+  let(:doc) { SolrDocument.new(collection.to_solr) }
+
   before do
     allow(view).to receive(:blacklight_config).and_return(CatalogController.blacklight_config)
     stub_template 'catalog/_search_sidebar.html.erb' => ''
@@ -19,16 +23,14 @@ describe 'catalog/index.html.erb', :type => :view do
     allow(resp).to receive(:limit_value).and_return(10)
     allow(resp).to receive(:empty?).and_return(false)
 
-    @collection = Collection.new(pid: 'sufia:foo', title: 'collection1')
-    doc = SolrDocument.new(@collection.to_solr.merge('has_model_ssim' => [Collection.to_class_uri]))
+    # This stubs out the SolrDocument#to_model
+    allow(ActiveFedora::Base).to receive(:load_instance_from_solr).with('abc123').and_return(collection)
     assign(:document_list, [doc])
   end
 
-
-
   it 'appears on page without error' do
     render
-    expect(rendered).to include(@collection.title)
+    expect(rendered).to include(collection.title)
     page = Capybara::Node::Simple.new(rendered)
     expect(page).to have_selector("span.glyphicon.glyphicon-th.collection-icon-search")
   end

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

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe 'collections/_form.html.erb', :type => :view do
   describe 'when the collection edit form is rendered' do
-    let(:collection) { Collection.new({title: 'the title', description: 'the description',
-                                       creator: 'the creator'})}
+    let(:collection) { Collection.new(title: 'the title', description: 'the description',
+                                       creator: ['the creator'])}
 
     before do
       controller.request.path_parameters[:id] = 'j12345'
@@ -14,7 +14,9 @@ describe 'collections/_form.html.erb', :type => :view do
     it "should draw the metadata fields for collection" do
       render
       expect(rendered).to have_selector("input#collection_title", count: 1)
+      expect(rendered).to_not have_selector("div#additional_title_clone button.adder")
       expect(rendered).to have_selector("input#collection_creator", count: 1)
+      expect(rendered).to have_selector("div#additional_creator_clone button.adder")
       expect(rendered).to have_selector("textarea#collection_description", count: 1)
       expect(rendered).to have_selector("input#collection_contributor", count: 1)
       expect(rendered).to have_selector("input#collection_tag", count: 1)

data/spec/views/collections/_show_document_list.erb_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe 'collections/_show_document_list.html.erb', :type => :view do
+
+  let(:user) { FactoryGirl.find_or_create(:jill) }
+  let(:collection) { mock_model(Collection) }
+
+  let(:file) do
+    gf = GenericFile.new(creator: ["ggm"], title: ['One Hundred Years of Solitude'])
+    gf.apply_depositor_metadata(user)
+    gf.save
+    gf
+  end
+
+  let(:documents) {[file]}
+
+  context 'when not logged in' do
+    before do
+      allow(view).to receive(:blacklight_config).and_return(Blacklight::Configuration.new)
+      allow(view).to receive(:current_user).and_return(nil)
+      allow(file).to receive(:title_or_label).and_return("One Hundred Years of Solitude")
+      allow(file).to receive(:edit_people).and_return([])
+    end
+
+    it "should render collection" do
+      render(partial: 'collections/show_document_list.html.erb', locals: {documents: documents})
+      expect(rendered).to have_content 'One Hundred Years of Solitude'
+    end
+  end
+
+end

data/spec/views/dashboard/index_spec.rb

@@ -64,8 +64,8 @@ describe "dashboard/index.html.erb", :type => :view do
       expect(@sidebar).to include '<span class="badge">2</span>'
       expect(@sidebar).to include '<span class="badge">15</span>'
       expect(@sidebar).to include '<span class="badge">3</span>'
-      expect(@sidebar).to include '<span class="badge-optional">1</span> View'
-      expect(@sidebar).to include '<span class="badge-optional">3</span> Downloads'
+      expect(@sidebar).to include '1 View'
+      expect(@sidebar).to include '3 Downloads'
     end
 
     it "should show the statistics before the profile" do

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

@@ -1,23 +1,37 @@
 require 'spec_helper'
 
-describe 'generic_files/edit.html.erb', :type => :view do
+describe 'generic_files/edit.html.erb', :no_clean do
   describe 'when the file has two or more resource types' 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(:version_list) { Sufia::VersionListPresenter.new([resource_version]) }
+    let(:versions_graph) { double(all: [version1]) }
+    let(:content) { double('content', mimeType: 'application/pdf') }
+
     let(:generic_file) {
-      content = double('content', versions: [], mimeType: 'application/pdf')
-      stub_model(GenericFile, noid: '123',
+      stub_model(GenericFile, id: '123', noid: '123',
         depositor: 'bob',
-        resource_type: ['Book', 'Dataset'],
-        content: content)
+        resource_type: ['Book', 'Dataset'])
     }
 
     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(:version_list, version_list)
     end
 
-    it "should only draw one resource_type multiselect" do
+    let(:page) do
       render
       page = Capybara::Node::Simple.new(rendered)
+    end
+
+    it "should only 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/show.html.erb_spec.rb

@@ -12,7 +12,7 @@ describe 'generic_files/show.html.erb', :type => :view do
   end
 
   let(:generic_file) do
-    stub_model(GenericFile, noid: '123',
+    stub_model(GenericFile, id: '123', noid: '123',
       depositor: depositor.user_key,
       audit_stat: 1,
       title: ['My Title'],
@@ -25,11 +25,11 @@ describe 'generic_files/show.html.erb', :type => :view do
       date_created: ['1984-01-02'],
       language: ['Quechua'],
       publisher: ['Random Publishing, Inc.'],
-      subject: ['Biology', 'Physiology', 'Ethnography'],
-      content: content)
+      subject: ['Biology', 'Physiology', 'Ethnography'])
   end
 
   before do
+    allow(generic_file).to receive(:content).and_return(content)
     allow(controller).to receive(:current_user).and_return(depositor)
     allow_any_instance_of(Ability).to receive(:can?).and_return(true)
     allow(User).to receive(:find_by_user_key).with(generic_file.depositor).and_return(depositor)

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

@@ -31,7 +31,7 @@ describe 'users/show.html.erb', :type => :view do
 
   context "with trophy" do
 
-    let(:generic_file) { GenericFile.new(title: ["Fake object"], pid:"sufia:abc123") }
+    let(:generic_file) { GenericFile.new(title: ["Fake object"], id: "abc123") }
     before do
       allow(view).to receive(:search_session).and_return({})
       allow(view).to receive(:blacklight_config).and_return(CatalogController.blacklight_config)

data/sufia-models/app/actors/sufia/generic_file/actor.rb

@@ -20,7 +20,7 @@ module Sufia::GenericFile
       generic_file.creator = [user.name]
 
       if batch_id
-        generic_file.batch_id = Sufia::Noid.namespaceize(batch_id)
+        generic_file.batch_id = batch_id
       else
         ActiveFedora::Base.logger.warn "unable to find batch to attach to"
       end
@@ -28,8 +28,7 @@ module Sufia::GenericFile
     end
 
     def create_content(file, file_name, dsid)
-      fname = generic_file.label.blank? ? file_name.truncate(255) : generic_file.label
-      generic_file.add_file(file, dsid, fname)
+      generic_file.add_file(file, dsid, file_name.truncate(255))
       save_characterize_and_record_committer do
         if Sufia.config.respond_to?(:after_create_content)
           Sufia.config.after_create_content.call(generic_file, user)
@@ -37,9 +36,9 @@ module Sufia::GenericFile
       end
     end
 
-    def revert_content(revision_id, datastream_id)
-      revision = generic_file.content.get_version(revision_id)
-      generic_file.add_file(revision.content, datastream_id, revision.label)
+    def revert_content(revision_id)
+      generic_file.content.restore_version(revision_id)
+      generic_file.content.create_version
       save_characterize_and_record_committer do
         if Sufia.config.respond_to?(:after_revert_content)
           Sufia.config.after_revert_content.call(generic_file, user, revision_id)
@@ -69,11 +68,10 @@ module Sufia::GenericFile
     end
 
     def destroy
-      pid = generic_file.pid  #Work around for https://github.com/projecthydra/active_fedora/issues/422
       generic_file.destroy
-      FeaturedWork.where(generic_file_id: pid).destroy_all
+      FeaturedWork.where(generic_file_id: generic_file.id).destroy_all
       if Sufia.config.respond_to?(:after_destroy)
-        Sufia.config.after_destroy.call(pid, user)
+        Sufia.config.after_destroy.call(generic_file.id, user)
       end
     end
 
@@ -103,7 +101,7 @@ module Sufia::GenericFile
     end
 
     def push_characterize_job
-      Sufia.queue.push(CharacterizeJob.new(@generic_file.pid))
+      Sufia.queue.push(CharacterizeJob.new(@generic_file.id))
     end
 
     class << self

data/sufia-models/app/jobs/active_fedora_pid_based_job.rb

@@ -10,10 +10,9 @@ class ActiveFedoraPidBasedJob
   end
 
   def object
-    @object ||= ActiveFedora::Base.find(pid, cast: true).tap do |f|
-      f.reload_on_save = true
-    end
+    @object ||= ActiveFedora::Base.find(pid)
   end
+
   alias_method :generic_file, :object
   alias_method :generic_file_id, :pid
 

data/sufia-models/app/jobs/audit_job.rb

@@ -6,44 +6,58 @@ class AuditJob < ActiveFedoraPidBasedJob
   PASS = 'Passing Audit Run'
   FAIL = 'Failing Audit Run'
 
-  attr_accessor :pid, :datastream_id, :version_id
+  attr_accessor :uri, :pid, :path
 
-  def initialize(pid, datastream_id, version_id)
-    super(pid)
-    self.datastream_id = datastream_id
-    self.version_id = version_id
+  # URI of the resource to audit.
+  # This URI could include the actual resource (e.g. content) and the version to audit:
+  #     http://localhost:8983/fedora/rest/test/a/b/c/abcxyz/content/fcr:versions/version1
+  # but it could also just be:
+  #     http://localhost:8983/fedora/rest/test/a/b/c/abcxyz/content
+  def initialize(id, path, uri)
+    super(uri)
+    self.pid = id
+    self.path = path
+    self.uri = uri
   end
 
   def run
-    if generic_file
-      datastream = generic_file.datastreams[datastream_id]
-      if datastream
-        version =  datastream.versions.select { |v| v.versionID == version_id}.first
-        log = run_audit(version)
-
-        # look up the user for sending the message to
-        login = generic_file.depositor
-        if login
-          user = User.find_by_user_key(login)
-          ActiveFedora::Base.logger.warn "User '#{login}' not found" unless user
-          job_user = User.audituser()
-          # send the user a message about the failing audit
-          unless (log.pass == 1)
-            message = "The audit run at #{log.created_at} for #{log.pid}:#{log.dsid}:#{log.version} was #{log.pass == 1 ? 'passing' : 'failing'}."
-            subject = (log.pass == 1 ? PASS : FAIL)
-            job_user.send_message(user, message, subject)
-          end 
-        end
+    fixity_ok = false
+    log = run_audit
+    fixity_ok = (log.pass == 1)
+    unless fixity_ok
+      # send the user a message about the failing audit
+      login = generic_file.depositor
+      user = User.find_by_user_key(login)
+      logger.warn "User '#{login}' not found" unless user
+      job_user = User.audituser()
+      file_title = generic_file.title.first
+      message = "The audit run at #{log.created_at} for #{file_title} (#{uri}) failed."
+      subject = FAIL
+      job_user.send_message(user, message, subject)
+    end
+    fixity_ok
+  end
+
+  protected
+
+    def run_audit
+      begin
+        fixity_ok = ActiveFedora::FixityService.new(uri).check
+      rescue Ldp::NotFound
+        error_msg = "resource not found"
+      end
+
+      if fixity_ok
+        passing = 1
+        ChecksumAuditLog.prune_history(pid, path)
       else
-        ActiveFedora::Base.logger.warn "No datastream for audit!!!!! pid: #{pid} dsid: #{datastream_id}"
+        logger.warn "***AUDIT*** Audit failed for #{uri} #{error_msg}"
+        passing = 0
       end
-    else
-      ActiveFedora::Base.logger.warn "No generic file for data stream audit!!!!! pid: #{pid} dsid: #{datastream_id}"
+      ChecksumAuditLog.create!(pass: passing, pid: pid, version: uri, dsid: path)
     end
-  end
 
-  private
-  def run_audit(version)
-    object.class.run_audit(version)
-  end
+    def logger
+      ActiveFedora::Base.logger
+    end
 end