sufia 0.0.1.pre2 → 0.0.1

data/spec/models/file_content_datastream_spec.rb

@@ -16,17 +16,17 @@ require 'spec_helper'
 
 describe FileContentDatastream do
   before do
-    GenericFile.any_instance.stubs(:terms_of_service).returns('1')
+    GenericFile.any_instance.stub(:terms_of_service).and_return('1')
     @subject = FileContentDatastream.new(nil, 'content')
-    @subject.stubs(:pid=>'my_pid')
-    @subject.stubs(:dsVersionID=>'content.7')
+    @subject.stub(:pid=>'my_pid')
+    @subject.stub(:dsVersionID=>'content.7')
   end
   describe "version control" do
     before(:all) do
-      GenericFile.any_instance.stubs(:terms_of_service).returns('1')
+      GenericFile.any_instance.stub(:terms_of_service).and_return('1')
       f = GenericFile.new
       f.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content')
-      f.expects(:characterize_if_changed).yields
+      f.should_receive(:characterize_if_changed).and_yield
       f.apply_depositor_metadata('mjg36')
       f.save
       @file = GenericFile.find(f.pid)
@@ -52,7 +52,7 @@ describe FileContentDatastream do
     describe "add a version" do
       before(:all) do
         @file.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content')
-        @file.expects(:characterize_if_changed).yields
+        @file.should_receive(:characterize_if_changed).and_yield
         @file.save
       end
       it "should return two versions" do
@@ -73,25 +73,25 @@ describe FileContentDatastream do
     end
     it "should return an xml document" do
       repo = mock("repo")
-      repo.stubs(:config=>{})
+      repo.stub(:config=>{})
       f = File.new(fixture_path + '/world.png')
       content = mock("file")
-      content.stubs(:read=>f.read)
-      content.stubs(:rewind=>f.rewind)
-      @subject.expects(:content).times(5).returns(f)
+      content.stub(:read=>f.read)
+      content.stub(:rewind=>f.rewind)
+      @subject.should_receive(:content).exactly(5).times.and_return(f)
       xml = @subject.extract_metadata
       doc = Nokogiri::XML.parse(xml)
       doc.root.xpath('//ns:imageWidth/text()', {'ns'=>'http://hul.harvard.edu/ois/xml/ns/fits/fits_output'}).inner_text.should == '50'
     end
     it "should return expected results when invoked via HTTP" do
       repo = mock("repo")
-      repo.stubs(:config=>{})
+      repo.stub(:config=>{})
       f = ActionDispatch::Http::UploadedFile.new(:tempfile => File.new(fixture_path + '/world.png'),
                                                  :filename => 'world.png')
       content = mock("file")
-      content.stubs(:read=>f.read)
-      content.stubs(:rewind=>f.rewind)
-      @subject.expects(:content).times(5).returns(f)
+      content.stub(:read=>f.read)
+      content.stub(:rewind=>f.rewind)
+      @subject.should_receive(:content).exactly(5).times.and_return(f)
       xml = @subject.extract_metadata
       doc = Nokogiri::XML.parse(xml)
       doc.root.xpath('//ns:identity/@mimetype', {'ns'=>'http://hul.harvard.edu/ois/xml/ns/fits/fits_output'}).first.value.should == 'image/png'

data/spec/models/fits_datastream_spec.rb

@@ -16,7 +16,7 @@ require 'spec_helper'
 
 describe FitsDatastream do
   before(:all) do
-    GenericFile.any_instance.stubs(:terms_of_service).returns('1')
+    GenericFile.any_instance.stub(:terms_of_service).and_return('1')
     @file = GenericFile.new
     @file.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content')
     @file.apply_depositor_metadata('mjg36')

data/spec/models/generic_file_spec.rb

@@ -16,7 +16,7 @@ require 'spec_helper'
 
 describe GenericFile do
   before(:each) do
-    GenericFile.any_instance.stubs(:terms_of_service).returns('1')
+    GenericFile.any_instance.stub(:terms_of_service).and_return('1')
     @file = GenericFile.new
     @file.apply_depositor_metadata('jcoyne')
   end
@@ -131,7 +131,7 @@ describe GenericFile do
     end
     describe "that have been saved" do
       before(:each) do
-        Resque.expects(:enqueue).once.returns(true)
+        Sufia.queue.should_receive(:push).once
       end
       after(:each) do
         unless @file.inner_object.class == ActiveFedora::UnsavedDigitalObject
@@ -227,18 +227,18 @@ describe GenericFile do
     describe "with an image that doesn't get resized" do
       before do
         @f = GenericFile.new
-        @f.stubs(:mime_type=>'image/png', :width=>['50'], :height=>['50'])  #Would get set by the characterization job
+        @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"), :dsid=>'content')
         @f.apply_depositor_metadata('mjg36')
         @f.save
         @mock_image = mock("image", :from_blob=>true)
-        Magick::ImageList.expects(:new).returns(@mock_image)
+        Magick::ImageList.should_receive(:new).and_return(@mock_image)
       end
       after do
         @f.delete
       end
       it "should scale the thumbnail to original size" do
-        @mock_image.expects(:scale).with(50, 50).returns(stub(:to_blob=>'fake content'))
+        @mock_image.should_receive(:scale).with(50, 50).and_return(stub(:to_blob=>'fake content'))
         @f.create_thumbnail
         @f.content.changed?.should be_false
         @f.thumbnail.content.should == 'fake content'
@@ -246,48 +246,95 @@ describe GenericFile do
     end
   end
   describe "audit" do
-    before(:all) do
-      GenericFile.any_instance.stubs(:terms_of_service).returns('1')
-      GenericFile.any_instance.stubs(:characterize).returns(true)
-      f = GenericFile.new
+    before(:each) do
+      u = FactoryGirl.create(:user)
+      f = GenericFile.new(:terms_of_service=>'1')
+      f.stub(:characterize).and_return(true)
       f.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content')
-      f.apply_depositor_metadata('mjg36')
-      f.save
+      f.apply_depositor_metadata(u.user_key)
+      f.save!
       @f = GenericFile.find(f.pid)
-      @datastreams = [FileContentDatastream, ActiveFedora::RelsExtDatastream,
-                      ActiveFedora::Datastream, PropertiesDatastream,
-                      ParanoidRightsDatastream]
-    end
-    after(:all) do
-      @f.delete
-    end
-    it "should schedule a audit job" do
-      @datastreams.each { |ds| ds.any_instance.stubs(:dsChecksumValid).returns(false) }
-      ChecksumAuditLog.stubs(:create!).returns(true)
-      Resque.expects(:enqueue).times(@datastreams.count)
+      @f.stub(:characterize).and_return(true)
+    end
+    it "should schedule a audit job for each datastream" do
+      s1 = stub('one')
+      AuditJob.should_receive(:new).with(@f.pid, 'DC', "DC1.0").and_return(s1)
+      Sufia.queue.should_receive(:push).with(s1)
+      s2 = stub('two')
+      AuditJob.should_receive(:new).with(@f.pid, 'RELS-EXT', "RELS-EXT.0").and_return(s2)
+      Sufia.queue.should_receive(:push).with(s2)
+      s3 = stub('three')
+      AuditJob.should_receive(:new).with(@f.pid, 'rightsMetadata', "rightsMetadata.0").and_return(s3)
+      Sufia.queue.should_receive(:push).with(s3)
+      s4 = stub('four')
+      AuditJob.should_receive(:new).with(@f.pid, 'properties', "properties.0").and_return(s4)
+      Sufia.queue.should_receive(:push).with(s4)
+      s5 = stub('five')
+      AuditJob.should_receive(:new).with(@f.pid, 'content', "content.0").and_return(s5)
+      Sufia.queue.should_receive(:push).with(s5)
+      s6 = stub('six')
+      AuditJob.should_receive(:new).with(@f.pid, 'characterization', "characterization.0").and_return(s6)
+      Sufia.queue.should_receive(:push).with(s6)
+      s7 = stub('seven')
+      AuditJob.should_receive(:new).with(@f.pid, 'thumbnail', "thumbnail.0").and_return(s7)
+      Sufia.queue.should_receive(:push).with(s7)
       @f.audit!
     end
     it "should log a failing audit" do
-      @datastreams.each { |ds| ds.any_instance.stubs(:dsChecksumValid).returns(false) }
+      @f.datastreams.each { |ds| ds.stub(:dsChecksumValid).and_return(false) }
+      GenericFile.stub(:run_audit).and_return(stub(:respose, :pass=>1, :created_at=>'2005-12-20', :pid=>'foo:123', :dsid=>'foo', :version=>'1'))
       @f.audit!
       ChecksumAuditLog.all.all? { |cal| cal.pass == 0 }.should be_true
     end
     it "should log a passing audit" do
-      @datastreams.each { |ds| ds.any_instance.stubs(:dsChecksumValid).returns(true) }
+      GenericFile.stub(:run_audit).and_return(stub(:respose, :pass=>1, :created_at=>'2005-12-20', :pid=>'foo:123', :dsid=>'foo', :version=>'1'))
       @f.audit!
       ChecksumAuditLog.all.all? { |cal| cal.pass == 1 }.should be_true
     end
+
     it "should return true on audit_status" do
       @f.audit_stat.should be_true
     end
   end
+
+  describe "run_audit" do
+    before do
+      @f = GenericFile.new(:terms_of_service => '1')
+      @f.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content')
+      @f.apply_depositor_metadata('mjg36')
+      @f.save!
+      @version = @f.datastreams['content'].versions.first
+      @old = ChecksumAuditLog.create(:pid=>@f.pid, :dsid=>@version.dsid, :version=>@version.versionID, :pass=>1, :created_at=>2.minutes.ago)
+      @new = ChecksumAuditLog.create(:pid=>@f.pid, :dsid=>@version.dsid, :version=>@version.versionID, :pass=>0)
+    end
+    it "should not prune failed audits" do
+      @version.should_receive(:dsChecksumValid).and_return(true)
+      GenericFile.run_audit(@version)
+
+      @version.should_receive(:dsChecksumValid).and_return(false)
+      GenericFile.run_audit(@version)
+
+      @version.should_receive(:dsChecksumValid).and_return(false)
+      GenericFile.run_audit(@version)
+
+      @version.should_receive(:dsChecksumValid).and_return(true)
+      GenericFile.run_audit(@version)
+
+      @version.should_receive(:dsChecksumValid).and_return(false)
+      GenericFile.run_audit(@version)
+
+      @f.logs(@version.dsid).map(&:pass).should == [0, 1, 0, 0, 1, 0, 1]
+    end
+
+  end
+
   describe "save" do
     after(:each) do
       @file.delete
     end
     it "should schedule a characterization job" do
       @file.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content')
-      Resque.expects(:enqueue).once
+      Sufia.queue.should_receive(:push).once
       @file.save
     end
   end
@@ -334,8 +381,8 @@ describe GenericFile do
       @f1.save
       @f2.save
       mock_batch = mock("batch")
-      mock_batch.stubs(:generic_files => [@f1, @f2])
-      @f1.expects(:batch).returns(mock_batch)
+      mock_batch.stub(:generic_files => [@f1, @f2])
+      @f1.should_receive(:batch).and_return(mock_batch)
       @f1.related_files.should == [@f2]
     end
     it "should work when batch is not defined by querying solr" do
@@ -343,7 +390,7 @@ describe GenericFile do
       @f2.add_relationship("isPartOf", "info:fedora/#{@batch_id}")
       @f1.save
       @f2.save
-      @f1.expects(:batch).twice.raises(NoMethodError)
+      @f1.should_receive(:batch).twice.and_raise(NoMethodError)
       lambda { @f1.related_files }.should_not raise_error
       @f1.related_files.should == [@f2]
     end
@@ -352,7 +399,7 @@ describe GenericFile do
       @f2.add_relationship(:is_part_of, "info:fedora/#{@batch_id}")
       @f1.save
       @f2.save
-      @f1.expects(:batch).twice.raises(NoMethodError)
+      @f1.should_receive(:batch).twice.and_raise(NoMethodError)
       lambda { @f1.related_files }.should_not raise_error
       @f1.related_files.should == [@f2]
     end
@@ -362,16 +409,16 @@ describe GenericFile do
       @f1.save
       @f2.save
       mock_batch = mock("batch")
-      mock_batch.stubs(:generic_files).raises(NoMethodError)
-      @f1.expects(:batch).twice
+      mock_batch.stub(:generic_files).and_raise(NoMethodError)
+      @f1.should_receive(:batch).twice
       lambda { @f1.related_files }.should_not raise_error
       @f1.related_files.should == [@f2]
     end
   end
   describe "noid integration" do
     before(:all) do
-      GenericFile.any_instance.stubs(:terms_of_service).returns('1')
-      GenericFile.any_instance.expects(:characterize_if_changed).yields
+      GenericFile.any_instance.stub(:terms_of_service).and_return('1')
+      GenericFile.any_instance.should_receive(:characterize_if_changed).and_yield
       @new_file = GenericFile.new(:pid => 'ns:123')
       @new_file.apply_depositor_metadata('mjg36')
       @new_file.save
@@ -399,19 +446,19 @@ describe GenericFile do
       doc.root.xpath('//ns:imageWidth/text()', {'ns'=>'http://hul.harvard.edu/ois/xml/ns/fits/fits_output'}).inner_text.should == '50'
     end
     it "should not be triggered unless the content ds is changed" do
-      Resque.expects(:enqueue).once
+      Sufia.queue.should_receive(:push).once
       @file.content.content = "hey"
       @file.save
       @file.related_url = 'http://example.com'
-      Resque.expects(:enqueue).never
+      Sufia.queue.should_receive(:push).never
       @file.save
       @file.delete
     end
     describe "after job runs" do
       before(:all) do
-        GenericFile.any_instance.stubs(:terms_of_service).returns('1')
+        GenericFile.any_instance.stub(:terms_of_service).and_return('1')
         myfile = GenericFile.new
-        myfile.add_file_datastream(File.new(fixture_path + '/scholarsphere/scholarsphere_test4.pdf'), :dsid=>'content')
+        myfile.add_file_datastream(File.new(fixture_path + '/sufia/sufia_test4.pdf'), :dsid=>'content')
         myfile.label = 'label123'
         myfile.thumbnail.size.nil?.should be_true
         myfile.apply_depositor_metadata('mjg36')
@@ -493,7 +540,7 @@ describe GenericFile do
   describe "permissions validation" do
     context "depositor must have edit access" do
       before(:each) do
-        GenericFile.any_instance.stubs(:terms_of_service).returns('1')
+        GenericFile.any_instance.stub(:terms_of_service).and_return('1')
         @file = GenericFile.new
         @file.apply_depositor_metadata('mjg36')
         @rightsmd = @file.rightsMetadata
@@ -593,7 +640,7 @@ describe GenericFile do
     end
     context "public must not have edit access" do
       before(:each) do
-        GenericFile.any_instance.stubs(:terms_of_service).returns('1')
+        GenericFile.any_instance.stub(:terms_of_service).and_return('1')
         @file = GenericFile.new
         @file.apply_depositor_metadata('mjg36')
         @file.read_groups = ['public']
@@ -694,7 +741,7 @@ describe GenericFile do
     end
     context "registered must not have edit access" do
       before(:each) do
-        GenericFile.any_instance.stubs(:terms_of_service).returns('1')
+        GenericFile.any_instance.stub(:terms_of_service).and_return('1')
         @file = GenericFile.new
         @file.apply_depositor_metadata('mjg36')
         @file.read_groups = ['registered']
@@ -795,7 +842,7 @@ describe GenericFile do
     end
     context "everything is copacetic" do
       before(:each) do
-        GenericFile.any_instance.stubs(:terms_of_service).returns('1')
+        GenericFile.any_instance.stub(:terms_of_service).and_return('1')
         @file = GenericFile.new
         @file.apply_depositor_metadata('mjg36')
         @file.read_groups = ['public']

data/spec/models/single_use_link_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe SingleUseLink do
   before (:all) do
-    GenericFile.any_instance.stubs(:terms_of_service).returns('1')
+    GenericFile.any_instance.stub(:terms_of_service).and_return('1')
     @file = GenericFile.new
     @file.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content')
     @file.apply_depositor_metadata('mjg36')
@@ -16,9 +16,9 @@ describe SingleUseLink do
   describe "create" do
      before do
         @now = DateTime.now
-        DateTime.stubs(:now).returns(@now)
+        DateTime.stub(:now).and_return(@now)
         @hash = "sha2hash"+@now.to_f.to_s
-        Digest::SHA2.expects(:new).returns(@hash)
+        Digest::SHA2.should_receive(:new).and_return(@hash)
         
      end
      it "should create show link" do

data/spec/models/transcode_video_job_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe TranscodeVideoJob do
+  before do
+    @generic_file = GenericFile.new(:terms_of_service=>'1')
+    @generic_file.apply_depositor_metadata('jcoyne@example.com')
+    @generic_file.add_file_datastream(File.new(fixture_path + '/countdown.avi'), :dsid=>'content')
+    @generic_file.save!
+  end
+
+  after do
+    @generic_file.delete
+  end
+
+  subject { TranscodeVideoJob.new(@generic_file.id, 'content')}
+  it "should put content in datastream_out" do
+    subject.run
+    reloaded = GenericFile.find(@generic_file.pid)
+    derivative = reloaded.datastreams['webm']
+    derivative.should_not be_nil
+    derivative.content.should_not be_nil
+    derivative.mimeType.should == 'video/webm'
+
+    derivative2 = reloaded.datastreams['mp4']
+    derivative2.should_not be_nil
+    derivative2.content.should_not be_nil
+    derivative2.mimeType.should == 'video/mp4'
+  end
+end
+

data/spec/models/unzip_job_spec.rb

@@ -17,8 +17,7 @@ require 'spec_helper'
 describe UnzipJob do
   before(:all) do
     @batch = Batch.create
-    GenericFile.any_instance.expects(:characterize_if_changed).at_least_once.yields
-    GenericFile.any_instance.stubs(:terms_of_service).returns('1')
+    GenericFile.any_instance.stub(:terms_of_service).and_return('1')
     @generic_file = GenericFile.new(:batch=>@batch)
     @generic_file.add_file_datastream(File.new(fixture_path + '/icons.zip'), :dsid=>'content')
     @generic_file.apply_depositor_metadata('mjg36')
@@ -32,10 +31,13 @@ describe UnzipJob do
 
   it "should create GenericFiles for each file in the zipfile" do
     one = GenericFile.new
+    #one.should_receive(:characterize_if_changed)
     two = GenericFile.new
+    #two.should_receive(:characterize_if_changed)
     three = GenericFile.new
-    GenericFile.expects(:new).times(3).returns(one, two, three)
-    Resque.enqueue(UnzipJob, @generic_file.pid)
+    #three.should_receive(:characterize_if_changed)
+    GenericFile.should_receive(:new).exactly(3).times.and_return(one, two, three)
+    UnzipJob.new(@generic_file.pid).run
 
     one.content.size.should == 13024 #bread
     one.content.label.should == 'spec/fixtures/bread-icon.png'

data/spec/rake/{scholarsphere_fixtures_spec.rb → sufia_fixtures_spec.rb}

@@ -12,15 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Used to test the scholarsphere-fixtures rake task
+# Used to test the sufia-fixtures rake task
 #
 require "spec_helper"
 require "rake"
 
-describe "scholarsphere:fixtures" do
+describe "sufia:fixtures" do
 
   def loaded_files_excluding_current_rake_file
-    $".reject { |file| file.include? "tasks/scholarsphere-fixtures" }
+    $".reject { |file| file.include? "tasks/sufia-fixtures" }
   end
 
   # saves original $stdout in variable
@@ -42,11 +42,11 @@ describe "scholarsphere:fixtures" do
   end
   
   def delete_fixture_files
-    File.delete(File.join(File.expand_path("#{fixture_path}/scholarsphere"), "sufia_rspecTestFixture.txt"))
-    File.delete(File.join(File.expand_path("#{fixture_path}/scholarsphere"), "sufia_rspecTestFixture.descMeta.txt"))
-    File.delete(File.join(File.expand_path("#{fixture_path}/scholarsphere"), "sufia_rspecTestFixture.foxml.erb"))
+    File.delete(File.join(File.expand_path("#{fixture_path}/sufia"), "sufia_rspecTestFixture.txt"))
+    File.delete(File.join(File.expand_path("#{fixture_path}/sufia"), "sufia_rspecTestFixture.descMeta.txt"))
+    File.delete(File.join(File.expand_path("#{fixture_path}/sufia"), "sufia_rspecTestFixture.foxml.erb"))
     begin
-      File.delete(File.join(File.expand_path("#{fixture_path}/scholarsphere"), "sufia_rspecTestFixture.foxml.xml"))
+      File.delete(File.join(File.expand_path("#{fixture_path}/sufia"), "sufia_rspecTestFixture.foxml.xml"))
     rescue
       # do nothing; this just means the generate task was not called
     end
@@ -56,7 +56,7 @@ describe "scholarsphere:fixtures" do
   before(:each) do
     @rake = Rake::Application.new 
     Rake.application = @rake
-    Rake.application.rake_require("tasks/scholarsphere-fixtures", ["."], loaded_files_excluding_current_rake_file)
+    Rake.application.rake_require("tasks/sufia-fixtures", ["."], loaded_files_excluding_current_rake_file)
     Rake.application.rake_require("lib/tasks/fixtures", ["."], loaded_files_excluding_current_rake_file)
     Rake.application.rake_require("lib/tasks/active_fedora", [activefedora_path], loaded_files_excluding_current_rake_file)      
     Rake::Task.define_task(:environment)
@@ -72,15 +72,15 @@ describe "scholarsphere:fixtures" do
       ENV["FIXTURE_TITLE"] = "rspec Test Fixture" 
       ENV["FIXTURE_USER"] = "rspec"
       o = capture_stdout do
-        @rake['scholarsphere:fixtures:create'].invoke
-        @rake['scholarsphere:fixtures:generate'].invoke
-        @rake['scholarsphere:fixtures:load'].invoke       
-        @rake['scholarsphere:fixtures:delete'].invoke
+        @rake['sufia:fixtures:create'].invoke
+        @rake['sufia:fixtures:generate'].invoke
+        @rake['sufia:fixtures:load'].invoke       
+        @rake['sufia:fixtures:delete'].invoke
       end
-      Dir.glob(File.join(fixture_path, File.expand_path("/scholarsphere"), "sufia_rspecTestFixture.txt")).length.should == 1
-      Dir.glob(File.join(fixture_path, File.expand_path("/scholarsphere"), "sufia_rspecTestFixture.foxml.erb")).length.should == 1
-      Dir.glob(File.join(fixture_path, File.expand_path("/scholarsphere"), "sufia_rspecTestFixture.descMeta.txt")).length.should == 1
-      Dir.glob(File.join(fixture_path, File.expand_path("/scholarsphere"), "sufia_rspecTestFixture.foxml.xml")).length.should == 1
+      Dir.glob(File.join(fixture_path, File.expand_path("/sufia"), "sufia_rspecTestFixture.txt")).length.should == 1
+      Dir.glob(File.join(fixture_path, File.expand_path("/sufia"), "sufia_rspecTestFixture.foxml.erb")).length.should == 1
+      Dir.glob(File.join(fixture_path, File.expand_path("/sufia"), "sufia_rspecTestFixture.descMeta.txt")).length.should == 1
+      Dir.glob(File.join(fixture_path, File.expand_path("/sufia"), "sufia_rspecTestFixture.foxml.xml")).length.should == 1
       o.should include "Loaded 'sufia:rspecTestFixture'"
       o.should include "Deleted 'sufia:rspecTestFixture'"
     end