sufia 6.0.0.rc2 → 6.0.0.rc3

data/spec/views/generic_file/stats.html.erb_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'generic_files/stats.html.erb', :type => :view do
   describe 'usage statistics' do
     let(:generic_file) {
-      stub_model(GenericFile, noid: '123',
+      stub_model(GenericFile, id: '123',
         title: ['file1.txt'])
     }
 

data/spec/views/homepage/_featured_works.html.erb_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe "homepage/_featured_works.html.erb" do
+  let(:list) { FeaturedWorkList.new }
+  subject { rendered }
+  before { assign(:featured_work_list, list) }
+
+  context "without featured works" do
+    before { render }
+    it {
+      is_expected.to have_content 'No works have been featured'
+      is_expected.not_to have_selector('form')
+    }
+  end
+
+  context "with featured works" do
+    before do
+      allow(view).to receive(:can?).with(:update, FeaturedWork).and_return(false)
+      allow(list).to receive(:empty?).and_return(false)
+      render
+    end
+
+    it {
+      is_expected.not_to have_content 'No works have been featured'
+      is_expected.not_to have_selector('form')
+      is_expected.to have_selector('ol#featured_works')
+    }
+  end
+end

data/spec/views/users/show.html.erb_spec.rb

@@ -43,7 +43,7 @@ describe 'users/show.html.erb', :type => :view do
       render
       page = Capybara::Node::Simple.new(rendered)
       expect(page).to have_selector(".tab-content > div#contributions.tab-pane")
-      expect(page).to have_selector("#trophyrow_#{generic_file.noid}")
+      expect(page).to have_selector("#trophyrow_#{generic_file.id}")
 
     end
   end

data/sufia-models/app/actors/sufia/generic_file/actor.rb

@@ -15,8 +15,9 @@ module Sufia::GenericFile
     #   create_metadata(batch_id) { |gf| gf.save }
     def create_metadata(batch_id)
       generic_file.apply_depositor_metadata(user)
-      generic_file.date_uploaded = Date.today
-      generic_file.date_modified = Date.today
+      time_in_utc = DateTime.now.new_offset(0)
+      generic_file.date_uploaded = time_in_utc
+      generic_file.date_modified = time_in_utc
       generic_file.creator = [user.name]
 
       if batch_id
@@ -27,8 +28,10 @@ module Sufia::GenericFile
       yield(generic_file) if block_given?
     end
 
-    def create_content(file, file_name, dsid)
-      generic_file.add_file(file, dsid, file_name.truncate(255))
+    def create_content(file, file_name, path, mime_type)
+      generic_file.add_file(file, path: path, original_name: file_name, mime_type: mime_type)
+      generic_file.label ||= file_name
+      generic_file.title = [file_name] if generic_file.title.blank?
       save_characterize_and_record_committer do
         if Sufia.config.respond_to?(:after_create_content)
           Sufia.config.after_create_content.call(generic_file, user)
@@ -46,8 +49,8 @@ module Sufia::GenericFile
       end
     end
 
-    def update_content(file, datastream_id)
-      generic_file.add_file(file, datastream_id, file.original_filename)
+    def update_content(file, path)
+      generic_file.add_file(file, path: path, original_name: file.original_filename, mime_type: file.content_type)
       save_characterize_and_record_committer do
         if Sufia.config.respond_to?(:after_update_content)
           Sufia.config.after_update_content.call(generic_file, user)
@@ -83,6 +86,7 @@ module Sufia::GenericFile
     end
 
     # Takes an optional block and executes the block if the save was successful.
+    # returns false if the save was unsuccessful
     def save_and_record_committer
       save_tries = 0
       begin
@@ -124,10 +128,10 @@ module Sufia::GenericFile
       end
 
     private
+
       def remove_from_feature_works
-        featured_work = FeaturedWork.find_by_generic_file_id(generic_file.noid)
+        featured_work = FeaturedWork.find_by_generic_file_id(generic_file.id)
         featured_work.destroy unless featured_work.nil?
       end
-
   end
 end

data/sufia-models/app/jobs/batch_update_job.rb

@@ -61,12 +61,12 @@ class BatchUpdateJob
   end
 
   def send_user_success_message user, batch
-    message = saved.count > 1 ? multiple_success(batch.noid, saved) : single_success(batch.noid, saved.first)
+    message = saved.count > 1 ? multiple_success(batch.id, saved) : single_success(batch.id, saved.first)
     User.batchuser.send_message(user, message, success_subject, sanitize_text = false)
   end
 
   def send_user_failure_message user, batch
-    message = denied.count > 1 ? multiple_failure(batch.noid, denied) : single_failure(batch.noid, denied.first)
+    message = denied.count > 1 ? multiple_failure(batch.id, denied) : single_failure(batch.id, denied.first)
     User.batchuser.send_message(user, message, failure_subject, sanitize_text = false)
   end
 end

data/sufia-models/app/jobs/import_url_job.rb

@@ -12,9 +12,9 @@ class ImportUrlJob < ActiveFedoraPidBasedJob
     user = User.find_by_user_key(generic_file.depositor)
 
     Tempfile.open(pid.gsub('/', '_')) do |f|
-      path = copy_remote_file(generic_file.import_url, f)
+      path, mime_type = copy_remote_file(generic_file.import_url, f)
       # attach downloaded file to generic file stubbed out
-      if Sufia::GenericFile::Actor.new(generic_file, user).create_content(f, path, 'content')
+      if Sufia::GenericFile::Actor.new(generic_file, user).create_content(f, path, 'content', mime_type)
         # add message to user for downloaded file
         message = "The file (#{generic_file.label}) was successfully imported."
         job_user.send_message(user, message, 'File Import')
@@ -31,9 +31,11 @@ class ImportUrlJob < ActiveFedoraPidBasedJob
     http = Net::HTTP.new(uri.host, uri.port)
     http.use_ssl = uri.scheme == "https"  # enable SSL/TLS
     http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    mime_type = nil
 
     http.start do
       http.request_get(uri.request_uri) do |resp|
+        mime_type = resp.content_type
         resp.read_body do |segment|
           f.write(segment)
         end
@@ -41,7 +43,7 @@ class ImportUrlJob < ActiveFedoraPidBasedJob
     end
 
     f.rewind
-    uri.path
+    return uri.path, mime_type
   end
 
   def job_user

data/sufia-models/app/jobs/ingest_local_file_job.rb

@@ -0,0 +1,46 @@
+class IngestLocalFileJob
+  attr_accessor :directory, :filename, :user_key, :generic_file_id
+
+  def queue_name
+    :ingest
+  end
+
+  def initialize(generic_file_id, directory, filename, user_key)
+    self.generic_file_id = generic_file_id
+    self.directory = directory
+    self.filename = filename
+    self.user_key = user_key
+  end
+
+  #TODO this should use Actor#create_content
+  def run
+    user = User.find_by_user_key(user_key)
+    raise "Unable to find user for #{user_key}" unless user
+    generic_file = GenericFile.find(generic_file_id)
+    path = File.join(directory, filename)
+
+    actor = Sufia::GenericFile::Actor.new(generic_file, user)
+
+    if actor.create_content(File.open(path), filename, 'content', mime_type(filename))
+      FileUtils.rm(path)
+      Sufia.queue.push(ContentDepositEventJob.new(generic_file.id, user_key))
+
+      message = "The file (#{File.basename(filename)}) was successfully deposited."
+      subject = 'Local file ingest'
+    else
+      message = "There was a problem depositing #{File.basename(filename)}. Please contact a system admin."
+      subject = 'Local file ingest error'
+    end
+
+    job_user.send_message(user, message, subject)
+  end
+
+  def job_user
+    User.batchuser
+  end
+
+  def mime_type(file_name)
+    mime_types = MIME::Types.of(file_name)
+    mime_types.empty? ? "application/octet-stream" : mime_types.first.content_type
+  end
+end

data/sufia-models/app/jobs/resolrize_job.rb

@@ -4,13 +4,6 @@ class ResolrizeJob
   end
 
   def run
-    require 'active_fedora/version'
-    active_fedora_version = Gem::Version.new(ActiveFedora::VERSION)
-    minimum_feature_version = Gem::Version.new('6.4.4')
-    if active_fedora_version >= minimum_feature_version
-      ActiveFedora::Base.reindex_everything("pid~#{Sufia.config.id_namespace}:*")
-    else
-      ActiveFedora::Base.reindex_everything
-    end
+    ActiveFedora::Base.reindex_everything
   end
 end

data/sufia-models/app/models/batch.rb

@@ -19,11 +19,4 @@ class Batch < ActiveFedora::Base
       Batch.create(id: id)
     end
   end
-
-  class << self
-    # override the default indexing service
-    def indexer
-      Sufia::IndexingService
-    end
-  end
 end

data/sufia-models/app/models/concerns/sufia/ability.rb

@@ -37,7 +37,7 @@ module Sufia
     def editor_abilities
       if user_groups.include? 'admin'
         can :create, TinymceAsset
-        can :update, ContentBlock
+        can [:create, :update], ContentBlock
       end
     end
 

data/sufia-models/app/models/concerns/sufia/{collection.rb → collection_behavior.rb}

@@ -1,5 +1,5 @@
 module Sufia
-  module Collection
+  module CollectionBehavior
     extend ActiveSupport::Concern
     include Hydra::Collection
     include Sufia::ModelMethods
@@ -11,10 +11,6 @@ module Sufia
       validates :title, presence: true
     end
 
-    def to_param
-      noid
-    end
-
     def update_permissions
       self.visibility = "open"
     end
@@ -24,13 +20,5 @@ module Sufia
     def bytes
       members.reduce(0) { |sum, gf| sum + gf.file_size.first.to_i }
     end
-
-    module ClassMethods
-      # override the default indexing service
-      def indexer
-        Sufia::IndexingService
-      end
-    end
-
   end
 end

data/sufia-models/app/models/concerns/sufia/generic_file/batches.rb

@@ -11,16 +11,15 @@ module Sufia
       # to each file when it is done uploading.  The Batch object is not created
       # until all objects are done uploading and the user is redirected to
       # BatchController#edit.  Therefore, we must handle the case where
-      # self.batch_id is set but self.batch returns nil.
+      # batch_id is set but batch returns nil.
       def related_files
-        return [] if batch.nil?
+        return [] unless batch
         batch.generic_files.reject { |sibling| sibling.id == id }
       end
 
       # Is this file in the middle of being processed by a batch?
       def processing?
-         return false if self.batch.blank? || !self.batch.methods.include?(:status)
-         (!self.batch.status.empty?) && (self.batch.status.count == 1) && (self.batch.status[0] == "processing")
+         try(:batch).try(:status) == ['processing'.freeze]
       end
 
     end

data/sufia-models/app/models/concerns/sufia/generic_file/export.rb

@@ -42,7 +42,7 @@ module Sufia
       end
 
       def persistent_url
-        "#{Sufia.config.persistent_hostpath}#{noid}"
+        "#{Sufia.config.persistent_hostpath}#{id}"
       end
 
       # MIME type: 'application/x-openurl-ctx-kev'

data/sufia-models/app/models/concerns/sufia/generic_file/featured.rb

@@ -3,12 +3,9 @@ module Sufia
     module Featured
       extend ActiveSupport::Concern
 
-
       def featured?
-        FeaturedWork.where(generic_file_id: noid).exists?
+        FeaturedWork.where(generic_file_id: id).exists?
       end
-
     end
   end
 end
-

data/sufia-models/app/models/concerns/sufia/generic_file/metadata.rb

@@ -46,10 +46,17 @@ module Sufia
         property :date_created, predicate: ::RDF::DC.created do |index|
           index.as :stored_searchable
         end
+
+        # We reserve date_uploaded for the original creation date of the record.
+        # For example, when migrating data from a fedora3 repo to fedora4,
+        # fedora's system created date will reflect the date when the record
+        # was created in fedora4, but the date_uploaded will preserve the
+        # original creation date from the old repository.
         property :date_uploaded, predicate: ::RDF::DC.dateSubmitted, multiple: false do |index|
           index.type :date
           index.as :stored_sortable
         end
+
         property :date_modified, predicate: ::RDF::DC.modified, multiple: false do |index|
           index.type :date
           index.as :stored_sortable
@@ -86,13 +93,6 @@ module Sufia
         end
       end
 
-      # Add a schema.org itemtype
-      def itemtype
-        # Look up the first non-empty resource type value in a hash from the config
-        Sufia.config.resource_types_to_schema[resource_type.to_a.reject { |type| type.empty? }.first] || 'http://schema.org/CreativeWork'
-      rescue
-        'http://schema.org/CreativeWork'
-      end
     end
   end
 end

data/sufia-models/app/models/concerns/sufia/generic_file/trophies.rb

@@ -7,9 +7,8 @@ module Sufia
       end
 
       def cleanup_trophies
-        Trophy.destroy_all(generic_file_id: self.noid)
+        Trophy.destroy_all(generic_file_id: self.id)
       end
-
     end
   end
 end

data/sufia-models/app/models/concerns/sufia/generic_file/virus_check.rb

@@ -10,23 +10,28 @@ module Sufia
       # Default behavior is to raise a validation error and halt the save if a virus is found
       def detect_viruses
         return unless content.changed?
-        path = if content.content.respond_to?(:path)
-                 content.content.path
-               else
-                 Tempfile.open('') do |t|
-                   t.binmode
-                   t.write(content.content)
-                   t.close
-                   t.path
-                 end
-               end
-        Sufia::GenericFile::Actor.virus_check(path)
+        Sufia::GenericFile::Actor.virus_check(local_path_for_content)
         true
       rescue Sufia::VirusFoundError => virus
         logger.warn(virus.message)
         errors.add(:base, virus.message)
         false
       end
+
+      private
+
+        def local_path_for_content
+          if content.content.respond_to?(:path)
+            content.content.path
+          else
+            Tempfile.open('') do |t|
+              t.binmode
+              t.write(content.content)
+              t.close
+              t.path
+            end
+          end
+        end
     end
   end
 end

data/sufia-models/app/models/concerns/sufia/model_methods.rb

@@ -3,20 +3,7 @@ module Sufia
     extend ActiveSupport::Concern
 
     included do
-      include Hydra::ModelMethods
-    end
-
-    # OVERRIDE to support Hydra::Datastream::Properties which does not
-    #   respond to :depositor_values but :depositor
-    # Adds metadata about the depositor to the asset and ads +depositor_id+ to
-    # its individual edit permissions.
-    def apply_depositor_metadata(depositor)
-      depositor_id = depositor.respond_to?(:user_key) ? depositor.user_key : depositor
-
-      self.edit_users += [depositor_id]
-      self.depositor = depositor_id
-
-      return true
+      include Hydra::WithDepositor
     end
 
     def to_s

data/sufia-models/app/models/concerns/sufia/user.rb

@@ -54,6 +54,11 @@ module Sufia::User
     { id: user_key, text: display_name ? "#{display_name} (#{user_key})" : user_key }
   end
 
+  # Populate user instance with attributes from remote system (e.g., LDAP)
+  # There is no default implementation -- override this in your application
+  def populate_attributes
+  end
+
   def email_address
     self.email
   end

data/sufia-models/app/models/file_usage.rb

@@ -8,7 +8,7 @@ class FileUsage
     user_id = user ? user.id : nil
 
     self.id = id
-    self.path = Sufia::Engine.routes.url_helpers.generic_file_path(Sufia::Noid.noidify(id))
+    self.path = Sufia::Engine.routes.url_helpers.generic_file_path(id)
     earliest = Sufia.config.analytic_start_date
     self.created = ::GenericFile.find(id).create_date
     self.created = earliest > created ? earliest : created unless earliest.blank?