sufia 1.3.0 → 2.0.0

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

@@ -0,0 +1,55 @@
+require 'net/https'
+require 'uri'
+require 'tempfile'
+
+class ImportUrlJob 
+
+  def queue_name
+    :import_url
+  end
+
+  attr_accessor :pid
+
+  def initialize(pid)
+    self.pid = pid 
+  end
+
+  def run
+    generic_file = GenericFile.find(self.pid)
+    f = Tempfile.new(self.pid)
+    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) do |resp|
+        resp.read_body do |segment|
+          f.write(segment)
+        end
+      end
+    end 
+    job_user = User.batchuser()
+    user = User.find_by_user_key(generic_file.depositor)
+    # check for virus
+    if Sufia::GenericFile::Actions.virus_check(f) != 0
+      message = "The file (#{File.basename(uri.path)}) was unable to be imported because it contained a virus."
+      job_user.send_message(user, message, 'File Import Error') 
+      return
+    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)
+    # 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') 
+ 
+  ensure
+    f.close
+    f.unlink
+  end
+end

data/{lib/sufia → sufia-models/lib/sufia/models}/jobs/unzip_job.rb

@@ -26,27 +26,39 @@ class UnzipJob
   def run
     Zip::Archive.open_buffer(zip_file.content.content) do |archive|
       archive.each do |f|
-        create_file(f)
+        if f.directory?
+          create_directory(f)
+        else
+          create_file(f)
+        end
       end
     end
   end
 
   protected
 
-  def create_file(f)
+  # Creates a GenericFile object based on +file+
+  # @param file [Zip::File]
+  def create_file(file)
     @generic_file = GenericFile.new
     @generic_file.batch_id = zip_file.batch.pid
-    file_name = f.name
+    file_name = file.name
     mime_types = MIME::Types.of(file_name)
     mime_type = mime_types.empty? ? "application/octet-stream" : mime_types.first.content_type
     options = {:label=>file_name, :dsid=>'content', :mimeType=>mime_type}
-    @generic_file.add_file_datastream(f.read, options)
+    @generic_file.add_file_datastream(file.read, options)
     @generic_file.set_title_and_label( file_name, :only_if_blank=>true )
     @generic_file.apply_depositor_metadata(zip_file.edit_users.first)
     @generic_file.date_uploaded = Time.now.ctime
     @generic_file.date_modified = Time.now.ctime
     @generic_file.save
   end
+  
+  # Creates representation of directory corresponding to +file+
+  # Default behavior: _do nothing_
+  # @param file [Zip::File]
+  def create_directory(file)
+  end
 
   def zip_file
     @zip_file ||= GenericFile.find(pid)

data/{lib/sufia → sufia-models/lib/sufia/models}/noid.rb

@@ -36,7 +36,7 @@ module Sufia
 
     protected
     def Noid.namespace
-      Sufia::Engine.config.id_namespace
+      Sufia.config.id_namespace
     end
   end
 end

data/{lib/sufia/queue → sufia-models/lib/sufia/models}/resque.rb

@@ -1,5 +1,3 @@
-require 'active_support/core_ext/marshal'
-
 # Borrowed from:
 # https://github.com/jeremy/resque-rails/blob/master/lib/resque/rails/queue.rb
 module Sufia

data/{lib/sufia → sufia-models/lib/sufia/models}/user.rb

@@ -71,7 +71,7 @@ module Sufia::User
 
   #method to get the trophy ids without the namespace included
   def trophy_ids
-    trophies.map { |t| "#{Sufia::Engine.config.id_namespace}:#{t.generic_file_id}" }
+    trophies.map { |t| "#{Sufia.config.id_namespace}:#{t.generic_file_id}" }
   end
 
   # method needed for messaging

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

@@ -0,0 +1,5 @@
+module Sufia
+  module Models
+    VERSION = "2.0.0"
+  end
+end

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

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

data/sufia-models/sufia-models.gemspec

@@ -0,0 +1,44 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'sufia/models/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "sufia-models"
+  spec.version       = Sufia::Models::VERSION
+  spec.authors       = [
+    "Jeremy Friesen",
+  ]
+  spec.email         = [
+    "jeremy.n.friesen@gmail.com",
+  ]
+  spec.description   = %q{Models and services for sufia}
+  spec.summary       = %q{Models and services for sufia}
+
+  # This is a temporary homepage until we've had a chance to review the
+  # process
+  spec.homepage      = "https://github.com/jeremyf/sufia"
+  spec.license       = "Apache"
+
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "rake"
+  spec.add_dependency "rails", "~> 3.2.13"
+  spec.add_dependency 'hydra-head', '~> 6.0'
+  spec.add_dependency 'nest', '~> 1.1.1'
+  spec.add_dependency 'resque', '~> 1.23.0'#, :require => 'resque/server'
+  spec.add_dependency 'resque-pool', '0.3.0'
+  spec.add_dependency 'noid', '~> 0.6.6'
+  spec.add_dependency 'mailboxer', '0.8.0'
+  spec.add_dependency 'acts_as_follower', '0.1.1'
+  spec.add_dependency 'rmagick'
+  spec.add_dependency 'paperclip', '3.3.0'
+  spec.add_dependency 'zipruby', '0.3.6'
+  spec.add_dependency 'activerecord-import', '0.3.0' # 0.3.1 caused a bug in testing: "SQLite3::SQLException: near ",": syntax error: INSERT INTO..."
+  spec.add_dependency 'devise'
+
+end

data/sufia.gemspec

@@ -16,27 +16,17 @@ Gem::Specification.new do |gem|
   gem.version       = Sufia::VERSION
 
   gem.add_dependency 'rails', '~> 3.2.13'
+  gem.add_dependency 'sufia-models', '~> 0.1.2'
   gem.add_dependency 'blacklight', '~> 4.0'
   gem.add_dependency 'blacklight_advanced_search'
   gem.add_dependency "hydra-head", "~> 6.0"
 
-  gem.add_dependency 'noid', '~> 0.6.6'
   gem.add_dependency 'hydra-batch-edit', '~> 1.0'
 
-  gem.add_dependency 'resque', '~> 1.23.0'#, :require => 'resque/server'
-  gem.add_dependency 'resque-pool', '0.3.0'
-  gem.add_dependency 'rmagick'
-  gem.add_dependency 'devise'
-  gem.add_dependency 'paperclip', '3.3.0'
   gem.add_dependency 'daemons', '1.1.9'
-  gem.add_dependency 'zipruby', '0.3.6'
   gem.add_dependency 'mail_form'
-  gem.add_dependency 'rails_autolink', '1.0.9'
-  gem.add_dependency 'acts_as_follower', '0.1.1'
-  gem.add_dependency 'nest', '1.1.1'
+  gem.add_dependency 'rails_autolink', '~> 1.1.0'
   gem.add_dependency 'yaml_db', '0.2.3'
-  gem.add_dependency 'mailboxer', '0.8.0'
   gem.add_dependency 'rainbow', '1.1.4'
-  gem.add_dependency 'activerecord-import', '0.3.0' # 0.3.1 caused a bug in testing: "SQLite3::SQLException: near ",": syntax error: INSERT INTO..."
   gem.add_dependency 'font-awesome-sass-rails', '~>3.0'
 end

data/tasks/release.rake

@@ -0,0 +1,90 @@
+root    = File.expand_path('../../', __FILE__)
+version = File.read("#{root}/SUFIA_VERSION").strip
+tag     = "v#{version}"
+
+['sufia-models', 'sufia'].each do |framework|
+  namespace framework do
+    gem     = "pkg/#{framework}-#{version}.gem"
+    gemspec = "#{framework}.gemspec"
+
+    task :clean do
+      rm_f gem
+    end
+
+    task :update_version_rb do
+      glob = root.dup
+      if framework == "sufia"
+        glob << "/lib/*"
+      else
+        glob << "/#{framework}/lib/**"
+      end
+      glob << "/version.rb"
+
+      file = Dir[glob].first
+      if file
+        ruby = File.read(file)
+
+        major, minor, tiny, pre = version.split('.')
+        pre = pre ? pre.inspect : "nil"
+
+        ruby.gsub!(/^(\s*)VERSION = ".*?"$/, "\\1VERSION = \"#{version}\"")
+        raise "Could not insert VERSION in #{file}" unless $1
+        File.open(file, 'w') { |f| f.write ruby }
+      end
+    end
+    task gem => %w(update_version_rb pkg) do
+      cmd = ""
+      cmd << "cd #{framework} && " unless framework == "sufia"
+      cmd << "gem build #{gemspec} && mv #{framework}-#{version}.gem #{root}/pkg/"
+      sh cmd
+    end
+
+    task :build => [:clean, gem]
+    task :install => :build do
+      sh "gem install #{gem}"
+    end
+
+    task :prep_release => [:ensure_clean_state, :build]
+
+    task :push => :build do
+      sh "gem push #{gem}"
+    end
+  end
+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 :ensure_clean_state do
+    unless `git status -s | grep -v SUFIA_VERSION | grep -v History.md`.strip.empty?
+      abort "[ABORTING] `git status` reports a dirty tree. Make sure all changes are committed"
+    end
+
+    unless ENV['SKIP_TAG'] || `git tag | grep "#{tag}$"`.strip.empty?
+      abort "[ABORTING] `git tag` shows that #{tag} already exists. Has this version already\n"\
+            "           been released? Git tagging can be skipped by setting SKIP_TAG=1"
+    end
+  end
+
+  task :commit do
+    File.open('pkg/commit_message.txt', 'w') do |f|
+      f.puts "# Preparing for #{version} release\n"
+      f.puts
+      f.puts "# UNCOMMENT THE LINE ABOVE TO APPROVE THIS COMMIT"
+    end
+
+    sh "git add . && git commit --verbose --template=pkg/commit_message.txt"
+    rm_f "pkg/commit_message.txt"
+  end
+
+  task :tag do
+    sh "git tag #{tag}"
+    sh "git push --tags"
+  end
+
+  task :release => %w(ensure_clean_state build commit tag push)
+end
+

data/tasks/sufia-dev.rake

@@ -25,7 +25,7 @@ RSpec::Core::RakeTask.new(:spec => [:generate]) do |t|
   t.rspec_opts = "--colour"
 end
 
-desc "Load scholarsphere fixtures"
+desc "Load fixtures"
 task :fixtures => :generate do# => ['sufia:fixtures:refresh'] do
   #NOTE do we need fixtures:create, fixtures:generate
   within_test_app do

data/tasks/sufia.rake

@@ -102,9 +102,7 @@ namespace :sufia do
   end
 
   desc "Re-solrize all objects"
-  task :resolrize => :environment do
-    Sufia.queue.push(ResolrizeJob.new)
-  end
+  task :resolrize => ['solr:reindex']
 
   namespace :export do
     desc "Dump metadata as RDF/XML for e.g. Summon integration"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sufia
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-24 00:00:00.000000000 Z
+date: 2013-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,6 +24,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.13
+- !ruby/object:Gem::Dependency
+  name: sufia-models
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +80,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '6.0'
-- !ruby/object:Gem::Dependency
-  name: noid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.6
 - !ruby/object:Gem::Dependency
   name: hydra-batch-edit
   requirement: !ruby/object:Gem::Requirement
@@ -94,76 +94,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: resque
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.23.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.23.0
-- !ruby/object:Gem::Dependency
-  name: resque-pool
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-- !ruby/object:Gem::Dependency
-  name: rmagick
-  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: devise
-  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: paperclip
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: daemons
   requirement: !ruby/object:Gem::Requirement
@@ -178,20 +108,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.1.9
-- !ruby/object:Gem::Dependency
-  name: zipruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.3.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.3.6
 - !ruby/object:Gem::Dependency
   name: mail_form
   requirement: !ruby/object:Gem::Requirement
@@ -210,44 +126,16 @@ dependencies:
   name: rails_autolink
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.9
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.9
-- !ruby/object:Gem::Dependency
-  name: acts_as_follower
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-- !ruby/object:Gem::Dependency
-  name: nest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: yaml_db
   requirement: !ruby/object:Gem::Requirement
@@ -262,20 +150,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.2.3
-- !ruby/object:Gem::Dependency
-  name: mailboxer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -290,20 +164,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.1.4
-- !ruby/object:Gem::Dependency
-  name: activerecord-import
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: font-awesome-sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -335,6 +195,8 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
+- Releasing_sufia.md
+- SUFIA_VERSION
 - app/assets/images/blacklight/bg.png
 - app/assets/images/blacklight/border.png
 - app/assets/images/blacklight/bul_sq_gry.gif
@@ -399,10 +261,13 @@ files:
 - app/assets/javascripts/sufia.js
 - app/assets/javascripts/sufia/batch_select_all.js
 - app/assets/javascripts/sufia/edit_metadata.js
+- app/assets/javascripts/sufia/fileupload.js
 - app/assets/javascripts/sufia/multiForm.js
 - app/assets/javascripts/sufia/permissions.js
 - app/assets/javascripts/sufia/trophy.js
+- app/assets/javascripts/sufia/uploader.js
 - app/assets/javascripts/terms_of_service.js
+- app/assets/stylesheets/application-bootstrap.css
 - app/assets/stylesheets/audio-js.css
 - app/assets/stylesheets/blacklight_more_facets.css
 - app/assets/stylesheets/bootstrap.min.css
@@ -418,7 +283,6 @@ files:
 - app/assets/stylesheets/jquery-ui-1.8.23.custom.css
 - app/assets/stylesheets/jquery-ui.css
 - app/assets/stylesheets/reset_body.css
-- app/assets/stylesheets/scholarsphere-bootstrap.css
 - app/assets/stylesheets/sufia.css.scss
 - app/assets/stylesheets/trophy.css
 - app/assets/stylesheets/video-js.css
@@ -442,26 +306,16 @@ files:
 - app/helpers/generic_file_helper.rb
 - app/helpers/sufia_helper.rb
 - app/helpers/trophy_helper.rb
-- app/models/batch.rb
-- app/models/checksum_audit_log.rb
+- app/jobs/content_delete_event_job.rb
+- app/jobs/content_deposit_event_job.rb
+- app/jobs/content_new_version_event_job.rb
+- app/jobs/content_restored_version_event_job.rb
+- app/jobs/content_update_event_job.rb
+- app/jobs/event_job.rb
+- app/jobs/user_edit_profile_event_job.rb
+- app/jobs/user_follow_event_job.rb
+- app/jobs/user_unfollow_event_job.rb
 - app/models/contact_form.rb
-- app/models/datastreams/batch_rdf_datastream.rb
-- app/models/datastreams/file_content_datastream.rb
-- app/models/datastreams/fits_datastream.rb
-- app/models/datastreams/generic_file_rdf_datastream.rb
-- app/models/datastreams/paranoid_rights_datastream.rb
-- app/models/datastreams/properties_datastream.rb
-- app/models/domain_term.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/single_use_link.rb
-- app/models/subject_local_authority_entry.rb
-- app/models/trophy.rb
-- app/models/version_committer.rb
 - app/views/_add_assets_links.html.erb
 - app/views/_flash_msg.html.erb
 - app/views/_footer.html.erb
@@ -479,6 +333,7 @@ files:
 - app/views/batch/_metadata.html.erb
 - app/views/batch/_more_metadata.html.erb
 - app/views/batch/edit.html.erb
+- app/views/batch_edits/_batch_edits_actions.html.erb
 - app/views/batch_edits/_check_all.html.erb
 - app/views/batch_edits/_delete_selected.html.erb
 - app/views/batch_edits/edit.html.erb
@@ -540,6 +395,7 @@ files:
 - app/views/contact_form/_directions.html.erb
 - app/views/contact_form/create.html.erb
 - app/views/contact_form/new.html.erb
+- app/views/dashboard/_batch_edits_actions.html.erb
 - app/views/dashboard/_constraints.html.erb
 - app/views/dashboard/_did_you_mean.html.erb
 - app/views/dashboard/_document_list.html.erb
@@ -569,7 +425,9 @@ files:
 - app/views/generic_files/_asset_updated_flash.html.erb
 - app/views/generic_files/_breadcrumbs.html.erb
 - app/views/generic_files/_descriptions.html.erb
+- app/views/generic_files/_dropbox_import.html.erb
 - 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/_groups_description.html.erb
 - app/views/generic_files/_media_display.html.erb
@@ -585,25 +443,20 @@ files:
 - app/views/generic_files/edit.html.erb
 - app/views/generic_files/edit_fields/_default.html.erb
 - app/views/generic_files/edit_fields/_description.html.erb
+- app/views/generic_files/edit_fields/_resource_type.html.erb
 - app/views/generic_files/edit_fields/_rights.html.erb
 - app/views/generic_files/edit_fields/_suffix.html.erb
 - app/views/generic_files/edit_fields/_type.html.erb
 - app/views/generic_files/new.html.erb
 - app/views/generic_files/show.html.erb
-- app/views/generic_files/show_fields/_based_near.html.erb
-- app/views/generic_files/show_fields/_contributor.html.erb
-- app/views/generic_files/show_fields/_creator.html.erb
-- app/views/generic_files/show_fields/_date_created.html.erb
-- app/views/generic_files/show_fields/_description.html.erb
-- app/views/generic_files/show_fields/_identifier.html.erb
-- app/views/generic_files/show_fields/_language.html.erb
-- app/views/generic_files/show_fields/_publisher.html.erb
-- app/views/generic_files/show_fields/_related_url.html.erb
-- app/views/generic_files/show_fields/_resource_type.html.erb
-- app/views/generic_files/show_fields/_rights.html.erb
-- app/views/generic_files/show_fields/_subject.html.erb
-- app/views/generic_files/show_fields/_tag.html.erb
-- app/views/generic_files/show_fields/_title.html.erb
+- app/views/generic_files/show_fields/_default.html.erb
+- app/views/generic_files/upload/_agreement.html.erb
+- app/views/generic_files/upload/_alerts.html.erb
+- app/views/generic_files/upload/_dropbox_chooser.html.erb
+- app/views/generic_files/upload/_form.html.erb
+- app/views/generic_files/upload/_form_fields.html.erb
+- app/views/generic_files/upload/_script_templates.html.erb
+- app/views/generic_files/upload/_tos_checkbox.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
@@ -611,8 +464,11 @@ files:
 - app/views/kaminari/blacklight/_page.html.erb
 - 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/error.html.erb
-- app/views/layouts/hydra-head.html.erb
+- app/views/layouts/homepage.html.erb
+- app/views/layouts/sufia-one-column.html.erb
+- app/views/layouts/sufia-two-column.html.erb
 - app/views/mailbox/index.html.erb
 - app/views/single_use_link/generate_download.html.erb
 - app/views/single_use_link/generate_show.html.erb
@@ -636,6 +492,7 @@ files:
 - app/views/users/show.html.erb
 - bin/audit_repository
 - config/cucumber.yml
+- config/initializers/sufia_events.rb
 - config/jetty.yml
 - config/locales/sufia.en.yml
 - config/routes.rb
@@ -648,8 +505,8 @@ files:
 - features/ingest_upload_files.feature
 - features/step_definitions/edit_metadata_steps.rb
 - features/step_definitions/fixture_steps.rb
-- features/step_definitions/scholarsphere.rb
 - features/step_definitions/show_document_steps.rb
+- features/step_definitions/sufia.rb
 - features/step_definitions/user_steps.rb
 - features/step_definitions/web_steps.rb
 - features/support/cleanup.rb
@@ -659,7 +516,6 @@ files:
 - features/users.feature
 - fedora_conf/conf/development/fedora.fcfg
 - fedora_conf/conf/test/fedora.fcfg
-- lib/active_support/core_ext/marshal.rb
 - lib/generators/sufia/sufia_generator.rb
 - lib/generators/sufia/templates/catalog_controller.rb
 - lib/generators/sufia/templates/config/action_dispatch_http_upload_monkey_patch.rb
@@ -682,51 +538,14 @@ files:
 - lib/generators/sufia/templates/migrations/create_trophies.rb
 - lib/generators/sufia/templates/migrations/create_version_committers.rb
 - lib/sufia.rb
-- lib/sufia/active_fedora/redis.rb
-- lib/sufia/active_record/redis.rb
 - lib/sufia/batch_edits_controller_behavior.rb
 - lib/sufia/contact_form_controller_behavior.rb
 - lib/sufia/controller.rb
 - lib/sufia/dashboard_controller_behavior.rb
 - lib/sufia/downloads_controller_behavior.rb
-- lib/sufia/file_content.rb
-- lib/sufia/file_content/extract_metadata.rb
-- lib/sufia/file_content/versions.rb
 - lib/sufia/files_controller_behavior.rb
-- lib/sufia/generic_file.rb
-- lib/sufia/generic_file/actions.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/generic_file/web_form.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/ffmpeg_transcode_job.rb
-- lib/sufia/jobs/resolrize_job.rb
-- lib/sufia/jobs/transcode_audio_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/queue/resque.rb
 - lib/sufia/role_mapper.rb
 - lib/sufia/single_use_error.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
@@ -827,13 +646,75 @@ files:
 - spec/support/fedora_conf/fedora.fcfg
 - spec/support/lib/generators/test_app_generator.rb
 - spec/support/uploaded_file_monkeypatch.rb
+- spec/views/batch_edits/check_all_spec.rb
 - spec/views/single_user_link/download.html.erb_spec.rb
 - spec/views/single_user_link/generate_download.html.erb_spec.rb
 - spec/views/single_user_link/generate_show.html.erb_spec.rb
 - spec/views/single_user_link/show.html.erb_spec.rb
+- sufia-models/.gitignore
+- sufia-models/Gemfile
+- sufia-models/LICENSE.md
+- sufia-models/README.md
+- sufia-models/Rakefile
+- sufia-models/app/models/batch.rb
+- sufia-models/app/models/checksum_audit_log.rb
+- sufia-models/app/models/datastreams/batch_rdf_datastream.rb
+- sufia-models/app/models/datastreams/file_content_datastream.rb
+- sufia-models/app/models/datastreams/fits_datastream.rb
+- sufia-models/app/models/datastreams/generic_file_rdf_datastream.rb
+- sufia-models/app/models/datastreams/paranoid_rights_datastream.rb
+- sufia-models/app/models/datastreams/properties_datastream.rb
+- sufia-models/app/models/domain_term.rb
+- sufia-models/app/models/follow.rb
+- sufia-models/app/models/generic_file.rb
+- sufia-models/app/models/geo_names_resource.rb
+- sufia-models/app/models/group.rb
+- sufia-models/app/models/local_authority.rb
+- sufia-models/app/models/local_authority_entry.rb
+- sufia-models/app/models/single_use_link.rb
+- sufia-models/app/models/subject_local_authority_entry.rb
+- sufia-models/app/models/trophy.rb
+- sufia-models/app/models/version_committer.rb
+- sufia-models/config/locales/sufia.en.yml
+- sufia-models/lib/sufia/models.rb
+- sufia-models/lib/sufia/models/active_fedora/redis.rb
+- sufia-models/lib/sufia/models/active_record/redis.rb
+- sufia-models/lib/sufia/models/active_support/core_ext/marshal.rb
+- sufia-models/lib/sufia/models/engine.rb
+- sufia-models/lib/sufia/models/file_content.rb
+- sufia-models/lib/sufia/models/file_content/extract_metadata.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/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/export.rb
+- sufia-models/lib/sufia/models/generic_file/permissions.rb
+- sufia-models/lib/sufia/models/generic_file/thumbnail.rb
+- sufia-models/lib/sufia/models/generic_file/web_form.rb
+- sufia-models/lib/sufia/models/id_service.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/ffmpeg_transcode_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/jobs/unzip_job.rb
+- sufia-models/lib/sufia/models/model_methods.rb
+- sufia-models/lib/sufia/models/noid.rb
+- sufia-models/lib/sufia/models/resque.rb
+- sufia-models/lib/sufia/models/solr_document_behavior.rb
+- sufia-models/lib/sufia/models/user.rb
+- sufia-models/lib/sufia/models/utils.rb
+- sufia-models/lib/sufia/models/version.rb
+- sufia-models/lib/tasks/sufia-models_tasks.rake
+- sufia-models/sufia-models.gemspec
 - sufia.gemspec
 - tasks/cucumber.rake
 - tasks/jetty.rake
+- tasks/release.rake
 - tasks/sufia-db.rake
 - tasks/sufia-dev.rake
 - tasks/sufia-fixtures.rake
@@ -849,9 +730,6 @@ files:
 - vendor/assets/javascripts/ZeroClipboard.swf
 - vendor/assets/javascripts/audio.min.js
 - vendor/assets/javascripts/audiojs.swf
-- vendor/assets/javascripts/fileupload.js
-- vendor/assets/javascripts/fileupload/application.js
-- vendor/assets/javascripts/fileupload/jquery-ui-1.8.14.custom.min.js
 - vendor/assets/javascripts/fileupload/jquery.fileupload-ip.js
 - vendor/assets/javascripts/fileupload/jquery.fileupload-ui.js
 - vendor/assets/javascripts/fileupload/jquery.fileupload.js
@@ -900,8 +778,8 @@ test_files:
 - features/ingest_upload_files.feature
 - features/step_definitions/edit_metadata_steps.rb
 - features/step_definitions/fixture_steps.rb
-- features/step_definitions/scholarsphere.rb
 - features/step_definitions/show_document_steps.rb
+- features/step_definitions/sufia.rb
 - features/step_definitions/user_steps.rb
 - features/step_definitions/web_steps.rb
 - features/support/cleanup.rb
@@ -1001,7 +879,9 @@ test_files:
 - spec/support/fedora_conf/fedora.fcfg
 - spec/support/lib/generators/test_app_generator.rb
 - spec/support/uploaded_file_monkeypatch.rb
+- spec/views/batch_edits/check_all_spec.rb
 - spec/views/single_user_link/download.html.erb_spec.rb
 - spec/views/single_user_link/generate_download.html.erb_spec.rb
 - spec/views/single_user_link/generate_show.html.erb_spec.rb
 - spec/views/single_user_link/show.html.erb_spec.rb
+has_rdoc: