sufia 4.0.0.rc1 → 4.0.0.rc2

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

@@ -25,11 +25,10 @@ module Sufia
       config.enable_local_ingest = nil
       config.analytics = false
       config.queue = Sufia::Resque::Queue
+      config.max_notifications_for_dashboard = 5
 
       config.autoload_paths += %W(
-        #{config.root}/lib/sufia/models/jobs
         #{config.root}/app/models/datastreams
-        #{config.root}/app/models/concerns
       )
 
       rake_tasks do
@@ -44,7 +43,6 @@ module Sufia
       initializer 'requires' do
         require 'activerecord-import'
         require 'hydra/derivatives'
-        require 'sufia/models/model_methods'
         require 'sufia/models/file_content'
         require 'sufia/models/file_content/versions'
         require 'sufia/models/user_local_directory_behavior'

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

@@ -14,7 +14,7 @@ module Sufia
         begin
           ::Resque.enqueue_to queue, MarshaledJob, Base64.encode64(Marshal.dump(job))
         rescue Redis::CannotConnectError
-          logger.error "Redis is down!"
+          ActiveFedora::Base.logger.error "Redis is down!"
         end
       end
     end

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

@@ -1,5 +1,5 @@
 module Sufia
   module Models
-    VERSION = "4.0.0.rc1"
+    VERSION = "4.0.0.rc2"
   end
 end

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

@@ -0,0 +1,9 @@
+module Sufia
+  module Permissions
+    extend ActiveSupport::Autoload
+
+    autoload :Writable
+    autoload :Readable
+
+  end
+end

data/sufia-models/lib/sufia/permissions/readable.rb

@@ -0,0 +1,20 @@
+module Sufia
+  module Permissions
+    module Readable
+      extend ActiveSupport::Concern
+
+      def public?
+        read_groups.include?('public')
+      end
+
+      def registered?
+        read_groups.include?('registered')
+      end
+
+      def private?
+        !(public? || registered?)
+      end
+
+    end
+  end
+end

data/sufia-models/lib/sufia/permissions/writable.rb

@@ -0,0 +1,56 @@
+module Sufia
+  module Permissions
+    module Writable
+      extend ActiveSupport::Concern
+
+      #we're overriding the permissions= method which is in Hydra::AccessControls::Permissions
+      include Hydra::AccessControls::Permissions
+      include Hydra::AccessControls::Visibility
+
+      included do
+        has_metadata "rightsMetadata", type: ParanoidRightsDatastream
+        validate :paranoid_permissions
+      end
+
+      def paranoid_permissions
+        # let the rightsMetadata ds make this determination
+        # - the object instance is passed in for easier access to the props ds
+        rightsMetadata.validate(self)
+      end
+
+      ## Updates those permissions that are provided to it. Does not replace any permissions unless they are provided
+      def permissions=(params)
+        perm_hash = permission_hash
+        params[:new_user_name].each { |name, access| perm_hash['person'][name] = access } if params[:new_user_name].present?
+        params[:new_group_name].each { |name, access| perm_hash['group'][name] = access } if params[:new_group_name].present?
+
+        params[:user].each { |name, access| perm_hash['person'][name] = access} if params[:user]
+        params[:group].each { |name, access| perm_hash['group'][name] = access if ['read', 'edit'].include?(access)} if params[:group]
+
+        rightsMetadata.update_permissions(perm_hash)
+      end
+
+      def permissions
+        perms = super
+        perms.map {|p| { name: p.name, access: p.access, type:p.type } }
+      end
+
+      private
+
+      def permission_hash
+        old_perms = self.permissions
+        user_perms =  {}
+        old_perms.select{|r| r[:type] == 'user'}.each do |r|
+          user_perms[r[:name]] = r[:access]
+        end
+        user_perms
+        group_perms =  {}
+        old_perms.select{|r| r[:type] == 'group'}.each do |r|
+          group_perms[r[:name]] = r[:access]
+        end
+        {'person'=>user_perms, 'group'=>group_perms}
+      end
+
+    end
+  end
+end

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

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

data/sufia-models/sufia-models.gemspec

@@ -24,22 +24,22 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rake", "~> 10.3"
 
   spec.add_dependency 'rails', '~> 4.0', '< 5.0.0'
-  spec.add_dependency 'activeresource', "~>4.0.0" # No longer a dependency of rails 4.0
+  spec.add_dependency 'activeresource', "~> 4.0" # No longer a dependency of rails 4.0
 
   spec.add_dependency "hydra-head", "~> 7.0"
-  spec.add_dependency 'nest', '~> 1.1.1'
+  spec.add_dependency 'nest', '~> 1.1'
   spec.add_dependency 'resque', '~> 1.23'
-  spec.add_dependency 'resque-pool', '~> 0.3.0'
-  spec.add_dependency 'noid', '~> 0.6.6'
-  spec.add_dependency 'mailboxer', '~> 0.12.0'
+  spec.add_dependency 'resque-pool', '~> 0.3'
+  spec.add_dependency 'noid', '~> 0.6'
+  spec.add_dependency 'mailboxer', '~> 0.12'
   spec.add_dependency 'acts_as_follower', '>= 0.1.1', '< 0.3'
-  spec.add_dependency 'carrierwave', '~> 0.9.0'
+  spec.add_dependency 'carrierwave', '~> 0.9'
   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'
-  spec.add_dependency 'activerecord-import'
+  spec.add_dependency 'oauth2', '~> 0.9'
+  spec.add_dependency 'google-api-client', '~> 0.7'
+  spec.add_dependency 'legato', '~> 0.3'
+  spec.add_dependency 'activerecord-import', '~> 0.5'
 end

data/sufia.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'sufia-models', version
   gem.add_dependency 'blacklight_advanced_search', '~> 5.0'
-  gem.add_dependency 'blacklight', '~> 5.0'
+  gem.add_dependency 'blacklight', '~> 5.5'
   gem.add_dependency 'tinymce-rails', '~> 4.0.19'
   gem.add_dependency 'tinymce-rails-imageupload', '~> 4.0.16.beta'
 
@@ -29,16 +29,26 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'sass-rails'
 
   gem.add_dependency 'hydra-batch-edit', '>= 1.1.1', '< 2.0.0'
-  gem.add_dependency 'browse-everything', '>= 0.4.0'
+  gem.add_dependency 'browse-everything', '~> 0.4'
 
-  gem.add_dependency 'daemons', '1.1.9'
+  gem.add_dependency 'daemons', '~> 1.1'
   gem.add_dependency 'mail_form'
-  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', '~> 0.3.0'
-  gem.add_dependency 'hydra-collections', '~> 2.0.2'
-  gem.add_dependency 'bootstrap_form', '~> 2.1.1'
+  gem.add_dependency 'rails_autolink', '~> 1.1'
+  gem.add_dependency 'yaml_db', '~> 0.2'
+  gem.add_dependency 'font-awesome-rails'
+  gem.add_dependency 'hydra-editor', '~> 0.3'
+  gem.add_dependency 'hydra-collections', '~> 2.0'
+  gem.add_dependency 'bootstrap_form', '~> 2.1'
+  gem.add_dependency 'bootstrap-sass', '< 3.2'
   gem.add_dependency 'blacklight-gallery'
 
+  gem.add_development_dependency 'engine_cart'
+  gem.add_development_dependency 'mida'
+  gem.add_development_dependency 'database_cleaner'
+  gem.add_development_dependency 'rspec-its'
+  gem.add_development_dependency 'rspec-activemodel-mocks'
+  gem.add_development_dependency "capybara"
+  gem.add_development_dependency "poltergeist", "~> 1.5"
+  gem.add_development_dependency "factory_girl_rails"
+
 end

data/tasks/jetty.rake

@@ -1,13 +1,14 @@
 namespace :jetty do
   desc "Copies the default Solr & Fedora configs into the bundled Hydra Testing Server"
   task :config do
-    Rake::Task["jetty:config_fedora"].invoke
+    Rake::Task['sufia:jetty:download_jars'].invoke
     Rake::Task["jetty:config_solr"].invoke
+    Rake::Task["jetty:config_fedora"].invoke
   end
-  
+
   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|  
+    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)
     end
@@ -15,13 +16,13 @@ namespace :jetty do
 
   desc "Copies a custom fedora config for the bundled Hydra Testing Server"
   task :config_fedora do
-    # load a custom fedora.fcfg - 
+    # load a custom fedora.fcfg -
     if defined?(Rails.root)
       app_root = Rails.root
     else
       app_root = File.join(File.dirname(__FILE__),"..")
     end
-     
+
     fcfg = File.join(app_root,"fedora_conf","conf","development","fedora.fcfg")
     if File.exists?(fcfg)
       puts "copying over development/fedora.fcfg"

data/tasks/sufia-dev.rake

@@ -1,11 +1,12 @@
 require 'rspec/core'
 require 'rspec/core/rake_task'
-APP_ROOT="." # for jettywrapper
+RSpec::Core::RakeTask.new(:spec)
+
 require 'jettywrapper'
-#ENV["RAILS_ROOT"] ||= 'spec/internal'
+require 'engine_cart/rake_task'
 
 desc 'Spin up hydra-jetty and run specs'
-task ci: ['jetty:clean', 'jetty:config'] do
+task ci: ['engine_cart:generate', 'jetty:clean', 'sufia:jetty:config'] do
   puts 'running continuous integration'
   jetty_params = Jettywrapper.load_config
   error = Jettywrapper.wrap(jetty_params) do
@@ -13,77 +14,3 @@ task ci: ['jetty:clean', 'jetty:config'] do
   end
   raise "test failures: #{error}" if error
 end
-
-task spec: :generate do
-  Bundler.with_clean_env do
-    within_test_app do
-      Rake::Task['rspec'].invoke
-    end
-  end
-end
-
-desc "Run specs"
-RSpec::Core::RakeTask.new(:rspec) do |t|
-  t.pattern = '../**/*_spec.rb'
-  if ENV["TRAVIS"]
-    t.rspec_opts = ["--colour -I ../", '--backtrace', '--profile 20']
-  else
-    t.rspec_opts = ["--colour -I ../"]
-  end
-end
-
-desc "Create the test rails app"
-task :generate do
-  unless File.exists?('spec/internal/Rakefile')
-    puts "Generating rails app"
-    `rails new spec/internal`
-    puts "Updating gemfile"
-
-    `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`
-    Bundler.with_clean_env do
-      within_test_app do
-        puts "Bundle install"
-        `bundle install`
-        puts "running test_app_generator"
-        system "rails generate test_app"
-
-        # These factories are autogenerated and conflict with our factories
-        system 'rm test/factories/users.rb'
-        puts "running migrations"
-        puts `rake db:migrate db:test:prepare`
-      end
-    end
-  end
-  puts "Done generating test app"
-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
-
-def within_test_app
-  FileUtils.cd('spec/internal')
-  yield
-  FileUtils.cd('../..')
-end
-
-namespace :meme do
-  desc "configure jetty to generate checksums"
-  task :config do
-  end
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sufia
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc1
+  version: 4.0.0.rc2
 platform: ruby
 authors:
 - Justin Coyne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-06 00:00:00.000000000 Z
+date: 2014-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sufia-models
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc1
+        version: 4.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc1
+        version: 4.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: blacklight_advanced_search
   requirement: !ruby/object:Gem::Requirement
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.5'
 - !ruby/object:Gem::Dependency
   name: tinymce-rails
   requirement: !ruby/object:Gem::Requirement
@@ -119,30 +119,30 @@ dependencies:
   name: browse-everything
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: daemons
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.9
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.9
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: mail_form
   requirement: !ruby/object:Gem::Requirement
@@ -163,84 +163,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: yaml_db
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: font-awesome-sass-rails
+  name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: hydra-editor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: hydra-collections
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bootstrap_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: bootstrap-sass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: blacklight-gallery
   requirement: !ruby/object:Gem::Requirement
@@ -255,6 +269,118 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: engine_cart
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mida
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-activemodel-mocks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: poltergeist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: factory_girl_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  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@curationexperts.com
@@ -287,7 +413,6 @@ 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/hydra/powered_by_hydra.png
 - app/assets/images/hydra/search-button.png
 - app/assets/images/loading.gif
@@ -339,6 +464,7 @@ files:
 - app/assets/javascripts/sufia.js
 - app/assets/javascripts/sufia/app.js
 - app/assets/javascripts/sufia/audio.js
+- app/assets/javascripts/sufia/batch.js
 - app/assets/javascripts/sufia/batch_edit.js
 - app/assets/javascripts/sufia/batch_select_all.js
 - app/assets/javascripts/sufia/dashboard_actions.js
@@ -351,9 +477,12 @@ files:
 - app/assets/javascripts/sufia/permissions.js
 - app/assets/javascripts/sufia/search.js
 - app/assets/javascripts/sufia/single_use_link.js
+- app/assets/javascripts/sufia/tabs.js
 - app/assets/javascripts/sufia/trophy.js
 - app/assets/javascripts/sufia/uploader.js
 - app/assets/javascripts/terms_of_service.js
+- app/assets/stylesheets/catalog.css.scss
+- app/assets/stylesheets/collections.css.scss
 - app/assets/stylesheets/featured.css.scss
 - app/assets/stylesheets/file-listing.css.scss
 - app/assets/stylesheets/fileupload/application.css
@@ -366,6 +495,7 @@ files:
 - app/assets/stylesheets/home-page.css.scss
 - app/assets/stylesheets/jquery-ui.css
 - app/assets/stylesheets/nestable.css.scss
+- app/assets/stylesheets/settings.css.scss
 - app/assets/stylesheets/styles.css.scss
 - app/assets/stylesheets/sufia-audio-overrides.css
 - app/assets/stylesheets/sufia.css.scss
@@ -486,18 +616,21 @@ files:
 - 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_document_list.html.erb
+- app/views/collections/_show_document_list_menu.html.erb
+- app/views/collections/_show_document_list_row.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/collections/show_fields/_creator.html.erb
-- app/views/collections/show_fields/_description.html.erb
-- app/views/collections/show_fields/_title.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/_index_partials/_contents.html.erb
+- app/views/dashboard/_index_partials/_heading_actions.html.erb
+- app/views/dashboard/_index_partials/_heading_greetings.html.erb
 - app/views/dashboard/_index_partials/_stats.html.erb
 - app/views/dashboard/_index_partials/_user_info.html.erb
 - app/views/dashboard/index.html.erb
@@ -524,34 +657,17 @@ files:
 - app/views/generic_files/_permission.html.erb
 - app/views/generic_files/_permission_form.html.erb
 - app/views/generic_files/_rights_modal.html.erb
+- app/views/generic_files/_share_with.html.erb
 - app/views/generic_files/_show_actions.html.erb
+- app/views/generic_files/_show_collections.html.erb
 - app/views/generic_files/_show_descriptions.html.erb
 - app/views/generic_files/_show_details.html.erb
 - app/views/generic_files/_versioning.html.erb
+- app/views/generic_files/_visibility.html.erb
 - app/views/generic_files/citation.html.erb
 - 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/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/_default.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/stats.html.erb
 - app/views/generic_files/upload/_agreement.html.erb
 - app/views/generic_files/upload/_alerts.html.erb
@@ -591,6 +707,7 @@ files:
 - app/views/my/_action_menu.html.erb
 - app/views/my/_batch_edits_actions.html.erb
 - app/views/my/_collection_action_menu.html.erb
+- app/views/my/_constraints.html.erb
 - app/views/my/_did_you_mean.html.erb
 - app/views/my/_document_list.html.erb
 - app/views/my/_facet_layout.html.erb
@@ -603,16 +720,34 @@ files:
 - app/views/my/_index_partials/_list_files.html.erb
 - app/views/my/_results_pagination.html.erb
 - app/views/my/_scripts.js.erb
+- app/views/my/_search_header.html.erb
 - app/views/my/_sort_and_per_page.html.erb
 - app/views/my/facet.html.erb
 - app/views/my/index.html.erb
 - app/views/pages/show.html.erb
 - app/views/records/_edit_field.html.erb
+- app/views/records/edit_fields/_default.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/records/show_fields/_based_near.html.erb
+- app/views/records/show_fields/_contributor.html.erb
+- app/views/records/show_fields/_creator.html.erb
+- app/views/records/show_fields/_date_created.html.erb
+- app/views/records/show_fields/_default.html.erb
+- app/views/records/show_fields/_description.html.erb
+- app/views/records/show_fields/_identifier.html.erb
+- app/views/records/show_fields/_language.html.erb
+- app/views/records/show_fields/_publisher.html.erb
+- app/views/records/show_fields/_related_url.html.erb
+- app/views/records/show_fields/_resource_type.html.erb
+- app/views/records/show_fields/_rights.html.erb
+- app/views/records/show_fields/_subject.html.erb
+- app/views/records/show_fields/_tag.html.erb
+- app/views/records/show_fields/_title.html.erb
+- app/views/shared/_attributes.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
@@ -637,6 +772,7 @@ files:
 - app/views/users/_social_media_info.html.erb
 - app/views/users/_trophy_edit.html.erb
 - app/views/users/_user_info.html.erb
+- app/views/users/_user_util_links_extra.html.erb
 - app/views/users/_vitals.html.erb
 - app/views/users/edit.html.erb
 - app/views/users/index.html.erb
@@ -651,7 +787,7 @@ files:
 - db/seeds.rb
 - fedora_conf/conf/development/fedora.fcfg
 - fedora_conf/conf/test/fedora.fcfg
-- lib/generators/sufia/sufia_generator.rb
+- lib/generators/sufia/install_generator.rb
 - 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
@@ -667,7 +803,6 @@ files:
 - solr_conf/conf/solrconfig.xml
 - 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
@@ -711,6 +846,7 @@ files:
 - spec/features/search_spec.rb
 - spec/features/single_use_links_spec.rb
 - spec/features/users_spec.rb
+- spec/fixtures/1.5mb-avatar.jpg
 - spec/fixtures/4-20.png
 - spec/fixtures/Example.ogg
 - spec/fixtures/charter.docx
@@ -739,8 +875,10 @@ files:
 - spec/fixtures/world.png
 - spec/fixtures/xls_fits.xml
 - spec/fixtures/xml_fits.xml
+- spec/helpers/batch_edits_helper_spec.rb
 - spec/helpers/content_block_helper_spec.rb
 - spec/helpers/dashboard_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
@@ -754,7 +892,10 @@ files:
 - spec/jobs/ingest_local_file_job_spec.rb
 - spec/lib/sufia/analytics_spec.rb
 - spec/lib/sufia/id_service_spec.rb
+- spec/lib/sufia/messages_spec.rb
+- spec/lib/sufia/readable_permissions_spec.rb
 - spec/lib/sufia/upload_complete_behavior_spec.rb
+- spec/lib/sufia/writable_permissions_spec.rb
 - spec/models/ability_spec.rb
 - spec/models/batch_spec.rb
 - spec/models/checksum_audit_log_spec.rb
@@ -786,12 +927,16 @@ files:
 - spec/support/features/session_helpers.rb
 - spec/support/fedora_conf/fedora.fcfg
 - spec/support/fixture_helpers.rb
-- spec/support/lib/generators/test_app_generator.rb
 - spec/support/uploaded_file_monkeypatch.rb
+- spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/views/batch/edit.html.erb_spec.rb
 - spec/views/batch_edits/check_all_spec.rb
-- spec/views/catalog/sort_and_per_pange.html.erb_spec.rb
+- spec/views/catalog/index.html.erb_spec.rb
+- spec/views/catalog/sort_and_per_page.html.erb_spec.rb
+- spec/views/collections/_form.html.erb_spec.rb
+- spec/views/collections/_show_descriptions.html.erb_spec.rb
 - spec/views/dashboard/index_spec.rb
+- spec/views/generic_file/_breadcrumbs.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
@@ -799,6 +944,7 @@ files:
 - spec/views/users/_follower_modal.html.erb_spec.rb
 - spec/views/users/_following_modal.html.erb_spec.rb
 - spec/views/users/_notify_number.html.erb_spec.rb
+- spec/views/users/_user_util_links.html.erb_spec.rb
 - spec/views/users/index.html.erb_spec.rb
 - spec/views/users/show.html.erb_spec.rb
 - sufia-models/.gitignore
@@ -807,9 +953,18 @@ files:
 - sufia-models/README.md
 - sufia-models/Rakefile
 - sufia-models/app/actors/sufia/generic_file/actor.rb
+- sufia-models/app/jobs/active_fedora_pid_based_job.rb
+- sufia-models/app/jobs/audit_job.rb
+- sufia-models/app/jobs/batch_update_job.rb
+- sufia-models/app/jobs/characterize_job.rb
+- sufia-models/app/jobs/create_derivatives_job.rb
+- sufia-models/app/jobs/import_url_job.rb
+- sufia-models/app/jobs/resolrize_job.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/ability.rb
+- sufia-models/app/models/concerns/sufia/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
@@ -817,6 +972,7 @@ files:
 - 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/full_text_indexing.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
@@ -825,6 +981,7 @@ files:
 - 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/model_methods.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
@@ -854,6 +1011,7 @@ files:
 - sufia-models/app/services/sufia/id_service.rb
 - sufia-models/app/services/sufia/noid.rb
 - sufia-models/config/locales/sufia.en.yml
+- sufia-models/lib/generators/sufia/models/fulltext_generator.rb
 - sufia-models/lib/generators/sufia/models/install_generator.rb
 - sufia-models/lib/generators/sufia/models/templates/config/analytics.yml
 - sufia-models/lib/generators/sufia/models/templates/config/clamav.rb
@@ -864,6 +1022,7 @@ files:
 - sufia-models/lib/generators/sufia/models/templates/config/resque_admin.rb
 - sufia-models/lib/generators/sufia/models/templates/config/resque_config.rb
 - sufia-models/lib/generators/sufia/models/templates/config/setup_mail.rb
+- sufia-models/lib/generators/sufia/models/templates/config/solrconfig.xml
 - sufia-models/lib/generators/sufia/models/templates/config/sufia.rb
 - sufia-models/lib/generators/sufia/models/templates/migrations/acts_as_follower_migration.rb
 - sufia-models/lib/generators/sufia/models/templates/migrations/add_avatars_to_users.rb
@@ -881,26 +1040,21 @@ files:
 - sufia-models/lib/generators/sufia/models/templates/migrations/create_version_committers.rb
 - sufia-models/lib/generators/sufia/models/upgrade400_generator.rb
 - sufia-models/lib/generators/sufia/models/usagestats_generator.rb
-- sufia-models/lib/sufia/ability.rb
+- sufia-models/lib/sufia/messages.rb
 - 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/engine.rb
 - sufia-models/lib/sufia/models/file_content.rb
 - sufia-models/lib/sufia/models/file_content/versions.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/model_methods.rb
 - sufia-models/lib/sufia/models/resque.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
 - sufia-models/lib/sufia/models/virus_found_error.rb
+- sufia-models/lib/sufia/permissions.rb
+- sufia-models/lib/sufia/permissions/readable.rb
+- sufia-models/lib/sufia/permissions/writable.rb
 - sufia-models/lib/tasks/resque.rake
 - sufia-models/lib/tasks/sufia-models_tasks.rake
 - sufia-models/sufia-models.gemspec
@@ -973,7 +1127,6 @@ specification_version: 4
 summary: Sufia was extracted from ScholarSphere developed by Penn State University
 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
@@ -1017,6 +1170,7 @@ test_files:
 - spec/features/search_spec.rb
 - spec/features/single_use_links_spec.rb
 - spec/features/users_spec.rb
+- spec/fixtures/1.5mb-avatar.jpg
 - spec/fixtures/4-20.png
 - spec/fixtures/Example.ogg
 - spec/fixtures/charter.docx
@@ -1045,8 +1199,10 @@ test_files:
 - spec/fixtures/world.png
 - spec/fixtures/xls_fits.xml
 - spec/fixtures/xml_fits.xml
+- spec/helpers/batch_edits_helper_spec.rb
 - spec/helpers/content_block_helper_spec.rb
 - spec/helpers/dashboard_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
@@ -1060,7 +1216,10 @@ test_files:
 - spec/jobs/ingest_local_file_job_spec.rb
 - spec/lib/sufia/analytics_spec.rb
 - spec/lib/sufia/id_service_spec.rb
+- spec/lib/sufia/messages_spec.rb
+- spec/lib/sufia/readable_permissions_spec.rb
 - spec/lib/sufia/upload_complete_behavior_spec.rb
+- spec/lib/sufia/writable_permissions_spec.rb
 - spec/models/ability_spec.rb
 - spec/models/batch_spec.rb
 - spec/models/checksum_audit_log_spec.rb
@@ -1092,12 +1251,16 @@ test_files:
 - spec/support/features/session_helpers.rb
 - spec/support/fedora_conf/fedora.fcfg
 - spec/support/fixture_helpers.rb
-- spec/support/lib/generators/test_app_generator.rb
 - spec/support/uploaded_file_monkeypatch.rb
+- spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/views/batch/edit.html.erb_spec.rb
 - spec/views/batch_edits/check_all_spec.rb
-- spec/views/catalog/sort_and_per_pange.html.erb_spec.rb
+- spec/views/catalog/index.html.erb_spec.rb
+- spec/views/catalog/sort_and_per_page.html.erb_spec.rb
+- spec/views/collections/_form.html.erb_spec.rb
+- spec/views/collections/_show_descriptions.html.erb_spec.rb
 - spec/views/dashboard/index_spec.rb
+- spec/views/generic_file/_breadcrumbs.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
@@ -1105,6 +1268,6 @@ test_files:
 - spec/views/users/_follower_modal.html.erb_spec.rb
 - spec/views/users/_following_modal.html.erb_spec.rb
 - spec/views/users/_notify_number.html.erb_spec.rb
+- spec/views/users/_user_util_links.html.erb_spec.rb
 - spec/views/users/index.html.erb_spec.rb
 - spec/views/users/show.html.erb_spec.rb
-has_rdoc: