enju_message 0.2.4 → 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 (229) hide show
  1. checksums.yaml +4 -4
  2. data/README.rdoc +4 -4
  3. data/Rakefile +2 -2
  4. data/app/assets/config/enju_message_manifest.js +0 -0
  5. data/app/controllers/message_requests_controller.rb +3 -2
  6. data/app/controllers/message_templates_controller.rb +4 -3
  7. data/app/controllers/messages_controller.rb +3 -2
  8. data/app/models/concerns/enju_message/enju_user.rb +2 -2
  9. data/app/models/message.rb +4 -4
  10. data/app/models/message_request.rb +12 -13
  11. data/app/models/message_request_transition.rb +1 -1
  12. data/app/models/message_template.rb +2 -2
  13. data/app/models/message_transition.rb +1 -1
  14. data/app/views/messages/index.atom.builder +1 -1
  15. data/app/views/messages/index.rss.builder +7 -12
  16. data/config/routes.rb +1 -1
  17. data/db/migrate/149_create_message_templates.rb +6 -6
  18. data/db/migrate/154_create_messages.rb +1 -1
  19. data/db/migrate/20080819181903_create_message_requests.rb +1 -1
  20. data/db/migrate/20110913115320_add_lft_and_rgt_to_message.rb +1 -1
  21. data/db/migrate/20120125050502_add_depth_to_message.rb +1 -1
  22. data/db/migrate/20140518111006_create_message_transitions.rb +1 -1
  23. data/db/migrate/20140518135713_create_message_request_transitions.rb +1 -1
  24. data/db/migrate/20160703185015_add_most_recent_to_message_transitions.rb +1 -1
  25. data/db/migrate/20160814165332_add_most_recent_to_message_request_transitions.rb +1 -1
  26. data/db/migrate/20180107162659_add_constraints_to_most_recent_for_message_transitions.rb +2 -2
  27. data/db/migrate/20180107162711_add_constraints_to_most_recent_for_message_request_transitions.rb +2 -2
  28. data/lib/enju_message/engine.rb +1 -0
  29. data/lib/enju_message/version.rb +1 -1
  30. data/lib/generators/enju_message/setup/setup_generator.rb +1 -1
  31. data/lib/tasks/enju_message_tasks.rake +3 -3
  32. data/lib/tasks/message_template.rb +1 -1
  33. data/spec/controllers/message_requests_controller_spec.rb +28 -28
  34. data/spec/controllers/message_templates_controller_spec.rb +45 -45
  35. data/spec/controllers/messages_controller_spec.rb +49 -49
  36. data/spec/dummy/app/models/user.rb +1 -1
  37. data/spec/dummy/bin/rails +1 -1
  38. data/spec/dummy/bin/setup +21 -12
  39. data/spec/dummy/bin/update +29 -0
  40. data/spec/dummy/bin/yarn +11 -0
  41. data/spec/dummy/config/application.rb +6 -16
  42. data/spec/dummy/config/boot.rb +4 -9
  43. data/spec/dummy/config/cable.yml +10 -0
  44. data/spec/dummy/config/database.yml +17 -22
  45. data/spec/dummy/config/environment.rb +4 -4
  46. data/spec/dummy/config/environments/development.rb +24 -11
  47. data/spec/dummy/config/environments/production.rb +28 -16
  48. data/spec/dummy/config/environments/test.rb +6 -8
  49. data/spec/dummy/config/initializers/application_controller_renderer.rb +8 -0
  50. data/spec/dummy/config/initializers/assets.rb +14 -0
  51. data/spec/dummy/config/initializers/cookies_serializer.rb +5 -0
  52. data/spec/dummy/config/initializers/filter_parameter_logging.rb +4 -0
  53. data/spec/dummy/config/initializers/inflections.rb +9 -3
  54. data/spec/dummy/config/initializers/mime_types.rb +0 -1
  55. data/spec/dummy/config/initializers/wrap_parameters.rb +5 -5
  56. data/spec/dummy/config/puma.rb +56 -0
  57. data/spec/dummy/config/secrets.yml +32 -0
  58. data/spec/dummy/config/spring.rb +6 -0
  59. data/spec/dummy/config/sunspot.yml +23 -0
  60. data/spec/dummy/db/migrate/001_create_agents.rb +7 -7
  61. data/spec/dummy/db/migrate/002_devise_create_users.rb +6 -6
  62. data/spec/dummy/db/migrate/005_create_manifestations.rb +13 -13
  63. data/spec/dummy/db/migrate/006_create_items.rb +6 -6
  64. data/spec/dummy/db/migrate/012_create_owns.rb +3 -3
  65. data/spec/dummy/db/migrate/015_create_creates.rb +3 -3
  66. data/spec/dummy/db/migrate/041_create_roles.rb +3 -3
  67. data/spec/dummy/db/migrate/047_create_produces.rb +3 -3
  68. data/spec/dummy/db/migrate/059_create_libraries.rb +1 -1
  69. data/spec/dummy/db/migrate/069_create_shelves.rb +1 -1
  70. data/spec/dummy/db/migrate/073_create_carrier_types.rb +2 -2
  71. data/spec/dummy/db/migrate/077_create_user_groups.rb +2 -2
  72. data/spec/dummy/db/migrate/080_create_library_groups.rb +1 -1
  73. data/spec/dummy/db/migrate/112_create_frequencies.rb +2 -2
  74. data/spec/dummy/db/migrate/117_create_form_of_works.rb +2 -2
  75. data/spec/dummy/db/migrate/120_create_baskets.rb +1 -1
  76. data/spec/dummy/db/migrate/124_create_bookstores.rb +2 -2
  77. data/spec/dummy/db/migrate/125_create_donates.rb +3 -3
  78. data/spec/dummy/db/migrate/130_create_request_status_types.rb +2 -2
  79. data/spec/dummy/db/migrate/131_create_request_types.rb +2 -2
  80. data/spec/dummy/db/migrate/133_create_agent_merges.rb +2 -2
  81. data/spec/dummy/db/migrate/134_create_agent_merge_lists.rb +1 -1
  82. data/spec/dummy/db/migrate/20080830154109_create_realizes.rb +3 -3
  83. data/spec/dummy/db/migrate/20080830172106_create_exemplifies.rb +4 -4
  84. data/spec/dummy/db/migrate/20080905191442_create_agent_types.rb +2 -2
  85. data/spec/dummy/db/migrate/20081006090811_create_subscriptions.rb +1 -1
  86. data/spec/dummy/db/migrate/20081006093246_create_subscribes.rb +1 -1
  87. data/spec/dummy/db/migrate/20081023092436_create_search_engines.rb +6 -6
  88. data/spec/dummy/db/migrate/20081025083323_create_countries.rb +5 -5
  89. data/spec/dummy/db/migrate/20081025083905_create_languages.rb +6 -6
  90. data/spec/dummy/db/migrate/20081027150907_create_picture_files.rb +2 -2
  91. data/spec/dummy/db/migrate/20081028083142_create_agent_import_files.rb +1 -1
  92. data/spec/dummy/db/migrate/20081028083208_create_resource_import_files.rb +1 -1
  93. data/spec/dummy/db/migrate/20090705133942_add_attachments_picture_to_picture_file.rb +1 -1
  94. data/spec/dummy/db/migrate/20090705212043_add_attachments_attachment_to_manifestation.rb +1 -1
  95. data/spec/dummy/db/migrate/20090719201843_create_extents.rb +2 -2
  96. data/spec/dummy/db/migrate/20090720091106_create_medium_of_performances.rb +2 -2
  97. data/spec/dummy/db/migrate/20090720091429_create_content_types.rb +2 -2
  98. data/spec/dummy/db/migrate/20090812151902_create_agent_relationship_types.rb +2 -2
  99. data/spec/dummy/db/migrate/20091012101112_add_dcndl_schema.rb +1 -1
  100. data/spec/dummy/db/migrate/20091025080447_create_licenses.rb +2 -2
  101. data/spec/dummy/db/migrate/20091202124834_create_versions.rb +4 -4
  102. data/spec/dummy/db/migrate/20091214131723_create_series_statements.rb +1 -1
  103. data/spec/dummy/db/migrate/20100129142347_create_import_requests.rb +1 -1
  104. data/spec/dummy/db/migrate/20100211105551_add_admin_networks_to_library_group.rb +1 -1
  105. data/spec/dummy/db/migrate/20100223121519_rename_series_statement_title_to_original_title.rb +1 -1
  106. data/spec/dummy/db/migrate/20100314190054_add_opening_hour_to_library.rb +1 -1
  107. data/spec/dummy/db/migrate/20100321235924_add_series_statement_identifier_to_series_statement.rb +1 -1
  108. data/spec/dummy/db/migrate/20100525124311_create_manifestation_relationships.rb +1 -1
  109. data/spec/dummy/db/migrate/20100606065209_create_user_has_roles.rb +1 -1
  110. data/spec/dummy/db/migrate/20100606073747_create_agent_relationships.rb +1 -1
  111. data/spec/dummy/db/migrate/20100607044753_create_manifestation_relationship_types.rb +2 -2
  112. data/spec/dummy/db/migrate/20100814091104_add_position_to_agent_relationship.rb +1 -1
  113. data/spec/dummy/db/migrate/20100925043847_create_resource_import_results.rb +1 -1
  114. data/spec/dummy/db/migrate/20100925074559_create_agent_import_results.rb +1 -1
  115. data/spec/dummy/db/migrate/20101212070145_add_acquired_at_to_item.rb +1 -1
  116. data/spec/dummy/db/migrate/20110222073537_add_url_to_library_group.rb +2 -2
  117. data/spec/dummy/db/migrate/20110301035123_add_pub_date_to_manifestation.rb +1 -1
  118. data/spec/dummy/db/migrate/20110301121550_add_birth_date_and_death_date_to_agent.rb +1 -1
  119. data/spec/dummy/db/migrate/20110318183304_add_valid_period_for_new_user_to_user_group.rb +2 -2
  120. data/spec/dummy/db/migrate/20110603184217_add_edit_mode_to_resource_import_file.rb +1 -1
  121. data/spec/dummy/db/migrate/20110619064807_add_edition_string_to_manifestation.rb +1 -1
  122. data/spec/dummy/db/migrate/20110620173525_add_bookstore_id_to_item.rb +1 -1
  123. data/spec/dummy/db/migrate/20110627034940_create_series_statement_merge_lists.rb +1 -1
  124. data/spec/dummy/db/migrate/20110627035057_create_series_statement_merges.rb +3 -3
  125. data/spec/dummy/db/migrate/20110916091020_add_volume_number_to_manifestation.rb +1 -1
  126. data/spec/dummy/db/migrate/20110916103953_add_manifestaiton_id_to_series_statement.rb +1 -1
  127. data/spec/dummy/db/migrate/20110918162329_add_note_to_series_statement.rb +1 -1
  128. data/spec/dummy/db/migrate/20111124110059_create_create_types.rb +1 -1
  129. data/spec/dummy/db/migrate/20111124110319_create_realize_types.rb +1 -1
  130. data/spec/dummy/db/migrate/20111124110355_create_produce_types.rb +1 -1
  131. data/spec/dummy/db/migrate/20111124112131_add_create_type_to_create.rb +1 -1
  132. data/spec/dummy/db/migrate/20120105074911_add_isil_to_library.rb +1 -1
  133. data/spec/dummy/db/migrate/20120125152919_add_title_subseries_transcription_to_series_statement.rb +1 -1
  134. data/spec/dummy/db/migrate/20120129014038_create_budget_types.rb +1 -1
  135. data/spec/dummy/db/migrate/20120129020544_add_budget_type_id_to_item.rb +1 -1
  136. data/spec/dummy/db/migrate/20120319120638_add_content_type_id_to_manifestation.rb +2 -2
  137. data/spec/dummy/db/migrate/20120319173203_create_accepts.rb +1 -1
  138. data/spec/dummy/db/migrate/20120410104851_add_year_of_publication_to_manifestation.rb +1 -1
  139. data/spec/dummy/db/migrate/20120413072700_add_picture_meta_to_picture_file.rb +1 -1
  140. data/spec/dummy/db/migrate/20120413100352_add_fingerprint_to_picture_file.rb +1 -1
  141. data/spec/dummy/db/migrate/20120413161340_add_fingerprint_to_resource_import_file.rb +1 -1
  142. data/spec/dummy/db/migrate/20120413161403_add_fingerprint_to_agent_import_file.rb +1 -1
  143. data/spec/dummy/db/migrate/20120413170705_add_error_message_to_resource_import_file.rb +1 -1
  144. data/spec/dummy/db/migrate/20120413170720_add_error_message_to_agent_import_file.rb +1 -1
  145. data/spec/dummy/db/migrate/20120415164821_add_attachment_meta_to_manifestation.rb +1 -1
  146. data/spec/dummy/db/migrate/20120418081407_add_month_of_publication_to_manifestation.rb +1 -1
  147. data/spec/dummy/db/migrate/20120510140958_add_closed_to_shelf.rb +2 -2
  148. data/spec/dummy/db/migrate/20120511072422_add_agent_identifier_to_agent.rb +1 -1
  149. data/spec/dummy/db/migrate/20120602141129_add_edit_mode_to_agent_import_file.rb +1 -1
  150. data/spec/dummy/db/migrate/20121116031206_add_fulltext_content_to_manifestation.rb +1 -1
  151. data/spec/dummy/db/migrate/20130221154434_add_additional_attributes_to_user.rb +4 -4
  152. data/spec/dummy/db/migrate/20130412083556_add_latitude_and_longitude_to_library.rb +1 -1
  153. data/spec/dummy/db/migrate/20130421093852_add_periodical_to_manifestation.rb +1 -1
  154. data/spec/dummy/db/migrate/20130421155019_add_creator_string_to_series_statement.rb +1 -1
  155. data/spec/dummy/db/migrate/20130421164124_add_series_master_to_series_statement.rb +1 -1
  156. data/spec/dummy/db/migrate/20130429020822_add_root_manifestation_id_to_series_statement.rb +1 -1
  157. data/spec/dummy/db/migrate/20130506175303_create_identifier_types.rb +1 -1
  158. data/spec/dummy/db/migrate/20130506175834_create_identifiers.rb +3 -3
  159. data/spec/dummy/db/migrate/20130509185724_add_statement_of_responsibility_to_manifestation.rb +1 -1
  160. data/spec/dummy/db/migrate/20140110122216_create_user_import_files.rb +1 -1
  161. data/spec/dummy/db/migrate/20140110131010_create_user_import_results.rb +1 -1
  162. data/spec/dummy/db/migrate/20140122054321_create_profiles.rb +2 -2
  163. data/spec/dummy/db/migrate/20140519170214_create_resource_import_file_transitions.rb +1 -1
  164. data/spec/dummy/db/migrate/20140519171220_create_import_request_transitions.rb +1 -1
  165. data/spec/dummy/db/migrate/20140524020735_create_agent_import_file_transitions.rb +1 -1
  166. data/spec/dummy/db/migrate/20140524074813_create_user_import_file_transitions.rb +1 -1
  167. data/spec/dummy/db/migrate/20140610123439_drop_email_unique_constraint_enju_leaf_rc10.rb +1 -1
  168. data/spec/dummy/db/migrate/20140614065404_create_resource_export_files.rb +1 -1
  169. data/spec/dummy/db/migrate/20140614141500_create_resource_export_file_transitions.rb +1 -1
  170. data/spec/dummy/db/migrate/20140628072217_add_user_encoding_to_user_import_file.rb +1 -1
  171. data/spec/dummy/db/migrate/20140628073524_add_user_encoding_to_agent_import_file.rb +1 -1
  172. data/spec/dummy/db/migrate/20140628073535_add_user_encoding_to_resource_import_file.rb +1 -1
  173. data/spec/dummy/db/migrate/20140709113413_create_user_export_files.rb +1 -1
  174. data/spec/dummy/db/migrate/20140709113905_create_user_export_file_transitions.rb +1 -1
  175. data/spec/dummy/db/migrate/20140720140916_add_binding_item_identifier_to_item.rb +1 -1
  176. data/spec/dummy/db/migrate/20140720170714_add_default_library_id_to_user_import_file.rb +1 -1
  177. data/spec/dummy/db/migrate/20140720170735_add_default_user_group_id_to_user_import_file.rb +1 -1
  178. data/spec/dummy/db/migrate/20140721151416_add_default_shelf_id_to_resource_import_file.rb +1 -1
  179. data/spec/dummy/db/migrate/20140802082007_add_manifestation_id_to_item.rb +1 -1
  180. data/spec/dummy/db/migrate/20140811031145_add_expired_at_to_profile.rb +1 -1
  181. data/spec/dummy/db/migrate/20140813182425_add_publication_place_to_manifestation.rb +1 -1
  182. data/spec/dummy/db/migrate/20140817155043_add_extent_of_text_to_manifestation.rb +1 -1
  183. data/spec/dummy/db/migrate/20140821151023_create_colors.rb +1 -1
  184. data/spec/dummy/db/migrate/20140822114527_add_error_message_to_resource_import_result.rb +1 -1
  185. data/spec/dummy/db/migrate/20140823083524_add_extent_to_manifestation.rb +1 -1
  186. data/spec/dummy/db/migrate/20140823094847_add_dimensions_to_manifestation.rb +1 -1
  187. data/spec/dummy/db/migrate/20140823095740_rename_manifestation_periodical_to_serial.rb +1 -1
  188. data/spec/dummy/db/migrate/20141003181336_add_full_name_transcription_to_profile.rb +1 -1
  189. data/spec/dummy/db/migrate/20141003182825_add_date_of_birth_to_profile.rb +1 -1
  190. data/spec/dummy/db/migrate/20150117111136_add_foreign_key_to_items_referencing_manifestations.rb +1 -1
  191. data/spec/dummy/db/migrate/20150221063719_add_settings_to_library_group.rb +1 -1
  192. data/spec/dummy/db/migrate/20150506105356_add_error_message_to_user_import_result.rb +1 -1
  193. data/spec/dummy/db/migrate/20150924115059_create_withdraws.rb +1 -1
  194. data/spec/dummy/db/migrate/20151125004028_add_profile_id_to_agent.rb +1 -1
  195. data/spec/dummy/db/migrate/20151213070943_add_translation_table_to_library_group.rb +1 -1
  196. data/spec/dummy/db/migrate/20151213072705_add_footer_banner_to_library_group.rb +1 -1
  197. data/spec/dummy/db/migrate/20160610093229_add_html_snippet_to_library_group.rb +1 -1
  198. data/spec/dummy/db/migrate/20160627232219_add_most_recent_to_user_import_file_transitions.rb +1 -1
  199. data/spec/dummy/db/migrate/20160627232316_add_most_recent_to_user_export_file_transitions.rb +1 -1
  200. data/spec/dummy/db/migrate/20160801080612_add_most_recent_to_import_request_transitions.rb +1 -1
  201. data/spec/dummy/db/migrate/20160801080619_add_most_recent_to_resource_import_file_transitions.rb +1 -1
  202. data/spec/dummy/db/migrate/20160801080637_add_most_recent_to_resource_export_file_transitions.rb +1 -1
  203. data/spec/dummy/db/migrate/20160801080643_add_most_recent_to_agent_import_file_transitions.rb +1 -1
  204. data/spec/dummy/db/migrate/20160811102604_add_picture_width_to_picture_file.rb +1 -1
  205. data/spec/dummy/db/migrate/20160813191647_add_max_number_of_results_to_library_group.rb +1 -1
  206. data/spec/dummy/db/migrate/20160813191733_add_family_name_first_to_library_group.rb +1 -1
  207. data/spec/dummy/db/migrate/20160813192542_add_pub_year_facet_range_interval_to_library_group.rb +1 -1
  208. data/spec/dummy/db/migrate/20160813203039_add_user_id_to_library_group.rb +1 -1
  209. data/spec/dummy/db/migrate/20160820004638_add_attachment_attachment_to_carrier_types.rb +1 -1
  210. data/spec/dummy/db/migrate/20170305064014_add_csv_charset_conversion_to_library_group.rb +1 -1
  211. data/spec/dummy/db/migrate/20171014084528_add_header_logo_to_library_group.rb +1 -1
  212. data/spec/dummy/db/migrate/20171119051258_set_not_null_to_manifestation_id_on_items.rb +1 -1
  213. data/spec/dummy/db/migrate/20171126133835_rename_login_banner_to_old_login_banner.rb +1 -1
  214. data/spec/dummy/db/migrate/20171126135238_add_foreign_key_to_library_group_id_on_library.rb +1 -1
  215. data/spec/dummy/db/migrate/20180102162311_add_header_logo_meta_to_library_group.rb +1 -1
  216. data/spec/dummy/db/migrate/20180107160726_add_constraints_to_most_recent_for_user_import_file_transitions.rb +2 -2
  217. data/spec/dummy/db/migrate/20180107160740_add_constraints_to_most_recent_for_user_export_file_transitions.rb +2 -2
  218. data/spec/dummy/db/migrate/20180107161311_add_constraints_to_most_recent_for_agent_import_file_transitions.rb +2 -2
  219. data/spec/dummy/db/migrate/20180107161331_add_constraints_to_most_recent_for_resource_import_file_transitions.rb +2 -2
  220. data/spec/dummy/db/migrate/20180107161347_add_constraints_to_most_recent_for_resource_export_file_transitions.rb +2 -2
  221. data/spec/dummy/db/migrate/20180107161410_add_constraints_to_most_recent_for_import_request_transitions.rb +2 -2
  222. data/spec/dummy/db/schema.rb +634 -684
  223. data/spec/dummy/package.json +5 -0
  224. data/spec/factories/library.rb +1 -1
  225. data/spec/factories/message.rb +6 -5
  226. data/spec/factories/message_request.rb +5 -5
  227. data/spec/rails_helper.rb +1 -14
  228. data/spec/views/messages/index.html.erb_spec.rb +5 -5
  229. metadata +77 -52
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: b3331d61ef8da31c2128f7686a3cdcc9c5103ac1
4
- data.tar.gz: 413ff20e2bc783aeeda56c4bd310a747c1aafc41
3
+ metadata.gz: e75af30f09ac93f59585860221a94ba9236b3e2d
4
+ data.tar.gz: 9d3eb4ac9e0ea0bf7703e4d7c170747827739ae9
5
5
  SHA512:
6
- metadata.gz: de8c7f3430f71773fcd2fd1bc6ad2abf92fcb6a6eb5678748b782c9e96005831a13350c4057a435164e1b6909d66f47c7d299d0a8236fbb59d5153281a6b5626
7
- data.tar.gz: 6412dd23c146ab481a3a7a28e8152b947876477233fbca37826a3ef686a2d4e66f6a476f8807af0671ccc2bd7df7797355515e1715b899a0d7048a3744b18b2e
6
+ metadata.gz: 207d25d934a7d825adb0e2ed0c2b0ecc0e9116b934e24523ca6e5b0c27945861b97687a18f846094dbecfc3b7df51da4b16c1c8acc55b13660df874ef7e650cc
7
+ data.tar.gz: c7222db7109beb1c3f3cfc6ab2b92f58fd8a9b2c254c0b5dc90483ba299230a9a6dddd85129604328f158a2a5294913a2b8f6392e23da1676f278300651e65d6
data/README.rdoc CHANGED
@@ -1,10 +1,10 @@
1
1
  = EnjuMessage
2
- {<img src="https://travis-ci.org/next-l/enju_message.svg?branch=1.2" alt="Build Status" />}[https://travis-ci.org/next-l/enju_message]
3
- {<img src="https://coveralls.io/repos/next-l/enju_message/badge.svg?branch=1.2&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_message?branch=1.2]
4
- {<img src="https://hakiri.io/github/next-l/enju_message/1.2.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_message/1.2]
2
+ {<img src="https://travis-ci.org/next-l/enju_message.svg?branch=1.3" alt="Build Status" />}[https://travis-ci.org/next-l/enju_message]
3
+ {<img src="https://coveralls.io/repos/next-l/enju_message/badge.svg?branch=1.3&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_message?branch=1.3]
4
+ {<img src="https://hakiri.io/github/next-l/enju_message/1.3.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_message/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
@@ -39,8 +39,8 @@ require 'rspec/core'
39
39
  require 'rspec/core/rake_task'
40
40
 
41
41
  RSpec::Core::RakeTask.new(:spec) do |spec|
42
- spec.pattern = FileList['spec/**/*_spec.rb']
42
+ spec.pattern = FileList['spec/**/*_spec.rb']
43
43
  end
44
44
 
45
45
 
46
- task :default => :spec
46
+ task default: :spec
File without changes
@@ -38,7 +38,7 @@ class MessageRequestsController < ApplicationController
38
38
  # PUT /message_requests/1.json
39
39
  def update
40
40
  respond_to do |format|
41
- if @message_request.update_attributes(message_request_params)
41
+ if @message_request.update(message_request_params)
42
42
  flash[:notice] = t('controller.successfully_updated', model: t('activerecord.models.message_request'))
43
43
  format.html { redirect_to(@message_request) }
44
44
  format.json { head :no_content }
@@ -62,6 +62,7 @@ class MessageRequestsController < ApplicationController
62
62
  end
63
63
 
64
64
  private
65
+
65
66
  def set_message_request
66
67
  @message_request = MessageRequest.find(params[:id])
67
68
  authorize @message_request
@@ -74,7 +75,7 @@ class MessageRequestsController < ApplicationController
74
75
  def message_request_params
75
76
  params.require(:message_request).permit(
76
77
  :body,
77
- :sender, :receiver, :message_template, :body #, as: :admin
78
+ :sender, :receiver, :message_template, :body # , as: :admin
78
79
  )
79
80
  end
80
81
  end
@@ -44,7 +44,7 @@ class MessageTemplatesController < ApplicationController
44
44
 
45
45
  respond_to do |format|
46
46
  if @message_template.save
47
- format.html { redirect_to @message_template, notice: t('controller.successfully_created', model: t('activerecord.models.message_template')) }
47
+ format.html { redirect_to @message_template, notice: t('controller.successfully_created', model: t('activerecord.models.message_template')) }
48
48
  format.json { render json: @message_template, status: :created, location: @message_template }
49
49
  else
50
50
  format.html { render action: "new" }
@@ -62,8 +62,8 @@ class MessageTemplatesController < ApplicationController
62
62
  end
63
63
 
64
64
  respond_to do |format|
65
- if @message_template.update_attributes(message_template_params)
66
- format.html { redirect_to @message_template, notice: t('controller.successfully_updated', model: t('activerecord.models.message_template')) }
65
+ if @message_template.update(message_template_params)
66
+ format.html { redirect_to @message_template, notice: t('controller.successfully_updated', model: t('activerecord.models.message_template')) }
67
67
  format.json { head :no_content }
68
68
  else
69
69
  format.html { render action: "edit" }
@@ -84,6 +84,7 @@ class MessageTemplatesController < ApplicationController
84
84
  end
85
85
 
86
86
  private
87
+
87
88
  def set_message_template
88
89
  @message_template = MessageTemplate.find(params[:id])
89
90
  authorize @message_template
@@ -23,7 +23,7 @@ class MessagesController < ApplicationController
23
23
  with(:receiver_id).equal_to user.id
24
24
  facet(:is_read)
25
25
  end
26
- @message_facet = Hash[*search.execute!.facet_response['facet_fields']['is_read_b']]
26
+ @message_facet = Hash[*search.execute!.facet_response['facet_fields']['is_read_b']]
27
27
  search.build do
28
28
  with(:is_read).equal_to is_read unless is_read.nil?
29
29
  end
@@ -97,7 +97,7 @@ class MessagesController < ApplicationController
97
97
  def update
98
98
  @message = current_user.received_messages.find(params[:id])
99
99
 
100
- if @message.update_attributes(message_params)
100
+ if @message.update(message_params)
101
101
  format.html { redirect_to @message, notice: t('controller.successfully_updated', model: t('activerecord.models.message')) }
102
102
  format.json { head :no_content }
103
103
  else
@@ -141,6 +141,7 @@ class MessagesController < ApplicationController
141
141
  end
142
142
 
143
143
  private
144
+
144
145
  def set_message
145
146
  if current_user
146
147
  @message = current_user.received_messages.find(params[:id])
@@ -3,8 +3,8 @@ module EnjuMessage
3
3
  extend ActiveSupport::Concern
4
4
 
5
5
  included do
6
- has_many :sent_messages, :foreign_key => 'sender_id', :class_name => 'Message'
7
- has_many :received_messages, :foreign_key => 'receiver_id', :class_name => 'Message'
6
+ has_many :sent_messages, foreign_key: 'sender_id', class_name: 'Message'
7
+ has_many :received_messages, foreign_key: 'receiver_id', class_name: 'Message'
8
8
  end
9
9
 
10
10
  def send_message(status, options = {})
@@ -1,12 +1,11 @@
1
- # -*- encoding: utf-8 -*-
2
1
  class Message < ActiveRecord::Base
3
2
  include Statesman::Adapters::ActiveRecordQueries
4
3
  scope :unread, -> {in_state('unread')}
5
- belongs_to :message_request
4
+ belongs_to :message_request, optional: true
6
5
  belongs_to :sender, class_name: 'User'
7
6
  belongs_to :receiver, class_name: 'User'
8
- validates_presence_of :subject, :body #, :sender
9
- validates_presence_of :receiver, message: :invalid
7
+ validates :subject, :body, presence: true # , :sender
8
+ validates :receiver, presence: { message: :invalid }
10
9
  before_validation :set_receiver
11
10
  after_save :index
12
11
  after_destroy :remove_from_index
@@ -61,6 +60,7 @@ class Message < ActiveRecord::Base
61
60
  end
62
61
 
63
62
  private
63
+
64
64
  def self.transition_class
65
65
  MessageTransition
66
66
  end
@@ -1,4 +1,3 @@
1
- require 'erubis'
2
1
  class MessageRequest < ActiveRecord::Base
3
2
  include Statesman::Adapters::ActiveRecordQueries
4
3
  scope :not_sent, -> {in_state(:pending).where('sent_at IS NULL')}
@@ -9,8 +8,8 @@ class MessageRequest < ActiveRecord::Base
9
8
  has_many :messages
10
9
 
11
10
  validates_associated :sender, :receiver, :message_template
12
- validates_presence_of :sender, :receiver, :message_template
13
- validates_presence_of :body, on: :update
11
+ validates :sender, :receiver, :message_template, presence: true
12
+ validates :body, presence: { on: :update }
14
13
 
15
14
  paginates_per 10
16
15
 
@@ -26,15 +25,14 @@ class MessageRequest < ActiveRecord::Base
26
25
  def send_message
27
26
  message = nil
28
27
  MessageRequest.transaction do
29
- message = Message.new
30
- message.sender = sender
31
- message.recipient = receiver.username
32
- message.subject = subject
33
- message.body = body
34
- message.body = 'test'
35
- message.save!
36
- self.sent_at = Time.zone.now
37
- save(validate: false)
28
+ message = Message.create!(
29
+ sender: sender,
30
+ recipient: receiver.username,
31
+ subject: subject,
32
+ body: body,
33
+ message_request: self
34
+ )
35
+ update!(sent_at: Time.zone.now)
38
36
  if ['reservation_expired_for_patron', 'reservation_expired_for_patron'].include?(message_template.status)
39
37
  self.receiver.reserves.each do |reserve|
40
38
  reserve.expiration_notice_to_patron = true
@@ -54,7 +52,7 @@ class MessageRequest < ActiveRecord::Base
54
52
  receiver: receiver,
55
53
  locale: receiver.profile.locale
56
54
  }.merge(options)
57
- update_attributes!({body: message_template.embed_body(options)})
55
+ update!({body: message_template.embed_body(options)})
58
56
  end
59
57
 
60
58
  def self.send_messages
@@ -66,6 +64,7 @@ class MessageRequest < ActiveRecord::Base
66
64
  end
67
65
 
68
66
  private
67
+
69
68
  def self.transition_class
70
69
  MessageRequestTransition
71
70
  end
@@ -3,7 +3,7 @@ class MessageRequestTransition < ActiveRecord::Base
3
3
 
4
4
 
5
5
  belongs_to :message_request, inverse_of: :message_request_transitions
6
- #attr_accessible :to_state, :sort_key, :metadata
6
+ # attr_accessible :to_state, :sort_key, :metadata
7
7
  end
8
8
 
9
9
  # == Schema Information
@@ -1,8 +1,8 @@
1
1
  class MessageTemplate < ActiveRecord::Base
2
2
  has_many :message_requests
3
3
 
4
- validates_uniqueness_of :status
5
- validates_presence_of :status, :title, :body
4
+ validates :status, uniqueness: true
5
+ validates :status, :title, :body, presence: true
6
6
 
7
7
  acts_as_list
8
8
 
@@ -3,7 +3,7 @@ class MessageTransition < ActiveRecord::Base
3
3
 
4
4
 
5
5
  belongs_to :message, inverse_of: :message_transitions
6
- #attr_accessible :to_state, :sort_key, :metadata
6
+ # attr_accessible :to_state, :sort_key, :metadata
7
7
  end
8
8
 
9
9
  # == Schema Information
@@ -4,7 +4,7 @@ atom_feed do |feed|
4
4
 
5
5
  @messages.each do |message|
6
6
  feed.entry(message, url: message_url(message)) do |entry|
7
- entry.title message.subject
7
+ entry.title message.subject
8
8
  entry.content message.body, type: 'html'
9
9
 
10
10
  entry.author do |author|
@@ -1,4 +1,4 @@
1
- xml.instruct! :xml, :version=>"1.0"
1
+ xml.instruct! :xml, version: "1.0"
2
2
  xml.rss('version' => "2.0",
3
3
  'xmlns:opensearch' => "http://a9.com/-/spec/opensearch/1.1/",
4
4
  'xmlns:atom' => "http://www.w3.org/2005/Atom"){
@@ -13,28 +13,23 @@ xml.rss('version' => "2.0",
13
13
  xml.description "Next-L Enju, an open source integrated library system developed by Project Next-L"
14
14
  xml.language @locale.to_s
15
15
  xml.ttl "60"
16
- if @user
17
- xml.tag! "atom:link", rel: 'self', href: messages_url(format: :rss)
18
- xml.tag! "atom:link", rel: 'alternate', href: messages_url(format: :rss)
19
- else
20
- xml.tag! "atom:link", rel: 'self', href: messages_url(format: :rss)
21
- xml.tag! "atom:link", rel: 'alternate', href: messages_url
22
- end
23
- #xml.tag! "atom:link", rel: 'search', type: 'application/opensearchdescription+xml', href: "http://#{request.host_with_port}/page/opensearch"
16
+ xml.tag! "atom:link", rel: 'self', href: messages_url(format: :rss)
17
+ xml.tag! "atom:link", rel: 'alternate', href: messages_url
18
+ # xml.tag! "atom:link", rel: 'search', type: 'application/opensearchdescription+xml', href: "http://#{request.host_with_port}/page/opensearch"
24
19
  unless params[:query].blank?
25
20
  xml.tag! "opensearch:totalResults", @messages.total_entries
26
21
  xml.tag! "opensearch:startIndex", @messages.offset + 1
27
22
  xml.tag! "opensearch:itemsPerPage", @messages.per_page
28
- #xml.tag! "opensearch:Query", :role => 'request', :searchTerms => params[:query], :startPage => (params[:page] || 1)
23
+ # xml.tag! "opensearch:Query", :role => 'request', :searchTerms => params[:query], :startPage => (params[:page] || 1)
29
24
  end
30
25
  @messages.each do |message|
31
26
  xml.item do
32
27
  xml.title message.subject
33
- #xml.description(message.title)
28
+ # xml.description(message.title)
34
29
  # rfc822
35
30
  xml.pubDate message.created_at.utc.rfc822
36
31
  xml.link message_url(message)
37
- xml.guid message_url(message), :isPermaLink => "true"
32
+ xml.guid message_url(message), isPermaLink: "true"
38
33
  end
39
34
  end
40
35
  }
data/config/routes.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  Rails.application.routes.draw do
2
- resources :message_requests, :except => [:new, :create]
2
+ resources :message_requests, except: [:new, :create]
3
3
  resources :message_templates
4
4
  resources :messages do
5
5
  collection do
@@ -1,15 +1,15 @@
1
- class CreateMessageTemplates < ActiveRecord::Migration
1
+ class CreateMessageTemplates < ActiveRecord::Migration[4.2]
2
2
  def self.up
3
3
  create_table :message_templates do |t|
4
- t.string :status, :null => false
5
- t.text :title, :null => false
6
- t.text :body, :null => false
4
+ t.string :status, null: false
5
+ t.text :title, null: false
6
+ t.text :body, null: false
7
7
  t.integer :position
8
- t.string :locale, :default => I18n.default_locale.to_s
8
+ t.string :locale, default: I18n.default_locale.to_s
9
9
 
10
10
  t.timestamps
11
11
  end
12
- add_index :message_templates, :status, :unique => true
12
+ add_index :message_templates, :status, unique: true
13
13
  end
14
14
 
15
15
  def self.down
@@ -1,4 +1,4 @@
1
- class CreateMessages < ActiveRecord::Migration
1
+ class CreateMessages < ActiveRecord::Migration[4.2]
2
2
  def self.up
3
3
  create_table :messages, force: true do |t|
4
4
  t.datetime :read_at
@@ -1,4 +1,4 @@
1
- class CreateMessageRequests < ActiveRecord::Migration
1
+ class CreateMessageRequests < ActiveRecord::Migration[4.2]
2
2
  def self.up
3
3
  create_table :message_requests do |t|
4
4
  t.references :sender
@@ -1,4 +1,4 @@
1
- class AddLftAndRgtToMessage < ActiveRecord::Migration
1
+ class AddLftAndRgtToMessage < ActiveRecord::Migration[4.2]
2
2
  def self.up
3
3
  add_column :messages, :lft, :integer
4
4
  add_column :messages, :rgt, :integer
@@ -1,4 +1,4 @@
1
- class AddDepthToMessage < ActiveRecord::Migration
1
+ class AddDepthToMessage < ActiveRecord::Migration[4.2]
2
2
  def change
3
3
  add_column :messages, :depth, :integer
4
4
 
@@ -1,4 +1,4 @@
1
- class CreateMessageTransitions < ActiveRecord::Migration
1
+ class CreateMessageTransitions < ActiveRecord::Migration[4.2]
2
2
  def change
3
3
  create_table :message_transitions do |t|
4
4
  t.string :to_state
@@ -1,4 +1,4 @@
1
- class CreateMessageRequestTransitions < ActiveRecord::Migration
1
+ class CreateMessageRequestTransitions < ActiveRecord::Migration[4.2]
2
2
  def change
3
3
  create_table :message_request_transitions do |t|
4
4
  t.string :to_state
@@ -1,4 +1,4 @@
1
- class AddMostRecentToMessageTransitions < ActiveRecord::Migration
1
+ class AddMostRecentToMessageTransitions < ActiveRecord::Migration[4.2]
2
2
  def up
3
3
  add_column :message_transitions, :most_recent, :boolean, null: true
4
4
  end
@@ -1,4 +1,4 @@
1
- class AddMostRecentToMessageRequestTransitions < ActiveRecord::Migration
1
+ class AddMostRecentToMessageRequestTransitions < ActiveRecord::Migration[4.2]
2
2
  def up
3
3
  add_column :message_request_transitions, :most_recent, :boolean, null: true
4
4
  end
@@ -1,8 +1,8 @@
1
- class AddConstraintsToMostRecentForMessageTransitions < ActiveRecord::Migration
1
+ class AddConstraintsToMostRecentForMessageTransitions < ActiveRecord::Migration[4.2]
2
2
  disable_ddl_transaction!
3
3
 
4
4
  def up
5
- add_index :message_transitions, [:message_id, :most_recent], unique: true, where: "most_recent", name: "index_message_transitions_parent_most_recent" #, algorithm: :concurrently
5
+ add_index :message_transitions, [:message_id, :most_recent], unique: true, where: "most_recent", name: "index_message_transitions_parent_most_recent" # , algorithm: :concurrently
6
6
  change_column_null :message_transitions, :most_recent, false
7
7
  end
8
8
 
@@ -1,8 +1,8 @@
1
- class AddConstraintsToMostRecentForMessageRequestTransitions < ActiveRecord::Migration
1
+ class AddConstraintsToMostRecentForMessageRequestTransitions < ActiveRecord::Migration[4.2]
2
2
  disable_ddl_transaction!
3
3
 
4
4
  def up
5
- add_index :message_request_transitions, [:message_request_id, :most_recent], unique: true, where: "most_recent", name: "index_message_request_transitions_parent_most_recent" #, algorithm: :concurrently
5
+ add_index :message_request_transitions, [:message_request_id, :most_recent], unique: true, where: "most_recent", name: "index_message_request_transitions_parent_most_recent" # , algorithm: :concurrently
6
6
  change_column_null :message_request_transitions, :most_recent, false
7
7
  end
8
8
 
@@ -1,5 +1,6 @@
1
1
  require 'enju_library'
2
2
  require 'awesome_nested_set'
3
+ require 'erubis'
3
4
 
4
5
  module EnjuMessage
5
6
  class Engine < ::Rails::Engine
@@ -1,3 +1,3 @@
1
1
  module EnjuMessage
2
- VERSION = "0.2.4"
2
+ VERSION = "0.3.0.beta.1"
3
3
  end
@@ -1,6 +1,6 @@
1
1
  class EnjuMessage::SetupGenerator < Rails::Generators::Base
2
2
  source_root File.expand_path('../templates', __FILE__)
3
- argument :file, :type => :string, :default => "all"
3
+ argument :file, type: :string, default: "all"
4
4
 
5
5
  def copy_setup_files
6
6
  directory("db/fixtures", "db/fixtures/enju_message")
@@ -3,19 +3,19 @@ require 'tasks/message_template'
3
3
 
4
4
  namespace :enju_message do
5
5
  desc "create initial records for enju_message"
6
- task :setup => :environment do
6
+ task setup: :environment do
7
7
  Dir.glob(Rails.root.to_s + '/db/fixtures/enju_message/*.yml').each do |file|
8
8
  ActiveRecord::FixtureSet.create_fixtures('db/fixtures/enju_message', File.basename(file, '.*'))
9
9
  end
10
10
  end
11
11
 
12
12
  desc "Send messages"
13
- task :send => :environment do
13
+ task send: :environment do
14
14
  MessageRequest.send_messages if defined?(EnjuMessage)
15
15
  end
16
16
 
17
17
  desc "upgrade enju_message"
18
- task :upgrade => :environment do
18
+ task upgrade: :environment do
19
19
  Rake::Task['statesman:backfill_most_recent'].invoke('Message')
20
20
  Rake::Task['statesman:backfill_most_recent'].invoke('MessageRequest')
21
21
  puts 'enju_message: The upgrade completed successfully.'
@@ -5,7 +5,7 @@ def update_message_template
5
5
  status: l["status"], locale: l["locale"]
6
6
  ).first
7
7
  if template
8
- template.update_attributes!(l)
8
+ template.update!(l)
9
9
  else
10
10
  MessageTemplate.create!(l)
11
11
  end