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,2 +0,0 @@
1
- // Place all the behaviors and hooks related to the matching controller here.
2
- // All this logic will automatically be available in application.js.
@@ -1,406 +0,0 @@
1
- /*! normalize.css v2.1.3 | MIT License | git.io/normalize */
2
-
3
- /* ==========================================================================
4
- HTML5 display definitions
5
- ========================================================================== */
6
-
7
- /**
8
- * Correct `block` display not defined in IE 8/9.
9
- */
10
-
11
- article,
12
- aside,
13
- details,
14
- figcaption,
15
- figure,
16
- footer,
17
- header,
18
- hgroup,
19
- main,
20
- nav,
21
- section,
22
- summary {
23
- display: block;
24
- }
25
-
26
- /**
27
- * Correct `inline-block` display not defined in IE 8/9.
28
- */
29
-
30
- audio,
31
- canvas,
32
- video {
33
- display: inline-block;
34
- }
35
-
36
- /**
37
- * Prevent modern browsers from displaying `audio` without controls.
38
- * Remove excess height in iOS 5 devices.
39
- */
40
-
41
- audio:not([controls]) {
42
- display: none;
43
- height: 0;
44
- }
45
-
46
- /**
47
- * Address `[hidden]` styling not present in IE 8/9.
48
- * Hide the `template` element in IE, Safari, and Firefox < 22.
49
- */
50
-
51
- [hidden],
52
- template {
53
- display: none;
54
- }
55
-
56
- /* ==========================================================================
57
- Base
58
- ========================================================================== */
59
-
60
- /**
61
- * 1. Set default font family to sans-serif.
62
- * 2. Prevent iOS text size adjust after orientation change, without disabling
63
- * user zoom.
64
- */
65
-
66
- html {
67
- font-family: sans-serif; /* 1 */
68
- -ms-text-size-adjust: 100%; /* 2 */
69
- -webkit-text-size-adjust: 100%; /* 2 */
70
- }
71
-
72
- /**
73
- * Remove default margin.
74
- */
75
-
76
- body {
77
- margin: 0;
78
- }
79
-
80
- /* ==========================================================================
81
- Links
82
- ========================================================================== */
83
-
84
- /**
85
- * Remove the gray background color from active links in IE 10.
86
- */
87
-
88
- a {
89
- background: transparent;
90
- }
91
-
92
- /**
93
- * Address `outline` inconsistency between Chrome and other browsers.
94
- */
95
-
96
- a:focus {
97
- outline: thin dotted;
98
- }
99
-
100
- /**
101
- * Improve readability when focused and also mouse hovered in all browsers.
102
- */
103
-
104
- a:active,
105
- a:hover {
106
- outline: 0;
107
- }
108
-
109
- /* ==========================================================================
110
- Typography
111
- ========================================================================== */
112
-
113
- /**
114
- * Address variable `h1` font-size and margin within `section` and `article`
115
- * contexts in Firefox 4+, Safari 5, and Chrome.
116
- */
117
-
118
- h1 {
119
- font-size: 2em;
120
- margin: 0.67em 0;
121
- }
122
-
123
- /**
124
- * Address styling not present in IE 8/9, Safari 5, and Chrome.
125
- */
126
-
127
- abbr[title] {
128
- border-bottom: 1px dotted;
129
- }
130
-
131
- /**
132
- * Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome.
133
- */
134
-
135
- b,
136
- strong {
137
- font-weight: bold;
138
- }
139
-
140
- /**
141
- * Address styling not present in Safari 5 and Chrome.
142
- */
143
-
144
- dfn {
145
- font-style: italic;
146
- }
147
-
148
- /**
149
- * Address differences between Firefox and other browsers.
150
- */
151
-
152
- hr {
153
- -moz-box-sizing: content-box;
154
- box-sizing: content-box;
155
- height: 0;
156
- }
157
-
158
- /**
159
- * Address styling not present in IE 8/9.
160
- */
161
-
162
- mark {
163
- background: #ff0;
164
- color: #000;
165
- }
166
-
167
- /**
168
- * Correct font family set oddly in Safari 5 and Chrome.
169
- */
170
-
171
- code,
172
- kbd,
173
- pre,
174
- samp {
175
- font-family: monospace, serif;
176
- font-size: 1em;
177
- }
178
-
179
- /**
180
- * Improve readability of pre-formatted text in all browsers.
181
- */
182
-
183
- pre {
184
- white-space: pre-wrap;
185
- }
186
-
187
- /**
188
- * Set consistent quote types.
189
- */
190
-
191
- q {
192
- quotes: "\201C" "\201D" "\2018" "\2019";
193
- }
194
-
195
- /**
196
- * Address inconsistent and variable font size in all browsers.
197
- */
198
-
199
- small {
200
- font-size: 80%;
201
- }
202
-
203
- /**
204
- * Prevent `sub` and `sup` affecting `line-height` in all browsers.
205
- */
206
-
207
- sub,
208
- sup {
209
- font-size: 75%;
210
- line-height: 0;
211
- position: relative;
212
- vertical-align: baseline;
213
- }
214
-
215
- sup {
216
- top: -0.5em;
217
- }
218
-
219
- sub {
220
- bottom: -0.25em;
221
- }
222
-
223
- /* ==========================================================================
224
- Embedded content
225
- ========================================================================== */
226
-
227
- /**
228
- * Remove border when inside `a` element in IE 8/9.
229
- */
230
-
231
- img {
232
- border: 0;
233
- }
234
-
235
- /**
236
- * Correct overflow displayed oddly in IE 9.
237
- */
238
-
239
- svg:not(:root) {
240
- overflow: hidden;
241
- }
242
-
243
- /* ==========================================================================
244
- Figures
245
- ========================================================================== */
246
-
247
- /**
248
- * Address margin not present in IE 8/9 and Safari 5.
249
- */
250
-
251
- figure {
252
- margin: 0;
253
- }
254
-
255
- /* ==========================================================================
256
- Forms
257
- ========================================================================== */
258
-
259
- /**
260
- * Define consistent border, margin, and padding.
261
- */
262
-
263
- fieldset {
264
- border: 1px solid #c0c0c0;
265
- margin: 0 2px;
266
- padding: 0.35em 0.625em 0.75em;
267
- }
268
-
269
- /**
270
- * 1. Correct `color` not being inherited in IE 8/9.
271
- * 2. Remove padding so people aren't caught out if they zero out fieldsets.
272
- */
273
-
274
- legend {
275
- border: 0; /* 1 */
276
- padding: 0; /* 2 */
277
- }
278
-
279
- /**
280
- * 1. Correct font family not being inherited in all browsers.
281
- * 2. Correct font size not being inherited in all browsers.
282
- * 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome.
283
- */
284
-
285
- button,
286
- input,
287
- select,
288
- textarea {
289
- font-family: inherit; /* 1 */
290
- font-size: 100%; /* 2 */
291
- margin: 0; /* 3 */
292
- }
293
-
294
- /**
295
- * Address Firefox 4+ setting `line-height` on `input` using `!important` in
296
- * the UA stylesheet.
297
- */
298
-
299
- button,
300
- input {
301
- line-height: normal;
302
- }
303
-
304
- /**
305
- * Address inconsistent `text-transform` inheritance for `button` and `select`.
306
- * All other form control elements do not inherit `text-transform` values.
307
- * Correct `button` style inheritance in Chrome, Safari 5+, and IE 8+.
308
- * Correct `select` style inheritance in Firefox 4+ and Opera.
309
- */
310
-
311
- button,
312
- select {
313
- text-transform: none;
314
- }
315
-
316
- /**
317
- * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
318
- * and `video` controls.
319
- * 2. Correct inability to style clickable `input` types in iOS.
320
- * 3. Improve usability and consistency of cursor style between image-type
321
- * `input` and others.
322
- */
323
-
324
- button,
325
- html input[type="button"], /* 1 */
326
- input[type="reset"],
327
- input[type="submit"] {
328
- -webkit-appearance: button; /* 2 */
329
- cursor: pointer; /* 3 */
330
- }
331
-
332
- /**
333
- * Re-set default cursor for disabled elements.
334
- */
335
-
336
- button[disabled],
337
- html input[disabled] {
338
- cursor: default;
339
- }
340
-
341
- /**
342
- * 1. Address box sizing set to `content-box` in IE 8/9/10.
343
- * 2. Remove excess padding in IE 8/9/10.
344
- */
345
-
346
- input[type="checkbox"],
347
- input[type="radio"] {
348
- box-sizing: border-box; /* 1 */
349
- padding: 0; /* 2 */
350
- }
351
-
352
- /**
353
- * 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome.
354
- * 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome
355
- * (include `-moz` to future-proof).
356
- */
357
-
358
- input[type="search"] {
359
- -webkit-appearance: textfield; /* 1 */
360
- -moz-box-sizing: content-box;
361
- -webkit-box-sizing: content-box; /* 2 */
362
- box-sizing: content-box;
363
- }
364
-
365
- /**
366
- * Remove inner padding and search cancel button in Safari 5 and Chrome
367
- * on OS X.
368
- */
369
-
370
- input[type="search"]::-webkit-search-cancel-button,
371
- input[type="search"]::-webkit-search-decoration {
372
- -webkit-appearance: none;
373
- }
374
-
375
- /**
376
- * Remove inner padding and border in Firefox 4+.
377
- */
378
-
379
- button::-moz-focus-inner,
380
- input::-moz-focus-inner {
381
- border: 0;
382
- padding: 0;
383
- }
384
-
385
- /**
386
- * 1. Remove default vertical scrollbar in IE 8/9.
387
- * 2. Improve readability and alignment in all browsers.
388
- */
389
-
390
- textarea {
391
- overflow: auto; /* 1 */
392
- vertical-align: top; /* 2 */
393
- }
394
-
395
- /* ==========================================================================
396
- Tables
397
- ========================================================================== */
398
-
399
- /**
400
- * Remove most spacing between table cells.
401
- */
402
-
403
- table {
404
- border-collapse: collapse;
405
- border-spacing: 0;
406
- }
@@ -1,4 +0,0 @@
1
- /*
2
- Place all the styles related to the matching controller here.
3
- They will automatically be included in application.css.
4
- */
@@ -1,56 +0,0 @@
1
- body {
2
- background-color: #fff;
3
- color: #333;
4
- font-family: verdana, arial, helvetica, sans-serif;
5
- font-size: 13px;
6
- line-height: 18px; }
7
-
8
- p, ol, ul, td {
9
- font-family: verdana, arial, helvetica, sans-serif;
10
- font-size: 13px;
11
- line-height: 18px; }
12
-
13
- pre {
14
- background-color: #eee;
15
- padding: 10px;
16
- font-size: 11px; }
17
-
18
- a {
19
- color: #000;
20
- &:visited {
21
- color: #666; }
22
- &:hover {
23
- color: #fff;
24
- background-color: #000; } }
25
-
26
- div {
27
- &.field, &.actions {
28
- margin-bottom: 10px; } }
29
-
30
- #notice {
31
- color: green; }
32
-
33
- .field_with_errors {
34
- padding: 2px;
35
- background-color: red;
36
- display: table; }
37
-
38
- #error_explanation {
39
- width: 450px;
40
- border: 2px solid red;
41
- padding: 7px;
42
- padding-bottom: 0;
43
- margin-bottom: 20px;
44
- background-color: #f0f0f0;
45
- h2 {
46
- text-align: left;
47
- font-weight: bold;
48
- padding: 5px 5px 5px 15px;
49
- font-size: 12px;
50
- margin: -7px;
51
- margin-bottom: 0px;
52
- background-color: #c00;
53
- color: #fff; }
54
- ul li {
55
- font-size: 12px;
56
- list-style: square; } }