sufia-models 6.0.0.rc2 → 6.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61b522c3064c907375bcbad951e0878c3b692fac
-  data.tar.gz: a4074b935257278771c9e4808d8c8dd5c87ebc48
+  metadata.gz: 51e106549a813b6bf42150ec4287e9579e171dad
+  data.tar.gz: 987fd56596a1da6b517205ddb9581b8c21fae645
 SHA512:
-  metadata.gz: 73aacb00e97352fbaad299467c98ca52349d11b8070da097aa565403ebf46398e3550d97066b3242b56180d14b9604ef1ab76c6b5b1714cee03c3cec8789ad4b
-  data.tar.gz: 3ae78655ec6badec1106aeebe2833729591744c877bd1571ed87da3314dfa4fc49fff1f0637dd303f34661778996ea6b33dc129475d3aa0156dd4ce12aefaf54
+  metadata.gz: c1fd765adfeacd91d0ccb197e4b9920f82d3ddf1aba32d1fabf0c403ea35eb0c6d28b3a7304e3b3850abf1a1ddec9c67b1076c764cf5e13b1388674cff138417
+  data.tar.gz: 3b399d52d64a204e6151833a0bb87bb22e61b50464767faba06e3d67084d6ddaa11acfe9abfd2047ec08b36251b372c059cabc0183fc6c7672421d292ca96943

data/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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?

data/app/models/file_view_stat.rb

@@ -12,7 +12,7 @@ class FileViewStat < ActiveRecord::Base
   # Sufia::Download is sent to Sufia::Analytics.profile as #sufia__download
   # see Legato::ProfileMethods.method_name_from_klass
   def self.ga_statistics start_date, file_id
-    path = Sufia::Engine.routes.url_helpers.generic_file_path(Sufia::Noid.noidify(file_id))
+    path = Sufia::Engine.routes.url_helpers.generic_file_path(file_id)
     Sufia::Analytics.profile.sufia__pageview(sort: 'date', start_date: start_date).for_path(path)
   end
 end

data/app/models/sufia/collection.rb

@@ -0,0 +1,5 @@
+module Sufia
+  class Collection < ActiveFedora::Base
+    include Sufia::CollectionBehavior
+  end
+end

data/app/services/sufia/generic_file_indexing_service.rb

@@ -1,5 +1,5 @@
 module Sufia
-  class GenericFileIndexingService < IndexingService
+  class GenericFileIndexingService < ActiveFedora::IndexingService
     def generate_solr_document
       super.tap do |solr_doc|
         solr_doc[Solrizer.solr_name('label')] = object.label

data/app/services/sufia/id_service.rb

@@ -9,12 +9,11 @@ module Sufia
 
     @minter = ::Noid::Minter.new(template: noid_template)
     @pid = $$
-    #@namespace = Sufia.config.id_namespace
     @semaphore = Mutex.new
     def self.valid?(identifier)
       # remove the fedora namespace since it's not part of the noid
       noid = identifier#.split(":").last
-      return @minter.valid? noid
+      @minter.valid? noid
     end
     def self.mint
       @semaphore.synchronize do

data/app/services/sufia/noid.rb

@@ -3,40 +3,20 @@ module Sufia
     extend ActiveSupport::Concern
 
     ## This overrides the default behavior, which is to ask Fedora for a pid
-    # @see ActiveFedora::Sharding.assign_pid
-    def assign_pid
-      Sufia::IdService.mint
+    # @see ActiveFedora::Persistence.assign_id
+    def assign_id
+      Sufia::IdService.mint if Sufia.config.enable_noids
     end
 
-    def noid
-      Noid.noidify(id)
-    end
-
-    # Redefine this for more intuitive keys in Redis
     def to_param
-      noid
+      id
     end
 
     class << self
-      def noidify(identifier)
-        String(identifier).split(":").last
-      end
-
       # Create a pairtree like path for the given identifier
       def treeify(identifier)
         (identifier.scan(/..?/).first(4) + [identifier]).join('/')
       end
-
-      def namespaceize(identifier)
-        return identifier if identifier.include?(':')
-        "#{namespace}:#{identifier}"
-      end
-
-      protected
-
-      def namespace
-        Sufia.config.id_namespace
-      end
     end
   end
 end

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

@@ -37,7 +37,8 @@ This generator makes the following changes to your application:
       'add_linkedin_to_users.rb',
       'create_tinymce_assets.rb',
       'create_content_blocks.rb',
-      'create_featured_works.rb'
+      'create_featured_works.rb',
+      'add_external_key_to_content_blocks.rb'
     ].each do |file|
       better_migration_template file
     end
@@ -67,6 +68,10 @@ This generator makes the following changes to your application:
     copy_file 'config/resque_config.rb', 'config/initializers/resque_config.rb'
   end
 
+  def create_collection
+    copy_file 'app/models/collection.rb', 'app/models/collection.rb'
+  end
+
   def install_mailboxer
     generate "mailboxer:install"
   end

data/lib/generators/sufia/models/templates/app/models/collection.rb

@@ -0,0 +1,2 @@
+class Collection < Sufia::Collection
+end

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

@@ -2,4 +2,4 @@ config = YAML::load(ERB.new(IO.read(File.join(Rails.root, 'config', 'redis.yml')
 Resque.redis = Redis.new(host: config[:host], port: config[:port], thread_safe: true)
 
 Resque.inline = Rails.env.test?
-Resque.redis.namespace = "#{Sufia.config.id_namespace}:#{Rails.env}"
+Resque.redis.namespace = "#{Sufia.config.redis_namespace}:#{Rails.env}"

data/lib/generators/sufia/models/templates/config/solrconfig.xml

@@ -18,6 +18,52 @@
 
   <dataDir>${solr.data.dir:}</dataDir>
 
+  <!-- The default high-performance update handler -->
+  <updateHandler class="solr.DirectUpdateHandler2">
+
+    <!-- Enables a transaction log, used for real-time get, durability, and
+         and solr cloud replica recovery.  The log can grow as big as
+         uncommitted changes to the index, so use of a hard autoCommit
+         is recommended (see below).
+         "dir" - the target directory for transaction logs, defaults to the
+                solr data directory.  -->
+    <updateLog>
+      <str name="dir">${solr.ulog.dir:}</str>
+    </updateLog>
+
+    <!-- AutoCommit
+         Perform a hard commit automatically under certain conditions.
+         Instead of enabling autoCommit, consider using "commitWithin"
+         when adding documents.
+         http://wiki.apache.org/solr/UpdateXmlMessages
+         maxDocs - Maximum number of documents to add since the last
+                   commit before automatically triggering a new commit.
+         maxTime - Maximum amount of time in ms that is allowed to pass
+                   since a document was added before automatically
+                   triggering a new commit.
+         openSearcher - if false, the commit causes recent index changes
+           to be flushed to stable storage, but does not cause a new
+           searcher to be opened to make those changes visible.
+         If the updateLog is enabled, then it's highly recommended to
+         have some sort of hard autoCommit to limit the log size.
+      -->
+     <autoCommit>
+       <maxTime>${solr.autoCommit.maxTime:15000}</maxTime>
+       <openSearcher>false</openSearcher>
+     </autoCommit>
+
+    <!-- softAutoCommit is like autoCommit except it causes a
+         'soft' commit which only ensures that changes are visible
+         but does not ensure that data is synced to disk.  This is
+         faster and more near-realtime friendly than a hard commit.
+      -->
+
+     <autoSoftCommit>
+       <maxTime>${solr.autoSoftCommit.maxTime:-1}</maxTime>
+     </autoSoftCommit>
+
+  </updateHandler>
+
   <requestHandler name="search" class="solr.SearchHandler" default="true">
     <!-- default values for query parameters can be specified, these
          will be overridden by parameters in the request

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

@@ -6,9 +6,6 @@ Sufia.config do |config|
     file_author: :creator
   }
 
-  # Specify a different template for your repositories unique identifiers
-  # config.noid_template = ".reeddeeddk"
-
   config.max_days_between_audits = 7
 
   config.max_notifications_for_dashboard = 5
@@ -105,8 +102,15 @@ Sufia.config do |config|
   # If you have ffmpeg installed and want to transcode audio and video uncomment this line
   # config.enable_ffmpeg = true
 
-  # Specify the Fedora pid prefix:
-  # config.id_namespace = "sufia"
+  # Sufia uses NOIDs for files and collections instead of Fedora UUIDs
+  # where NOID = 10-character string and UUID = 32-character string w/ hyphens
+  # config.enable_noids = true
+
+  # Specify a different template for your repository's NOID IDs
+  # config.noid_template = ".reeddeeddk"
+
+  # Specify the prefix for Redis keys:
+  # config.redis_namespace = "sufia"
 
   # Specify the path to the file characterization tool:
   # config.fits_path = "fits.sh"

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

@@ -0,0 +1,6 @@
+class AddExternalKeyToContentBlocks < ActiveRecord::Migration
+  def change
+    add_column :content_blocks, :external_key, :string
+    remove_index :content_blocks, :name
+  end
+end

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

@@ -0,0 +1,18 @@
+require_relative 'abstract_migration_generator'
+
+class Sufia::Models::UpdateContentBlocksGenerator < Sufia::Models::AbstractMigrationGenerator
+  source_root File.expand_path('../templates', __FILE__)
+
+  desc """
+This generator creates a database migration to add an external_key column to the content_blocks table (if the migration doesn't already exist).  This allows you to associate a user_key with a featured_researcher entry.
+       """
+
+  def banner
+    say_status("warning", "CREATING MIGRATION FILE", :yellow)
+  end
+
+  def copy_migrations
+    better_migration_template 'add_external_key_to_content_blocks.rb'
+  end
+
+end

data/lib/sufia/messages.rb

@@ -46,22 +46,21 @@ module Sufia
     end
 
     def link_to_file file
-      link_to(file.to_s, Sufia::Engine.routes.url_helpers.generic_file_path(file.noid))
+      link_to(file.to_s, Sufia::Engine.routes.url_helpers.generic_file_path(file))
     end
 
     private
 
-    def success_link files
-      link_to I18n.t("sufia.messages.success.multiple.link"), "#", 
-        rel: "popover", 
-        data: { content: file_list(files).html_safe, title: I18n.t("sufia.messages.success.title") }
-    end
-
-    def failure_link files
-      link_to I18n.t("sufia.messages.failure.multiple.link"), "#", 
-        rel: "popover", 
-        data: { content: file_list(files).html_safe, title: I18n.t("sufia.messages.failure.title") }
-    end
+      def success_link files
+        link_to I18n.t("sufia.messages.success.multiple.link"), "#",
+          rel: "popover",
+          data: { content: file_list(files).html_safe, title: I18n.t("sufia.messages.success.title") }
+      end
 
+      def failure_link files
+        link_to I18n.t("sufia.messages.failure.multiple.link"), "#",
+          rel: "popover",
+          data: { content: file_list(files).html_safe, title: I18n.t("sufia.messages.failure.title") }
+      end
   end
 end

data/lib/sufia/models/engine.rb

@@ -18,8 +18,9 @@ module Sufia
       config.ffmpeg_path = 'ffmpeg'
       config.fits_message_length = 5
       config.temp_file_base = nil
+      config.enable_noids = true
       config.minter_statefile = '/tmp/minter-state'
-      config.id_namespace = "sufia"
+      config.redis_namespace = "sufia"
       config.fits_path = "fits.sh"
       config.enable_contact_form_delivery = false
       config.browse_everything = nil

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

@@ -12,11 +12,11 @@ module Sufia
         start_date = date_since_last_cache(user)
 
         stats = {}
-        files_for_user(user).each do |file|
-          view_stats = FileViewStat.statistics(file.id, start_date, user.id)
+        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)
 
-          dl_stats = FileDownloadStat.statistics(file.id, start_date, user.id)
+          dl_stats = FileDownloadStat.statistics(file_id, start_date, user.id)
           stats = tally_results(dl_stats, :downloads, stats)
         end
 
@@ -38,8 +38,12 @@ private
       end
     end
 
-    def files_for_user(user)
-      ::GenericFile.where(Solrizer.solr_name('depositor', :symbol) => user.user_key)
+    def file_ids_for_user(user)
+      ids = []
+      ::GenericFile.find_in_batches("#{Solrizer.solr_name('depositor', :symbol)}:\"#{user.user_key}\"", fl:"id") do |group|
+        ids.concat group.map { |doc| doc["id"] }
+      end
+      ids
     end
 
     # For each date, add the view and download counts for this

data/lib/sufia/models/version.rb

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

data/sufia-models.gemspec

@@ -26,13 +26,13 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.3"
 
-  spec.add_dependency 'rails', '~> 4.0', '< 5.0.0'
+  spec.add_dependency 'rails', '~> 4.0'
   spec.add_dependency 'activeresource', "~> 4.0" # No longer a dependency of rails 4.0
 
-  spec.add_dependency "hydra-head", "~> 9.0.0.rc3"
-  spec.add_dependency "active-fedora", "~> 9.0.0.rc3"
-  spec.add_dependency "hydra-collections", "~> 4.0.0.rc2"
-  spec.add_dependency 'hydra-derivatives', '~> 1.0.0.rc1'
+  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-derivatives', '~> 1.0'
   spec.add_dependency 'nest', '~> 1.1'
   spec.add_dependency 'resque', '~> 1.23'
   spec.add_dependency 'resque-pool', '~> 0.3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sufia-models
 version: !ruby/object:Gem::Version
-  version: 6.0.0.rc2
+  version: 6.0.0.rc3
 platform: ruby
 authors:
 - Jeremy Friesen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-16 00:00:00.000000000 Z
+date: 2015-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -45,9 +45,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -55,9 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: activeresource
   requirement: !ruby/object:Gem::Requirement
@@ -78,56 +72,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.0.0.rc3
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.0.0.rc3
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: active-fedora
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.0.0.rc3
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.0.0.rc3
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: hydra-collections
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc2
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc2
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hydra-derivatives
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: nest
   requirement: !ruby/object:Gem::Requirement
@@ -321,12 +315,12 @@ files:
 - app/jobs/characterize_job.rb
 - app/jobs/create_derivatives_job.rb
 - app/jobs/import_url_job.rb
+- app/jobs/ingest_local_file_job.rb
 - app/jobs/resolrize_job.rb
 - app/models/batch.rb
 - app/models/checksum_audit_log.rb
-- app/models/collection.rb
 - app/models/concerns/sufia/ability.rb
-- app/models/concerns/sufia/collection.rb
+- app/models/concerns/sufia/collection_behavior.rb
 - app/models/concerns/sufia/file_stat_utils.rb
 - app/models/concerns/sufia/generic_file.rb
 - app/models/concerns/sufia/generic_file/batches.rb
@@ -366,6 +360,7 @@ files:
 - app/models/subject_local_authority_entry.rb
 - app/models/sufia/avatar_uploader.rb
 - app/models/sufia/avatar_validator.rb
+- app/models/sufia/collection.rb
 - app/models/sufia/download.rb
 - app/models/sufia/orcid_validator.rb
 - app/models/sufia/pageview.rb
@@ -376,7 +371,6 @@ files:
 - app/services/sufia/generic_file_audit_service.rb
 - app/services/sufia/generic_file_indexing_service.rb
 - app/services/sufia/id_service.rb
-- app/services/sufia/indexing_service.rb
 - app/services/sufia/noid.rb
 - app/services/sufia/repository_audit_service.rb
 - config/locales/sufia.en.yml
@@ -386,6 +380,7 @@ files:
 - lib/generators/sufia/models/install_generator.rb
 - lib/generators/sufia/models/orcid_field_generator.rb
 - lib/generators/sufia/models/proxies_generator.rb
+- lib/generators/sufia/models/templates/app/models/collection.rb
 - lib/generators/sufia/models/templates/config/analytics.yml
 - lib/generators/sufia/models/templates/config/clamav.rb
 - lib/generators/sufia/models/templates/config/mailboxer.rb
@@ -400,6 +395,7 @@ files:
 - lib/generators/sufia/models/templates/config/sufia.rb
 - lib/generators/sufia/models/templates/migrations/acts_as_follower_migration.rb
 - lib/generators/sufia/models/templates/migrations/add_avatars_to_users.rb
+- lib/generators/sufia/models/templates/migrations/add_external_key_to_content_blocks.rb
 - lib/generators/sufia/models/templates/migrations/add_groups_to_users.rb
 - lib/generators/sufia/models/templates/migrations/add_ldap_attrs_to_user.rb
 - lib/generators/sufia/models/templates/migrations/add_linkedin_to_users.rb
@@ -418,6 +414,7 @@ files:
 - lib/generators/sufia/models/templates/migrations/create_trophies.rb
 - lib/generators/sufia/models/templates/migrations/create_user_stats.rb
 - 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/usagestats_generator.rb
 - lib/generators/sufia/models/user_stats_generator.rb
@@ -461,7 +458,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Models and services for sufia

data/app/models/collection.rb

@@ -1,3 +0,0 @@
-class Collection < ActiveFedora::Base
-  include Sufia::Collection
-end

data/app/services/sufia/indexing_service.rb

@@ -1,15 +0,0 @@
-module Sufia
-  class IndexingService < ActiveFedora::IndexingService
-
-    # Unstemmed, searchable, stored
-    def self.noid_indexer
-      @noid_indexer ||= Solrizer::Descriptor.new(:text, :indexed, :stored)
-    end
-
-    def generate_solr_document
-      super.tap do |solr_doc|
-        solr_doc[Solrizer.solr_name("noid", Sufia::IndexingService.noid_indexer)] = object.noid
-      end
-    end
-  end
-end