sufia 6.0.0.rc4 → 6.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (143) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +1 -1
  3. data/Gemfile +1 -1
  4. data/History.md +280 -0
  5. data/README.md +180 -98
  6. data/SUFIA_VERSION +1 -1
  7. data/app/assets/images/site_images/collection-icon.svg +168 -0
  8. data/app/assets/javascripts/sufia/uploader.js +7 -4
  9. data/app/assets/stylesheets/sufia.css.scss +1 -1
  10. data/app/assets/stylesheets/sufia/_collections.scss +33 -13
  11. data/app/assets/stylesheets/sufia/_file-show.scss +24 -0
  12. data/app/assets/stylesheets/sufia/_settings.scss +4 -0
  13. data/app/controllers/concerns/sufia/catalog.rb +1 -11
  14. data/app/controllers/concerns/sufia/collections_controller_behavior.rb +13 -15
  15. data/app/controllers/concerns/sufia/dashboard_controller_behavior.rb +3 -1
  16. data/app/controllers/concerns/sufia/files_controller/browse_everything.rb +2 -1
  17. data/app/controllers/concerns/sufia/files_controller/local_ingest_behavior.rb +1 -0
  18. data/app/controllers/concerns/sufia/files_controller_behavior.rb +4 -1
  19. data/app/controllers/concerns/sufia/homepage_controller.rb +4 -11
  20. data/app/controllers/concerns/sufia/my_controller_behavior.rb +3 -21
  21. data/app/controllers/concerns/sufia/transfers_controller_behavior.rb +6 -6
  22. data/app/controllers/concerns/sufia/users_controller_behavior.rb +7 -7
  23. data/app/controllers/my/collections_controller.rb +1 -8
  24. data/app/controllers/my/files_controller.rb +1 -1
  25. data/app/controllers/my/highlights_controller.rb +1 -9
  26. data/app/controllers/my/shares_controller.rb +1 -8
  27. data/app/helpers/generic_file_helper.rb +4 -0
  28. data/app/helpers/sufia/sufia_helper_behavior.rb +3 -3
  29. data/app/helpers/sufia_url_helper.rb +9 -0
  30. data/app/jobs/content_depositor_change_event_job.rb +5 -5
  31. data/app/search_builders/sufia/search_builder.rb +50 -0
  32. data/app/views/_user_util_links.html.erb +6 -4
  33. data/app/views/batch_edits/_check_all.html.erb +1 -1
  34. data/app/views/catalog/index.html.erb +3 -30
  35. data/app/views/collections/_media_display.html.erb +1 -1
  36. data/app/views/collections/_show_descriptions.html.erb +1 -1
  37. data/app/views/collections/_show_document_list_row.html.erb +2 -2
  38. data/app/views/dashboard/_index_partials/_heading_actions.html.erb +16 -12
  39. data/app/views/generic_files/_browse_everything.html.erb +3 -1
  40. data/app/views/generic_files/_local_file_import.html.erb +0 -1
  41. data/app/views/generic_files/_multiple_upload.html.erb +0 -1
  42. data/app/views/generic_files/_show_descriptions.html.erb +6 -11
  43. data/app/views/generic_files/_show_details.html.erb +41 -65
  44. data/app/views/generic_files/new.html.erb +1 -0
  45. data/app/views/generic_files/show.html.erb +2 -1
  46. data/app/views/generic_files/upload/_alerts.html.erb +5 -13
  47. data/app/views/homepage/_home_header.html.erb +6 -7
  48. data/app/views/my/_index_partials/_list_collections.html.erb +1 -1
  49. data/app/views/my/index.html.erb +2 -2
  50. data/app/views/records/edit_fields/_resource_type.html.erb +1 -1
  51. data/config/initializers/sufia_events.rb +2 -3
  52. data/config/locales/sufia.en.yml +11 -2
  53. data/lib/generators/sufia/install_generator.rb +5 -1
  54. data/lib/generators/sufia/templates/catalog_controller.rb +3 -5
  55. data/lib/generators/sufia/upgrade600_generator.rb +26 -0
  56. data/lib/sufia/version.rb +1 -1
  57. data/spec/actors/generic_file/actor_spec.rb +14 -0
  58. data/spec/controllers/collections_controller_spec.rb +19 -2
  59. data/spec/controllers/dashboard_controller_spec.rb +43 -12
  60. data/spec/controllers/generic_files_controller_spec.rb +24 -1
  61. data/spec/controllers/transfers_controller_spec.rb +4 -4
  62. data/spec/controllers/users_controller_spec.rb +18 -4
  63. data/spec/fixtures/spoken-text.m4a +0 -0
  64. data/spec/helpers/dashboard_helper_spec.rb +1 -1
  65. data/spec/helpers/sufia_url_helper_spec.rb +15 -0
  66. data/spec/inputs/select_with_help_input_spec.rb +15 -0
  67. data/spec/jobs/{active_fedora_pid_based_job_spec.rb → active_fedora_id_based_job_spec.rb} +2 -2
  68. data/spec/jobs/audit_job_spec.rb +2 -2
  69. data/spec/lib/sufia/id_service_spec.rb +8 -8
  70. data/spec/lib/sufia/user_stat_importer_spec.rb +9 -1
  71. data/spec/models/ability_spec.rb +7 -4
  72. data/spec/models/checksum_audit_log_spec.rb +10 -10
  73. data/spec/models/collection_spec.rb +8 -13
  74. data/spec/models/fits_datastream_spec.rb +17 -0
  75. data/spec/models/generic_file_spec.rb +9 -1
  76. data/spec/models/proxy_deposit_request_spec.rb +15 -3
  77. data/spec/services/generic_file_audit_service_spec.rb +1 -1
  78. data/spec/support/features.rb +1 -0
  79. data/spec/support/rake_output.rb +20 -0
  80. data/spec/tasks/rake_spec.rb +58 -0
  81. data/spec/test_app_templates/Gemfile.extra +3 -1
  82. data/spec/views/batch/edit.html.erb_spec.rb +6 -2
  83. data/spec/views/catalog/index.html.erb_spec.rb +1 -1
  84. data/spec/views/catalog/sort_and_per_page.html.erb_spec.rb +6 -2
  85. data/spec/views/dashboard/index_spec.rb +49 -1
  86. data/spec/views/generic_file/_browse_everything.html.erb_spec.rb +9 -0
  87. data/spec/views/generic_file/show.html.erb_spec.rb +13 -8
  88. data/spec/views/homepage/_home_header.html.erb_spec.rb +26 -0
  89. data/spec/views/users/_user_util_links.html.erb_spec.rb +20 -0
  90. data/spec/views/users/show.html.erb_spec.rb +1 -1
  91. data/sufia-models/app/actors/sufia/generic_file/actor.rb +1 -1
  92. data/sufia-models/app/jobs/active_fedora_id_based_job.rb +22 -0
  93. data/sufia-models/app/jobs/active_fedora_pid_based_job.rb +5 -20
  94. data/sufia-models/app/jobs/audit_job.rb +5 -6
  95. data/sufia-models/app/jobs/characterize_job.rb +1 -1
  96. data/sufia-models/app/jobs/create_derivatives_job.rb +1 -1
  97. data/sufia-models/app/jobs/import_url_job.rb +2 -2
  98. data/sufia-models/app/models/batch.rb +18 -4
  99. data/sufia-models/app/models/checksum_audit_log.rb +2 -2
  100. data/sufia-models/app/models/concerns/sufia/ability.rb +7 -1
  101. data/sufia-models/app/models/concerns/sufia/collection_behavior.rb +1 -1
  102. data/sufia-models/app/models/concerns/sufia/generic_file/full_text_indexing.rb +23 -14
  103. data/sufia-models/app/models/concerns/sufia/generic_file/proxy_deposit.rb +1 -1
  104. data/sufia-models/app/models/datastreams/fits_datastream.rb +1 -36
  105. data/sufia-models/app/models/proxy_deposit_request.rb +6 -6
  106. data/sufia-models/app/services/sufia/generic_file_audit_service.rb +1 -1
  107. data/sufia-models/app/services/sufia/generic_file_indexing_service.rb +0 -1
  108. data/sufia-models/app/services/sufia/id_service.rb +2 -3
  109. data/sufia-models/app/services/sufia/noid.rb +1 -1
  110. data/sufia-models/lib/generators/sufia/models/templates/config/sufia.rb +1 -1
  111. data/sufia-models/lib/generators/sufia/models/templates/migrations/change_audit_log_pid_to_generic_file_id.rb +5 -0
  112. data/sufia-models/lib/generators/sufia/models/templates/migrations/change_proxy_deposit_request_pid_to_generic_file_id.rb +5 -0
  113. data/sufia-models/lib/generators/sufia/models/upgrade600_generator.rb +21 -0
  114. data/sufia-models/lib/sufia/models/stats/user_stat_importer.rb +20 -1
  115. data/sufia-models/lib/sufia/models/version.rb +1 -1
  116. data/sufia-models/lib/tasks/batch_cleanup.rake +19 -0
  117. data/sufia-models/lib/tasks/migrate.rake +21 -0
  118. data/sufia-models/lib/tasks/sufia-models_tasks.rake +55 -38
  119. data/sufia-models/sufia-models.gemspec +1 -1
  120. data/sufia.gemspec +2 -2
  121. metadata +44 -38
  122. data/app/assets/images/site_images/bg_body.png +0 -0
  123. data/app/assets/images/site_images/bg_breadcrumbs.png +0 -0
  124. data/app/assets/images/site_images/bg_button1.png +0 -0
  125. data/app/assets/images/site_images/bg_button2.png +0 -0
  126. data/app/assets/images/site_images/bg_button3.png +0 -0
  127. data/app/assets/images/site_images/bg_content.png +0 -0
  128. data/app/assets/images/site_images/bg_content2.png +0 -0
  129. data/app/assets/images/site_images/bg_footer.png +0 -0
  130. data/app/assets/images/site_images/bg_masthead.png +0 -0
  131. data/app/assets/images/site_images/bg_search_field.png +0 -0
  132. data/app/assets/images/site_images/bg_search_header.png +0 -0
  133. data/app/assets/images/site_images/bg_signin.png +0 -0
  134. data/app/assets/images/site_images/carrot_blue.png +0 -0
  135. data/app/assets/images/site_images/carrot_yellow.png +0 -0
  136. data/app/assets/images/site_images/icon_arrow2_up.png +0 -0
  137. data/app/assets/images/site_images/icon_arrow3_down.png +0 -0
  138. data/app/assets/images/site_images/icon_arrow3_right.png +0 -0
  139. data/app/assets/images/site_images/icon_arrow_down.png +0 -0
  140. data/app/assets/images/site_images/icons_sprite.png +0 -0
  141. data/app/assets/images/site_images/logo_psuss_footer.png +0 -0
  142. data/app/views/catalog/_edit_partials/_default.html.erb +0 -55
  143. data/spec/support/fedora_conf/fedora.fcfg +0 -953
@@ -0,0 +1,5 @@
1
+ class ChangeProxyDepositRequestPidToGenericFileId < ActiveRecord::Migration
2
+ def change
3
+ rename_column :proxy_deposit_requests, :pid, :generic_file_id
4
+ end
5
+ end
@@ -0,0 +1,21 @@
1
+ require_relative 'abstract_migration_generator'
2
+
3
+ class Sufia::Models::Upgrade600Generator < Sufia::Models::AbstractMigrationGenerator
4
+ source_root File.expand_path('../templates', __FILE__)
5
+
6
+ desc """
7
+ This generator for upgrading sufia-models to 6.0 makes the following changes to your application:
8
+ 1. Creates several database migrations if they do not exist in /db/migrate
9
+ """
10
+
11
+ # Setup the database migrations
12
+ def copy_migrations
13
+ [
14
+ 'change_audit_log_pid_to_generic_file_id.rb',
15
+ 'change_proxy_deposit_request_pid_to_generic_file_id.rb'
16
+ ].each do |file|
17
+ better_migration_template file
18
+ end
19
+ end
20
+ end
21
+
@@ -1,23 +1,28 @@
1
1
  module Sufia
2
2
  class UserStatImporter
3
3
 
4
+ UserRecord = Struct.new("UserRecord", :id, :user_key, :last_stats_update)
5
+
4
6
  def initialize(options={})
5
7
  @verbose = options[:verbose]
6
8
  @logging = options[:logging]
9
+ @delay_secs = options[:delay_secs].to_f
7
10
  end
8
11
 
9
12
  def import
10
13
  log_message('Begin import of User stats.')
11
- ::User.find_each do |user|
14
+ sorted_users.each do |user|
12
15
  start_date = date_since_last_cache(user)
13
16
 
14
17
  stats = {}
15
18
  file_ids_for_user(user).each do |file_id|
16
19
  view_stats = FileViewStat.statistics(file_id, start_date, user.id)
17
20
  stats = tally_results(view_stats, :views, stats)
21
+ delay
18
22
 
19
23
  dl_stats = FileDownloadStat.statistics(file_id, start_date, user.id)
20
24
  stats = tally_results(dl_stats, :downloads, stats)
25
+ delay
21
26
  end
22
27
 
23
28
  create_or_update_user_stats(stats, user)
@@ -25,9 +30,23 @@ module Sufia
25
30
  log_message('User stats import complete.')
26
31
  end
27
32
 
33
+ # Returns an array of users sorted by the date of their last
34
+ # stats update. Users that have not been recently updated
35
+ # will be at the top of the array.
36
+ def sorted_users
37
+ users = []
38
+ ::User.find_each do |user|
39
+ users.push(UserRecord.new(user.id, user.user_key, date_since_last_cache(user)))
40
+ end
41
+ users.sort! {|a, b| a.last_stats_update <=> b.last_stats_update}
42
+ end
28
43
 
29
44
  private
30
45
 
46
+ def delay
47
+ sleep @delay_secs
48
+ end
49
+
31
50
  def date_since_last_cache(user)
32
51
  last_cached_stat = UserStat.where(user_id: user.id).order(date: :asc).last
33
52
 
@@ -1,5 +1,5 @@
1
1
  module Sufia
2
2
  module Models
3
- VERSION = "6.0.0.rc4"
3
+ VERSION = "6.0.0"
4
4
  end
5
5
  end
@@ -0,0 +1,19 @@
1
+ namespace :sufia do
2
+
3
+ desc "Reports on and optionally removes empty batches that contain no associated files"
4
+ task :empty_batches, [:remove] => :environment do |t, args|
5
+ option = args.to_hash.fetch(:remove, "keep")
6
+ Batch.all.each do |batch|
7
+ if batch.generic_files.empty?
8
+ print "#{batch.id} contains no files - "
9
+ if option == "remove"
10
+ batch.destroy
11
+ puts "deleted"
12
+ else
13
+ puts "to delete, rerun with the remove option: rake sufia:empty_batches[remove]"
14
+ end
15
+ end
16
+ end
17
+ end
18
+
19
+ end
@@ -0,0 +1,21 @@
1
+ namespace :sufia do
2
+ namespace :migrate do
3
+
4
+ desc "Migrate proxy deposits"
5
+ task proxy_deposits: :environment do
6
+ ProxyDepositRequest.all.each do |pd|
7
+ pd.generic_file_id = pd.generic_file_id.delete "#{Sufia.config.redis_namespace}:"
8
+ pd.save
9
+ end
10
+ end
11
+
12
+ desc "Migrate audit logs"
13
+ task audit_logs: :environment do
14
+ ChecksumAuditLog.all.each do |cs|
15
+ cs.generic_file_id = cs.generic_file_id.delete "#{Sufia.config.redis_namespace}:"
16
+ cs.save
17
+ end
18
+ end
19
+
20
+ end
21
+ end
@@ -1,3 +1,5 @@
1
+ require 'net/http'
2
+
1
3
  namespace :solr do
2
4
  desc "Enqueue a job to resolrize the repository objects"
3
5
  task reindex: :environment do
@@ -7,6 +9,41 @@ end
7
9
 
8
10
  namespace :sufia do
9
11
  namespace :jetty do
12
+
13
+ FULLTEXT_JARS = %w(
14
+ org/apache/james/apache-mime4j-core/0.7.2/apache-mime4j-core-0.7.2.jar
15
+ org/apache/james/apache-mime4j-dom/0.7.2/apache-mime4j-dom-0.7.2.jar
16
+ org/apache/solr/solr-cell/4.0.0/solr-cell-4.0.0.jar
17
+ org/bouncycastle/bcmail-jdk15/1.45/bcmail-jdk15-1.45.jar
18
+ org/bouncycastle/bcprov-jdk15/1.45/bcprov-jdk15-1.45.jar
19
+ de/l3s/boilerpipe/boilerpipe/1.1.0/boilerpipe-1.1.0.jar
20
+ org/apache/commons/commons-compress/1.4.1/commons-compress-1.4.1.jar
21
+ dom4j/dom4j/1.6.1/dom4j-1.6.1.jar
22
+ org/apache/pdfbox/fontbox/1.7.0/fontbox-1.7.0.jar
23
+ com/ibm/icu/icu4j/49.1/icu4j-49.1.jar
24
+ com/googlecode/mp4parser/isoparser/1.0-RC-1/isoparser-1.0-RC-1.jar
25
+ jdom/jdom/1.0/jdom-1.0.jar
26
+ org/apache/pdfbox/jempbox/1.7.0/jempbox-1.7.0.jar
27
+ com/googlecode/juniversalchardet/juniversalchardet/1.0.3/juniversalchardet-1.0.3.jar
28
+ com/drewnoakes/metadata-extractor/2.4.0-beta-1/metadata-extractor-2.4.0-beta-1.jar
29
+ edu/ucar/netcdf/4.2-min/netcdf-4.2-min.jar
30
+ org/apache/pdfbox/pdfbox/1.7.0/pdfbox-1.7.0.jar
31
+ org/apache/poi/poi/3.8/poi-3.8.jar
32
+ org/apache/poi/poi-ooxml/3.8/poi-ooxml-3.8.jar
33
+ org/apache/poi/poi-ooxml-schemas/3.8/poi-ooxml-schemas-3.8.jar
34
+ org/apache/poi/poi-scratchpad/3.8/poi-scratchpad-3.8.jar
35
+ rome/rome/0.9/rome-0.9.jar
36
+ org/ccil/cowan/tagsoup/tagsoup/1.2.1/tagsoup-1.2.1.jar
37
+ org/apache/tika/tika-core/1.2/tika-core-1.2.jar
38
+ org/apache/tika/tika-parsers/1.2/tika-parsers-1.2.jar
39
+ org/gagravarr/vorbis-java-core/0.1/vorbis-java-core-0.1.jar
40
+ org/gagravarr/vorbis-java-tika/0.1/vorbis-java-tika-0.1.jar
41
+ xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar
42
+ org/apache/xmlbeans/xmlbeans/2.3.0/xmlbeans-2.3.0.jar
43
+ org/tukaani/xz/1.0/xz-1.0.jar
44
+ org/aspectj/aspectjrt/1.8.5/aspectjrt-1.8.5.jar
45
+ )
46
+
10
47
  desc 'Configure jetty with full-text indexing'
11
48
  task config: :download_jars do
12
49
  Rake::Task['jetty:config'].invoke
@@ -15,49 +52,29 @@ namespace :sufia do
15
52
  desc 'Download Solr full-text extraction jars'
16
53
  task :download_jars do
17
54
  puts "Downloading full-text jars from maven.org ..."
18
- url_prefix = 'http://search.maven.org/remotecontent?filepath='
19
55
  fulltext_dir = 'jetty/solr/lib/contrib/extraction/lib'
20
- jars = %w(
21
- org/apache/james/apache-mime4j-core/0.7.2/apache-mime4j-core-0.7.2.jar
22
- org/apache/james/apache-mime4j-dom/0.7.2/apache-mime4j-dom-0.7.2.jar
23
- org/apache/solr/solr-cell/4.0.0/solr-cell-4.0.0.jar
24
- org/bouncycastle/bcmail-jdk15/1.45/bcmail-jdk15-1.45.jar
25
- org/bouncycastle/bcprov-jdk15/1.45/bcprov-jdk15-1.45.jar
26
- de/l3s/boilerpipe/boilerpipe/1.1.0/boilerpipe-1.1.0.jar
27
- org/apache/commons/commons-compress/1.4.1/commons-compress-1.4.1.jar
28
- dom4j/dom4j/1.6.1/dom4j-1.6.1.jar
29
- org/apache/pdfbox/fontbox/1.7.0/fontbox-1.7.0.jar
30
- com/ibm/icu/icu4j/49.1/icu4j-49.1.jar
31
- com/googlecode/mp4parser/isoparser/1.0-RC-1/isoparser-1.0-RC-1.jar
32
- jdom/jdom/1.0/jdom-1.0.jar
33
- org/apache/pdfbox/jempbox/1.7.0/jempbox-1.7.0.jar
34
- com/googlecode/juniversalchardet/juniversalchardet/1.0.3/juniversalchardet-1.0.3.jar
35
- com/drewnoakes/metadata-extractor/2.4.0-beta-1/metadata-extractor-2.4.0-beta-1.jar
36
- edu/ucar/netcdf/4.2-min/netcdf-4.2-min.jar
37
- org/apache/pdfbox/pdfbox/1.7.0/pdfbox-1.7.0.jar
38
- org/apache/poi/poi/3.8/poi-3.8.jar
39
- org/apache/poi/poi-ooxml/3.8/poi-ooxml-3.8.jar
40
- org/apache/poi/poi-ooxml-schemas/3.8/poi-ooxml-schemas-3.8.jar
41
- org/apache/poi/poi-scratchpad/3.8/poi-scratchpad-3.8.jar
42
- rome/rome/0.9/rome-0.9.jar
43
- org/ccil/cowan/tagsoup/tagsoup/1.2.1/tagsoup-1.2.1.jar
44
- org/apache/tika/tika-core/1.2/tika-core-1.2.jar
45
- org/apache/tika/tika-parsers/1.2/tika-parsers-1.2.jar
46
- org/gagravarr/vorbis-java-core/0.1/vorbis-java-core-0.1.jar
47
- org/gagravarr/vorbis-java-tika/0.1/vorbis-java-tika-0.1.jar
48
- xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar
49
- org/apache/xmlbeans/xmlbeans/2.3.0/xmlbeans-2.3.0.jar
50
- org/tukaani/xz/1.0/xz-1.0.jar
51
- )
52
56
  FileUtils.mkdir_p(fulltext_dir) unless File.directory?(fulltext_dir)
53
57
  Dir.chdir(fulltext_dir) do
54
- jars.each do |jar|
55
- url = url_prefix + jar
56
- jarfile = jar.split('/').last
57
- puts "Fetching #{url}" unless File.exists?(jarfile)
58
- system "wget --quiet --no-clobber #{url} -O #{jarfile}"
58
+ FULLTEXT_JARS.each do |jar|
59
+ destination = jar.split('/').last
60
+ download_from_maven(jar, destination) unless File.exists?(destination)
59
61
  end
60
62
  end
61
63
  end
62
64
  end
63
65
  end
66
+
67
+ def download_from_maven url, dst
68
+ full_url = '/remotecontent?filepath=' + url
69
+ file = File.open(dst, "w")
70
+ Net::HTTP.start("search.maven.org") do |http|
71
+ puts "Fetching #{full_url}"
72
+ begin
73
+ http.request_get(full_url) do |resp|
74
+ resp.read_body { |segment| file.write(segment) }
75
+ end
76
+ ensure
77
+ file.close
78
+ end
79
+ end
80
+ end
@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
31
31
 
32
32
  spec.add_dependency "hydra-head", "~> 9.0"
33
33
  spec.add_dependency "active-fedora", "~> 9.0"
34
- spec.add_dependency "hydra-collections", "~> 4.0"
34
+ spec.add_dependency "hydra-collections", [">= 5.0.2", "< 6.0"]
35
35
  spec.add_dependency 'hydra-derivatives', '~> 1.0'
36
36
  spec.add_dependency 'nest', '~> 1.1'
37
37
  spec.add_dependency 'resque', '~> 1.23'
@@ -17,8 +17,8 @@ Gem::Specification.new do |gem|
17
17
  gem.license = 'Apache2'
18
18
 
19
19
  gem.add_dependency 'sufia-models', version
20
- gem.add_dependency 'blacklight_advanced_search', '~> 5.0'
21
- gem.add_dependency 'blacklight', '~> 5.5'
20
+ gem.add_dependency 'blacklight_advanced_search', ['>= 5.1.4', '< 6.0']
21
+ gem.add_dependency 'blacklight', '~> 5.12'
22
22
  gem.add_dependency 'tinymce-rails', '~> 4.0.19'
23
23
  gem.add_dependency 'tinymce-rails-imageupload', '~> 4.0.16.beta'
24
24
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sufia
3
3
  version: !ruby/object:Gem::Version
4
- version: 6.0.0.rc4
4
+ version: 6.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Justin Coyne
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2015-02-18 00:00:00.000000000 Z
12
+ date: 2015-03-27 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: sufia-models
@@ -17,42 +17,48 @@ dependencies:
17
17
  requirements:
18
18
  - - '='
19
19
  - !ruby/object:Gem::Version
20
- version: 6.0.0.rc4
20
+ version: 6.0.0
21
21
  type: :runtime
22
22
  prerelease: false
23
23
  version_requirements: !ruby/object:Gem::Requirement
24
24
  requirements:
25
25
  - - '='
26
26
  - !ruby/object:Gem::Version
27
- version: 6.0.0.rc4
27
+ version: 6.0.0
28
28
  - !ruby/object:Gem::Dependency
29
29
  name: blacklight_advanced_search
30
30
  requirement: !ruby/object:Gem::Requirement
31
31
  requirements:
32
- - - "~>"
32
+ - - ">="
33
33
  - !ruby/object:Gem::Version
34
- version: '5.0'
34
+ version: 5.1.4
35
+ - - "<"
36
+ - !ruby/object:Gem::Version
37
+ version: '6.0'
35
38
  type: :runtime
36
39
  prerelease: false
37
40
  version_requirements: !ruby/object:Gem::Requirement
38
41
  requirements:
39
- - - "~>"
42
+ - - ">="
43
+ - !ruby/object:Gem::Version
44
+ version: 5.1.4
45
+ - - "<"
40
46
  - !ruby/object:Gem::Version
41
- version: '5.0'
47
+ version: '6.0'
42
48
  - !ruby/object:Gem::Dependency
43
49
  name: blacklight
44
50
  requirement: !ruby/object:Gem::Requirement
45
51
  requirements:
46
52
  - - "~>"
47
53
  - !ruby/object:Gem::Version
48
- version: '5.5'
54
+ version: '5.12'
49
55
  type: :runtime
50
56
  prerelease: false
51
57
  version_requirements: !ruby/object:Gem::Requirement
52
58
  requirements:
53
59
  - - "~>"
54
60
  - !ruby/object:Gem::Version
55
- version: '5.5'
61
+ version: '5.12'
56
62
  - !ruby/object:Gem::Dependency
57
63
  name: tinymce-rails
58
64
  requirement: !ruby/object:Gem::Requirement
@@ -444,26 +450,7 @@ files:
444
450
  - app/assets/images/old_main_tulips.jpg
445
451
  - app/assets/images/orcid.png
446
452
  - app/assets/images/progressbar.gif
447
- - app/assets/images/site_images/bg_body.png
448
- - app/assets/images/site_images/bg_breadcrumbs.png
449
- - app/assets/images/site_images/bg_button1.png
450
- - app/assets/images/site_images/bg_button2.png
451
- - app/assets/images/site_images/bg_button3.png
452
- - app/assets/images/site_images/bg_content.png
453
- - app/assets/images/site_images/bg_content2.png
454
- - app/assets/images/site_images/bg_footer.png
455
- - app/assets/images/site_images/bg_masthead.png
456
- - app/assets/images/site_images/bg_search_field.png
457
- - app/assets/images/site_images/bg_search_header.png
458
- - app/assets/images/site_images/bg_signin.png
459
- - app/assets/images/site_images/carrot_blue.png
460
- - app/assets/images/site_images/carrot_yellow.png
461
- - app/assets/images/site_images/icon_arrow2_up.png
462
- - app/assets/images/site_images/icon_arrow3_down.png
463
- - app/assets/images/site_images/icon_arrow3_right.png
464
- - app/assets/images/site_images/icon_arrow_down.png
465
- - app/assets/images/site_images/icons_sprite.png
466
- - app/assets/images/site_images/logo_psuss_footer.png
453
+ - app/assets/images/site_images/collection-icon.svg
467
454
  - app/assets/images/ui-anim_basic_16x16.gif
468
455
  - app/assets/images/ui-bg_diagonals-thick_18_b81900_40x40.png
469
456
  - app/assets/images/ui-bg_diagonals-thick_20_666666_40x40.png
@@ -525,6 +512,7 @@ files:
525
512
  - app/assets/stylesheets/sufia/_dashboard.scss
526
513
  - app/assets/stylesheets/sufia/_featured.scss
527
514
  - app/assets/stylesheets/sufia/_file-listing.scss
515
+ - app/assets/stylesheets/sufia/_file-show.scss
528
516
  - app/assets/stylesheets/sufia/_header.scss
529
517
  - app/assets/stylesheets/sufia/_home-page.scss
530
518
  - app/assets/stylesheets/sufia/_multi_value_fields.css.scss
@@ -595,6 +583,7 @@ files:
595
583
  - app/helpers/sufia/dashboard_helper_behavior.rb
596
584
  - app/helpers/sufia/permissions_helper.rb
597
585
  - app/helpers/sufia/sufia_helper_behavior.rb
586
+ - app/helpers/sufia_url_helper.rb
598
587
  - app/helpers/trophy_helper.rb
599
588
  - app/inputs/multi_value_with_help_input.rb
600
589
  - app/inputs/select_with_help_input.rb
@@ -620,6 +609,7 @@ files:
620
609
  - app/presenters/sufia/presenter_renderer.rb
621
610
  - app/presenters/sufia/version_list_presenter.rb
622
611
  - app/presenters/sufia/version_presenter.rb
612
+ - app/search_builders/sufia/search_builder.rb
623
613
  - app/uploaders/tinymce_asset_uploader.rb
624
614
  - app/views/_add_assets_links.html.erb
625
615
  - app/views/_controls.html.erb
@@ -647,7 +637,6 @@ files:
647
637
  - app/views/batch_edits/edit.html.erb
648
638
  - app/views/catalog/_delete_partials/_default.html.erb
649
639
  - app/views/catalog/_document_list.html.erb
650
- - app/views/catalog/_edit_partials/_default.html.erb
651
640
  - app/views/catalog/_edit_partials/_default_details.html.erb
652
641
  - app/views/catalog/_facet_limit.html.erb
653
642
  - app/views/catalog/_search_form.html.erb
@@ -857,6 +846,7 @@ files:
857
846
  - lib/generators/sufia/templates/config/tinymce.yml
858
847
  - lib/generators/sufia/templates/sufia_helper.rb
859
848
  - lib/generators/sufia/upgrade400_generator.rb
849
+ - lib/generators/sufia/upgrade600_generator.rb
860
850
  - lib/sufia.rb
861
851
  - lib/sufia/form_builder.rb
862
852
  - lib/sufia/role_mapper.rb
@@ -938,6 +928,7 @@ files:
938
928
  - spec/fixtures/png_fits.xml
939
929
  - spec/fixtures/sample_mpeg4.mp4
940
930
  - spec/fixtures/small_file.txt
931
+ - spec/fixtures/spoken-text.m4a
941
932
  - spec/fixtures/sufia/.gitignore
942
933
  - spec/fixtures/sufia/sufia_test4.pdf
943
934
  - spec/fixtures/sufia/sufia_test5.mp3
@@ -954,11 +945,12 @@ files:
954
945
  - spec/helpers/generic_file_helper_spec.rb
955
946
  - spec/helpers/permissions_helper_spec.rb
956
947
  - spec/helpers/sufia_helper_spec.rb
948
+ - spec/helpers/sufia_url_helper_spec.rb
957
949
  - spec/helpers/trophy_helper_spec.rb
958
950
  - spec/inputs/multi_value_with_help_input_spec.rb
959
951
  - spec/inputs/select_with_help_input_spec.rb
960
952
  - spec/inputs/select_with_modal_help_input_spec.rb
961
- - spec/jobs/active_fedora_pid_based_job_spec.rb
953
+ - spec/jobs/active_fedora_id_based_job_spec.rb
962
954
  - spec/jobs/audit_job_spec.rb
963
955
  - spec/jobs/batch_update_job_spec.rb
964
956
  - spec/jobs/characterize_job_spec.rb
@@ -1016,15 +1008,16 @@ files:
1016
1008
  - spec/support/cleaner.rb
1017
1009
  - spec/support/features.rb
1018
1010
  - spec/support/features/session_helpers.rb
1019
- - spec/support/fedora_conf/fedora.fcfg
1020
1011
  - spec/support/fixture_helpers.rb
1021
1012
  - spec/support/input_support.rb
1022
1013
  - spec/support/locations.rb
1023
1014
  - spec/support/poltergeist.rb
1024
1015
  - spec/support/proxies.rb
1016
+ - spec/support/rake_output.rb
1025
1017
  - spec/support/selectors.rb
1026
1018
  - spec/support/statistic_helper.rb
1027
1019
  - spec/support/uploaded_file_monkeypatch.rb
1020
+ - spec/tasks/rake_spec.rb
1028
1021
  - spec/test_app_templates/Gemfile.extra
1029
1022
  - spec/test_app_templates/lib/generators/test_app_generator.rb
1030
1023
  - spec/views/batch/edit.html.erb_spec.rb
@@ -1036,11 +1029,13 @@ files:
1036
1029
  - spec/views/collections/_show_descriptions.html.erb_spec.rb
1037
1030
  - spec/views/collections/_show_document_list.erb_spec.rb
1038
1031
  - spec/views/dashboard/index_spec.rb
1032
+ - spec/views/generic_file/_browse_everything.html.erb_spec.rb
1039
1033
  - spec/views/generic_file/_permission_form.html.erb_spec.rb
1040
1034
  - spec/views/generic_file/edit.html.erb_spec.rb
1041
1035
  - spec/views/generic_file/show.html.erb_spec.rb
1042
1036
  - spec/views/generic_file/stats.html.erb_spec.rb
1043
1037
  - spec/views/homepage/_featured_works.html.erb_spec.rb
1038
+ - spec/views/homepage/_home_header.html.erb_spec.rb
1044
1039
  - spec/views/my/facet.html.erb_spec.rb
1045
1040
  - spec/views/users/_follower_modal.html.erb_spec.rb
1046
1041
  - spec/views/users/_following_modal.html.erb_spec.rb
@@ -1054,6 +1049,7 @@ files:
1054
1049
  - sufia-models/README.md
1055
1050
  - sufia-models/Rakefile
1056
1051
  - sufia-models/app/actors/sufia/generic_file/actor.rb
1052
+ - sufia-models/app/jobs/active_fedora_id_based_job.rb
1057
1053
  - sufia-models/app/jobs/active_fedora_pid_based_job.rb
1058
1054
  - sufia-models/app/jobs/audit_job.rb
1059
1055
  - sufia-models/app/jobs/batch_update_job.rb
@@ -1146,6 +1142,8 @@ files:
1146
1142
  - sufia-models/lib/generators/sufia/models/templates/migrations/add_linkedin_to_users.rb
1147
1143
  - sufia-models/lib/generators/sufia/models/templates/migrations/add_orcid_to_users.rb
1148
1144
  - sufia-models/lib/generators/sufia/models/templates/migrations/add_social_to_users.rb
1145
+ - sufia-models/lib/generators/sufia/models/templates/migrations/change_audit_log_pid_to_generic_file_id.rb
1146
+ - sufia-models/lib/generators/sufia/models/templates/migrations/change_proxy_deposit_request_pid_to_generic_file_id.rb
1149
1147
  - sufia-models/lib/generators/sufia/models/templates/migrations/create_checksum_audit_logs.rb
1150
1148
  - sufia-models/lib/generators/sufia/models/templates/migrations/create_content_blocks.rb
1151
1149
  - sufia-models/lib/generators/sufia/models/templates/migrations/create_featured_works.rb
@@ -1161,6 +1159,7 @@ files:
1161
1159
  - sufia-models/lib/generators/sufia/models/templates/migrations/create_version_committers.rb
1162
1160
  - sufia-models/lib/generators/sufia/models/update_content_blocks_generator.rb
1163
1161
  - sufia-models/lib/generators/sufia/models/upgrade400_generator.rb
1162
+ - sufia-models/lib/generators/sufia/models/upgrade600_generator.rb
1164
1163
  - sufia-models/lib/generators/sufia/models/usagestats_generator.rb
1165
1164
  - sufia-models/lib/generators/sufia/models/user_stats_generator.rb
1166
1165
  - sufia-models/lib/sufia/messages.rb
@@ -1179,6 +1178,8 @@ files:
1179
1178
  - sufia-models/lib/sufia/permissions.rb
1180
1179
  - sufia-models/lib/sufia/permissions/readable.rb
1181
1180
  - sufia-models/lib/sufia/permissions/writable.rb
1181
+ - sufia-models/lib/tasks/batch_cleanup.rake
1182
+ - sufia-models/lib/tasks/migrate.rake
1182
1183
  - sufia-models/lib/tasks/resque.rake
1183
1184
  - sufia-models/lib/tasks/stats_tasks.rake
1184
1185
  - sufia-models/lib/tasks/sufia-models_tasks.rake
@@ -1240,12 +1241,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
1240
1241
  version: '0'
1241
1242
  required_rubygems_version: !ruby/object:Gem::Requirement
1242
1243
  requirements:
1243
- - - ">"
1244
+ - - ">="
1244
1245
  - !ruby/object:Gem::Version
1245
- version: 1.3.1
1246
+ version: '0'
1246
1247
  requirements: []
1247
1248
  rubyforge_project:
1248
- rubygems_version: 2.4.5
1249
+ rubygems_version: 2.4.6
1249
1250
  signing_key:
1250
1251
  specification_version: 4
1251
1252
  summary: Sufia was extracted from ScholarSphere developed by Penn State University
@@ -1321,6 +1322,7 @@ test_files:
1321
1322
  - spec/fixtures/png_fits.xml
1322
1323
  - spec/fixtures/sample_mpeg4.mp4
1323
1324
  - spec/fixtures/small_file.txt
1325
+ - spec/fixtures/spoken-text.m4a
1324
1326
  - spec/fixtures/sufia/.gitignore
1325
1327
  - spec/fixtures/sufia/sufia_test4.pdf
1326
1328
  - spec/fixtures/sufia/sufia_test5.mp3
@@ -1337,11 +1339,12 @@ test_files:
1337
1339
  - spec/helpers/generic_file_helper_spec.rb
1338
1340
  - spec/helpers/permissions_helper_spec.rb
1339
1341
  - spec/helpers/sufia_helper_spec.rb
1342
+ - spec/helpers/sufia_url_helper_spec.rb
1340
1343
  - spec/helpers/trophy_helper_spec.rb
1341
1344
  - spec/inputs/multi_value_with_help_input_spec.rb
1342
1345
  - spec/inputs/select_with_help_input_spec.rb
1343
1346
  - spec/inputs/select_with_modal_help_input_spec.rb
1344
- - spec/jobs/active_fedora_pid_based_job_spec.rb
1347
+ - spec/jobs/active_fedora_id_based_job_spec.rb
1345
1348
  - spec/jobs/audit_job_spec.rb
1346
1349
  - spec/jobs/batch_update_job_spec.rb
1347
1350
  - spec/jobs/characterize_job_spec.rb
@@ -1399,15 +1402,16 @@ test_files:
1399
1402
  - spec/support/cleaner.rb
1400
1403
  - spec/support/features.rb
1401
1404
  - spec/support/features/session_helpers.rb
1402
- - spec/support/fedora_conf/fedora.fcfg
1403
1405
  - spec/support/fixture_helpers.rb
1404
1406
  - spec/support/input_support.rb
1405
1407
  - spec/support/locations.rb
1406
1408
  - spec/support/poltergeist.rb
1407
1409
  - spec/support/proxies.rb
1410
+ - spec/support/rake_output.rb
1408
1411
  - spec/support/selectors.rb
1409
1412
  - spec/support/statistic_helper.rb
1410
1413
  - spec/support/uploaded_file_monkeypatch.rb
1414
+ - spec/tasks/rake_spec.rb
1411
1415
  - spec/test_app_templates/Gemfile.extra
1412
1416
  - spec/test_app_templates/lib/generators/test_app_generator.rb
1413
1417
  - spec/views/batch/edit.html.erb_spec.rb
@@ -1419,11 +1423,13 @@ test_files:
1419
1423
  - spec/views/collections/_show_descriptions.html.erb_spec.rb
1420
1424
  - spec/views/collections/_show_document_list.erb_spec.rb
1421
1425
  - spec/views/dashboard/index_spec.rb
1426
+ - spec/views/generic_file/_browse_everything.html.erb_spec.rb
1422
1427
  - spec/views/generic_file/_permission_form.html.erb_spec.rb
1423
1428
  - spec/views/generic_file/edit.html.erb_spec.rb
1424
1429
  - spec/views/generic_file/show.html.erb_spec.rb
1425
1430
  - spec/views/generic_file/stats.html.erb_spec.rb
1426
1431
  - spec/views/homepage/_featured_works.html.erb_spec.rb
1432
+ - spec/views/homepage/_home_header.html.erb_spec.rb
1427
1433
  - spec/views/my/facet.html.erb_spec.rb
1428
1434
  - spec/views/users/_follower_modal.html.erb_spec.rb
1429
1435
  - spec/views/users/_following_modal.html.erb_spec.rb