sufia 4.0.0.beta2 → 4.0.0.beta3

data/spec/models/characterize_job_spec.rb

@@ -1,93 +0,0 @@
-require 'spec_helper'
-
-describe CharacterizeJob do
-  before do
-    @generic_file = GenericFile.new
-    @generic_file.apply_depositor_metadata('jcoyne@example.com')
-    @generic_file.save!
-    GenericFile.any_instance.stub(:reload_on_save?).and_return(false)
-  end
-
-  after do
-    @generic_file.delete
-  end
-
-  subject { CharacterizeJob.new(@generic_file.id)}
-
-  describe "with a AVI (video) file" do
-    before do
-      @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
-        # 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).and_return(job)
-      Sufia.queue.should_receive(:push).with(job)
-      subject.run
-    end
-    it "should create a thumbnail" do
-      GenericFile.any_instance.should_receive(:create_thumbnail)
-      subject.run
-    end
-  end
-
-  describe "with a WAV (audio) file" do
-    before do
-      @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
-        # 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).and_return(job)
-      Sufia.queue.should_receive(:push).with(job)
-      subject.run
-    end
-  end
-
-  describe "with an mp3 (audio) file" do
-    before do
-      @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
-    it "should create a transcode job. (we'd like ogg too)" 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
-        # 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).and_return(job)
-      Sufia.queue.should_receive(:push).with(job)
-      subject.run
-    end
-  end
-
-  describe "with an jpeg2000 (image) file" do
-    before do
-      @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
-
-    it "should create a thumbnail" do
-      GenericFile.any_instance.should_receive(:create_thumbnail)
-      subject.run
-    end
-  end
-end
-
-

data/spec/models/transcode_audio_job_spec.rb

@@ -1,85 +0,0 @@
-require 'spec_helper'
-
-describe TranscodeAudioJob, :if => Sufia.config.enable_ffmpeg do
-  before do
-    @generic_file = GenericFile.new
-    @generic_file.apply_depositor_metadata('jcoyne@example.com')
-    @generic_file.stub(:characterize_if_changed).and_yield
-  end
-
-  subject { TranscodeAudioJob.new(@generic_file.id)}
-
-
-  describe "with a wav file" do
-    before do
-      @generic_file.add_file(File.open(fixture_path + '/piano_note.wav'), 'content', 'piano_note.wav')
-      @generic_file.save!
-    end
-    after do
-      @generic_file.delete
-    end
-
-
-    it "should transcode to mp3 and ogg" do
-      subject.run
-      reloaded = GenericFile.find(@generic_file.pid)
-      derivative = reloaded.datastreams['mp3']
-      derivative.should_not be_nil
-      derivative.content.should_not be_nil
-      derivative.mimeType.should == 'audio/mpeg'
-
-      derivative2 = reloaded.datastreams['ogg']
-      derivative2.should_not be_nil
-      derivative2.content.should_not be_nil
-      derivative2.mimeType.should == 'audio/ogg'
-    end
-  end
-
-  describe "with an mp3 file" do
-    # Uncomment when this is nolonger pending
-    # before do
-    #   @generic_file.add_file(File.open(fixture_path + '/sufia/sufia_test5.mp3'), 'content', 'sufia_test5.mp3')
-    #   @generic_file.characterize # so that the mime_type is set
-    #   @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 = GenericFile.find(@generic_file.pid)
-      derivative = reloaded.datastreams['mp3']
-      derivative.should_not be_nil
-      derivative.content.should == reloaded.content.content
-      derivative.mimeType.should == 'audio/mp3'
-
-      derivative2 = reloaded.datastreams['ogg']
-      derivative2.should_not be_nil
-      derivative2.content.should_not be_nil
-      derivative2.mimeType.should == 'audio/ogg'
-    end
-  end
-  describe "with an ogg file" do
-    # Uncomment when this is nolonger pending
-    # before do
-    #   @generic_file.add_file(File.open(fixture_path + '/Example.ogg'), 'content', 'Example.ogg')
-    #   @generic_file.characterize # so that the mime_type is set
-    #   @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 = GenericFile.find(@generic_file.pid)
-      derivative = reloaded.datastreams['mp3']
-      derivative.should_not be_nil
-      derivative.content.should_not be_nil
-      derivative.mimeType.should == 'audio/mp3'
-
-      derivative2 = reloaded.datastreams['ogg']
-      derivative2.should_not be_nil
-      #derivative2.content.should == reloaded.content.content
-      derivative2.mimeType.should == 'audio/ogg'
-    end
-  end
-end
-

data/spec/models/transcode_video_job_spec.rb

@@ -1,31 +0,0 @@
-require 'spec_helper'
-
-describe TranscodeVideoJob, :if => Sufia.config.enable_ffmpeg do
-  before do
-    @generic_file = GenericFile.new
-    @generic_file.apply_depositor_metadata('jcoyne@example.com')
-    @generic_file.add_file(File.open(fixture_path + '/countdown.avi'), 'content', 'countdown.avi')
-    @generic_file.stub(:characterize_if_changed).and_yield
-    @generic_file.mime_type = 'video/avi'
-    @generic_file.save!
-  end
-
-  after do
-    @generic_file.delete
-  end
-
-  subject { TranscodeVideoJob.new(@generic_file.id)}
-  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/views/dashboard/index_partials/_thumbnail_display.html.erb_spec.rb

@@ -1,22 +0,0 @@
-require 'spec_helper'
-
-describe "dashboard/_index_partials/_thumbnail_display.html.erb" do
-  describe "for an audio object" do
-    before do
-      allow(view).to receive(:document).and_return(stub_model(GenericFile, mime_type: 'audio/wav', noid: '123'))
-    end
-    it "should show the audio thumbnail" do
-      render
-      rendered.should match /src="\/assets\/audio.png"/
-    end
-  end
-  describe "for an document object" do
-    before do
-      allow(view).to receive(:document).and_return(stub_model(GenericFile, mime_type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', noid: '123'))
-    end
-    it "should show the default thumbnail" do
-      render
-      rendered.should match /src="\/assets\/default.png"/
-    end
-  end
-end

data/sufia-models/lib/sufia/models/generic_file/actions.rb

@@ -1,50 +0,0 @@
-module Sufia::GenericFile
-  # Actions are decoupled from controller logic so that they may be called from a controller or a background job.
-  module Actions
-    def self.create_metadata(generic_file, user, batch_id)
-      generic_file.apply_depositor_metadata(user)
-      generic_file.date_uploaded = Date.today
-      generic_file.date_modified = Date.today
-      generic_file.creator = user.name
-
-      if batch_id
-        generic_file.add_relationship("isPartOf", "info:fedora/#{Sufia::Noid.namespaceize(batch_id)}")
-      else
-        logger.warn "unable to find batch to attach to"
-      end
-      yield(generic_file) if block_given?
-      generic_file.save!
-    end
-
-    def self.create_content(generic_file, file, file_name, dsid, user)
-      generic_file.add_file(file, dsid, file_name)
-
-      save_tries = 0
-      begin
-        generic_file.save!
-      rescue RSolr::Error::Http => error
-        logger.warn "GenericFilesController::create_and_save_generic_file Caught RSOLR error #{error.inspect}"
-        save_tries+=1
-        # fail for good if the tries is greater than 3
-        raise error if save_tries >=3
-        sleep 0.01
-        retry
-      end
-
-      generic_file.record_version_committer(user)
-      if Sufia.config.respond_to?(:after_create_content)
-        Sufia.config.after_create_content.call(generic_file, user)
-      end
-    end
-
-    def self.virus_check(file)
-      path = file.is_a?(String) ? file : file.path
-      unless defined?(ClamAV)
-        logger.warn "Virus checking disabled, #{path} not checked"
-        return
-      end
-      scan_result = ClamAV.instance.scanfile(path)
-      raise Sufia::VirusFoundError.new("A virus was found in #{path}: #{scan_result}") unless scan_result == 0
-    end
-  end
-end

data/sufia-models/lib/sufia/models/generic_file/derivatives.rb

@@ -1,31 +0,0 @@
-module Sufia
-  module GenericFile
-    module Derivatives
-      extend ActiveSupport::Concern
-
-      included do
-        include Hydra::Derivatives
-
-        makes_derivatives do |obj| 
-          case obj.mime_type
-          when *pdf_mime_types
-            obj.transform_datastream :content, 
-              { :thumbnail => {size: "338x493", datastream: 'thumbnail'} }
-          when *audio_mime_types
-            obj.transform_datastream :content,
-              { :mp3 => {format: 'mp3', datastream: 'mp3'},
-                :ogg => {format: 'ogg', datastream: 'ogg'} }, processor: :audio
-          when *video_mime_types
-            obj.transform_datastream :content,
-              { :webm => {format: "webm", datastream: 'webm'}, 
-                :mp4 => {format: "mp4", datastream: 'mp4'} }, processor: :video
-          when *image_mime_types
-            obj.transform_datastream :content, { :thumbnail => {size: "200x150>", datastream: 'thumbnail'} }
-          end
-        end
-      end
-
-    end
-  end
-end
-

data/sufia-models/lib/sufia/models/generic_file/thumbnail.rb

@@ -1,37 +0,0 @@
-module Sufia
-  module GenericFile
-    module Thumbnail
-      extend ActiveSupport::Concern
-      # Create thumbnail requires that the characterization has already been run (so mime_type, width and height is available)
-      # and that the object is already has a pid set
-      def create_thumbnail
-        return unless self.content.has_content?
-
-        if video?
-          create_video_thumbnail
-        else
-          create_derivatives
-        end
-        self.save
-      end
-
-      protected
-      def create_video_thumbnail
-        return unless Sufia.config.enable_ffmpeg
-      
-        output_file = Dir::Tmpname.create(['sufia', ".png"], Sufia.config.temp_file_base){}
-        content.to_tempfile do |f|
-          # we could use something like this in order to find a frame in the middle.
-          #ffprobe -show_files video.avi 2> /dev/null | grep duration | cut -d= -f2 53.399999  
-          command = "#{Sufia.config.ffmpeg_path} -i \"#{f.path}\" -loglevel quiet -vf \"scale=338:-1\"  -r  1  -t  1 #{output_file}"
-          system(command)
-          raise "Unable to execute command \"#{command}\"" unless $?.success?
-        end
-
-        self.thumbnail.content = File.open(output_file, 'rb').read
-        self.thumbnail.mimeType = 'image/png'
-      end
-
-    end
-  end
-end

data/sufia-models/lib/sufia/models/generic_file/versions.rb

@@ -1,16 +0,0 @@
-module Sufia
-  module GenericFile
-    module Versions
-      def record_version_committer(user)
-        version = content.latest_version
-        # content datastream not (yet?) present
-        return if version.nil?
-        VersionCommitter.create(:obj_id => version.pid,
-                                :datastream_id => version.dsid,
-                                :version_id => version.versionID,
-                                :committer_login => user.user_key)
-      end
-
-    end
-  end
-end

data/sufia-models/lib/sufia/models/jobs/transcode_audio_job.rb

@@ -1,15 +0,0 @@
-# Created by: Justin Coyne
-# 7 Feb 2013
-# An asyncronous job for transcoding audio files using FFMpeg
-
-class TranscodeAudioJob < ActiveFedoraPidBasedJob
-  def queue_name
-    :audio
-  end
-
-  def run
-    generic_file.create_derivatives
-    generic_file.save
-  end
-
-end

data/sufia-models/lib/sufia/models/jobs/transcode_video_job.rb

@@ -1,15 +0,0 @@
-# Created by: Justin Coyne
-# 13 Dec 2012
-# An asyncronous job for transcoding video files using FFMpeg
-
-class TranscodeVideoJob < ActiveFedoraPidBasedJob
-  def queue_name
-    :video
-  end
-
-  def run
-    generic_file.create_derivatives
-    generic_file.save
-  end
-end
-