enju_circulation 0.2.5 → 0.3.0.beta.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (378) hide show
  1. checksums.yaml +4 -4
  2. data/README.rdoc +4 -4
  3. data/Rakefile +2 -2
  4. data/app/assets/config/enju_circulation_manifest.js +0 -0
  5. data/app/controllers/carrier_type_has_checkout_types_controller.rb +2 -1
  6. data/app/controllers/checked_items_controller.rb +2 -1
  7. data/app/controllers/checkins_controller.rb +4 -3
  8. data/app/controllers/checkout_types_controller.rb +2 -1
  9. data/app/controllers/checkouts_controller.rb +1 -0
  10. data/app/controllers/circulation_statuses_controller.rb +2 -1
  11. data/app/controllers/demands_controller.rb +2 -1
  12. data/app/controllers/item_has_use_restrictions_controller.rb +1 -0
  13. data/app/controllers/lending_policies_controller.rb +2 -1
  14. data/app/controllers/manifestation_checkout_stats_controller.rb +2 -1
  15. data/app/controllers/manifestation_reserve_stats_controller.rb +2 -1
  16. data/app/controllers/reserves_controller.rb +5 -4
  17. data/app/controllers/use_restrictions_controller.rb +2 -1
  18. data/app/controllers/user_checkout_stats_controller.rb +2 -1
  19. data/app/controllers/user_group_has_checkout_types_controller.rb +4 -3
  20. data/app/controllers/user_reserve_stats_controller.rb +2 -1
  21. data/app/helpers/items_helper.rb +3 -3
  22. data/app/models/carrier_type_has_checkout_type.rb +2 -2
  23. data/app/models/checked_item.rb +10 -9
  24. data/app/models/checkin.rb +4 -4
  25. data/app/models/checkout.rb +14 -14
  26. data/app/models/checkout_stat_has_manifestation.rb +3 -3
  27. data/app/models/checkout_stat_has_user.rb +3 -3
  28. data/app/models/checkout_type.rb +2 -2
  29. data/app/models/circulation_status.rb +1 -0
  30. data/app/models/concerns/enju_circulation/enju_basket.rb +1 -1
  31. data/app/models/concerns/enju_circulation/enju_item.rb +17 -17
  32. data/app/models/concerns/enju_circulation/enju_manifestation.rb +6 -6
  33. data/app/models/concerns/enju_circulation/enju_user.rb +9 -9
  34. data/app/models/concerns/enju_circulation/enju_user_group.rb +5 -5
  35. data/app/models/item_has_use_restriction.rb +2 -2
  36. data/app/models/lending_policy.rb +2 -2
  37. data/app/models/manifestation_checkout_stat.rb +4 -3
  38. data/app/models/manifestation_checkout_stat_transition.rb +2 -2
  39. data/app/models/manifestation_reserve_stat.rb +4 -3
  40. data/app/models/manifestation_reserve_stat_transition.rb +1 -1
  41. data/app/models/reserve.rb +46 -45
  42. data/app/models/reserve_stat_has_manifestation.rb +2 -2
  43. data/app/models/reserve_stat_has_user.rb +4 -4
  44. data/app/models/reserve_state_machine.rb +6 -6
  45. data/app/models/reserve_transition.rb +1 -1
  46. data/app/models/use_restriction.rb +1 -0
  47. data/app/models/user_checkout_stat.rb +3 -2
  48. data/app/models/user_checkout_stat_transition.rb +1 -1
  49. data/app/models/user_group_has_checkout_type.rb +6 -6
  50. data/app/models/user_reserve_stat.rb +3 -2
  51. data/app/models/user_reserve_stat_transition.rb +1 -1
  52. data/app/policies/checkout_policy.rb +3 -3
  53. data/app/policies/reserve_policy.rb +3 -3
  54. data/app/views/checkouts/index.rss.builder +4 -4
  55. data/app/views/checkouts/index.txt.ruby +13 -0
  56. data/app/views/reserves/index.rss.builder +5 -5
  57. data/db/migrate/032_create_checkins.rb +1 -1
  58. data/db/migrate/033_create_checkouts.rb +1 -1
  59. data/db/migrate/035_create_reserves.rb +1 -1
  60. data/db/migrate/121_create_checked_items.rb +1 -1
  61. data/db/migrate/127_create_use_restrictions.rb +1 -1
  62. data/db/migrate/129_create_item_has_use_restrictions.rb +1 -1
  63. data/db/migrate/132_create_circulation_statuses.rb +1 -1
  64. data/db/migrate/20081030023412_create_checkout_types.rb +2 -2
  65. data/db/migrate/20081030023518_create_user_group_has_checkout_types.rb +1 -1
  66. data/db/migrate/20081030023615_create_carrier_type_has_checkout_types.rb +1 -1
  67. data/db/migrate/20081212075554_create_checkout_stat_has_manifestations.rb +1 -1
  68. data/db/migrate/20081212080038_create_manifestation_checkout_stats.rb +1 -1
  69. data/db/migrate/20081215094302_create_user_checkout_stats.rb +1 -1
  70. data/db/migrate/20081215094955_create_checkout_stat_has_users.rb +1 -1
  71. data/db/migrate/20081216190517_create_reserve_stat_has_manifestations.rb +1 -1
  72. data/db/migrate/20081216190724_create_manifestation_reserve_stats.rb +1 -1
  73. data/db/migrate/20081220023628_create_user_reserve_stats.rb +1 -1
  74. data/db/migrate/20081220034117_create_reserve_stat_has_users.rb +1 -1
  75. data/db/migrate/20090321130448_add_completed_at_to_user_checkout_stat.rb +1 -1
  76. data/db/migrate/20090831220301_create_lending_policies.rb +2 -2
  77. data/db/migrate/20110301134521_add_expire_date_to_reserve.rb +1 -1
  78. data/db/migrate/20110328130826_add_current_checkout_count_to_user_group_has_checkout_type.rb +1 -1
  79. data/db/migrate/20110621093332_remove_expire_date_from_reserve.rb +1 -1
  80. data/db/migrate/20110627122938_add_number_of_day_to_notify_overdue_to_user_group.rb +4 -4
  81. data/db/migrate/20111129044509_add_pickup_location_to_reserve.rb +1 -1
  82. data/db/migrate/20120424103932_add_librarian_id_to_checked_item.rb +1 -1
  83. data/db/migrate/20130303124821_add_retained_at_to_reserve.rb +1 -1
  84. data/db/migrate/20130304015019_add_postponed_at_to_reserve.rb +1 -1
  85. data/db/migrate/20130416054135_add_circulation_status_id_to_item.rb +1 -1
  86. data/db/migrate/20130519065638_add_lock_version_to_reserve.rb +2 -2
  87. data/db/migrate/20130519065837_add_lock_version_to_checkin.rb +2 -2
  88. data/db/migrate/20140518050147_create_reserve_transitions.rb +1 -1
  89. data/db/migrate/20140528045518_create_user_checkout_stat_transitions.rb +1 -1
  90. data/db/migrate/20140528045539_create_user_reserve_stat_transitions.rb +1 -1
  91. data/db/migrate/20140528045600_create_manifestation_checkout_stat_transitions.rb +1 -1
  92. data/db/migrate/20140528045617_create_manifestation_reserve_stat_transitions.rb +1 -1
  93. data/db/migrate/20140810061942_add_user_id_to_user_checkout_stat.rb +1 -1
  94. data/db/migrate/20140810091231_add_checkout_icalendar_token_to_profile.rb +2 -2
  95. data/db/migrate/20140810091417_add_save_checkout_history_to_profile.rb +2 -2
  96. data/db/migrate/20141014065831_add_shelf_id_to_checkout.rb +1 -1
  97. data/db/migrate/20141020120523_add_library_id_to_checkout.rb +1 -1
  98. data/db/migrate/20150106001709_create_demands.rb +1 -1
  99. data/db/migrate/20160703184619_add_most_recent_to_reserve_transitions.rb +1 -1
  100. data/db/migrate/20160703184650_add_most_recent_to_manifestation_checkout_stat_transitions.rb +1 -1
  101. data/db/migrate/20160703184723_add_most_recent_to_manifestation_reserve_stat_transitions.rb +1 -1
  102. data/db/migrate/20160703184747_add_most_recent_to_user_checkout_stat_transitions.rb +1 -1
  103. data/db/migrate/20160703184805_add_most_recent_to_user_reserve_stat_transitions.rb +1 -1
  104. data/db/migrate/20160703190209_add_foreign_key_on_manifestation_id_to_reserve.rb +1 -1
  105. data/db/migrate/20180107161035_add_constraints_to_most_recent_for_reserve_transitions.rb +2 -2
  106. data/db/migrate/20180107161951_add_constraints_to_most_recent_for_user_checkout_stat_transitions.rb +2 -2
  107. data/db/migrate/20180107162009_add_constraints_to_most_recent_for_user_reserve_stat_transitions.rb +2 -2
  108. data/db/migrate/20180107162029_add_constraints_to_most_recent_for_manifestation_checkout_stat_transitions.rb +2 -2
  109. data/db/migrate/20180107162048_add_constraints_to_most_recent_for_manifestation_reserve_stat_transitions.rb +2 -2
  110. data/lib/enju_circulation/helper.rb +8 -8
  111. data/lib/enju_circulation/version.rb +1 -1
  112. data/lib/generators/enju_circulation/setup/setup_generator.rb +1 -1
  113. data/lib/generators/enju_circulation/setup/templates/config/schedule.rb +2 -2
  114. data/lib/tasks/enju_circulation_tasks.rake +30 -6
  115. data/spec/controllers/carrier_type_has_checkout_types_controller_spec.rb +45 -45
  116. data/spec/controllers/checked_items_controller_spec.rb +42 -42
  117. data/spec/controllers/checkins_controller_spec.rb +49 -49
  118. data/spec/controllers/checkout_types_controller_spec.rb +45 -45
  119. data/spec/controllers/checkouts_controller_spec.rb +63 -63
  120. data/spec/controllers/circulation_statuses_controller_spec.rb +45 -45
  121. data/spec/controllers/item_has_use_restrictions_controller_spec.rb +45 -45
  122. data/spec/controllers/lending_policies_controller_spec.rb +44 -44
  123. data/spec/controllers/manifestation_checkout_stats_controller_spec.rb +45 -45
  124. data/spec/controllers/manifestation_reserve_stats_controller_spec.rb +45 -45
  125. data/spec/controllers/profiles_controller_spec.rb +1 -1
  126. data/spec/controllers/reserves_controller_spec.rb +95 -95
  127. data/spec/controllers/use_restrictions_controller_spec.rb +45 -45
  128. data/spec/controllers/user_checkout_stats_controller_spec.rb +45 -45
  129. data/spec/controllers/user_group_has_checkout_types_controller_spec.rb +44 -44
  130. data/spec/controllers/user_reserve_stats_controller_spec.rb +45 -45
  131. data/spec/dummy/app/assets/config/manifest.js +4 -0
  132. data/spec/dummy/app/helpers/application_helper.rb +2 -2
  133. data/spec/dummy/bin/rails +1 -1
  134. data/spec/dummy/bin/setup +21 -12
  135. data/spec/dummy/bin/update +29 -0
  136. data/spec/dummy/bin/yarn +11 -0
  137. data/spec/dummy/config/application.rb +6 -17
  138. data/spec/dummy/config/cable.yml +9 -0
  139. data/spec/dummy/config/environment.rb +4 -4
  140. data/spec/dummy/config/environments/development.rb +24 -11
  141. data/spec/dummy/config/environments/production.rb +28 -16
  142. data/spec/dummy/config/environments/test.rb +8 -8
  143. data/spec/dummy/config/initializers/application_controller_renderer.rb +8 -0
  144. data/spec/dummy/config/initializers/content_security_policy.rb +25 -0
  145. data/spec/dummy/config/initializers/cookies_serializer.rb +5 -0
  146. data/spec/dummy/config/initializers/filter_parameter_logging.rb +4 -0
  147. data/spec/dummy/config/puma.rb +47 -0
  148. data/spec/dummy/config/routes.rb +4 -2
  149. data/spec/dummy/config/spring.rb +6 -0
  150. data/spec/dummy/db/migrate/001_create_agents.rb +7 -7
  151. data/spec/dummy/db/migrate/002_devise_create_users.rb +6 -7
  152. data/spec/dummy/db/migrate/005_create_manifestations.rb +13 -13
  153. data/spec/dummy/db/migrate/006_create_items.rb +6 -6
  154. data/spec/dummy/db/migrate/012_create_owns.rb +3 -3
  155. data/spec/dummy/db/migrate/015_create_creates.rb +3 -3
  156. data/spec/dummy/db/migrate/041_create_roles.rb +3 -3
  157. data/spec/dummy/db/migrate/047_create_produces.rb +3 -3
  158. data/spec/dummy/db/migrate/059_create_libraries.rb +1 -1
  159. data/spec/dummy/db/migrate/069_create_shelves.rb +1 -1
  160. data/spec/dummy/db/migrate/073_create_carrier_types.rb +2 -2
  161. data/spec/dummy/db/migrate/077_create_user_groups.rb +2 -2
  162. data/spec/dummy/db/migrate/080_create_library_groups.rb +1 -1
  163. data/spec/dummy/db/migrate/112_create_frequencies.rb +2 -2
  164. data/spec/dummy/db/migrate/113_create_events.rb +4 -4
  165. data/spec/dummy/db/migrate/114_create_event_categories.rb +2 -2
  166. data/spec/dummy/db/migrate/117_create_form_of_works.rb +2 -2
  167. data/spec/dummy/db/migrate/120_create_baskets.rb +1 -1
  168. data/spec/dummy/db/migrate/124_create_bookstores.rb +2 -2
  169. data/spec/dummy/db/migrate/125_create_donates.rb +3 -3
  170. data/spec/dummy/db/migrate/130_create_request_status_types.rb +2 -2
  171. data/spec/dummy/db/migrate/131_create_request_types.rb +2 -2
  172. data/spec/dummy/db/migrate/133_create_agent_merges.rb +2 -2
  173. data/spec/dummy/db/migrate/134_create_agent_merge_lists.rb +1 -1
  174. data/spec/dummy/db/migrate/149_create_message_templates.rb +6 -6
  175. data/spec/dummy/db/migrate/154_create_messages.rb +3 -3
  176. data/spec/dummy/db/migrate/20080819181903_create_message_requests.rb +1 -1
  177. data/spec/dummy/db/migrate/20080830154109_create_realizes.rb +3 -3
  178. data/spec/dummy/db/migrate/20080830172106_create_exemplifies.rb +4 -4
  179. data/spec/dummy/db/migrate/20080905191442_create_agent_types.rb +2 -2
  180. data/spec/dummy/db/migrate/20081006090811_create_subscriptions.rb +1 -1
  181. data/spec/dummy/db/migrate/20081006093246_create_subscribes.rb +1 -1
  182. data/spec/dummy/db/migrate/20081023092436_create_search_engines.rb +6 -6
  183. data/spec/dummy/db/migrate/20081025083323_create_countries.rb +9 -10
  184. data/spec/dummy/db/migrate/20081025083905_create_languages.rb +6 -7
  185. data/spec/dummy/db/migrate/20081027150907_create_picture_files.rb +2 -2
  186. data/spec/dummy/db/migrate/20081028083142_create_agent_import_files.rb +1 -1
  187. data/spec/dummy/db/migrate/20081028083208_create_resource_import_files.rb +1 -1
  188. data/spec/dummy/db/migrate/20081028093607_create_event_import_files.rb +1 -1
  189. data/spec/dummy/db/migrate/20090519203307_create_participates.rb +3 -3
  190. data/spec/dummy/db/migrate/20090705133942_add_attachments_picture_to_picture_file.rb +1 -1
  191. data/spec/dummy/db/migrate/20090705212043_add_attachments_attachment_to_manifestation.rb +1 -1
  192. data/spec/dummy/db/migrate/20090720091106_create_medium_of_performances.rb +2 -2
  193. data/spec/dummy/db/migrate/20090720091429_create_content_types.rb +2 -2
  194. data/spec/dummy/db/migrate/20090812151902_create_agent_relationship_types.rb +2 -2
  195. data/spec/dummy/db/migrate/20091012101112_add_dcndl_schema.rb +1 -1
  196. data/spec/dummy/db/migrate/20091025080447_create_licenses.rb +2 -2
  197. data/spec/dummy/db/migrate/20091202124834_create_versions.rb +4 -4
  198. data/spec/dummy/db/migrate/20091214131723_create_series_statements.rb +1 -1
  199. data/spec/dummy/db/migrate/20100129142347_create_import_requests.rb +1 -1
  200. data/spec/dummy/db/migrate/20100211105551_add_admin_networks_to_library_group.rb +1 -1
  201. data/spec/dummy/db/migrate/20100223121519_rename_series_statement_title_to_original_title.rb +1 -1
  202. data/spec/dummy/db/migrate/20100314190054_add_opening_hour_to_library.rb +1 -1
  203. data/spec/dummy/db/migrate/20100321235924_add_series_statement_identifier_to_series_statement.rb +1 -1
  204. data/spec/dummy/db/migrate/20100525124311_create_manifestation_relationships.rb +1 -1
  205. data/spec/dummy/db/migrate/20100606065209_create_user_has_roles.rb +1 -1
  206. data/spec/dummy/db/migrate/20100606073747_create_agent_relationships.rb +1 -1
  207. data/spec/dummy/db/migrate/20100607044753_create_manifestation_relationship_types.rb +2 -2
  208. data/spec/dummy/db/migrate/20100814091104_add_position_to_agent_relationship.rb +1 -1
  209. data/spec/dummy/db/migrate/20100925043847_create_resource_import_results.rb +1 -1
  210. data/spec/dummy/db/migrate/20100925074559_create_agent_import_results.rb +1 -1
  211. data/spec/dummy/db/migrate/20100925074639_create_event_import_results.rb +1 -1
  212. data/spec/dummy/db/migrate/20101212070145_add_acquired_at_to_item.rb +1 -1
  213. data/spec/dummy/db/migrate/20110222073537_add_url_to_library_group.rb +2 -2
  214. data/spec/dummy/db/migrate/20110301035123_add_pub_date_to_manifestation.rb +1 -1
  215. data/spec/dummy/db/migrate/20110301121550_add_birth_date_and_death_date_to_agent.rb +1 -1
  216. data/spec/dummy/db/migrate/20110318183304_add_valid_period_for_new_user_to_user_group.rb +2 -2
  217. data/spec/dummy/db/migrate/20110603184217_add_edit_mode_to_resource_import_file.rb +1 -1
  218. data/spec/dummy/db/migrate/20110619064807_add_edition_string_to_manifestation.rb +1 -1
  219. data/spec/dummy/db/migrate/20110620173525_add_bookstore_id_to_item.rb +1 -1
  220. data/spec/dummy/db/migrate/20110627034940_create_series_statement_merge_lists.rb +1 -1
  221. data/spec/dummy/db/migrate/20110627035057_create_series_statement_merges.rb +3 -3
  222. data/spec/dummy/db/migrate/20110913115320_add_lft_and_rgt_to_message.rb +1 -1
  223. data/spec/dummy/db/migrate/20110916091020_add_volume_number_to_manifestation.rb +1 -1
  224. data/spec/dummy/db/migrate/20110916103953_add_manifestaiton_id_to_series_statement.rb +1 -1
  225. data/spec/dummy/db/migrate/20110918162329_add_note_to_series_statement.rb +1 -1
  226. data/spec/dummy/db/migrate/20111124110059_create_create_types.rb +1 -1
  227. data/spec/dummy/db/migrate/20111124110319_create_realize_types.rb +1 -1
  228. data/spec/dummy/db/migrate/20111124110355_create_produce_types.rb +1 -1
  229. data/spec/dummy/db/migrate/20111124112131_add_create_type_to_create.rb +1 -1
  230. data/spec/dummy/db/migrate/20120105074911_add_isil_to_library.rb +1 -1
  231. data/spec/dummy/db/migrate/20120125050502_add_depth_to_message.rb +1 -2
  232. data/spec/dummy/db/migrate/20120125152919_add_title_subseries_transcription_to_series_statement.rb +1 -2
  233. data/spec/dummy/db/migrate/20120129014038_create_budget_types.rb +1 -1
  234. data/spec/dummy/db/migrate/20120129020544_add_budget_type_id_to_item.rb +1 -2
  235. data/spec/dummy/db/migrate/20120319120638_add_content_type_id_to_manifestation.rb +2 -3
  236. data/spec/dummy/db/migrate/20120319173203_create_accepts.rb +1 -1
  237. data/spec/dummy/db/migrate/20120410104851_add_year_of_publication_to_manifestation.rb +1 -1
  238. data/spec/dummy/db/migrate/20120413051535_add_event_import_fingerprint_to_event_import_file.rb +1 -1
  239. data/spec/dummy/db/migrate/20120413072700_add_picture_meta_to_picture_file.rb +1 -1
  240. data/spec/dummy/db/migrate/20120413100352_add_fingerprint_to_picture_file.rb +1 -1
  241. data/spec/dummy/db/migrate/20120413161340_add_fingerprint_to_resource_import_file.rb +1 -1
  242. data/spec/dummy/db/migrate/20120413161403_add_fingerprint_to_agent_import_file.rb +1 -1
  243. data/spec/dummy/db/migrate/20120413170705_add_error_message_to_resource_import_file.rb +1 -1
  244. data/spec/dummy/db/migrate/20120413170720_add_error_message_to_agent_import_file.rb +1 -1
  245. data/spec/dummy/db/migrate/20120413170734_add_error_message_to_event_import_file.rb +1 -1
  246. data/spec/dummy/db/migrate/20120415060342_rename_event_import_file_imported_at_to_executed_at.rb +1 -1
  247. data/spec/dummy/db/migrate/20120415164821_add_attachment_meta_to_manifestation.rb +1 -1
  248. data/spec/dummy/db/migrate/20120418081407_add_month_of_publication_to_manifestation.rb +1 -1
  249. data/spec/dummy/db/migrate/20120510140958_add_closed_to_shelf.rb +2 -2
  250. data/spec/dummy/db/migrate/20120511072422_add_agent_identifier_to_agent.rb +1 -1
  251. data/spec/dummy/db/migrate/20120602141129_add_edit_mode_to_agent_import_file.rb +1 -1
  252. data/spec/dummy/db/migrate/20121116031206_add_fulltext_content_to_manifestation.rb +1 -1
  253. data/spec/dummy/db/migrate/20130221154434_add_additional_attributes_to_user.rb +4 -4
  254. data/spec/dummy/db/migrate/20130412083556_add_latitude_and_longitude_to_library.rb +1 -1
  255. data/spec/dummy/db/migrate/20130421093852_add_periodical_to_manifestation.rb +1 -1
  256. data/spec/dummy/db/migrate/20130421155019_add_creator_string_to_series_statement.rb +1 -1
  257. data/spec/dummy/db/migrate/20130421164124_add_series_master_to_series_statement.rb +1 -1
  258. data/spec/dummy/db/migrate/20130429020822_add_root_manifestation_id_to_series_statement.rb +1 -1
  259. data/spec/dummy/db/migrate/20130506175303_create_identifier_types.rb +1 -1
  260. data/spec/dummy/db/migrate/20130506175834_create_identifiers.rb +3 -3
  261. data/spec/dummy/db/migrate/20130509185724_add_statement_of_responsibility_to_manifestation.rb +1 -1
  262. data/spec/dummy/db/migrate/20140110122216_create_user_import_files.rb +1 -1
  263. data/spec/dummy/db/migrate/20140110131010_create_user_import_results.rb +1 -1
  264. data/spec/dummy/db/migrate/20140122054321_create_profiles.rb +2 -2
  265. data/spec/dummy/db/migrate/20140518111006_create_message_transitions.rb +1 -1
  266. data/spec/dummy/db/migrate/20140518135713_create_message_request_transitions.rb +1 -1
  267. data/spec/dummy/db/migrate/20140519170214_create_resource_import_file_transitions.rb +1 -1
  268. data/spec/dummy/db/migrate/20140519171220_create_import_request_transitions.rb +1 -1
  269. data/spec/dummy/db/migrate/20140523171309_create_event_import_file_transitions.rb +1 -1
  270. data/spec/dummy/db/migrate/20140524020735_create_agent_import_file_transitions.rb +1 -1
  271. data/spec/dummy/db/migrate/20140524074813_create_user_import_file_transitions.rb +1 -1
  272. data/spec/dummy/db/migrate/20140610123439_drop_email_unique_constraint_enju_leaf_rc10.rb +1 -1
  273. data/spec/dummy/db/migrate/20140614065404_create_resource_export_files.rb +1 -1
  274. data/spec/dummy/db/migrate/20140614141500_create_resource_export_file_transitions.rb +1 -1
  275. data/spec/dummy/db/migrate/20140628071719_add_user_encoding_to_event_import_file.rb +1 -1
  276. data/spec/dummy/db/migrate/20140628072217_add_user_encoding_to_user_import_file.rb +1 -1
  277. data/spec/dummy/db/migrate/20140628073524_add_user_encoding_to_agent_import_file.rb +1 -1
  278. data/spec/dummy/db/migrate/20140628073535_add_user_encoding_to_resource_import_file.rb +1 -1
  279. data/spec/dummy/db/migrate/20140709113413_create_user_export_files.rb +1 -1
  280. data/spec/dummy/db/migrate/20140709113905_create_user_export_file_transitions.rb +1 -1
  281. data/spec/dummy/db/migrate/20140720140916_add_binding_item_identifier_to_item.rb +1 -1
  282. data/spec/dummy/db/migrate/20140720170714_add_default_library_id_to_user_import_file.rb +1 -1
  283. data/spec/dummy/db/migrate/20140720170735_add_default_user_group_id_to_user_import_file.rb +1 -1
  284. data/spec/dummy/db/migrate/20140720192418_add_default_library_id_to_event_import_file.rb +1 -1
  285. data/spec/dummy/db/migrate/20140721151416_add_default_shelf_id_to_resource_import_file.rb +1 -1
  286. data/spec/dummy/db/migrate/20140802082007_add_manifestation_id_to_item.rb +1 -1
  287. data/spec/dummy/db/migrate/20140811031145_add_expired_at_to_profile.rb +1 -1
  288. data/spec/dummy/db/migrate/20140812152348_create_event_export_files.rb +1 -1
  289. data/spec/dummy/db/migrate/20140812153137_create_event_export_file_transitions.rb +1 -1
  290. data/spec/dummy/db/migrate/20140813182425_add_publication_place_to_manifestation.rb +1 -1
  291. data/spec/dummy/db/migrate/20140814070854_add_default_event_category_id_to_event_import_file.rb +1 -1
  292. data/spec/dummy/db/migrate/20140821151023_create_colors.rb +1 -1
  293. data/spec/dummy/db/migrate/20140822114527_add_error_message_to_resource_import_result.rb +1 -1
  294. data/spec/dummy/db/migrate/20140823083524_add_extent_to_manifestation.rb +1 -1
  295. data/spec/dummy/db/migrate/20140823094847_add_dimensions_to_manifestation.rb +1 -1
  296. data/spec/dummy/db/migrate/20140823095740_rename_manifestation_periodical_to_serial.rb +1 -1
  297. data/spec/dummy/db/migrate/20141003181336_add_full_name_transcription_to_profile.rb +1 -1
  298. data/spec/dummy/db/migrate/20141003182825_add_date_of_birth_to_profile.rb +1 -1
  299. data/spec/dummy/db/migrate/20150117111136_add_foreign_key_to_items_referencing_manifestations.rb +1 -1
  300. data/spec/dummy/db/migrate/20150221063719_add_settings_to_library_group.rb +1 -1
  301. data/spec/dummy/db/migrate/20150506105356_add_error_message_to_user_import_result.rb +1 -1
  302. data/spec/dummy/db/migrate/20150924115059_create_withdraws.rb +1 -1
  303. data/spec/dummy/db/migrate/20151125004028_add_profile_id_to_agent.rb +1 -1
  304. data/spec/dummy/db/migrate/20151213070943_add_translation_table_to_library_group.rb +5 -13
  305. data/spec/dummy/db/migrate/20151213072705_add_footer_banner_to_library_group.rb +1 -1
  306. data/spec/dummy/db/migrate/20160610093229_add_html_snippet_to_library_group.rb +1 -1
  307. data/spec/dummy/db/migrate/20160627232219_add_most_recent_to_user_import_file_transitions.rb +1 -1
  308. data/spec/dummy/db/migrate/20160627232316_add_most_recent_to_user_export_file_transitions.rb +1 -1
  309. data/spec/dummy/db/migrate/20160703185015_add_most_recent_to_message_transitions.rb +1 -1
  310. data/spec/dummy/db/migrate/20160801080612_add_most_recent_to_import_request_transitions.rb +1 -1
  311. data/spec/dummy/db/migrate/20160801080619_add_most_recent_to_resource_import_file_transitions.rb +1 -1
  312. data/spec/dummy/db/migrate/20160801080637_add_most_recent_to_resource_export_file_transitions.rb +1 -1
  313. data/spec/dummy/db/migrate/20160801080643_add_most_recent_to_agent_import_file_transitions.rb +1 -1
  314. data/spec/dummy/db/migrate/20160811102604_add_picture_width_to_picture_file.rb +1 -1
  315. data/spec/dummy/db/migrate/20160813191647_add_max_number_of_results_to_library_group.rb +1 -1
  316. data/spec/dummy/db/migrate/20160813191733_add_family_name_first_to_library_group.rb +1 -1
  317. data/spec/dummy/db/migrate/20160813192542_add_pub_year_facet_range_interval_to_library_group.rb +1 -1
  318. data/spec/dummy/db/migrate/20160813203039_add_user_id_to_library_group.rb +1 -1
  319. data/spec/dummy/db/migrate/20160814165332_add_most_recent_to_message_request_transitions.rb +1 -1
  320. data/spec/dummy/db/migrate/20160820004638_add_attachment_attachment_to_carrier_types.rb +1 -1
  321. data/spec/dummy/db/migrate/20170305064014_add_csv_charset_conversion_to_library_group.rb +1 -1
  322. data/spec/dummy/db/migrate/20171014084528_add_header_logo_to_library_group.rb +1 -1
  323. data/spec/dummy/db/migrate/20171119051258_set_not_null_to_manifestation_id_on_items.rb +1 -1
  324. data/spec/dummy/db/migrate/20171126133835_rename_login_banner_to_old_login_banner.rb +1 -1
  325. data/spec/dummy/db/migrate/20171126135238_add_foreign_key_to_library_group_id_on_library.rb +1 -1
  326. data/spec/dummy/db/migrate/20180102162311_add_header_logo_meta_to_library_group.rb +1 -1
  327. data/spec/dummy/db/migrate/20180107160726_add_constraints_to_most_recent_for_user_import_file_transitions.rb +2 -2
  328. data/spec/dummy/db/migrate/20180107160740_add_constraints_to_most_recent_for_user_export_file_transitions.rb +2 -2
  329. data/spec/dummy/db/migrate/20180107161311_add_constraints_to_most_recent_for_agent_import_file_transitions.rb +2 -2
  330. data/spec/dummy/db/migrate/20180107161331_add_constraints_to_most_recent_for_resource_import_file_transitions.rb +2 -2
  331. data/spec/dummy/db/migrate/20180107161347_add_constraints_to_most_recent_for_resource_export_file_transitions.rb +2 -2
  332. data/spec/dummy/db/migrate/20180107161410_add_constraints_to_most_recent_for_import_request_transitions.rb +2 -2
  333. data/spec/dummy/db/schema.rb +858 -936
  334. data/spec/factories/bookstore.rb +5 -0
  335. data/spec/factories/budget_types.rb +18 -0
  336. data/spec/factories/checkout.rb +1 -1
  337. data/spec/factories/item.rb +6 -4
  338. data/spec/factories/manifestation_checkout_stat.rb +4 -3
  339. data/spec/factories/manifestation_reserve_stat.rb +4 -3
  340. data/spec/factories/profile.rb +1 -1
  341. data/spec/factories/reserve.rb +2 -3
  342. data/spec/factories/user.rb +4 -4
  343. data/spec/factories/user_checkout_stat.rb +4 -3
  344. data/spec/factories/user_reserve_stat.rb +4 -3
  345. data/spec/fixtures/content_types.yml +98 -0
  346. data/spec/fixtures/frequencies.yml +68 -0
  347. data/spec/helpers/items_helper_spec.rb +1 -1
  348. data/spec/models/basket_spec.rb +1 -1
  349. data/spec/models/carrier_type_has_checkout_type_spec.rb +1 -1
  350. data/spec/models/checkin_spec.rb +3 -1
  351. data/spec/models/checkout_spec.rb +2 -2
  352. data/spec/models/checkout_stat_has_manifestation_spec.rb +1 -1
  353. data/spec/models/checkout_stat_has_user_spec.rb +1 -1
  354. data/spec/models/checkout_type_spec.rb +1 -1
  355. data/spec/models/circulation_status_spec.rb +1 -1
  356. data/spec/models/item_has_use_resetriction_spec.rb +1 -1
  357. data/spec/models/lending_policy_spec.rb +1 -1
  358. data/spec/models/reserve_spec.rb +1 -1
  359. data/spec/models/reserve_stat_has_manifestation_spec.rb +1 -1
  360. data/spec/models/reserve_stat_has_user_spec.rb +1 -1
  361. data/spec/models/use_resetriction_spec.rb +1 -1
  362. data/spec/models/user_spec.rb +2 -2
  363. data/spec/rails_helper.rb +1 -14
  364. data/spec/routing/checked_items_routing_spec.rb +7 -7
  365. data/spec/support/tasks.rb +30 -0
  366. data/spec/tasks/export_checkout_spec.rb +37 -0
  367. data/spec/views/checkout_types/edit.html.erb_spec.rb +8 -8
  368. data/spec/views/checkout_types/index.html.erb_spec.rb +9 -9
  369. data/spec/views/checkout_types/new.html.erb_spec.rb +8 -8
  370. data/spec/views/checkout_types/show.html.erb_spec.rb +4 -4
  371. data/spec/views/checkouts/show.html.erb_spec.rb +2 -2
  372. data/spec/views/reserves/index.html.erb_spec.rb +5 -5
  373. data/spec/views/use_restrictions/edit.html.erb_spec.rb +8 -8
  374. data/spec/views/use_restrictions/index.html.erb_spec.rb +9 -9
  375. data/spec/views/use_restrictions/new.html.erb_spec.rb +8 -8
  376. data/spec/views/use_restrictions/show.html.erb_spec.rb +4 -4
  377. metadata +80 -61
  378. data/app/views/checkouts/index.txt.erb +0 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: dda5244be075c380ff8290904ec4d0bd0503d075
4
- data.tar.gz: 76ea8769aeeb402fe0516f8b38bc7b80a7fd6114
3
+ metadata.gz: 2171f72d6b8294ecadc813f1fce2913b181b8ada
4
+ data.tar.gz: 7cc0cce388307b726847650cbdf55ecea30b8754
5
5
  SHA512:
6
- metadata.gz: 7f9b1b8a03dfa58fe4710fdd65ca34a00f0b44e6cbcf54a506b0197d3b63237aacecd6ead72a44a437e978f3dfba4d73d06b1b41c6110ed7a41461fa6d2b589f
7
- data.tar.gz: c02c164437b5b2183841af93e8163adc3dfdcb97633de55f11755124f094e12a7d72675b97492b6adb553874a2b6d4f1a8c5a47a1af05cf8bbf55233d950721d
6
+ metadata.gz: 231d92bae9545ef89cf5a88a4db5e33664f9d3504c6c937beb84c7c32641d62c0919ac828fe5ed634df3ff09227518e37c6d081a16212972909eeb9f96f7fcfe
7
+ data.tar.gz: 2c7ccd5a94d2277fa33e96aa403ad2c09f0ffb858e4b3eada1ee3660a293b58518401ab27c61c3d242f0e27a83a44de67fbbe4f1397d59b84b51913a75ec03a8
@@ -1,10 +1,10 @@
1
1
  = EnjuCirculation
2
- {<img src="https://travis-ci.org/next-l/enju_circulation.svg?branch=1.2" alt="Build Status" />}[https://travis-ci.org/next-l/enju_circulation]
3
- {<img src="https://coveralls.io/repos/next-l/enju_circulation/badge.svg?branch=1.2&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_circulation?branch=1.2]
4
- {<img src="https://hakiri.io/github/next-l/enju_circulation/1.2.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_circulation/1.2]
2
+ {<img src="https://travis-ci.org/next-l/enju_circulation.svg?branch=1.3" alt="Build Status" />}[https://travis-ci.org/next-l/enju_circulation]
3
+ {<img src="https://coveralls.io/repos/next-l/enju_circulation/badge.svg?branch=1.3&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_circulation?branch=1.3]
4
+ {<img src="https://hakiri.io/github/next-l/enju_circulation/1.3.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_circulation/1.3]
5
5
 
6
6
  This project rocks and uses MIT-LICENSE.
7
7
 
8
8
  == 製作者・貢献者 (Authors and contributors)
9
9
  * {TANABE, Kosuke}[https://github.com/nabeta] ({@nabeta}[https://twitter.com/nabeta])
10
- * {Project Next-L}[http://www.next-l.jp] ({@ProjectNextL}[https://twitter.com/ProjectNextL])
10
+ * {Project Next-L}[https://www.next-l.jp] ({@ProjectNextL}[https://twitter.com/ProjectNextL])
data/Rakefile CHANGED
@@ -33,7 +33,7 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
33
33
  spec.pattern = FileList['spec/**/*_spec.rb']
34
34
  end
35
35
 
36
- task :default => :spec
36
+ task default: :spec
37
37
  require 'rake/testtask'
38
38
 
39
39
  Rake::TestTask.new(:test) do |t|
@@ -44,4 +44,4 @@ Rake::TestTask.new(:test) do |t|
44
44
  end
45
45
 
46
46
 
47
- task :default => :spec
47
+ task default: :spec
@@ -63,7 +63,7 @@ class CarrierTypeHasCheckoutTypesController < ApplicationController
63
63
  # PUT /carrier_type_has_checkout_types/1.json
64
64
  def update
65
65
  respond_to do |format|
66
- if @carrier_type_has_checkout_type.update_attributes(carrier_type_has_checkout_type_params)
66
+ if @carrier_type_has_checkout_type.update(carrier_type_has_checkout_type_params)
67
67
  flash[:notice] = t('controller.successfully_updated', model: t('activerecord.models.carrier_type_has_checkout_type'))
68
68
  format.html { redirect_to @carrier_type_has_checkout_type }
69
69
  format.json { head :no_content }
@@ -87,6 +87,7 @@ class CarrierTypeHasCheckoutTypesController < ApplicationController
87
87
  end
88
88
 
89
89
  private
90
+
90
91
  def set_carrier_type_has_checkout_type
91
92
  @carrier_type_has_checkout_type = CarrierTypeHasCheckoutType.find(params[:id])
92
93
  authorize @carrier_type_has_checkout_type
@@ -89,7 +89,7 @@ class CheckedItemsController < ApplicationController
89
89
  end
90
90
 
91
91
  respond_to do |format|
92
- if @checked_item.update_attributes(checked_item_params)
92
+ if @checked_item.update(checked_item_params)
93
93
  format.html { redirect_to checked_item_url(@checked_item), notice: t('controller.successfully_updated', model: t('activerecord.models.checked_item')) }
94
94
  format.json { head :no_content }
95
95
  else
@@ -111,6 +111,7 @@ class CheckedItemsController < ApplicationController
111
111
  end
112
112
 
113
113
  private
114
+
114
115
  def set_checked_item
115
116
  @checked_item = CheckedItem.find(params[:id])
116
117
  authorize @checked_item
@@ -22,7 +22,7 @@ class CheckinsController < ApplicationController
22
22
  # GET /checkins/1
23
23
  # GET /checkins/1.json
24
24
  def show
25
- #@checkin = Checkin.find(params[:id])
25
+ # @checkin = Checkin.find(params[:id])
26
26
 
27
27
  respond_to do |format|
28
28
  format.html # show.html.erb
@@ -52,7 +52,7 @@ class CheckinsController < ApplicationController
52
52
 
53
53
  # GET /checkins/1/edit
54
54
  def edit
55
- #@checkin = Checkin.find(params[:id])
55
+ # @checkin = Checkin.find(params[:id])
56
56
  end
57
57
 
58
58
  # POST /checkins
@@ -108,7 +108,7 @@ class CheckinsController < ApplicationController
108
108
  # DELETE /checkins/1
109
109
  # DELETE /checkins/1.json
110
110
  def destroy
111
- #@checkin = Checkin.find(params[:id])
111
+ # @checkin = Checkin.find(params[:id])
112
112
  @checkin.destroy
113
113
 
114
114
  respond_to do |format|
@@ -118,6 +118,7 @@ class CheckinsController < ApplicationController
118
118
  end
119
119
 
120
120
  private
121
+
121
122
  def set_checkin
122
123
  @checkin = Checkin.find(params[:id])
123
124
  authorize @checkin
@@ -79,7 +79,7 @@ class CheckoutTypesController < ApplicationController
79
79
  end
80
80
 
81
81
  respond_to do |format|
82
- if @checkout_type.update_attributes(checkout_type_params)
82
+ if @checkout_type.update(checkout_type_params)
83
83
  format.html { redirect_to @checkout_type, notice: t('controller.successfully_updated', model: t('activerecord.models.checkout_type')) }
84
84
  format.json { head :no_content }
85
85
  else
@@ -104,6 +104,7 @@ class CheckoutTypesController < ApplicationController
104
104
  end
105
105
 
106
106
  private
107
+
107
108
  def set_checkout_type
108
109
  @checkout_type = CheckoutType.find(params[:id])
109
110
  authorize @checkout_type
@@ -167,6 +167,7 @@ class CheckoutsController < ApplicationController
167
167
  end
168
168
 
169
169
  private
170
+
170
171
  def set_checkout
171
172
  @checkout = Checkout.find(params[:id])
172
173
  authorize @checkout
@@ -62,7 +62,7 @@ class CirculationStatusesController < ApplicationController
62
62
  end
63
63
 
64
64
  respond_to do |format|
65
- if @circulation_status.update_attributes(circulation_status_params)
65
+ if @circulation_status.update(circulation_status_params)
66
66
  format.html { redirect_to @circulation_status, notice: t('controller.successfully_updated', model: t('activerecord.models.circulation_status')) }
67
67
  format.json { head :no_content }
68
68
  else
@@ -84,6 +84,7 @@ class CirculationStatusesController < ApplicationController
84
84
  end
85
85
 
86
86
  private
87
+
87
88
  def set_circulation_status
88
89
  @circulation_status = CirculationStatus.find(params[:id])
89
90
  authorize @circulation_status
@@ -58,7 +58,7 @@ class DemandsController < ApplicationController
58
58
  # PUT /demands/1.json
59
59
  def update
60
60
  respond_to do |format|
61
- if @demand.update_attributes(demand_params)
61
+ if @demand.update(demand_params)
62
62
  format.html { redirect_to @demand, notice: t('controller.successfully_updated', model: t('activerecord.models.demand')) }
63
63
  format.json { head :no_content }
64
64
  else
@@ -80,6 +80,7 @@ class DemandsController < ApplicationController
80
80
  end
81
81
 
82
82
  private
83
+
83
84
  def set_demand
84
85
  @demand = Demand.find(params[:id])
85
86
  authorize @demand
@@ -89,6 +89,7 @@ class ItemHasUseRestrictionsController < ApplicationController
89
89
  end
90
90
 
91
91
  private
92
+
92
93
  def set_item_has_use_restriction
93
94
  @item_has_use_restriction = ItemHasUseRestriction.find(params[:id])
94
95
  authorize @item_has_use_restriction
@@ -60,7 +60,7 @@ class LendingPoliciesController < ApplicationController
60
60
  # PUT /lending_policies/1.json
61
61
  def update
62
62
  respond_to do |format|
63
- if @lending_policy.update_attributes(lending_policy_params)
63
+ if @lending_policy.update(lending_policy_params)
64
64
  format.html { redirect_to @lending_policy, notice: t('controller.successfully_updated', model: t('activerecord.models.lending_policy')) }
65
65
  format.json { head :no_content }
66
66
  else
@@ -83,6 +83,7 @@ class LendingPoliciesController < ApplicationController
83
83
  end
84
84
 
85
85
  private
86
+
86
87
  def set_lending_policy
87
88
  @lending_policy = LendingPolicy.find(params[:id])
88
89
  authorize @lending_policy
@@ -96,7 +96,7 @@ class ManifestationCheckoutStatsController < ApplicationController
96
96
  # PUT /manifestation_checkout_stats/1.json
97
97
  def update
98
98
  respond_to do |format|
99
- if @manifestation_checkout_stat.update_attributes(manifestation_checkout_stat_params)
99
+ if @manifestation_checkout_stat.update(manifestation_checkout_stat_params)
100
100
  if @manifestation_checkout_stat.mode == 'import'
101
101
  ManifestationCheckoutStatJob.perform_later(@manifestation_checkout_stat)
102
102
  end
@@ -121,6 +121,7 @@ class ManifestationCheckoutStatsController < ApplicationController
121
121
  end
122
122
 
123
123
  private
124
+
124
125
  def set_manifestation_checkout_stat
125
126
  @manifestation_checkout_stat = ManifestationCheckoutStat.find(params[:id])
126
127
  authorize @manifestation_checkout_stat
@@ -69,7 +69,7 @@ class ManifestationReserveStatsController < ApplicationController
69
69
  # PUT /manifestation_reserve_stats/1.json
70
70
  def update
71
71
  respond_to do |format|
72
- if @manifestation_reserve_stat.update_attributes(manifestation_reserve_stat_params)
72
+ if @manifestation_reserve_stat.update(manifestation_reserve_stat_params)
73
73
  if @manifestation_reserve_stat.mode == 'import'
74
74
  ManifestationReserveStatJob.perform_later(@manifestation_reserve_stat)
75
75
  end
@@ -94,6 +94,7 @@ class ManifestationReserveStatsController < ApplicationController
94
94
  end
95
95
 
96
96
  private
97
+
97
98
  def set_manifestation_reserve_stat
98
99
  @manifestation_reserve_stat = ManifestationReserveStat.find(params[:id])
99
100
  authorize @manifestation_reserve_stat
@@ -42,7 +42,7 @@ class ReservesController < ApplicationController
42
42
  page = params[:page] || 1
43
43
  end
44
44
 
45
- if params[:mode] == 'hold' and current_user.has_role?('Librarian')
45
+ if (params[:mode] == 'hold') && current_user.has_role?('Librarian')
46
46
  search.build do
47
47
  with(:hold).equal_to true
48
48
  end
@@ -139,7 +139,7 @@ class ReservesController < ApplicationController
139
139
  authorize @manifestation, :show?
140
140
  @reserve.manifestation = @manifestation
141
141
  if @reserve.user
142
- #@reserve.expired_at = @manifestation.reservation_expired_period(@reserve.user).days.from_now.end_of_day
142
+ # @reserve.expired_at = @manifestation.reservation_expired_period(@reserve.user).days.from_now.end_of_day
143
143
  if @manifestation.is_reserved_by?(@reserve.user)
144
144
  flash[:notice] = t('reserve.this_manifestation_is_already_reserved')
145
145
  redirect_to @manifestation
@@ -201,7 +201,7 @@ class ReservesController < ApplicationController
201
201
  @reserve.transition_to!(:canceled)
202
202
  else
203
203
  if @reserve.retained?
204
- if @reserve.item_identifier.present? and @reserve.force_retaining == '1'
204
+ if @reserve.item_identifier.present? && (@reserve.force_retaining == '1')
205
205
  @reserve.transition_to!(:retained)
206
206
  end
207
207
  else
@@ -231,7 +231,7 @@ class ReservesController < ApplicationController
231
231
  # DELETE /reserves/1.json
232
232
  def destroy
233
233
  @reserve.destroy
234
- #flash[:notice] = t('reserve.reservation_was_canceled')
234
+ # flash[:notice] = t('reserve.reservation_was_canceled')
235
235
 
236
236
  if @reserve.manifestation.is_reserved?
237
237
  if @reserve.item
@@ -249,6 +249,7 @@ class ReservesController < ApplicationController
249
249
  end
250
250
 
251
251
  private
252
+
252
253
  def set_reserve
253
254
  @reserve = Reserve.find(params[:id])
254
255
  authorize @reserve
@@ -62,7 +62,7 @@ class UseRestrictionsController < ApplicationController
62
62
  end
63
63
 
64
64
  respond_to do |format|
65
- if @use_restriction.update_attributes(use_restriction_params)
65
+ if @use_restriction.update(use_restriction_params)
66
66
  format.html { redirect_to @use_restriction, notice: t('controller.successfully_updated', model: t('activerecord.models.use_restriction')) }
67
67
  format.json { head :no_content }
68
68
  else
@@ -84,6 +84,7 @@ class UseRestrictionsController < ApplicationController
84
84
  end
85
85
 
86
86
  private
87
+
87
88
  def set_use_restriction
88
89
  @use_restriction = UseRestriction.find(params[:id])
89
90
  authorize @use_restriction
@@ -68,7 +68,7 @@ class UserCheckoutStatsController < ApplicationController
68
68
  # PUT /user_checkout_stats/1.json
69
69
  def update
70
70
  respond_to do |format|
71
- if @user_checkout_stat.update_attributes(user_checkout_stat_params)
71
+ if @user_checkout_stat.update(user_checkout_stat_params)
72
72
  if @user_checkout_stat.mode == 'import'
73
73
  UserCheckoutStatJob.perform_later(@user_checkout_stat)
74
74
  end
@@ -93,6 +93,7 @@ class UserCheckoutStatsController < ApplicationController
93
93
  end
94
94
 
95
95
  private
96
+
96
97
  def set_user_checkout_stat
97
98
  @user_checkout_stat = UserCheckoutStat.find(params[:id])
98
99
  authorize @user_checkout_stat
@@ -28,8 +28,8 @@ class UserGroupHasCheckoutTypesController < ApplicationController
28
28
  # GET /user_group_has_checkout_types/new.json
29
29
  def new
30
30
  @user_group_has_checkout_type = UserGroupHasCheckoutType.new(
31
- :checkout_type => get_checkout_type,
32
- :user_group => get_user_group
31
+ checkout_type: get_checkout_type,
32
+ user_group: get_user_group
33
33
  )
34
34
 
35
35
  respond_to do |format|
@@ -63,7 +63,7 @@ class UserGroupHasCheckoutTypesController < ApplicationController
63
63
  # PUT /user_group_has_checkout_types/1.json
64
64
  def update
65
65
  respond_to do |format|
66
- if @user_group_has_checkout_type.update_attributes(user_group_has_checkout_type_params)
66
+ if @user_group_has_checkout_type.update(user_group_has_checkout_type_params)
67
67
  format.html { redirect_to @user_group_has_checkout_type, notice: t('controller.successfully_updated', model: t('activerecord.models.user_group_has_checkout_type')) }
68
68
  format.json { head :no_content }
69
69
  else
@@ -86,6 +86,7 @@ class UserGroupHasCheckoutTypesController < ApplicationController
86
86
  end
87
87
 
88
88
  private
89
+
89
90
  def set_user_group_has_checkout_type
90
91
  @user_group_has_checkout_type = UserGroupHasCheckoutType.find(params[:id])
91
92
  authorize @user_group_has_checkout_type
@@ -68,7 +68,7 @@ class UserReserveStatsController < ApplicationController
68
68
  # PUT /user_reserve_stats/1.json
69
69
  def update
70
70
  respond_to do |format|
71
- if @user_reserve_stat.update_attributes(user_reserve_stat_params)
71
+ if @user_reserve_stat.update(user_reserve_stat_params)
72
72
  if @user_reserve_stat.mode == 'import'
73
73
  UserReserveStatJob.perform_later(@user_reserve_stat)
74
74
  end
@@ -93,6 +93,7 @@ class UserReserveStatsController < ApplicationController
93
93
  end
94
94
 
95
95
  private
96
+
96
97
  def set_user_reserve_stat
97
98
  @user_reserve_stat = UserReserveStat.find(params[:id])
98
99
  authorize @user_reserve_stat
@@ -3,14 +3,14 @@ module ItemsHelper
3
3
  string = ''
4
4
  circulation_status = CirculationStatus.where(name: facet.value).select([:name, :display_name]).first
5
5
  if circulation_status
6
- #string << form_icon(circulation_status)
6
+ # string << form_icon(circulation_status)
7
7
  current = true if params[:circulation_status] == circulation_status.name
8
8
  if current
9
9
  content_tag :strong do
10
- link_to("#{circulation_status.display_name.localize} (" + facet.count.to_s + ")", url_for(params.merge(circulation_status: circulation_status.name, page: nil, view: nil, only_path: true)))
10
+ link_to("#{circulation_status.display_name.localize} (" + facet.count.to_s + ")", url_for(filtered_params.merge(circulation_status: circulation_status.name, page: nil, view: nil, only_path: true)))
11
11
  end
12
12
  else
13
- link_to("#{circulation_status.display_name.localize} (" + facet.count.to_s + ")", url_for(params.merge(circulation_status: circulation_status.name, page: nil, view: nil, only_path: true)))
13
+ link_to("#{circulation_status.display_name.localize} (" + facet.count.to_s + ")", url_for(filtered_params.merge(circulation_status: circulation_status.name, page: nil, view: nil, only_path: true)))
14
14
  end
15
15
  end
16
16
  end
@@ -5,9 +5,9 @@ class CarrierTypeHasCheckoutType < ActiveRecord::Base
5
5
  belongs_to :carrier_type, validate: true
6
6
  belongs_to :checkout_type, validate: true
7
7
 
8
- validates_presence_of :carrier_type, :checkout_type
8
+ validates :carrier_type, :checkout_type, presence: true
9
9
  validates_associated :carrier_type, :checkout_type
10
- validates_uniqueness_of :checkout_type_id, scope: :carrier_type_id
10
+ validates :checkout_type_id, uniqueness: { scope: :carrier_type_id }
11
11
 
12
12
  acts_as_list scope: :carrier_type_id
13
13
  end
@@ -1,11 +1,11 @@
1
1
  class CheckedItem < ActiveRecord::Base
2
- belongs_to :item #, validate: true
3
- belongs_to :basket #, validate: true
4
- belongs_to :librarian, class_name: 'User' #, validate: true
2
+ belongs_to :item
3
+ belongs_to :basket
4
+ belongs_to :librarian, class_name: 'User', optional: true
5
5
 
6
6
  validates_associated :item, :basket, on: :update
7
- validates_presence_of :item, :basket, :due_date, on: :update
8
- validates_uniqueness_of :item_id, scope: :basket_id
7
+ validates :item, :basket, :due_date, presence: { on: :update }
8
+ validates :item_id, uniqueness: { scope: :basket_id }
9
9
  validate :available_for_checkout?, on: :create
10
10
  validates :due_date_string, format: {with: /\A\[{0,1}\d+([\/-]\d{0,2}){0,2}\]{0,1}\z/}, allow_blank: true
11
11
  validate :check_due_date
@@ -14,7 +14,7 @@ class CheckedItem < ActiveRecord::Base
14
14
  before_validation :set_due_date, on: :create
15
15
  strip_attributes only: :item_identifier
16
16
 
17
- #attr_protected :user_id
17
+ # attr_protected :user_id
18
18
  attr_accessor :item_identifier, :ignore_restriction, :due_date_string
19
19
 
20
20
  def available_for_checkout?
@@ -72,7 +72,7 @@ class CheckedItem < ActiveRecord::Base
72
72
  end
73
73
 
74
74
  def item_checkout_type
75
- if item and basket
75
+ if item && basket
76
76
  basket.user.profile.user_group.user_group_has_checkout_types.available_for_item(item).first
77
77
  end
78
78
  end
@@ -86,10 +86,10 @@ class CheckedItem < ActiveRecord::Base
86
86
  return nil if lending_rule.nil?
87
87
 
88
88
  if lending_rule.fixed_due_date.blank?
89
- #self.due_date = item_checkout_type.checkout_period.days.since Time.zone.today
89
+ # self.due_date = item_checkout_type.checkout_period.days.since Time.zone.today
90
90
  self.due_date = lending_rule.loan_period.days.since(Time.zone.now).end_of_day
91
91
  else
92
- #self.due_date = item_checkout_type.fixed_due_date
92
+ # self.due_date = item_checkout_type.fixed_due_date
93
93
  self.due_date = lending_rule.fixed_due_date.tomorrow.end_of_day
94
94
  end
95
95
  # 返却期限日が閉館日の場合
@@ -113,6 +113,7 @@ class CheckedItem < ActiveRecord::Base
113
113
  end
114
114
 
115
115
  private
116
+
116
117
  def check_due_date
117
118
  return nil unless due_date
118
119
  if due_date <= Time.zone.now
@@ -6,8 +6,8 @@ class Checkin < ActiveRecord::Base
6
6
  belongs_to :librarian, class_name: 'User'
7
7
  belongs_to :basket
8
8
 
9
- validates_uniqueness_of :item_id, scope: :basket_id
10
- validates_presence_of :item_id, :basket_id
9
+ validates :item_id, uniqueness: { scope: :basket_id }
10
+ validates :item_id, :basket_id, presence: true
11
11
  validate :available_for_checkin?, on: :create
12
12
  before_validation :set_item
13
13
 
@@ -62,8 +62,8 @@ class Checkin < ActiveRecord::Base
62
62
  end
63
63
 
64
64
  # メールとメッセージの送信
65
- #ReservationNotifier.deliver_reserved(item.manifestation.reserves.first.user, item.manifestation)
66
- #Message.create(sender: current_user, receiver: item.manifestation.next_reservation.user, subject: message_template.title, body: message_template.body, recipient: item.manifestation.next_reservation.user)
65
+ # ReservationNotifier.deliver_reserved(item.manifestation.reserves.first.user, item.manifestation)
66
+ # Message.create(sender: current_user, receiver: item.manifestation.next_reservation.user, subject: message_template.title, body: message_template.body, recipient: item.manifestation.next_reservation.user)
67
67
  end
68
68
  if message.present?
69
69
  message