sufia 4.0.0.beta2 → 4.0.0.beta3

data/spec/features/users_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "User Profile" do
 
   before do
-    sign_in :curator
+    sign_in FactoryGirl.create(:curator)
   end
 
   it "should be displayed" do

data/spec/helpers/records_helper_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+describe RecordsHelper do
+  it "draws add button" do
+    helper.add_field(:test).should == 
+      "<button class=\"adder btn\" id=\"additional_test_submit\" name=\"additional_test\">+<span class=\"sr-only\">add another test</span></button>"
+  end
+
+  it "draws subtract button" do
+    helper.subtract_field(:test).should == 
+      "<button class=\"remover btn\" id=\"additional_test_submit\" name=\"additional_test\">-<span class=\"sr-only\">add another test</span></button>"
+  end
+
+  it "draws help_icon" do
+    str = String.new(helper.help_icon(:tag))
+    doc = Nokogiri::HTML(str)
+    a = doc.xpath('//a').first
+    
+    a.attr('data-content').should == "Words or phrases you select to describe what the file is about. These are used to search for content. <em>This is a required field</em>."
+    a.attr('data-original-title').should == "Keyword"
+    a.attr('id').should == "generic_file_tag_help"
+    i = a.children.first
+    i.attr('class').should == 'glyphicon glyphicon-question-sign icon-large'
+  end
+
+  describe "download links" do
+
+    before :all do
+      @file = GenericFile.new(pid: "fake:1")
+      assign :generic_file, @file
+    end
+
+    describe "#render_download_link" do    
+      it "has default text" do
+        helper.render_download_link.should have_selector("#file_download")
+        helper.render_download_link.should have_content("Download")
+      end
+
+      it "includes user-supplied text" do
+        content = helper.render_download_link("Download Fake")
+        content.should have_selector("#file_download")
+        content.should have_content("Download Fake")
+      end
+    end
+
+    describe "#render_download_icon" do
+      it "has default text" do
+        helper.render_download_icon.should have_selector("#file_download")
+        helper.render_download_icon.should match("Download the document")
+      end
+
+      it "includes user-supplied text" do
+        content = helper.render_download_icon("Download the full-sized Fake")
+        content.should have_selector("#file_download")
+        content.should match("Download the full-sized Fake")
+      end
+    end
+
+  end
+
+end

data/spec/helpers/sufia_helper_spec.rb

@@ -9,8 +9,8 @@ describe SufiaHelper do
       subject { helper.link_to_facet_list(['car', 'truck'], 'vehicle_type') }
 
       it "should join the values" do
-        car_link = root_path(f: {'vehicle_type_sim' => ['car']})
-        truck_link = root_path(f: {'vehicle_type_sim' => ['truck']})
+        car_link = catalog_index_path(f: {'vehicle_type_sim' => ['car']})
+        truck_link = catalog_index_path(f: {'vehicle_type_sim' => ['truck']})
         expect(subject).to eq "<a href=\"#{car_link}\">car</a>, <a href=\"#{truck_link}\">truck</a>"
         expect(subject).to be_html_safe
       end
@@ -24,4 +24,42 @@ describe SufiaHelper do
       end
     end
   end
+
+  describe "has_collection_search_parameters?" do
+    subject { helper }
+    context "when cq is set" do
+      before { helper.stub(params: { cq: 'foo'})  }
+      it { should have_collection_search_parameters }
+    end
+
+    context "when cq is not set" do
+      before { helper.stub(params: { cq: ''})  }
+      it { should_not have_collection_search_parameters }
+    end
+  end
+
+  describe "sufia_thumbnail_tag" do
+    context "for an image object" do
+      let(:document) { SolrDocument.new( mime_type_tesim: 'image/jpeg', noid_tsi: '1234') }
+      it "should show the audio thumbnail" do
+        rendered = helper.sufia_thumbnail_tag(document, { width: 90 })
+        rendered.should match /src="\/downloads\/1234\?datastream_id=thumbnail"/
+        rendered.should match /width="90"/
+      end
+    end
+    context "for an audio object" do
+      let(:document) { SolrDocument.new( mime_type_tesim: 'audio/x-wave') }
+      it "should show the audio thumbnail" do
+        rendered = helper.sufia_thumbnail_tag(document, {})
+        rendered.should match /src="\/assets\/audio.png"/
+      end
+    end
+    context "for an document object" do
+      let(:document) { SolrDocument.new( mime_type_tesim: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document') }
+      it "should show the default thumbnail" do
+        rendered = helper.sufia_thumbnail_tag(document, {})
+        rendered.should match /src="\/assets\/default.png"/
+      end
+    end
+  end
 end

data/spec/{models → jobs}/audit_job_spec.rb

@@ -4,8 +4,6 @@ describe AuditJob do
   before do
     @user = FactoryGirl.find_or_create(:jill)
     @inbox = @user.mailbox.inbox
-    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)
     @file.save

data/spec/{models → jobs}/batch_update_job_spec.rb

@@ -5,10 +5,10 @@ describe BatchUpdateJob do
     @user = FactoryGirl.find_or_create(:jill)
     @batch = Batch.new
     @batch.save
-    @file = GenericFile.new(:batch=>@batch)
+    @file = GenericFile.new(batch: @batch)
     @file.apply_depositor_metadata(@user)
     @file.save
-    @file2 = GenericFile.new(:batch=>@batch)
+    @file2 = GenericFile.new(batch: @batch)
     @file2.apply_depositor_metadata('otherUser')
     @file2.save
   end

data/spec/jobs/characterize_job_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe CharacterizeJob do
+  before do
+    allow_any_instance_of(GenericFile).to receive(:reload_on_save?).and_return(false)
+    # Don't actually create the derivatives -- that is tested elsewhere
+    allow_any_instance_of(GenericFile).to receive(:create_derivatives)
+    @generic_file = GenericFile.new.tap do |gf|
+      gf.apply_depositor_metadata('jcoyne@example.com')
+      gf.add_file(File.open(fixture_path + '/charter.docx'), 'content', 'charter.docx')
+      gf.save
+    end
+  end
+
+  after do
+    @generic_file.destroy
+  end
+
+  subject { CharacterizeJob.new(@generic_file.id)}
+
+  it 'spawns a CreateDerivatives job' do
+    expect(CreateDerivativesJob).to receive(:new).with(@generic_file.id).once.and_call_original
+    subject.run
+  end
+end

data/spec/jobs/create_derivatives_job_spec.rb

@@ -0,0 +1,186 @@
+require 'spec_helper'
+
+describe CreateDerivativesJob do
+  before do
+    @ffmpeg_enabled = Sufia.config.enable_ffmpeg
+    Sufia.config.enable_ffmpeg = true
+    @generic_file = GenericFile.new.tap do |gf|
+      gf.apply_depositor_metadata('jcoyne@example.com')
+      gf.save
+    end
+  end
+
+  after do
+    Sufia.config.enable_ffmpeg = @ffmpeg_enabled
+    @generic_file.destroy
+  end
+
+  subject { CreateDerivativesJob.new(@generic_file.id) }
+
+  describe 'thumbnail generation' do
+    context 'with a video (.avi) file', unless: $in_travis do
+      before do
+        @generic_file.add_file(File.open(fixture_path + '/countdown.avi'), 'content', 'countdown.avi')
+        allow_any_instance_of(GenericFile).to receive(:mime_type).and_return('video/avi')
+        @generic_file.save!
+      end
+
+      it 'lacks a thumbnail' do
+        expect(@generic_file.thumbnail).not_to have_content
+      end
+
+      it 'generates a thumbnail on job run' do
+        subject.run
+        @generic_file.reload
+        expect(@generic_file.thumbnail).to have_content
+        expect(@generic_file.thumbnail.mimeType).to eq('image/jpeg')
+      end
+    end
+
+    context 'with an audio (.wav) file', unless: $in_travis do
+      before do
+        @generic_file.add_file(File.open(fixture_path + '/piano_note.wav'), 'content', 'piano_note.wav')
+        allow_any_instance_of(GenericFile).to receive(:mime_type).and_return('audio/wav')
+        @generic_file.save!
+      end
+
+      it 'lacks a thumbnail' do
+        expect(@generic_file.thumbnail).not_to have_content
+      end
+
+      it 'does not generate a thumbnail on job run' do
+        subject.run
+        @generic_file.reload
+        expect(@generic_file.thumbnail).not_to have_content
+      end
+    end
+
+    context 'with an image (.jp2) file' do
+      before do
+        @generic_file.add_file(File.open(fixture_path + '/image.jp2'), 'content', 'image.jp2')
+        allow_any_instance_of(GenericFile).to receive(:mime_type).and_return('image/jp2')
+        @generic_file.save!
+      end
+
+      it 'lacks a thumbnail' do
+        expect(@generic_file.thumbnail).not_to have_content
+      end
+
+      it 'generates a thumbnail on job run' do
+        subject.run
+        @generic_file.reload
+        expect(@generic_file.thumbnail).to have_content
+        expect(@generic_file.thumbnail.mimeType).to eq('image/jpeg')
+      end
+    end
+
+    context 'with an office document (.docx) file', unless: $in_travis do
+      before do
+        @generic_file.add_file(File.open(fixture_path + '/charter.docx'), 'content', 'charter.docx')
+        allow_any_instance_of(GenericFile).to receive(:mime_type).and_return('application/vnd.openxmlformats-officedocument.wordprocessingml.document')
+        @generic_file.save!
+      end
+
+      it 'lacks a thumbnail' do
+        expect(@generic_file.thumbnail).not_to have_content
+      end
+
+      it 'generates a thumbnail on job run' do
+        subject.run
+        @generic_file.reload
+        expect(@generic_file.thumbnail).to have_content
+        expect(@generic_file.thumbnail.mimeType).to eq('image/jpeg')
+      end
+    end
+  end
+
+  describe 'audiovisual transcoding' do
+    context 'with a video (.avi) file', unless: $in_travis do
+      before do
+        @generic_file.add_file(File.open(fixture_path + '/countdown.avi'), 'content', 'countdown.avi')
+        allow_any_instance_of(GenericFile).to receive(:mime_type).and_return('video/avi')
+        @generic_file.save!
+      end
+
+      it 'transcodes to webm and mp4' do
+        subject.run
+        reloaded = @generic_file.reload
+        derivative = reloaded.datastreams['webm']
+        expect(derivative).not_to be_nil
+        expect(derivative.content).not_to be_nil
+        expect(derivative.mimeType).to eq('video/webm')
+
+        derivative2 = reloaded.datastreams['mp4']
+        expect(derivative2).not_to be_nil
+        expect(derivative2.content).not_to be_nil
+        expect(derivative2.mimeType).to eq('video/mp4')
+      end
+    end
+
+    context 'with an audio (.wav) file', unless: $in_travis do
+      before do
+        @generic_file.add_file(File.open(fixture_path + '/piano_note.wav'), 'content', 'piano_note.wav')
+        allow_any_instance_of(GenericFile).to receive(:mime_type).and_return('audio/wav')
+        @generic_file.save!
+      end
+
+      it 'transcodes to mp3 and ogg' do
+        subject.run
+        reloaded = @generic_file.reload
+        derivative = reloaded.datastreams['mp3']
+        expect(derivative).not_to be_nil
+        expect(derivative.content).not_to be_nil
+        expect(derivative.mimeType).to eq('audio/mpeg')
+
+        derivative2 = reloaded.datastreams['ogg']
+        expect(derivative2).not_to be_nil
+        expect(derivative2.content).not_to be_nil
+        expect(derivative2.mimeType).to eq('audio/ogg')
+      end
+    end
+
+    describe 'with an mp3 file' do
+      # Uncomment when this is no longer pending
+      # before do
+      #   @generic_file.add_file(File.open(fixture_path + '/sufia/sufia_test5.mp3'), 'content', 'sufia_test5.mp3')
+      #   @generic_file.save!
+      # end
+
+      it 'should copy the content to the mp3 datastream and transcode to ogg' do
+        pending 'Need a way to do this in hydra-derivatives'
+        subject.run
+        reloaded = @generic_file.reload
+        derivative = reloaded.datastreams['mp3']
+        expect(derivative.content.size).to eq(reloaded.content.content.size)
+        expect(derivative.mimeType).to eq('audio/mpeg')
+
+        derivative2 = reloaded.datastreams['ogg']
+        expect(derivative2.content).not_to be_nil
+        expect(derivative2.mimeType).to eq('audio/ogg')
+      end
+    end
+
+    describe 'with an ogg file' do
+      # Uncomment when this is no longer pending
+      # before do
+      #   @generic_file.add_file(File.open(fixture_path + '/Example.ogg'), 'content', 'Example.ogg')
+      #   @generic_file.save!
+      # end
+
+      it 'should copy the content to the ogg datastream and transcode to mp3' do
+        pending 'Need a way to do this in hydra-derivatives'
+        subject.run
+        reloaded = @generic_file.reload
+        derivative = reloaded.datastreams['mp3']
+        expect(derivative).not_to be_nil
+        expect(derivative.content).not_to be_nil
+        expect(derivative.mimeType).to eq('audio/mpeg')
+
+        derivative2 = reloaded.datastreams['ogg']
+        expect(derivative2).not_to be_nil
+        expect(derivative2.content.size).to eq(reloaded.content.content.size)
+        expect(derivative2.mimeType).to eq('audio/ogg')
+      end
+    end
+  end
+end

data/spec/{models → jobs}/event_jobs_spec.rb

@@ -5,7 +5,6 @@ describe 'event jobs' do
     @user = FactoryGirl.find_or_create(:jill)
     @another_user = FactoryGirl.find_or_create(:archivist)
     @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)
     @gf.title = 'Hamlet'

data/spec/jobs/import_url_job_spec.rb

@@ -3,14 +3,23 @@ require 'spec_helper'
 describe ImportUrlJob do
   let(:user) { FactoryGirl.find_or_create(:jill) }
 
+  let(:file_path) { '/world.png' }
+
   let(:generic_file) do
     GenericFile.new.tap do |f|
-      f.import_url = "http://example.org/world.png"
+      f.import_url = "http://example.org#{file_path}"
       f.apply_depositor_metadata(user.user_key)
       f.save
     end
   end
 
+  let(:mock_response) do
+    double('response').tap do |http_res|
+      allow(http_res).to receive(:start).and_yield
+       allow(http_res).to receive(:read_body).and_yield(File.open(File.expand_path('../../fixtures/world.png', __FILE__)).read)
+    end
+  end
+
   after do
     generic_file.destroy
   end
@@ -21,23 +30,36 @@ describe ImportUrlJob do
     generic_file.content.size.should be_nil
   end
 
-  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)
-    job.run
-    generic_file.reload.content.size.should == 4218
-  end
+  context "after running the job" do
+    before do
+      s1 = double('content deposit event')
+      allow(ContentDepositEventJob).to receive(:new).with(generic_file.id, 'jilluser@example.com').and_return(s1).once
+      expect(Sufia.queue).to receive(:push).with(s1).once
+
+      s2 = double('characterize')
+      allow(CharacterizeJob).to receive(:new).with(generic_file.id).and_return(s2)
+      expect(Sufia.queue).to receive(:push).with(s2).once
 
-  describe "virus checking" do
-    it "should run virus check" do
-      expect(Sufia::GenericFile::Actions).to receive(:virus_check).twice.and_return(0)
+      expect(Sufia::GenericFile::Actor).to receive(:virus_check).and_return(false)
+    end
+
+    it "should create a content datastream" do
+      Net::HTTP.any_instance.should_receive(:request_get).with(file_path).and_yield(mock_response)
       job.run
+      generic_file.reload.content.size.should == 4218
+    end
+  end
+
+  context "when the file has a virus" do
+    before do
+      s1 = double('content deposit event')
+      allow(ContentDepositEventJob).to receive(:new).with(generic_file.id, 'jilluser@example.com').never
+
+      s2 = double('characterize')
+      allow(CharacterizeJob).to receive(:new).with(generic_file.id).never
     end
     it "should abort if virus check fails" do
-      Sufia::GenericFile::Actions.stub(:virus_check).and_raise(Sufia::VirusFoundError.new('A virus was found'))
+      allow(Sufia::GenericFile::Actor).to receive(: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