enju_leaf 1.1.0.rc10 → 1.1.0.rc11

Sign up to get free protection for your applications and to get access to all the features.
Files changed (144) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/enju_leaf.js +1 -1
  3. data/app/assets/javascripts/mobile.js +1 -1
  4. data/app/assets/stylesheets/enju.css +0 -2
  5. data/app/assets/stylesheets/enju_leaf.css +4 -4
  6. data/app/assets/stylesheets/mobile.css +1 -1
  7. data/app/controllers/user_import_files_controller.rb +6 -0
  8. data/app/controllers/user_import_results_controller.rb +1 -1
  9. data/app/mailers/notifier.rb +1 -1
  10. data/app/models/profile.rb +18 -0
  11. data/app/models/user_import_file.rb +46 -30
  12. data/app/models/user_import_file_state_machine.rb +2 -2
  13. data/app/models/user_import_file_transition.rb +13 -0
  14. data/app/models/user_import_result.rb +12 -0
  15. data/app/views/devise/sessions/new.html.erb +2 -2
  16. data/app/views/my_accounts/edit.html.erb +2 -2
  17. data/app/views/my_accounts/show.html.erb +2 -2
  18. data/app/views/page/403.html.erb +2 -2
  19. data/app/views/page/404.html.erb +2 -2
  20. data/app/views/page/500.html.erb +2 -2
  21. data/app/views/page/about.en.html.erb +4 -4
  22. data/app/views/page/about.ja.html.erb +4 -4
  23. data/app/views/page/add_on.html.erb +2 -2
  24. data/app/views/page/advanced_search.html.erb +10 -4
  25. data/app/views/page/export.html.erb +3 -3
  26. data/app/views/page/import.html.erb +2 -2
  27. data/app/views/page/statistics.html.erb +2 -2
  28. data/app/views/roles/edit.html.erb +2 -2
  29. data/app/views/roles/index.html.erb +2 -2
  30. data/app/views/roles/new.html.erb +2 -2
  31. data/app/views/roles/show.html.erb +2 -2
  32. data/app/views/user_groups/edit.html.erb +2 -2
  33. data/app/views/user_groups/index.html.erb +2 -2
  34. data/app/views/user_groups/new.html.erb +2 -2
  35. data/app/views/user_groups/show.html.erb +2 -2
  36. data/app/views/user_import_files/index.html.erb +2 -2
  37. data/app/views/user_import_files/new.html.erb +19 -6
  38. data/app/views/user_import_files/show.html.erb +11 -1
  39. data/app/views/user_import_results/index.html.erb +4 -4
  40. data/app/views/user_import_results/{index.csv.erb → index.tsv.erb} +1 -1
  41. data/app/views/users/edit.html.erb +2 -2
  42. data/app/views/users/index.html.erb +2 -2
  43. data/app/views/users/new.html.erb +2 -2
  44. data/app/views/users/show.html.erb +2 -2
  45. data/app/workers/user_import_file_queue.rb +7 -0
  46. data/config/initializers/mime_types.rb +1 -0
  47. data/config/initializers/paperclip.rb +12 -0
  48. data/config/initializers/resque.rb +1 -0
  49. data/config/locales/translation_en.yml +3 -0
  50. data/config/locales/translation_ja.yml +3 -0
  51. data/db/migrate/20130221154434_add_additional_attributes_to_user.rb +0 -1
  52. data/db/migrate/20140110122216_create_user_import_files.rb +0 -1
  53. data/db/migrate/20140122054321_create_profiles.rb +0 -1
  54. data/db/migrate/20140628072217_add_user_encoding_to_user_import_file.rb +5 -0
  55. data/lib/enju_leaf/calculate_stat.rb +1 -1
  56. data/lib/enju_leaf/import_file.rb +56 -0
  57. data/lib/enju_leaf/version.rb +1 -1
  58. data/lib/generators/enju_leaf/setup/setup_generator.rb +0 -5
  59. data/lib/generators/enju_leaf/setup/templates/config/schedule.rb +0 -8
  60. data/spec/controllers/my_accounts_controller_spec.rb +1 -1
  61. data/spec/dummy/app/models/setting.rb +4 -0
  62. data/spec/dummy/db/development.sqlite3 +0 -0
  63. data/spec/dummy/db/schema.rb +2 -4
  64. data/spec/dummy/db/test.sqlite3 +0 -0
  65. data/spec/dummy/solr/default/data/index/_t.fdt +0 -0
  66. data/spec/dummy/solr/default/data/index/{_2h.fdx → _t.fdx} +0 -0
  67. data/spec/dummy/solr/default/data/index/{_2h.fnm → _t.fnm} +0 -0
  68. data/spec/dummy/solr/default/data/index/{_2h.nvd → _t.nvd} +0 -0
  69. data/spec/dummy/solr/default/data/index/{_2h.nvm → _t.nvm} +0 -0
  70. data/spec/dummy/solr/default/data/index/{_2h.si → _t.si} +0 -0
  71. data/spec/dummy/solr/default/data/index/{_2h_Lucene41_0.doc → _t_Lucene41_0.doc} +0 -0
  72. data/spec/dummy/solr/default/data/index/{_2h_Lucene41_0.pos → _t_Lucene41_0.pos} +0 -0
  73. data/spec/dummy/solr/default/data/index/{_2h_Lucene41_0.tim → _t_Lucene41_0.tim} +0 -0
  74. data/spec/dummy/solr/default/data/index/{_2h_Lucene41_0.tip → _t_Lucene41_0.tip} +0 -0
  75. data/spec/dummy/solr/default/data/index/segments.gen +0 -0
  76. data/spec/dummy/solr/default/data/index/segments_1p +0 -0
  77. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000050 +0 -0
  78. data/spec/dummy/solr/default/data/tlog/{tlog.0000000000000000177 → tlog.0000000000000000051} +0 -0
  79. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000052 +0 -0
  80. data/spec/dummy/solr/default/data/tlog/{tlog.0000000000000000179 → tlog.0000000000000000053} +0 -0
  81. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000054 +0 -0
  82. data/spec/dummy/solr/default/data/tlog/{tlog.0000000000000000181 → tlog.0000000000000000055} +0 -0
  83. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000056 +0 -0
  84. data/spec/dummy/solr/default/data/tlog/{tlog.0000000000000000183 → tlog.0000000000000000057} +0 -0
  85. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000058 +0 -0
  86. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000059 +0 -0
  87. data/spec/dummy/tmp/cache/4F7/F90/default_role +0 -0
  88. data/spec/dummy/tmp/cache/ACB/B20/manifestation_search_total +0 -0
  89. data/spec/dummy/tmp/cache/assets/test/sprockets/3f8d795856d1fdf902b0be679120571a +0 -0
  90. data/spec/dummy/tmp/cache/assets/test/sprockets/5998e66e374537d52eed3fe1ca5f2bfc +0 -0
  91. data/spec/dummy/tmp/cache/assets/test/sprockets/5ea4a1824e1d67da6c4fb9aeef9f49f4 +0 -0
  92. data/spec/dummy/tmp/cache/assets/test/sprockets/87f0cb69a0df1355e33cce3949919d5a +0 -0
  93. data/spec/dummy/tmp/cache/stdout +103 -0
  94. data/spec/dummy/tmp/pids/redis-test.pid +1 -0
  95. data/spec/fixtures/roles.yml +15 -15
  96. data/spec/fixtures/user_has_roles.yml +11 -11
  97. data/spec/fixtures/user_import_files.yml +20 -2
  98. data/spec/fixtures/user_import_results.yml +12 -0
  99. data/spec/models/role_spec.rb +14 -14
  100. data/spec/models/user_has_role_spec.rb +8 -8
  101. data/spec/models/user_import_file_spec.rb +30 -2
  102. data/spec/models/user_import_result_spec.rb +12 -0
  103. data/spec/models/user_spec.rb +19 -19
  104. data/spec/spec_helper.rb +3 -0
  105. data/spec/support/resque.rb +30 -0
  106. data/vendor/assets/javascripts/jquery.colorbox.js +5 -6
  107. data/{app/assets/javascripts/jquery.mobile-1.4.2.js → vendor/assets/javascripts/jquery.mobile-1.4.3.js} +460 -187
  108. data/{app/assets/stylesheets/jquery.mobile-1.4.2.css → vendor/assets/stylesheets/jquery.mobile-1.4.3.css} +22 -17
  109. metadata +107 -101
  110. data/app/assets/javascripts/profiles.js +0 -2
  111. data/app/assets/stylesheets/normalize.css +0 -406
  112. data/app/assets/stylesheets/profiles.css +0 -4
  113. data/app/assets/stylesheets/scaffolds.css.scss +0 -56
  114. data/app/helpers/profiles_helper.rb +0 -2
  115. data/app/views/layouts/patrons.html.erb +0 -26
  116. data/app/views/layouts/patrons.mobile.erb +0 -18
  117. data/app/views/profiles/_form.html.erb +0 -53
  118. data/app/views/profiles/edit.html.erb +0 -6
  119. data/app/views/profiles/index.html.erb +0 -43
  120. data/app/views/profiles/new.html.erb +0 -14
  121. data/app/views/profiles/show.html.erb +0 -54
  122. data/spec/dummy/private/system/user_import_files/user_imports/980/190/963/original/user_delete_file.tsv +0 -4
  123. data/spec/dummy/solr/default/data/index/_2h.fdt +0 -0
  124. data/spec/dummy/solr/default/data/index/segments_57 +0 -0
  125. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000176 +0 -0
  126. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000178 +0 -0
  127. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000180 +0 -0
  128. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000182 +0 -0
  129. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000184 +0 -0
  130. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000000185 +0 -0
  131. data/spec/dummy/tmp/cache/assets/test/sprockets/13fe41fee1fe35b49d145bcc06610705 +0 -0
  132. data/spec/dummy/tmp/cache/assets/test/sprockets/154f7b83f2da0e86effbe25f32135177 +0 -0
  133. data/spec/dummy/tmp/cache/assets/test/sprockets/1b984bdbd3204a51a82d0e01a1569e2d +0 -0
  134. data/spec/dummy/tmp/cache/assets/test/sprockets/2f5173deea6c795b8fdde723bb4b63af +0 -0
  135. data/spec/dummy/tmp/cache/assets/test/sprockets/3054c50144654f9c7e57bb0639a276e9 +0 -0
  136. data/spec/dummy/tmp/cache/assets/test/sprockets/357970feca3ac29060c1e3861e2c0953 +0 -0
  137. data/spec/dummy/tmp/cache/assets/test/sprockets/3bd7a263237ba366f64d938fe5303757 +0 -0
  138. data/spec/dummy/tmp/cache/assets/test/sprockets/62899096da1a3e67660f3b88068be8c9 +0 -0
  139. data/spec/dummy/tmp/cache/assets/test/sprockets/65b2e4f67eab21b30217e29075f433b2 +0 -0
  140. data/spec/dummy/tmp/cache/assets/test/sprockets/87d24a3f43f175d4d17babe9203c79a7 +0 -0
  141. data/spec/dummy/tmp/cache/assets/test/sprockets/cffd775d018f68ce5dba1ee0d951a994 +0 -0
  142. data/spec/dummy/tmp/cache/assets/test/sprockets/d38d8658b30de1d068603968227680d4 +0 -0
  143. data/spec/dummy/tmp/cache/assets/test/sprockets/d771ace226fc8215a3572e0aa35bb0d6 +0 -0
  144. data/spec/dummy/tmp/cache/assets/test/sprockets/f7cbd26ba1d28d48de824f0e94586655 +0 -0
@@ -1,9 +1,9 @@
1
1
  /*!
2
- * jQuery Mobile 1.4.2
3
- * Git HEAD hash: 9d9a42a27d0c693e8b5569c3a10d771916af5045 <> Date: Fri Feb 28 2014 17:32:01 UTC
2
+ * jQuery Mobile 1.4.3
3
+ * Git HEAD hash: b9c6473e3d90af26570e6f14e5a0307897ab385c <> Date: Tue Jul 1 2014 15:37:36 UTC
4
4
  * http://jquerymobile.com
5
5
  *
6
- * Copyright 2010, 2014 jQuery Foundation, Inc. and other contributors
6
+ * Copyright 2010, 2014 jQuery Foundation, Inc. and othercontributors
7
7
  * Released under the MIT license.
8
8
  * http://jquery.org/license
9
9
  *
@@ -790,7 +790,7 @@ label.ui-btn {
790
790
  border-width: 1px;
791
791
  border-style: solid;
792
792
  }
793
- .ui-btn:link {
793
+ .ui-btn {
794
794
  text-decoration: none !important;
795
795
  }
796
796
  .ui-btn-active {
@@ -873,7 +873,7 @@ html .ui-alt-icon.ui-radio-off:after,
873
873
  html .ui-alt-icon .ui-checkbox-off:after,
874
874
  html .ui-alt-icon .ui-radio-off:after {
875
875
  background-color: #666 /*{global-icon-color}*/;
876
- background-color: rgba(0,0,0,.15);
876
+ background-color: rgba(0,0,0,.15) /*{global-icon-disc}*/;
877
877
  }
878
878
  /* No disc */
879
879
  .ui-nodisc-icon.ui-btn:after,
@@ -907,6 +907,10 @@ html .ui-alt-icon .ui-radio-off:after {
907
907
  -webkit-border-radius: .1875em;
908
908
  border-radius: .1875em;
909
909
  }
910
+ .ui-btn.ui-checkbox-off:after {
911
+ background-color: #666;
912
+ background-color: rgba(0,0,0,.3);
913
+ }
910
914
  .ui-radio .ui-btn.ui-radio-on:after {
911
915
  background-image: none;
912
916
  background-color: #fff;
@@ -1520,7 +1524,9 @@ div.ui-mobile-viewport {
1520
1524
  -ms-user-select: none;
1521
1525
  user-select: none;
1522
1526
  }
1523
- .ui-btn-icon-notext {
1527
+ .ui-btn-icon-notext,
1528
+ .ui-header button.ui-btn.ui-btn-icon-notext,
1529
+ .ui-footer button.ui-btn.ui-btn-icon-notext {
1524
1530
  padding: 0;
1525
1531
  width: 1.75em;
1526
1532
  height: 1.75em;
@@ -1540,6 +1546,10 @@ div.ui-mobile-viewport {
1540
1546
  display: inline-block;
1541
1547
  vertical-align: middle;
1542
1548
  }
1549
+ .ui-header .ui-controlgroup .ui-btn-icon-notext,
1550
+ .ui-footer .ui-controlgroup .ui-btn-icon-notext {
1551
+ font-size: 12.5px;
1552
+ }
1543
1553
  /* To ensure same top and left/right position when ui-btn-left/right are added to something other than buttons. */
1544
1554
  .ui-header .ui-btn-left,
1545
1555
  .ui-header .ui-btn-right {
@@ -1660,7 +1670,9 @@ button.ui-btn,
1660
1670
  -moz-appearance: none;
1661
1671
  width: 100%;
1662
1672
  }
1663
- button.ui-btn-inline {
1673
+ button.ui-btn-inline,
1674
+ .ui-header button.ui-btn,
1675
+ .ui-footer button.ui-btn {
1664
1676
  width: auto;
1665
1677
  }
1666
1678
  /* Firefox adds a 1px border in a button element. We negate this to make sure they have the same height as other buttons in controlgroups. */
@@ -2501,7 +2513,6 @@ button.ui-btn-icon-notext,
2501
2513
  width: 78%;
2502
2514
  -webkit-box-sizing: border-box;
2503
2515
  -moz-box-sizing: border-box;
2504
- -ms-box-sizing: border-box;
2505
2516
  box-sizing: border-box;
2506
2517
  }
2507
2518
  /* ui-hide-label deprecated in 1.4. TODO: Remove in 1.5 */
@@ -2568,7 +2579,9 @@ li.ui-block-e {
2568
2579
  [class*="ui-block-"] > .ui-checkbox,
2569
2580
  [class*="ui-block-"] > .ui-radio,
2570
2581
  [class*="ui-block-"] > button.ui-btn-inline,
2571
- [class*="ui-block-"] > button.ui-btn-icon-notext {
2582
+ [class*="ui-block-"] > button.ui-btn-icon-notext,
2583
+ .ui-header [class*="ui-block-"] > button.ui-btn,
2584
+ .ui-footer [class*="ui-block-"] > button.ui-btn {
2572
2585
  margin-right: .3125em;
2573
2586
  margin-left: .3125em;
2574
2587
  }
@@ -3854,7 +3867,6 @@ input.ui-slider-input {
3854
3867
  appearance: none;
3855
3868
  -webkit-box-sizing: content-box;
3856
3869
  -moz-box-sizing: content-box;
3857
- -ms-box-sizing: content-box;
3858
3870
  box-sizing: content-box;
3859
3871
  }
3860
3872
  .ui-slider-input::-webkit-outer-spin-button,
@@ -4077,7 +4089,6 @@ textarea.ui-input-text {
4077
4089
  width: 100%;
4078
4090
  -webkit-box-sizing: border-box;
4079
4091
  -moz-box-sizing: border-box;
4080
- -ms-box-sizing: border-box;
4081
4092
  box-sizing: border-box;
4082
4093
  outline: 0;
4083
4094
  }
@@ -4251,7 +4262,6 @@ textarea.ui-input-text.ui-textinput-autogrow {
4251
4262
  border-style: solid;
4252
4263
  -webkit-box-sizing: border-box;
4253
4264
  -moz-box-sizing: border-box;
4254
- -ms-box-sizing: border-box;
4255
4265
  box-sizing: border-box;
4256
4266
  border-radius: inherit;
4257
4267
  overflow: visible;
@@ -4269,7 +4279,6 @@ html .ui-popup .ui-field-contain > label + .ui-flipswitch {
4269
4279
  width: 5.875em; /* If you override the width for .ui-flipswitch you should repeat the same value here */
4270
4280
  -webkit-box-sizing: content-box;
4271
4281
  -moz-box-sizing: content-box;
4272
- -ms-box-sizing: content-box;
4273
4282
  box-sizing: content-box;
4274
4283
  }
4275
4284
  .ui-field-contain .ui-flipswitch.ui-flipswitch-active,
@@ -4434,10 +4443,6 @@ html .ui-popup .ui-field-contain > label + .ui-flipswitch {
4434
4443
  }
4435
4444
  /* Breakpoint to show as a standard table at 560px (35em x 16px) or wider */
4436
4445
  @media ( min-width: 35em ) {
4437
- /* Fixes table rendering when switching between breakpoints in Safari <= 5. See https://github.com/jquery/jquery-mobile/issues/5380 */
4438
- .ui-table-reflow.ui-responsive {
4439
- display: table-row-group;
4440
- }
4441
4446
  /* Show the table header rows */
4442
4447
  .ui-table-reflow.ui-responsive td,
4443
4448
  .ui-table-reflow.ui-responsive th,
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: enju_leaf
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.0.rc10
4
+ version: 1.1.0.rc11
5
5
  platform: ruby
6
6
  authors:
7
7
  - Kosuke Tanabe
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-06-24 00:00:00.000000000 Z
11
+ date: 2014-07-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: enju_biblio
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 0.1.0.pre52
19
+ version: 0.1.0.pre53
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: 0.1.0.pre52
26
+ version: 0.1.0.pre53
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: enju_library
29
29
  requirement: !ruby/object:Gem::Requirement
@@ -140,16 +140,16 @@ dependencies:
140
140
  name: jquery-ui-rails
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
- - - ">="
143
+ - - "~>"
144
144
  - !ruby/object:Gem::Version
145
- version: '0'
145
+ version: '5.0'
146
146
  type: :runtime
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
- - - ">="
150
+ - - "~>"
151
151
  - !ruby/object:Gem::Version
152
- version: '0'
152
+ version: '5.0'
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: cache_digests
155
155
  requirement: !ruby/object:Gem::Requirement
@@ -184,14 +184,14 @@ dependencies:
184
184
  requirements:
185
185
  - - "~>"
186
186
  - !ruby/object:Gem::Version
187
- version: '3.5'
187
+ version: '4.1'
188
188
  type: :runtime
189
189
  prerelease: false
190
190
  version_requirements: !ruby/object:Gem::Requirement
191
191
  requirements:
192
192
  - - "~>"
193
193
  - !ruby/object:Gem::Version
194
- version: '3.5'
194
+ version: '4.1'
195
195
  - !ruby/object:Gem::Dependency
196
196
  name: kaminari
197
197
  requirement: !ruby/object:Gem::Requirement
@@ -238,16 +238,16 @@ dependencies:
238
238
  name: rspec-rails
239
239
  requirement: !ruby/object:Gem::Requirement
240
240
  requirements:
241
- - - '='
241
+ - - "~>"
242
242
  - !ruby/object:Gem::Version
243
- version: '2.99'
243
+ version: '3.0'
244
244
  type: :development
245
245
  prerelease: false
246
246
  version_requirements: !ruby/object:Gem::Requirement
247
247
  requirements:
248
- - - '='
248
+ - - "~>"
249
249
  - !ruby/object:Gem::Version
250
- version: '2.99'
250
+ version: '3.0'
251
251
  - !ruby/object:Gem::Dependency
252
252
  name: enju_message
253
253
  requirement: !ruby/object:Gem::Requirement
@@ -332,6 +332,34 @@ dependencies:
332
332
  - - ">="
333
333
  - !ruby/object:Gem::Version
334
334
  version: '0'
335
+ - !ruby/object:Gem::Dependency
336
+ name: annotate
337
+ requirement: !ruby/object:Gem::Requirement
338
+ requirements:
339
+ - - ">="
340
+ - !ruby/object:Gem::Version
341
+ version: '0'
342
+ type: :development
343
+ prerelease: false
344
+ version_requirements: !ruby/object:Gem::Requirement
345
+ requirements:
346
+ - - ">="
347
+ - !ruby/object:Gem::Version
348
+ version: '0'
349
+ - !ruby/object:Gem::Dependency
350
+ name: rspec-activemodel-mocks
351
+ requirement: !ruby/object:Gem::Requirement
352
+ requirements:
353
+ - - ">="
354
+ - !ruby/object:Gem::Version
355
+ version: '0'
356
+ type: :development
357
+ prerelease: false
358
+ version_requirements: !ruby/object:Gem::Requirement
359
+ requirements:
360
+ - - ">="
361
+ - !ruby/object:Gem::Version
362
+ version: '0'
335
363
  description: integrated library system
336
364
  email:
337
365
  - nabeta@fastmail.fm
@@ -407,26 +435,20 @@ files:
407
435
  - app/assets/images/spinner.gif
408
436
  - app/assets/images/unknown_resource.png
409
437
  - app/assets/javascripts/enju_leaf.js
410
- - app/assets/javascripts/jquery.mobile-1.4.2.js
411
438
  - app/assets/javascripts/menu.enju.js
412
439
  - app/assets/javascripts/mobile.js
413
440
  - app/assets/javascripts/portlets.js
414
- - app/assets/javascripts/profiles.js
415
441
  - app/assets/javascripts/select_locale.js
416
442
  - app/assets/javascripts/tab_view.js
417
443
  - app/assets/stylesheets/enju.css
418
444
  - app/assets/stylesheets/enju_leaf.css
419
445
  - app/assets/stylesheets/enju_mobile.css
420
446
  - app/assets/stylesheets/enju_print.css
421
- - app/assets/stylesheets/jquery.mobile-1.4.2.css
422
447
  - app/assets/stylesheets/mobile.css
423
- - app/assets/stylesheets/normalize.css
424
448
  - app/assets/stylesheets/pagination.css
425
449
  - app/assets/stylesheets/portlets.css
426
450
  - app/assets/stylesheets/print.css
427
- - app/assets/stylesheets/profiles.css
428
451
  - app/assets/stylesheets/scaffold_modified.css
429
- - app/assets/stylesheets/scaffolds.css.scss
430
452
  - app/controllers/my_accounts_controller.rb
431
453
  - app/controllers/page_controller.rb
432
454
  - app/controllers/roles_controller.rb
@@ -435,7 +457,6 @@ files:
435
457
  - app/controllers/user_import_results_controller.rb
436
458
  - app/controllers/users_controller.rb
437
459
  - app/helpers/page_helper.rb
438
- - app/helpers/profiles_helper.rb
439
460
  - app/mailers/notifier.rb
440
461
  - app/models/enju_leaf/ability.rb
441
462
  - app/models/local_patron.rb
@@ -481,8 +502,6 @@ files:
481
502
  - app/views/layouts/devise/passwords.mobile.erb
482
503
  - app/views/layouts/devise/sessions.html.erb
483
504
  - app/views/layouts/devise/sessions.mobile.erb
484
- - app/views/layouts/patrons.html.erb
485
- - app/views/layouts/patrons.mobile.erb
486
505
  - app/views/my_accounts/_edit_credential.html.erb
487
506
  - app/views/my_accounts/_form.html.erb
488
507
  - app/views/my_accounts/_show.html.erb
@@ -528,11 +547,6 @@ files:
528
547
  - app/views/page/msie_acceralator.builder
529
548
  - app/views/page/opensearch.builder
530
549
  - app/views/page/statistics.html.erb
531
- - app/views/profiles/_form.html.erb
532
- - app/views/profiles/edit.html.erb
533
- - app/views/profiles/index.html.erb
534
- - app/views/profiles/new.html.erb
535
- - app/views/profiles/show.html.erb
536
550
  - app/views/roles/_form.html.erb
537
551
  - app/views/roles/edit.html.erb
538
552
  - app/views/roles/index.html.erb
@@ -549,8 +563,8 @@ files:
549
563
  - app/views/user_import_files/new.html.erb
550
564
  - app/views/user_import_files/show.html.erb
551
565
  - app/views/user_import_results/_form.html.erb
552
- - app/views/user_import_results/index.csv.erb
553
566
  - app/views/user_import_results/index.html.erb
567
+ - app/views/user_import_results/index.tsv.erb
554
568
  - app/views/user_import_results/show.html.erb
555
569
  - app/views/users/_edit_credential.html.erb
556
570
  - app/views/users/_form.html.erb
@@ -560,7 +574,10 @@ files:
560
574
  - app/views/users/new.html.erb
561
575
  - app/views/users/show.html.erb
562
576
  - app/views/users/show.mobile.erb
577
+ - app/workers/user_import_file_queue.rb
563
578
  - config/initializers/mime_types.rb
579
+ - config/initializers/paperclip.rb
580
+ - config/initializers/resque.rb
564
581
  - config/initializers/statesman.rb
565
582
  - config/locales/devise.en.yml
566
583
  - config/locales/devise.ja.yml
@@ -582,6 +599,7 @@ files:
582
599
  - db/migrate/20140122054321_create_profiles.rb
583
600
  - db/migrate/20140524074813_create_user_import_file_transitions.rb
584
601
  - db/migrate/20140610123439_drop_email_unique_constraint_enju_leaf_rc10.rb
602
+ - db/migrate/20140628072217_add_user_encoding_to_user_import_file.rb
585
603
  - lib/enju_leaf.rb
586
604
  - lib/enju_leaf/bookmark_url.rb
587
605
  - lib/enju_leaf/calculate_stat.rb
@@ -640,6 +658,7 @@ files:
640
658
  - spec/dummy/app/assets/stylesheets/application.css
641
659
  - spec/dummy/app/controllers/application_controller.rb
642
660
  - spec/dummy/app/helpers/application_helper.rb
661
+ - spec/dummy/app/models/setting.rb
643
662
  - spec/dummy/app/models/user.rb
644
663
  - spec/dummy/app/views/layouts/application.html.erb
645
664
  - spec/dummy/config.ru
@@ -784,7 +803,6 @@ files:
784
803
  - spec/dummy/db/migrate/20130506175834_create_identifiers.rb
785
804
  - spec/dummy/db/schema.rb
786
805
  - spec/dummy/db/test.sqlite3
787
- - spec/dummy/private/system/user_import_files/user_imports/980/190/963/original/user_delete_file.tsv
788
806
  - spec/dummy/private/system/user_import_files/user_imports/980/190/963/original/user_import_file_sample.tsv
789
807
  - spec/dummy/private/system/user_import_files/user_imports/980/190/963/original/user_update_file.tsv
790
808
  - spec/dummy/private/system/user_import_files/user_imports/980/190/964/original/user_delete_file.tsv
@@ -803,28 +821,28 @@ files:
803
821
  - spec/dummy/solr/conf/spellings.txt
804
822
  - spec/dummy/solr/conf/stopwords.txt
805
823
  - spec/dummy/solr/conf/synonyms.txt
806
- - spec/dummy/solr/default/data/index/_2h.fdt
807
- - spec/dummy/solr/default/data/index/_2h.fdx
808
- - spec/dummy/solr/default/data/index/_2h.fnm
809
- - spec/dummy/solr/default/data/index/_2h.nvd
810
- - spec/dummy/solr/default/data/index/_2h.nvm
811
- - spec/dummy/solr/default/data/index/_2h.si
812
- - spec/dummy/solr/default/data/index/_2h_Lucene41_0.doc
813
- - spec/dummy/solr/default/data/index/_2h_Lucene41_0.pos
814
- - spec/dummy/solr/default/data/index/_2h_Lucene41_0.tim
815
- - spec/dummy/solr/default/data/index/_2h_Lucene41_0.tip
824
+ - spec/dummy/solr/default/data/index/_t.fdt
825
+ - spec/dummy/solr/default/data/index/_t.fdx
826
+ - spec/dummy/solr/default/data/index/_t.fnm
827
+ - spec/dummy/solr/default/data/index/_t.nvd
828
+ - spec/dummy/solr/default/data/index/_t.nvm
829
+ - spec/dummy/solr/default/data/index/_t.si
830
+ - spec/dummy/solr/default/data/index/_t_Lucene41_0.doc
831
+ - spec/dummy/solr/default/data/index/_t_Lucene41_0.pos
832
+ - spec/dummy/solr/default/data/index/_t_Lucene41_0.tim
833
+ - spec/dummy/solr/default/data/index/_t_Lucene41_0.tip
816
834
  - spec/dummy/solr/default/data/index/segments.gen
817
- - spec/dummy/solr/default/data/index/segments_57
818
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000000176
819
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000000177
820
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000000178
821
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000000179
822
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000000180
823
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000000181
824
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000000182
825
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000000183
826
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000000184
827
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000000185
835
+ - spec/dummy/solr/default/data/index/segments_1p
836
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000000050
837
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000000051
838
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000000052
839
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000000053
840
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000000054
841
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000000055
842
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000000056
843
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000000057
844
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000000058
845
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000000059
828
846
  - spec/dummy/solr/development/data/index/segments.gen
829
847
  - spec/dummy/solr/development/data/index/segments_1
830
848
  - spec/dummy/solr/solr.xml
@@ -832,20 +850,12 @@ files:
832
850
  - spec/dummy/solr/test/data/index/segments_1
833
851
  - spec/dummy/tmp/cache/4F7/F90/default_role
834
852
  - spec/dummy/tmp/cache/ACB/B20/manifestation_search_total
835
- - spec/dummy/tmp/cache/assets/test/sprockets/13fe41fee1fe35b49d145bcc06610705
836
- - spec/dummy/tmp/cache/assets/test/sprockets/154f7b83f2da0e86effbe25f32135177
837
- - spec/dummy/tmp/cache/assets/test/sprockets/1b984bdbd3204a51a82d0e01a1569e2d
838
- - spec/dummy/tmp/cache/assets/test/sprockets/2f5173deea6c795b8fdde723bb4b63af
839
- - spec/dummy/tmp/cache/assets/test/sprockets/3054c50144654f9c7e57bb0639a276e9
840
- - spec/dummy/tmp/cache/assets/test/sprockets/357970feca3ac29060c1e3861e2c0953
841
- - spec/dummy/tmp/cache/assets/test/sprockets/3bd7a263237ba366f64d938fe5303757
842
- - spec/dummy/tmp/cache/assets/test/sprockets/62899096da1a3e67660f3b88068be8c9
843
- - spec/dummy/tmp/cache/assets/test/sprockets/65b2e4f67eab21b30217e29075f433b2
844
- - spec/dummy/tmp/cache/assets/test/sprockets/87d24a3f43f175d4d17babe9203c79a7
845
- - spec/dummy/tmp/cache/assets/test/sprockets/cffd775d018f68ce5dba1ee0d951a994
846
- - spec/dummy/tmp/cache/assets/test/sprockets/d38d8658b30de1d068603968227680d4
847
- - spec/dummy/tmp/cache/assets/test/sprockets/d771ace226fc8215a3572e0aa35bb0d6
848
- - spec/dummy/tmp/cache/assets/test/sprockets/f7cbd26ba1d28d48de824f0e94586655
853
+ - spec/dummy/tmp/cache/assets/test/sprockets/3f8d795856d1fdf902b0be679120571a
854
+ - spec/dummy/tmp/cache/assets/test/sprockets/5998e66e374537d52eed3fe1ca5f2bfc
855
+ - spec/dummy/tmp/cache/assets/test/sprockets/5ea4a1824e1d67da6c4fb9aeef9f49f4
856
+ - spec/dummy/tmp/cache/assets/test/sprockets/87f0cb69a0df1355e33cce3949919d5a
857
+ - spec/dummy/tmp/cache/stdout
858
+ - spec/dummy/tmp/pids/redis-test.pid
849
859
  - spec/factories/agent.rb
850
860
  - spec/factories/agent_relationship.rb
851
861
  - spec/factories/agent_relationship_type.rb
@@ -941,6 +951,7 @@ files:
941
951
  - spec/spec_helper.rb
942
952
  - spec/support/controller_macros.rb
943
953
  - spec/support/devise.rb
954
+ - spec/support/resque.rb
944
955
  - spec/views/users/edit.html.erb_spec.rb
945
956
  - spec/views/users/index.html.erb_spec.rb
946
957
  - spec/views/users/new.html.erb_spec.rb
@@ -949,6 +960,7 @@ files:
949
960
  - vendor/assets/javascripts/jquery.colorbox.js
950
961
  - vendor/assets/javascripts/jquery.cookie.js
951
962
  - vendor/assets/javascripts/jquery.highlight.js
963
+ - vendor/assets/javascripts/jquery.mobile-1.4.3.js
952
964
  - vendor/assets/javascripts/jquery.powertip.js
953
965
  - vendor/assets/javascripts/jquery.shortcut.js
954
966
  - vendor/assets/javascripts/jquery.ui.menubar.js
@@ -967,6 +979,7 @@ files:
967
979
  - vendor/assets/stylesheets/images/loading_background.png
968
980
  - vendor/assets/stylesheets/images/overlay.png
969
981
  - vendor/assets/stylesheets/images/spinner_bar.gif
982
+ - vendor/assets/stylesheets/jquery.mobile-1.4.3.css
970
983
  - vendor/assets/stylesheets/jquery.powertip.css
971
984
  - vendor/assets/stylesheets/jquery.ui.menubar.css
972
985
  homepage: https://github.com/next-l/enju_leaf
@@ -1008,6 +1021,7 @@ test_files:
1008
1021
  - spec/dummy/app/assets/stylesheets/application.css
1009
1022
  - spec/dummy/app/controllers/application_controller.rb
1010
1023
  - spec/dummy/app/helpers/application_helper.rb
1024
+ - spec/dummy/app/models/setting.rb
1011
1025
  - spec/dummy/app/models/user.rb
1012
1026
  - spec/dummy/app/views/layouts/application.html.erb
1013
1027
  - spec/dummy/config/application.rb
@@ -1152,7 +1166,6 @@ test_files:
1152
1166
  - spec/dummy/db/migrate/20130506175834_create_identifiers.rb
1153
1167
  - spec/dummy/db/schema.rb
1154
1168
  - spec/dummy/db/test.sqlite3
1155
- - spec/dummy/private/system/user_import_files/user_imports/980/190/963/original/user_delete_file.tsv
1156
1169
  - spec/dummy/private/system/user_import_files/user_imports/980/190/963/original/user_import_file_sample.tsv
1157
1170
  - spec/dummy/private/system/user_import_files/user_imports/980/190/963/original/user_update_file.tsv
1158
1171
  - spec/dummy/private/system/user_import_files/user_imports/980/190/964/original/user_delete_file.tsv
@@ -1173,28 +1186,28 @@ test_files:
1173
1186
  - spec/dummy/solr/conf/spellings.txt
1174
1187
  - spec/dummy/solr/conf/stopwords.txt
1175
1188
  - spec/dummy/solr/conf/synonyms.txt
1176
- - spec/dummy/solr/default/data/index/_2h.fdt
1177
- - spec/dummy/solr/default/data/index/_2h.fdx
1178
- - spec/dummy/solr/default/data/index/_2h.fnm
1179
- - spec/dummy/solr/default/data/index/_2h.nvd
1180
- - spec/dummy/solr/default/data/index/_2h.nvm
1181
- - spec/dummy/solr/default/data/index/_2h.si
1182
- - spec/dummy/solr/default/data/index/_2h_Lucene41_0.doc
1183
- - spec/dummy/solr/default/data/index/_2h_Lucene41_0.pos
1184
- - spec/dummy/solr/default/data/index/_2h_Lucene41_0.tim
1185
- - spec/dummy/solr/default/data/index/_2h_Lucene41_0.tip
1189
+ - spec/dummy/solr/default/data/index/_t.fdt
1190
+ - spec/dummy/solr/default/data/index/_t.fdx
1191
+ - spec/dummy/solr/default/data/index/_t.fnm
1192
+ - spec/dummy/solr/default/data/index/_t.nvd
1193
+ - spec/dummy/solr/default/data/index/_t.nvm
1194
+ - spec/dummy/solr/default/data/index/_t.si
1195
+ - spec/dummy/solr/default/data/index/_t_Lucene41_0.doc
1196
+ - spec/dummy/solr/default/data/index/_t_Lucene41_0.pos
1197
+ - spec/dummy/solr/default/data/index/_t_Lucene41_0.tim
1198
+ - spec/dummy/solr/default/data/index/_t_Lucene41_0.tip
1186
1199
  - spec/dummy/solr/default/data/index/segments.gen
1187
- - spec/dummy/solr/default/data/index/segments_57
1188
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000000176
1189
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000000177
1190
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000000178
1191
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000000179
1192
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000000180
1193
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000000181
1194
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000000182
1195
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000000183
1196
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000000184
1197
- - spec/dummy/solr/default/data/tlog/tlog.0000000000000000185
1200
+ - spec/dummy/solr/default/data/index/segments_1p
1201
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000000050
1202
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000000051
1203
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000000052
1204
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000000053
1205
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000000054
1206
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000000055
1207
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000000056
1208
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000000057
1209
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000000058
1210
+ - spec/dummy/solr/default/data/tlog/tlog.0000000000000000059
1198
1211
  - spec/dummy/solr/development/data/index/segments.gen
1199
1212
  - spec/dummy/solr/development/data/index/segments_1
1200
1213
  - spec/dummy/solr/solr.xml
@@ -1202,20 +1215,12 @@ test_files:
1202
1215
  - spec/dummy/solr/test/data/index/segments_1
1203
1216
  - spec/dummy/tmp/cache/4F7/F90/default_role
1204
1217
  - spec/dummy/tmp/cache/ACB/B20/manifestation_search_total
1205
- - spec/dummy/tmp/cache/assets/test/sprockets/13fe41fee1fe35b49d145bcc06610705
1206
- - spec/dummy/tmp/cache/assets/test/sprockets/154f7b83f2da0e86effbe25f32135177
1207
- - spec/dummy/tmp/cache/assets/test/sprockets/1b984bdbd3204a51a82d0e01a1569e2d
1208
- - spec/dummy/tmp/cache/assets/test/sprockets/2f5173deea6c795b8fdde723bb4b63af
1209
- - spec/dummy/tmp/cache/assets/test/sprockets/3054c50144654f9c7e57bb0639a276e9
1210
- - spec/dummy/tmp/cache/assets/test/sprockets/357970feca3ac29060c1e3861e2c0953
1211
- - spec/dummy/tmp/cache/assets/test/sprockets/3bd7a263237ba366f64d938fe5303757
1212
- - spec/dummy/tmp/cache/assets/test/sprockets/62899096da1a3e67660f3b88068be8c9
1213
- - spec/dummy/tmp/cache/assets/test/sprockets/65b2e4f67eab21b30217e29075f433b2
1214
- - spec/dummy/tmp/cache/assets/test/sprockets/87d24a3f43f175d4d17babe9203c79a7
1215
- - spec/dummy/tmp/cache/assets/test/sprockets/cffd775d018f68ce5dba1ee0d951a994
1216
- - spec/dummy/tmp/cache/assets/test/sprockets/d38d8658b30de1d068603968227680d4
1217
- - spec/dummy/tmp/cache/assets/test/sprockets/d771ace226fc8215a3572e0aa35bb0d6
1218
- - spec/dummy/tmp/cache/assets/test/sprockets/f7cbd26ba1d28d48de824f0e94586655
1218
+ - spec/dummy/tmp/cache/assets/test/sprockets/3f8d795856d1fdf902b0be679120571a
1219
+ - spec/dummy/tmp/cache/assets/test/sprockets/5998e66e374537d52eed3fe1ca5f2bfc
1220
+ - spec/dummy/tmp/cache/assets/test/sprockets/5ea4a1824e1d67da6c4fb9aeef9f49f4
1221
+ - spec/dummy/tmp/cache/assets/test/sprockets/87f0cb69a0df1355e33cce3949919d5a
1222
+ - spec/dummy/tmp/cache/stdout
1223
+ - spec/dummy/tmp/pids/redis-test.pid
1219
1224
  - spec/factories/agent.rb
1220
1225
  - spec/factories/agent_relationship.rb
1221
1226
  - spec/factories/agent_relationship_type.rb
@@ -1311,6 +1316,7 @@ test_files:
1311
1316
  - spec/spec_helper.rb
1312
1317
  - spec/support/controller_macros.rb
1313
1318
  - spec/support/devise.rb
1319
+ - spec/support/resque.rb
1314
1320
  - spec/views/users/edit.html.erb_spec.rb
1315
1321
  - spec/views/users/index.html.erb_spec.rb
1316
1322
  - spec/views/users/new.html.erb_spec.rb