enju_seed 0.2.3 → 0.3.0.beta.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (209) hide show
  1. checksums.yaml +4 -4
  2. data/Rakefile +17 -8
  3. data/app/assets/config/enju_seed_manifest.js +0 -0
  4. data/app/controllers/my_accounts_controller.rb +14 -13
  5. data/app/controllers/profiles_controller.rb +30 -29
  6. data/app/controllers/roles_controller.rb +2 -1
  7. data/app/models/concerns/enju_seed/enju_user.rb +22 -26
  8. data/app/models/concerns/master_model.rb +5 -6
  9. data/app/models/identity.rb +1 -1
  10. data/app/models/profile.rb +3 -3
  11. data/app/models/role.rb +2 -1
  12. data/app/models/user_has_role.rb +2 -2
  13. data/app/views/my_accounts/_edit_credential.html.slim +63 -0
  14. data/app/views/my_accounts/_form.html.slim +20 -0
  15. data/app/views/my_accounts/_show.html.slim +1 -0
  16. data/app/views/my_accounts/edit.html.slim +30 -0
  17. data/app/views/my_accounts/show.html+phone.slim +1 -0
  18. data/app/views/my_accounts/show.html.slim +57 -0
  19. data/app/views/profiles/_edit_credential.html.slim +67 -0
  20. data/app/views/profiles/_edit_profile.html.slim +40 -0
  21. data/app/views/profiles/_form.html.slim +12 -0
  22. data/app/views/profiles/_show.html.slim +1 -0
  23. data/app/views/profiles/edit.html.slim +30 -0
  24. data/app/views/profiles/index.html.slim +61 -0
  25. data/app/views/profiles/new.html.slim +65 -0
  26. data/app/views/profiles/show.html+phone.slim +1 -0
  27. data/app/views/profiles/show.html.slim +67 -0
  28. data/app/views/roles/_form.html.slim +16 -0
  29. data/app/views/roles/edit.html.slim +15 -0
  30. data/app/views/roles/index.html.slim +27 -0
  31. data/app/views/roles/new.html.slim +13 -0
  32. data/app/views/roles/show.html.slim +46 -0
  33. data/db/migrate/041_create_roles.rb +3 -3
  34. data/db/migrate/20130221154434_add_additional_attributes_to_user.rb +3 -3
  35. data/lib/enju_seed.rb +2 -3
  36. data/lib/enju_seed/engine.rb +1 -2
  37. data/lib/enju_seed/localized_name.rb +1 -3
  38. data/lib/enju_seed/version.rb +1 -1
  39. data/spec/controllers/my_accounts_controller_spec.rb +79 -79
  40. data/spec/controllers/profiles_controller_spec.rb +210 -210
  41. data/spec/controllers/roles_controller_spec.rb +47 -47
  42. data/spec/dummy/app/helpers/application_helper.rb +1 -1
  43. data/spec/dummy/app/models/user.rb +2 -2
  44. data/spec/dummy/bin/setup +8 -8
  45. data/spec/dummy/config/application.rb +2 -18
  46. data/spec/dummy/config/database.yml +70 -10
  47. data/spec/dummy/config/environment.rb +1 -1
  48. data/spec/dummy/config/environments/development.rb +24 -11
  49. data/spec/dummy/config/environments/production.rb +24 -17
  50. data/spec/dummy/config/environments/test.rb +6 -6
  51. data/spec/dummy/config/initializers/assets.rb +1 -1
  52. data/spec/dummy/config/initializers/friendly_id.rb +75 -75
  53. data/spec/dummy/db/migrate/001_create_agents.rb +6 -6
  54. data/spec/dummy/db/migrate/002_devise_create_users.rb +5 -6
  55. data/spec/dummy/db/migrate/005_create_manifestations.rb +12 -12
  56. data/spec/dummy/db/migrate/006_create_items.rb +5 -5
  57. data/spec/dummy/db/migrate/012_create_owns.rb +2 -2
  58. data/spec/dummy/db/migrate/015_create_creates.rb +2 -2
  59. data/spec/dummy/db/migrate/032_create_checkins.rb +1 -1
  60. data/spec/dummy/db/migrate/033_create_checkouts.rb +4 -4
  61. data/spec/dummy/db/migrate/035_create_reserves.rb +5 -5
  62. data/spec/dummy/db/migrate/047_create_produces.rb +2 -2
  63. data/spec/dummy/db/migrate/059_create_libraries.rb +6 -4
  64. data/spec/dummy/db/migrate/069_create_shelves.rb +2 -1
  65. data/spec/dummy/db/migrate/073_create_carrier_types.rb +1 -1
  66. data/spec/dummy/db/migrate/077_create_user_groups.rb +1 -1
  67. data/spec/dummy/db/migrate/080_create_library_groups.rb +2 -1
  68. data/spec/dummy/db/migrate/112_create_frequencies.rb +1 -1
  69. data/spec/dummy/db/migrate/117_create_form_of_works.rb +1 -1
  70. data/spec/dummy/db/migrate/120_create_baskets.rb +2 -1
  71. data/spec/dummy/db/migrate/121_create_checked_items.rb +3 -3
  72. data/spec/dummy/db/migrate/124_create_bookstores.rb +1 -1
  73. data/spec/dummy/db/migrate/125_create_donates.rb +2 -2
  74. data/spec/dummy/db/migrate/127_create_use_restrictions.rb +1 -1
  75. data/spec/dummy/db/migrate/129_create_item_has_use_restrictions.rb +2 -2
  76. data/spec/dummy/db/migrate/130_create_request_status_types.rb +1 -1
  77. data/spec/dummy/db/migrate/131_create_request_types.rb +1 -1
  78. data/spec/dummy/db/migrate/132_create_circulation_statuses.rb +1 -1
  79. data/spec/dummy/db/migrate/133_create_agent_merges.rb +1 -1
  80. data/spec/dummy/db/migrate/149_create_message_templates.rb +5 -5
  81. data/spec/dummy/db/migrate/154_create_messages.rb +2 -2
  82. data/spec/dummy/db/migrate/20080830154109_create_realizes.rb +2 -2
  83. data/spec/dummy/db/migrate/20080830172106_create_exemplifies.rb +13 -0
  84. data/spec/dummy/db/migrate/20080905191442_create_agent_types.rb +1 -1
  85. data/spec/dummy/db/migrate/20081006090811_create_subscriptions.rb +5 -2
  86. data/spec/dummy/db/migrate/20081006093246_create_subscribes.rb +2 -1
  87. data/spec/dummy/db/migrate/20081023092436_create_search_engines.rb +5 -5
  88. data/spec/dummy/db/migrate/20081025083323_create_countries.rb +8 -9
  89. data/spec/dummy/db/migrate/20081025083905_create_languages.rb +5 -6
  90. data/spec/dummy/db/migrate/20081027150907_create_picture_files.rb +1 -1
  91. data/spec/dummy/db/migrate/20081030023412_create_checkout_types.rb +1 -1
  92. data/spec/dummy/db/migrate/20081030023518_create_user_group_has_checkout_types.rb +8 -8
  93. data/spec/dummy/db/migrate/20081030023615_create_carrier_type_has_checkout_types.rb +3 -3
  94. data/spec/dummy/db/migrate/20081212075554_create_checkout_stat_has_manifestations.rb +4 -4
  95. data/spec/dummy/db/migrate/20081215094955_create_checkout_stat_has_users.rb +3 -3
  96. data/spec/dummy/db/migrate/20081216190517_create_reserve_stat_has_manifestations.rb +3 -3
  97. data/spec/dummy/db/migrate/20081220034117_create_reserve_stat_has_users.rb +2 -2
  98. data/spec/dummy/db/migrate/20090720091106_create_medium_of_performances.rb +1 -1
  99. data/spec/dummy/db/migrate/20090720091429_create_content_types.rb +1 -1
  100. data/spec/dummy/db/migrate/20090812151902_create_agent_relationship_types.rb +1 -1
  101. data/spec/dummy/db/migrate/20090831220301_create_lending_policies.rb +6 -6
  102. data/spec/dummy/db/migrate/20091025080447_create_licenses.rb +1 -1
  103. data/spec/dummy/db/migrate/20100607044753_create_manifestation_relationship_types.rb +1 -1
  104. data/spec/dummy/db/migrate/20110222073537_add_url_to_library_group.rb +1 -1
  105. data/spec/dummy/db/migrate/20110318183304_add_valid_period_for_new_user_to_user_group.rb +1 -1
  106. data/spec/dummy/db/migrate/20110627035057_create_series_statement_merges.rb +3 -3
  107. data/spec/dummy/db/migrate/20110627122938_add_number_of_day_to_notify_overdue_to_user_group.rb +3 -3
  108. data/spec/dummy/db/migrate/20120125050502_add_depth_to_message.rb +0 -1
  109. data/spec/dummy/db/migrate/20120125152919_add_title_subseries_transcription_to_series_statement.rb +0 -1
  110. data/spec/dummy/db/migrate/20120129020544_add_budget_type_id_to_item.rb +0 -1
  111. data/spec/dummy/db/migrate/20120319120638_add_content_type_id_to_manifestation.rb +1 -2
  112. data/spec/dummy/db/migrate/20120319173203_create_accepts.rb +6 -3
  113. data/spec/dummy/db/migrate/20120510140958_add_closed_to_shelf.rb +1 -1
  114. data/spec/dummy/db/migrate/20130416054135_add_circulation_status_id_to_item.rb +2 -2
  115. data/spec/dummy/db/migrate/20130506175834_create_identifiers.rb +2 -2
  116. data/spec/dummy/db/migrate/20130519065638_add_lock_version_to_reserve.rb +1 -1
  117. data/spec/dummy/db/migrate/20130519065837_add_lock_version_to_checkin.rb +1 -1
  118. data/spec/dummy/db/migrate/20140518050147_create_reserve_transitions.rb +2 -2
  119. data/spec/dummy/db/migrate/20140518111006_create_message_transitions.rb +2 -2
  120. data/spec/dummy/db/migrate/20140518135713_create_message_request_transitions.rb +3 -3
  121. data/spec/dummy/db/migrate/20140519170214_create_resource_import_file_transitions.rb +4 -4
  122. data/spec/dummy/db/migrate/20140519171220_create_import_request_transitions.rb +3 -3
  123. data/spec/dummy/db/migrate/20140524020735_create_agent_import_file_transitions.rb +3 -3
  124. data/spec/dummy/db/migrate/20140524074813_create_user_import_file_transitions.rb +3 -3
  125. data/spec/dummy/db/migrate/20140528045518_create_user_checkout_stat_transitions.rb +3 -3
  126. data/spec/dummy/db/migrate/20140528045539_create_user_reserve_stat_transitions.rb +3 -3
  127. data/spec/dummy/db/migrate/20140528045600_create_manifestation_checkout_stat_transitions.rb +4 -4
  128. data/spec/dummy/db/migrate/20140528045617_create_manifestation_reserve_stat_transitions.rb +4 -4
  129. data/spec/dummy/db/migrate/20140614065404_create_resource_export_files.rb +0 -1
  130. data/spec/dummy/db/migrate/20140614141500_create_resource_export_file_transitions.rb +4 -4
  131. data/spec/dummy/db/migrate/20140709113413_create_user_export_files.rb +0 -1
  132. data/spec/dummy/db/migrate/20140709113905_create_user_export_file_transitions.rb +4 -4
  133. data/spec/dummy/db/migrate/20140810091231_add_checkout_icalendar_token_to_profile.rb +1 -1
  134. data/spec/dummy/db/migrate/20140810091417_add_save_checkout_history_to_profile.rb +1 -1
  135. data/spec/dummy/db/migrate/20140821151023_create_colors.rb +3 -1
  136. data/spec/dummy/db/migrate/20141029131633_create_periodicals.rb +11 -0
  137. data/spec/dummy/db/migrate/20150124152756_add_foreign_key_to_shelves_referencing_libraries.rb +6 -0
  138. data/spec/dummy/db/migrate/20150221063719_add_settings_to_library_group.rb +1 -1
  139. data/spec/dummy/db/migrate/20150302110310_add_attachment_id_to_manifestation.rb +7 -0
  140. data/spec/dummy/db/migrate/20150304183215_add_picture_id_to_picture_file.rb +7 -0
  141. data/spec/dummy/db/migrate/20150305025906_add_resource_import_id_to_resource_import_file.rb +7 -0
  142. data/spec/dummy/db/migrate/20150305030046_add_resource_export_id_to_resource_export_file.rb +8 -0
  143. data/spec/dummy/db/migrate/20150305031709_add_agent_import_id_to_agent_import_file.rb +7 -0
  144. data/spec/dummy/db/migrate/20150305105231_add_attachment_fingerprint_to_manifestation.rb +5 -0
  145. data/spec/dummy/db/migrate/20150420145354_add_attachment_to_carrier_type.rb +8 -0
  146. data/spec/dummy/db/migrate/20150420145420_add_attachment_to_content_type.rb +8 -0
  147. data/spec/dummy/db/migrate/20150924115059_create_withdraws.rb +5 -3
  148. data/spec/dummy/db/migrate/20151213070943_add_translation_table_to_library_group.rb +2 -4
  149. data/spec/dummy/db/migrate/20151213072705_add_footer_banner_to_library_group.rb +2 -19
  150. data/spec/dummy/db/migrate/20151216123621_create_doi_records.rb +12 -0
  151. data/spec/dummy/db/migrate/20160319144230_create_issn_records.rb +12 -0
  152. data/spec/dummy/db/migrate/20160506144040_create_isbn_records.rb +12 -0
  153. data/spec/dummy/db/migrate/20160513000929_create_agent_names.rb +18 -0
  154. data/spec/dummy/db/migrate/20160801080612_add_most_recent_to_import_request_transitions.rb +9 -0
  155. data/spec/dummy/db/migrate/20160801080619_add_most_recent_to_resource_import_file_transitions.rb +9 -0
  156. data/spec/dummy/db/migrate/20160801080637_add_most_recent_to_resource_export_file_transitions.rb +9 -0
  157. data/spec/dummy/db/migrate/20160801080643_add_most_recent_to_agent_import_file_transitions.rb +9 -0
  158. data/spec/dummy/db/migrate/20161111175127_add_attachment_data_to_manifestation.rb +5 -0
  159. data/spec/dummy/db/migrate/20161111193255_add_attachment_data_to_carrier_type.rb +5 -0
  160. data/spec/dummy/db/migrate/20161111193346_add_attachment_data_to_content_type.rb +5 -0
  161. data/spec/dummy/db/migrate/20161112122706_add_attachment_data_to_resource_import_file.rb +5 -0
  162. data/spec/dummy/db/migrate/20161112122750_add_attachment_data_to_resource_export_file.rb +5 -0
  163. data/spec/dummy/db/migrate/20161112122814_add_attachment_data_to_agent_import_file.rb +5 -0
  164. data/spec/dummy/db/schema.rb +1418 -1402
  165. data/spec/factories/profile.rb +10 -10
  166. data/spec/factories/user.rb +10 -10
  167. data/spec/factories/user_group.rb +2 -2
  168. data/spec/fixtures/library_groups.yml +1 -0
  169. data/spec/models/profile_spec.rb +20 -19
  170. data/spec/models/role_spec.rb +7 -7
  171. data/spec/models/user_has_role_spec.rb +1 -2
  172. data/spec/models/user_spec.rb +25 -26
  173. data/spec/rails_helper.rb +7 -6
  174. data/spec/requests/profiles_spec.rb +3 -3
  175. data/spec/routing/profiles_routing_spec.rb +16 -18
  176. data/spec/routing/roles_routing_spec.rb +16 -18
  177. data/spec/routing/users_spec.rb +6 -7
  178. data/spec/spec_helper.rb +47 -49
  179. data/spec/support/controller_macros.rb +9 -9
  180. data/spec/views/my_accounts/show.html.erb_spec.rb +6 -6
  181. data/spec/views/profiles/edit.html.erb_spec.rb +7 -7
  182. data/spec/views/profiles/index.html.erb_spec.rb +3 -3
  183. data/spec/views/profiles/new.html.erb_spec.rb +5 -6
  184. data/spec/views/profiles/show.html.erb_spec.rb +3 -3
  185. metadata +323 -323
  186. data/app/views/my_accounts/_edit_credential.html.erb +0 -99
  187. data/app/views/my_accounts/_form.html.erb +0 -24
  188. data/app/views/my_accounts/_show.html.erb +0 -1
  189. data/app/views/my_accounts/edit.html.erb +0 -32
  190. data/app/views/my_accounts/show.html.erb +0 -49
  191. data/app/views/profiles/_edit_profile.html.erb +0 -42
  192. data/app/views/profiles/_form.html.erb +0 -15
  193. data/app/views/profiles/_show.html.erb +0 -1
  194. data/app/views/profiles/edit.html.erb +0 -33
  195. data/app/views/profiles/index.html.erb +0 -70
  196. data/app/views/profiles/new.html.erb +0 -88
  197. data/app/views/profiles/show.html+phone.erb +0 -1
  198. data/app/views/profiles/show.html.erb +0 -67
  199. data/app/views/roles/_form.html.erb +0 -19
  200. data/app/views/roles/edit.html.erb +0 -13
  201. data/app/views/roles/index.html.erb +0 -32
  202. data/app/views/roles/new.html.erb +0 -12
  203. data/app/views/roles/show.html.erb +0 -46
  204. data/lib/generators/enju_seed/update/update_generator.rb +0 -9
  205. data/spec/dummy/db/migrate/20170305064014_add_csv_charset_conversion_to_library_group.rb +0 -5
  206. data/spec/dummy/db/migrate/20171014084528_add_header_logo_to_library_group.rb +0 -5
  207. data/spec/dummy/db/migrate/20171126133835_rename_login_banner_to_old_login_banner.rb +0 -5
  208. data/spec/dummy/db/migrate/20171126135238_add_foreign_key_to_library_group_id_on_library.rb +0 -5
  209. data/spec/dummy/db/migrate/20180102162311_add_header_logo_meta_to_library_group.rb +0 -5
@@ -0,0 +1 @@
1
+ = render 'page/index'
@@ -0,0 +1,67 @@
1
+ .row
2
+ .col-md-3
3
+ .panel.panel-default
4
+ .panel-heading
5
+ - if defined?(EnjuCirculation) and @profile.user
6
+ = render 'submenu_checkout'
7
+ ul
8
+ - if flash[:query]
9
+ li
10
+ = link_to t('page.back'), profiles_path(query: flash[:query])
11
+ - else
12
+ li
13
+ = back_to_index
14
+ - if user_signed_in?
15
+ - if policy(@profile).update?
16
+ li
17
+ = link_to t('page.edit'), edit_profile_path(@profile)
18
+ - if defined?(EnjuMessage)
19
+ li
20
+ = link_to t('message.send'), new_message_path(recipient: @profile.user.username)
21
+ - if policy(Profile).create?
22
+ li
23
+ = link_to t('page.new', model: t('activerecord.models.profile')), new_profile_path
24
+ - if policy(@profile).destroy?
25
+ li
26
+ = link_to t('page.destroy'), @profile, data: {confirm: t('page.are_you_sure')}, method: :delete
27
+ - if defined?(EnjuCirculation)
28
+ li
29
+ = link_to t('activerecord.models.checkout'), checkouts_path(user_id: @profile.user.username)
30
+ li
31
+ = link_to t('activerecord.models.reserve'), reserves_path(user_id: @profile.user.username)
32
+ - if defined?(EnjuQuestion)
33
+ li
34
+ = link_to t('activerecord.models.question'), questions_path(user_id: @profile.user.username)
35
+ - if defined?(EnjuBookmark)
36
+ li
37
+ = link_to t('activerecord.models.bookmark'), bookmarks_path(user_id: @profile.user.username)
38
+ - if defined?(EnjuPurchaseRequest)
39
+ li
40
+ = link_to t('activerecord.models.purchase_request'), purchase_requests_path(user_id: @profile.user.username)
41
+ .col-md-9
42
+ .panel.panel-default
43
+ .panel-heading
44
+ h1.title
45
+ = t('page.showing', model: t('activerecord.models.user'))
46
+ .panel-body
47
+ p#notice
48
+ = notice
49
+ h2.resource_title
50
+ | [U]
51
+ = @profile.user.username
52
+ - if @profile.full_name?
53
+ | (
54
+ = @profile.full_name
55
+ | )
56
+ p
57
+ = t('activerecord.attributes.profile.user_number')
58
+ | :
59
+ = @profile.user_number
60
+ - if flash[:temporary_password]
61
+ p
62
+ = t('user.your_temporary_password_is')
63
+ | :
64
+ p[style="font-size: 200%"]
65
+ = flash[:temporary_password]
66
+ - if defined?(EnjuCirculation) and @profile.user
67
+ = render 'checkout_list', profile: @profile
@@ -0,0 +1,16 @@
1
+ = form_for(@role) do |f|
2
+ = f.error_messages
3
+ .form-group
4
+ = f.label :name
5
+ br
6
+ = f.text_field :name
7
+ .form-group
8
+ = f.label :display_name
9
+ br
10
+ = f.text_area :display_name
11
+ .form-group
12
+ = f.label :note
13
+ br
14
+ = f.text_area :note, class: 'form-control'
15
+ .form-control
16
+ = f.submit data: {confirm: t('page.are_you_sure')}, class: 'btn btn-default'
@@ -0,0 +1,15 @@
1
+ .row
2
+ #submenu.col-md-3
3
+ .panel.panel-default
4
+ .panel-heading
5
+ h2.panel-title
6
+ = t('activerecord.models.role')
7
+ ul.list-group
8
+ li.list-group-item
9
+ = link_to t('page.show'), role_path(@role)
10
+ li.list-group-item
11
+ = link_to t('page.back'), roles_path
12
+ #content_list.col-md-9
13
+ h1.panel-title
14
+ = t('page.editing', model: t('activerecord.models.role'))
15
+ = render 'form'
@@ -0,0 +1,27 @@
1
+ .row
2
+ #submenu.col-md-3
3
+ .panel.panel-default
4
+ .panel-heading
5
+ h2.panel-title
6
+ = t('activerecord.models.role')
7
+ #content_list.col-md-9
8
+ h1.panel-title
9
+ = t('page.listing', model: t('activerecord.models.role'))
10
+ table.table.table-striped.index
11
+ tr
12
+ th
13
+ = t('activerecord.attributes.role.name')
14
+ th
15
+ = t('activerecord.attributes.role.display_name')
16
+ th
17
+ - @roles.each do |role|
18
+ | <tr class="line
19
+ = cycle("0", "1")
20
+ | ">
21
+ td
22
+ = link_to role.name, role
23
+ td
24
+ = link_to role.display_name.localize, role
25
+ td
26
+ = link_to t('page.edit'), edit_role_path(role)
27
+ = link_to t('page.destroy'), role, data: {confirm: t('page.are_you_sure')}, method: :delete
@@ -0,0 +1,13 @@
1
+ .row
2
+ #submenu.col-md-3
3
+ .panel.panel-default
4
+ .panel-heading
5
+ h2.panel-title
6
+ = t('activerecord.models.role')
7
+ ul.list-group
8
+ li.list-group-item
9
+ = link_to t('page.back'), roles_path
10
+ #content_list.col-md-9
11
+ h1.panel-title
12
+ = t('page.new', model: t('activerecord.models.role'))
13
+ = render 'form'
@@ -0,0 +1,46 @@
1
+ .row
2
+ #submenu.col-md-3
3
+ .panel.panel-default
4
+ .panel-heading
5
+ h2.panel-title
6
+ = t('activerecord.models.role')
7
+ ul.list-group
8
+ li.list-group-item
9
+ = link_to t('page.edit'), edit_role_path(@role)
10
+ li.list-group-item
11
+ = back_to_index(flash[:page_info])
12
+ #content_list.col-md-9
13
+ h1.panel-title
14
+ = t('page.showing', model: t('activerecord.models.role'))
15
+ p#notice
16
+ = notice
17
+ p
18
+ strong
19
+ = t('activerecord.attributes.role.name')
20
+ | :
21
+ = @role.name
22
+ p
23
+ strong
24
+ = t('activerecord.attributes.role.display_name')
25
+ | :
26
+ = @role.display_name.localize
27
+ p
28
+ strong
29
+ = t('activerecord.attributes.role.score')
30
+ | :
31
+ = @role.score
32
+ p
33
+ strong
34
+ = t('activerecord.attributes.role.note')
35
+ | :
36
+ = @role.note
37
+ p
38
+ strong
39
+ = t('page.created_at')
40
+ | :
41
+ = l(@role.created_at) if @role.created_at
42
+ p
43
+ strong
44
+ = t('page.updated_at')
45
+ | :
46
+ = l(@role.updated_at) if @role.created_at
@@ -1,12 +1,12 @@
1
1
  class CreateRoles < ActiveRecord::Migration
2
2
  def change
3
- create_table "roles" do |t|
4
- t.column :name, :string, :null => false
3
+ create_table 'roles' do |t|
4
+ t.column :name, :string, null: false
5
5
  t.column :display_name, :string
6
6
  t.column :note, :text
7
7
  t.column :created_at, :datetime
8
8
  t.column :updated_at, :datetime
9
- t.integer :score, :default => 0, :null => false
9
+ t.integer :score, default: 0, null: false
10
10
  t.integer :position
11
11
  end
12
12
  end
@@ -4,13 +4,13 @@ class AddAdditionalAttributesToUser < ActiveRecord::Migration
4
4
  add_column :users, :deleted_at, :datetime
5
5
  add_column :users, :expired_at, :datetime
6
6
 
7
- add_column :users, :failed_attempts, :integer, :default => 0
7
+ add_column :users, :failed_attempts, :integer, default: 0
8
8
  add_column :users, :unlock_token, :string
9
9
  add_column :users, :locked_at, :datetime
10
10
 
11
11
  add_column :users, :confirmed_at, :datetime
12
12
 
13
- add_index :users, :username, :unique => true
14
- add_index :users, :unlock_token, :unique => true
13
+ add_index :users, :username, unique: true
14
+ add_index :users, :unlock_token, unique: true
15
15
  end
16
16
  end
@@ -1,6 +1,5 @@
1
- require "enju_seed/engine"
2
- require "enju_seed/version"
3
- require "enju_seed/localized_name"
1
+ require 'enju_seed/engine'
4
2
 
5
3
  module EnjuSeed
4
+ # Your code goes here...
6
5
  end
@@ -13,8 +13,7 @@ require 'sitemap_generator'
13
13
  require 'browser'
14
14
  require 'simple_form'
15
15
  require 'validates_timeliness'
16
- require 'globalize'
17
- require 'globalize-accessors'
16
+ require 'shrine'
18
17
 
19
18
  module EnjuSeed
20
19
  class Engine < ::Rails::Engine
@@ -1,9 +1,7 @@
1
1
  module LocalizedName
2
2
  def localize(locale = I18n.locale)
3
3
  string = YAML.load(self)
4
- if string.is_a?(Hash) and string[locale.to_s]
5
- return string[locale.to_s]
6
- end
4
+ return string[locale.to_s] if string.is_a?(Hash) && string[locale.to_s]
7
5
  self
8
6
  rescue NoMethodError
9
7
  self
@@ -1,3 +1,3 @@
1
1
  module EnjuSeed
2
- VERSION = "0.2.3"
2
+ VERSION = '0.3.0.beta.1'.freeze
3
3
  end
@@ -3,73 +3,73 @@ require 'rails_helper'
3
3
  describe MyAccountsController do
4
4
  fixtures :all
5
5
 
6
- describe "GET show" do
7
- describe "When logged in as Administrator" do
6
+ describe 'GET show' do
7
+ describe 'When logged in as Administrator' do
8
8
  before(:each) do
9
9
  sign_in User.friendly.find('enjuadmin')
10
10
  end
11
11
 
12
- it "assigns the requested user as @user" do
13
- get :show, id: 'admin'
12
+ it 'assigns the requested user as @user' do
13
+ get :show, params: { id: 'admin' }
14
14
  expect(response).to be_success
15
15
  end
16
16
  end
17
17
 
18
- describe "When not logged in" do
19
- it "assigns the requested user as @user" do
20
- get :show, id: 'admin'
18
+ describe 'When not logged in' do
19
+ it 'assigns the requested user as @user' do
20
+ get :show, params: { id: 'admin' }
21
21
  expect(assigns(:user)).to be_nil
22
22
  expect(response).to redirect_to(new_user_session_url)
23
23
  end
24
24
  end
25
25
  end
26
26
 
27
- describe "GET edit" do
28
- describe "When logged in as Administrator" do
27
+ describe 'GET edit' do
28
+ describe 'When logged in as Administrator' do
29
29
  before(:each) do
30
- profile = FactoryBot.create(:profile)
31
- @user = FactoryBot.create(:admin)
30
+ profile = FactoryGirl.create(:profile)
31
+ @user = FactoryGirl.create(:admin)
32
32
  @user.profile = profile
33
33
  sign_in @user
34
34
  end
35
35
 
36
- it "assigns the requested user as @user" do
36
+ it 'assigns the requested user as @user' do
37
37
  get :edit
38
38
  expect(assigns(:profile)).to eq(@user.profile)
39
39
  end
40
40
  end
41
41
 
42
- describe "When logged in as Librarian" do
42
+ describe 'When logged in as Librarian' do
43
43
  before(:each) do
44
- profile = FactoryBot.create(:profile)
45
- @user = FactoryBot.create(:librarian)
44
+ profile = FactoryGirl.create(:profile)
45
+ @user = FactoryGirl.create(:librarian)
46
46
  @user.profile = profile
47
47
  sign_in @user
48
48
  end
49
49
 
50
- it "should assign the requested user as @user" do
50
+ it 'should assign the requested user as @user' do
51
51
  get :edit
52
52
  expect(assigns(:profile)).to eq(@user.profile)
53
53
  end
54
54
  end
55
55
 
56
- describe "When logged in as User" do
56
+ describe 'When logged in as User' do
57
57
  before(:each) do
58
- profile = FactoryBot.create(:profile)
59
- @user = FactoryBot.create(:user)
58
+ profile = FactoryGirl.create(:profile)
59
+ @user = FactoryGirl.create(:user)
60
60
  @user.profile = profile
61
61
  sign_in @user
62
62
  end
63
63
 
64
- it "should assign the requested user as @user" do
64
+ it 'should assign the requested user as @user' do
65
65
  get :edit
66
66
  expect(assigns(:profile)).to eq(@user.profile)
67
67
  expect(response).to be_success
68
68
  end
69
69
  end
70
70
 
71
- describe "When not logged in" do
72
- it "should not assign the requested user as @user" do
71
+ describe 'When not logged in' do
72
+ it 'should not assign the requested user as @user' do
73
73
  get :edit
74
74
  expect(assigns(:user)).to be_nil
75
75
  expect(response).to redirect_to(new_user_session_url)
@@ -77,149 +77,149 @@ describe MyAccountsController do
77
77
  end
78
78
  end
79
79
 
80
- describe "PUT update" do
80
+ describe 'PUT update' do
81
81
  before(:each) do
82
- @attrs = {:user_attributes => {email: 'newaddress@example.jp', :current_password => 'password'}, :locale => 'en'}
83
- @invalid_attrs = {:user_attributes => {username: ''}, user_number: '日本語'}
84
- @invalid_passwd_attrs = {:user_attributes => {:current_password=> ''}}
82
+ @attrs = { user_attributes: { email: 'newaddress@example.jp', current_password: 'password' }, locale: 'en' }
83
+ @invalid_attrs = { user_attributes: { username: '' }, user_number: '日本語' }
84
+ @invalid_passwd_attrs = { user_attributes: { current_password: '' } }
85
85
  end
86
86
 
87
- describe "When logged in as Administrator" do
87
+ describe 'When logged in as Administrator' do
88
88
  before(:each) do
89
- profile = FactoryBot.create(:profile)
90
- @user = FactoryBot.create(:admin, :password => 'password', :password_confirmation => 'password')
89
+ profile = FactoryGirl.create(:profile)
90
+ @user = FactoryGirl.create(:admin, password: 'password', password_confirmation: 'password')
91
91
  @user.profile = profile
92
92
  sign_in @user
93
93
  end
94
94
 
95
- describe "with valid params" do
96
- it "updates the requested user" do
95
+ describe 'with valid params' do
96
+ it 'updates the requested user' do
97
97
  @attrs[:user_attributes][:id] = @user.id
98
- put :update, profile: @attrs
98
+ put :update, params: { profile: @attrs }
99
99
  end
100
100
 
101
- it "assigns the requested user as @user" do
101
+ it 'assigns the requested user as @user' do
102
102
  @attrs[:user_attributes][:id] = @user.id
103
- put :update, profile: @attrs
103
+ put :update, params: { profile: @attrs }
104
104
  expect(assigns(:profile)).to eq(@user.profile)
105
105
  end
106
106
 
107
- it "redirects to the user" do
107
+ it 'redirects to the user' do
108
108
  @attrs[:user_attributes][:id] = @user.id
109
- put :update, profile: @attrs
109
+ put :update, params: { profile: @attrs }
110
110
  expect(assigns(:profile)).to eq(@user.profile)
111
111
  expect(response).to redirect_to(my_account_url)
112
112
  end
113
113
  end
114
114
 
115
- describe "with invalid params" do
116
- it "assigns the requested user as @user" do
117
- put :update, profile: @invalid_attrs
115
+ describe 'with invalid params' do
116
+ it 'assigns the requested user as @user' do
117
+ put :update, params: { profile: @invalid_attrs }
118
118
  expect(assigns(:profile)).to eq(@user.profile)
119
119
  end
120
120
 
121
121
  it "re-renders the 'edit' template" do
122
- put :update, profile: @invalid_attrs
123
- expect(response).to render_template("edit")
122
+ put :update, params: { profile: @invalid_attrs }
123
+ expect(response).to render_template('edit')
124
124
  end
125
125
  end
126
126
 
127
- #describe "with invalid password params" do
127
+ # describe "with invalid password params" do
128
128
  # it "assigns the requested user as @user" do
129
129
  # put :update, profile: @invalid_passwd_attrs
130
130
  # expect(assigns(:profile).errors).not_to be_blank
131
131
  # end
132
- #end
132
+ # end
133
133
  end
134
134
 
135
- describe "When logged in as Librarian" do
135
+ describe 'When logged in as Librarian' do
136
136
  before(:each) do
137
- profile = FactoryBot.create(:profile)
138
- @user = FactoryBot.create(:librarian, :password => 'password', :password_confirmation => 'password')
137
+ profile = FactoryGirl.create(:profile)
138
+ @user = FactoryGirl.create(:librarian, password: 'password', password_confirmation: 'password')
139
139
  @user.profile = profile
140
140
  sign_in @user
141
141
  end
142
142
 
143
- describe "with valid params" do
144
- it "updates the requested user" do
143
+ describe 'with valid params' do
144
+ it 'updates the requested user' do
145
145
  @attrs[:user_attributes][:id] = @user.id
146
- put :update, profile: @attrs
146
+ put :update, params: { profile: @attrs }
147
147
  end
148
148
 
149
- it "assigns the requested user as @user" do
149
+ it 'assigns the requested user as @user' do
150
150
  @attrs[:user_attributes][:id] = @user.id
151
- put :update, profile: @attrs
151
+ put :update, params: { profile: @attrs }
152
152
  expect(assigns(:profile)).to eq(@user.profile)
153
153
  end
154
154
 
155
- it "redirects to the user" do
155
+ it 'redirects to the user' do
156
156
  @attrs[:user_attributes][:id] = @user.id
157
- put :update, profile: @attrs
157
+ put :update, params: { profile: @attrs }
158
158
  expect(assigns(:profile)).to eq(@user.profile)
159
159
  expect(response).to redirect_to(my_account_url)
160
160
  end
161
161
  end
162
162
 
163
- describe "with invalid params" do
164
- it "assigns the user as @user" do
165
- put :update, profile: @invalid_attrs
163
+ describe 'with invalid params' do
164
+ it 'assigns the user as @user' do
165
+ put :update, params: { profile: @invalid_attrs }
166
166
  expect(assigns(:profile)).to_not be_valid
167
167
  expect(response).to be_success
168
168
  end
169
169
 
170
- it "should ignore username" do
171
- put :update, profile: @invalid_attrs
172
- expect(response).to render_template("edit")
170
+ it 'should ignore username' do
171
+ put :update, params: { profile: @invalid_attrs }
172
+ expect(response).to render_template('edit')
173
173
  expect(assigns(:profile).changed?).to be_truthy
174
174
  end
175
175
  end
176
176
  end
177
177
 
178
- describe "When logged in as User" do
178
+ describe 'When logged in as User' do
179
179
  before(:each) do
180
- profile = FactoryBot.create(:profile)
181
- @user = FactoryBot.create(:user, :password => 'password', :password_confirmation => 'password')
180
+ profile = FactoryGirl.create(:profile)
181
+ @user = FactoryGirl.create(:user, password: 'password', password_confirmation: 'password')
182
182
  @user.profile = profile
183
183
  sign_in @user
184
184
  end
185
185
 
186
- describe "with valid params" do
187
- it "updates the requested user" do
186
+ describe 'with valid params' do
187
+ it 'updates the requested user' do
188
188
  @attrs[:user_attributes][:id] = @user.id
189
- put :update, profile: @attrs
189
+ put :update, params: { profile: @attrs }
190
190
  end
191
191
 
192
- it "assigns the requested user as @user" do
192
+ it 'assigns the requested user as @user' do
193
193
  @attrs[:user_attributes][:id] = @user.id
194
- put :update, profile: @attrs
194
+ put :update, params: { profile: @attrs }
195
195
  expect(assigns(:profile)).to eq(@user.profile)
196
196
  expect(response).to redirect_to(my_account_url)
197
197
  end
198
198
  end
199
199
 
200
- describe "with invalid params" do
201
- it "assigns the requested user as @user" do
202
- put :update, profile: @invalid_attrs
200
+ describe 'with invalid params' do
201
+ it 'assigns the requested user as @user' do
202
+ put :update, params: { profile: @invalid_attrs }
203
203
  expect(response).to be_success
204
204
  end
205
205
  end
206
206
  end
207
207
 
208
- describe "When not logged in" do
209
- describe "with valid params" do
210
- it "updates the requested user" do
211
- put :update, profile: @attrs
208
+ describe 'When not logged in' do
209
+ describe 'with valid params' do
210
+ it 'updates the requested user' do
211
+ put :update, params: { profile: @attrs }
212
212
  end
213
213
 
214
- it "should be forbidden" do
215
- put :update, profile: @attrs
214
+ it 'should be forbidden' do
215
+ put :update, params: { profile: @attrs }
216
216
  expect(response).to redirect_to(new_user_session_url)
217
217
  end
218
218
  end
219
219
 
220
- describe "with invalid params" do
221
- it "assigns the requested user as @user" do
222
- put :update, profile: @invalid_attrs
220
+ describe 'with invalid params' do
221
+ it 'assigns the requested user as @user' do
222
+ put :update, params: { profile: @invalid_attrs }
223
223
  expect(response).to redirect_to(new_user_session_url)
224
224
  end
225
225
  end