sufia 0.0.1.pre1 → 0.0.1.pre2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (151) hide show
  1. data/.gitignore +1 -2
  2. data/Gemfile +2 -1
  3. data/README.md +19 -15
  4. data/Rakefile +2 -0
  5. data/app/controllers/batch_controller.rb +2 -3
  6. data/app/controllers/contact_form_controller.rb +1 -0
  7. data/app/controllers/dashboard_controller.rb +2 -2
  8. data/app/controllers/generic_files_controller.rb +24 -12
  9. data/app/controllers/mailbox_controller.rb +2 -2
  10. data/app/controllers/single_use_link_controller.rb +5 -5
  11. data/app/controllers/users_controller.rb +10 -10
  12. data/app/helpers/{application_helper.rb → sufia_helper.rb} +5 -13
  13. data/app/models/audit_job.rb +3 -4
  14. data/app/models/batch.rb +2 -0
  15. data/app/models/batch_update_job.rb +4 -6
  16. data/app/models/checksum_audit_log.rb +2 -0
  17. data/app/models/contact_form.rb +2 -0
  18. data/app/models/content_delete_event_job.rb +1 -1
  19. data/app/models/content_deposit_event_job.rb +2 -2
  20. data/app/models/content_new_version_event_job.rb +2 -2
  21. data/app/models/content_restored_version_event_job.rb +2 -2
  22. data/app/models/content_update_event_job.rb +2 -2
  23. data/app/models/datastreams/properties_datastream.rb +1 -1
  24. data/app/models/domain_term.rb +1 -0
  25. data/app/models/event_job.rb +1 -1
  26. data/app/models/generic_file.rb +5 -4
  27. data/app/models/local_authority.rb +1 -0
  28. data/app/models/local_authority_entry.rb +1 -0
  29. data/app/models/single_use_link.rb +2 -2
  30. data/app/models/user_edit_profile_event_job.rb +1 -1
  31. data/app/models/user_follow_event_job.rb +2 -2
  32. data/app/models/user_unfollow_event_job.rb +2 -2
  33. data/app/models/version_committer.rb +1 -0
  34. data/app/views/_footer.html.erb +21 -0
  35. data/app/views/_logo.html.erb +3 -0
  36. data/app/views/_masthead.html.erb +38 -0
  37. data/app/views/_user_util_links.html.erb +14 -43
  38. data/app/views/catalog/_document_list.html.erb +0 -7
  39. data/app/views/catalog/_home_text.html.erb +4 -4
  40. data/app/views/catalog/_recent_document.html.erb +5 -5
  41. data/app/views/contact_form/_directions.html.erb +4 -0
  42. data/app/views/contact_form/new.html.erb +2 -4
  43. data/app/views/dashboard/_document_list.html.erb +1 -8
  44. data/app/views/dashboard/_facets.html.erb +1 -1
  45. data/app/views/dashboard/_index_partials/_list_files.html.erb +1 -1
  46. data/app/views/dashboard/_index_partials/_thumbnail_display.html.erb +6 -6
  47. data/app/views/dashboard/_search_form.html.erb +1 -1
  48. data/app/views/dashboard/index.html.erb +26 -25
  49. data/app/views/generic_files/_media_display.html.erb +5 -5
  50. data/app/views/generic_files/_permission.html.erb +11 -11
  51. data/app/views/generic_files/edit.html.erb +10 -8
  52. data/app/views/generic_files/show.html.erb +16 -12
  53. data/app/views/layouts/error.html.erb +2 -53
  54. data/app/views/layouts/hydra-head.html.erb +2 -21
  55. data/app/views/mailbox/index.html.erb +1 -1
  56. data/app/views/static/about.html.erb +2 -65
  57. data/app/views/static/help.html.erb +1 -721
  58. data/app/views/users/_search_form.html.erb +1 -1
  59. data/app/views/users/edit.html.erb +6 -3
  60. data/config/locales/sufia.en.yml +6 -0
  61. data/config/routes.rb +1 -3
  62. data/features/browse_dashboard_files.feature +1 -1
  63. data/features/display_dashboard.feature +1 -1
  64. data/features/step_definitions/fixture_steps.rb +2 -2
  65. data/features/step_definitions/user_steps.rb +12 -8
  66. data/features/support/env.rb +9 -0
  67. data/features/support/paths.rb +21 -21
  68. data/lib/generators/sufia/sufia_generator.rb +46 -4
  69. data/lib/generators/sufia/templates/catalog_controller.rb +2 -2
  70. data/lib/generators/sufia/templates/config/redis_config.rb +20 -0
  71. data/lib/generators/sufia/templates/config/sufia.rb +29 -0
  72. data/lib/generators/sufia/templates/migrations/add_groups_to_users.rb +0 -4
  73. data/lib/sufia.rb +22 -15
  74. data/lib/sufia/active_fedora/redis.rb +49 -0
  75. data/lib/{generators/sufia/templates/config/active_record_base_redis.rb → sufia/active_record/redis.rb} +1 -16
  76. data/lib/sufia/controller.rb +1 -2
  77. data/lib/sufia/http_header_auth.rb +9 -0
  78. data/lib/sufia/role_mapper.rb +1 -0
  79. data/lib/sufia/user.rb +24 -6
  80. data/lib/sufia/version.rb +1 -1
  81. data/lib/tasks/fixtures.rake +245 -0
  82. data/spec/.gitignore +1 -0
  83. data/spec/active_fedora/unsaved_digital_object_spec.rb +2 -2
  84. data/spec/config/host_to_vhost_spec.rb +8 -8
  85. data/spec/controllers/batch_controller_spec.rb +6 -6
  86. data/spec/controllers/catalog_controller_spec.rb +2 -0
  87. data/spec/controllers/dashboard_controller_spec.rb +13 -10
  88. data/spec/controllers/downloads_controller_spec.rb +8 -8
  89. data/spec/controllers/generic_files_controller_spec.rb +46 -44
  90. data/spec/controllers/mailbox_controller_spec.rb +6 -12
  91. data/spec/controllers/sessions_controller_spec.rb +8 -6
  92. data/spec/controllers/single_use_link_controller_spec.rb +9 -14
  93. data/spec/controllers/users_controller_spec.rb +49 -49
  94. data/spec/{factories.rb → factories/users.rb} +6 -3
  95. data/spec/fixtures/scholarsphere/scholarsphere_test2.foxml.erb +2 -2
  96. data/spec/fixtures/scholarsphere/scholarsphere_test3.foxml.erb +2 -2
  97. data/spec/fixtures/scholarsphere/scholarsphere_test4.foxml.erb +2 -2
  98. data/spec/fixtures/scholarsphere/scholarsphere_test6.foxml.erb +2 -2
  99. data/spec/fixtures/scholarsphere/sufia_scholarsphere1.descMeta.txt +12 -0
  100. data/spec/fixtures/scholarsphere/sufia_scholarsphere1.foxml.erb +79 -0
  101. data/spec/fixtures/scholarsphere/sufia_scholarsphere1.txt +1 -0
  102. data/spec/fixtures/scholarsphere/{scholarsphere_test1.foxml.erb → sufia_test1.foxml.erb} +6 -6
  103. data/spec/fixtures/scholarsphere/{scholarsphere_test5.foxml.erb → sufia_test5.foxml.erb} +5 -5
  104. data/spec/fixtures/scholarsphere_generic_stub.foxml.erb +5 -5
  105. data/spec/lib/{scholarsphere → sufia}/id_service_spec.rb +5 -5
  106. data/spec/lib/{scholarsphere → sufia}/role_mapper_spec.rb +5 -2
  107. data/spec/models/audit_job_spec.rb +1 -1
  108. data/spec/models/batch_spec.rb +2 -2
  109. data/spec/models/batch_update_job_spec.rb +5 -5
  110. data/spec/models/checksum_audit_log_spec.rb +1 -1
  111. data/spec/models/event_jobs_spec.rb +19 -19
  112. data/spec/models/file_content_datastream_spec.rb +6 -6
  113. data/spec/models/fits_datastream_spec.rb +1 -1
  114. data/spec/models/generic_file_spec.rb +8 -9
  115. data/spec/models/local_authority_spec.rb +3 -3
  116. data/spec/models/single_use_link_spec.rb +5 -5
  117. data/spec/models/unzip_job_spec.rb +1 -1
  118. data/spec/models/user_spec.rb +5 -26
  119. data/spec/rake/scholarsphere_fixtures_spec.rb +13 -12
  120. data/spec/routing/route_spec.rb +4 -41
  121. data/spec/spec_helper.rb +14 -4
  122. data/spec/support/Gemfile +21 -0
  123. data/spec/support/config/redis.yml +6 -0
  124. data/spec/support/lib/generators/test_app_generator.rb +40 -0
  125. data/sufia.gemspec +4 -2
  126. data/tasks/cucumber.rake +0 -6
  127. data/tasks/jetty.rake +40 -0
  128. data/tasks/scholarsphere-dev.rake +57 -17
  129. data/tasks/scholarsphere-fixtures.rake +16 -63
  130. metadata +74 -55
  131. data/.rvmrc +0 -59
  132. data/LICENSE +0 -22
  133. data/app/assets/images/site_images/logo_psuss_logotype.png +0 -0
  134. data/app/assets/images/site_images/logo_psuss_shield.png +0 -0
  135. data/lib/generators/sufia/templates/config/active_fedora_base_redis.rb +0 -54
  136. data/lib/sufia/ldap.rb +0 -123
  137. data/spec/fixtures/hydra_test_default_partials.foxml.xml +0 -80
  138. data/spec/fixtures/hydra_test_generic_content.foxml.xml +0 -138
  139. data/spec/fixtures/hydra_test_generic_image.foxml.xml +0 -395
  140. data/spec/fixtures/hydra_test_no_model.foxml.xml +0 -79
  141. data/spec/fixtures/hydrangea_fixture_archivist_only_mods_article.foxml.xml +0 -1212
  142. data/spec/fixtures/hydrangea_fixture_file_asset1.foxml.xml +0 -4946
  143. data/spec/fixtures/hydrangea_fixture_mods_article1.foxml.xml +0 -234
  144. data/spec/fixtures/hydrangea_fixture_mods_article2.foxml.xml +0 -177
  145. data/spec/fixtures/hydrangea_fixture_mods_article3.foxml.xml +0 -170
  146. data/spec/fixtures/hydrangea_fixture_mods_dataset1.foxml.xml +0 -187
  147. data/spec/fixtures/hydrangea_fixture_uploaded_svg1.foxml.xml +0 -676
  148. data/spec/fixtures/hydrus_admin_class1.foxml.xml +0 -176
  149. data/spec/fixtures/libra-oa_1.foxml.xml +0 -2324
  150. data/spec/fixtures/libra-oa_2.foxml.xml +0 -2422
  151. data/spec/fixtures/libra-oa_7.foxml.xml +0 -1735
@@ -1,23 +1,63 @@
1
1
  require 'rspec/core'
2
2
  require 'rspec/core/rake_task'
3
- namespace :scholarsphere do
4
- desc "Execute Continuous Integration build (docs, tests with coverage)"
5
- task :ci => :environment do
6
- #Rake::Task["hyhead:doc"].invoke
7
- Rake::Task["jetty:config"].invoke
8
- #Rake::Task["db:drop"].invoke
9
- #Rake::Task["db:create"].invoke
10
- Rake::Task["db:migrate"].invoke
11
-
12
- require 'jettywrapper'
13
- jetty_params = Jettywrapper.load_config.merge({:jetty_home => File.expand_path(File.join(Rails.root, 'jetty'))})
14
-
15
- error = nil
16
- error = Jettywrapper.wrap(jetty_params) do
17
- Rake::Task['spec'].invoke
18
- Rake::Task['cucumber:ok'].invoke
3
+ APP_ROOT="." # for jettywrapper
4
+ require 'jettywrapper'
5
+ ENV["RAILS_ROOT"] ||= 'spec/internal'
6
+
7
+ desc "Run specs"
8
+ RSpec::Core::RakeTask.new(:spec => [:generate]) do |t|
9
+ # if ENV['COVERAGE'] and RUBY_VERSION =~ /^1.8/
10
+ # t.rcov = true
11
+ # t.rcov_opts = %w{--exclude spec\/*,gems\/*,ruby\/* --aggregate coverage.data}
12
+ # end
13
+ t.rspec_opts = "--colour"
14
+ end
15
+
16
+ desc "Load scholarsphere fixtures"
17
+ task :fixtures do# => ['scholarsphere:fixtures:refresh'] do
18
+ #NOTE do we need fixtures:create, fixtures:generate
19
+ within_test_app do
20
+ puts "Loading fixtures "
21
+ ENV["RAILS_ENV"] = 'test'
22
+ puts `rake scholarsphere:fixtures:refresh`
23
+ end
24
+ end
25
+
26
+
27
+ desc "Create the test rails app"
28
+ task :generate do
29
+ unless File.exists?('spec/internal/Rakefile')
30
+ puts "Generating rails app"
31
+ `rails new spec/internal`
32
+ puts "Copying gemfile"
33
+ `cp spec/support/Gemfile spec/internal`
34
+ puts "Copying generator"
35
+ `cp -r spec/support/lib/generators spec/internal/lib`
36
+ Bundler.with_clean_env do
37
+ within_test_app do
38
+ puts "Bundle install"
39
+ `bundle install`
40
+ puts "running test_app_generator"
41
+ system "rails generate test_app"
42
+
43
+ puts "running migrations"
44
+ puts `rake db:migrate db:test:prepare`
45
+ end
19
46
  end
20
- raise "test failures: #{error}" if error
21
47
  end
48
+ puts "Running specs"
49
+ end
22
50
 
51
+ desc "Clean out the test rails app"
52
+ task :clean do
53
+ puts "Removing sample rails app"
54
+ `rm -rf spec/internal`
23
55
  end
56
+
57
+ def within_test_app
58
+ FileUtils.cd('spec/internal')
59
+ yield
60
+ FileUtils.cd('../..')
61
+ end
62
+
63
+
@@ -183,32 +183,30 @@
183
183
  #
184
184
  #
185
185
  #
186
- namespace :scholarsphere do
187
-
188
- desc "Init Hydra configuration"
189
- task :init => [:environment] do
190
- # We need to just start rails so that all the models are loaded
191
- end
192
186
 
187
+ require 'active_fedora'
188
+
189
+ SUFIA_TEST_NS = 'sufia' #this must be the same as id_namespace in the test applications config
190
+ namespace :scholarsphere do
193
191
  namespace :fixtures do
194
- @localDir = 'spec/fixtures'
192
+ @localDir = File.expand_path("../../spec/fixtures", __FILE__)
195
193
  @dir = ENV["FIXTURE_DIR"] || 'scholarsphere'
196
194
 
197
195
  desc "Create ScholarSphere Hydra fixtures for generation and loading"
198
- task :create => :environment do
196
+ task :create do
199
197
  @id = ENV["FIXTURE_ID"] ||'scholarsphere1'
200
198
  @title = ENV["FIXTURE_TITLE"] || 'scholarsphere test'
201
199
  @user = ENV["FIXTURE_USER"] || 'archivist1'
202
200
 
203
- @root ='<%=Rails.root%>'
201
+ @root ='<%=@localDir%>'
204
202
 
205
- @inputFoxmlFile = File.join(Rails.root, 'spec', 'fixtures', 'scholarsphere_generic_stub.foxml.erb')
206
- @inputDescFile = File.join(Rails.root, 'spec', 'fixtures', 'scholarsphere_generic_stub.descMeta.txt')
207
- @inputTxtFile = File.join(Rails.root, 'spec', 'fixtures', 'scholarsphere_generic_stub.txt')
203
+ @inputFoxmlFile = File.join(@localDir, 'scholarsphere_generic_stub.foxml.erb')
204
+ @inputDescFile = File.join(@localDir, 'scholarsphere_generic_stub.descMeta.txt')
205
+ @inputTxtFile = File.join(@localDir, 'scholarsphere_generic_stub.txt')
208
206
 
209
- @outputFoxmlFile = File.join(Rails.root, @localDir, @dir, 'scholarsphere_'+@id+'.foxml.erb')
210
- @outputDescFile = File.join(Rails.root, @localDir, @dir, 'scholarsphere_'+@id+'.descMeta.txt')
211
- @outputTxtFile = File.join(Rails.root, @localDir, @dir, 'scholarsphere_'+@id+'.txt')
207
+ @outputFoxmlFile = File.join(@localDir, @dir, "#{SUFIA_TEST_NS}_#{@id}.foxml.erb")
208
+ @outputDescFile = File.join(@localDir, @dir, "#{SUFIA_TEST_NS}_#{@id}.descMeta.txt")
209
+ @outputTxtFile = File.join(@localDir, @dir, "#{SUFIA_TEST_NS}_#{@id}.txt")
212
210
 
213
211
  run_erb_stub @inputFoxmlFile, @outputFoxmlFile
214
212
  run_erb_stub @inputDescFile, @outputDescFile
@@ -217,57 +215,18 @@ namespace :scholarsphere do
217
215
 
218
216
  desc "Generate default ScholarSphere Hydra fixtures"
219
217
  task :generate do
220
- ENV["dir"] = File.join(Rails.root, @localDir, @dir)
218
+ ENV["dir"] = File.join(@localDir, @dir)
221
219
  fixtures = find_fixtures_erb(@dir)
222
220
  fixtures.each do |fixture|
223
221
  unless fixture.include?('generic_stub')
224
222
  outFile = fixture.sub('foxml.erb','foxml.xml')
225
223
  File.open(outFile, "w+") do |f|
226
- f.write(ERB.new(get_erb_template fixture).result())
224
+ f.write(ERB.new(get_erb_template fixture).result(binding))
227
225
  end
228
226
  end
229
227
  end
230
228
  end
231
229
 
232
- desc "Load default ScholarSphere Hydra fixtures"
233
- task :load do
234
- ENV["dir"] = File.join(Rails.root, @localDir, @dir)
235
- fixtures = find_fixtures(@dir)
236
- fixtures.each do |fixture|
237
- ENV["pid"] = fixture
238
- Rake::Task["repo:load"].reenable
239
- Rake::Task["repo:load"].invoke
240
- end
241
- raise "No fixtures found; you may need to generate from erb, use: rake scholarsphere:fixtures:generate" if fixtures.empty?
242
- end
243
-
244
- desc "Remove default ScholarSphere Hydra fixtures"
245
- task :delete do
246
- ENV["dir"] = File.join(Rails.root, @localDir, @dir)
247
- fixtures = find_fixtures(@dir)
248
- fixtures.each do |fixture|
249
- ENV["pid"] = fixture
250
- Rake::Task["repo:delete"].reenable
251
- Rake::Task["repo:delete"].invoke
252
- end
253
- end
254
-
255
- desc "Refresh default ScholarSphere Hydra fixtures"
256
- task :refresh => [:delete, :load]
257
-
258
- desc "Fix fixtures so they work with Cucumber [KLUDGE]"
259
- task :fix => :environment do
260
- puts "Attempting to fix fixtures that break cuke"
261
- ## Kludgy workarounds to get past lack of depositor in fixtures
262
- # First, create a user record
263
- User.create(login: 'archivist1', display_name: 'Captain Archivist')
264
- # Then, set this user as the depositor of test4 to appease this damn failing cuke
265
- gf = GenericFile.find('scholarsphere:test4')
266
- gf.terms_of_service = '1'
267
- gf.apply_depositor_metadata('archivist1')
268
- gf.save
269
- end
270
-
271
230
  private
272
231
 
273
232
  def run_erb_stub(inputFile, outputFile)
@@ -276,14 +235,8 @@ namespace :scholarsphere do
276
235
  end
277
236
  end
278
237
 
279
- def find_fixtures(dir)
280
- Dir.glob(File.join(Rails.root, @localDir, dir, '*.foxml.xml')).map do |fixture_file|
281
- File.basename(fixture_file, '.foxml.xml').gsub('_',':')
282
- end
283
- end
284
-
285
238
  def find_fixtures_erb(dir)
286
- Dir.glob(File.join(Rails.root, @localDir, dir, '*.foxml.erb'))
239
+ Dir.glob(File.join(@localDir, dir, '*.foxml.erb'))
287
240
  end
288
241
 
289
242
  def get_erb_template(file)
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: 0.0.1.pre1
4
+ version: 0.0.1.pre2
5
5
  prerelease: 6
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-11-15 00:00:00.000000000 Z
12
+ date: 2012-11-20 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
@@ -96,17 +96,17 @@ dependencies:
96
96
  requirement: !ruby/object:Gem::Requirement
97
97
  none: false
98
98
  requirements:
99
- - - ! '>='
99
+ - - ~>
100
100
  - !ruby/object:Gem::Version
101
- version: '0'
101
+ version: 0.0.7
102
102
  type: :runtime
103
103
  prerelease: false
104
104
  version_requirements: !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
- - - ! '>='
107
+ - - ~>
108
108
  - !ruby/object:Gem::Version
109
- version: '0'
109
+ version: 0.0.7
110
110
  - !ruby/object:Gem::Dependency
111
111
  name: resque
112
112
  requirement: !ruby/object:Gem::Requirement
@@ -251,6 +251,22 @@ dependencies:
251
251
  - - '='
252
252
  - !ruby/object:Gem::Version
253
253
  version: 0.3.6
254
+ - !ruby/object:Gem::Dependency
255
+ name: mail_form
256
+ requirement: !ruby/object:Gem::Requirement
257
+ none: false
258
+ requirements:
259
+ - - ! '>='
260
+ - !ruby/object:Gem::Version
261
+ version: '0'
262
+ type: :runtime
263
+ prerelease: false
264
+ version_requirements: !ruby/object:Gem::Requirement
265
+ none: false
266
+ requirements:
267
+ - - ! '>='
268
+ - !ruby/object:Gem::Version
269
+ version: '0'
254
270
  - !ruby/object:Gem::Dependency
255
271
  name: rails_autolink
256
272
  requirement: !ruby/object:Gem::Requirement
@@ -379,6 +395,22 @@ dependencies:
379
395
  - - '='
380
396
  - !ruby/object:Gem::Version
381
397
  version: 3.0.3
398
+ - !ruby/object:Gem::Dependency
399
+ name: activerecord-import
400
+ requirement: !ruby/object:Gem::Requirement
401
+ none: false
402
+ requirements:
403
+ - - ! '>='
404
+ - !ruby/object:Gem::Version
405
+ version: '0'
406
+ type: :runtime
407
+ prerelease: false
408
+ version_requirements: !ruby/object:Gem::Requirement
409
+ none: false
410
+ requirements:
411
+ - - ! '>='
412
+ - !ruby/object:Gem::Version
413
+ version: '0'
382
414
  description: Engine for PSU scholarsphere
383
415
  email:
384
416
  - justin.coyne@yourmediashelf.com
@@ -390,9 +422,7 @@ files:
390
422
  - .gitignore
391
423
  - .gitmodules
392
424
  - .rspec
393
- - .rvmrc
394
425
  - Gemfile
395
- - LICENSE
396
426
  - LICENSE.md
397
427
  - README.md
398
428
  - Rakefile
@@ -438,8 +468,6 @@ files:
438
468
  - app/assets/images/site_images/icon_arrow_down.png
439
469
  - app/assets/images/site_images/icons_sprite.png
440
470
  - app/assets/images/site_images/logo_psuss_footer.png
441
- - app/assets/images/site_images/logo_psuss_logotype.png
442
- - app/assets/images/site_images/logo_psuss_shield.png
443
471
  - app/assets/images/site_images/temp/guitar.jpg
444
472
  - app/assets/images/splashscreen.png
445
473
  - app/assets/images/ui-anim_basic_16x16.gif
@@ -497,11 +525,11 @@ files:
497
525
  - app/controllers/single_use_link_controller.rb
498
526
  - app/controllers/static_controller.rb
499
527
  - app/controllers/users_controller.rb
500
- - app/helpers/application_helper.rb
501
528
  - app/helpers/batch_edits_helper.rb
502
529
  - app/helpers/blacklight/render_constraints_helper_behavior.rb
503
530
  - app/helpers/contact_form_helper.rb
504
531
  - app/helpers/generic_file_helper.rb
532
+ - app/helpers/sufia_helper.rb
505
533
  - app/models/audit_job.rb
506
534
  - app/models/batch.rb
507
535
  - app/models/batch_update_job.rb
@@ -538,7 +566,10 @@ files:
538
566
  - app/models/version_committer.rb
539
567
  - app/views/_add_assets_links.html.erb
540
568
  - app/views/_flash_msg.html.erb
569
+ - app/views/_footer.html.erb
541
570
  - app/views/_ga.html.erb
571
+ - app/views/_logo.html.erb
572
+ - app/views/_masthead.html.erb
542
573
  - app/views/_user_util_links.html.erb
543
574
  - app/views/advanced/_advanced_search_facets.html.erb
544
575
  - app/views/advanced/_advanced_search_fields.html.erb
@@ -611,6 +642,7 @@ files:
611
642
  - app/views/catalog/show.html.erb
612
643
  - app/views/catalog/show.refworks.erb
613
644
  - app/views/catalog/sms.erb
645
+ - app/views/contact_form/_directions.html.erb
614
646
  - app/views/contact_form/create.html.erb
615
647
  - app/views/contact_form/new.html.erb
616
648
  - app/views/dashboard/_constraints.html.erb
@@ -682,6 +714,7 @@ files:
682
714
  - app/views/users/notifications_number.js.erb
683
715
  - app/views/users/show.html.erb
684
716
  - bin/audit_repository
717
+ - config/locales/sufia.en.yml
685
718
  - config/routes.rb
686
719
  - db/data.yml
687
720
  - db/seeds.rb
@@ -707,8 +740,6 @@ files:
707
740
  - lib/generators/sufia/sufia_generator.rb
708
741
  - lib/generators/sufia/templates/catalog_controller.rb
709
742
  - lib/generators/sufia/templates/config/action_dispatch_http_upload_monkey_patch.rb
710
- - lib/generators/sufia/templates/config/active_fedora_base_redis.rb
711
- - lib/generators/sufia/templates/config/active_record_base_redis.rb
712
743
  - lib/generators/sufia/templates/config/clamav.rb
713
744
  - lib/generators/sufia/templates/config/devise.rb
714
745
  - lib/generators/sufia/templates/config/hydra_config.rb
@@ -727,10 +758,11 @@ files:
727
758
  - lib/generators/sufia/templates/migrations/create_version_committers.rb
728
759
  - lib/redirect_to_web_access_failure.rb
729
760
  - lib/sufia.rb
761
+ - lib/sufia/active_fedora/redis.rb
762
+ - lib/sufia/active_record/redis.rb
730
763
  - lib/sufia/controller.rb
731
764
  - lib/sufia/http_header_auth.rb
732
765
  - lib/sufia/id_service.rb
733
- - lib/sufia/ldap.rb
734
766
  - lib/sufia/model_methods.rb
735
767
  - lib/sufia/noid.rb
736
768
  - lib/sufia/permissions.rb
@@ -738,12 +770,14 @@ files:
738
770
  - lib/sufia/user.rb
739
771
  - lib/sufia/utils.rb
740
772
  - lib/sufia/version.rb
773
+ - lib/tasks/fixtures.rake
741
774
  - public/.gitkeep
742
775
  - public/favicon.ico
743
776
  - public/robots.txt
744
777
  - solr_conf/conf/schema.xml
745
778
  - solr_conf/conf/solrconfig.xml
746
779
  - solr_conf/solr.xml
780
+ - spec/.gitignore
747
781
  - spec/active_fedora/unsaved_digital_object_spec.rb
748
782
  - spec/config/host_to_vhost_spec.rb
749
783
  - spec/controllers/_sort_and_per_page.html.erb
@@ -757,9 +791,9 @@ files:
757
791
  - spec/controllers/sessions_controller_spec.rb
758
792
  - spec/controllers/single_use_link_controller_spec.rb
759
793
  - spec/controllers/users_controller_spec.rb
760
- - spec/factories.rb
761
794
  - spec/factories/checksum_audit_logs.rb
762
795
  - spec/factories/single_use_links.rb
796
+ - spec/factories/users.rb
763
797
  - spec/fixtures/4-20.png
764
798
  - spec/fixtures/cities15000.tsv
765
799
  - spec/fixtures/docx_fits.xml
@@ -767,31 +801,15 @@ files:
767
801
  - spec/fixtures/empty_file.txt
768
802
  - spec/fixtures/fits_datastream.xml
769
803
  - spec/fixtures/genreForms.nt
770
- - spec/fixtures/hydra_test_default_partials.foxml.xml
771
- - spec/fixtures/hydra_test_generic_content.foxml.xml
772
- - spec/fixtures/hydra_test_generic_image.foxml.xml
773
- - spec/fixtures/hydra_test_no_model.foxml.xml
774
- - spec/fixtures/hydrangea_fixture_archivist_only_mods_article.foxml.xml
775
- - spec/fixtures/hydrangea_fixture_file_asset1.foxml.xml
776
- - spec/fixtures/hydrangea_fixture_mods_article1.foxml.xml
777
- - spec/fixtures/hydrangea_fixture_mods_article2.foxml.xml
778
- - spec/fixtures/hydrangea_fixture_mods_article3.foxml.xml
779
- - spec/fixtures/hydrangea_fixture_mods_dataset1.foxml.xml
780
- - spec/fixtures/hydrangea_fixture_uploaded_svg1.foxml.xml
781
- - spec/fixtures/hydrus_admin_class1.foxml.xml
782
804
  - spec/fixtures/icons.zip
783
805
  - spec/fixtures/image.jp2
784
806
  - spec/fixtures/jp2_fits.xml
785
807
  - spec/fixtures/jpg_fits.xml
786
808
  - spec/fixtures/lexvo.rdf
787
- - spec/fixtures/libra-oa_1.foxml.xml
788
- - spec/fixtures/libra-oa_2.foxml.xml
789
- - spec/fixtures/libra-oa_7.foxml.xml
790
809
  - spec/fixtures/mp3_fits.xml
791
810
  - spec/fixtures/pdf_fits.xml
792
811
  - spec/fixtures/scholarsphere/bg_header.jpg
793
812
  - spec/fixtures/scholarsphere/scholarsphere_test1.descMeta.txt
794
- - spec/fixtures/scholarsphere/scholarsphere_test1.foxml.erb
795
813
  - spec/fixtures/scholarsphere/scholarsphere_test1.txt
796
814
  - spec/fixtures/scholarsphere/scholarsphere_test2.descMeta.txt
797
815
  - spec/fixtures/scholarsphere/scholarsphere_test2.docx
@@ -803,13 +821,17 @@ files:
803
821
  - spec/fixtures/scholarsphere/scholarsphere_test4.foxml.erb
804
822
  - spec/fixtures/scholarsphere/scholarsphere_test4.pdf
805
823
  - spec/fixtures/scholarsphere/scholarsphere_test5.descMeta.txt
806
- - spec/fixtures/scholarsphere/scholarsphere_test5.foxml.erb
807
824
  - spec/fixtures/scholarsphere/scholarsphere_test5.mp3
808
825
  - spec/fixtures/scholarsphere/scholarsphere_test5.txt
809
826
  - spec/fixtures/scholarsphere/scholarsphere_test6.descMeta.txt
810
827
  - spec/fixtures/scholarsphere/scholarsphere_test6.foxml.erb
811
828
  - spec/fixtures/scholarsphere/scholarsphere_test6.jp2
812
829
  - spec/fixtures/scholarsphere/scholarsphere_test6.txt
830
+ - spec/fixtures/scholarsphere/sufia_scholarsphere1.descMeta.txt
831
+ - spec/fixtures/scholarsphere/sufia_scholarsphere1.foxml.erb
832
+ - spec/fixtures/scholarsphere/sufia_scholarsphere1.txt
833
+ - spec/fixtures/scholarsphere/sufia_test1.foxml.erb
834
+ - spec/fixtures/scholarsphere/sufia_test5.foxml.erb
813
835
  - spec/fixtures/scholarsphere_generic_stub.descMeta.txt
814
836
  - spec/fixtures/scholarsphere_generic_stub.foxml.erb
815
837
  - spec/fixtures/scholarsphere_generic_stub.txt
@@ -818,8 +840,8 @@ files:
818
840
  - spec/fixtures/world.png
819
841
  - spec/fixtures/xls_fits.xml
820
842
  - spec/fixtures/xml_fits.xml
821
- - spec/lib/scholarsphere/id_service_spec.rb
822
- - spec/lib/scholarsphere/role_mapper_spec.rb
843
+ - spec/lib/sufia/id_service_spec.rb
844
+ - spec/lib/sufia/role_mapper_spec.rb
823
845
  - spec/models/audit_job_spec.rb
824
846
  - spec/models/batch_spec.rb
825
847
  - spec/models/batch_update_job_spec.rb
@@ -835,6 +857,9 @@ files:
835
857
  - spec/rake/scholarsphere_fixtures_spec.rb
836
858
  - spec/routing/route_spec.rb
837
859
  - spec/spec_helper.rb
860
+ - spec/support/Gemfile
861
+ - spec/support/config/redis.yml
862
+ - spec/support/lib/generators/test_app_generator.rb
838
863
  - spec/support/uploaded_file_monkeypatch.rb
839
864
  - spec/views/single_user_link/download.html.erb_spec.rb
840
865
  - spec/views/single_user_link/generate_download.html.erb_spec.rb
@@ -842,6 +867,7 @@ files:
842
867
  - spec/views/single_user_link/show.html.erb_spec.rb
843
868
  - sufia.gemspec
844
869
  - tasks/cucumber.rake
870
+ - tasks/jetty.rake
845
871
  - tasks/resque.rake
846
872
  - tasks/scholarsphere-db.rake
847
873
  - tasks/scholarsphere-dev.rake
@@ -901,7 +927,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
901
927
  version: 1.3.1
902
928
  requirements: []
903
929
  rubyforge_project:
904
- rubygems_version: 1.8.23
930
+ rubygems_version: 1.8.24
905
931
  signing_key:
906
932
  specification_version: 3
907
933
  summary: A generic hyda-head repository
@@ -921,6 +947,7 @@ test_files:
921
947
  - features/support/env.rb
922
948
  - features/support/headless.rb
923
949
  - features/support/paths.rb
950
+ - spec/.gitignore
924
951
  - spec/active_fedora/unsaved_digital_object_spec.rb
925
952
  - spec/config/host_to_vhost_spec.rb
926
953
  - spec/controllers/_sort_and_per_page.html.erb
@@ -934,9 +961,9 @@ test_files:
934
961
  - spec/controllers/sessions_controller_spec.rb
935
962
  - spec/controllers/single_use_link_controller_spec.rb
936
963
  - spec/controllers/users_controller_spec.rb
937
- - spec/factories.rb
938
964
  - spec/factories/checksum_audit_logs.rb
939
965
  - spec/factories/single_use_links.rb
966
+ - spec/factories/users.rb
940
967
  - spec/fixtures/4-20.png
941
968
  - spec/fixtures/cities15000.tsv
942
969
  - spec/fixtures/docx_fits.xml
@@ -944,31 +971,15 @@ test_files:
944
971
  - spec/fixtures/empty_file.txt
945
972
  - spec/fixtures/fits_datastream.xml
946
973
  - spec/fixtures/genreForms.nt
947
- - spec/fixtures/hydra_test_default_partials.foxml.xml
948
- - spec/fixtures/hydra_test_generic_content.foxml.xml
949
- - spec/fixtures/hydra_test_generic_image.foxml.xml
950
- - spec/fixtures/hydra_test_no_model.foxml.xml
951
- - spec/fixtures/hydrangea_fixture_archivist_only_mods_article.foxml.xml
952
- - spec/fixtures/hydrangea_fixture_file_asset1.foxml.xml
953
- - spec/fixtures/hydrangea_fixture_mods_article1.foxml.xml
954
- - spec/fixtures/hydrangea_fixture_mods_article2.foxml.xml
955
- - spec/fixtures/hydrangea_fixture_mods_article3.foxml.xml
956
- - spec/fixtures/hydrangea_fixture_mods_dataset1.foxml.xml
957
- - spec/fixtures/hydrangea_fixture_uploaded_svg1.foxml.xml
958
- - spec/fixtures/hydrus_admin_class1.foxml.xml
959
974
  - spec/fixtures/icons.zip
960
975
  - spec/fixtures/image.jp2
961
976
  - spec/fixtures/jp2_fits.xml
962
977
  - spec/fixtures/jpg_fits.xml
963
978
  - spec/fixtures/lexvo.rdf
964
- - spec/fixtures/libra-oa_1.foxml.xml
965
- - spec/fixtures/libra-oa_2.foxml.xml
966
- - spec/fixtures/libra-oa_7.foxml.xml
967
979
  - spec/fixtures/mp3_fits.xml
968
980
  - spec/fixtures/pdf_fits.xml
969
981
  - spec/fixtures/scholarsphere/bg_header.jpg
970
982
  - spec/fixtures/scholarsphere/scholarsphere_test1.descMeta.txt
971
- - spec/fixtures/scholarsphere/scholarsphere_test1.foxml.erb
972
983
  - spec/fixtures/scholarsphere/scholarsphere_test1.txt
973
984
  - spec/fixtures/scholarsphere/scholarsphere_test2.descMeta.txt
974
985
  - spec/fixtures/scholarsphere/scholarsphere_test2.docx
@@ -980,13 +991,17 @@ test_files:
980
991
  - spec/fixtures/scholarsphere/scholarsphere_test4.foxml.erb
981
992
  - spec/fixtures/scholarsphere/scholarsphere_test4.pdf
982
993
  - spec/fixtures/scholarsphere/scholarsphere_test5.descMeta.txt
983
- - spec/fixtures/scholarsphere/scholarsphere_test5.foxml.erb
984
994
  - spec/fixtures/scholarsphere/scholarsphere_test5.mp3
985
995
  - spec/fixtures/scholarsphere/scholarsphere_test5.txt
986
996
  - spec/fixtures/scholarsphere/scholarsphere_test6.descMeta.txt
987
997
  - spec/fixtures/scholarsphere/scholarsphere_test6.foxml.erb
988
998
  - spec/fixtures/scholarsphere/scholarsphere_test6.jp2
989
999
  - spec/fixtures/scholarsphere/scholarsphere_test6.txt
1000
+ - spec/fixtures/scholarsphere/sufia_scholarsphere1.descMeta.txt
1001
+ - spec/fixtures/scholarsphere/sufia_scholarsphere1.foxml.erb
1002
+ - spec/fixtures/scholarsphere/sufia_scholarsphere1.txt
1003
+ - spec/fixtures/scholarsphere/sufia_test1.foxml.erb
1004
+ - spec/fixtures/scholarsphere/sufia_test5.foxml.erb
990
1005
  - spec/fixtures/scholarsphere_generic_stub.descMeta.txt
991
1006
  - spec/fixtures/scholarsphere_generic_stub.foxml.erb
992
1007
  - spec/fixtures/scholarsphere_generic_stub.txt
@@ -995,8 +1010,8 @@ test_files:
995
1010
  - spec/fixtures/world.png
996
1011
  - spec/fixtures/xls_fits.xml
997
1012
  - spec/fixtures/xml_fits.xml
998
- - spec/lib/scholarsphere/id_service_spec.rb
999
- - spec/lib/scholarsphere/role_mapper_spec.rb
1013
+ - spec/lib/sufia/id_service_spec.rb
1014
+ - spec/lib/sufia/role_mapper_spec.rb
1000
1015
  - spec/models/audit_job_spec.rb
1001
1016
  - spec/models/batch_spec.rb
1002
1017
  - spec/models/batch_update_job_spec.rb
@@ -1012,8 +1027,12 @@ test_files:
1012
1027
  - spec/rake/scholarsphere_fixtures_spec.rb
1013
1028
  - spec/routing/route_spec.rb
1014
1029
  - spec/spec_helper.rb
1030
+ - spec/support/Gemfile
1031
+ - spec/support/config/redis.yml
1032
+ - spec/support/lib/generators/test_app_generator.rb
1015
1033
  - spec/support/uploaded_file_monkeypatch.rb
1016
1034
  - spec/views/single_user_link/download.html.erb_spec.rb
1017
1035
  - spec/views/single_user_link/generate_download.html.erb_spec.rb
1018
1036
  - spec/views/single_user_link/generate_show.html.erb_spec.rb
1019
1037
  - spec/views/single_user_link/show.html.erb_spec.rb
1038
+ has_rdoc: