enju_library 0.1.0.pre33 → 0.1.0.pre34

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 (334) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/accepts_controller.rb +14 -14
  3. data/app/controllers/baskets_controller.rb +15 -21
  4. data/app/controllers/libraries_controller.rb +12 -12
  5. data/app/controllers/library_groups_controller.rb +5 -6
  6. data/app/controllers/shelves_controller.rb +17 -17
  7. data/app/controllers/subscribes_controller.rb +10 -10
  8. data/app/controllers/subscriptions_controller.rb +11 -11
  9. data/app/models/accept.rb +7 -12
  10. data/app/models/basket.rb +6 -6
  11. data/app/models/bookstore.rb +2 -2
  12. data/app/models/budget_type.rb +1 -1
  13. data/app/models/library.rb +8 -8
  14. data/app/models/library_group.rb +5 -21
  15. data/app/models/request_status_type.rb +1 -1
  16. data/app/models/request_type.rb +1 -1
  17. data/app/models/search_engine.rb +6 -6
  18. data/app/models/shelf.rb +5 -5
  19. data/app/models/subscribe.rb +3 -3
  20. data/app/models/subscription.rb +5 -5
  21. data/app/views/accepts/_form.html.erb +1 -1
  22. data/app/views/accepts/_list.html.erb +3 -3
  23. data/app/views/accepts/edit.html.erb +1 -1
  24. data/app/views/accepts/index.html.erb +6 -6
  25. data/app/views/accepts/{index.csv.erb → index.txt.csv} +0 -0
  26. data/app/views/accepts/new.html.erb +1 -1
  27. data/app/views/accepts/show.html.erb +2 -2
  28. data/app/views/baskets/edit.html.erb +2 -2
  29. data/app/views/baskets/index.html.erb +3 -2
  30. data/app/views/baskets/new.html.erb +6 -6
  31. data/app/views/baskets/show.html.erb +1 -1
  32. data/app/views/bookstores/_form.html.erb +3 -3
  33. data/app/views/bookstores/edit.html.erb +1 -1
  34. data/app/views/bookstores/index.html.erb +3 -3
  35. data/app/views/bookstores/new.html.erb +1 -1
  36. data/app/views/bookstores/show.html.erb +1 -1
  37. data/app/views/budget_types/_form.html.erb +2 -2
  38. data/app/views/budget_types/edit.html.erb +1 -1
  39. data/app/views/budget_types/index.html.erb +6 -6
  40. data/app/views/budget_types/new.html.erb +1 -1
  41. data/app/views/budget_types/show.html.erb +1 -1
  42. data/app/views/libraries/_calendar.html.erb +2 -2
  43. data/app/views/libraries/_form.html.erb +12 -12
  44. data/app/views/libraries/edit.html.erb +1 -1
  45. data/app/views/libraries/index.html.erb +18 -14
  46. data/app/views/libraries/new.html.erb +1 -1
  47. data/app/views/libraries/show.html.erb +7 -7
  48. data/app/views/library_groups/_form.html.erb +4 -4
  49. data/app/views/library_groups/edit.html.erb +1 -1
  50. data/app/views/library_groups/index.html.erb +2 -2
  51. data/app/views/library_groups/new.html.erb +1 -1
  52. data/app/views/library_groups/show.html.erb +2 -2
  53. data/app/views/request_status_types/edit.html.erb +1 -1
  54. data/app/views/request_status_types/index.html.erb +3 -3
  55. data/app/views/request_status_types/new.html.erb +1 -1
  56. data/app/views/request_status_types/show.html.erb +1 -1
  57. data/app/views/request_types/edit.html.erb +1 -1
  58. data/app/views/request_types/index.html.erb +3 -3
  59. data/app/views/request_types/new.html.erb +1 -1
  60. data/app/views/request_types/show.html.erb +1 -1
  61. data/app/views/search_engines/_form.html.erb +4 -4
  62. data/app/views/search_engines/edit.html.erb +1 -1
  63. data/app/views/search_engines/index.html.erb +3 -3
  64. data/app/views/search_engines/new.html.erb +1 -1
  65. data/app/views/search_engines/show.html.erb +1 -1
  66. data/app/views/shelves/_form.html.erb +4 -4
  67. data/app/views/shelves/_library_facet.html.erb +1 -1
  68. data/app/views/shelves/edit.html.erb +1 -1
  69. data/app/views/shelves/index.html.erb +5 -5
  70. data/app/views/shelves/new.html.erb +2 -2
  71. data/app/views/shelves/show.html.erb +5 -5
  72. data/app/views/shelves/show.mobile.erb +1 -1
  73. data/app/views/subscribes/edit.html.erb +3 -3
  74. data/app/views/subscribes/index.html.erb +3 -3
  75. data/app/views/subscribes/new.html.erb +8 -8
  76. data/app/views/subscribes/show.html.erb +1 -1
  77. data/app/views/subscriptions/edit.html.erb +3 -3
  78. data/app/views/subscriptions/index.html.erb +4 -4
  79. data/app/views/subscriptions/new.html.erb +3 -3
  80. data/app/views/subscriptions/show.html.erb +1 -1
  81. data/config/locales/translation_ja.yml +1 -1
  82. data/db/migrate/080_create_library_groups.rb +0 -1
  83. data/lib/enju_library/version.rb +1 -1
  84. data/lib/generators/enju_library/setup/templates/db/fixtures/request_status_types.yml +37 -0
  85. data/lib/generators/enju_library/setup/templates/db/fixtures/request_types.yml +29 -0
  86. data/spec/controllers/accepts_controller_spec.rb +1 -1
  87. data/spec/controllers/baskets_controller_spec.rb +30 -30
  88. data/spec/controllers/bookstores_controller_spec.rb +21 -21
  89. data/spec/controllers/budget_types_controller_spec.rb +1 -1
  90. data/spec/controllers/libraries_controller_spec.rb +24 -24
  91. data/spec/controllers/library_groups_controller_spec.rb +7 -7
  92. data/spec/controllers/request_status_types_controller_spec.rb +21 -21
  93. data/spec/controllers/request_types_controller_spec.rb +21 -21
  94. data/spec/controllers/search_engines_controller_spec.rb +21 -21
  95. data/spec/controllers/shelves_controller_spec.rb +20 -20
  96. data/spec/controllers/subscribes_controller_spec.rb +21 -21
  97. data/spec/controllers/subscriptions_controller_spec.rb +21 -21
  98. data/spec/dummy/app/helpers/application_helper.rb +1 -0
  99. data/spec/dummy/app/models/user.rb +6 -86
  100. data/spec/dummy/db/development.sqlite3 +0 -0
  101. data/spec/dummy/db/migrate/001_create_agents.rb +0 -8
  102. data/spec/dummy/db/migrate/{20111201155513_add_devise_to_users.rb → 002_devise_create_users.rb} +18 -16
  103. data/spec/dummy/db/migrate/005_create_manifestations.rb +7 -24
  104. data/spec/dummy/db/migrate/006_create_items.rb +0 -6
  105. data/spec/dummy/db/migrate/041_create_roles.rb +13 -0
  106. data/spec/dummy/db/migrate/077_create_user_groups.rb +3 -7
  107. data/spec/dummy/db/migrate/112_create_frequencies.rb +12 -0
  108. data/spec/dummy/db/migrate/117_create_form_of_works.rb +12 -0
  109. data/spec/dummy/db/migrate/154_create_messages.rb +0 -1
  110. data/spec/dummy/db/migrate/20080819181903_create_message_requests.rb +0 -2
  111. data/spec/dummy/db/migrate/20081027150907_create_picture_files.rb +0 -1
  112. data/spec/dummy/db/migrate/20081028083142_create_agent_import_files.rb +20 -0
  113. data/spec/dummy/db/migrate/20081028083208_create_resource_import_files.rb +20 -0
  114. data/spec/dummy/db/migrate/20081028093607_create_event_import_files.rb +0 -2
  115. data/spec/dummy/db/migrate/20081212080038_create_manifestation_checkout_stats.rb +0 -1
  116. data/spec/dummy/db/migrate/20081215094302_create_user_checkout_stats.rb +0 -1
  117. data/spec/dummy/db/migrate/20081216190724_create_manifestation_reserve_stats.rb +0 -1
  118. data/spec/dummy/db/migrate/20081220023628_create_user_reserve_stats.rb +0 -1
  119. data/spec/dummy/db/migrate/20090321130448_add_completed_at_to_user_checkout_stat.rb +0 -4
  120. data/spec/dummy/db/migrate/20090705212043_add_attachments_attachment_to_manifestation.rb +15 -0
  121. data/spec/dummy/db/migrate/20090719201843_create_extents.rb +12 -0
  122. data/spec/dummy/db/migrate/20090720091106_create_medium_of_performances.rb +12 -0
  123. data/spec/dummy/db/migrate/20090720091429_create_content_types.rb +12 -0
  124. data/spec/dummy/db/migrate/20091025080447_create_licenses.rb +12 -0
  125. data/spec/dummy/db/migrate/20100129142347_create_import_requests.rb +14 -0
  126. data/spec/dummy/db/migrate/{20111201163718_create_user_has_roles.rb → 20100606065209_create_user_has_roles.rb} +2 -0
  127. data/spec/dummy/db/migrate/20100925043847_create_resource_import_results.rb +15 -0
  128. data/spec/dummy/db/migrate/20100925074559_create_agent_import_results.rb +12 -0
  129. data/spec/dummy/db/migrate/20110318183304_add_valid_period_for_new_user_to_user_group.rb +0 -2
  130. data/spec/dummy/db/migrate/20110603184217_add_edit_mode_to_resource_import_file.rb +9 -0
  131. data/spec/dummy/db/migrate/20120129020544_add_budget_type_id_to_item.rb +6 -0
  132. data/spec/dummy/db/migrate/20120319120638_add_content_type_id_to_manifestation.rb +6 -0
  133. data/spec/dummy/db/migrate/20120410104851_add_year_of_publication_to_manifestation.rb +5 -0
  134. data/spec/dummy/db/migrate/20120413161340_add_fingerprint_to_resource_import_file.rb +5 -0
  135. data/spec/dummy/db/migrate/20120413161403_add_fingerprint_to_agent_import_file.rb +5 -0
  136. data/spec/dummy/db/migrate/20120413170705_add_error_message_to_resource_import_file.rb +5 -0
  137. data/spec/dummy/db/migrate/20120413170720_add_error_message_to_agent_import_file.rb +5 -0
  138. data/spec/dummy/db/migrate/20120415164821_add_attachment_meta_to_manifestation.rb +5 -0
  139. data/spec/dummy/db/migrate/20120418081407_add_month_of_publication_to_manifestation.rb +5 -0
  140. data/spec/dummy/db/migrate/20120511072422_add_agent_identifier_to_agent.rb +6 -0
  141. data/spec/dummy/db/migrate/20120602141129_add_edit_mode_to_agent_import_file.rb +5 -0
  142. data/spec/dummy/db/migrate/20121116031206_add_fulltext_content_to_manifestation.rb +5 -0
  143. data/spec/dummy/db/migrate/20121116033446_add_doi_to_manifestation.rb +6 -0
  144. data/spec/dummy/db/migrate/20130221154434_add_additional_attributes_to_user.rb +16 -0
  145. data/spec/dummy/db/migrate/{20111201121844_create_roles.rb → 20130506175303_create_identifier_types.rb} +2 -2
  146. data/spec/dummy/db/migrate/20130506175834_create_identifiers.rb +15 -0
  147. data/spec/dummy/db/migrate/20130509185724_add_statement_of_responsibility_to_manifestation.rb +5 -0
  148. data/spec/dummy/db/migrate/20140110122216_create_user_import_files.rb +18 -0
  149. data/spec/dummy/db/migrate/20140110131010_create_user_import_results.rb +11 -0
  150. data/spec/dummy/db/migrate/20140122054321_create_profiles.rb +20 -0
  151. data/spec/dummy/db/migrate/20140518050147_create_reserve_transitions.rb +14 -0
  152. data/spec/dummy/db/migrate/20140518111006_create_message_transitions.rb +14 -0
  153. data/spec/dummy/db/migrate/20140518135713_create_message_request_transitions.rb +14 -0
  154. data/spec/dummy/db/migrate/20140519170214_create_resource_import_file_transitions.rb +14 -0
  155. data/spec/dummy/db/migrate/20140519171220_create_import_request_transitions.rb +14 -0
  156. data/spec/dummy/db/migrate/20140523171309_create_event_import_file_transitions.rb +14 -0
  157. data/spec/dummy/db/migrate/20140524020735_create_agent_import_file_transitions.rb +14 -0
  158. data/spec/dummy/db/migrate/20140524074813_create_user_import_file_transitions.rb +14 -0
  159. data/spec/dummy/db/migrate/20140528045518_create_user_checkout_stat_transitions.rb +14 -0
  160. data/spec/dummy/db/migrate/20140528045539_create_user_reserve_stat_transitions.rb +14 -0
  161. data/spec/dummy/db/migrate/20140528045600_create_manifestation_checkout_stat_transitions.rb +14 -0
  162. data/spec/dummy/db/migrate/20140528045617_create_manifestation_reserve_stat_transitions.rb +14 -0
  163. data/spec/dummy/db/migrate/20140610123439_drop_email_unique_constraint_enju_leaf_rc10.rb +11 -0
  164. data/spec/dummy/db/migrate/20140614065404_create_resource_export_files.rb +11 -0
  165. data/spec/dummy/db/migrate/20140614141500_create_resource_export_file_transitions.rb +14 -0
  166. data/spec/dummy/db/migrate/20140628071719_add_user_encoding_to_event_import_file.rb +5 -0
  167. data/spec/dummy/db/migrate/20140628072217_add_user_encoding_to_user_import_file.rb +5 -0
  168. data/spec/dummy/db/migrate/20140628073524_add_user_encoding_to_agent_import_file.rb +5 -0
  169. data/spec/dummy/db/migrate/20140628073535_add_user_encoding_to_resource_import_file.rb +5 -0
  170. data/spec/dummy/db/migrate/20140709113413_create_user_export_files.rb +11 -0
  171. data/spec/dummy/db/migrate/20140709113905_create_user_export_file_transitions.rb +14 -0
  172. data/spec/dummy/db/migrate/20140720140916_add_binding_item_identifier_to_item.rb +8 -0
  173. data/spec/dummy/db/migrate/20140720170714_add_default_library_id_to_user_import_file.rb +5 -0
  174. data/spec/dummy/db/migrate/20140720170735_add_default_user_group_id_to_user_import_file.rb +5 -0
  175. data/spec/dummy/db/migrate/20140720192418_add_default_library_id_to_event_import_file.rb +5 -0
  176. data/spec/dummy/db/migrate/20140721151416_add_default_shelf_id_to_resource_import_file.rb +5 -0
  177. data/spec/dummy/db/migrate/20140802082007_add_manifestation_id_to_item.rb +6 -0
  178. data/spec/dummy/db/migrate/20140810061942_add_user_id_to_user_checkout_stat.rb +12 -0
  179. data/spec/dummy/db/migrate/20140810091231_add_checkout_icalendar_token_to_profile.rb +6 -0
  180. data/spec/dummy/db/migrate/20140810091417_add_save_checkout_history_to_profile.rb +5 -0
  181. data/spec/dummy/db/migrate/20140811031145_add_expired_at_to_profile.rb +5 -0
  182. data/spec/dummy/db/schema.rb +453 -74
  183. data/spec/dummy/db/test.sqlite3 +0 -0
  184. data/spec/dummy/solr/conf/admin-extra.html +31 -0
  185. data/spec/dummy/solr/conf/elevate.xml +36 -0
  186. data/spec/dummy/solr/conf/mapping-ISOLatin1Accent.txt +246 -0
  187. data/spec/dummy/solr/conf/protwords.txt +21 -0
  188. data/spec/dummy/solr/conf/schema.xml +255 -0
  189. data/spec/dummy/solr/conf/scripts.conf +24 -0
  190. data/spec/dummy/solr/conf/solrconfig.xml +667 -0
  191. data/spec/dummy/solr/conf/spellings.txt +2 -0
  192. data/spec/dummy/solr/conf/stopwords.txt +58 -0
  193. data/spec/dummy/solr/conf/synonyms.txt +31 -0
  194. data/spec/dummy/solr/default/data/index/_1vz.fdt +0 -0
  195. data/spec/dummy/solr/default/data/index/_1vz.fdx +0 -0
  196. data/spec/dummy/solr/default/data/index/_1vz.fnm +0 -0
  197. data/spec/dummy/solr/default/data/index/_1vz.nvd +0 -0
  198. data/spec/dummy/solr/default/data/index/_1vz.nvm +0 -0
  199. data/spec/dummy/solr/default/data/index/_1vz.si +0 -0
  200. data/spec/dummy/solr/default/data/index/_1vz_Lucene41_0.doc +0 -0
  201. data/spec/dummy/solr/default/data/index/_1vz_Lucene41_0.pos +0 -0
  202. data/spec/dummy/solr/default/data/index/_1vz_Lucene41_0.tim +0 -0
  203. data/spec/dummy/solr/default/data/index/_1vz_Lucene41_0.tip +0 -0
  204. data/spec/dummy/solr/default/data/index/segments.gen +0 -0
  205. data/spec/dummy/solr/default/data/index/segments_36s +0 -0
  206. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000004121 +0 -0
  207. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000004122 +0 -0
  208. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000004123 +0 -0
  209. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000004124 +0 -0
  210. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000004125 +0 -0
  211. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000004126 +0 -0
  212. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000004127 +0 -0
  213. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000004128 +0 -0
  214. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000004129 +0 -0
  215. data/spec/dummy/solr/default/data/tlog/tlog.0000000000000004130 +0 -0
  216. data/spec/dummy/solr/development/data/index/segments.gen +0 -0
  217. data/spec/dummy/solr/development/data/index/segments_1 +0 -0
  218. data/spec/dummy/solr/solr.xml +8 -0
  219. data/spec/dummy/solr/test/data/index/segments.gen +0 -0
  220. data/spec/dummy/solr/test/data/index/segments_1 +0 -0
  221. data/spec/dummy/tmp/cache/assets/test/sprockets/0440b81b0aae840cf287a686585a8cec +0 -0
  222. data/spec/dummy/tmp/cache/assets/test/sprockets/0483120d2ec851526d1beb322a87b34d +0 -0
  223. data/spec/dummy/tmp/cache/assets/test/sprockets/096c3408c7592aaeb756778ce1775f16 +0 -0
  224. data/spec/dummy/tmp/cache/assets/test/sprockets/09bc1fff0c1477a69e8cd36ed3fe771f +0 -0
  225. data/spec/dummy/tmp/cache/assets/test/sprockets/0c0062cfb97ef1437ab0020e724876c6 +0 -0
  226. data/spec/dummy/tmp/cache/assets/test/sprockets/0c8f59d97121b79a2e2a0d009d6da9c3 +0 -0
  227. data/spec/dummy/tmp/cache/assets/test/sprockets/0e3e358e4fe4601ba5e435f6d0c86f12 +0 -0
  228. data/spec/dummy/tmp/cache/assets/test/sprockets/0e7592ffc95bd8b73854cc6453c64e33 +0 -0
  229. data/spec/dummy/tmp/cache/assets/test/sprockets/0e8e7445a50fad85ab545fa283abf5b7 +0 -0
  230. data/spec/dummy/tmp/cache/assets/test/sprockets/1260173072d9796c1ae7d7752b9916c3 +0 -0
  231. data/spec/dummy/tmp/cache/assets/test/sprockets/129cec5384c0f26fcfb0ce65048298c5 +0 -0
  232. data/spec/dummy/tmp/cache/assets/test/sprockets/1572dfd6f1e555f4be1aa60ddc3cb0c0 +0 -0
  233. data/spec/dummy/tmp/cache/assets/test/sprockets/17c9f5037fae5b6ee1fc7466948001b5 +0 -0
  234. data/spec/dummy/tmp/cache/assets/test/sprockets/1c1fbab93e4552626da626e0dbe70c74 +0 -0
  235. data/spec/dummy/tmp/cache/assets/test/sprockets/1d450e5266eb3d679107d9a36dc22559 +0 -0
  236. data/spec/dummy/tmp/cache/assets/test/sprockets/2258e83cd2e464c650334b6a72a87cb6 +0 -0
  237. data/spec/dummy/tmp/cache/assets/test/sprockets/241a5d6ad6008e25a64a5092e8361ae8 +0 -0
  238. data/spec/dummy/tmp/cache/assets/test/sprockets/2bf9c36d2bc8f8ca084394d139ce8edf +0 -0
  239. data/spec/dummy/tmp/cache/assets/test/sprockets/2f09f58943a88f21e3a0318621391785 +0 -0
  240. data/spec/dummy/tmp/cache/assets/test/sprockets/2ffe508d0533d0afd2a37bb574eda40d +0 -0
  241. data/spec/dummy/tmp/cache/assets/test/sprockets/301d9ec69800d0dc163460a12304676a +0 -0
  242. data/spec/dummy/tmp/cache/assets/test/sprockets/3fbe8dcb9a5b2fbc7a22cc4b1ca4aa11 +0 -0
  243. data/spec/dummy/tmp/cache/assets/test/sprockets/45f3c74e1e31b58d9bda6908d5623290 +0 -0
  244. data/spec/dummy/tmp/cache/assets/test/sprockets/49d32c13d390c1b80d8b2705aac86579 +0 -0
  245. data/spec/dummy/tmp/cache/assets/test/sprockets/4aa18096a209e515f5f1df487622cdf4 +0 -0
  246. data/spec/dummy/tmp/cache/assets/test/sprockets/4c4d6b8fc44a49272793290caed29e24 +0 -0
  247. data/spec/dummy/tmp/cache/assets/test/sprockets/4f877aaa67a006f34ad9643d7f82b6dc +0 -0
  248. data/spec/dummy/tmp/cache/assets/test/sprockets/50e64f45f0cb4cee52fd3f3908f89a82 +0 -0
  249. data/spec/dummy/tmp/cache/assets/test/sprockets/5762cca052dd5d3eb8bb35e2ed9a59b8 +0 -0
  250. data/spec/dummy/tmp/cache/assets/test/sprockets/5ab3fcfe4078a2bb14bd91e9ce73ef29 +0 -0
  251. data/spec/dummy/tmp/cache/assets/test/sprockets/5afd4f8068bdfb3d99f5ec4034d2410c +0 -0
  252. data/spec/dummy/tmp/cache/assets/test/sprockets/5db165a5b217a384aaa8885d6bcaf193 +0 -0
  253. data/spec/dummy/tmp/cache/assets/test/sprockets/5dd0b61707256a0514d7f5e224188a1d +0 -0
  254. data/spec/dummy/tmp/cache/assets/test/sprockets/65a8d4d288e5f082f0166aa7be7a2464 +0 -0
  255. data/spec/dummy/tmp/cache/assets/test/sprockets/66e8ff0ee49363fdd0e1866807515228 +0 -0
  256. data/spec/dummy/tmp/cache/assets/test/sprockets/6738d1a07584e4b732d197e10afd6a19 +0 -0
  257. data/spec/dummy/tmp/cache/assets/test/sprockets/6a83d3fd052b7923111a0ed838ff53e0 +0 -0
  258. data/spec/dummy/tmp/cache/assets/test/sprockets/6a958d3fc0999c71aa19bae06bacdeb6 +0 -0
  259. data/spec/dummy/tmp/cache/assets/test/sprockets/6df57ded762c97e6755758008bb3a660 +0 -0
  260. data/spec/dummy/tmp/cache/assets/test/sprockets/6fdb4513af157010ef79b56df44d665e +0 -0
  261. data/spec/dummy/tmp/cache/assets/test/sprockets/7289cf11ae787f5e0639528dc155bffb +0 -0
  262. data/spec/dummy/tmp/cache/assets/test/sprockets/7c4b2e5317023fb751fa54ad41f95101 +0 -0
  263. data/spec/dummy/tmp/cache/assets/test/sprockets/7eea3b9e54d8a23d8a05d354f1a93f51 +0 -0
  264. data/spec/dummy/tmp/cache/assets/test/sprockets/811e5198d0dc4efe02d28c0c2215e207 +0 -0
  265. data/spec/dummy/tmp/cache/assets/test/sprockets/84c8a64682205dba3f8edd60fc1ec8e5 +0 -0
  266. data/spec/dummy/tmp/cache/assets/test/sprockets/8a73d1e841a4716b4f18ed4a23622092 +0 -0
  267. data/spec/dummy/tmp/cache/assets/test/sprockets/8be2a49de16592553e0d0a09d92bf6ef +0 -0
  268. data/spec/dummy/tmp/cache/assets/test/sprockets/8f72bcc7284bf844ac8bec5dc4b71482 +0 -0
  269. data/spec/dummy/tmp/cache/assets/test/sprockets/9604073a83f822f13caaabd7e157bbbb +0 -0
  270. data/spec/dummy/tmp/cache/assets/test/sprockets/979eaef456657e4fc79b9b967aef0587 +0 -0
  271. data/spec/dummy/tmp/cache/assets/test/sprockets/9ad166e60e3d477c78328181979a7b77 +0 -0
  272. data/spec/dummy/tmp/cache/assets/test/sprockets/9b78afe804f3870fbafb97d2d62e5f6b +0 -0
  273. data/spec/dummy/tmp/cache/assets/test/sprockets/a296264dcc89e1f8ab6382e678ffbe38 +0 -0
  274. data/spec/dummy/tmp/cache/assets/test/sprockets/a3cea75f1356ef55329e78f86b4c72b1 +0 -0
  275. data/spec/dummy/tmp/cache/assets/test/sprockets/a5bf9fc3822019953dee89c6ae2b32ea +0 -0
  276. data/spec/dummy/tmp/cache/assets/test/sprockets/a7387ef33f472faf58df3dd72623fbc6 +0 -0
  277. data/spec/dummy/tmp/cache/assets/test/sprockets/aa2e1ada35daa496bb08e85fcb817536 +0 -0
  278. data/spec/dummy/tmp/cache/assets/test/sprockets/abee2d4cb18d15789dcdc9c680f3e6de +0 -0
  279. data/spec/dummy/tmp/cache/assets/test/sprockets/ae706bde720905edffe622ae48f15740 +0 -0
  280. data/spec/dummy/tmp/cache/assets/test/sprockets/b53fd979e77975479427d0b481b004d4 +0 -0
  281. data/spec/dummy/tmp/cache/assets/test/sprockets/b57a0579a21bd3280d1db6f42550e5c7 +0 -0
  282. data/spec/dummy/tmp/cache/assets/test/sprockets/b80bed2ef62ec65384f12272c185a9a8 +0 -0
  283. data/spec/dummy/tmp/cache/assets/test/sprockets/bf33fb298844af06e55096420b989e3b +0 -0
  284. data/spec/dummy/tmp/cache/assets/test/sprockets/c3e97042b232e677d67679e11ebdb8ec +0 -0
  285. data/spec/dummy/tmp/cache/assets/test/sprockets/c4700cd893db92917b893a0e48f57a24 +0 -0
  286. data/spec/dummy/tmp/cache/assets/test/sprockets/c488c91e58a235d36a0ff8058e5a1004 +0 -0
  287. data/spec/dummy/tmp/cache/assets/test/sprockets/c4a984c6feb506f3e1f9120a8d029bda +0 -0
  288. data/spec/dummy/tmp/cache/assets/test/sprockets/c5ef868ba5f891f326945efdd43e3170 +0 -0
  289. data/spec/dummy/tmp/cache/assets/test/sprockets/c6283ae59dff510d5a2bb2bb9194d045 +0 -0
  290. data/spec/dummy/tmp/cache/assets/test/sprockets/c6bbf5ca5c9b58807ba226fde0ccc60f +0 -0
  291. data/spec/dummy/tmp/cache/assets/test/sprockets/ca5b985126fb033dec26015bd08d56ee +0 -0
  292. data/spec/dummy/tmp/cache/assets/test/sprockets/d26b3581068a8ec8af52f3b2cce8c32a +0 -0
  293. data/spec/dummy/tmp/cache/assets/test/sprockets/d34b5413caa9407126db68d5d590804a +0 -0
  294. data/spec/dummy/tmp/cache/assets/test/sprockets/d4ac74c17332ad931b72f42d7997fcc0 +0 -0
  295. data/spec/dummy/tmp/cache/assets/test/sprockets/d648a0b0abb7fd7ff579d72ffe033d50 +0 -0
  296. data/spec/dummy/tmp/cache/assets/test/sprockets/db6425848529903bdee75792cb2ed79a +0 -0
  297. data/spec/dummy/tmp/cache/assets/test/sprockets/dd672deb061233e0db1d2f413d27213f +0 -0
  298. data/spec/dummy/tmp/cache/assets/test/sprockets/e1fcfb0faa3c12467a1c35251e04c8b1 +0 -0
  299. data/spec/dummy/tmp/cache/assets/test/sprockets/e22f9546f5d75bd3549886e979dcb96e +0 -0
  300. data/spec/dummy/tmp/cache/assets/test/sprockets/e44b4816bd1b2a7ba674c978dad35f3a +0 -0
  301. data/spec/dummy/tmp/cache/assets/test/sprockets/e513ee1af8fa24dcb4f473c18c09bf87 +0 -0
  302. data/spec/dummy/tmp/cache/assets/test/sprockets/e8142c2b10712e79b6d2c2cba0894b4c +0 -0
  303. data/spec/dummy/tmp/cache/assets/test/sprockets/f964bf5dc3949774db54d7cda5761d43 +0 -0
  304. data/spec/dummy/tmp/cache/assets/test/sprockets/fa8059ddbbe226114ba0c178de3fc31b +0 -0
  305. data/spec/dummy/tmp/cache/assets/test/sprockets/fa8e81ce1d45228121b9df5618542190 +0 -0
  306. data/spec/dummy/tmp/cache/assets/test/sprockets/fbc69737b9b0dc77871fa2bb8647a38a +0 -0
  307. data/spec/factories/accepts.rb +12 -0
  308. data/spec/factories/budget_types.rb +13 -0
  309. data/spec/factories/profile.rb +10 -0
  310. data/spec/factories/user.rb +21 -12
  311. data/spec/fixtures/agents.yml +0 -12
  312. data/spec/fixtures/items.yml +49 -37
  313. data/spec/fixtures/libraries.yml +25 -28
  314. data/spec/fixtures/library_groups.yml +13 -18
  315. data/spec/fixtures/manifestation_checkout_stats.yml +0 -3
  316. data/spec/fixtures/manifestation_reserve_stats.yml +0 -3
  317. data/spec/fixtures/message_requests.yml +0 -3
  318. data/spec/fixtures/profiles.yml +98 -0
  319. data/spec/fixtures/request_status_types.yml +4 -5
  320. data/spec/fixtures/request_types.yml +4 -5
  321. data/spec/fixtures/reserve_transitions.yml +88 -0
  322. data/spec/fixtures/shelves.yml +7 -7
  323. data/spec/fixtures/user_checkout_stats.yml +0 -3
  324. data/spec/fixtures/user_groups.yml +3 -3
  325. data/spec/fixtures/user_reserve_stats.yml +0 -3
  326. data/spec/fixtures/users.yml +0 -55
  327. data/spec/models/library_group_spec.rb +0 -2
  328. data/spec/views/budget_types/index.html.erb_spec.rb +2 -2
  329. metadata +417 -28
  330. data/app/models/library_group_sweeper.rb +0 -12
  331. data/spec/dummy/db/migrate/20110425133109_add_issn_to_series_statement.rb +0 -9
  332. data/spec/dummy/db/migrate/20110618091240_add_periodical_to_series_statement.rb +0 -9
  333. data/spec/dummy/db/migrate/20110916053430_rename_manifestation_number_list_to_number_string.rb +0 -13
  334. data/spec/dummy/db/migrate/20111201155456_create_users.rb +0 -16
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: bd5f2a84f8de884044cc92ccf75b5b256eb4f9a1
4
- data.tar.gz: 1fa77d84c76d38bedd20edb2cc23b9c7273006a4
3
+ metadata.gz: 29978eed453931a7389deced51c7d5faefc36b5b
4
+ data.tar.gz: bcf7cd57d779511d2d2005ee713164d66b4a6ad0
5
5
  SHA512:
6
- metadata.gz: 4547dfa9384a1876c44ac8121e6c96e3d85d2da70105d55c1587ecbad4773d248ed398c1bf1443ca32e3a927886e6faabc1815a5b9ffca0a18577c602d794e73
7
- data.tar.gz: b4b6cdf0b15841f6831dc7d25324dcc9e49ed894bfeb87afeb4b221faa800c5f806b5ef8eaa8c6ef55ba1ec8fb9275258aaa30ece53b87f11800c193ffacddc1
6
+ metadata.gz: c91faabec4565a8b9e741083848401378b5ee39a07867e999f250e2fc2f543ecdc8008bd385efa165bd1dbb1912b5f2b88b56a1644fd485cc983adbd73226e13
7
+ data.tar.gz: 22b6b9a889175cd7d4fa9fb5ee65d8cdc58d390354dc16bec7561c0d431e1113c5634171af8a72d600730e51ee2360ee1503a1aa9539ea43f7e2bbecabaeb0da
@@ -1,13 +1,13 @@
1
1
  class AcceptsController < InheritedResources::Base
2
- load_and_authorize_resource :except => :index
3
- authorize_resource :only => :index
2
+ load_and_authorize_resource except: :index
3
+ authorize_resource only: :index
4
4
  respond_to :html, :json
5
- before_filter :get_basket, :only => [:index, :create]
5
+ before_filter :get_basket, only: [:index, :create]
6
6
 
7
7
  # GET /accepts
8
8
  # GET /accepts.json
9
9
  def index
10
- if params[:format] == 'csv'
10
+ if params[:format] == 'txt'
11
11
  @accepts = Accept.order('accepts.created_at DESC').page(params[:page]).per(65534)
12
12
  else
13
13
  if params[:accept]
@@ -28,9 +28,9 @@ class AcceptsController < InheritedResources::Base
28
28
 
29
29
  respond_to do |format|
30
30
  format.html # index.html.erb
31
- format.json { render :json => @accepts }
31
+ format.json { render json: @accepts }
32
32
  format.js { @accept = Accept.new }
33
- format.csv
33
+ format.txt
34
34
  end
35
35
  end
36
36
 
@@ -45,7 +45,7 @@ class AcceptsController < InheritedResources::Base
45
45
 
46
46
  respond_to do |format|
47
47
  format.html # new.html.erb
48
- format.json { render :json => @accept }
48
+ format.json { render json: @accept }
49
49
  end
50
50
  end
51
51
 
@@ -68,15 +68,15 @@ class AcceptsController < InheritedResources::Base
68
68
 
69
69
  respond_to do |format|
70
70
  if @accept.save
71
- flash[:message] << t('accept.successfully_accepted', :model => t('activerecord.models.accept'))
72
- format.html { redirect_to basket_accepts_url(@basket) }
73
- format.json { render :json => @accept, :status => :created, :location => @accept }
74
- format.js { redirect_to basket_accepts_url(@basket, :format => :js) }
71
+ flash[:message] << t('accept.successfully_accepted', model: t('activerecord.models.accept'))
72
+ format.html { redirect_to accepts_url(basket_id: @basket.id) }
73
+ format.json { render json: @accept, status: :created, location: @accept }
74
+ format.js { redirect_to accepts_url(basket_id: @basket.id, format: :js) }
75
75
  else
76
76
  @accepts = @basket.accepts.page(params[:page])
77
- format.html { render :action => "index" }
78
- format.json { render :json => @accept.errors, :status => :unprocessable_entity }
79
- format.js { render :action => "index" }
77
+ format.html { render action: "index" }
78
+ format.json { render json: @accept.errors, status: :unprocessable_entity }
79
+ format.js { render action: "index" }
80
80
  end
81
81
  end
82
82
  end
@@ -1,8 +1,5 @@
1
1
  class BasketsController < ApplicationController
2
2
  load_and_authorize_resource
3
- if defined?(EnjuCirculation)
4
- cache_sweeper :circulation_sweeper, :only => [:create, :update, :destroy]
5
- end
6
3
 
7
4
  # GET /baskets
8
5
  # GET /baskets.json
@@ -16,7 +13,7 @@ class BasketsController < ApplicationController
16
13
 
17
14
  respond_to do |format|
18
15
  format.html # index.html.erb
19
- format.json { render :json => @baskets }
16
+ format.json { render json: @baskets }
20
17
  end
21
18
  end
22
19
 
@@ -25,7 +22,7 @@ class BasketsController < ApplicationController
25
22
  def show
26
23
  respond_to do |format|
27
24
  format.html # show.html.erb
28
- format.json { render :json => @basket }
25
+ format.json { render json: @basket }
29
26
  end
30
27
  end
31
28
 
@@ -37,7 +34,7 @@ class BasketsController < ApplicationController
37
34
 
38
35
  respond_to do |format|
39
36
  format.html # new.html.erb
40
- format.json { render :json => @basket }
37
+ format.json { render json: @basket }
41
38
  end
42
39
  end
43
40
 
@@ -49,20 +46,18 @@ class BasketsController < ApplicationController
49
46
  # POST /baskets.json
50
47
  def create
51
48
  @basket = Basket.new(params[:basket])
52
- @user = User.where(:user_number => @basket.user_number).first if @basket.user_number
49
+ @user = Profile.where(user_number: @basket.user_number).first.try(:user) if @basket.user_number.present?
53
50
  if @user
54
- if @user.user_number?
55
- @basket.user = @user
56
- end
51
+ @basket.user = @user
57
52
  end
58
53
 
59
54
  respond_to do |format|
60
55
  if @basket.save
61
- format.html { redirect_to new_basket_checked_item_url(@basket), :notice => t('controller.successfully_created', :model => t('activerecord.models.basket')) }
62
- format.json { render :json => @basket, :status => :created, :location => @basket }
56
+ format.html { redirect_to new_checked_item_url(basket_id: @basket.id), notice: t('controller.successfully_created', model: t('activerecord.models.basket')) }
57
+ format.json { render json: @basket, status: :created, location: @basket }
63
58
  else
64
- format.html { render :action => "new" }
65
- format.json { render :json => @basket.errors, :status => :unprocessable_entity }
59
+ format.html { render action: "new" }
60
+ format.json { render json: @basket.errors, status: :unprocessable_entity }
66
61
  end
67
62
  end
68
63
  end
@@ -73,13 +68,13 @@ class BasketsController < ApplicationController
73
68
  librarian = current_user
74
69
  begin
75
70
  unless @basket.basket_checkout(librarian)
76
- redirect_to new_basket_checked_item_url(@basket)
71
+ redirect_to new_checked_item_url(basket_id: @basket.id)
77
72
  return
78
73
  end
79
74
  rescue ActiveRecord::RecordInvalid
80
75
  flash[:message] = t('checked_item.already_checked_out_try_again')
81
76
  @basket.checked_items.delete_all
82
- redirect_to new_basket_checked_item_url(@basket)
77
+ redirect_to new_checked_item_url(basket_id: @basket.id)
83
78
  return
84
79
  end
85
80
 
@@ -87,11 +82,11 @@ class BasketsController < ApplicationController
87
82
  #if @basket.update_attributes({})
88
83
  if @basket.save(:validate => false)
89
84
  # 貸出完了時
90
- format.html { redirect_to user_checkouts_url(@basket.user), :notice => t('basket.checkout_completed') }
85
+ format.html { redirect_to checkouts_url(user_id: @basket.user.username), notice: t('basket.checkout_completed') }
91
86
  format.json { head :no_content }
92
87
  else
93
- format.html { redirect_to basket_checked_items_url(@basket) }
94
- format.json { render :json => @basket.errors, :status => :unprocessable_entity }
88
+ format.html { redirect_to checked_items_url(basket_id: @basket.id) }
89
+ format.json { render json: @basket.errors, status: :unprocessable_entity }
95
90
  end
96
91
  end
97
92
 
@@ -103,8 +98,7 @@ class BasketsController < ApplicationController
103
98
  @basket.destroy
104
99
 
105
100
  respond_to do |format|
106
- #format.html { redirect_to(user_baskets_url(@user)) }
107
- format.html { redirect_to user_checkouts_url(@basket.user) }
101
+ format.html { redirect_to checkouts_url(user_id: @basket.user.username) }
108
102
  format.json { head :no_content }
109
103
  end
110
104
  end
@@ -1,7 +1,7 @@
1
1
  # -*- encoding: utf-8 -*-
2
2
  class LibrariesController < ApplicationController
3
3
  load_and_authorize_resource
4
- after_filter :solr_commit, :only => [:create, :update, :destroy]
4
+ after_filter :solr_commit, only: [:create, :update, :destroy]
5
5
 
6
6
  # GET /libraries
7
7
  # GET /libraries.json
@@ -16,7 +16,7 @@ class LibrariesController < ApplicationController
16
16
  query = @query = params[:query].to_s.strip
17
17
  page = params[:page] || 1
18
18
 
19
- @libraries = Library.search(:include => [:shelves]) do
19
+ @libraries = Library.search(include: [:shelves]) do
20
20
  fulltext query if query.present?
21
21
  paginate :page => page.to_i, :per_page => Library.default_per_page
22
22
  order_by sort[:sort_by], sort[:order]
@@ -24,7 +24,7 @@ class LibrariesController < ApplicationController
24
24
 
25
25
  respond_to do |format|
26
26
  format.html # index.html.erb
27
- format.json { render :json => @libraries }
27
+ format.json { render json: @libraries }
28
28
  end
29
29
  end
30
30
 
@@ -45,7 +45,7 @@ class LibrariesController < ApplicationController
45
45
 
46
46
  respond_to do |format|
47
47
  format.html # show.html.erb
48
- format.json { render :json => @library }
48
+ format.json { render json: @library }
49
49
  format.js
50
50
  end
51
51
  end
@@ -58,7 +58,7 @@ class LibrariesController < ApplicationController
58
58
 
59
59
  respond_to do |format|
60
60
  format.html # new.html.erb
61
- format.json { render :json => @library }
61
+ format.json { render json: @library }
62
62
  end
63
63
  end
64
64
 
@@ -74,12 +74,12 @@ class LibrariesController < ApplicationController
74
74
 
75
75
  respond_to do |format|
76
76
  if @library.save
77
- format.html { redirect_to @library, :notice => t('controller.successfully_created', :model => t('activerecord.models.library')) }
78
- format.json { render :json => @library, :status => :created }
77
+ format.html { redirect_to @library, notice: t('controller.successfully_created', model: t('activerecord.models.library')) }
78
+ format.json { render json: @library, status: :created }
79
79
  else
80
80
  prepare_options
81
- format.html { render :action => "new" }
82
- format.json { render :json => @library.errors, :status => :unprocessable_entity }
81
+ format.html { render action: "new" }
82
+ format.json { render json: @library.errors, status: :unprocessable_entity }
83
83
  end
84
84
  end
85
85
  end
@@ -94,13 +94,13 @@ class LibrariesController < ApplicationController
94
94
 
95
95
  respond_to do |format|
96
96
  if @library.update_attributes(params[:library])
97
- format.html { redirect_to @library, :notice => t('controller.successfully_updated', :model => t('activerecord.models.library')) }
97
+ format.html { redirect_to @library, notice: t('controller.successfully_updated', model: t('activerecord.models.library')) }
98
98
  format.json { head :no_content }
99
99
  else
100
100
  @library.name = @library.name_was
101
101
  prepare_options
102
- format.html { render :action => "edit" }
103
- format.json { render :json => @library.errors, :status => :unprocessable_entity }
102
+ format.html { render action: "edit" }
103
+ format.json { render json: @library.errors, status: :unprocessable_entity }
104
104
  end
105
105
  end
106
106
  end
@@ -1,7 +1,6 @@
1
1
  # -*- encoding: utf-8 -*-
2
2
  class LibraryGroupsController < ApplicationController
3
3
  load_and_authorize_resource
4
- cache_sweeper :library_group_sweeper, :only => [:update]
5
4
 
6
5
  # GET /library_groups
7
6
  # GET /library_groups.json
@@ -10,7 +9,7 @@ class LibraryGroupsController < ApplicationController
10
9
 
11
10
  respond_to do |format|
12
11
  format.html # index.html.erb
13
- format.json { render :json => @library_groups }
12
+ format.json { render json: @library_groups }
14
13
  end
15
14
  end
16
15
 
@@ -19,7 +18,7 @@ class LibraryGroupsController < ApplicationController
19
18
  def show
20
19
  respond_to do |format|
21
20
  format.html # show.html.erb
22
- format.json { render :json => @library_group }
21
+ format.json { render json: @library_group }
23
22
  end
24
23
  end
25
24
 
@@ -34,12 +33,12 @@ class LibraryGroupsController < ApplicationController
34
33
  respond_to do |format|
35
34
  if @library_group.update_attributes(params[:library_group])
36
35
  expire_page '/page/opensearch'
37
- format.html { redirect_to @library_group, :notice => t('controller.successfully_updated', :model => t('activerecord.models.library_group')) }
36
+ format.html { redirect_to @library_group, notice: t('controller.successfully_updated', model: t('activerecord.models.library_group')) }
38
37
  format.json { head :no_content }
39
38
  else
40
39
  @countries = Country.all
41
- format.html { render :action => "edit" }
42
- format.json { render :json => @library_group.errors, :status => :unprocessable_entity }
40
+ format.html { render action: "edit" }
41
+ format.json { render json: @library_group.errors, status: :unprocessable_entity }
43
42
  end
44
43
  end
45
44
  end
@@ -1,7 +1,7 @@
1
1
  class ShelvesController < ApplicationController
2
2
  load_and_authorize_resource
3
3
  before_filter :get_library
4
- before_filter :get_libraries, :only => [:new, :edit, :create, :update]
4
+ before_filter :get_libraries, only: [:new, :edit, :create, :update]
5
5
 
6
6
  # GET /shelves
7
7
  # GET /shelves.json
@@ -12,7 +12,7 @@ class ShelvesController < ApplicationController
12
12
  else
13
13
  @shelves = Shelf.real
14
14
  end
15
- render :partial => 'select_form'
15
+ render partial: 'select_form'
16
16
  return
17
17
  else
18
18
  sort = {:sort_by => 'name', :order => 'asc'}
@@ -26,7 +26,7 @@ class ShelvesController < ApplicationController
26
26
  page = params[:page] || 1
27
27
  library = @library if @library
28
28
 
29
- search = Shelf.search(:include => [:library]) do
29
+ search = Shelf.search(include: [:library]) do
30
30
  fulltext query if query.present?
31
31
  paginate :page => page.to_i, :per_page => Shelf.default_per_page
32
32
  if library
@@ -43,18 +43,18 @@ class ShelvesController < ApplicationController
43
43
 
44
44
  respond_to do |format|
45
45
  format.html # index.html.erb
46
- format.json { render :json => @shelves }
46
+ format.json { render json: @shelves }
47
47
  end
48
48
  end
49
49
 
50
50
  # GET /shelves/1
51
51
  # GET /shelves/1.json
52
52
  def show
53
- @shelf = Shelf.find(params[:id], :include => :library)
53
+ @shelf = Shelf.find(params[:id], include: :library)
54
54
 
55
55
  respond_to do |format|
56
56
  format.html # show.html.erb
57
- format.json { render :json => @shelf }
57
+ format.json { render json: @shelf }
58
58
  format.mobile
59
59
  end
60
60
  end
@@ -62,20 +62,20 @@ class ShelvesController < ApplicationController
62
62
  # GET /shelves/new
63
63
  # GET /shelves/new.json
64
64
  def new
65
- @library = Library.web if @library.nil?
66
65
  @shelf = Shelf.new
66
+ @library = current_user.profile.library unless @library
67
67
  @shelf.library = @library
68
68
  #@shelf.user = current_user
69
69
 
70
70
  respond_to do |format|
71
71
  format.html # new.html.erb
72
- format.json { render :json => @shelf }
72
+ format.json { render json: @shelf }
73
73
  end
74
74
  end
75
75
 
76
76
  # GET /shelves/1/edit
77
77
  def edit
78
- @shelf = Shelf.find(params[:id], :include => :library)
78
+ @shelf = Shelf.find(params[:id], include: :library)
79
79
  end
80
80
 
81
81
  # POST /shelves
@@ -90,12 +90,12 @@ class ShelvesController < ApplicationController
90
90
 
91
91
  respond_to do |format|
92
92
  if @shelf.save
93
- format.html { redirect_to @shelf, :notice => t('controller.successfully_created', :model => t('activerecord.models.shelf')) }
94
- format.json { render :json => @shelf, :status => :created, :location => @shelf }
93
+ format.html { redirect_to @shelf, notice: t('controller.successfully_created', model: t('activerecord.models.shelf')) }
94
+ format.json { render json: @shelf, status: :created, location: @shelf }
95
95
  else
96
96
  @library = Library.first if @shelf.library.nil?
97
- format.html { render :action => "new" }
98
- format.json { render :json => @shelf.errors, :status => :unprocessable_entity }
97
+ format.html { render action: "new" }
98
+ format.json { render json: @shelf.errors, status: :unprocessable_entity }
99
99
  end
100
100
  end
101
101
  end
@@ -107,18 +107,18 @@ class ShelvesController < ApplicationController
107
107
 
108
108
  if params[:move]
109
109
  move_position(@shelf, params[:move], false)
110
- redirect_to library_shelves_url(@shelf.library)
110
+ redirect_to shelves_url(library_id: @shelf.library_id)
111
111
  return
112
112
  end
113
113
 
114
114
  respond_to do |format|
115
115
  if @shelf.update_attributes(params[:shelf])
116
- format.html { redirect_to @shelf, :notice => t('controller.successfully_updated', :model => t('activerecord.models.shelf')) }
116
+ format.html { redirect_to @shelf, notice: t('controller.successfully_updated', model: t('activerecord.models.shelf')) }
117
117
  format.json { head :no_content }
118
118
  else
119
119
  @library = Library.first if @library.nil?
120
- format.html { render :action => "edit" }
121
- format.json { render :json => @shelf.errors, :status => :unprocessable_entity }
120
+ format.html { render action: "edit" }
121
+ format.json { render json: @shelf.errors, status: :unprocessable_entity }
122
122
  end
123
123
  end
124
124
  end
@@ -9,7 +9,7 @@ class SubscribesController < ApplicationController
9
9
 
10
10
  respond_to do |format|
11
11
  format.html # index.html.erb
12
- format.json { render :json => @subscribes }
12
+ format.json { render json: @subscribes }
13
13
  end
14
14
  end
15
15
 
@@ -18,7 +18,7 @@ class SubscribesController < ApplicationController
18
18
  def show
19
19
  respond_to do |format|
20
20
  format.html # show.html.erb
21
- format.json { render :json => @subscribe }
21
+ format.json { render json: @subscribe }
22
22
  end
23
23
  end
24
24
 
@@ -31,7 +31,7 @@ class SubscribesController < ApplicationController
31
31
 
32
32
  respond_to do |format|
33
33
  format.html # new.html.erb
34
- format.json { render :json => @subscribe }
34
+ format.json { render json: @subscribe }
35
35
  end
36
36
  end
37
37
 
@@ -46,11 +46,11 @@ class SubscribesController < ApplicationController
46
46
 
47
47
  respond_to do |format|
48
48
  if @subscribe.save
49
- format.html { redirect_to @subscribe, :notice => t('controller.successfully_created', :model => t('activerecord.models.subscribe')) }
50
- format.json { render :json => @subscribe, :status => :created, :location => @subscribe }
49
+ format.html { redirect_to @subscribe, notice: t('controller.successfully_created', model: t('activerecord.models.subscribe')) }
50
+ format.json { render json: @subscribe, status: :created, location: @subscribe }
51
51
  else
52
- format.html { render :action => "new" }
53
- format.json { render :json => @subscribe.errors, :status => :unprocessable_entity }
52
+ format.html { render action: "new" }
53
+ format.json { render json: @subscribe.errors, status: :unprocessable_entity }
54
54
  end
55
55
  end
56
56
  end
@@ -60,11 +60,11 @@ class SubscribesController < ApplicationController
60
60
  def update
61
61
  respond_to do |format|
62
62
  if @subscribe.update_attributes(params[:subscribe])
63
- format.html { redirect_to @subscribe, :notice => t('controller.successfully_updated', :model => t('activerecord.models.subscribe')) }
63
+ format.html { redirect_to @subscribe, notice: t('controller.successfully_updated', model: t('activerecord.models.subscribe')) }
64
64
  format.json { head :no_content }
65
65
  else
66
- format.html { render :action => "edit" }
67
- format.json { render :json => @subscribe.errors, :status => :unprocessable_entity }
66
+ format.html { render action: "edit" }
67
+ format.json { render json: @subscribe.errors, status: :unprocessable_entity }
68
68
  end
69
69
  end
70
70
  end