sufia 3.0.0 → 3.1.0

data/spec/jobs/import_url_job_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+describe ImportUrlJob do
+  let(:user) { FactoryGirl.find_or_create(:user) }
+
+  let(:generic_file) do
+    GenericFile.new.tap do |f|
+      f.import_url = "http://example.org/world.png"
+      f.apply_depositor_metadata(user.user_key)
+      f.save
+    end
+  end
+
+  after do
+    generic_file.destroy
+  end
+
+  subject { ImportUrlJob.new(generic_file.id) }
+
+  it "should have no content at the outset" do
+    generic_file.content.size.should be_nil
+  end
+
+  it "should create a content datastream" do
+    http_res = double('response')
+    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
+    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
+    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
+    end
+  end
+end

data/spec/jobs/ingest_local_file_job_spec.rb

@@ -0,0 +1,35 @@
+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 
+
+  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
+    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
+    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/)
+    end
+  end
+end

data/spec/lib/sufia/id_service_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'spec_helper'
 
 describe Sufia::IdService do
   describe "mint" do

data/spec/lib/sufia/upload_complete_behavior_spec.rb

@@ -0,0 +1,26 @@
+require "spec_helper"
+class UploadThing
+  extend Sufia::FilesController::UploadCompleteBehavior
+end
+
+class UploadThingRedefine
+  extend Sufia::FilesController::UploadCompleteBehavior
+  def self.upload_complete_path(id)
+    return "example.com"
+  end
+
+end
+
+describe Sufia::FilesController::UploadCompleteBehavior do
+  let (:test_id) {"123abc"}
+  context "Not overridden" do
+    it "respond with the batch edit path" do
+      UploadThing.upload_complete_path(test_id).should == Sufia::Engine.routes.url_helpers.batch_edit_path(test_id)
+    end
+  end
+  context "overriden path" do
+    it "respond with the batch edit path" do
+      UploadThingRedefine.upload_complete_path(test_id).should == "example.com"
+    end
+  end
+end

data/spec/models/audit_job_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe AuditJob do
   before do
@@ -7,7 +7,7 @@ describe AuditJob do
     GenericFile.any_instance.should_receive(:characterize_if_changed).and_yield
     GenericFile.any_instance.stub(:terms_of_service).and_return('1')
     @file = GenericFile.new
-    @file.apply_depositor_metadata(@user.user_key)
+    @file.apply_depositor_metadata(@user)
     @file.save
     @ds = @file.datastreams.first
   end

data/spec/models/batch_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe Batch do
   before(:all) do

data/spec/models/batch_update_job_spec.rb

@@ -1,6 +1,4 @@
-# encoding: UTF-8
-
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe BatchUpdateJob do
   before do
@@ -8,7 +6,7 @@ describe BatchUpdateJob do
     @batch = Batch.new
     @batch.save
     @file = GenericFile.new(:batch=>@batch)
-    @file.apply_depositor_metadata(@user.user_key)
+    @file.apply_depositor_metadata(@user)
     @file.save
     @file2 = GenericFile.new(:batch=>@batch)
     @file2.apply_depositor_metadata('otherUser')

data/spec/models/characterize_job_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe CharacterizeJob do
   before do
@@ -15,17 +15,18 @@ describe CharacterizeJob do
 
   describe "with a AVI (video) file" do
     before do
-      @generic_file.add_file_datastream(File.new(fixture_path + '/countdown.avi'), :dsid=>'content', :mime_type=>'video/avi')
+      @generic_file.add_file(File.open(fixture_path + '/countdown.avi'), 'content', 'countdown.avi')
       @generic_file.stub(:characterize_if_changed).and_yield
       @generic_file.save!
     end
     it "should create a transcode job" do
       job = double("stub video job")
       if $in_travis
-        @generic_file.stub(:video?).and_return(true)
-        GenericFile.should_receive(:find).with(@generic_file.id).and_return(@generic_file)
+        # This is in place because we stub fits for travis, and the stub sets the mime to application/pdf, fixing that.
+        @generic_file.stub(:mime_type).and_return('video/avi')
+        ActiveFedora::Base.should_receive(:find).with(@generic_file.id, cast:true).and_return(@generic_file)
       end
-      TranscodeVideoJob.should_receive(:new).with(@generic_file.id, 'content').and_return(job)
+      TranscodeVideoJob.should_receive(:new).with(@generic_file.id).and_return(job)
       Sufia.queue.should_receive(:push).with(job)
       subject.run
     end
@@ -37,17 +38,18 @@ describe CharacterizeJob do
 
   describe "with a WAV (audio) file" do
     before do
-      @generic_file.add_file_datastream(File.new(fixture_path + '/piano_note.wav'), :dsid=>'content', :mime_type=>'audio/wav')
+      @generic_file.add_file(File.open(fixture_path + '/piano_note.wav'), 'content', 'piano_note.wav')
       @generic_file.stub(:characterize_if_changed).and_yield
       @generic_file.save!
     end
     it "should create a transcode job" do
       job = double("stub audio job")
       if $in_travis
-        @generic_file.stub(:audio?).and_return(true)
-        GenericFile.should_receive(:find).with(@generic_file.id).and_return(@generic_file)
+        # This is in place because we stub fits for travis, and the stub sets the mime to application/pdf, fixing that.
+        @generic_file.stub(:mime_type).and_return('audio/wav')
+        ActiveFedora::Base.should_receive(:find).with(@generic_file.id, cast:true).and_return(@generic_file)
       end
-      TranscodeAudioJob.should_receive(:new).with(@generic_file.id, 'content').and_return(job)
+      TranscodeAudioJob.should_receive(:new).with(@generic_file.id).and_return(job)
       Sufia.queue.should_receive(:push).with(job)
       subject.run
     end
@@ -55,7 +57,7 @@ describe CharacterizeJob do
 
   describe "with an mp3 (audio) file" do
     before do
-      @generic_file.add_file_datastream(File.new(fixture_path + '/sufia/sufia_test5.mp3'), :dsid=>'content', :mime_type=>'audio/mp3')
+      @generic_file.add_file(File.open(fixture_path + '/sufia/sufia_test5.mp3'), 'content', 'sufia_test5.mp3')
       @generic_file.stub(:characterize_if_changed).and_yield
       @generic_file.save!
     end
@@ -63,10 +65,11 @@ describe CharacterizeJob do
       # TODO just copy the 'content' datastream to the mp3 datastream if it's an mp3, and then transcode to ogg
       job = double("stub audio job")
       if $in_travis
-        @generic_file.stub(:audio?).and_return(true)
-        GenericFile.should_receive(:find).with(@generic_file.id).and_return(@generic_file)
+        # This is in place because we stub fits for travis, and the stub sets the mime to application/pdf, fixing that.
+        @generic_file.stub(:mime_type).and_return('audio/mpeg')
+        ActiveFedora::Base.should_receive(:find).with(@generic_file.id, cast:true).and_return(@generic_file)
       end
-      TranscodeAudioJob.should_receive(:new).with(@generic_file.id, 'content').and_return(job)
+      TranscodeAudioJob.should_receive(:new).with(@generic_file.id).and_return(job)
       Sufia.queue.should_receive(:push).with(job)
       subject.run
     end
@@ -74,7 +77,7 @@ describe CharacterizeJob do
 
   describe "with an jpeg2000 (image) file" do
     before do
-      @generic_file.add_file_datastream(File.new(fixture_path + '/image.jp2'), :dsid=>'content', :mime_type=>'image/jp2')
+      @generic_file.add_file(File.open(fixture_path + '/image.jp2'), 'content', 'image.jp2')
       @generic_file.stub(:characterize_if_changed).and_yield
       @generic_file.save!
     end

data/spec/models/checksum_audit_log_spec.rb

@@ -1,9 +1,9 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe ChecksumAuditLog do
   before(:all) do
     @f = GenericFile.new
-    @f.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content')
+    @f.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
     @f.apply_depositor_metadata('mjg36')
     @f.stub(:characterize_if_changed).and_yield #don't run characterization
     @f.save!

data/spec/models/event_jobs_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe 'event jobs' do
   before(:each) do
@@ -7,7 +7,7 @@ describe 'event jobs' do
     @third_user = FactoryGirl.find_or_create(:curator)
     GenericFile.any_instance.stub(:terms_of_service).and_return('1')
     @gf = GenericFile.new(pid: 'test:123')
-    @gf.apply_depositor_metadata(@user.user_key)
+    @gf.apply_depositor_metadata(@user)
     @gf.title = 'Hamlet'
     @gf.save
   end

data/spec/models/file_content_datastream_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe FileContentDatastream do
   before do
@@ -7,7 +7,7 @@ describe FileContentDatastream do
   describe "version control" do
     before do
       f = GenericFile.new
-      f.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content')
+      f.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
       f.apply_depositor_metadata('mjg36')
       f.stub(:characterize_if_changed).and_yield #don't run characterization
       f.save
@@ -33,7 +33,7 @@ describe FileContentDatastream do
     end
     describe "add a version" do
       before do
-        @file.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content')
+        @file.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
         @file.stub(:characterize_if_changed).and_yield #don't run characterization
         @file.save
       end
@@ -93,13 +93,13 @@ describe FileContentDatastream do
       @generic_file.delete
     end
     it "should only return true when the datastream has actually changed" do
-      @generic_file.add_file_datastream(File.new(fixture_path + '/world.png', 'rb'), :dsid=>'content')
+      @generic_file.add_file(File.open(fixture_path + '/world.png', 'rb'), 'content', 'world.png')
       @generic_file.content.changed?.should be_true
       @generic_file.save!
       @generic_file.content.changed?.should be_false
 
       # Add a thumbnail ds
-      @generic_file.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'thumbnail')
+      @generic_file.add_file(File.open(fixture_path + '/world.png'), 'thumbnail', 'world.png')
       @generic_file.thumbnail.changed?.should be_true
       @generic_file.content.changed?.should be_false
 

data/spec/models/fits_datastream_spec.rb

@@ -1,9 +1,9 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe FitsDatastream, :unless => $in_travis do
   before(:all) do
     @file = GenericFile.new
-    @file.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content')
+    @file.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
     @file.characterize
   end
   it "should have a format label" do

data/spec/models/generic_file/actions_spec.rb

@@ -0,0 +1,25 @@
+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
+    end
+  end
+end

data/spec/models/generic_file/web_form_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'spec_helper'
 
 describe GenericFile do
   before do

data/spec/models/generic_file_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe GenericFile do
   before do
@@ -156,7 +156,7 @@ describe GenericFile do
       @file.descMetadata.should be_kind_of GenericFileRdfDatastream
     end
     it "should have content datastream" do
-      @file.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content')
+      @file.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
       @file.content.should be_kind_of FileContentDatastream
     end
   end
@@ -310,7 +310,7 @@ describe GenericFile do
     describe "with a video", :if => Sufia.config.enable_ffmpeg do
       before do
         @f.stub(:mime_type=>'video/quicktime')  #Would get set by the characterization job
-        @f.add_file_datastream(File.new("#{fixture_path}/countdown.avi", 'rb'), :dsid=>'content')
+        @f.add_file(File.open("#{fixture_path}/countdown.avi", 'rb'), 'content', 'countdown.avi')
         @f.save
       end
       it "should make a png thumbnail" do
@@ -319,36 +319,16 @@ describe GenericFile do
         @f.thumbnail.mimeType.should == 'image/png'
       end
     end
-
-    describe "with an image that doesn't get resized" do
-      before do
-        @f.stub(:mime_type=>'image/png', :width=>['50'], :height=>['50'])  #Would get set by the characterization job
-        @f.add_file_datastream(File.new("#{fixture_path}/world.png", 'rb'), :dsid=>'content')
-        @f.save
-      end
-      it "should keep the thumbnail at the original size (but transform to png)" do
-        @mock_image = double("image", :from_blob=>true)
-        @mock_image.should_not_receive(:scale)
-        @mock_image.should_receive(:to_blob).and_return('fake content')
-        Magick::ImageList.should_receive(:new).and_return(@mock_image)
-        @f.create_thumbnail
-        @f.thumbnail.content.should == 'fake content'
-        @f.thumbnail.mimeType.should == 'image/png'
-      end
-    end
   end
   describe "trophies" do
-    before(:all) do
-      @u = FactoryGirl.create(:user)
+    before do
+      u = FactoryGirl.create(:user)
       @f = GenericFile.new.tap do |gf|
-        gf.apply_depositor_metadata(@u.user_key)
+        gf.apply_depositor_metadata(u)
         gf.stub(:characterize_if_changed).and_yield #don't run characterization
         gf.save!
       end
-      @t = Trophy.create(user_id: @u.id, generic_file_id: @f.pid)
-    end
-    after(:all) do
-      @u.destroy
+      @t = Trophy.create(user_id: u.id, generic_file_id: @f.pid)
     end
     it "should have a trophy" do
       Trophy.where(generic_file_id: @f.pid).count.should == 1
@@ -363,13 +343,16 @@ describe GenericFile do
     before(:each) do
       u = FactoryGirl.create(:user)
       f = GenericFile.new
-      f.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content')
-      f.apply_depositor_metadata(u.user_key)
+      f.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
+      f.apply_depositor_metadata(u)
       f.stub(:characterize_if_changed).and_yield #don't run characterization
       f.save!
       @f = f.reload
     end
     it "should schedule a audit job for each datastream" do
+      s0 = double('zero')
+      AuditJob.should_receive(:new).with(@f.pid, 'descMetadata', "descMetadata.0").and_return(s0)
+      Sufia.queue.should_receive(:push).with(s0)
       s1 = double('one')
       AuditJob.should_receive(:new).with(@f.pid, 'DC', "DC1.0").and_return(s1)
       Sufia.queue.should_receive(:push).with(s1)
@@ -407,7 +390,7 @@ describe GenericFile do
   describe "run_audit" do
     before do
       @f = GenericFile.new
-      @f.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content')
+      @f.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
       @f.apply_depositor_metadata('mjg36')
       @f.stub(:characterize_if_changed).and_yield #don't run characterization
       @f.save!
@@ -441,7 +424,7 @@ describe GenericFile do
       @file.delete
     end
     it "should schedule a characterization job" do
-      @file.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content')
+      @file.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
       Sufia.queue.should_receive(:push).once
       @file.save
     end
@@ -547,7 +530,7 @@ describe GenericFile do
   end
   describe "characterize" do
     it "should return expected results when called", :unless => $in_travis do
-      @file.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content')
+      @file.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
       @file.characterize
       doc = Nokogiri::XML.parse(@file.characterization.content)
       doc.root.xpath('//ns:imageWidth/text()', {'ns'=>'http://hul.harvard.edu/ois/xml/ns/fits/fits_output'}).inner_text.should == '50'
@@ -564,7 +547,7 @@ describe GenericFile do
     describe "after job runs" do
       before(:all) do
         myfile = GenericFile.new
-        myfile.add_file_datastream(File.new(fixture_path + '/sufia/sufia_test4.pdf'), :dsid=>'content')
+        myfile.add_file(File.open(fixture_path + '/sufia/sufia_test4.pdf'), 'content', 'sufia_test4.pdf')
         myfile.label = 'label123'
         myfile.apply_depositor_metadata('mjg36')
         myfile.save