sufia 4.0.0.beta2 → 4.0.0.beta3

data/sufia-models/lib/sufia/models/engine.rb

@@ -23,6 +23,7 @@ module Sufia
       config.enable_contact_form_delivery = false
       config.browse_everything = nil
       config.enable_local_ingest = nil
+      config.usage_statistics = nil
       config.queue = Sufia::Resque::Queue
 
       config.autoload_paths += %W(
@@ -46,19 +47,12 @@ module Sufia
         require 'sufia/models/model_methods'
         require 'sufia/models/file_content'
         require 'sufia/models/file_content/versions'
-        require 'sufia/models/generic_file/audit'
-        require 'sufia/models/generic_file/characterization'
-        require 'sufia/models/generic_file/derivatives'
-        require 'sufia/models/generic_file/export'
-        require 'sufia/models/generic_file/mime_types'
-        require 'sufia/models/generic_file/thumbnail'
-        require 'sufia/models/generic_file'
         require 'sufia/models/user_local_directory_behavior'
-        require 'sufia/models/solr_document_behavior'
         require 'sufia/noid'
         require 'sufia/id_service'
-        require 'sufia/usage_statistics'
+        require 'sufia/analytics'
         require 'sufia/pageview'
+        require 'sufia/download'
       end
 
       initializer 'configure' do

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

@@ -10,9 +10,9 @@ module Sufia
       end
 
       def version_committer(version)
-        vc = VersionCommitter.where(:obj_id => version.pid,
-                                    :datastream_id => version.dsid,
-                                    :version_id => version.versionID)
+        vc = VersionCommitter.where(obj_id: version.pid,
+                                    datastream_id: version.dsid,
+                                    version_id: version.versionID)
         return vc.empty? ? nil : vc.first.committer_login
       end
 

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

@@ -4,11 +4,15 @@ class ActiveFedoraPidBasedJob
   end
 
   attr_accessor :pid
+
   def initialize(pid)
     self.pid = pid
   end
+
   def object
-    @object ||= ActiveFedora::Base.find(pid, cast:true).tap{|f| f.reload_on_save = true}
+    @object ||= ActiveFedora::Base.find(pid, cast: true).tap do |f|
+      f.reload_on_save = true
+    end
   end
   alias_method :generic_file, :object
   alias_method :generic_file_id, :pid
@@ -16,4 +20,4 @@ class ActiveFedoraPidBasedJob
   def run
     raise RuntimeError, "Define #run in a subclass"
   end
-end
+end

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

@@ -1,6 +1,6 @@
 class BatchUpdateJob
   include Hydra::PermissionsQuery
-  include Rails.application.routes.url_helpers 
+  include Rails.application.routes.url_helpers
 
   def queue_name
     :batch_update
@@ -14,7 +14,6 @@ class BatchUpdateJob
     self.file_attributes = params[:generic_file]
     self.visibility = params[:visibility]
     self.batch_id = params[:id]
-
   end
 
   def run
@@ -27,15 +26,14 @@ class BatchUpdateJob
       update_file(gf, user)
     end
     batch.update_attributes({status:["Complete"]})
-    
+
     job_user = User.batchuser()
-    
+
     message = '<span class="batchid ui-helper-hidden">ss-'+batch.noid+'</span>The file(s) '+ file_list(@saved)+ " have been saved." unless @saved.empty?
     job_user.send_message(user, message, 'Batch upload complete') unless @saved.empty?
- 
+
     message = '<span class="batchid ui-helper-hidden">'+batch.noid+'</span>The file(s) '+ file_list(@denied)+" could not be updated.  You do not have sufficient privileges to edit it." unless @denied.empty?
     job_user.send_message(user, message, 'Batch upload permission denied') unless @denied.empty?
-     
   end
 
   def update_file(gf, user)
@@ -62,10 +60,8 @@ class BatchUpdateJob
     Sufia.queue.push(ContentUpdateEventJob.new(gf.pid, login))
     @saved << gf
   end
-  
+
   def file_list ( files)
-    return files.map {|gf| '<a href="'+Sufia::Engine.routes.url_helpers.generic_files_path+'/'+gf.noid+'">'+gf.to_s+'</a>'}.join(', ')
-    
+    files.map { |gf| '<a href="'+Sufia::Engine.routes.url_helpers.generic_files_path+'/'+gf.noid+'">'+gf.to_s+'</a>' }.join(', ')
   end
-  
 end

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

@@ -1,22 +1,10 @@
 class CharacterizeJob < ActiveFedoraPidBasedJob
-
   def queue_name
     :characterize
   end
 
   def run
     generic_file.characterize
-    after_characterize
-  end
-
-  def after_characterize
-    if generic_file.pdf? || generic_file.image? || generic_file.video?
-      generic_file.create_thumbnail
-    end
-    if generic_file.video?
-      Sufia.queue.push(TranscodeVideoJob.new(generic_file_id))
-    elsif generic_file.audio?
-      Sufia.queue.push(TranscodeAudioJob.new(generic_file_id))
-    end
+    Sufia.queue.push(CreateDerivativesJob.new(generic_file.id))
   end
 end

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

@@ -0,0 +1,14 @@
+class CreateDerivativesJob < ActiveFedoraPidBasedJob
+  def queue_name
+    :derivatives
+  end
+
+  def run
+    return unless generic_file.content.has_content?
+    if generic_file.video?
+      return unless Sufia.config.enable_ffmpeg
+    end
+    generic_file.create_derivatives
+    generic_file.save
+  end
+end

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

@@ -12,32 +12,36 @@ class ImportUrlJob < ActiveFedoraPidBasedJob
     user = User.find_by_user_key(generic_file.depositor)
 
     Tempfile.open(self.pid) do |f|
-      f.binmode
-
-      # download file from url
-      uri = URI(generic_file.import_url)
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = uri.scheme == "https"  # enable SSL/TLS
-      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-
-      http.start do
-        http.request_get(uri.request_uri) do |resp|
-          resp.read_body do |segment|
-            f.write(segment)
-          end
-        end
+      path = 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')
+        # add message to user for downloaded file
+        message = "The file (#{File.basename(path)}) was successfully imported."
+        job_user.send_message(user, message, 'File Import')
+      else
+        job_user.send_message(user, generic_file.errors.full_messages.join(', '), 'File Import Error')
       end
+    end
+  end
 
-      f.rewind
-      # attach downloaded file to generic file stubbed out
-      Sufia::GenericFile::Actions.create_content(generic_file, f, File.basename(uri.path), 'content', user)
-      Sufia.queue.push(ContentDepositEventJob.new(generic_file.pid, generic_file.depositor))
-      # add message to user for downloaded file
-      message = "The file (#{File.basename(uri.path)}) was successfully imported."
-      job_user.send_message(user, message, 'File Import')
+  def copy_remote_file(import_url, f)
+    f.binmode
+    # download file from url
+    uri = URI(generic_file.import_url)
+    http = Net::HTTP.new(uri.host, uri.port)
+    http.use_ssl = uri.scheme == "https"  # enable SSL/TLS
+    http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
+    http.start do
+      http.request_get(uri.request_uri) do |resp|
+        resp.read_body do |segment|
+          f.write(segment)
+        end
+      end
     end
-  rescue => error
-    job_user.send_message(user, error.message, 'File Import Error')
+
+    f.rewind
+    uri.path
   end
 
   def job_user

data/sufia-models/lib/tasks/sufia-models_tasks.rake

@@ -1,7 +1,7 @@
 namespace :solr do
 
   desc "Enqueue a job to resolrize the repository objects"
-  task :reindex => :environment do
+  task reindex: :environment do
     Sufia.queue.push(ResolrizeJob.new)
   end
 end

data/sufia-models/sufia-models.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'mailboxer', '~> 0.12.0.rc1'
   spec.add_dependency 'acts_as_follower', '>= 0.1.1', '< 0.3'
   spec.add_dependency 'carrierwave', '~> 0.9.0'
-  spec.add_dependency 'hydra-derivatives', '~> 0.0.5'
+  spec.add_dependency 'hydra-derivatives', '~> 0.1'
   spec.add_dependency 'oauth2', '~> 0.9.3'
   spec.add_dependency 'google-api-client', '~> 0.7.1'
   spec.add_dependency 'legato', '~> 0.3.0'

data/sufia.gemspec

@@ -2,8 +2,8 @@
 version = File.read(File.expand_path("../SUFIA_VERSION",__FILE__)).strip
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Justin Coyne"]
-  gem.email         = ["justin.coyne@yourmediashelf.com"]
+  gem.authors       = ["Justin Coyne", 'Michael J. Giarlo']
+  gem.email         = ["justin@curationexperts.com", 'leftwing@alumni.rutgers.edu']
   gem.description   = %q{Sufia is a Rails engine for creating a self-deposit institutional repository}
   gem.summary       = %q{Sufia was extracted from ScholarSphere developed by Penn State University}
   gem.homepage      = "http://github.com/projecthydra/sufia"
@@ -36,4 +36,9 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'rails_autolink', '~> 1.1.0'
   gem.add_dependency 'yaml_db', '0.2.3'
   gem.add_dependency 'font-awesome-sass-rails', '~> 3.0'
+  gem.add_dependency 'hydra-editor'
+  gem.add_dependency 'hydra-collections', '~> 2.0.2'
+  gem.add_dependency 'bootstrap_form', '~> 2.1.1'
+  gem.add_dependency 'blacklight-gallery'
+
 end

data/tasks/jetty.rake

@@ -8,8 +8,8 @@ namespace :jetty do
   desc "Copies the contents of solr_conf into the Solr development-core and test-core of Testing Server"
   task :config_solr do
     FileList['solr_conf/conf/*'].each do |f|  
-      cp("#{f}", 'jetty/solr/development-core/conf/', :verbose => true)
-      cp("#{f}", 'jetty/solr/test-core/conf/', :verbose => true)
+      cp("#{f}", 'jetty/solr/development-core/conf/', verbose: true)
+      cp("#{f}", 'jetty/solr/test-core/conf/', verbose: true)
     end
   end
 
@@ -25,14 +25,14 @@ namespace :jetty do
     fcfg = File.join(app_root,"fedora_conf","conf","development","fedora.fcfg")
     if File.exists?(fcfg)
       puts "copying over development/fedora.fcfg"
-      cp("#{fcfg}", 'jetty/fedora/default/server/config/', :verbose => true)
+      cp("#{fcfg}", 'jetty/fedora/default/server/config/', verbose: true)
     else
       puts "#{fcfg} file not found -- skipping fedora config"
     end
     fcfg = File.join(app_root,"fedora_conf","conf","test","fedora.fcfg")
     if File.exists?(fcfg)
       puts "copying over test/fedora.fcfg"
-      cp("#{fcfg}", 'jetty/fedora/test/server/config/', :verbose => true)
+      cp("#{fcfg}", 'jetty/fedora/test/server/config/', verbose: true)
     else
       puts "#{fcfg} file not found -- skipping fedora config"
     end

data/tasks/release.rake

@@ -41,14 +41,14 @@ directory 'pkg'
       sh cmd
     end
 
-    task :build => [:clean, gem]
-    task :install => :build do
+    task build: [:clean, gem]
+    task install: :build do
       sh "gem install #{gem}"
     end
 
-    task :prep_release => [:ensure_clean_state, :build]
+    task prep_release: [:ensure_clean_state, :build]
 
-    task :push => :build do
+    task push: :build do
       sh "gem push #{gem}"
     end
   end
@@ -56,9 +56,9 @@ end
 
 
 namespace :all do
-  task :build   => ['sufia-models:build', 'sufia:build']
-  task :install => ['sufia-models:install', 'sufia:install']
-  task :push    => ['sufia-models:push', 'sufia:push']
+  task build: ['sufia-models:build', 'sufia:build']
+  task install: ['sufia-models:install', 'sufia:install']
+  task push: ['sufia-models:push', 'sufia:push']
 
   task :ensure_clean_state do
     unless `git status -s | grep -v SUFIA_VERSION | grep -v History.md`.strip.empty?
@@ -88,6 +88,6 @@ namespace :all do
   end
 
   desc "Release both sufia and sufia-models and update the version to #{version} in all locations"
-  task :release => %w(ensure_clean_state build commit tag push)
+  task release: %w(ensure_clean_state build commit tag push)
 end
 

data/tasks/sufia-db.rake

@@ -1,21 +1,21 @@
 namespace :sufia do
   namespace :db do
     desc "delete all Generic Files in Fedora and Solr (This may take some time...)."
-    task :deleteAll => :environment do
+    task deleteAll: :environment do
       unless Rails.env.integration?
         puts "Warning: this task is only for the integration environment!"
         next
       end
-      GenericFile.find(:all, :rows => GenericFile.count).each(&:delete)
+      GenericFile.find(:all, rows: GenericFile.count).each(&:delete)
     end
 
     desc "delete 500 Generic Files from Fedora and Solr."
-    task :delete500 => :environment do
+    task delete500: :environment do
       unless Rails.env.integration?
         puts "Warning: this task is only for the integration environment!"
         next
       end
-      GenericFile.find(:all, :rows => 500).each(&:delete)
+      GenericFile.find(:all, rows: 500).each(&:delete)
     end
   end
 end

data/tasks/sufia-dev.rake

@@ -5,7 +5,7 @@ require 'jettywrapper'
 #ENV["RAILS_ROOT"] ||= 'spec/internal'
 
 desc 'Spin up hydra-jetty and run specs'
-task :ci => ['jetty:config'] do
+task ci: ['jetty:config'] do
   puts 'running continuous integration'
   jetty_params = Jettywrapper.load_config
   error = Jettywrapper.wrap(jetty_params) do
@@ -14,7 +14,7 @@ task :ci => ['jetty:config'] do
   raise "test failures: #{error}" if error
 end
 
-task :spec => :generate do
+task spec: :generate do
   Bundler.with_clean_env do
     within_test_app do
       Rake::Task['rspec'].invoke
@@ -22,7 +22,6 @@ task :spec => :generate do
   end
 end
 
-
 desc "Run specs"
 RSpec::Core::RakeTask.new(:rspec) do |t|
   t.pattern = '../**/*_spec.rb'
@@ -33,7 +32,6 @@ RSpec::Core::RakeTask.new(:rspec) do |t|
   end
 end
 
-
 desc "Create the test rails app"
 task :generate do
   unless File.exists?('spec/internal/Rakefile')
@@ -41,9 +39,11 @@ task :generate do
     `rails new spec/internal`
     puts "Updating gemfile"
 
-    `echo "gem 'sufia', :path=>'../../../sufia'
+    `echo "gem 'sufia', path: '../../../sufia'
 gem 'capybara'
+gem 'database_cleaner'
 gem 'factory_girl_rails'
+gem 'poltergeist'
 gem 'kaminari', github: 'harai/kaminari', branch: 'route_prefix_prototype'" >> spec/internal/Gemfile`
     puts "Copying generator"
     `cp -r spec/support/lib/generators spec/internal/lib`
@@ -66,6 +66,12 @@ end
 
 desc "Clean out the test rails app"
 task :clean do
+  if File.directory?('spec/internal')
+    within_test_app do
+      puts "Stopping Spring"
+      `spring stop`
+    end
+  end
   puts "Removing sample rails app"
   `rm -rf spec/internal`
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: sufia
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta2
+  version: 4.0.0.beta3
 platform: ruby
 authors:
 - Justin Coyne
+- Michael J. Giarlo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-05 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sufia-models
@@ -16,116 +17,116 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta2
+        version: 4.0.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta2
+        version: 4.0.0.beta3
 - !ruby/object:Gem::Dependency
   name: blacklight_advanced_search
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: tinymce-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.19
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.19
 - !ruby/object:Gem::Dependency
   name: tinymce-rails-imageupload
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.16.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.16.beta
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hydra-batch-edit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.1
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.1
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: browse-everything
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.0
 - !ruby/object:Gem::Dependency
@@ -146,28 +147,28 @@ dependencies:
   name: mail_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rails_autolink
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
@@ -188,28 +189,85 @@ dependencies:
   name: font-awesome-sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: hydra-editor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: hydra-collections
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+- !ruby/object:Gem::Dependency
+  name: bootstrap_form
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.1
+- !ruby/object:Gem::Dependency
+  name: blacklight-gallery
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Sufia is a Rails engine for creating a self-deposit institutional repository
 email:
-- justin.coyne@yourmediashelf.com
+- justin@curationexperts.com
+- leftwing@alumni.rutgers.edu
 executables:
 - audit_repository
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .gitmodules
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".gitmodules"
+- ".rspec"
+- ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
 - History.md
@@ -231,6 +289,7 @@ files:
 - app/assets/images/blacklight/start_over.gif
 - app/assets/images/default.png
 - app/assets/images/favicon.ico
+- app/assets/images/folder.png
 - app/assets/images/glyphicons-halflings-white.png
 - app/assets/images/glyphicons-halflings.png
 - app/assets/images/hydra/powered_by_hydra.png
@@ -282,15 +341,19 @@ files:
 - app/assets/javascripts/jquery.tagcloud.js
 - app/assets/javascripts/jquery.tinysort.min.js
 - app/assets/javascripts/sufia.js
+- app/assets/javascripts/sufia/app.js
 - app/assets/javascripts/sufia/audio.js
 - app/assets/javascripts/sufia/batch_edit.js
 - app/assets/javascripts/sufia/batch_select_all.js
+- app/assets/javascripts/sufia/dashboard_actions.js
 - app/assets/javascripts/sufia/edit_metadata.js
 - app/assets/javascripts/sufia/editor.js
 - app/assets/javascripts/sufia/featured_works.js
 - app/assets/javascripts/sufia/fileupload.js
+- app/assets/javascripts/sufia/ga_events.js
 - app/assets/javascripts/sufia/multiForm.js
 - app/assets/javascripts/sufia/permissions.js
+- app/assets/javascripts/sufia/search.js
 - app/assets/javascripts/sufia/single_use_link.js
 - app/assets/javascripts/sufia/trophy.js
 - app/assets/javascripts/sufia/uploader.js
@@ -315,12 +378,26 @@ files:
 - app/controllers/authorities_controller.rb
 - app/controllers/batch_controller.rb
 - app/controllers/batch_edits_controller.rb
+- app/controllers/collections_controller.rb
+- app/controllers/concerns/sufia/batch_edits_controller_behavior.rb
 - app/controllers/concerns/sufia/catalog.rb
 - app/controllers/concerns/sufia/contact_form_controller_behavior.rb
+- app/controllers/concerns/sufia/controller.rb
 - app/controllers/concerns/sufia/dashboard_controller_behavior.rb
+- app/controllers/concerns/sufia/downloads_controller_behavior.rb
+- app/controllers/concerns/sufia/files_controller/browse_everything.rb
+- app/controllers/concerns/sufia/files_controller/local_ingest_behavior.rb
+- app/controllers/concerns/sufia/files_controller/upload_complete_behavior.rb
+- app/controllers/concerns/sufia/files_controller_behavior.rb
+- app/controllers/concerns/sufia/homepage_controller.rb
 - app/controllers/concerns/sufia/users_controller_behavior.rb
 - app/controllers/contact_form_controller.rb
 - app/controllers/content_blocks_controller.rb
+- app/controllers/dashboard/collections_controller.rb
+- app/controllers/dashboard/files_controller.rb
+- app/controllers/dashboard/highlights_controller.rb
+- app/controllers/dashboard/lists_controller.rb
+- app/controllers/dashboard/shares_controller.rb
 - app/controllers/dashboard_controller.rb
 - app/controllers/directory_controller.rb
 - app/controllers/downloads_controller.rb
@@ -328,6 +405,7 @@ files:
 - app/controllers/featured_work_lists_controller.rb
 - app/controllers/featured_works_controller.rb
 - app/controllers/generic_files_controller.rb
+- app/controllers/homepage_controller.rb
 - app/controllers/mailbox_controller.rb
 - app/controllers/pages_controller.rb
 - app/controllers/single_use_links_controller.rb
@@ -339,7 +417,10 @@ files:
 - app/helpers/contact_form_helper.rb
 - app/helpers/content_block_helper.rb
 - app/helpers/generic_file_helper.rb
-- app/helpers/sufia_helper.rb
+- app/helpers/records_helper.rb
+- app/helpers/sufia/blacklight_override.rb
+- app/helpers/sufia/records_helper_behavior.rb
+- app/helpers/sufia/sufia_helper_behavior.rb
 - app/helpers/trophy_helper.rb
 - app/jobs/content_delete_event_job.rb
 - app/jobs/content_deposit_event_job.rb
@@ -351,6 +432,7 @@ files:
 - app/jobs/user_edit_profile_event_job.rb
 - app/jobs/user_follow_event_job.rb
 - app/jobs/user_unfollow_event_job.rb
+- app/models/concerns/sufia/solr_document_behavior.rb
 - app/models/contact_form.rb
 - app/models/content_block.rb
 - app/models/featured_work_list.rb
@@ -380,7 +462,6 @@ files:
 - app/views/batch_edits/edit.html.erb
 - app/views/batch_edits/update_edit.js.erb
 - app/views/catalog/_bookmark_control.html.erb
-- app/views/catalog/_bookmark_form.html.erb
 - app/views/catalog/_citation.html.erb
 - app/views/catalog/_constraints.html.erb
 - app/views/catalog/_constraints_element.html.erb
@@ -395,19 +476,14 @@ files:
 - app/views/catalog/_facet_limit.html.erb
 - app/views/catalog/_facet_selected.html.erb
 - app/views/catalog/_facets.html.erb
-- app/views/catalog/_featured_researcher.html.erb
 - app/views/catalog/_folder_control.html.erb
-- app/views/catalog/_home.html.erb
-- app/views/catalog/_home_content.html.erb
-- app/views/catalog/_home_header.html.erb
 - app/views/catalog/_index_default.html.erb
+- app/views/catalog/_index_header_default.html.erb
 - app/views/catalog/_index_partials/_default_group.html.erb
 - app/views/catalog/_index_partials/_list_files.html.erb
 - app/views/catalog/_marc_view.html.erb
 - app/views/catalog/_opensearch_response_metadata.html.erb
 - app/views/catalog/_previous_next_doc.html.erb
-- app/views/catalog/_recent_document.html.erb
-- app/views/catalog/_recents.html.erb
 - app/views/catalog/_refworks_form.html.erb
 - app/views/catalog/_results_pagination.html.erb
 - app/views/catalog/_search_form.html.erb
@@ -419,7 +495,6 @@ files:
 - app/views/catalog/_show_tools.html.erb
 - app/views/catalog/_sms_form.html.erb
 - app/views/catalog/_sort_and_per_page.html.erb
-- app/views/catalog/_tagcloud.html.erb
 - app/views/catalog/about.html.erb
 - app/views/catalog/citation.html.erb
 - app/views/catalog/email.erb
@@ -436,10 +511,32 @@ files:
 - app/views/catalog/show.html.erb
 - app/views/catalog/show.refworks.erb
 - app/views/catalog/sms.erb
+- app/views/collections/_action_menu.html.erb
+- app/views/collections/_batch_edits_actions.html.erb
+- app/views/collections/_button_for_creating_empty_collection.html.erb
+- app/views/collections/_dashboard_document_list.html.erb
+- app/views/collections/_document_list.html.erb
+- app/views/collections/_edit_actions.html.erb
+- app/views/collections/_edit_descriptions.html.erb
+- app/views/collections/_form.html.erb
+- app/views/collections/_form_for_select_collection.html.erb
+- app/views/collections/_media_display.html.erb
+- app/views/collections/_paginate.html.erb
+- app/views/collections/_search_collection_dashboard_form.html.erb
+- app/views/collections/_show_actions.html.erb
+- app/views/collections/_show_descriptions.html.erb
+- app/views/collections/_show_fields.html.erb
+- app/views/collections/_single_item_action_fields.html.erb
+- app/views/collections/_sort_and_per_page.html.erb
+- app/views/collections/_view_type_group.html.erb
+- app/views/collections/edit.html.erb
+- app/views/collections/show.html.erb
 - app/views/contact_form/_directions.html.erb
 - app/views/contact_form/create.html.erb
 - app/views/contact_form/new.html.erb
+- app/views/dashboard/_action_menu.html.erb
 - app/views/dashboard/_batch_edits_actions.html.erb
+- app/views/dashboard/_collection_action_menu.html.erb
 - app/views/dashboard/_constraints.html.erb
 - app/views/dashboard/_did_you_mean.html.erb
 - app/views/dashboard/_document_list.html.erb
@@ -450,8 +547,8 @@ files:
 - app/views/dashboard/_facets.html.erb
 - app/views/dashboard/_heading.html.erb
 - app/views/dashboard/_index_partials/_default_group.html.erb
+- app/views/dashboard/_index_partials/_list_collections.html.erb
 - app/views/dashboard/_index_partials/_list_files.html.erb
-- app/views/dashboard/_index_partials/_thumbnail_display.html.erb
 - app/views/dashboard/_results_pagination.html.erb
 - app/views/dashboard/_search_form.html.erb
 - app/views/dashboard/_show_partials/_default.html.erb
@@ -460,6 +557,7 @@ files:
 - app/views/dashboard/_sort_and_per_page.html.erb
 - app/views/dashboard/facet.html.erb
 - app/views/dashboard/index.html.erb
+- app/views/dashboard/lists/index.html.erb
 - app/views/error/401.html.erb
 - app/views/error/404.html.erb
 - app/views/error/500.html.erb
@@ -474,6 +572,7 @@ files:
 - app/views/generic_files/_extra_fields_modal.html.erb
 - app/views/generic_files/_field_display.html.erb
 - app/views/generic_files/_field_form.html.erb
+- app/views/generic_files/_flot_stats.js.erb
 - app/views/generic_files/_groups_description.html.erb
 - app/views/generic_files/_local_file_import.html.erb
 - app/views/generic_files/_media_display.html.erb
@@ -505,8 +604,17 @@ files:
 - app/views/generic_files/upload/_tos_checkbox.html.erb
 - app/views/homepage/_featured.html.erb
 - app/views/homepage/_featured_fields.html.erb
+- app/views/homepage/_featured_researcher.html.erb
 - app/views/homepage/_featured_works.html.erb
+- app/views/homepage/_home.html.erb
+- app/views/homepage/_home_content.html.erb
+- app/views/homepage/_home_header.html.erb
+- app/views/homepage/_marketing.html.erb
+- app/views/homepage/_recent_document.html.erb
+- app/views/homepage/_recents.html.erb
 - app/views/homepage/_sortable_featured.html.erb
+- app/views/homepage/_tagcloud.html.erb
+- app/views/homepage/index.html.erb
 - app/views/kaminari/blacklight/_first_page.html.erb
 - app/views/kaminari/blacklight/_gap.html.erb
 - app/views/kaminari/blacklight/_last_page.html.erb
@@ -515,7 +623,6 @@ files:
 - app/views/kaminari/blacklight/_paginator.html.erb
 - app/views/kaminari/blacklight/_prev_page.html.erb
 - app/views/layouts/_head_tag_content.html.erb
-- app/views/layouts/_homepage_sidebar2.html.erb
 - app/views/layouts/error.html.erb
 - app/views/layouts/homepage.html.erb
 - app/views/layouts/sufia-dashboard.html.erb
@@ -523,6 +630,12 @@ files:
 - app/views/layouts/sufia-two-column.html.erb
 - app/views/mailbox/index.html.erb
 - app/views/pages/show.html.erb
+- app/views/records/_edit_field.html.erb
+- app/views/records/edit_fields/_description.html.erb
+- app/views/records/edit_fields/_resource_type.html.erb
+- app/views/records/edit_fields/_rights.html.erb
+- app/views/records/edit_fields/_suffix.html.erb
+- app/views/records/edit_fields/_type.html.erb
 - app/views/single_use_links/new_download.html.erb
 - app/views/single_use_links/new_show.html.erb
 - app/views/single_use_links_viewer/show.html.erb
@@ -565,13 +678,8 @@ files:
 - lib/generators/sufia/templates/catalog_controller.rb
 - lib/generators/sufia/templates/config/action_dispatch_http_upload_monkey_patch.rb
 - lib/generators/sufia/templates/config/tinymce.yml
+- lib/generators/sufia/templates/sufia_helper.rb
 - lib/sufia.rb
-- lib/sufia/batch_edits_controller_behavior.rb
-- lib/sufia/controller.rb
-- lib/sufia/downloads_controller_behavior.rb
-- lib/sufia/files_controller/local_ingest_behavior.rb
-- lib/sufia/files_controller/upload_complete_behavior.rb
-- lib/sufia/files_controller_behavior.rb
 - lib/sufia/role_mapper.rb
 - lib/sufia/single_use_error.rb
 - lib/sufia/version.rb
@@ -582,16 +690,23 @@ files:
 - solr_conf/solr.xml
 - spec/.gitignore
 - spec/active_fedora/unsaved_digital_object_spec.rb
+- spec/actors/generic_file/actor_spec.rb
 - spec/controllers/authorities_controller_spec.rb
 - spec/controllers/batch_controller_spec.rb
 - spec/controllers/batch_edits_controller_spec.rb
 - spec/controllers/catalog_controller_spec.rb
+- spec/controllers/collections_controller_spec.rb
 - spec/controllers/content_blocks_controller_spec.rb
+- spec/controllers/dashboard/collections_controller_spec.rb
+- spec/controllers/dashboard/files_controller_spec.rb
+- spec/controllers/dashboard/highlights_controller_spec.rb
+- spec/controllers/dashboard/shares_controller_spec.rb
 - spec/controllers/dashboard_controller_spec.rb
 - spec/controllers/downloads_controller_spec.rb
 - spec/controllers/featured_work_lists_controller_spec.rb
 - spec/controllers/featured_works_controller_spec.rb
 - spec/controllers/generic_files_controller_spec.rb
+- spec/controllers/homepage_controller_spec.rb
 - spec/controllers/mailbox_controller_spec.rb
 - spec/controllers/pages_controller_spec.rb
 - spec/controllers/single_use_links_controller_spec.rb
@@ -608,14 +723,17 @@ files:
 - spec/features/browse_dashboard_files_spec.rb
 - spec/features/browse_files_spec.rb
 - spec/features/cloud_upload_spec.rb
+- spec/features/collection_spec.rb
 - spec/features/contact_form_spec.rb
 - spec/features/display_dashboard_spec.rb
 - spec/features/ingest_upload_files_spec.rb
 - spec/features/notifications_spec.rb
+- spec/features/search_spec.rb
 - spec/features/single_use_links_spec.rb
 - spec/features/users_spec.rb
 - spec/fixtures/4-20.png
 - spec/fixtures/Example.ogg
+- spec/fixtures/charter.docx
 - spec/fixtures/cities15000.tsv
 - spec/fixtures/countdown.avi
 - spec/fixtures/docx_fits.xml
@@ -642,39 +760,41 @@ files:
 - spec/fixtures/xls_fits.xml
 - spec/fixtures/xml_fits.xml
 - spec/helpers/content_block_helper_spec.rb
-- spec/helpers/generic_file_helper_spec.rb
+- spec/helpers/records_helper_spec.rb
 - spec/helpers/sufia_helper_spec.rb
 - spec/helpers/trophy_helper_spec.rb
+- spec/jobs/active_fedora_pid_based_job_spec.rb
+- spec/jobs/audit_job_spec.rb
+- spec/jobs/batch_update_job_spec.rb
+- spec/jobs/characterize_job_spec.rb
+- spec/jobs/create_derivatives_job_spec.rb
+- spec/jobs/event_jobs_spec.rb
 - spec/jobs/import_url_job_spec.rb
 - spec/jobs/ingest_local_file_job_spec.rb
+- spec/lib/sufia/analytics_spec.rb
 - spec/lib/sufia/id_service_spec.rb
 - spec/lib/sufia/upload_complete_behavior_spec.rb
-- spec/lib/sufia/usage_statistics_spec.rb
 - spec/models/ability_spec.rb
-- spec/models/active_fedora_pid_based_job_spec.rb
-- spec/models/audit_job_spec.rb
 - spec/models/batch_spec.rb
-- spec/models/batch_update_job_spec.rb
-- spec/models/characterize_job_spec.rb
 - spec/models/checksum_audit_log_spec.rb
-- spec/models/event_jobs_spec.rb
+- spec/models/collection_spec.rb
+- spec/models/download_spec.rb
 - spec/models/featured_work_list_spec.rb
 - spec/models/featured_work_spec.rb
 - spec/models/file_content_datastream_spec.rb
+- spec/models/file_usage_spec.rb
 - spec/models/fits_datastream_spec.rb
-- spec/models/generic_file/actions_spec.rb
 - spec/models/generic_file/reload_on_save_spec.rb
 - spec/models/generic_file/visibility_spec.rb
 - spec/models/generic_file/web_form_spec.rb
+- spec/models/generic_file_rdf_datastream_spec.rb
 - spec/models/generic_file_spec.rb
 - spec/models/geo_names_resource_spec.rb
 - spec/models/local_authority_spec.rb
-- spec/models/pageview.rb
+- spec/models/pageview_spec.rb
 - spec/models/properties_datastream_spec.rb
 - spec/models/single_use_link_spec.rb
 - spec/models/solr_document_spec.rb
-- spec/models/transcode_audio_job_spec.rb
-- spec/models/transcode_video_job_spec.rb
 - spec/models/trophy_spec.rb
 - spec/models/user_spec.rb
 - spec/routing/featured_works_route_spec.rb
@@ -688,7 +808,6 @@ files:
 - spec/support/uploaded_file_monkeypatch.rb
 - spec/views/batch_edits/check_all_spec.rb
 - spec/views/dashboard/facet_limit.html.erb_spec.rb
-- spec/views/dashboard/index_partials/_thumbnail_display.html.erb_spec.rb
 - spec/views/generic_file/edit.html.erb_spec.rb
 - spec/views/generic_file/show.html.erb_spec.rb
 - spec/views/generic_file/stats.html.erb_spec.rb
@@ -702,8 +821,25 @@ files:
 - sufia-models/LICENSE.md
 - sufia-models/README.md
 - sufia-models/Rakefile
+- sufia-models/app/actors/sufia/generic_file/actor.rb
 - sufia-models/app/models/batch.rb
 - sufia-models/app/models/checksum_audit_log.rb
+- sufia-models/app/models/collection.rb
+- sufia-models/app/models/concerns/sufia/generic_file.rb
+- sufia-models/app/models/concerns/sufia/generic_file/accessible_attributes.rb
+- sufia-models/app/models/concerns/sufia/generic_file/audit.rb
+- sufia-models/app/models/concerns/sufia/generic_file/characterization.rb
+- sufia-models/app/models/concerns/sufia/generic_file/derivatives.rb
+- sufia-models/app/models/concerns/sufia/generic_file/export.rb
+- sufia-models/app/models/concerns/sufia/generic_file/featured.rb
+- sufia-models/app/models/concerns/sufia/generic_file/metadata.rb
+- sufia-models/app/models/concerns/sufia/generic_file/mime_types.rb
+- sufia-models/app/models/concerns/sufia/generic_file/permissions.rb
+- sufia-models/app/models/concerns/sufia/generic_file/reload_on_save.rb
+- sufia-models/app/models/concerns/sufia/generic_file/trophies.rb
+- sufia-models/app/models/concerns/sufia/generic_file/versions.rb
+- sufia-models/app/models/concerns/sufia/generic_file/virus_check.rb
+- sufia-models/app/models/concerns/sufia/generic_file/web_form.rb
 - sufia-models/app/models/concerns/sufia/properties_datastream_behavior.rb
 - sufia-models/app/models/concerns/sufia/user.rb
 - sufia-models/app/models/datastreams/batch_rdf_datastream.rb
@@ -714,6 +850,7 @@ files:
 - sufia-models/app/models/datastreams/properties_datastream.rb
 - sufia-models/app/models/domain_term.rb
 - sufia-models/app/models/featured_work.rb
+- sufia-models/app/models/file_usage.rb
 - sufia-models/app/models/follow.rb
 - sufia-models/app/models/generic_file.rb
 - sufia-models/app/models/geo_names_resource.rb
@@ -724,12 +861,13 @@ files:
 - sufia-models/app/models/subject_local_authority_entry.rb
 - sufia-models/app/models/sufia/avatar_uploader.rb
 - sufia-models/app/models/sufia/avatar_validator.rb
+- sufia-models/app/models/sufia/download.rb
 - sufia-models/app/models/sufia/pageview.rb
 - sufia-models/app/models/trophy.rb
 - sufia-models/app/models/version_committer.rb
+- sufia-models/app/services/sufia/analytics.rb
 - sufia-models/app/services/sufia/id_service.rb
 - sufia-models/app/services/sufia/noid.rb
-- sufia-models/app/services/sufia/usage_statistics.rb
 - sufia-models/config/locales/sufia.en.yml
 - sufia-models/lib/generators/sufia/models/install_generator.rb
 - sufia-models/lib/generators/sufia/models/templates/config/analytics.yml
@@ -764,34 +902,15 @@ files:
 - sufia-models/lib/sufia/models/engine.rb
 - sufia-models/lib/sufia/models/file_content.rb
 - sufia-models/lib/sufia/models/file_content/versions.rb
-- sufia-models/lib/sufia/models/generic_file.rb
-- sufia-models/lib/sufia/models/generic_file/accessible_attributes.rb
-- sufia-models/lib/sufia/models/generic_file/actions.rb
-- sufia-models/lib/sufia/models/generic_file/audit.rb
-- sufia-models/lib/sufia/models/generic_file/characterization.rb
-- sufia-models/lib/sufia/models/generic_file/derivatives.rb
-- sufia-models/lib/sufia/models/generic_file/export.rb
-- sufia-models/lib/sufia/models/generic_file/featured.rb
-- sufia-models/lib/sufia/models/generic_file/metadata.rb
-- sufia-models/lib/sufia/models/generic_file/mime_types.rb
-- sufia-models/lib/sufia/models/generic_file/permissions.rb
-- sufia-models/lib/sufia/models/generic_file/reload_on_save.rb
-- sufia-models/lib/sufia/models/generic_file/thumbnail.rb
-- sufia-models/lib/sufia/models/generic_file/trophies.rb
-- sufia-models/lib/sufia/models/generic_file/versions.rb
-- sufia-models/lib/sufia/models/generic_file/virus_check.rb
-- sufia-models/lib/sufia/models/generic_file/web_form.rb
 - sufia-models/lib/sufia/models/jobs/active_fedora_pid_based_job.rb
 - sufia-models/lib/sufia/models/jobs/audit_job.rb
 - sufia-models/lib/sufia/models/jobs/batch_update_job.rb
 - sufia-models/lib/sufia/models/jobs/characterize_job.rb
+- sufia-models/lib/sufia/models/jobs/create_derivatives_job.rb
 - sufia-models/lib/sufia/models/jobs/import_url_job.rb
 - sufia-models/lib/sufia/models/jobs/resolrize_job.rb
-- sufia-models/lib/sufia/models/jobs/transcode_audio_job.rb
-- sufia-models/lib/sufia/models/jobs/transcode_video_job.rb
 - sufia-models/lib/sufia/models/model_methods.rb
 - sufia-models/lib/sufia/models/resque.rb
-- sufia-models/lib/sufia/models/solr_document_behavior.rb
 - sufia-models/lib/sufia/models/user_local_directory_behavior.rb
 - sufia-models/lib/sufia/models/utils.rb
 - sufia-models/lib/sufia/models/version.rb
@@ -852,12 +971,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
@@ -869,16 +988,23 @@ summary: Sufia was extracted from ScholarSphere developed by Penn State Universi
 test_files:
 - spec/.gitignore
 - spec/active_fedora/unsaved_digital_object_spec.rb
+- spec/actors/generic_file/actor_spec.rb
 - spec/controllers/authorities_controller_spec.rb
 - spec/controllers/batch_controller_spec.rb
 - spec/controllers/batch_edits_controller_spec.rb
 - spec/controllers/catalog_controller_spec.rb
+- spec/controllers/collections_controller_spec.rb
 - spec/controllers/content_blocks_controller_spec.rb
+- spec/controllers/dashboard/collections_controller_spec.rb
+- spec/controllers/dashboard/files_controller_spec.rb
+- spec/controllers/dashboard/highlights_controller_spec.rb
+- spec/controllers/dashboard/shares_controller_spec.rb
 - spec/controllers/dashboard_controller_spec.rb
 - spec/controllers/downloads_controller_spec.rb
 - spec/controllers/featured_work_lists_controller_spec.rb
 - spec/controllers/featured_works_controller_spec.rb
 - spec/controllers/generic_files_controller_spec.rb
+- spec/controllers/homepage_controller_spec.rb
 - spec/controllers/mailbox_controller_spec.rb
 - spec/controllers/pages_controller_spec.rb
 - spec/controllers/single_use_links_controller_spec.rb
@@ -895,14 +1021,17 @@ test_files:
 - spec/features/browse_dashboard_files_spec.rb
 - spec/features/browse_files_spec.rb
 - spec/features/cloud_upload_spec.rb
+- spec/features/collection_spec.rb
 - spec/features/contact_form_spec.rb
 - spec/features/display_dashboard_spec.rb
 - spec/features/ingest_upload_files_spec.rb
 - spec/features/notifications_spec.rb
+- spec/features/search_spec.rb
 - spec/features/single_use_links_spec.rb
 - spec/features/users_spec.rb
 - spec/fixtures/4-20.png
 - spec/fixtures/Example.ogg
+- spec/fixtures/charter.docx
 - spec/fixtures/cities15000.tsv
 - spec/fixtures/countdown.avi
 - spec/fixtures/docx_fits.xml
@@ -929,39 +1058,41 @@ test_files:
 - spec/fixtures/xls_fits.xml
 - spec/fixtures/xml_fits.xml
 - spec/helpers/content_block_helper_spec.rb
-- spec/helpers/generic_file_helper_spec.rb
+- spec/helpers/records_helper_spec.rb
 - spec/helpers/sufia_helper_spec.rb
 - spec/helpers/trophy_helper_spec.rb
+- spec/jobs/active_fedora_pid_based_job_spec.rb
+- spec/jobs/audit_job_spec.rb
+- spec/jobs/batch_update_job_spec.rb
+- spec/jobs/characterize_job_spec.rb
+- spec/jobs/create_derivatives_job_spec.rb
+- spec/jobs/event_jobs_spec.rb
 - spec/jobs/import_url_job_spec.rb
 - spec/jobs/ingest_local_file_job_spec.rb
+- spec/lib/sufia/analytics_spec.rb
 - spec/lib/sufia/id_service_spec.rb
 - spec/lib/sufia/upload_complete_behavior_spec.rb
-- spec/lib/sufia/usage_statistics_spec.rb
 - spec/models/ability_spec.rb
-- spec/models/active_fedora_pid_based_job_spec.rb
-- spec/models/audit_job_spec.rb
 - spec/models/batch_spec.rb
-- spec/models/batch_update_job_spec.rb
-- spec/models/characterize_job_spec.rb
 - spec/models/checksum_audit_log_spec.rb
-- spec/models/event_jobs_spec.rb
+- spec/models/collection_spec.rb
+- spec/models/download_spec.rb
 - spec/models/featured_work_list_spec.rb
 - spec/models/featured_work_spec.rb
 - spec/models/file_content_datastream_spec.rb
+- spec/models/file_usage_spec.rb
 - spec/models/fits_datastream_spec.rb
-- spec/models/generic_file/actions_spec.rb
 - spec/models/generic_file/reload_on_save_spec.rb
 - spec/models/generic_file/visibility_spec.rb
 - spec/models/generic_file/web_form_spec.rb
+- spec/models/generic_file_rdf_datastream_spec.rb
 - spec/models/generic_file_spec.rb
 - spec/models/geo_names_resource_spec.rb
 - spec/models/local_authority_spec.rb
-- spec/models/pageview.rb
+- spec/models/pageview_spec.rb
 - spec/models/properties_datastream_spec.rb
 - spec/models/single_use_link_spec.rb
 - spec/models/solr_document_spec.rb
-- spec/models/transcode_audio_job_spec.rb
-- spec/models/transcode_video_job_spec.rb
 - spec/models/trophy_spec.rb
 - spec/models/user_spec.rb
 - spec/routing/featured_works_route_spec.rb
@@ -975,7 +1106,6 @@ test_files:
 - spec/support/uploaded_file_monkeypatch.rb
 - spec/views/batch_edits/check_all_spec.rb
 - spec/views/dashboard/facet_limit.html.erb_spec.rb
-- spec/views/dashboard/index_partials/_thumbnail_display.html.erb_spec.rb
 - spec/views/generic_file/edit.html.erb_spec.rb
 - spec/views/generic_file/show.html.erb_spec.rb
 - spec/views/generic_file/stats.html.erb_spec.rb
@@ -984,3 +1114,4 @@ test_files:
 - spec/views/users/_notify_number.html.erb_spec.rb
 - spec/views/users/index.html.erb_spec.rb
 - spec/views/users/show.html.erb_spec.rb
+has_rdoc: