sufia 0.0.1.pre2 → 0.0.1

data/spec/support/lib/generators/test_app_generator.rb

@@ -15,16 +15,6 @@ class TestAppGenerator < Rails::Generators::Base
     generate 'hydra:head', '-f'
   end
 
-  def run_hydra_head_generator
-    say_status("warning", "GENERATING HH", :yellow)       
-
-    generate 'hydra:head', '-f'
-  end
-
-  def install_redis_config
-    copy_file "config/redis.yml"
-  end
-
   def run_sufia_generator
     say_status("warning", "GENERATING SUFIA", :yellow)       
 
@@ -36,5 +26,5 @@ class TestAppGenerator < Rails::Generators::Base
   def remove_index_page
     remove_file 'public/index.html'
   end
-
+  
 end

data/sufia.gemspec

@@ -16,15 +16,17 @@ Gem::Specification.new do |gem|
   gem.version       = Sufia::VERSION
 
   gem.add_dependency 'rails', '~> 3.2.8'
-  gem.add_dependency 'blacklight'#, '~> 4.0.0.pre4'
+  gem.add_dependency 'blacklight', '~> 4.0.0'
   gem.add_dependency 'blacklight_advanced_search'
-  gem.add_dependency 'hydra-head', '5.0.0.pre11'
+  gem.add_dependency "hydra-head", "~> 5.0.0"
+  gem.add_dependency "active-fedora", "~> 5.0.0"
+
   #TODO remove
   gem.add_dependency 'noid', '0.5.5'
   gem.add_dependency 'hydra-batch-edit', '~> 0.0.7'
 
 # Other components
-  gem.add_dependency 'resque', '1.22.0'#, :require => 'resque/server'
+  gem.add_dependency 'resque', '1.23.0'#, :require => 'resque/server'
   gem.add_dependency 'resque-pool', '0.3.0'
 # NOTE: the :require arg is necessary on Linux-based hosts
   gem.add_dependency 'rmagick', '2.13.1'#, :require => 'RMagick'

data/tasks/{scholarsphere-db.rake → sufia-db.rake}

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-namespace :scholarsphere do
+namespace :sufia do
   namespace :db do
     desc "delete all Generic Files in Fedora and Solr (This may take some time...)."
     task :deleteAll => :environment do

data/tasks/{scholarsphere-dev.rake → sufia-dev.rake}

@@ -14,12 +14,12 @@ RSpec::Core::RakeTask.new(:spec => [:generate]) do |t|
 end
 
 desc "Load scholarsphere fixtures"
-task :fixtures do# => ['scholarsphere:fixtures:refresh'] do
+task :fixtures => :generate do# => ['sufia:fixtures:refresh'] do
   #NOTE do we need fixtures:create, fixtures:generate
   within_test_app do
     puts "Loading fixtures "
     ENV["RAILS_ENV"] = 'test'
-    puts `rake scholarsphere:fixtures:refresh`
+    puts `rake sufia:fixtures:refresh`
   end
 end
 
@@ -60,4 +60,8 @@ def within_test_app
   FileUtils.cd('../..')
 end
   
-
+namespace :meme do
+  desc "configure jetty to generate checksums"
+  task :config do
+  end
+end

data/tasks/{scholarsphere-fixtures.rake → sufia-fixtures.rake}

@@ -12,83 +12,83 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# scholarsphere-fixtures
+# sufia-fixtures
 #
 # This was extracted from the original Hydra version in 
-#                      ~/rvm/gems/<rails version>@scholarsphere/bundler/gems/lib/railties
+#                      ~/rvm/gems/<rails version>@sufia/bundler/gems/lib/railties
 # It has been changed to read all files out of a directory and pass those as fixtures.
 # Any _ in the file name will be modified to a : for the id, since colons are not valid in a file name. 
-# The files should be named id_[fixture id] which should relates to the id within the foxml scholarsphere:[fixture id] where 
+# The files should be named id_[fixture id] which should relates to the id within the foxml sufia:[fixture id] where 
 # [fixture id] is some alpha numeric id ('test1')
 #
-# There are 2 sets of data needed to attach to a ScholarSphere fixture, 1 the data file, and 2 the metadata.
+# There are 2 sets of data needed to attach to a sufia fixture, 1 the data file, and 2 the metadata.
 # It is important that the meta-data contains the appropriate id, or solor will not index it!
 #
-# Usage: rake scholarsphere:fixtures:create [DIR=<fixture dir>] [FIXTURE_ID=<fixture id>] [FIXTURE_TITLE=<fixture title>] [FIXTURE_USER=<fixture user>]
+# Usage: rake sufia:fixtures:create [DIR=<fixture dir>] [FIXTURE_ID=<fixture id>] [FIXTURE_TITLE=<fixture title>] [FIXTURE_USER=<fixture user>]
 #              <fixture dir> is an optional directory under spec/fixtures to find the fixtures to load
-#                      DEFAULT: scholarsphere
+#                      DEFAULT: sufia
 #              <fixture id> is the id given to this fixture with fedora and solr.   
 #                            This must be unique and any old files will be overwritten. 
-#                      DEFAULT: scholarsphere1
+#                      DEFAULT: sufia1
 #              <fixture title> is the title given to the fixture in fedora and solor, 
 #                            along with being put in the description and subject by default.
-#                      DEFAULT: scholarsphere test
+#                      DEFAULT: sufia test
 #              <fixture user> is the user given to the fixture in fedora and solor, 
 #                            along with being put in the contributor and rights.
 #                      DEFAULT: archivist1
 #           
 #          
-#               Creates new fixture files including the erb, descMeta, and text for loading into ScholarSphere.  
-#               The Files are named based on the scholarsphere: id_<fixture id>.foxml.erb, id_<fixture id>.descMeta.txt, and id_<fixture id>.txt
+#               Creates new fixture files including the erb, descMeta, and text for loading into sufia.  
+#               The Files are named based on the sufia: id_<fixture id>.foxml.erb, id_<fixture id>.descMeta.txt, and id_<fixture id>.txt
 #               The foxml.erb file references the descMeta.txt and .txt file.  You can edit the erb to point to other data and/or edit the 
 #               .descMeta.txt  and/or .txt file to contain the data you wish.  
 #
 #            *** Please note that the id must be changed in the file name, foxml.erb, and descMeta.txt if you change it after creation. ***
 #
-#        rake scholarsphere:fixtures:generate [DIR=<fixture dir>]
+#        rake sufia:fixtures:generate [DIR=<fixture dir>]
 #              <fixture dir> is an optional directory under spec/fixtures to find the fixtures to load
-#                      DEFAULT: scholarsphere
+#                      DEFAULT: sufia
 #
 #               Creates foxml.xml files from the foxml.erb files doing any erb substitutions within the erb file.
 #               This task is mostly used to put the appropriate Rails.root into the foxml.xml file so that 
 #               the data and meta-data files can be located on load. 
 #
-#        rake scholarsphere:fixtures:delete [DIR=<fixture dir>]
+#        rake sufia:fixtures:delete [DIR=<fixture dir>]
 #              <fixture dir> is an optional directory under spec/fixtures to find the fixtures to load
-#                      DEFAULT: scholarsphere
+#                      DEFAULT: sufia
 #
 #               Remove any fixtures defined by .xml.foxml files in Rais.root/spec/fixtures/<fixture dir> from fedora and solr. 
 #
-#        rake scholarsphere:fixtures:load [DIR=<fixture dir>]
+#        rake sufia:fixtures:load [DIR=<fixture dir>]
 #              <fixture dir> is an optional directory under spec/fixtures to find the fixtures to load
-#                      DEFAULT: scholarsphere
+#                      DEFAULT: sufia
 #
 #               load any fixtures defined by .xml.foxml files in Rais.root/spec/fixtures/<fixture dir> into fedora and solr. 
 #
-#        rake scholarsphere:fixtures:refresh [DIR=<fixture dir>]
+#        rake sufia:fixtures:refresh [DIR=<fixture dir>]
 #              <fixture dir> is an optional directory under spec/fixtures to find the fixtures to load
-#                      DEFAULT: scholarsphere
+#                      DEFAULT: sufia
 #
 #               delete then load any fixtures defined by .xml.foxml files in Rais.root/spec/fixtures/<fixture dir> into fedora and solr. 
 #
 # Example meta-data:
 #
-#    <info:fedora/scholarsphere:[fixture id]> <http://purl.org/dc/terms/publisher> "archivist1" .
-#    <info:fedora/scholarsphere:[fixture id]> <http://purl.org/dc/terms/description> "MP3 Description" .
-#    <info:fedora/scholarsphere:[fixture id]> <http://purl.org/dc/terms/created> "04/12/2012" .
-#    <info:fedora/scholarsphere:[fixture id]> <http://purl.org/dc/terms/contributor> "archivist1" .
-#    <info:fedora/scholarsphere:[fixture id]> <http://purl.org/dc/terms/title> "MP3" .
-#    <info:fedora/scholarsphere:[fixture id]> <http://purl.org/dc/terms/relation> "test" .
-#    <info:fedora/scholarsphere:[fixture id]> <http://purl.org/dc/terms/subject> "MP3 Test" .
-#    <info:fedora/scholarsphere:[fixture id]> <http://purl.org/dc/terms/language> "En" .
-#    <info:fedora/scholarsphere:[fixture id]> <http://xmlns.com/foaf/0.1/based_near> "State College" .
-#    <info:fedora/scholarsphere:[fixture id]> <http://purl.org/dc/terms/rights> "archivist1" .
-#    <info:fedora/scholarsphere:[fixture id]> <http://purl.org/dc/terms/creator> "archivist1" .
-#    <info:fedora/scholarsphere:[fixture id]> <http://purl.org/dc/terms/identifier> "Test" .
+#    <info:fedora/sufia:[fixture id]> <http://purl.org/dc/terms/publisher> "archivist1" .
+#    <info:fedora/sufia:[fixture id]> <http://purl.org/dc/terms/description> "MP3 Description" .
+#    <info:fedora/sufia:[fixture id]> <http://purl.org/dc/terms/created> "04/12/2012" .
+#    <info:fedora/sufia:[fixture id]> <http://purl.org/dc/terms/contributor> "archivist1" .
+#    <info:fedora/sufia:[fixture id]> <http://purl.org/dc/terms/title> "MP3" .
+#    <info:fedora/sufia:[fixture id]> <http://purl.org/dc/terms/relation> "test" .
+#    <info:fedora/sufia:[fixture id]> <http://purl.org/dc/terms/subject> "MP3 Test" .
+#    <info:fedora/sufia:[fixture id]> <http://purl.org/dc/terms/language> "En" .
+#    <info:fedora/sufia:[fixture id]> <http://xmlns.com/foaf/0.1/based_near> "State College" .
+#    <info:fedora/sufia:[fixture id]> <http://purl.org/dc/terms/rights> "archivist1" .
+#    <info:fedora/sufia:[fixture id]> <http://purl.org/dc/terms/creator> "archivist1" .
+#    <info:fedora/sufia:[fixture id]> <http://purl.org/dc/terms/identifier> "Test" .
 #
 # Example foxml:  (note the ID needs to be unique) (the binary data in the xml below was generated using base64 on the text)
 #    <?xml version="1.0" encoding="UTF-8"?>
-#    <foxml:digitalObject PID="scholarsphere:[fixture id]" VERSION="1.1" xmlns:foxml="info:fedora/fedora-system:def/foxml#"
+#    <foxml:digitalObject PID="sufia:[fixture id]" VERSION="1.1" xmlns:foxml="info:fedora/fedora-system:def/foxml#"
 #      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/definitions/1/0/foxml1-1.xsd">
 #      <foxml:objectProperties>
 #        <foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
@@ -103,7 +103,7 @@
 #              xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
 #              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
 #              <dc:title>testFixture2.txt</dc:title>
-#              <dc:identifier>scholarsphere:[fixture id]</dc:identifier>
+#              <dc:identifier>sufia:[fixture id]</dc:identifier>
 #            </oai_dc:dc>
 #          </foxml:xmlContent>
 #        </foxml:datastreamVersion>
@@ -134,7 +134,7 @@
 #          LABEL="Fedora Object-to-Object Relationship Metadata" MIMETYPE="application/rdf+xml" SIZE="286">
 #          <foxml:xmlContent>
 #            <rdf:RDF xmlns:ns0="info:fedora/fedora-system:def/model#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-#              <rdf:Description rdf:about="info:fedora/scholarsphere:[fixture id]">
+#              <rdf:Description rdf:about="info:fedora/sufia:[fixture id]">
 #                <ns0:hasModel rdf:resource="info:fedora/afmodel:GenericFile"/>
 #              </rdf:Description>
 #            </rdf:RDF>
@@ -187,33 +187,33 @@
 require 'active_fedora'
 
 SUFIA_TEST_NS = 'sufia' #this must be the same as id_namespace in the test applications config
-namespace :scholarsphere do
+namespace :sufia do
   namespace :fixtures do
     @localDir = File.expand_path("../../spec/fixtures", __FILE__)
-    @dir = ENV["FIXTURE_DIR"] || 'scholarsphere'
+    @dir = ENV["FIXTURE_DIR"] || 'sufia'
 
-    desc "Create ScholarSphere Hydra fixtures for generation and loading"
+    desc "Create sufia Hydra fixtures for generation and loading"
     task :create  do
-      @id = ENV["FIXTURE_ID"] ||'scholarsphere1'
-      @title = ENV["FIXTURE_TITLE"] || 'scholarsphere test'
+      @id = ENV["FIXTURE_ID"] ||'sufia1'
+      @title = ENV["FIXTURE_TITLE"] || 'sufia test'
       @user = ENV["FIXTURE_USER"] || 'archivist1'
 
       @root ='<%=@localDir%>'
 
-      @inputFoxmlFile = File.join(@localDir, 'scholarsphere_generic_stub.foxml.erb')
-      @inputDescFile = File.join(@localDir,  'scholarsphere_generic_stub.descMeta.txt')
-      @inputTxtFile = File.join(@localDir,  'scholarsphere_generic_stub.txt')
+      @inputFoxmlFile = File.join(@localDir, 'sufia_generic_stub.foxml.erb')
+      @inputDescFile = File.join(@localDir,  'sufia_generic_stub.descMeta.txt')
+      @inputTxtFile = File.join(@localDir,  'sufia_generic_stub.txt')
 
       @outputFoxmlFile = File.join(@localDir, @dir, "#{SUFIA_TEST_NS}_#{@id}.foxml.erb")
       @outputDescFile = File.join(@localDir, @dir, "#{SUFIA_TEST_NS}_#{@id}.descMeta.txt")
       @outputTxtFile = File.join(@localDir, @dir, "#{SUFIA_TEST_NS}_#{@id}.txt")
-
+      
       run_erb_stub @inputFoxmlFile, @outputFoxmlFile
       run_erb_stub @inputDescFile, @outputDescFile
       run_erb_stub @inputTxtFile, @outputTxtFile
     end
 
-    desc "Generate default ScholarSphere Hydra fixtures"
+    desc "Generate default sufia Hydra fixtures"
     task :generate do
       ENV["dir"] = File.join(@localDir, @dir) 
       fixtures = find_fixtures_erb(@dir)

data/tasks/{scholarsphere.rake → sufia.rake}

@@ -19,7 +19,7 @@ require 'action_view'
 require 'rainbow'
 include ActionView::Helpers::NumberHelper
 
-namespace :scholarsphere do
+namespace :sufia do
   desc "Restore missing user accounts"
   task :restore_users => :environment do
     # Query Solr for unique depositors
@@ -109,7 +109,7 @@ namespace :scholarsphere do
   namespace :export do
     desc "Dump metadata as RDF/XML for e.g. Summon integration"
     task :rdfxml => :environment do
-      raise "rake scholarsphere:export:rdfxml output=FILE" unless ENV['output']
+      raise "rake sufia:export:rdfxml output=FILE" unless ENV['output']
       export_file = ENV['output']
       triples = RDF::Repository.new
       rows = GenericFile.count

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: sufia
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre2
-  prerelease: 6
+  version: 0.0.1
+  prerelease: 
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-20 00:00:00.000000000 Z
+date: 2012-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -32,17 +32,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: blacklight_advanced_search
   requirement: !ruby/object:Gem::Requirement
@@ -64,17 +64,33 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 5.0.0.pre11
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 5.0.0.pre11
+        version: 5.0.0
+- !ruby/object:Gem::Dependency
+  name: active-fedora
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: noid
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +130,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.22.0
+        version: 1.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +138,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.22.0
+        version: 1.23.0
 - !ruby/object:Gem::Dependency
   name: resque-pool
   requirement: !ruby/object:Gem::Requirement
@@ -493,7 +509,7 @@ files:
 - app/assets/javascripts/contact_form.js
 - app/assets/javascripts/dashboard.js
 - app/assets/javascripts/generic_files.js
-- app/assets/javascripts/scholarsphere.js
+- app/assets/javascripts/sufia.js
 - app/assets/stylesheets/blacklight_more_facets.css
 - app/assets/stylesheets/bootstrap.min.css
 - app/assets/stylesheets/contact_form.css
@@ -509,7 +525,7 @@ files:
 - app/assets/stylesheets/jquery-ui-1.8.23.custom.css
 - app/assets/stylesheets/reset_body.css
 - app/assets/stylesheets/scholarsphere-bootstrap.css
-- app/assets/stylesheets/scholarsphere.css
+- app/assets/stylesheets/sufia.css
 - app/assets/stylesheets/video-js.css
 - app/controllers/authorities_controller.rb
 - app/controllers/batch_controller.rb
@@ -530,17 +546,9 @@ files:
 - app/helpers/contact_form_helper.rb
 - app/helpers/generic_file_helper.rb
 - app/helpers/sufia_helper.rb
-- app/models/audit_job.rb
 - app/models/batch.rb
-- app/models/batch_update_job.rb
-- app/models/characterize_job.rb
 - app/models/checksum_audit_log.rb
 - app/models/contact_form.rb
-- app/models/content_delete_event_job.rb
-- app/models/content_deposit_event_job.rb
-- app/models/content_new_version_event_job.rb
-- app/models/content_restored_version_event_job.rb
-- app/models/content_update_event_job.rb
 - app/models/datastreams/batch_rdf_datastream.rb
 - app/models/datastreams/file_content_datastream.rb
 - app/models/datastreams/fits_datastream.rb
@@ -548,21 +556,14 @@ files:
 - app/models/datastreams/paranoid_rights_datastream.rb
 - app/models/datastreams/properties_datastream.rb
 - app/models/domain_term.rb
-- app/models/event_job.rb
 - app/models/follow.rb
 - app/models/generic_file.rb
 - app/models/geo_names_resource.rb
 - app/models/group.rb
 - app/models/local_authority.rb
 - app/models/local_authority_entry.rb
-- app/models/resolrize_job.rb
 - app/models/single_use_link.rb
-- app/models/solr_document.rb
 - app/models/subject_local_authority_entry.rb
-- app/models/unzip_job.rb
-- app/models/user_edit_profile_event_job.rb
-- app/models/user_follow_event_job.rb
-- app/models/user_unfollow_event_job.rb
 - app/models/version_committer.rb
 - app/views/_add_assets_links.html.erb
 - app/views/_flash_msg.html.erb
@@ -714,6 +715,7 @@ files:
 - app/views/users/notifications_number.js.erb
 - app/views/users/show.html.erb
 - bin/audit_repository
+- config/jetty.yml
 - config/locales/sufia.en.yml
 - config/routes.rb
 - db/data.yml
@@ -733,8 +735,10 @@ files:
 - features/support/env.rb
 - features/support/headless.rb
 - features/support/paths.rb
+- features/users.feature
 - fedora_conf/conf/development/fedora.fcfg
 - fedora_conf/conf/test/fedora.fcfg
+- lib/active_support/core_ext/marshal.rb
 - lib/devise/models/http_header_authenticatable.rb
 - lib/devise/strategies/http_header_authenticatable.rb
 - lib/generators/sufia/sufia_generator.rb
@@ -744,6 +748,7 @@ files:
 - lib/generators/sufia/templates/config/devise.rb
 - lib/generators/sufia/templates/config/hydra_config.rb
 - lib/generators/sufia/templates/config/mailboxer.rb
+- lib/generators/sufia/templates/config/redis.yml
 - lib/generators/sufia/templates/config/redis_config.rb
 - lib/generators/sufia/templates/config/resque_config.rb
 - lib/generators/sufia/templates/config/setup_mail.rb
@@ -751,26 +756,51 @@ files:
 - lib/generators/sufia/templates/migrations/acts_as_follower_migration.rb
 - lib/generators/sufia/templates/migrations/add_avatars_to_users.rb
 - lib/generators/sufia/templates/migrations/add_groups_to_users.rb
+- lib/generators/sufia/templates/migrations/add_ldap_attrs_to_user.rb
 - lib/generators/sufia/templates/migrations/add_social_to_users.rb
 - lib/generators/sufia/templates/migrations/create_checksum_audit_logs.rb
 - lib/generators/sufia/templates/migrations/create_local_authorities.rb
 - lib/generators/sufia/templates/migrations/create_single_use_links.rb
 - lib/generators/sufia/templates/migrations/create_version_committers.rb
+- lib/kaminari/helpers/tag.rb
 - lib/redirect_to_web_access_failure.rb
 - lib/sufia.rb
 - lib/sufia/active_fedora/redis.rb
 - lib/sufia/active_record/redis.rb
 - lib/sufia/controller.rb
+- lib/sufia/generic_file.rb
+- lib/sufia/generic_file/audit.rb
+- lib/sufia/generic_file/characterization.rb
+- lib/sufia/generic_file/export.rb
+- lib/sufia/generic_file/permissions.rb
+- lib/sufia/generic_file/thumbnail.rb
 - lib/sufia/http_header_auth.rb
 - lib/sufia/id_service.rb
+- lib/sufia/jobs/audit_job.rb
+- lib/sufia/jobs/batch_update_job.rb
+- lib/sufia/jobs/characterize_job.rb
+- lib/sufia/jobs/content_delete_event_job.rb
+- lib/sufia/jobs/content_deposit_event_job.rb
+- lib/sufia/jobs/content_new_version_event_job.rb
+- lib/sufia/jobs/content_restored_version_event_job.rb
+- lib/sufia/jobs/content_update_event_job.rb
+- lib/sufia/jobs/event_job.rb
+- lib/sufia/jobs/resolrize_job.rb
+- lib/sufia/jobs/transcode_video_job.rb
+- lib/sufia/jobs/unzip_job.rb
+- lib/sufia/jobs/user_edit_profile_event_job.rb
+- lib/sufia/jobs/user_follow_event_job.rb
+- lib/sufia/jobs/user_unfollow_event_job.rb
 - lib/sufia/model_methods.rb
 - lib/sufia/noid.rb
-- lib/sufia/permissions.rb
+- lib/sufia/queue/resque.rb
 - lib/sufia/role_mapper.rb
+- lib/sufia/solr_document_behavior.rb
 - lib/sufia/user.rb
 - lib/sufia/utils.rb
 - lib/sufia/version.rb
 - lib/tasks/fixtures.rake
+- lib/tasks/resque.rake
 - public/.gitkeep
 - public/favicon.ico
 - public/robots.txt
@@ -796,6 +826,7 @@ files:
 - spec/factories/users.rb
 - spec/fixtures/4-20.png
 - spec/fixtures/cities15000.tsv
+- spec/fixtures/countdown.avi
 - spec/fixtures/docx_fits.xml
 - spec/fixtures/dublin_core_rdf_descMetadata.nt
 - spec/fixtures/empty_file.txt
@@ -808,34 +839,32 @@ files:
 - spec/fixtures/lexvo.rdf
 - spec/fixtures/mp3_fits.xml
 - spec/fixtures/pdf_fits.xml
-- spec/fixtures/scholarsphere/bg_header.jpg
-- spec/fixtures/scholarsphere/scholarsphere_test1.descMeta.txt
-- spec/fixtures/scholarsphere/scholarsphere_test1.txt
-- spec/fixtures/scholarsphere/scholarsphere_test2.descMeta.txt
-- spec/fixtures/scholarsphere/scholarsphere_test2.docx
-- spec/fixtures/scholarsphere/scholarsphere_test2.foxml.erb
-- spec/fixtures/scholarsphere/scholarsphere_test3.descMeta.txt
-- spec/fixtures/scholarsphere/scholarsphere_test3.foxml.erb
-- spec/fixtures/scholarsphere/scholarsphere_test3.xls
-- spec/fixtures/scholarsphere/scholarsphere_test4.descMeta.txt
-- spec/fixtures/scholarsphere/scholarsphere_test4.foxml.erb
-- spec/fixtures/scholarsphere/scholarsphere_test4.pdf
-- spec/fixtures/scholarsphere/scholarsphere_test5.descMeta.txt
-- spec/fixtures/scholarsphere/scholarsphere_test5.mp3
-- spec/fixtures/scholarsphere/scholarsphere_test5.txt
-- spec/fixtures/scholarsphere/scholarsphere_test6.descMeta.txt
-- spec/fixtures/scholarsphere/scholarsphere_test6.foxml.erb
-- spec/fixtures/scholarsphere/scholarsphere_test6.jp2
-- spec/fixtures/scholarsphere/scholarsphere_test6.txt
-- spec/fixtures/scholarsphere/sufia_scholarsphere1.descMeta.txt
-- spec/fixtures/scholarsphere/sufia_scholarsphere1.foxml.erb
-- spec/fixtures/scholarsphere/sufia_scholarsphere1.txt
-- spec/fixtures/scholarsphere/sufia_test1.foxml.erb
-- spec/fixtures/scholarsphere/sufia_test5.foxml.erb
-- spec/fixtures/scholarsphere_generic_stub.descMeta.txt
-- spec/fixtures/scholarsphere_generic_stub.foxml.erb
-- spec/fixtures/scholarsphere_generic_stub.txt
 - spec/fixtures/small_file.txt
+- spec/fixtures/sufia/.gitignore
+- spec/fixtures/sufia/bg_header.jpg
+- spec/fixtures/sufia/sufia_test1.descMeta.txt
+- spec/fixtures/sufia/sufia_test1.foxml.erb
+- spec/fixtures/sufia/sufia_test1.txt
+- spec/fixtures/sufia/sufia_test2.descMeta.txt
+- spec/fixtures/sufia/sufia_test2.docx
+- spec/fixtures/sufia/sufia_test2.foxml.erb
+- spec/fixtures/sufia/sufia_test3.descMeta.txt
+- spec/fixtures/sufia/sufia_test3.foxml.erb
+- spec/fixtures/sufia/sufia_test3.xls
+- spec/fixtures/sufia/sufia_test4.descMeta.txt
+- spec/fixtures/sufia/sufia_test4.foxml.erb
+- spec/fixtures/sufia/sufia_test4.pdf
+- spec/fixtures/sufia/sufia_test5.descMeta.txt
+- spec/fixtures/sufia/sufia_test5.foxml.erb
+- spec/fixtures/sufia/sufia_test5.mp3
+- spec/fixtures/sufia/sufia_test5.txt
+- spec/fixtures/sufia/sufia_test6.descMeta.txt
+- spec/fixtures/sufia/sufia_test6.foxml.erb
+- spec/fixtures/sufia/sufia_test6.jp2
+- spec/fixtures/sufia/sufia_test6.txt
+- spec/fixtures/sufia_generic_stub.descMeta.txt
+- spec/fixtures/sufia_generic_stub.foxml.erb
+- spec/fixtures/sufia_generic_stub.txt
 - spec/fixtures/txt_fits.xml
 - spec/fixtures/world.png
 - spec/fixtures/xls_fits.xml
@@ -852,13 +881,14 @@ files:
 - spec/models/generic_file_spec.rb
 - spec/models/local_authority_spec.rb
 - spec/models/single_use_link_spec.rb
+- spec/models/transcode_video_job_spec.rb
 - spec/models/unzip_job_spec.rb
 - spec/models/user_spec.rb
-- spec/rake/scholarsphere_fixtures_spec.rb
+- spec/rake/sufia_fixtures_spec.rb
 - spec/routing/route_spec.rb
 - spec/spec_helper.rb
 - spec/support/Gemfile
-- spec/support/config/redis.yml
+- spec/support/fedora_conf/fedora.fcfg
 - spec/support/lib/generators/test_app_generator.rb
 - spec/support/uploaded_file_monkeypatch.rb
 - spec/views/single_user_link/download.html.erb_spec.rb
@@ -869,10 +899,10 @@ files:
 - tasks/cucumber.rake
 - tasks/jetty.rake
 - tasks/resque.rake
-- tasks/scholarsphere-db.rake
-- tasks/scholarsphere-dev.rake
-- tasks/scholarsphere-fixtures.rake
-- tasks/scholarsphere.rake
+- tasks/sufia-db.rake
+- tasks/sufia-dev.rake
+- tasks/sufia-fixtures.rake
+- tasks/sufia.rake
 - vendor/assets/fonts/Lato-Light.eot
 - vendor/assets/fonts/Lato-Light.ttf
 - vendor/assets/fonts/fontawesome-webfont.eot
@@ -922,9 +952,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -947,6 +977,7 @@ test_files:
 - features/support/env.rb
 - features/support/headless.rb
 - features/support/paths.rb
+- features/users.feature
 - spec/.gitignore
 - spec/active_fedora/unsaved_digital_object_spec.rb
 - spec/config/host_to_vhost_spec.rb
@@ -966,6 +997,7 @@ test_files:
 - spec/factories/users.rb
 - spec/fixtures/4-20.png
 - spec/fixtures/cities15000.tsv
+- spec/fixtures/countdown.avi
 - spec/fixtures/docx_fits.xml
 - spec/fixtures/dublin_core_rdf_descMetadata.nt
 - spec/fixtures/empty_file.txt
@@ -978,34 +1010,32 @@ test_files:
 - spec/fixtures/lexvo.rdf
 - spec/fixtures/mp3_fits.xml
 - spec/fixtures/pdf_fits.xml
-- spec/fixtures/scholarsphere/bg_header.jpg
-- spec/fixtures/scholarsphere/scholarsphere_test1.descMeta.txt
-- spec/fixtures/scholarsphere/scholarsphere_test1.txt
-- spec/fixtures/scholarsphere/scholarsphere_test2.descMeta.txt
-- spec/fixtures/scholarsphere/scholarsphere_test2.docx
-- spec/fixtures/scholarsphere/scholarsphere_test2.foxml.erb
-- spec/fixtures/scholarsphere/scholarsphere_test3.descMeta.txt
-- spec/fixtures/scholarsphere/scholarsphere_test3.foxml.erb
-- spec/fixtures/scholarsphere/scholarsphere_test3.xls
-- spec/fixtures/scholarsphere/scholarsphere_test4.descMeta.txt
-- spec/fixtures/scholarsphere/scholarsphere_test4.foxml.erb
-- spec/fixtures/scholarsphere/scholarsphere_test4.pdf
-- spec/fixtures/scholarsphere/scholarsphere_test5.descMeta.txt
-- spec/fixtures/scholarsphere/scholarsphere_test5.mp3
-- spec/fixtures/scholarsphere/scholarsphere_test5.txt
-- spec/fixtures/scholarsphere/scholarsphere_test6.descMeta.txt
-- spec/fixtures/scholarsphere/scholarsphere_test6.foxml.erb
-- spec/fixtures/scholarsphere/scholarsphere_test6.jp2
-- spec/fixtures/scholarsphere/scholarsphere_test6.txt
-- spec/fixtures/scholarsphere/sufia_scholarsphere1.descMeta.txt
-- spec/fixtures/scholarsphere/sufia_scholarsphere1.foxml.erb
-- spec/fixtures/scholarsphere/sufia_scholarsphere1.txt
-- spec/fixtures/scholarsphere/sufia_test1.foxml.erb
-- spec/fixtures/scholarsphere/sufia_test5.foxml.erb
-- spec/fixtures/scholarsphere_generic_stub.descMeta.txt
-- spec/fixtures/scholarsphere_generic_stub.foxml.erb
-- spec/fixtures/scholarsphere_generic_stub.txt
 - spec/fixtures/small_file.txt
+- spec/fixtures/sufia/.gitignore
+- spec/fixtures/sufia/bg_header.jpg
+- spec/fixtures/sufia/sufia_test1.descMeta.txt
+- spec/fixtures/sufia/sufia_test1.foxml.erb
+- spec/fixtures/sufia/sufia_test1.txt
+- spec/fixtures/sufia/sufia_test2.descMeta.txt
+- spec/fixtures/sufia/sufia_test2.docx
+- spec/fixtures/sufia/sufia_test2.foxml.erb
+- spec/fixtures/sufia/sufia_test3.descMeta.txt
+- spec/fixtures/sufia/sufia_test3.foxml.erb
+- spec/fixtures/sufia/sufia_test3.xls
+- spec/fixtures/sufia/sufia_test4.descMeta.txt
+- spec/fixtures/sufia/sufia_test4.foxml.erb
+- spec/fixtures/sufia/sufia_test4.pdf
+- spec/fixtures/sufia/sufia_test5.descMeta.txt
+- spec/fixtures/sufia/sufia_test5.foxml.erb
+- spec/fixtures/sufia/sufia_test5.mp3
+- spec/fixtures/sufia/sufia_test5.txt
+- spec/fixtures/sufia/sufia_test6.descMeta.txt
+- spec/fixtures/sufia/sufia_test6.foxml.erb
+- spec/fixtures/sufia/sufia_test6.jp2
+- spec/fixtures/sufia/sufia_test6.txt
+- spec/fixtures/sufia_generic_stub.descMeta.txt
+- spec/fixtures/sufia_generic_stub.foxml.erb
+- spec/fixtures/sufia_generic_stub.txt
 - spec/fixtures/txt_fits.xml
 - spec/fixtures/world.png
 - spec/fixtures/xls_fits.xml
@@ -1022,13 +1052,14 @@ test_files:
 - spec/models/generic_file_spec.rb
 - spec/models/local_authority_spec.rb
 - spec/models/single_use_link_spec.rb
+- spec/models/transcode_video_job_spec.rb
 - spec/models/unzip_job_spec.rb
 - spec/models/user_spec.rb
-- spec/rake/scholarsphere_fixtures_spec.rb
+- spec/rake/sufia_fixtures_spec.rb
 - spec/routing/route_spec.rb
 - spec/spec_helper.rb
 - spec/support/Gemfile
-- spec/support/config/redis.yml
+- spec/support/fedora_conf/fedora.fcfg
 - spec/support/lib/generators/test_app_generator.rb
 - spec/support/uploaded_file_monkeypatch.rb
 - spec/views/single_user_link/download.html.erb_spec.rb