sufia 6.0.0.rc2 → 6.0.0.rc3

data/sufia-models/app/models/file_view_stat.rb

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

data/sufia-models/app/models/sufia/collection.rb

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

data/sufia-models/app/services/sufia/generic_file_indexing_service.rb

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

data/sufia-models/app/services/sufia/id_service.rb

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

data/sufia-models/app/services/sufia/noid.rb

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

data/sufia-models/sufia-models.gemspec

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

data/sufia.gemspec

@@ -31,24 +31,24 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'hydra-batch-edit', '~> 1.1'
   gem.add_dependency 'browse-everything', '~> 0.4'
   gem.add_dependency 'daemons', '~> 1.1'
-  gem.add_dependency 'mail_form'
+  gem.add_dependency 'mail_form', '~> 1.5'
   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', '~> 1.0.0.rc3'
-  gem.add_dependency 'blacklight-gallery'
-  gem.add_dependency 'breadcrumbs_on_rails', '~>2.3.0'
-  gem.add_dependency 'select2-rails'
+  gem.add_dependency 'font-awesome-rails', '~> 4.2'
+  gem.add_dependency 'hydra-editor', '~> 1.0'
+  gem.add_dependency 'blacklight-gallery', '~> 0.1'
+  gem.add_dependency 'breadcrumbs_on_rails', '~> 2.3.0'
+  gem.add_dependency 'select2-rails', '~> 3.5.9'
   gem.add_dependency "devise", "~> 3.0"
 
-  gem.add_development_dependency 'engine_cart'
-  gem.add_development_dependency 'mida'
-  gem.add_development_dependency 'database_cleaner'
-  gem.add_development_dependency 'rspec-rails'
-  gem.add_development_dependency 'rspec-its'
-  gem.add_development_dependency 'rspec-activemodel-mocks'
-  gem.add_development_dependency "capybara"
+  gem.add_development_dependency 'engine_cart', '~> 0.5'
+  gem.add_development_dependency 'mida', '~> 0.3'
+  gem.add_development_dependency 'database_cleaner', '~> 1.3'
+  gem.add_development_dependency 'rspec-rails', '~> 3.1'
+  gem.add_development_dependency 'rspec-its', '~> 1.1'
+  gem.add_development_dependency 'rspec-activemodel-mocks', '~> 1.0'
+  gem.add_development_dependency "capybara", '~> 2.4'
   gem.add_development_dependency "poltergeist", "~> 1.5"
-  gem.add_development_dependency "factory_girl_rails"
-  gem.add_development_dependency "equivalent-xml"
+  gem.add_development_dependency "factory_girl_rails", '~> 4.4'
+  gem.add_development_dependency "equivalent-xml", '~> 0.5'
 end

data/tasks/sufia-dev.rake

@@ -15,19 +15,3 @@ task ci: ['engine_cart:generate', 'jetty:clean', 'sufia:jetty:config'] do
   end
   raise "test failures: #{error}" if error
 end
-
-EXTRA_GEMS =<<EOF
-gem 'kaminari', github: 'harai/kaminari', branch: 'route_prefix_prototype'
-EOF
-
-namespace :engine_cart do
-  desc 'Regenerate embedded app for testing'
-  task regenerate: ['engine_cart:clean', 'engine_cart:generate']
-
-  # we're adding some extra stuff into the gemfile beyond what engine_cart gives us by default
-  task :inject_gemfile_extras do
-    open(File.expand_path('Gemfile', EngineCart.destination), 'a') do |f|
-      f.write EXTRA_GEMS
-    end
-  end
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sufia
 version: !ruby/object:Gem::Version
-  version: 6.0.0.rc2
+  version: 6.0.0.rc3
 platform: ruby
 authors:
 - Justin Coyne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-16 00:00:00.000000000 Z
+date: 2015-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sufia-models
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc2
+        version: 6.0.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc2
+        version: 6.0.0.rc3
 - !ruby/object:Gem::Dependency
   name: blacklight_advanced_search
   requirement: !ruby/object:Gem::Requirement
@@ -141,16 +141,16 @@ dependencies:
   name: mail_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rails_autolink
   requirement: !ruby/object:Gem::Requirement
@@ -183,44 +183,44 @@ dependencies:
   name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: hydra-editor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: blacklight-gallery
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: breadcrumbs_on_rails
   requirement: !ruby/object:Gem::Requirement
@@ -239,16 +239,16 @@ dependencies:
   name: select2-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.9
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -267,100 +267,100 @@ dependencies:
   name: engine_cart
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: mida
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rspec-activemodel-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: poltergeist
   requirement: !ruby/object:Gem::Requirement
@@ -379,30 +379,30 @@ dependencies:
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.4'
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
 description: Sufia is a Rails engine for creating a self-deposit institutional repository
 email:
 - justin@curationexperts.com
@@ -418,7 +418,7 @@ files:
 - CONTRIBUTING.md
 - Gemfile
 - History.md
-- LICENSE.md
+- LICENSE
 - README.md
 - RELEASING.md
 - Rakefile
@@ -526,10 +526,12 @@ files:
 - app/assets/stylesheets/sufia/_file-listing.scss
 - app/assets/stylesheets/sufia/_header.scss
 - app/assets/stylesheets/sufia/_home-page.scss
+- app/assets/stylesheets/sufia/_multi_value_fields.css.scss
 - app/assets/stylesheets/sufia/_proxy-rights.scss
 - app/assets/stylesheets/sufia/_settings.scss
 - app/assets/stylesheets/sufia/_styles.scss
 - app/assets/stylesheets/sufia/_tagcloud.scss
+- app/assets/stylesheets/sufia/_tinymce.scss
 - app/assets/stylesheets/sufia/_usage-stats.scss
 - app/builders/sufia/bootstrap_breadcrumbs_builder.rb
 - app/controllers/authorities_controller.rb
@@ -601,7 +603,6 @@ files:
 - app/jobs/content_restored_version_event_job.rb
 - app/jobs/content_update_event_job.rb
 - app/jobs/event_job.rb
-- app/jobs/ingest_local_file_job.rb
 - app/jobs/user_edit_profile_event_job.rb
 - app/jobs/user_follow_event_job.rb
 - app/jobs/user_unfollow_event_job.rb
@@ -777,6 +778,7 @@ files:
 - app/views/my/facet.html.erb
 - app/views/my/index.html.erb
 - app/views/pages/show.html.erb
+- app/views/records/_rights_modal.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
@@ -813,6 +815,8 @@ files:
 - app/views/users/_activity.html.erb
 - app/views/users/_activity_log.html.erb
 - app/views/users/_contributions.html.erb
+- app/views/users/_edit_primary.html.erb
+- app/views/users/_edit_secondary.html.erb
 - app/views/users/_follower_modal.html.erb
 - app/views/users/_following_modal.html.erb
 - app/views/users/_left_sidebar.html.erb
@@ -832,8 +836,11 @@ files:
 - app/views/users/notifications_number.js.erb
 - app/views/users/show.html.erb
 - bin/audit_repository
+- config/initializers/simple_form.rb
+- config/initializers/simple_form_bootstrap.rb
 - config/initializers/sufia_events.rb
 - config/jetty.yml
+- config/locales/simple_form.en.yml
 - config/locales/sufia.en.yml
 - config/routes.rb
 - db/data.yml
@@ -896,6 +903,7 @@ files:
 - spec/features/collection_spec.rb
 - spec/features/contact_form_spec.rb
 - spec/features/display_dashboard_spec.rb
+- spec/features/edit_file_spec.rb
 - spec/features/ingest_upload_files_spec.rb
 - spec/features/notifications_spec.rb
 - spec/features/ownership_transfer_spec.rb
@@ -942,6 +950,7 @@ files:
 - spec/helpers/sufia_helper_spec.rb
 - spec/helpers/trophy_helper_spec.rb
 - spec/inputs/multi_value_with_help_input_spec.rb
+- spec/inputs/select_with_help_input_spec.rb
 - spec/inputs/select_with_modal_help_input_spec.rb
 - spec/jobs/active_fedora_pid_based_job_spec.rb
 - spec/jobs/audit_job_spec.rb
@@ -965,6 +974,7 @@ files:
 - spec/models/characterization_spec.rb
 - spec/models/checksum_audit_log_spec.rb
 - spec/models/collection_spec.rb
+- spec/models/content_block_spec.rb
 - spec/models/download_spec.rb
 - spec/models/featured_work_list_spec.rb
 - spec/models/featured_work_spec.rb
@@ -985,6 +995,7 @@ files:
 - spec/models/user_spec.rb
 - spec/models/user_usage_stats_spec.rb
 - spec/presenters/presenter_renderer_spec.rb
+- spec/presenters/sufia/collection_presenter_spec.rb
 - spec/presenters/sufia/generic_file_presenter_spec.rb
 - spec/presenters/sufia/version_list_presenter_spec.rb
 - spec/presenters/sufia/version_presenter_spec.rb
@@ -1007,6 +1018,7 @@ files:
 - spec/support/selectors.rb
 - spec/support/statistic_helper.rb
 - spec/support/uploaded_file_monkeypatch.rb
+- spec/test_app_templates/Gemfile.extra
 - 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
@@ -1021,6 +1033,7 @@ files:
 - 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
+- spec/views/homepage/_featured_works.html.erb_spec.rb
 - spec/views/my/facet.html.erb_spec.rb
 - spec/views/users/_follower_modal.html.erb_spec.rb
 - spec/views/users/_following_modal.html.erb_spec.rb
@@ -1040,12 +1053,12 @@ files:
 - 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/ingest_local_file_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/collection_behavior.rb
 - sufia-models/app/models/concerns/sufia/file_stat_utils.rb
 - sufia-models/app/models/concerns/sufia/generic_file.rb
 - sufia-models/app/models/concerns/sufia/generic_file/batches.rb
@@ -1085,6 +1098,7 @@ files:
 - sufia-models/app/models/subject_local_authority_entry.rb
 - sufia-models/app/models/sufia/avatar_uploader.rb
 - sufia-models/app/models/sufia/avatar_validator.rb
+- sufia-models/app/models/sufia/collection.rb
 - sufia-models/app/models/sufia/download.rb
 - sufia-models/app/models/sufia/orcid_validator.rb
 - sufia-models/app/models/sufia/pageview.rb
@@ -1095,7 +1109,6 @@ files:
 - sufia-models/app/services/sufia/generic_file_audit_service.rb
 - sufia-models/app/services/sufia/generic_file_indexing_service.rb
 - sufia-models/app/services/sufia/id_service.rb
-- sufia-models/app/services/sufia/indexing_service.rb
 - sufia-models/app/services/sufia/noid.rb
 - sufia-models/app/services/sufia/repository_audit_service.rb
 - sufia-models/config/locales/sufia.en.yml
@@ -1105,6 +1118,7 @@ files:
 - sufia-models/lib/generators/sufia/models/install_generator.rb
 - sufia-models/lib/generators/sufia/models/orcid_field_generator.rb
 - sufia-models/lib/generators/sufia/models/proxies_generator.rb
+- sufia-models/lib/generators/sufia/models/templates/app/models/collection.rb
 - sufia-models/lib/generators/sufia/models/templates/config/analytics.yml
 - sufia-models/lib/generators/sufia/models/templates/config/clamav.rb
 - sufia-models/lib/generators/sufia/models/templates/config/mailboxer.rb
@@ -1119,6 +1133,7 @@ files:
 - 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
+- sufia-models/lib/generators/sufia/models/templates/migrations/add_external_key_to_content_blocks.rb
 - sufia-models/lib/generators/sufia/models/templates/migrations/add_groups_to_users.rb
 - sufia-models/lib/generators/sufia/models/templates/migrations/add_ldap_attrs_to_user.rb
 - sufia-models/lib/generators/sufia/models/templates/migrations/add_linkedin_to_users.rb
@@ -1137,6 +1152,7 @@ files:
 - sufia-models/lib/generators/sufia/models/templates/migrations/create_trophies.rb
 - sufia-models/lib/generators/sufia/models/templates/migrations/create_user_stats.rb
 - sufia-models/lib/generators/sufia/models/templates/migrations/create_version_committers.rb
+- sufia-models/lib/generators/sufia/models/update_content_blocks_generator.rb
 - sufia-models/lib/generators/sufia/models/upgrade400_generator.rb
 - sufia-models/lib/generators/sufia/models/usagestats_generator.rb
 - sufia-models/lib/generators/sufia/models/user_stats_generator.rb
@@ -1222,7 +1238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Sufia was extracted from ScholarSphere developed by Penn State University
@@ -1269,6 +1285,7 @@ test_files:
 - spec/features/collection_spec.rb
 - spec/features/contact_form_spec.rb
 - spec/features/display_dashboard_spec.rb
+- spec/features/edit_file_spec.rb
 - spec/features/ingest_upload_files_spec.rb
 - spec/features/notifications_spec.rb
 - spec/features/ownership_transfer_spec.rb
@@ -1315,6 +1332,7 @@ test_files:
 - spec/helpers/sufia_helper_spec.rb
 - spec/helpers/trophy_helper_spec.rb
 - spec/inputs/multi_value_with_help_input_spec.rb
+- spec/inputs/select_with_help_input_spec.rb
 - spec/inputs/select_with_modal_help_input_spec.rb
 - spec/jobs/active_fedora_pid_based_job_spec.rb
 - spec/jobs/audit_job_spec.rb
@@ -1338,6 +1356,7 @@ test_files:
 - spec/models/characterization_spec.rb
 - spec/models/checksum_audit_log_spec.rb
 - spec/models/collection_spec.rb
+- spec/models/content_block_spec.rb
 - spec/models/download_spec.rb
 - spec/models/featured_work_list_spec.rb
 - spec/models/featured_work_spec.rb
@@ -1358,6 +1377,7 @@ test_files:
 - spec/models/user_spec.rb
 - spec/models/user_usage_stats_spec.rb
 - spec/presenters/presenter_renderer_spec.rb
+- spec/presenters/sufia/collection_presenter_spec.rb
 - spec/presenters/sufia/generic_file_presenter_spec.rb
 - spec/presenters/sufia/version_list_presenter_spec.rb
 - spec/presenters/sufia/version_presenter_spec.rb
@@ -1380,6 +1400,7 @@ test_files:
 - spec/support/selectors.rb
 - spec/support/statistic_helper.rb
 - spec/support/uploaded_file_monkeypatch.rb
+- spec/test_app_templates/Gemfile.extra
 - 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
@@ -1394,6 +1415,7 @@ test_files:
 - 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
+- spec/views/homepage/_featured_works.html.erb_spec.rb
 - spec/views/my/facet.html.erb_spec.rb
 - spec/views/users/_follower_modal.html.erb_spec.rb
 - spec/views/users/_following_modal.html.erb_spec.rb