sufia 3.4.0 → 3.5.0

data/lib/sufia/virus_found_error.rb

@@ -0,0 +1,4 @@
+module Sufia
+  class VirusFoundError < StandardError
+  end
+end

data/spec/controllers/generic_files_controller_spec.rb

@@ -3,7 +3,6 @@ require 'spec_helper'
 describe GenericFilesController do
   before do
     controller.stub(:has_access?).and_return(true)
-
     @user = FactoryGirl.find_or_create(:user)
     sign_in @user
     User.any_instance.stub(:groups).and_return([])
@@ -17,10 +16,7 @@ describe GenericFilesController do
     end
     after do
       GenericFile.unstub(:new)
-      begin
-        Batch.find("sample:batch_id").delete
-      rescue
-      end
+      Batch.find("sample:batch_id").delete rescue
       @mock.delete unless @mock.inner_object.class == ActiveFedora::UnsavedDigitalObject
     end
 
@@ -43,6 +39,15 @@ describe GenericFilesController do
       CharacterizeJob.should_receive(:new).with('test:123').and_return(s2)
       Sufia.queue.should_receive(:push).with(s2).once
       xhr :post, :create, :files=>[file], :Filename=>"The world", :batch_id => "sample:batch_id", :permission=>{"group"=>{"public"=>"read"} }, :terms_of_service => '1'
+      flash[:error].should be_nil
+    end
+
+    it "displays a flash error when file has a virus" do
+      file = fixture_file_upload('/world.png', 'image/png')
+      Sufia::GenericFile::Actions.should_receive(:virus_check).with(file.path).and_raise(Sufia::VirusFoundError.new('A virus was found'))
+      xhr :post, :create, :files=>[file], :Filename=>"The world", :batch_id => "sample:batch_id", :permission=>{"group"=>{"public"=>"read"} }, :terms_of_service => '1'
+      flash[:error].should_not be_blank
+      flash[:error].should include('A virus was found')
     end
 
     it "should expand zip files" do
@@ -62,43 +67,6 @@ describe GenericFilesController do
       xhr :post, :create, :files=>[file], :Filename=>"The world", :batch_id => "sample:batch_id", :permission=>{"group"=>{"public"=>"read"} }, :terms_of_service => '1'
     end
 
-    it "should download and import a file from a given url" do
-      pending "This is just downloading a 401 error page"
-      date_today = Date.today
-      Date.stub(:today).and_return(date_today)
-      generic_file = GenericFile.new      #find(self.pid)
-      Sufia::GenericFile::Actions.create_metadata(generic_file, @user, '1234')
-      #generic_file.import_url = "https://dl.dropboxusercontent.com/1/view/kcb4j1dtkw0td3z/ArticleCritique.doc"
-      generic_file.import_url =  "https://dl.dropboxusercontent.com/1/view/m4og1xrgbk3ihw6/Getting%20Started.pdf"
-      generic_file.save
-      f = Tempfile.new(generic_file.pid)  #self.pid)
-      f.binmode
-      # download file from url
-      uri = URI(generic_file.import_url)
-      http = Net::HTTP.new(uri.host, uri.port) 
-      http.use_ssl = uri.scheme == "https"  # enable SSL/TLS
-      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-
-      http.start do  
-        http.request_get(uri.to_s) do |resp|
-          resp.read_body do |segment|
-            f.write(segment)
-          end 
-        end 
-      end 
-      job_user = User.batchuser()
-      user = User.find_by_user_key(generic_file.depositor)
-      # check for virus
-      if Sufia::GenericFile::Actions.virus_check(f) != 0
-        message = "The file (#{File.basename(uri.path)}) was unable to be imported because it contained a virus."
-        job_user.send_message(user, message, 'File Import Error') 
-        return
-      end 
-      f.rewind
-      # attach downloaded file to generic file stubbed out
-      Sufia::GenericFile::Actions.create_content(generic_file, f, File.basename(uri.path), 'content', user)
-    end
-
     it "should create and save a file asset from the given params" do
       date_today = Date.today
       Date.stub(:today).and_return(date_today)
@@ -159,19 +127,6 @@ describe GenericFilesController do
       saved_file.to_solr.keys.should include('depositor_tesim')
       saved_file.to_solr['depositor_tesim'].should == ['jilluser@example.com']
     end
-    it "Should call virus check" do
-      controller.should_receive(:virus_check).and_return(0)      
-      file = fixture_file_upload('/world.png','image/png')
-
-      s1 = double('one')
-      ContentDepositEventJob.should_receive(:new).with('test:123', 'jilluser@example.com').and_return(s1)
-      Sufia.queue.should_receive(:push).with(s1).once
-
-      s2 = double('one')
-      CharacterizeJob.should_receive(:new).with('test:123').and_return(s2)
-      Sufia.queue.should_receive(:push).with(s2).once
-      xhr :post, :create, :files=>[file], :Filename=>"The world", :batch_id => "sample:batch_id", :permission=>{"group"=>{"public"=>"read"} }, :terms_of_service=>"1"
-    end
     
     it "should error out of create and save after on continuos rsolr error" do
       GenericFile.any_instance.stub(:save).and_raise(RSolr::Error::Http.new({},{}))  
@@ -181,7 +136,7 @@ describe GenericFilesController do
       response.body.should include("Error occurred while creating generic file.")
     end
   end
-    
+  
   describe "#create with local_file" do
     let (:mock_url) {"http://example.com"}
     before do
@@ -255,27 +210,9 @@ describe GenericFilesController do
       end
     end
   end
-  
-  describe "#virus_check" do
-    it "passing virus check should not create flash error" do
-      GenericFile.any_instance.stub(:to_solr).and_return({})
-      file = fixture_file_upload('/world.png','image/png')  
-      Sufia::GenericFile::Actions.should_receive(:virus_check).with(file).and_return(0)    
-      controller.send :virus_check, file
-      flash[:error].should be_nil
-    end
-    it "failing virus check should create flash" do
-      GenericFile.any_instance.stub(:to_solr).and_return({})
-      file = fixture_file_upload('/world.png','image/png')  
-      Sufia::GenericFile::Actions.should_receive(:virus_check).with(file).and_return(1)    
-      controller.send :virus_check, file
-      flash[:error].should_not be_empty
-    end
-  end
 
   describe "audit" do
     before do
-      #GenericFile.any_instance.stub(:to_solr).and_return({})
       @generic_file = GenericFile.new
       @generic_file.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
       @generic_file.apply_depositor_metadata('mjg36')
@@ -303,7 +240,7 @@ describe GenericFilesController do
     end
     after do
       @user.delete
-    end    
+    end
     it "should delete the file" do
       GenericFile.find(@generic_file.pid).should_not be_nil
       delete :destroy, :id=>@generic_file.pid
@@ -319,7 +256,6 @@ describe GenericFilesController do
 
   describe "update" do
     before do
-      #controller.should_receive(:virus_check).and_return(0)      
       @generic_file = GenericFile.new
       @generic_file.apply_depositor_metadata(@user)
       @generic_file.save
@@ -374,7 +310,6 @@ describe GenericFilesController do
       posted_file.content.mimeType.should == "image/jpeg"
       post :update, :id=>@generic_file.pid, :revision=>'content.0'
 
-
       restored_file = GenericFile.find(@generic_file.pid)
       version3 = restored_file.content.latest_version
       version3.versionID.should_not == version2.versionID
@@ -396,7 +331,7 @@ describe GenericFilesController do
       version1 = posted_file.content.latest_version
       posted_file.content.version_committer(version1).should == @user.user_key
 
-      # other user uploads new version 
+      # other user uploads new version
       # TODO this should be a separate test
       archivist = FactoryGirl.find_or_create(:archivist)
       controller.stub(:current_user).and_return(archivist)
@@ -454,7 +389,7 @@ describe GenericFilesController do
     end
     it "should spawn a virus check" do
       # The expectation is in the begin block
-      controller.should_receive(:virus_check).and_return(0)      
+      Sufia::GenericFile::Actions.should_receive(:virus_check).and_return(0)
       s1 = double('one')
       ContentNewVersionEventJob.should_receive(:new).with(@generic_file.pid, 'jilluser@example.com').and_return(s1)
       Sufia.queue.should_receive(:push).with(s1).once

data/spec/controllers/mailbox_controller_spec.rb

@@ -17,32 +17,28 @@ describe MailboxController do
   end
   describe "#index" do
     it "should show message" do
-      User.any_instance.should_receive(:mark_as_read)
       get :index
       response.should be_success
       assigns[:messages].first.last_message.body.should == 'Test Message'
       assigns[:messages].first.last_message.subject.should == 'Test Subject'
+      @user.mailbox.inbox(:unread => true).count.should == 0
     end
   end
   describe "#delete" do
     it "should delete message" do
       rec = @another_user.send_message(@user, 'message 2', 'subject 2')
-      @user.mailbox.inbox.count.should == 2
-      get :index
-      assigns[:messages].first.last_message.body.should == 'message 2'
-      get :delete, :uid=> rec.conversation.id
-      response.should redirect_to(@routes.url_helpers.mailbox_path)
-      @user.mailbox.inbox.count.should ==1
+      expect {
+        delete :destroy, :id=> rec.conversation.id
+        response.should redirect_to(@routes.url_helpers.notifications_path)
+      }.to change {@user.mailbox.inbox.count}.by(-1)
     end
     it "should not delete message" do
       @curator = FactoryGirl.find_or_create(:curator)
       rec = @another_user.send_message(@curator, 'message 3', 'subject 3')
-      @curator.mailbox.inbox.count.should == 1
-      get :delete, :uid=> rec.conversation.id
-      response.should redirect_to(@routes.url_helpers.mailbox_path)
-      @curator.mailbox.inbox.count.should ==1
-      rec.delete
-      @curator.delete       
+      expect {
+        delete :destroy, :id=> rec.conversation.id
+        response.should redirect_to(@routes.url_helpers.notifications_path)
+      }.to_not change { @curator.mailbox.inbox.count}
     end
   end
   describe "#delete_all" do

data/spec/features/users_spec.rb

@@ -3,9 +3,6 @@ require 'spec_helper'
 describe "User Profile" do
 
   before do
-    # FactoryGirl.create(:user)
-    # FactoryGirl.create(:archivist)
-    # FactoryGirl.create(:curator)
     sign_in :curator
   end
 

data/spec/jobs/import_url_job_spec.rb

@@ -15,7 +15,7 @@ describe ImportUrlJob do
     generic_file.destroy
   end
 
-  subject { ImportUrlJob.new(generic_file.id) }
+  subject(:job) { ImportUrlJob.new(generic_file.id) }
 
   it "should have no content at the outset" do
     generic_file.content.size.should be_nil
@@ -23,23 +23,23 @@ describe ImportUrlJob do
 
   it "should create a content datastream" do
     http_res = double('response')
+    http_res.stub(:start).and_yield
     http_res.stub(:read_body).and_yield(File.open(File.expand_path('../../fixtures/world.png', __FILE__)).read)
     Net::HTTP.any_instance.stub(:request_get).and_yield(http_res)
     Net::HTTP.any_instance.should_receive(:request_get).with(URI(generic_file.import_url).request_uri)
-    subject.run
+    job.run
     generic_file.reload.content.size.should == 4218
   end
 
   describe "virus checking" do
     it "should run virus check" do
-      Sufia::GenericFile::Actions.should_receive(:virus_check).and_return(0)
-      Sufia::GenericFile::Actions.should_receive(:create_content).once
-      subject.run
+      expect(Sufia::GenericFile::Actions).to receive(:virus_check).twice.and_return(0)
+      job.run
     end
     it "should abort if virus check fails" do
-      Sufia::GenericFile::Actions.should_receive(:virus_check).and_return(1)
-      User.any_instance.should_receive(:send_message).with(user, 'The file (world.png) was unable to be imported because it contained a virus.', 'File Import Error')
-      subject.run
+      Sufia::GenericFile::Actions.stub(:virus_check).and_raise(Sufia::VirusFoundError.new('A virus was found'))
+      job.run
+      expect(user.mailbox.inbox.first.subject).to eq("File Import Error")
     end
   end
 end

data/spec/jobs/ingest_local_file_job_spec.rb

@@ -3,33 +3,36 @@ require 'spec_helper'
 describe IngestLocalFileJob do
   let(:user) { FactoryGirl.find_or_create(:user) }
 
-  let (:generic_file) do 
-    GenericFile.new.tap { |f| f.apply_depositor_metadata(user); f.save } 
-  end 
+  let (:generic_file) do
+    GenericFile.new.tap { |f| f.apply_depositor_metadata(user); f.save }
+  end
+
+  subject(:job) { IngestLocalFileJob.new(generic_file.id, @mock_upload_directory, "world.png", user.user_key) }
 
   before do
     @mock_upload_directory = 'spec/mock_upload_directory'
     Dir.mkdir @mock_upload_directory unless File.exists? @mock_upload_directory
     FileUtils.copy(File.expand_path('../../fixtures/world.png', __FILE__), @mock_upload_directory)
   end
+
   after do
     generic_file.destroy
   end
-  subject { IngestLocalFileJob.new(generic_file.id, @mock_upload_directory, "world.png", user.user_key) }
 
   it "should have attached a file" do
-    subject.run
+    job.run
     generic_file.reload.content.size.should == 4218
   end
-  
+
   describe "virus checking" do
     it "should run virus check" do
-      Sufia::GenericFile::Actions.should_receive(:virus_check).and_return(0)
-      subject.run
+      expect(Sufia::GenericFile::Actions).to receive(:virus_check).twice.and_return(0)
+      job.run
     end
     it "should abort if virus check fails" do
-      Sufia::GenericFile::Actions.should_receive(:virus_check).and_return(1)
-      expect { subject.run }.to raise_error(StandardError, /Virus checking did not pass/)
+      Sufia::GenericFile::Actions.stub(:virus_check).and_raise(Sufia::VirusFoundError.new('A virus was found'))
+      job.run
+      expect(user.mailbox.inbox.first.subject).to eq("Local file ingest error")
     end
   end
 end

data/spec/models/fits_datastream_spec.rb

@@ -1,28 +1,79 @@
 require 'spec_helper'
 
 describe FitsDatastream, :unless => $in_travis do
-  before(:all) do
-    @file = GenericFile.new
-    @file.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
-    @file.characterize
+  describe "image" do
+    before(:all) do
+      @file = GenericFile.new
+      @file.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
+      @file.characterize
+    end
+    it "should have a format label" do
+      @file.format_label.should == ["Portable Network Graphics"]
+    end
+    it "should have a mime type" do
+      @file.mime_type.should == "image/png"
+    end
+    it "should have a file size" do
+      @file.file_size.should == ["4218"]
+    end
+    it "should have a file size" do
+      @file.file_size.should == ["4218"]
+    end
+    it "should have a last modified timestamp" do
+      @file.last_modified.should_not be_empty
+    end
+    it "should have a filename" do
+      @file.filename.should_not be_empty
+    end
+    it "should have a checksum" do
+      @file.original_checksum.should == ["28da6259ae5707c68708192a40b3e85c"]
+    end
+    it "should have a height" do
+      @file.height.should == ["50"]
+    end
+    it "should have a width" do
+      @file.width.should == ["50"]
+    end
   end
-  it "should have a format label" do
-    @file.format_label.should == ["Portable Network Graphics"]
-  end
-  it "should have a mime type" do
-    @file.mime_type.should == "image/png"
-  end
-  it "should have a file size" do
-    @file.file_size.should == ["4218"]
-  end
-  it "should have a last modified timestamp" do
-    @file.last_modified.should_not be_empty
-  end
-  it "should have a filename" do
-    @file.filename.should_not be_empty
-  end
-  it "should have a checksum" do
-    @file.original_checksum.should == ["28da6259ae5707c68708192a40b3e85c"]
+  describe "video" do
+    before(:all) do
+      @file = GenericFile.new
+      @file.add_file(File.open(fixture_path + '/sample_mpeg4.mp4'), 'content', 'sample_mpeg4.mp4')
+      @file.characterize
+    end
+    it "should have a format label" do
+      @file.format_label.should == ["ISO Media, MPEG v4 system, version 2"]
+    end
+    it "should have a mime type" do
+      @file.mime_type.should == "video/mp4"
+    end
+    it "should have a file size" do
+      @file.file_size.should == ["245779"]
+    end
+    it "should have a last modified timestamp" do
+      @file.last_modified.should_not be_empty
+    end
+    it "should have a filename" do
+      @file.filename.should_not be_empty
+    end
+    it "should have a checksum" do
+      @file.original_checksum.should == ["dc77a8de8c091c19d86df74280f6feb7"]
+    end
+    it "should have a width" do
+      @file.width.should == ["190"]
+    end
+    it "should have a height" do
+      @file.height.should == ["240"]
+    end
+    it "should have a sample_rate" do
+      @file.sample_rate.should == ["32000"]
+    end
+    it "should have a duration" do
+      @file.duration.should == ["4.97 s"]
+    end
+    it "should have a frame_rate" do
+      @file.frame_rate.should == ["30"]
+    end
   end
 end
 

data/spec/models/generic_file/actions_spec.rb

@@ -1,25 +1,10 @@
 require 'spec_helper'
 
 describe GenericFile do
-
   describe "#virus_check" do
-    before do
-      unless defined? ClamAV
-        class ClamAV
-          def self.instance
-            new
-          end
-        end
-        @stubbed_clamav = true
-      end
-    end
-    after do
-      Object.send(:remove_const, :ClamAV) if @stubbed_clamav
-    end
     it "should return the results of running ClamAV scanfile method" do
-      # subject.stub(:to_solr).and_return({})
-      ClamAV.any_instance.should_receive(:scanfile).and_return(1)    
-      Sufia::GenericFile::Actions.virus_check(File.new(fixture_path + '/world.png')).should == 1
+      ClamAV.instance.should_receive(:scanfile).and_return(1)
+      expect { Sufia::GenericFile::Actions.virus_check(File.new(fixture_path + '/world.png')) }.to raise_error(Sufia::VirusFoundError)
     end
   end
 end