sufia 5.0.0 → 6.0.0.beta1

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.5', '< 5.10'
+  gem.add_dependency 'blacklight', '~> 5.5'
   gem.add_dependency 'tinymce-rails', '~> 4.0.19'
   gem.add_dependency 'tinymce-rails-imageupload', '~> 4.0.16.beta'
 
@@ -30,23 +30,22 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'hydra-batch-edit', '>= 1.1.1', '< 2.0.0'
   gem.add_dependency 'browse-everything', '~> 0.4'
-
   gem.add_dependency 'daemons', '~> 1.1'
   gem.add_dependency 'mail_form'
   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 'simple_form', '~> 3.1.0'
-  gem.add_dependency 'bootstrap_form', '~> 2.1.1'
+  gem.add_dependency 'bootstrap_form', '~> 2.1'
   gem.add_dependency 'blacklight-gallery'
   gem.add_dependency 'breadcrumbs_on_rails', '~>2.3.0'
   gem.add_dependency 'select2-rails'
+  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"

data/tasks/jetty.rake

@@ -3,7 +3,6 @@ namespace :jetty do
   task :config do
     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"
@@ -13,29 +12,4 @@ namespace :jetty do
       cp("#{f}", 'jetty/solr/test-core/conf/', verbose: true)
     end
   end
-
-  desc "Copies a custom fedora config for the bundled Hydra Testing Server"
-  task :config_fedora do
-    # 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"
-      cp("#{fcfg}", 'jetty/fedora/default/server/config/', verbose: true)
-    else
-      puts "#{fcfg} file not found -- skipping fedora config"
-    end
-    fcfg = File.join(app_root,"fedora_conf","conf","test","fedora.fcfg")
-    if File.exists?(fcfg)
-      puts "copying over test/fedora.fcfg"
-      cp("#{fcfg}", 'jetty/fedora/test/server/config/', verbose: true)
-    else
-      puts "#{fcfg} file not found -- skipping fedora config"
-    end
-  end
 end

data/tasks/sufia-dev.rake

@@ -3,7 +3,8 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
 require 'jettywrapper'
-Jettywrapper.hydra_jetty_version = "v7.1.0"
+Jettywrapper.hydra_jetty_version = "v8.1.1"
+
 require 'engine_cart/rake_task'
 
 desc 'Spin up hydra-jetty and run specs'
@@ -16,7 +17,18 @@ task ci: ['engine_cart:generate', 'jetty:clean', 'sufia:jetty:config'] do
   raise "test failures: #{error}" if error
 end
 
-namespace 'engine_cart' do
+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: 5.0.0
+  version: 6.0.0.beta1
 platform: ruby
 authors:
 - Justin Coyne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-06 00:00:00.000000000 Z
+date: 2014-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sufia-models
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 6.0.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 6.0.0.beta1
 - !ruby/object:Gem::Dependency
   name: blacklight_advanced_search
   requirement: !ruby/object:Gem::Requirement
@@ -46,9 +46,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.5'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -56,9 +53,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.5'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.10'
 - !ruby/object:Gem::Dependency
   name: tinymce-rails
   requirement: !ruby/object:Gem::Requirement
@@ -220,49 +214,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: hydra-collections
+  name: bootstrap_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: simple_form
+  name: blacklight-gallery
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bootstrap_form
+  name: breadcrumbs_on_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
-  name: blacklight-gallery
+  name: select2-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -276,27 +270,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: breadcrumbs_on_rails
+  name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: select2-rails
+  name: engine_cart
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -304,7 +298,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: engine_cart
+  name: mida
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -318,7 +312,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mida
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -332,7 +326,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -444,7 +438,7 @@ files:
 - CONTRIBUTING.md
 - Gemfile
 - History.md
-- LICENSE
+- LICENSE.md
 - README.md
 - RELEASING.md
 - Rakefile
@@ -468,7 +462,6 @@ 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
@@ -522,7 +515,7 @@ 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/manage_repeating_fields.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
@@ -553,7 +546,6 @@ 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
@@ -615,7 +607,6 @@ files:
 - app/helpers/sufia/records_helper_behavior.rb
 - app/helpers/sufia/sufia_helper_behavior.rb
 - app/helpers/trophy_helper.rb
-- app/inputs/multi_value_input.rb
 - app/jobs/content_delete_event_job.rb
 - app/jobs/content_deposit_event_job.rb
 - app/jobs/content_depositor_change_event_job.rb
@@ -632,6 +623,8 @@ files:
 - app/models/content_block.rb
 - app/models/featured_work_list.rb
 - app/models/tinymce_asset.rb
+- app/presenters/sufia/version_list_presenter.rb
+- app/presenters/sufia/version_presenter.rb
 - app/uploaders/tinymce_asset_uploader.rb
 - app/views/_add_assets_links.html.erb
 - app/views/_controls.html.erb
@@ -691,6 +684,8 @@ files:
 - 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/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
@@ -796,7 +791,6 @@ files:
 - app/views/my/index.html.erb
 - app/views/pages/show.html.erb
 - app/views/records/_edit_field.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
@@ -845,6 +839,7 @@ 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
@@ -854,17 +849,12 @@ 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
 - db/seeds.rb
-- fedora_conf/conf/development/fedora.fcfg
-- fedora_conf/conf/test/fedora.fcfg
 - 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
@@ -995,25 +985,26 @@ files:
 - spec/models/file_usage_spec.rb
 - spec/models/file_view_stat_spec.rb
 - spec/models/fits_datastream_spec.rb
-- spec/models/generic_file/reload_on_save_spec.rb
 - spec/models/generic_file/visibility_spec.rb
 - spec/models/generic_file/web_form_spec.rb
-- spec/models/generic_file_rdf_datastream_spec.rb
 - spec/models/generic_file_spec.rb
 - spec/models/geo_names_resource_spec.rb
 - spec/models/local_authority_spec.rb
 - spec/models/pageview_spec.rb
-- spec/models/properties_datastream_spec.rb
 - spec/models/proxy_deposit_request_spec.rb
 - spec/models/single_use_link_spec.rb
 - spec/models/solr_document_spec.rb
 - spec/models/trophy_spec.rb
 - spec/models/user_spec.rb
 - spec/models/user_usage_stats_spec.rb
+- spec/presenters/sufia/version_list_presenter_spec.rb
+- spec/presenters/sufia/version_presenter_spec.rb
 - spec/routing/featured_works_route_spec.rb
 - spec/routing/ownership_transfers_route_spec.rb
 - spec/routing/route_spec.rb
+- spec/services/generic_file_audit_service_spec.rb
 - spec/services/noid_spec.rb
+- spec/services/repository_audit_service_spec.rb
 - spec/spec_helper.rb
 - spec/support/cleaner.rb
 - spec/support/features.rb
@@ -1033,8 +1024,8 @@ files:
 - 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
@@ -1066,31 +1057,27 @@ files:
 - 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/audit.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
 - 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/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
 - sufia-models/app/models/concerns/sufia/generic_file/proxy_deposit.rb
-- sufia-models/app/models/concerns/sufia/generic_file/reload_on_save.rb
 - 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/properties_datastream_behavior.rb
 - sufia-models/app/models/concerns/sufia/user.rb
 - sufia-models/app/models/concerns/sufia/user_usage_stats.rb
-- sufia-models/app/models/datastreams/batch_rdf_datastream.rb
 - sufia-models/app/models/datastreams/file_content_datastream.rb
 - sufia-models/app/models/datastreams/fits_datastream.rb
-- sufia-models/app/models/datastreams/generic_file_rdf_datastream.rb
-- sufia-models/app/models/datastreams/paranoid_rights_datastream.rb
-- sufia-models/app/models/datastreams/properties_datastream.rb
 - sufia-models/app/models/domain_term.rb
 - sufia-models/app/models/featured_work.rb
 - sufia-models/app/models/file_download_stat.rb
@@ -1109,20 +1096,19 @@ 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/id_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
@@ -1141,7 +1127,6 @@ 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
@@ -1158,7 +1143,6 @@ 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
@@ -1236,12 +1220,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Sufia was extracted from ScholarSphere developed by Penn State University
@@ -1361,25 +1345,26 @@ test_files:
 - spec/models/file_usage_spec.rb
 - spec/models/file_view_stat_spec.rb
 - spec/models/fits_datastream_spec.rb
-- spec/models/generic_file/reload_on_save_spec.rb
 - spec/models/generic_file/visibility_spec.rb
 - spec/models/generic_file/web_form_spec.rb
-- spec/models/generic_file_rdf_datastream_spec.rb
 - spec/models/generic_file_spec.rb
 - spec/models/geo_names_resource_spec.rb
 - spec/models/local_authority_spec.rb
 - spec/models/pageview_spec.rb
-- spec/models/properties_datastream_spec.rb
 - spec/models/proxy_deposit_request_spec.rb
 - spec/models/single_use_link_spec.rb
 - spec/models/solr_document_spec.rb
 - spec/models/trophy_spec.rb
 - spec/models/user_spec.rb
 - spec/models/user_usage_stats_spec.rb
+- spec/presenters/sufia/version_list_presenter_spec.rb
+- spec/presenters/sufia/version_presenter_spec.rb
 - spec/routing/featured_works_route_spec.rb
 - spec/routing/ownership_transfers_route_spec.rb
 - spec/routing/route_spec.rb
+- spec/services/generic_file_audit_service_spec.rb
 - spec/services/noid_spec.rb
+- spec/services/repository_audit_service_spec.rb
 - spec/spec_helper.rb
 - spec/support/cleaner.rb
 - spec/support/features.rb
@@ -1399,8 +1384,8 @@ test_files:
 - 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