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
- module ProfilesHelper
2
- end
@@ -1,26 +0,0 @@
1
- <!DOCTYPE html>
2
- <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= @locale.to_s -%>" lang="<%= @locale.to_s -%>">
3
- <head>
4
- <meta charset="UTF-8" />
5
- <title><%= title(controller.controller_name) %></title>
6
- <%= render 'page/include' %>
7
- <%- if controller.action_name == 'index' -%>
8
- <%= auto_discovery_link_tag(:rss, url_for(params.merge(:format => 'rss', :page => nil, :commit => nil, :only_path => true)), :title => (t('agent.library_group_agent', :library_group_name => @library_group.display_name.localize) + " (RSS)")) %>
9
- <%= auto_discovery_link_tag(:atom, url_for(params.merge(:format => 'atom', :page => nil, :commit => nil, :only_path => true)), :title => (t('agent.library_group_agent', :library_group_name => @library_group.display_name.localize) + " (Atom)")) %>
10
- <%- end -%>
11
- </head>
12
- <body>
13
-
14
- <%= render 'page/header' %>
15
- <%= render 'page/menu' %>
16
-
17
- <div id="content">
18
-
19
- <%= yield %>
20
-
21
- </div>
22
-
23
- <%= render 'page/footer' %>
24
-
25
- </body>
26
- </html>
@@ -1,18 +0,0 @@
1
- <!DOCTYPE html>
2
- <html>
3
- <head>
4
- <title><%= title(controller.controller_name) %></title>
5
- <%= render 'page/mobile' %>
6
- </head>
7
- <body>
8
-
9
- <div data-role="page">
10
-
11
- <%= yield %>
12
-
13
- <%= render 'page/footer' %>
14
-
15
- </div>
16
-
17
- </body>
18
- </html>
@@ -1,53 +0,0 @@
1
- <%= form_for(@profile) do |f| %>
2
- <% if @profile.errors.any? %>
3
- <div id="error_explanation">
4
- <h2><%= pluralize(@profile.errors.count, "error") %> prohibited this profile from being saved:</h2>
5
-
6
- <ul>
7
- <% @profile.errors.full_messages.each do |msg| %>
8
- <li><%= msg %></li>
9
- <% end %>
10
- </ul>
11
- </div>
12
- <% end %>
13
-
14
- <div class="field">
15
- <%= f.label :user_id %><br>
16
- <%= f.number_field :user_id %>
17
- </div>
18
- <div class="field">
19
- <%= f.label :user_group_id %><br>
20
- <%= f.select :user_group_id, @user_groups.map{|u| [u.display_name.localize, u.id]} %>
21
- </div>
22
- <div class="field">
23
- <%= f.label :library_id %><br>
24
- <%= f.select :library_id, @libraries.map{|l| [l.display_name.localize, l.id]} %>
25
- </div>
26
- <div class="field">
27
- <%= f.label :locale %><br>
28
- <%= f.text_field :locale %>
29
- </div>
30
- <div class="field">
31
- <%= f.label :user_number %><br>
32
- <%= f.text_field :user_number %>
33
- </div>
34
- <div class="field">
35
- <%= f.label :full_name %><br>
36
- <%= f.text_area :full_name %>
37
- </div>
38
- <div class="field">
39
- <%= f.label :note %><br>
40
- <%= f.text_area :note %>
41
- </div>
42
- <div class="field">
43
- <%= f.label :keyword_list %><br>
44
- <%= f.text_area :keyword_list %>
45
- </div>
46
- <div class="field">
47
- <%= f.label :required_role_id %><br>
48
- <%= f.number_field :required_role_id %>
49
- </div>
50
- <div class="actions">
51
- <%= f.submit %>
52
- </div>
53
- <% end %>
@@ -1,6 +0,0 @@
1
- <h1>Editing profile</h1>
2
-
3
- <%= render 'form' %>
4
-
5
- <%= link_to 'Show', @profile %> |
6
- <%= link_to 'Back', profiles_path %>
@@ -1,43 +0,0 @@
1
- <h1>Listing profiles</h1>
2
-
3
- <table>
4
- <thead>
5
- <tr>
6
- <th>User</th>
7
- <th>User group</th>
8
- <th>Library</th>
9
- <th>Locale</th>
10
- <th>User number</th>
11
- <th>Full name</th>
12
- <th>Note</th>
13
- <th>Keyword list</th>
14
- <th>Required role</th>
15
- <th>State</th>
16
- <th colspan="3"></th>
17
- </tr>
18
- </thead>
19
-
20
- <tbody>
21
- <% @profiles.each do |profile| %>
22
- <tr>
23
- <td><%= profile.user_id %></td>
24
- <td><%= profile.user_group_id %></td>
25
- <td><%= profile.library_id %></td>
26
- <td><%= profile.locale %></td>
27
- <td><%= profile.user_number %></td>
28
- <td><%= profile.full_name %></td>
29
- <td><%= profile.note %></td>
30
- <td><%= profile.keyword_list %></td>
31
- <td><%= profile.required_role_id %></td>
32
- <td><%= profile.state %></td>
33
- <td><%= link_to 'Show', profile %></td>
34
- <td><%= link_to 'Edit', edit_profile_path(profile) %></td>
35
- <td><%= link_to 'Destroy', profile, method: :delete, data: { confirm: 'Are you sure?' } %></td>
36
- </tr>
37
- <% end %>
38
- </tbody>
39
- </table>
40
-
41
- <br>
42
-
43
- <%= link_to 'New Profile', new_profile_path %>
@@ -1,14 +0,0 @@
1
- <div id="content_detail" class="ui-corner-all ui-widget-content">
2
- <h1 class="title"><%= t('page.new', :model => t('activerecord.models.profile')) -%></h1>
3
- <div id="content_list">
4
-
5
- <%= render 'form' %>
6
-
7
- </div>
8
- </div>
9
-
10
- <div id="submenu" class="ui-corner-all ui-widget-content">
11
- <ul>
12
- <li><%= link_to 'Back', profiles_path %></li>
13
- </ul>
14
- </div>
@@ -1,54 +0,0 @@
1
- <p id="notice"><%= notice %></p>
2
-
3
- <p>
4
- <strong>User:</strong>
5
- <%= @profile.user_id %>
6
- </p>
7
-
8
- <p>
9
- <strong>User group:</strong>
10
- <%= @profile.user_group_id %>
11
- </p>
12
-
13
- <p>
14
- <strong>Library:</strong>
15
- <%= @profile.library_id %>
16
- </p>
17
-
18
- <p>
19
- <strong>Locale:</strong>
20
- <%= @profile.locale %>
21
- </p>
22
-
23
- <p>
24
- <strong>User number:</strong>
25
- <%= @profile.user_number %>
26
- </p>
27
-
28
- <p>
29
- <strong>Full name:</strong>
30
- <%= @profile.full_name %>
31
- </p>
32
-
33
- <p>
34
- <strong>Note:</strong>
35
- <%= @profile.note %>
36
- </p>
37
-
38
- <p>
39
- <strong>Keyword list:</strong>
40
- <%= @profile.keyword_list %>
41
- </p>
42
-
43
- <p>
44
- <strong>Required role:</strong>
45
- <%= @profile.required_role_id %>
46
- </p>
47
-
48
- <p>
49
- <strong>State:</strong>
50
- <%= @profile.state %>
51
- </p>
52
-
53
- <%= link_to 'Edit', edit_profile_path(@profile) %> |
54
- <%= link_to 'Back', profiles_path %>
@@ -1,4 +0,0 @@
1
- username email role user_group expired_at note
2
- user001 user001@example.jp Administrator test
3
- user002 User 2013-12-01
4
- user003 user003@example.jp Librarian テストユーザ