sufia 6.0.0.beta1 → 6.0.0.rc1

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

@@ -1,12 +1,7 @@
-# -*- encoding : utf-8 -*-
-require 'rails/generators'
-require 'rails/generators/migration'
-
-class Sufia::Models::InstallGenerator < Rails::Generators::Base
-  include Rails::Generators::Migration
+require_relative 'abstract_migration_generator'
 
+class Sufia::Models::InstallGenerator < Sufia::Models::AbstractMigrationGenerator
   source_root File.expand_path('../templates', __FILE__)
-
   argument     :model_name, type: :string , default: "user"
   desc """
 This generator makes the following changes to your application:
@@ -19,30 +14,15 @@ This generator makes the following changes to your application:
  7. Runs full-text generator
  8. Runs proxies generator
  9. Runs cached stats generator
+10. Runs ORCID field generator
+11. Runs user stats generator
        """
-
-  # Implement the required interface for Rails::Generators::Migration.
-  # taken from http://github.com/rails/rails/blob/master/activerecord/lib/generators/active_record.rb
-  def self.next_migration_number(path)
-    if @prev_migration_nr
-      @prev_migration_nr += 1
-    else
-      if last_migration = Dir[File.join(path, '*.rb')].sort.last
-        @prev_migration_nr = last_migration.sub(File.join(path, '/'), '').to_i + 1
-      else
-        @prev_migration_nr = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
-      end
-    end
-    @prev_migration_nr.to_s
-  end
-
   def banner
     say_status("warning", "GENERATING SUFIA MODELS", :yellow)
   end
 
   # Setup the database migrations
   def copy_migrations
-    # Can't get this any more DRY, because we need this order.
     [
       "acts_as_follower_migration.rb",
       "add_social_to_users.rb",
@@ -114,13 +94,13 @@ This generator makes the following changes to your application:
     generate 'sufia:models:cached_stats'
   end
 
-  private
+  # Adds orcid field to user model
+  def orcid_field
+    generate 'sufia:models:orcid_field'
+  end
 
-  def better_migration_template(file)
-    begin
-      migration_template "migrations/#{file}", "db/migrate/#{file}"
-    rescue Rails::Generators::Error => e
-      say_status("warning", e.message, :yellow)
-    end
+  # Adds user stats-related migration & methods
+  def user_stats
+    generate 'sufia:models:user_stats'
   end
 end

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

@@ -0,0 +1,19 @@
+require_relative 'abstract_migration_generator'
+
+class Sufia::Models::OrcidFieldGenerator < Sufia::Models::AbstractMigrationGenerator
+  source_root File.expand_path('../templates', __FILE__)
+
+  desc """
+This generator adds a field to hold users' ORCIDs to your application:
+ 1. Creates a database migration if they do not exist in /db/migrate
+       """
+
+  def banner
+    say_status("warning", "ADDING ORCID FIELD TO USER MODEL", :yellow)
+  end
+
+  # Setup the database migration
+  def copy_migrations
+    better_migration_template 'add_orcid_to_users.rb'
+  end
+end

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

@@ -1,30 +1,12 @@
-# -*- encoding : utf-8 -*-
-require 'rails/generators'
-require 'rails/generators/migration'
-
-class Sufia::Models::ProxiesGenerator < Rails::Generators::Base
-  include Rails::Generators::Migration
+require_relative 'abstract_migration_generator'
 
+class Sufia::Models::ProxiesGenerator < Sufia::Models::AbstractMigrationGenerator
   source_root File.expand_path('../templates', __FILE__)
 
   desc """
 This generator adds proxies and transfers to your application:
  1. Creates several database migrations if they do not exist in /db/migrate
        """
-  # Implement the required interface for Rails::Generators::Migration.
-  # taken from http://github.com/rails/rails/blob/master/activerecord/lib/generators/active_record.rb
-  def self.next_migration_number(path)
-    if @prev_migration_nr
-      @prev_migration_nr += 1
-    else
-      if last_migration = Dir[File.join(path, '*.rb')].sort.last
-        @prev_migration_nr = last_migration.sub(File.join(path, '/'), '').to_i + 1
-      else
-        @prev_migration_nr = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
-      end
-    end
-    @prev_migration_nr.to_s
-  end
 
   def banner
     say_status("warning", "ADDING PROXY/TRANSFER-RELATED SUFIA MODELS", :yellow)
@@ -32,7 +14,6 @@ This generator adds proxies and transfers to your application:
 
   # Setup the database migrations
   def copy_migrations
-    # Can't get this any more DRY, because we need this order.
     [
       'create_proxy_deposit_rights.rb',
       'create_proxy_deposit_requests.rb'
@@ -40,14 +21,4 @@ This generator adds proxies and transfers to your application:
       better_migration_template file
     end
   end
-
-  private
-
-  def better_migration_template(file)
-    begin
-      migration_template "migrations/#{file}", "db/migrate/#{file}"
-    rescue Rails::Generators::Error => e
-      say_status("warning", e.message, :yellow)
-    end
-  end
 end

data/sufia-models/lib/generators/sufia/models/templates/config/redis.yml

@@ -4,3 +4,6 @@ development:
 test:
   host: localhost
   port: 6379
+production:
+  host: localhost
+  port: 6379

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

@@ -99,6 +99,9 @@ Sufia.config do |config|
   # Where to store tempfiles, leave blank for the system temp directory (e.g. /tmp)
   # config.temp_file_base = '/home/developer1'
 
+  # Specify the form of hostpath to be used in Endnote exports
+  # config.persistent_hostpath = 'http://localhost/files/'
+
   # If you have ffmpeg installed and want to transcode audio and video uncomment this line
   # config.enable_ffmpeg = true
 

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

@@ -0,0 +1,5 @@
+class AddOrcidToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :orcid, :string
+  end
+end

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

@@ -1,13 +1,8 @@
-# -*- encoding : utf-8 -*-
-require 'rails/generators'
-require 'rails/generators/migration'
-
-class Sufia::Models::Upgrade400Generator < Rails::Generators::Base
-  include Rails::Generators::Migration
+require_relative 'abstract_migration_generator'
 
+class Sufia::Models::Upgrade400Generator < Sufia::Models::AbstractMigrationGenerator
   source_root File.expand_path('../templates', __FILE__)
 
-  argument     :model_name, type: :string , default: "user"
   desc """
 This generator for upgrading sufia-models from 3.7.2 to 4.0 makes the following changes to your application:
  1. Creates several database migrations if they do not exist in /db/migrate
@@ -16,28 +11,12 @@ This generator for upgrading sufia-models from 3.7.2 to 4.0 makes the following
  4. Runs full-text generator
        """
 
-  # Implement the required interface for Rails::Generators::Migration.
-  # taken from http://github.com/rails/rails/blob/master/activerecord/lib/generators/active_record.rb
-  def self.next_migration_number(path)
-    if @prev_migration_nr
-      @prev_migration_nr += 1
-    else
-      if last_migration = Dir[File.join(path, '*.rb')].sort.last
-        @prev_migration_nr = last_migration.sub(File.join(path, '/'), '').to_i + 1
-      else
-        @prev_migration_nr = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
-      end
-    end
-    @prev_migration_nr.to_s
-  end
-
   def banner
     say_status("warning", "UPGRADING SUFIA MODELS", :yellow)
   end
 
   # Setup the database migrations
   def copy_migrations
-    # Can't get this any more DRY, because we need this order.
     [
       'create_tinymce_assets.rb',
       'create_content_blocks.rb',
@@ -72,14 +51,4 @@ This generator for upgrading sufia-models from 3.7.2 to 4.0 makes the following
   def full_text_indexing
     generate "sufia:models:fulltext"
   end
-
-  private
-
-  def better_migration_template(file)
-    begin
-      migration_template "migrations/#{file}", "db/migrate/#{file}"
-    rescue Rails::Generators::Error => e
-      say_status("warning", e.message, :yellow)
-    end
-  end
 end

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

@@ -0,0 +1,31 @@
+require_relative 'abstract_migration_generator'
+
+class Sufia::Models::UserStatsGenerator < Sufia::Models::AbstractMigrationGenerator
+  source_root File.expand_path('../templates', __FILE__)
+  argument :model_name, type: :string , default: "user"
+
+  desc """
+This generator adds usage stats methods to the user model in your application:
+       """
+
+  def banner
+    say_status("warning", "ADDING USER STATS-RELATED ABILITIES TO SUFIA MODELS", :yellow)
+  end
+
+  # Setup the database migrations
+  def copy_migrations
+    better_migration_template 'create_user_stats.rb'
+  end
+
+  def add_stats_mixin_to_user_model
+    file_path = "app/models/#{model_name.underscore}.rb"
+
+    if File.exists?(file_path)
+      inject_into_file file_path, after: /include Sufia\:\:User.*$/ do
+        "\n  include Sufia::UserUsageStats"
+      end
+    else
+      puts "     \e[31mFailure\e[0m  Sufia requires a user object. This generator assumes that the model is defined in the file #{file_path}, which does not exist.  If you used a different name, please re-run the generator and provide that name as an argument. Such as \b  rails g sufia:models:user_stats client"
+    end
+  end
+end

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

@@ -12,6 +12,7 @@ module Sufia
       require 'sufia/models/resque'
 
       # Set some configuration defaults
+      config.persistent_hostpath = "http://localhost/files/"
       config.enable_ffmpeg = false
       config.noid_template = '.reeddeeddk'
       config.ffmpeg_path = 'ffmpeg'

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

@@ -1,5 +1,5 @@
 module Sufia
   module Models
-    VERSION = "6.0.0.beta1"
+    VERSION = "6.0.0.rc1"
   end
 end

data/sufia-models/sufia-models.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   # This is a temporary homepage until we've had a chance to review the
   # process
   spec.homepage      = "https://github.com/projecthydra/sufia"
-  spec.license       = "Apache"
+  spec.license       = "Apache2"
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -29,10 +29,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rails', '~> 4.0', '< 5.0.0'
   spec.add_dependency 'activeresource', "~> 4.0" # No longer a dependency of rails 4.0
 
-  spec.add_dependency "hydra-head", "~> 9.0.0.beta1"
-  spec.add_dependency "active-fedora", "~> 9.0.0.beta5"
-  spec.add_dependency "hydra-collections", "~> 4.0.0.beta1"
-  spec.add_dependency 'hydra-derivatives', '~> 1.0.0.beta1'
+  spec.add_dependency "hydra-head", "~> 9.0.0.rc2"
+  spec.add_dependency "active-fedora", "~> 9.0.0.rc2"
+  spec.add_dependency "hydra-collections", "~> 4.0.0.rc2"
+  spec.add_dependency 'hydra-derivatives', '~> 1.0.0.rc1'
   spec.add_dependency 'nest', '~> 1.1'
   spec.add_dependency 'resque', '~> 1.23'
   spec.add_dependency 'resque-pool', '~> 0.3'

data/sufia.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
   gem.name          = "sufia"
   gem.require_paths = ["lib"]
   gem.version       = version
-  gem.license       = 'APACHE2'
+  gem.license       = 'Apache2'
 
   gem.add_dependency 'sufia-models', version
   gem.add_dependency 'blacklight_advanced_search', '~> 5.0'
@@ -35,8 +35,7 @@ Gem::Specification.new do |gem|
   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 'bootstrap_form', '~> 2.1'
+  gem.add_dependency 'hydra-editor', '~> 1.0.0.rc2'
   gem.add_dependency 'blacklight-gallery'
   gem.add_dependency 'breadcrumbs_on_rails', '~>2.3.0'
   gem.add_dependency 'select2-rails'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sufia
 version: !ruby/object:Gem::Version
-  version: 6.0.0.beta1
+  version: 6.0.0.rc1
 platform: ruby
 authors:
 - Justin Coyne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-12 00:00:00.000000000 Z
+date: 2015-01-07 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.beta1
+        version: 6.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta1
+        version: 6.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: blacklight_advanced_search
   requirement: !ruby/object:Gem::Requirement
@@ -205,28 +205,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 1.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
-- !ruby/object:Gem::Dependency
-  name: bootstrap_form
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 1.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: blacklight-gallery
   requirement: !ruby/object:Gem::Requirement
@@ -462,6 +448,7 @@ files:
 - app/assets/images/missing_original.png
 - app/assets/images/missing_thumb.png
 - app/assets/images/old_main_tulips.jpg
+- app/assets/images/orcid.png
 - app/assets/images/progressbar.gif
 - app/assets/images/site_images/bg_body.png
 - app/assets/images/site_images/bg_breadcrumbs.png
@@ -515,7 +502,6 @@ files:
 - app/assets/javascripts/sufia/featured_works.js
 - app/assets/javascripts/sufia/fileupload.js
 - app/assets/javascripts/sufia/ga_events.js
-- app/assets/javascripts/sufia/multiForm.js
 - app/assets/javascripts/sufia/permissions.js
 - app/assets/javascripts/sufia/proxy_rights.js
 - app/assets/javascripts/sufia/search.js
@@ -596,17 +582,23 @@ files:
 - app/controllers/tinymce_assets_controller.rb
 - app/controllers/transfers_controller.rb
 - app/controllers/users_controller.rb
+- app/forms/sufia/forms/batch_edit_form.rb
+- app/forms/sufia/forms/collection_edit_form.rb
+- app/forms/sufia/forms/generic_file_edit_form.rb
 - app/helpers/batch_edits_helper.rb
 - app/helpers/contact_form_helper.rb
 - app/helpers/content_block_helper.rb
 - app/helpers/dashboard_helper.rb
 - app/helpers/generic_file_helper.rb
-- app/helpers/records_helper.rb
 - app/helpers/sufia/blacklight_override.rb
 - app/helpers/sufia/dashboard_helper_behavior.rb
-- app/helpers/sufia/records_helper_behavior.rb
+- app/helpers/sufia/permissions_helper.rb
 - app/helpers/sufia/sufia_helper_behavior.rb
 - app/helpers/trophy_helper.rb
+- app/inputs/multi_value_with_help_input.rb
+- app/inputs/select_with_help_input.rb
+- app/inputs/select_with_modal_help_input.rb
+- app/inputs/with_help_icon.rb
 - app/jobs/content_delete_event_job.rb
 - app/jobs/content_deposit_event_job.rb
 - app/jobs/content_depositor_change_event_job.rb
@@ -623,6 +615,9 @@ files:
 - app/models/content_block.rb
 - app/models/featured_work_list.rb
 - app/models/tinymce_asset.rb
+- app/presenters/sufia/collection_presenter.rb
+- app/presenters/sufia/generic_file_presenter.rb
+- app/presenters/sufia/presenter_renderer.rb
 - app/presenters/sufia/version_list_presenter.rb
 - app/presenters/sufia/version_presenter.rb
 - app/uploaders/tinymce_asset_uploader.rb
@@ -650,7 +645,6 @@ files:
 - app/views/batch_edits/_check_all.html.erb
 - app/views/batch_edits/_delete_selected.html.erb
 - app/views/batch_edits/edit.html.erb
-- app/views/batch_edits/update_edit.js.erb
 - app/views/catalog/_delete_partials/_default.html.erb
 - app/views/catalog/_document_list.html.erb
 - app/views/catalog/_edit_partials/_default.html.erb
@@ -668,7 +662,6 @@ files:
 - app/views/collections/_dashboard_document_list.html.erb
 - app/views/collections/_document_list.html.erb
 - app/views/collections/_edit_actions.html.erb
-- app/views/collections/_edit_descriptions.html.erb
 - app/views/collections/_form.html.erb
 - app/views/collections/_form_for_select_collection.html.erb
 - app/views/collections/_media_display.html.erb
@@ -685,7 +678,6 @@ files:
 - app/views/collections/_view_type_group.html.erb
 - app/views/collections/edit.html.erb
 - app/views/collections/edit_fields/_description.html.erb
-- app/views/collections/edit_fields/_title.html.erb
 - app/views/collections/show.html.erb
 - app/views/contact_form/_directions.html.erb
 - app/views/contact_form/create.html.erb
@@ -710,7 +702,6 @@ files:
 - app/views/generic_files/_descriptions.html.erb
 - app/views/generic_files/_edit.js.erb
 - app/views/generic_files/_extra_fields_modal.html.erb
-- app/views/generic_files/_field_form.html.erb
 - app/views/generic_files/_flot_stats.js.erb
 - app/views/generic_files/_generic_file.html.erb
 - app/views/generic_files/_groups_description.html.erb
@@ -729,6 +720,7 @@ files:
 - 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/jq_upload.json.jbuilder
 - app/views/generic_files/new.html.erb
 - app/views/generic_files/proxy.html.erb
 - app/views/generic_files/show.html.erb
@@ -790,13 +782,10 @@ files:
 - 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
@@ -839,7 +828,6 @@ files:
 - app/views/users/_profile_tabs.html.erb
 - app/views/users/_proxies.html.erb
 - app/views/users/_search_form.html.erb
-- 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
@@ -862,6 +850,7 @@ files:
 - lib/generators/sufia/templates/sufia_helper.rb
 - lib/generators/sufia/upgrade400_generator.rb
 - lib/sufia.rb
+- lib/sufia/form_builder.rb
 - lib/sufia/role_mapper.rb
 - lib/sufia/single_use_error.rb
 - lib/sufia/version.rb
@@ -948,13 +937,17 @@ files:
 - spec/fixtures/world.png
 - spec/fixtures/xls_fits.xml
 - spec/fixtures/xml_fits.xml
+- spec/forms/collection_edit_form_spec.rb
+- spec/forms/generic_file_edit_form_spec.rb
 - 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/permissions_helper_spec.rb
 - 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_modal_help_input_spec.rb
 - spec/jobs/active_fedora_pid_based_job_spec.rb
 - spec/jobs/audit_job_spec.rb
 - spec/jobs/batch_update_job_spec.rb
@@ -986,7 +979,6 @@ files:
 - spec/models/file_view_stat_spec.rb
 - spec/models/fits_datastream_spec.rb
 - spec/models/generic_file/visibility_spec.rb
-- spec/models/generic_file/web_form_spec.rb
 - spec/models/generic_file_spec.rb
 - spec/models/geo_names_resource_spec.rb
 - spec/models/local_authority_spec.rb
@@ -997,6 +989,8 @@ files:
 - spec/models/trophy_spec.rb
 - spec/models/user_spec.rb
 - spec/models/user_usage_stats_spec.rb
+- spec/presenters/presenter_renderer_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
 - spec/routing/featured_works_route_spec.rb
@@ -1011,6 +1005,7 @@ files:
 - spec/support/features/session_helpers.rb
 - spec/support/fedora_conf/fedora.fcfg
 - spec/support/fixture_helpers.rb
+- spec/support/input_support.rb
 - spec/support/locations.rb
 - spec/support/poltergeist.rb
 - spec/support/proxies.rb
@@ -1020,12 +1015,14 @@ files:
 - 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/batch_edits/edit.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/collections/_show_document_list.erb_spec.rb
 - spec/views/dashboard/index_spec.rb
+- spec/views/generic_file/_permission_form.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
@@ -1056,7 +1053,6 @@ files:
 - sufia-models/app/models/concerns/sufia/collection.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/accessible_attributes.rb
 - sufia-models/app/models/concerns/sufia/generic_file/batches.rb
 - sufia-models/app/models/concerns/sufia/generic_file/characterization.rb
 - sufia-models/app/models/concerns/sufia/generic_file/content.rb
@@ -1072,7 +1068,6 @@ files:
 - sufia-models/app/models/concerns/sufia/generic_file/trophies.rb
 - sufia-models/app/models/concerns/sufia/generic_file/versions.rb
 - sufia-models/app/models/concerns/sufia/generic_file/virus_check.rb
-- sufia-models/app/models/concerns/sufia/generic_file/web_form.rb
 - sufia-models/app/models/concerns/sufia/model_methods.rb
 - sufia-models/app/models/concerns/sufia/user.rb
 - sufia-models/app/models/concerns/sufia/user_usage_stats.rb
@@ -1096,19 +1091,24 @@ files:
 - sufia-models/app/models/sufia/avatar_uploader.rb
 - sufia-models/app/models/sufia/avatar_validator.rb
 - sufia-models/app/models/sufia/download.rb
+- sufia-models/app/models/sufia/orcid_validator.rb
 - sufia-models/app/models/sufia/pageview.rb
 - sufia-models/app/models/trophy.rb
 - sufia-models/app/models/user_stat.rb
 - sufia-models/app/models/version_committer.rb
 - sufia-models/app/services/sufia/analytics.rb
 - 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
+- sufia-models/lib/generators/sufia/models/abstract_migration_generator.rb
 - sufia-models/lib/generators/sufia/models/cached_stats_generator.rb
 - sufia-models/lib/generators/sufia/models/fulltext_generator.rb
 - 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/config/analytics.yml
 - sufia-models/lib/generators/sufia/models/templates/config/clamav.rb
@@ -1127,6 +1127,7 @@ files:
 - 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
+- sufia-models/lib/generators/sufia/models/templates/migrations/add_orcid_to_users.rb
 - sufia-models/lib/generators/sufia/models/templates/migrations/add_social_to_users.rb
 - sufia-models/lib/generators/sufia/models/templates/migrations/create_checksum_audit_logs.rb
 - sufia-models/lib/generators/sufia/models/templates/migrations/create_content_blocks.rb
@@ -1143,6 +1144,7 @@ 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/generators/sufia/models/user_stats_generator.rb
 - sufia-models/lib/sufia/messages.rb
 - sufia-models/lib/sufia/models.rb
 - sufia-models/lib/sufia/models/active_fedora/redis.rb
@@ -1207,7 +1209,7 @@ files:
 - vendor/plugins/.gitkeep
 homepage: http://github.com/projecthydra/sufia
 licenses:
-- APACHE2
+- Apache2
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -1225,7 +1227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Sufia was extracted from ScholarSphere developed by Penn State University
@@ -1308,13 +1310,17 @@ test_files:
 - spec/fixtures/world.png
 - spec/fixtures/xls_fits.xml
 - spec/fixtures/xml_fits.xml
+- spec/forms/collection_edit_form_spec.rb
+- spec/forms/generic_file_edit_form_spec.rb
 - 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/permissions_helper_spec.rb
 - 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_modal_help_input_spec.rb
 - spec/jobs/active_fedora_pid_based_job_spec.rb
 - spec/jobs/audit_job_spec.rb
 - spec/jobs/batch_update_job_spec.rb
@@ -1346,7 +1352,6 @@ test_files:
 - spec/models/file_view_stat_spec.rb
 - spec/models/fits_datastream_spec.rb
 - spec/models/generic_file/visibility_spec.rb
-- spec/models/generic_file/web_form_spec.rb
 - spec/models/generic_file_spec.rb
 - spec/models/geo_names_resource_spec.rb
 - spec/models/local_authority_spec.rb
@@ -1357,6 +1362,8 @@ test_files:
 - spec/models/trophy_spec.rb
 - spec/models/user_spec.rb
 - spec/models/user_usage_stats_spec.rb
+- spec/presenters/presenter_renderer_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
 - spec/routing/featured_works_route_spec.rb
@@ -1371,6 +1378,7 @@ test_files:
 - spec/support/features/session_helpers.rb
 - spec/support/fedora_conf/fedora.fcfg
 - spec/support/fixture_helpers.rb
+- spec/support/input_support.rb
 - spec/support/locations.rb
 - spec/support/poltergeist.rb
 - spec/support/proxies.rb
@@ -1380,12 +1388,14 @@ test_files:
 - 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/batch_edits/edit.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/collections/_show_document_list.erb_spec.rb
 - spec/views/dashboard/index_spec.rb
+- spec/views/generic_file/_permission_form.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