sufia-models 6.0.0.rc4 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c298d5e01fec3e19368cbcf8c9dab669675fef6d
-  data.tar.gz: 5f35bbef30f86ed7c770fdc9fb2864eeb9d98ef3
+  metadata.gz: c12a4f1425665634659dfd88233a2c365594589d
+  data.tar.gz: 06d1405c0b4f1537c071700faadc20a0264f34e8
 SHA512:
-  metadata.gz: caa1ef71957cc6aa759a7a41d22cf99468f334aa86b0a3cce30badc6d488a6aa1eb5b2830708add33cdb5356ff8c3fe507c8771374e91da7f1ffe2c232e05442
-  data.tar.gz: 0f21473f2cb5f7ad5be47ee563ca8ee2a70ef02357121683a0f528ea1566b9ed529ad659efc5678b64f973b217647f4ff8685bef40e513b837d1b1be118a1b44
+  metadata.gz: 07a66fa4a7b7c950459a91143ac460859ce38edc9a7d336badb586bbaed916c168fe468dcdcad36405fa8d653774db8ad1acc9a9da07ab42b06e066ba18a6c1e
+  data.tar.gz: ae73b9db8e0607bfb3dcfcab6aef808a8b88be53b8447c66db279a6071ec8433f024dfdac404a5c5167865a6df153f22b03854e625df929175fe07f98cb6a93b

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

@@ -31,7 +31,7 @@ module Sufia::GenericFile
     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?
+      generic_file.title = [generic_file.label] 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)

data/app/jobs/active_fedora_id_based_job.rb

@@ -0,0 +1,22 @@
+class ActiveFedoraIdBasedJob
+  def queue_name
+    :id_based
+  end
+
+  attr_accessor :id
+
+  def initialize(id)
+    self.id = id
+  end
+
+  def object
+    @object ||= ActiveFedora::Base.find(id)
+  end
+
+  alias_method :generic_file, :object
+  alias_method :generic_file_id, :id
+
+  def run
+    raise RuntimeError, "Define #run in a subclass"
+  end
+end

data/app/jobs/active_fedora_pid_based_job.rb

@@ -1,22 +1,7 @@
-class ActiveFedoraPidBasedJob
-  def queue_name
-    :pid_based
-  end
-
-  attr_accessor :pid
-
-  def initialize(pid)
-    self.pid = pid
-  end
-
-  def object
-    @object ||= ActiveFedora::Base.find(pid)
-  end
-
-  alias_method :generic_file, :object
-  alias_method :generic_file_id, :pid
-
-  def run
-    raise RuntimeError, "Define #run in a subclass"
+class ActiveFedoraPidBasedJob < ActiveFedoraIdBasedJob
+  extend Deprecation
+  def self.extended(document)
+    Deprecation.warn ActiveFedoraPidBasedJob, "ActiveFedoraPidBasedJob is deprecated; use ActiveFedoraIdBasedJob instead."
   end
 end
+

data/app/jobs/audit_job.rb

@@ -1,4 +1,4 @@
-class AuditJob < ActiveFedoraPidBasedJob
+class AuditJob < ActiveFedoraIdBasedJob
   def queue_name
     :audit
   end
@@ -6,7 +6,7 @@ class AuditJob < ActiveFedoraPidBasedJob
   PASS = 'Passing Audit Run'
   FAIL = 'Failing Audit Run'
 
-  attr_accessor :uri, :pid, :path
+  attr_accessor :uri, :id, :path
 
   # URI of the resource to audit.
   # This URI could include the actual resource (e.g. content) and the version to audit:
@@ -14,8 +14,7 @@ class AuditJob < ActiveFedoraPidBasedJob
   # but it could also just be:
   #     http://localhost:8983/fedora/rest/test/a/b/c/abcxyz/content
   def initialize(id, path, uri)
-    super(uri)
-    self.pid = id
+    super(id)
     self.path = path
     self.uri = uri
   end
@@ -49,12 +48,12 @@ class AuditJob < ActiveFedoraPidBasedJob
 
       if fixity_ok
         passing = 1
-        ChecksumAuditLog.prune_history(pid, path)
+        ChecksumAuditLog.prune_history(id, path)
       else
         logger.warn "***AUDIT*** Audit failed for #{uri} #{error_msg}"
         passing = 0
       end
-      ChecksumAuditLog.create!(pass: passing, pid: pid, version: uri, dsid: path)
+      ChecksumAuditLog.create!(pass: passing, generic_file_id: id, version: uri, dsid: path)
     end
 
     def logger

data/app/jobs/characterize_job.rb

@@ -1,4 +1,4 @@
-class CharacterizeJob < ActiveFedoraPidBasedJob
+class CharacterizeJob < ActiveFedoraIdBasedJob
   def queue_name
     :characterize
   end

data/app/jobs/create_derivatives_job.rb

@@ -1,4 +1,4 @@
-class CreateDerivativesJob < ActiveFedoraPidBasedJob
+class CreateDerivativesJob < ActiveFedoraIdBasedJob
   def queue_name
     :derivatives
   end

data/app/jobs/import_url_job.rb

@@ -2,7 +2,7 @@ require 'net/https'
 require 'uri'
 require 'tempfile'
 
-class ImportUrlJob < ActiveFedoraPidBasedJob
+class ImportUrlJob < ActiveFedoraIdBasedJob
 
   def queue_name
     :import_url
@@ -11,7 +11,7 @@ class ImportUrlJob < ActiveFedoraPidBasedJob
   def run
     user = User.find_by_user_key(generic_file.depositor)
 
-    Tempfile.open(pid.gsub('/', '_')) do |f|
+    Tempfile.open(id.gsub('/', '_')) do |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', mime_type)

data/app/models/batch.rb

@@ -10,13 +10,27 @@ class Batch < ActiveFedora::Base
   property :status, predicate: ::RDF::DC.type
 
   def self.find_or_create(id)
-    # FIXME potential race condition in this method. Consider that `find' may raise
-    # ObjectNotFound in multiple processes. However, Fedora should raise an error
-    # if we try to create two objects with the same id.
     begin
       Batch.find(id)
     rescue ActiveFedora::ObjectNotFoundError
-      Batch.create(id: id)
+      safe_create(id)
     end
   end
+
+  private
+
+    # This method handles most race conditions gracefully. 
+    # If a batch with the same ID is created by another thread
+    # we fetch the batch that was created (rather than throwing
+    # an error) and continute.
+    def self.safe_create(id)
+      begin      
+        Batch.create(id: id)
+      rescue ActiveFedora::IllegalOperation => ex
+        # This is the exception thrown by LDP when we attempt to 
+        # create a duplicate object. If we can find the object
+        # then we are good to go.
+        Batch.find(id)
+      end
+    end
 end

data/app/models/checksum_audit_log.rb

@@ -1,7 +1,7 @@
 class ChecksumAuditLog < ActiveRecord::Base
 
   def self.get_audit_log(id, path, version_uri)
-    ChecksumAuditLog.find_or_create_by(pid: id, dsid: path, version: version_uri)
+    ChecksumAuditLog.find_or_create_by(generic_file_id: id, dsid: path, version: version_uri)
   end
 
   # Check to see if there are previous passing logs that we can delete
@@ -16,6 +16,6 @@ class ChecksumAuditLog < ActiveRecord::Base
   end
 
   def self.logs_for(id, path)
-    ChecksumAuditLog.where(pid: id, dsid: path).order('created_at desc, id desc')
+    ChecksumAuditLog.where(generic_file_id: id, dsid: path).order('created_at desc, id desc')
   end
 end

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

@@ -8,6 +8,7 @@ module Sufia
 
     def sufia_abilities
       generic_file_abilities
+      user_abilities
       featured_work_abilities
       editor_abilities
       stats_abilities
@@ -23,7 +24,10 @@ module Sufia
       can :reject, ProxyDepositRequest, receiving_user_id: current_user.id, status: 'pending'
       # a user who sent a proxy deposit request can cancel it if it's pending.
       can :destroy, ProxyDepositRequest, sending_user_id: current_user.id, status: 'pending'
-      can :edit, ::User, id: current_user.id
+    end
+
+    def user_abilities
+      can [:edit, :update, :toggle_trophy], ::User, id: current_user.id
     end
 
     def featured_work_abilities
@@ -31,6 +35,7 @@ module Sufia
     end
 
     def generic_file_abilities
+      can :view_share_work, [GenericFile]
       can :create, [GenericFile, Collection] if user_groups.include? 'registered'
     end
 
@@ -51,5 +56,6 @@ module Sufia
     def depositor_for_document(document_id)
       ::GenericFile.load_instance_from_solr(document_id).depositor
     end
+
   end
 end

data/app/models/concerns/sufia/collection_behavior.rb

@@ -18,7 +18,7 @@ module Sufia
     # Compute the sum of each file in the collection
     # Return an integer of the result
     def bytes
-      members.reduce(0) { |sum, gf| sum + gf.file_size.first.to_i }
+      members.reduce(0) { |sum, gf| sum + gf.content.size.to_i }
     end
   end
 end

data/app/models/concerns/sufia/generic_file/full_text_indexing.rb

@@ -14,21 +14,30 @@ module Sufia
 
       private
 
-        def extract_content
-          url = Blacklight.solr_config[:url] ? Blacklight.solr_config[:url] : Blacklight.solr_config["url"] ? Blacklight.solr_config["url"] : Blacklight.solr_config[:fulltext] ? Blacklight.solr_config[:fulltext]["url"] : Blacklight.solr_config[:default]["url"]
-          uri = URI("#{url}/update/extract?extractOnly=true&wt=json&extractFormat=text")
-          req = Net::HTTP.new(uri.host, uri.port)
-          resp = req.post(uri.to_s, self.content.content, {
-              'Content-type' => "#{self.mime_type};charset=utf-8",
-              'Content-Length' => self.content.content.size.to_s
-            })
-          raise "URL '#{uri}' returned code #{resp.code}" unless resp.code == "200"
-          self.content.content.rewind if self.content.content.respond_to?(:rewind)
-          extracted_text = JSON.parse(resp.body)[''].rstrip
-          full_text.content = extracted_text if extracted_text.present?
-        rescue => e
-          logger.error("Error extracting content from #{self.id}: #{e.inspect}")
+      def extract_content
+        uri = URI("#{connection_url}/update/extract?extractOnly=true&wt=json&extractFormat=text")
+        req = Net::HTTP.new(uri.host, uri.port)
+        resp = req.post(uri.to_s, self.content.content, {
+            'Content-type' => "#{self.mime_type};charset=utf-8",
+            'Content-Length' => self.content.content.size.to_s
+          })
+        raise "URL '#{uri}' returned code #{resp.code}" unless resp.code == "200"
+        self.content.content.rewind if self.content.content.respond_to?(:rewind)
+        extracted_text = JSON.parse(resp.body)[''].rstrip
+        full_text.content = extracted_text if extracted_text.present?
+      rescue => e
+        logger.error("Error extracting content from #{self.id}: #{e.inspect}")
+      end
+
+      def connection_url
+        case
+          when Blacklight.connection_config[:url] then Blacklight.connection_config[:url]
+          when Blacklight.connection_config["url"] then Blacklight.connection_config["url"]
+          when Blacklight.connection_config[:fulltext] then Blacklight.connection_config[:fulltext]["url"]
+          else Blacklight.connection_config[:default]["url"]
         end
+      end
+
     end
   end
 end

data/app/models/concerns/sufia/generic_file/proxy_deposit.rb

@@ -24,7 +24,7 @@ module Sufia
       def request_transfer_to(target)
         raise ArgumentError, "Must provide a target" unless target
         deposit_user = ::User.find_by_user_key(depositor)
-        ProxyDepositRequest.create!(pid: id, receiving_user: target, sending_user: deposit_user)
+        ProxyDepositRequest.create!(generic_file_id: id, receiving_user: target, sending_user: deposit_user)
       end
     end
   end

data/app/models/datastreams/fits_datastream.rb

@@ -144,42 +144,7 @@ class FitsDatastream < ActiveFedora::OmDatastream
     http://hul.harvard.edu/ois/xml/xsd/fits/fits_output.xsd",
                version: "0.6.0",
                timestamp: "1/25/12 11:04 AM") {
-        xml.identification {
-          xml.identity(format: '', mimetype: '',
-                       toolname: 'FITS', toolversion: '') {
-            xml.tool(toolname: '', toolversion: '')
-            xml.version(toolname: '', toolversion: '')
-            xml.externalIdentifier(toolname: '', toolversion: '')
-          }
-        }
-        xml.fileinfo {
-          xml.size(toolname: '', toolversion: '')
-          xml.creatingApplicatioName(toolname: '', toolversion: '',
-                                     status: '')
-          xml.lastmodified(toolname: '', toolversion: '', status: '')
-          xml.filepath(toolname: '', toolversion: '', status: '')
-          xml.filename(toolname: '', toolversion: '', status: '')
-          xml.md5checksum(toolname: '', toolversion: '', status: '')
-          xml.fslastmodified(toolname: '', toolversion: '', status: '')
-        }
-        xml.filestatus {
-          xml.tag! "well-formed", toolname: '', toolversion: '', status: ''
-          xml.valid(toolname: '', toolversion: '', status: '')
-        }
-        xml.metadata {
-          xml.document {
-            xml.title(toolname: '', toolversion: '', status: '')
-            xml.author(toolname: '', toolversion: '', status: '')
-            xml.pageCount(toolname: '', toolversion: '')
-            xml.isTagged(toolname: '', toolversion: '')
-            xml.hasOutline(toolname: '', toolversion: '')
-            xml.hasAnnotations(toolname: '', toolversion: '')
-            xml.isRightsManaged(toolname: '', toolversion: '',
-                                status: '')
-            xml.isProtected(toolname: '', toolversion: '')
-            xml.hasForms(toolname: '', toolversion: '', status: '')
-          }
-        }
+        xml.identification { xml.identity(toolname: 'FITS') }
       }
     end
     builder.doc

data/app/models/proxy_deposit_request.rb

@@ -1,11 +1,11 @@
 class ProxyDepositRequest < ActiveRecord::Base
-  include Blacklight::SolrHelper
+  include Blacklight::SearchHelper
   include ActionView::Helpers::UrlHelper
 
   belongs_to :receiving_user, class_name: 'User'
   belongs_to :sending_user, class_name: 'User'
 
-  validates :sending_user, :pid, presence: true
+  validates :sending_user, :generic_file_id, presence: true
   validate :transfer_to_should_be_a_valid_username
   validate :sending_user_should_not_be_receiving_user
   validate :should_not_be_already_part_of_a_transfer
@@ -28,7 +28,7 @@ class ProxyDepositRequest < ActiveRecord::Base
   end
 
   def should_not_be_already_part_of_a_transfer
-    transfers = ProxyDepositRequest.where(pid: pid)
+    transfers = ProxyDepositRequest.where(generic_file_id: generic_file_id, status: 'pending')
     errors.add(:open_transfer, 'must close open transfer on the file before creating a new one') unless transfers.blank? || ( transfers.count == 1 && transfers[0].id == self.id)
   end
 
@@ -53,7 +53,7 @@ class ProxyDepositRequest < ActiveRecord::Base
 
   # @param [Boolean] reset (false) should the access controls be reset. This means revoking edit access from the depositor
   def transfer!(reset = false)
-    Sufia.queue.push(ContentDepositorChangeEventJob.new(pid, receiving_user.user_key, reset))
+    Sufia.queue.push(ContentDepositorChangeEventJob.new(generic_file_id, receiving_user.user_key, reset))
     self.status = 'accepted'
     self.fulfillment_date = Time.now
     save!
@@ -73,12 +73,12 @@ class ProxyDepositRequest < ActiveRecord::Base
   end
 
   def deleted_file?
-    !GenericFile.exists?(pid)
+    !GenericFile.exists?(generic_file_id)
   end
 
   def title
     return 'file not found' if deleted_file?
-    query = ActiveFedora::SolrQueryBuilder.construct_query_for_ids([pid])
+    query = ActiveFedora::SolrQueryBuilder.construct_query_for_ids([generic_file_id])
     solr_response = ActiveFedora::SolrService.query(query, raw: true)
     SolrDocument.new(solr_response['response']['docs'].first, solr_response).title
   end

data/app/services/sufia/generic_file_audit_service.rb

@@ -63,7 +63,7 @@ module Sufia
         latest_audit = ChecksumAuditLog.logs_for(generic_file.id, file).first
         return latest_audit unless needs_audit?(latest_audit)
         Sufia.queue.push(AuditJob.new(generic_file.id, file, uri))
-        latest_audit || ChecksumAuditLog.new(pass: NO_RUNS, pid: generic_file.id, dsid: file, version: label)
+        latest_audit || ChecksumAuditLog.new(pass: NO_RUNS, generic_file_id: generic_file.id, dsid: file, version: label)
       end
 
       def needs_audit?(latest_audit)

data/app/services/sufia/generic_file_indexing_service.rb

@@ -6,7 +6,6 @@ module Sufia
         solr_doc[Solrizer.solr_name('file_format')] = object.file_format
         solr_doc[Solrizer.solr_name('file_format', :facetable)] = object.file_format
         solr_doc['all_text_timv'] = object.full_text.content
-        solr_doc = object.index_collection_ids(solr_doc)
       end
     end
   end

data/app/services/sufia/id_service.rb

@@ -8,7 +8,6 @@ module Sufia
     end
 
     @minter = ::Noid::Minter.new(template: noid_template)
-    @pid = $$
     @semaphore = Mutex.new
     def self.valid?(identifier)
       # remove the fedora namespace since it's not part of the noid
@@ -18,8 +17,8 @@ module Sufia
     def self.mint
       @semaphore.synchronize do
         while true
-          pid = self.next_id
-          return pid unless ActiveFedora::Base.exists?(pid)
+          id = self.next_id
+          return id unless ActiveFedora::Base.exists?(id)
         end
       end
     end

data/app/services/sufia/noid.rb

@@ -2,7 +2,7 @@ module Sufia
   module Noid
     extend ActiveSupport::Concern
 
-    ## This overrides the default behavior, which is to ask Fedora for a pid
+    ## This overrides the default behavior, which is to ask Fedora for an id
     # @see ActiveFedora::Persistence.assign_id
     def assign_id
       Sufia::IdService.mint if Sufia.config.enable_noids

data/lib/generators/sufia/models/templates/config/sufia.rb

@@ -123,7 +123,7 @@ Sufia.config do |config|
   # NOTE: if you have always sent analytics to GA for downloads and page views leave this commented out
   # config.analytic_start_date = DateTime.new(2014,9,10)
   #
-  # Method of converting pids into URIs for storage in Fedora
+  # Method of converting ids into URIs for storage in Fedora
   # config.translate_uri_to_id = lambda { |uri| uri.to_s.split('/')[-1] }
   # config.translate_id_to_uri = lambda { |id|
   #      "#{ActiveFedora.fedora.host}#{ActiveFedora.fedora.base_path}/#{Sufia::Noid.treeify(id)}" }

data/lib/generators/sufia/models/templates/migrations/change_audit_log_pid_to_generic_file_id.rb

@@ -0,0 +1,5 @@
+class ChangeAuditLogPidToGenericFileId < ActiveRecord::Migration
+  def change
+    rename_column :checksum_audit_logs, :pid, :generic_file_id
+  end
+end

data/lib/generators/sufia/models/templates/migrations/change_proxy_deposit_request_pid_to_generic_file_id.rb

@@ -0,0 +1,5 @@
+class ChangeProxyDepositRequestPidToGenericFileId < ActiveRecord::Migration
+  def change
+    rename_column :proxy_deposit_requests, :pid, :generic_file_id
+  end
+end

data/lib/generators/sufia/models/upgrade600_generator.rb

@@ -0,0 +1,21 @@
+require_relative 'abstract_migration_generator'
+
+class Sufia::Models::Upgrade600Generator < Sufia::Models::AbstractMigrationGenerator
+  source_root File.expand_path('../templates', __FILE__)
+
+  desc """
+This generator for upgrading sufia-models to 6.0 makes the following changes to your application:
+ 1. Creates several database migrations if they do not exist in /db/migrate
+       """
+
+  # Setup the database migrations
+  def copy_migrations
+    [
+      'change_audit_log_pid_to_generic_file_id.rb',
+      'change_proxy_deposit_request_pid_to_generic_file_id.rb'
+    ].each do |file|
+      better_migration_template file
+    end
+  end
+end
+

data/lib/sufia/models/stats/user_stat_importer.rb

@@ -1,23 +1,28 @@
 module Sufia
   class UserStatImporter
 
+    UserRecord = Struct.new("UserRecord", :id, :user_key, :last_stats_update)
+
     def initialize(options={})
       @verbose = options[:verbose]
       @logging = options[:logging]
+      @delay_secs = options[:delay_secs].to_f
     end
 
     def import
       log_message('Begin import of User stats.')
-      ::User.find_each do |user|
+      sorted_users.each do |user|
         start_date = date_since_last_cache(user)
 
         stats = {}
         file_ids_for_user(user).each do |file_id|
           view_stats = FileViewStat.statistics(file_id, start_date, user.id)
           stats = tally_results(view_stats, :views, stats)
+          delay
 
           dl_stats = FileDownloadStat.statistics(file_id, start_date, user.id)
           stats = tally_results(dl_stats, :downloads, stats)
+          delay
         end
 
         create_or_update_user_stats(stats, user)
@@ -25,9 +30,23 @@ module Sufia
       log_message('User stats import complete.')
     end
 
+    # Returns an array of users sorted by the date of their last
+    # stats update. Users that have not been recently updated 
+    # will be at the top of the array.
+    def sorted_users
+      users = []
+      ::User.find_each do |user|
+        users.push(UserRecord.new(user.id, user.user_key, date_since_last_cache(user)))
+      end
+      users.sort! {|a, b| a.last_stats_update <=> b.last_stats_update}
+    end
 
 private
 
+    def delay 
+      sleep @delay_secs
+    end
+
     def date_since_last_cache(user)
       last_cached_stat = UserStat.where(user_id: user.id).order(date: :asc).last
 

data/lib/sufia/models/version.rb

@@ -1,5 +1,5 @@
 module Sufia
   module Models
-    VERSION = "6.0.0.rc4"
+    VERSION = "6.0.0"
   end
 end

data/lib/tasks/batch_cleanup.rake

@@ -0,0 +1,19 @@
+namespace :sufia do
+
+  desc "Reports on and optionally removes empty batches that contain no associated files"
+  task :empty_batches, [:remove] => :environment do |t, args|
+    option = args.to_hash.fetch(:remove, "keep")
+    Batch.all.each do |batch|
+      if batch.generic_files.empty?
+        print "#{batch.id} contains no files - "
+        if option == "remove"
+          batch.destroy
+          puts "deleted"
+        else
+          puts "to delete, rerun with the remove option: rake sufia:empty_batches[remove]"
+        end
+      end
+    end
+  end
+
+end

data/lib/tasks/migrate.rake

@@ -0,0 +1,21 @@
+ namespace :sufia do
+  namespace :migrate do
+
+    desc "Migrate proxy deposits"
+    task proxy_deposits: :environment do
+      ProxyDepositRequest.all.each do |pd|
+        pd.generic_file_id = pd.generic_file_id.delete "#{Sufia.config.redis_namespace}:"
+        pd.save
+      end
+    end
+
+    desc "Migrate audit logs"
+    task audit_logs: :environment do
+      ChecksumAuditLog.all.each do |cs|
+        cs.generic_file_id = cs.generic_file_id.delete "#{Sufia.config.redis_namespace}:"
+        cs.save
+      end
+    end
+
+  end
+end

data/lib/tasks/sufia-models_tasks.rake

@@ -1,3 +1,5 @@
+require 'net/http'
+
 namespace :solr do
   desc "Enqueue a job to resolrize the repository objects"
   task reindex: :environment do
@@ -7,6 +9,41 @@ end
 
 namespace :sufia do
   namespace :jetty do
+
+    FULLTEXT_JARS = %w(
+        org/apache/james/apache-mime4j-core/0.7.2/apache-mime4j-core-0.7.2.jar
+        org/apache/james/apache-mime4j-dom/0.7.2/apache-mime4j-dom-0.7.2.jar
+        org/apache/solr/solr-cell/4.0.0/solr-cell-4.0.0.jar
+        org/bouncycastle/bcmail-jdk15/1.45/bcmail-jdk15-1.45.jar
+        org/bouncycastle/bcprov-jdk15/1.45/bcprov-jdk15-1.45.jar
+        de/l3s/boilerpipe/boilerpipe/1.1.0/boilerpipe-1.1.0.jar
+        org/apache/commons/commons-compress/1.4.1/commons-compress-1.4.1.jar
+        dom4j/dom4j/1.6.1/dom4j-1.6.1.jar
+        org/apache/pdfbox/fontbox/1.7.0/fontbox-1.7.0.jar
+        com/ibm/icu/icu4j/49.1/icu4j-49.1.jar
+        com/googlecode/mp4parser/isoparser/1.0-RC-1/isoparser-1.0-RC-1.jar
+        jdom/jdom/1.0/jdom-1.0.jar
+        org/apache/pdfbox/jempbox/1.7.0/jempbox-1.7.0.jar
+        com/googlecode/juniversalchardet/juniversalchardet/1.0.3/juniversalchardet-1.0.3.jar
+        com/drewnoakes/metadata-extractor/2.4.0-beta-1/metadata-extractor-2.4.0-beta-1.jar
+        edu/ucar/netcdf/4.2-min/netcdf-4.2-min.jar
+        org/apache/pdfbox/pdfbox/1.7.0/pdfbox-1.7.0.jar
+        org/apache/poi/poi/3.8/poi-3.8.jar
+        org/apache/poi/poi-ooxml/3.8/poi-ooxml-3.8.jar
+        org/apache/poi/poi-ooxml-schemas/3.8/poi-ooxml-schemas-3.8.jar
+        org/apache/poi/poi-scratchpad/3.8/poi-scratchpad-3.8.jar
+        rome/rome/0.9/rome-0.9.jar
+        org/ccil/cowan/tagsoup/tagsoup/1.2.1/tagsoup-1.2.1.jar
+        org/apache/tika/tika-core/1.2/tika-core-1.2.jar
+        org/apache/tika/tika-parsers/1.2/tika-parsers-1.2.jar
+        org/gagravarr/vorbis-java-core/0.1/vorbis-java-core-0.1.jar
+        org/gagravarr/vorbis-java-tika/0.1/vorbis-java-tika-0.1.jar
+        xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar
+        org/apache/xmlbeans/xmlbeans/2.3.0/xmlbeans-2.3.0.jar
+        org/tukaani/xz/1.0/xz-1.0.jar
+        org/aspectj/aspectjrt/1.8.5/aspectjrt-1.8.5.jar
+      )
+
     desc 'Configure jetty with full-text indexing'
     task config: :download_jars do
       Rake::Task['jetty:config'].invoke
@@ -15,49 +52,29 @@ namespace :sufia do
     desc 'Download Solr full-text extraction jars'
     task :download_jars do
       puts "Downloading full-text jars from maven.org ..."
-      url_prefix = 'http://search.maven.org/remotecontent?filepath='
       fulltext_dir = 'jetty/solr/lib/contrib/extraction/lib'
-      jars = %w(
-          org/apache/james/apache-mime4j-core/0.7.2/apache-mime4j-core-0.7.2.jar
-          org/apache/james/apache-mime4j-dom/0.7.2/apache-mime4j-dom-0.7.2.jar
-          org/apache/solr/solr-cell/4.0.0/solr-cell-4.0.0.jar
-          org/bouncycastle/bcmail-jdk15/1.45/bcmail-jdk15-1.45.jar
-          org/bouncycastle/bcprov-jdk15/1.45/bcprov-jdk15-1.45.jar
-          de/l3s/boilerpipe/boilerpipe/1.1.0/boilerpipe-1.1.0.jar
-          org/apache/commons/commons-compress/1.4.1/commons-compress-1.4.1.jar
-          dom4j/dom4j/1.6.1/dom4j-1.6.1.jar
-          org/apache/pdfbox/fontbox/1.7.0/fontbox-1.7.0.jar
-          com/ibm/icu/icu4j/49.1/icu4j-49.1.jar
-          com/googlecode/mp4parser/isoparser/1.0-RC-1/isoparser-1.0-RC-1.jar
-          jdom/jdom/1.0/jdom-1.0.jar
-          org/apache/pdfbox/jempbox/1.7.0/jempbox-1.7.0.jar
-          com/googlecode/juniversalchardet/juniversalchardet/1.0.3/juniversalchardet-1.0.3.jar
-          com/drewnoakes/metadata-extractor/2.4.0-beta-1/metadata-extractor-2.4.0-beta-1.jar
-          edu/ucar/netcdf/4.2-min/netcdf-4.2-min.jar
-          org/apache/pdfbox/pdfbox/1.7.0/pdfbox-1.7.0.jar
-          org/apache/poi/poi/3.8/poi-3.8.jar
-          org/apache/poi/poi-ooxml/3.8/poi-ooxml-3.8.jar
-          org/apache/poi/poi-ooxml-schemas/3.8/poi-ooxml-schemas-3.8.jar
-          org/apache/poi/poi-scratchpad/3.8/poi-scratchpad-3.8.jar
-          rome/rome/0.9/rome-0.9.jar
-          org/ccil/cowan/tagsoup/tagsoup/1.2.1/tagsoup-1.2.1.jar
-          org/apache/tika/tika-core/1.2/tika-core-1.2.jar
-          org/apache/tika/tika-parsers/1.2/tika-parsers-1.2.jar
-          org/gagravarr/vorbis-java-core/0.1/vorbis-java-core-0.1.jar
-          org/gagravarr/vorbis-java-tika/0.1/vorbis-java-tika-0.1.jar
-          xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar
-          org/apache/xmlbeans/xmlbeans/2.3.0/xmlbeans-2.3.0.jar
-          org/tukaani/xz/1.0/xz-1.0.jar
-        )
       FileUtils.mkdir_p(fulltext_dir) unless File.directory?(fulltext_dir)
       Dir.chdir(fulltext_dir) do
-        jars.each do |jar|
-          url = url_prefix + jar
-          jarfile = jar.split('/').last
-          puts "Fetching #{url}" unless File.exists?(jarfile)
-          system "wget --quiet --no-clobber #{url} -O #{jarfile}"
+        FULLTEXT_JARS.each do |jar|
+          destination = jar.split('/').last
+          download_from_maven(jar, destination) unless File.exists?(destination)
         end
       end
     end
   end
 end
+
+def download_from_maven url, dst
+  full_url = '/remotecontent?filepath=' + url
+  file = File.open(dst, "w")
+  Net::HTTP.start("search.maven.org") do |http|
+    puts "Fetching #{full_url}"
+    begin
+      http.request_get(full_url) do |resp|
+        resp.read_body { |segment| file.write(segment) }
+      end
+    ensure
+      file.close
+    end
+  end
+end

data/sufia-models.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "hydra-head", "~> 9.0"
   spec.add_dependency "active-fedora", "~> 9.0"
-  spec.add_dependency "hydra-collections", "~> 4.0"
+  spec.add_dependency "hydra-collections", [">= 5.0.2", "< 6.0"]
   spec.add_dependency 'hydra-derivatives', '~> 1.0'
   spec.add_dependency 'nest', '~> 1.1'
   spec.add_dependency 'resque', '~> 1.23'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sufia-models
 version: !ruby/object:Gem::Version
-  version: 6.0.0.rc4
+  version: 6.0.0
 platform: ruby
 authors:
 - Jeremy Friesen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-18 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,16 +98,22 @@ dependencies:
   name: hydra-collections
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 5.0.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 5.0.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: hydra-derivatives
   requirement: !ruby/object:Gem::Requirement
@@ -309,6 +315,7 @@ files:
 - README.md
 - Rakefile
 - app/actors/sufia/generic_file/actor.rb
+- app/jobs/active_fedora_id_based_job.rb
 - app/jobs/active_fedora_pid_based_job.rb
 - app/jobs/audit_job.rb
 - app/jobs/batch_update_job.rb
@@ -401,6 +408,8 @@ files:
 - lib/generators/sufia/models/templates/migrations/add_linkedin_to_users.rb
 - lib/generators/sufia/models/templates/migrations/add_orcid_to_users.rb
 - lib/generators/sufia/models/templates/migrations/add_social_to_users.rb
+- lib/generators/sufia/models/templates/migrations/change_audit_log_pid_to_generic_file_id.rb
+- lib/generators/sufia/models/templates/migrations/change_proxy_deposit_request_pid_to_generic_file_id.rb
 - lib/generators/sufia/models/templates/migrations/create_checksum_audit_logs.rb
 - lib/generators/sufia/models/templates/migrations/create_content_blocks.rb
 - lib/generators/sufia/models/templates/migrations/create_featured_works.rb
@@ -416,6 +425,7 @@ files:
 - lib/generators/sufia/models/templates/migrations/create_version_committers.rb
 - lib/generators/sufia/models/update_content_blocks_generator.rb
 - lib/generators/sufia/models/upgrade400_generator.rb
+- lib/generators/sufia/models/upgrade600_generator.rb
 - lib/generators/sufia/models/usagestats_generator.rb
 - lib/generators/sufia/models/user_stats_generator.rb
 - lib/sufia/messages.rb
@@ -434,6 +444,8 @@ files:
 - lib/sufia/permissions.rb
 - lib/sufia/permissions/readable.rb
 - lib/sufia/permissions/writable.rb
+- lib/tasks/batch_cleanup.rake
+- lib/tasks/migrate.rake
 - lib/tasks/resque.rake
 - lib/tasks/stats_tasks.rake
 - lib/tasks/sufia-models_tasks.rake
@@ -453,12 +465,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Models and services for sufia