umlaut 3.0.0alpha5 → 3.0.0alpha6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (37) hide show
  1. data/app/assets/javascripts/umlaut/update_html.js +21 -0
  2. data/app/assets/javascripts/umlaut_ui.js +15 -0
  3. data/app/helpers/resolve_helper.rb +14 -4
  4. data/app/views/resolve/api.xml.builder +10 -14
  5. data/lib/#Untitled-1# +14 -0
  6. data/lib/umlaut/routes.rb +14 -1
  7. data/lib/umlaut/version.rb +1 -1
  8. data/lib/umlaut.rb +12 -9
  9. data/test/dummy/tmp/cache/assets/C5F/340/sprockets%2F99692920160b7a279b86a80415b79db7 +0 -0
  10. data/test/dummy/tmp/cache/assets/C70/4D0/sprockets%2F034ad2036e623081bd352800786dfe80 +0 -0
  11. data/test/dummy/tmp/cache/assets/CBB/9C0/sprockets%2F706f28923fb754cad04b9107c89986a1 +31 -0
  12. data/test/dummy/tmp/cache/assets/CBF/B60/sprockets%2F08ca89671549936265dcb673bf02e36f +0 -0
  13. data/test/dummy/tmp/cache/assets/CC9/9F0/sprockets%2F306166316e2cafd13c15e62b51a2339d +0 -0
  14. data/test/dummy/tmp/cache/assets/CF7/2B0/sprockets%2F25a7c73655bd3598173b39d9f98bcd46 +880 -0
  15. data/test/dummy/tmp/cache/assets/CFE/080/sprockets%2F37fe9f4255baddbd549a659914929398 +0 -0
  16. data/test/dummy/tmp/cache/assets/D0B/E10/sprockets%2F1444763abc4444a8e129efdb9a43235f +378 -0
  17. data/test/dummy/tmp/cache/assets/D1F/830/sprockets%2Fe6a7a907a8e9b43780a80fe69a92913d +11773 -0
  18. data/test/dummy/tmp/cache/assets/D22/060/sprockets%2F9aec77b768e91a802d284271c58e2f7e +21361 -0
  19. data/test/dummy/tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705 +0 -0
  20. data/test/dummy/tmp/cache/assets/D33/6D0/sprockets%2F500129c57f1146e556ec3aacd6cd38c1 +158 -0
  21. data/test/dummy/tmp/cache/assets/D50/7B0/sprockets%2F6df95fb9a4189df351c1c88546c84a1d +394 -0
  22. data/test/dummy/tmp/cache/assets/D54/ED0/sprockets%2F71c9fa01091d432b131da3bb73faf3d4 +877 -0
  23. data/test/dummy/tmp/cache/assets/D69/820/sprockets%2F55a4f1a7c4918d71c0d4fb5b7dd4c055 +9272 -0
  24. data/test/dummy/tmp/cache/assets/D71/6B0/sprockets%2Fde558b71b494cf09b1bf055c8dff0353 +53 -0
  25. data/test/dummy/tmp/cache/assets/D72/610/sprockets%2Fa8c708eeb30ef93de34d755d4f45d023 +864 -0
  26. data/test/dummy/tmp/cache/assets/D76/AD0/sprockets%2Fe2158cde93188cf5ab6457bc6d6602ec +41 -0
  27. data/test/dummy/tmp/cache/assets/D84/210/sprockets%2Fabd0103ccec2b428ac62c94e4c40b384 +21744 -0
  28. data/test/dummy/tmp/cache/assets/D9B/770/sprockets%2F8aacf02eb7dbb0949704b28f27b87e0b +39 -0
  29. data/test/dummy/tmp/cache/assets/DD0/140/sprockets%2F1656d1d8f4c13fe42aff6553c6cdcda7 +11789 -0
  30. data/test/dummy/tmp/cache/assets/DE8/790/sprockets%2Fd1333bde2b9aafcc712d11dd09ab35d8 +0 -0
  31. data/test/dummy/tmp/cache/assets/DF1/AA0/sprockets%2Fedd37b0fdb6157fccb2297a8a10acc90 +9288 -0
  32. data/test/dummy/tmp/cache/assets/E03/570/sprockets%2F493bdc0ac14cd4f57fdfe4253f992bde +14 -0
  33. data/test/dummy/tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af +0 -0
  34. data/test/dummy/tmp/cache/assets/E5F/960/sprockets%2Fdc007b6cad5c7ef08e33ec28cfff0ef6 +0 -0
  35. metadata +200 -98
  36. data/test/dummy/config/database-jhu.yml +0 -44
  37. data/test/dummy/config/database.yml +0 -53
@@ -0,0 +1,14 @@
1
+ o: ActiveSupport::Cache::Entry :@compressedF:@expires_in0:@created_atf1325695618.01188: @value{ I" length:EFi2I" digest;
2
+ F"%abd0957254205a440fc2f84cf867692dI" source;
3
+ FI"2/* simple_visible_toggle.js. Used for toggling visibility of error information. Can possibly be combined with more powerful expand_contract_toggle.js */
4
+
5
+ jQuery(document).ready(function($) {
6
+
7
+ $("a.simple_visible_toggle").live("click", function() {
8
+ $(this).next().toggle();
9
+ });
10
+
11
+ });
12
+ ;
13
+ FI"
14
+ F"%123be40f9100e09e89b1d7ad06037a80
metadata CHANGED
@@ -1,122 +1,167 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: umlaut
3
- version: !ruby/object:Gem::Version
4
- version: 3.0.0alpha5
3
+ version: !ruby/object:Gem::Version
4
+ hash: -3702664400
5
5
  prerelease: 5
6
+ segments:
7
+ - 3
8
+ - 0
9
+ - 0
10
+ - alpha
11
+ - 6
12
+ version: 3.0.0alpha6
6
13
  platform: ruby
7
- authors:
14
+ authors:
8
15
  - Jonathan Rochkind, et al
9
16
  autorequire:
10
17
  bindir: bin
11
18
  cert_chain: []
12
- date: 2012-01-03 00:00:00.000000000 Z
13
- dependencies:
14
- - !ruby/object:Gem::Dependency
15
- name: rails
16
- requirement: &229448500 !ruby/object:Gem::Requirement
19
+
20
+ date: 2012-01-05 00:00:00 Z
21
+ dependencies:
22
+ - !ruby/object:Gem::Dependency
23
+ requirement: &id001 !ruby/object:Gem::Requirement
17
24
  none: false
18
- requirements:
25
+ requirements:
19
26
  - - ~>
20
- - !ruby/object:Gem::Version
27
+ - !ruby/object:Gem::Version
28
+ hash: 5
29
+ segments:
30
+ - 3
31
+ - 1
32
+ - 3
21
33
  version: 3.1.3
34
+ version_requirements: *id001
35
+ prerelease: false
36
+ name: rails
22
37
  type: :runtime
38
+ - !ruby/object:Gem::Dependency
39
+ requirement: &id002 !ruby/object:Gem::Requirement
40
+ none: false
41
+ requirements:
42
+ - - ">="
43
+ - !ruby/object:Gem::Version
44
+ hash: 3
45
+ segments:
46
+ - 0
47
+ version: "0"
48
+ version_requirements: *id002
23
49
  prerelease: false
24
- version_requirements: *229448500
25
- - !ruby/object:Gem::Dependency
26
50
  name: jquery-rails
27
- requirement: &229447820 !ruby/object:Gem::Requirement
28
- none: false
29
- requirements:
30
- - - ! '>='
31
- - !ruby/object:Gem::Version
32
- version: '0'
33
51
  type: :runtime
52
+ - !ruby/object:Gem::Dependency
53
+ requirement: &id003 !ruby/object:Gem::Requirement
54
+ none: false
55
+ requirements:
56
+ - - ">="
57
+ - !ruby/object:Gem::Version
58
+ hash: 3
59
+ segments:
60
+ - 0
61
+ version: "0"
62
+ version_requirements: *id003
34
63
  prerelease: false
35
- version_requirements: *229447820
36
- - !ruby/object:Gem::Dependency
37
64
  name: nokogiri
38
- requirement: &229463560 !ruby/object:Gem::Requirement
39
- none: false
40
- requirements:
41
- - - ! '>='
42
- - !ruby/object:Gem::Version
43
- version: '0'
44
65
  type: :runtime
45
- prerelease: false
46
- version_requirements: *229463560
47
- - !ruby/object:Gem::Dependency
48
- name: openurl
49
- requirement: &229462820 !ruby/object:Gem::Requirement
66
+ - !ruby/object:Gem::Dependency
67
+ requirement: &id004 !ruby/object:Gem::Requirement
50
68
  none: false
51
- requirements:
52
- - - ! '>='
53
- - !ruby/object:Gem::Version
69
+ requirements:
70
+ - - ">="
71
+ - !ruby/object:Gem::Version
72
+ hash: 23
73
+ segments:
74
+ - 0
75
+ - 2
76
+ - 0
54
77
  version: 0.2.0
55
- type: :runtime
78
+ version_requirements: *id004
56
79
  prerelease: false
57
- version_requirements: *229462820
58
- - !ruby/object:Gem::Dependency
59
- name: marc
60
- requirement: &229462060 !ruby/object:Gem::Requirement
80
+ name: openurl
81
+ type: :runtime
82
+ - !ruby/object:Gem::Dependency
83
+ requirement: &id005 !ruby/object:Gem::Requirement
61
84
  none: false
62
- requirements:
85
+ requirements:
63
86
  - - ~>
64
- - !ruby/object:Gem::Version
87
+ - !ruby/object:Gem::Version
88
+ hash: 9
89
+ segments:
90
+ - 0
91
+ - 4
92
+ - 3
65
93
  version: 0.4.3
94
+ version_requirements: *id005
95
+ prerelease: false
96
+ name: marc
66
97
  type: :runtime
98
+ - !ruby/object:Gem::Dependency
99
+ requirement: &id006 !ruby/object:Gem::Requirement
100
+ none: false
101
+ requirements:
102
+ - - ">="
103
+ - !ruby/object:Gem::Version
104
+ hash: 3
105
+ segments:
106
+ - 0
107
+ version: "0"
108
+ version_requirements: *id006
67
109
  prerelease: false
68
- version_requirements: *229462060
69
- - !ruby/object:Gem::Dependency
70
110
  name: isbn
71
- requirement: &229461220 !ruby/object:Gem::Requirement
72
- none: false
73
- requirements:
74
- - - ! '>='
75
- - !ruby/object:Gem::Version
76
- version: '0'
77
111
  type: :runtime
112
+ - !ruby/object:Gem::Dependency
113
+ requirement: &id007 !ruby/object:Gem::Requirement
114
+ none: false
115
+ requirements:
116
+ - - ">="
117
+ - !ruby/object:Gem::Version
118
+ hash: 3
119
+ segments:
120
+ - 0
121
+ version: "0"
122
+ version_requirements: *id007
78
123
  prerelease: false
79
- version_requirements: *229461220
80
- - !ruby/object:Gem::Dependency
81
124
  name: htmlentities
82
- requirement: &229460480 !ruby/object:Gem::Requirement
83
- none: false
84
- requirements:
85
- - - ! '>='
86
- - !ruby/object:Gem::Version
87
- version: '0'
88
125
  type: :runtime
126
+ - !ruby/object:Gem::Dependency
127
+ requirement: &id008 !ruby/object:Gem::Requirement
128
+ none: false
129
+ requirements:
130
+ - - ">="
131
+ - !ruby/object:Gem::Version
132
+ hash: 3
133
+ segments:
134
+ - 0
135
+ version: "0"
136
+ version_requirements: *id008
89
137
  prerelease: false
90
- version_requirements: *229460480
91
- - !ruby/object:Gem::Dependency
92
138
  name: multi_json
93
- requirement: &229459660 !ruby/object:Gem::Requirement
94
- none: false
95
- requirements:
96
- - - ! '>='
97
- - !ruby/object:Gem::Version
98
- version: '0'
99
139
  type: :runtime
100
- prerelease: false
101
- version_requirements: *229459660
102
- - !ruby/object:Gem::Dependency
103
- name: confstruct
104
- requirement: &229458840 !ruby/object:Gem::Requirement
140
+ - !ruby/object:Gem::Dependency
141
+ requirement: &id009 !ruby/object:Gem::Requirement
105
142
  none: false
106
- requirements:
143
+ requirements:
107
144
  - - ~>
108
- - !ruby/object:Gem::Version
109
- version: '0.2'
110
- type: :runtime
145
+ - !ruby/object:Gem::Version
146
+ hash: 15
147
+ segments:
148
+ - 0
149
+ - 2
150
+ version: "0.2"
151
+ version_requirements: *id009
111
152
  prerelease: false
112
- version_requirements: *229458840
153
+ name: confstruct
154
+ type: :runtime
113
155
  description:
114
- email:
156
+ email:
115
157
  - umlaut-general@rubyforge.org
116
158
  executables: []
159
+
117
160
  extensions: []
161
+
118
162
  extra_rdoc_files: []
119
- files:
163
+
164
+ files:
120
165
  - app/mailers/emailer.rb
121
166
  - app/controllers/search_methods/sfx4.rb
122
167
  - app/controllers/search_methods/sfx3.rb
@@ -154,6 +199,7 @@ files:
154
199
  - app/assets/images/list_open.png
155
200
  - app/assets/images/more_info.gif
156
201
  - app/assets/images/error.gif
202
+ - app/assets/javascripts/umlaut_ui.js
157
203
  - app/assets/javascripts/umlaut.js
158
204
  - app/assets/javascripts/umlaut/update_html.js
159
205
  - app/assets/javascripts/umlaut/ajax_windows.js
@@ -309,6 +355,7 @@ files:
309
355
  - lib/service_adaptors/opac.rb
310
356
  - lib/xml_schema_helper.rb
311
357
  - lib/metadata_helper.rb
358
+ - lib/#Untitled-1#
312
359
  - lib/generators/templates/umlaut_services.yml
313
360
  - lib/generators/umlaut/install_generator.rb
314
361
  - lib/generators/umlaut/asset_hooks_generator.rb
@@ -319,6 +366,32 @@ files:
319
366
  - LICENSE
320
367
  - Rakefile
321
368
  - README.md
369
+ - ./test/dummy/tmp/cache/assets/DE8/790/sprockets%2Fd1333bde2b9aafcc712d11dd09ab35d8
370
+ - ./test/dummy/tmp/cache/assets/D9B/770/sprockets%2F8aacf02eb7dbb0949704b28f27b87e0b
371
+ - ./test/dummy/tmp/cache/assets/DD0/140/sprockets%2F1656d1d8f4c13fe42aff6553c6cdcda7
372
+ - ./test/dummy/tmp/cache/assets/E5F/960/sprockets%2Fdc007b6cad5c7ef08e33ec28cfff0ef6
373
+ - ./test/dummy/tmp/cache/assets/D50/7B0/sprockets%2F6df95fb9a4189df351c1c88546c84a1d
374
+ - ./test/dummy/tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
375
+ - ./test/dummy/tmp/cache/assets/E03/570/sprockets%2F493bdc0ac14cd4f57fdfe4253f992bde
376
+ - ./test/dummy/tmp/cache/assets/CFE/080/sprockets%2F37fe9f4255baddbd549a659914929398
377
+ - ./test/dummy/tmp/cache/assets/D69/820/sprockets%2F55a4f1a7c4918d71c0d4fb5b7dd4c055
378
+ - ./test/dummy/tmp/cache/assets/D0B/E10/sprockets%2F1444763abc4444a8e129efdb9a43235f
379
+ - ./test/dummy/tmp/cache/assets/CF7/2B0/sprockets%2F25a7c73655bd3598173b39d9f98bcd46
380
+ - ./test/dummy/tmp/cache/assets/D84/210/sprockets%2Fabd0103ccec2b428ac62c94e4c40b384
381
+ - ./test/dummy/tmp/cache/assets/CBB/9C0/sprockets%2F706f28923fb754cad04b9107c89986a1
382
+ - ./test/dummy/tmp/cache/assets/D1F/830/sprockets%2Fe6a7a907a8e9b43780a80fe69a92913d
383
+ - ./test/dummy/tmp/cache/assets/D71/6B0/sprockets%2Fde558b71b494cf09b1bf055c8dff0353
384
+ - ./test/dummy/tmp/cache/assets/D54/ED0/sprockets%2F71c9fa01091d432b131da3bb73faf3d4
385
+ - ./test/dummy/tmp/cache/assets/CBF/B60/sprockets%2F08ca89671549936265dcb673bf02e36f
386
+ - ./test/dummy/tmp/cache/assets/CC9/9F0/sprockets%2F306166316e2cafd13c15e62b51a2339d
387
+ - ./test/dummy/tmp/cache/assets/D22/060/sprockets%2F9aec77b768e91a802d284271c58e2f7e
388
+ - ./test/dummy/tmp/cache/assets/DF1/AA0/sprockets%2Fedd37b0fdb6157fccb2297a8a10acc90
389
+ - ./test/dummy/tmp/cache/assets/C70/4D0/sprockets%2F034ad2036e623081bd352800786dfe80
390
+ - ./test/dummy/tmp/cache/assets/D76/AD0/sprockets%2Fe2158cde93188cf5ab6457bc6d6602ec
391
+ - ./test/dummy/tmp/cache/assets/D72/610/sprockets%2Fa8c708eeb30ef93de34d755d4f45d023
392
+ - ./test/dummy/tmp/cache/assets/C5F/340/sprockets%2F99692920160b7a279b86a80415b79db7
393
+ - ./test/dummy/tmp/cache/assets/D33/6D0/sprockets%2F500129c57f1146e556ec3aacd6cd38c1
394
+ - ./test/dummy/tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
322
395
  - ./test/dummy/app/controllers/application_controller.rb
323
396
  - ./test/dummy/app/controllers/umlaut_controller.rb
324
397
  - ./test/dummy/app/assets/javascripts/application.js
@@ -334,7 +407,6 @@ files:
334
407
  - ./test/dummy/config/environments/test.rb
335
408
  - ./test/dummy/config/application.rb
336
409
  - ./test/dummy/config/environment.rb
337
- - ./test/dummy/config/database.yml
338
410
  - ./test/dummy/config/umlaut_services.yml
339
411
  - ./test/dummy/config/routes.rb
340
412
  - ./test/dummy/config/locales/en.yml
@@ -345,7 +417,6 @@ files:
345
417
  - ./test/dummy/config/initializers/mime_types.rb
346
418
  - ./test/dummy/config/initializers/session_store.rb
347
419
  - ./test/dummy/config/initializers/secret_token.rb
348
- - ./test/dummy/config/database-jhu.yml
349
420
  - ./test/dummy/Rakefile
350
421
  - ./test/dummy/script/rails
351
422
  - ./test/dummy/config.ru
@@ -374,33 +445,66 @@ files:
374
445
  - ./test/fixtures/sfx_urls.yml
375
446
  homepage: https://github.com/team-umlaut/umlaut/tree/umlaut3dev
376
447
  licenses: []
448
+
377
449
  post_install_message:
378
450
  rdoc_options: []
379
- require_paths:
451
+
452
+ require_paths:
380
453
  - lib
381
- required_ruby_version: !ruby/object:Gem::Requirement
454
+ required_ruby_version: !ruby/object:Gem::Requirement
382
455
  none: false
383
- requirements:
384
- - - ! '>='
385
- - !ruby/object:Gem::Version
386
- version: '0'
387
- segments:
456
+ requirements:
457
+ - - ">="
458
+ - !ruby/object:Gem::Version
459
+ hash: 3
460
+ segments:
388
461
  - 0
389
- hash: 877002039789512539
390
- required_rubygems_version: !ruby/object:Gem::Requirement
462
+ version: "0"
463
+ required_rubygems_version: !ruby/object:Gem::Requirement
391
464
  none: false
392
- requirements:
393
- - - ! '>'
394
- - !ruby/object:Gem::Version
465
+ requirements:
466
+ - - ">"
467
+ - !ruby/object:Gem::Version
468
+ hash: 25
469
+ segments:
470
+ - 1
471
+ - 3
472
+ - 1
395
473
  version: 1.3.1
396
474
  requirements: []
475
+
397
476
  rubyforge_project:
398
- rubygems_version: 1.8.10
477
+ rubygems_version: 1.8.12
399
478
  signing_key:
400
479
  specification_version: 3
401
- summary: For Libraries, a just-in-time last-mile service aggregator, taking OpenURL
402
- input
403
- test_files:
480
+ summary: For Libraries, a just-in-time last-mile service aggregator, taking OpenURL input
481
+ test_files:
482
+ - ./test/dummy/tmp/cache/assets/DE8/790/sprockets%2Fd1333bde2b9aafcc712d11dd09ab35d8
483
+ - ./test/dummy/tmp/cache/assets/D9B/770/sprockets%2F8aacf02eb7dbb0949704b28f27b87e0b
484
+ - ./test/dummy/tmp/cache/assets/DD0/140/sprockets%2F1656d1d8f4c13fe42aff6553c6cdcda7
485
+ - ./test/dummy/tmp/cache/assets/E5F/960/sprockets%2Fdc007b6cad5c7ef08e33ec28cfff0ef6
486
+ - ./test/dummy/tmp/cache/assets/D50/7B0/sprockets%2F6df95fb9a4189df351c1c88546c84a1d
487
+ - ./test/dummy/tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
488
+ - ./test/dummy/tmp/cache/assets/E03/570/sprockets%2F493bdc0ac14cd4f57fdfe4253f992bde
489
+ - ./test/dummy/tmp/cache/assets/CFE/080/sprockets%2F37fe9f4255baddbd549a659914929398
490
+ - ./test/dummy/tmp/cache/assets/D69/820/sprockets%2F55a4f1a7c4918d71c0d4fb5b7dd4c055
491
+ - ./test/dummy/tmp/cache/assets/D0B/E10/sprockets%2F1444763abc4444a8e129efdb9a43235f
492
+ - ./test/dummy/tmp/cache/assets/CF7/2B0/sprockets%2F25a7c73655bd3598173b39d9f98bcd46
493
+ - ./test/dummy/tmp/cache/assets/D84/210/sprockets%2Fabd0103ccec2b428ac62c94e4c40b384
494
+ - ./test/dummy/tmp/cache/assets/CBB/9C0/sprockets%2F706f28923fb754cad04b9107c89986a1
495
+ - ./test/dummy/tmp/cache/assets/D1F/830/sprockets%2Fe6a7a907a8e9b43780a80fe69a92913d
496
+ - ./test/dummy/tmp/cache/assets/D71/6B0/sprockets%2Fde558b71b494cf09b1bf055c8dff0353
497
+ - ./test/dummy/tmp/cache/assets/D54/ED0/sprockets%2F71c9fa01091d432b131da3bb73faf3d4
498
+ - ./test/dummy/tmp/cache/assets/CBF/B60/sprockets%2F08ca89671549936265dcb673bf02e36f
499
+ - ./test/dummy/tmp/cache/assets/CC9/9F0/sprockets%2F306166316e2cafd13c15e62b51a2339d
500
+ - ./test/dummy/tmp/cache/assets/D22/060/sprockets%2F9aec77b768e91a802d284271c58e2f7e
501
+ - ./test/dummy/tmp/cache/assets/DF1/AA0/sprockets%2Fedd37b0fdb6157fccb2297a8a10acc90
502
+ - ./test/dummy/tmp/cache/assets/C70/4D0/sprockets%2F034ad2036e623081bd352800786dfe80
503
+ - ./test/dummy/tmp/cache/assets/D76/AD0/sprockets%2Fe2158cde93188cf5ab6457bc6d6602ec
504
+ - ./test/dummy/tmp/cache/assets/D72/610/sprockets%2Fa8c708eeb30ef93de34d755d4f45d023
505
+ - ./test/dummy/tmp/cache/assets/C5F/340/sprockets%2F99692920160b7a279b86a80415b79db7
506
+ - ./test/dummy/tmp/cache/assets/D33/6D0/sprockets%2F500129c57f1146e556ec3aacd6cd38c1
507
+ - ./test/dummy/tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
404
508
  - ./test/dummy/app/controllers/application_controller.rb
405
509
  - ./test/dummy/app/controllers/umlaut_controller.rb
406
510
  - ./test/dummy/app/assets/javascripts/application.js
@@ -416,7 +520,6 @@ test_files:
416
520
  - ./test/dummy/config/environments/test.rb
417
521
  - ./test/dummy/config/application.rb
418
522
  - ./test/dummy/config/environment.rb
419
- - ./test/dummy/config/database.yml
420
523
  - ./test/dummy/config/umlaut_services.yml
421
524
  - ./test/dummy/config/routes.rb
422
525
  - ./test/dummy/config/locales/en.yml
@@ -427,7 +530,6 @@ test_files:
427
530
  - ./test/dummy/config/initializers/mime_types.rb
428
531
  - ./test/dummy/config/initializers/session_store.rb
429
532
  - ./test/dummy/config/initializers/secret_token.rb
430
- - ./test/dummy/config/database-jhu.yml
431
533
  - ./test/dummy/Rakefile
432
534
  - ./test/dummy/script/rails
433
535
  - ./test/dummy/config.ru
@@ -1,44 +0,0 @@
1
- # SQLite version 3.x
2
- # gem install sqlite3
3
- #
4
- # Ensure the SQLite 3 gem is defined in your Gemfile
5
- # gem 'sqlite3'
6
- #
7
- # UMLAUT: mysql db with mysql2 adapter strongly recommended for Umlaut, in both
8
- # production and development. sqlite3 has unclear semantics under threaded
9
- # concurrency which umlaut uses, and in many cases simply does not work.
10
- #
11
- # A high (connection) pool setting is also, sadly, generally
12
- # required at present.
13
- #
14
- # development:
15
- # adapter: mysql2
16
- # host:
17
- # username:
18
- # password:
19
- # database:
20
- # pool: 30
21
-
22
- development:
23
- adapter: mysql2
24
- database: umlaut3_dev
25
- pool: 30
26
- timeout: 5000
27
- username: umlaut_app
28
- password: uu21
29
- host: app01.mse.jhu.edu
30
-
31
- # Warning: The database defined as "test" will be erased and
32
- # re-generated from your development database when you run "rake".
33
- # Do not set this db to the same as development or production.
34
- test:
35
- adapter: sqlite3
36
- database: db/test.sqlite3
37
- pool: 5
38
- timeout: 5000
39
-
40
- production:
41
- adapter: sqlite3
42
- database: db/production.sqlite3
43
- pool: 5
44
- timeout: 5000
@@ -1,53 +0,0 @@
1
- # SQLite version 3.x
2
- # gem install sqlite3
3
- #
4
- # Ensure the SQLite 3 gem is defined in your Gemfile
5
- # gem 'sqlite3'
6
- #
7
- # UMLAUT: mysql db with mysql2 adapter strongly recommended for Umlaut, in both
8
- # production and development. sqlite3 has unclear semantics under threaded
9
- # concurrency which umlaut uses, and in many cases simply does not work.
10
- #
11
- # A high (connection) pool setting is also, sadly, generally
12
- # required at present.
13
- #
14
- # development:
15
- # adapter: mysql2
16
- # host:
17
- # username:
18
- # password:
19
- # database:
20
- # pool: 30
21
-
22
- development:
23
- adapter: mysql2
24
- database: umlaut3_dev
25
- pool: 30
26
- timeout: 5000
27
- username: umlaut_app
28
- password: uu21
29
- host: app01.mse.jhu.edu
30
-
31
- # Warning: The database defined as "test" will be erased and
32
- # re-generated from your development database when you run "rake".
33
- # Do not set this db to the same as development or production.
34
- test:
35
- adapter: sqlite3
36
- database: db/test.sqlite3
37
- pool: 5
38
- timeout: 5000
39
-
40
- production:
41
- adapter: sqlite3
42
- database: db/production.sqlite3
43
- pool: 5
44
- timeout: 5000
45
-
46
-
47
- umlaut2_source:
48
- adapter: mysql2
49
- host: app01.mse.jhu.edu
50
- database: umlaut_production
51
- username: umlaut_app
52
- password: uu21
53
- encoding: utf8