enju_biblio 0.2.5 → 0.3.0.beta.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (513) hide show
  1. checksums.yaml +4 -4
  2. data/README.rdoc +3 -3
  3. data/Rakefile +1 -1
  4. data/app/assets/config/enju_biblio_manifest.js +0 -0
  5. data/app/controllers/agent_import_files_controller.rb +1 -1
  6. data/app/controllers/agent_merge_lists_controller.rb +1 -1
  7. data/app/controllers/agent_merges_controller.rb +1 -1
  8. data/app/controllers/agent_relationship_types_controller.rb +1 -1
  9. data/app/controllers/agent_relationships_controller.rb +1 -1
  10. data/app/controllers/agent_types_controller.rb +1 -1
  11. data/app/controllers/agents_controller.rb +2 -2
  12. data/app/controllers/carrier_types_controller.rb +2 -2
  13. data/app/controllers/concerns/enju_biblio/controller.rb +4 -4
  14. data/app/controllers/content_types_controller.rb +1 -1
  15. data/app/controllers/countries_controller.rb +1 -1
  16. data/app/controllers/create_types_controller.rb +1 -1
  17. data/app/controllers/creates_controller.rb +1 -1
  18. data/app/controllers/donates_controller.rb +1 -1
  19. data/app/controllers/form_of_works_controller.rb +1 -1
  20. data/app/controllers/frequencies_controller.rb +1 -1
  21. data/app/controllers/identifier_types_controller.rb +1 -1
  22. data/app/controllers/import_requests_controller.rb +1 -1
  23. data/app/controllers/items_controller.rb +3 -3
  24. data/app/controllers/languages_controller.rb +1 -1
  25. data/app/controllers/licenses_controller.rb +1 -1
  26. data/app/controllers/manifestation_relationship_types_controller.rb +1 -1
  27. data/app/controllers/manifestation_relationships_controller.rb +1 -1
  28. data/app/controllers/manifestations_controller.rb +13 -13
  29. data/app/controllers/medium_of_performances_controller.rb +1 -1
  30. data/app/controllers/owns_controller.rb +1 -1
  31. data/app/controllers/picture_files_controller.rb +1 -1
  32. data/app/controllers/produce_types_controller.rb +1 -1
  33. data/app/controllers/produces_controller.rb +1 -1
  34. data/app/controllers/realize_types_controller.rb +1 -1
  35. data/app/controllers/realizes_controller.rb +1 -1
  36. data/app/controllers/resource_export_files_controller.rb +1 -1
  37. data/app/controllers/resource_import_files_controller.rb +1 -1
  38. data/app/controllers/series_statement_merge_lists_controller.rb +1 -1
  39. data/app/controllers/series_statement_merges_controller.rb +1 -1
  40. data/app/controllers/series_statements_controller.rb +2 -2
  41. data/{lib/enju_biblio/biblio_helper.rb → app/helpers/enju_biblio/application_helper.rb} +1 -1
  42. data/app/models/agent.rb +2 -2
  43. data/app/models/agent_import_file.rb +3 -3
  44. data/app/models/agent_import_result.rb +1 -1
  45. data/app/models/agent_merge.rb +2 -2
  46. data/app/models/agent_relationship.rb +1 -1
  47. data/app/models/create.rb +1 -1
  48. data/app/models/identifier.rb +1 -2
  49. data/app/models/import_request.rb +1 -1
  50. data/app/models/item.rb +3 -3
  51. data/app/models/manifestation.rb +24 -20
  52. data/app/models/manifestation_relationship.rb +1 -1
  53. data/app/models/picture_file.rb +1 -1
  54. data/app/models/produce.rb +1 -1
  55. data/app/models/realize.rb +1 -1
  56. data/app/models/resource_export_file.rb +1 -1
  57. data/app/models/resource_import_file.rb +104 -94
  58. data/app/models/resource_import_result.rb +2 -2
  59. data/app/models/series_statement.rb +2 -2
  60. data/app/models/series_statement_merge.rb +2 -2
  61. data/app/views/agents/index.rss.builder +3 -3
  62. data/app/views/items/show.html.erb +1 -1
  63. data/app/views/manifestations/index.mods.builder +1 -1
  64. data/app/views/manifestations/index.rss.builder +1 -1
  65. data/app/views/manifestations/index.sru.builder +5 -5
  66. data/config/routes.rb +2 -2
  67. data/db/migrate/001_create_agents.rb +7 -7
  68. data/db/migrate/005_create_manifestations.rb +10 -10
  69. data/db/migrate/006_create_items.rb +6 -6
  70. data/db/migrate/012_create_owns.rb +3 -3
  71. data/db/migrate/015_create_creates.rb +3 -3
  72. data/db/migrate/047_create_produces.rb +3 -3
  73. data/db/migrate/073_create_carrier_types.rb +2 -2
  74. data/db/migrate/112_create_frequencies.rb +2 -2
  75. data/db/migrate/117_create_form_of_works.rb +2 -2
  76. data/db/migrate/125_create_donates.rb +3 -3
  77. data/db/migrate/133_create_agent_merges.rb +2 -2
  78. data/db/migrate/134_create_agent_merge_lists.rb +1 -1
  79. data/db/migrate/20080830154109_create_realizes.rb +3 -3
  80. data/db/migrate/20080905191442_create_agent_types.rb +2 -2
  81. data/db/migrate/20081025083323_create_countries.rb +5 -5
  82. data/db/migrate/20081025083905_create_languages.rb +6 -6
  83. data/db/migrate/20081027150907_create_picture_files.rb +2 -2
  84. data/db/migrate/20081028083142_create_agent_import_files.rb +1 -1
  85. data/db/migrate/20081028083208_create_resource_import_files.rb +1 -1
  86. data/db/migrate/20090705133942_add_attachments_picture_to_picture_file.rb +1 -1
  87. data/db/migrate/20090705212043_add_attachments_attachment_to_manifestation.rb +1 -1
  88. data/db/migrate/20090720091106_create_medium_of_performances.rb +2 -2
  89. data/db/migrate/20090720091429_create_content_types.rb +2 -2
  90. data/db/migrate/20090812151902_create_agent_relationship_types.rb +2 -2
  91. data/db/migrate/20091012101112_add_dcndl_schema.rb +1 -1
  92. data/db/migrate/20091025080447_create_licenses.rb +2 -2
  93. data/db/migrate/20091214131723_create_series_statements.rb +1 -1
  94. data/db/migrate/20100129142347_create_import_requests.rb +1 -1
  95. data/db/migrate/20100223121519_rename_series_statement_title_to_original_title.rb +1 -1
  96. data/db/migrate/20100321235924_add_series_statement_identifier_to_series_statement.rb +1 -1
  97. data/db/migrate/20100525124311_create_manifestation_relationships.rb +1 -1
  98. data/db/migrate/20100606073747_create_agent_relationships.rb +1 -1
  99. data/db/migrate/20100607044753_create_manifestation_relationship_types.rb +2 -2
  100. data/db/migrate/20100814091104_add_position_to_agent_relationship.rb +1 -1
  101. data/db/migrate/20100925043847_create_resource_import_results.rb +1 -1
  102. data/db/migrate/20100925074559_create_agent_import_results.rb +1 -1
  103. data/db/migrate/20101212070145_add_acquired_at_to_item.rb +1 -1
  104. data/db/migrate/20110301035123_add_pub_date_to_manifestation.rb +1 -1
  105. data/db/migrate/20110301121550_add_birth_date_and_death_date_to_agent.rb +1 -1
  106. data/db/migrate/20110603184217_add_edit_mode_to_resource_import_file.rb +1 -1
  107. data/db/migrate/20110619064807_add_edition_string_to_manifestation.rb +1 -1
  108. data/db/migrate/20110620173525_add_bookstore_id_to_item.rb +1 -1
  109. data/db/migrate/20110627034940_create_series_statement_merge_lists.rb +1 -1
  110. data/db/migrate/20110627035057_create_series_statement_merges.rb +3 -3
  111. data/db/migrate/20110916091020_add_volume_number_to_manifestation.rb +1 -1
  112. data/db/migrate/20110916103953_add_manifestaiton_id_to_series_statement.rb +1 -1
  113. data/db/migrate/20110918162329_add_note_to_series_statement.rb +1 -1
  114. data/db/migrate/20111124110059_create_create_types.rb +1 -1
  115. data/db/migrate/20111124110319_create_realize_types.rb +1 -1
  116. data/db/migrate/20111124110355_create_produce_types.rb +1 -1
  117. data/db/migrate/20111124112131_add_create_type_to_create.rb +1 -1
  118. data/db/migrate/20120125152919_add_title_subseries_transcription_to_series_statement.rb +1 -1
  119. data/db/migrate/20120129020544_add_budget_type_id_to_item.rb +1 -1
  120. data/db/migrate/20120319120638_add_content_type_id_to_manifestation.rb +2 -2
  121. data/db/migrate/20120410104851_add_year_of_publication_to_manifestation.rb +1 -1
  122. data/db/migrate/20120413072700_add_picture_meta_to_picture_file.rb +1 -1
  123. data/db/migrate/20120413100352_add_fingerprint_to_picture_file.rb +1 -1
  124. data/db/migrate/20120413161340_add_fingerprint_to_resource_import_file.rb +1 -1
  125. data/db/migrate/20120413161403_add_fingerprint_to_agent_import_file.rb +1 -1
  126. data/db/migrate/20120413170705_add_error_message_to_resource_import_file.rb +1 -1
  127. data/db/migrate/20120413170720_add_error_message_to_agent_import_file.rb +1 -1
  128. data/db/migrate/20120415164821_add_attachment_meta_to_manifestation.rb +1 -1
  129. data/db/migrate/20120418081407_add_month_of_publication_to_manifestation.rb +1 -1
  130. data/db/migrate/20120511072422_add_agent_identifier_to_agent.rb +1 -1
  131. data/db/migrate/20120602141129_add_edit_mode_to_agent_import_file.rb +1 -1
  132. data/db/migrate/20121116031206_add_fulltext_content_to_manifestation.rb +1 -1
  133. data/db/migrate/20130421093852_add_periodical_to_manifestation.rb +1 -1
  134. data/db/migrate/20130421155019_add_creator_string_to_series_statement.rb +1 -1
  135. data/db/migrate/20130421164124_add_series_master_to_series_statement.rb +1 -1
  136. data/db/migrate/20130429020822_add_root_manifestation_id_to_series_statement.rb +1 -1
  137. data/db/migrate/20130506175303_create_identifier_types.rb +1 -1
  138. data/db/migrate/20130506175834_create_identifiers.rb +3 -3
  139. data/db/migrate/20130509185724_add_statement_of_responsibility_to_manifestation.rb +1 -1
  140. data/db/migrate/20140519170214_create_resource_import_file_transitions.rb +1 -1
  141. data/db/migrate/20140519171220_create_import_request_transitions.rb +1 -1
  142. data/db/migrate/20140524020735_create_agent_import_file_transitions.rb +1 -1
  143. data/db/migrate/20140614065404_create_resource_export_files.rb +1 -1
  144. data/db/migrate/20140614141500_create_resource_export_file_transitions.rb +1 -1
  145. data/db/migrate/20140628073524_add_user_encoding_to_agent_import_file.rb +1 -1
  146. data/db/migrate/20140628073535_add_user_encoding_to_resource_import_file.rb +1 -1
  147. data/db/migrate/20140720140916_add_binding_item_identifier_to_item.rb +1 -1
  148. data/db/migrate/20140721151416_add_default_shelf_id_to_resource_import_file.rb +1 -1
  149. data/db/migrate/20140802082007_add_manifestation_id_to_item.rb +1 -1
  150. data/db/migrate/20140813182425_add_publication_place_to_manifestation.rb +1 -1
  151. data/db/migrate/20140822114527_add_error_message_to_resource_import_result.rb +1 -1
  152. data/db/migrate/20140823083524_add_extent_to_manifestation.rb +1 -1
  153. data/db/migrate/20140823094847_add_dimensions_to_manifestation.rb +1 -1
  154. data/db/migrate/20140823095740_rename_manifestation_periodical_to_serial.rb +1 -1
  155. data/db/migrate/20150117111136_add_foreign_key_to_items_referencing_manifestations.rb +1 -1
  156. data/db/migrate/20151125004028_add_profile_id_to_agent.rb +1 -1
  157. data/db/migrate/20160801080612_add_most_recent_to_import_request_transitions.rb +1 -1
  158. data/db/migrate/20160801080619_add_most_recent_to_resource_import_file_transitions.rb +1 -1
  159. data/db/migrate/20160801080637_add_most_recent_to_resource_export_file_transitions.rb +1 -1
  160. data/db/migrate/20160801080643_add_most_recent_to_agent_import_file_transitions.rb +1 -1
  161. data/db/migrate/20160811102604_add_picture_width_to_picture_file.rb +1 -1
  162. data/db/migrate/20160820004638_add_attachment_attachment_to_carrier_types.rb +1 -1
  163. data/db/migrate/20171119051258_set_not_null_to_manifestation_id_on_items.rb +1 -1
  164. data/db/migrate/20180107161311_add_constraints_to_most_recent_for_agent_import_file_transitions.rb +1 -1
  165. data/db/migrate/20180107161331_add_constraints_to_most_recent_for_resource_import_file_transitions.rb +1 -1
  166. data/db/migrate/20180107161347_add_constraints_to_most_recent_for_resource_export_file_transitions.rb +1 -1
  167. data/db/migrate/20180107161410_add_constraints_to_most_recent_for_import_request_transitions.rb +1 -1
  168. data/lib/enju_biblio.rb +0 -1
  169. data/lib/enju_biblio/openurl.rb +16 -17
  170. data/lib/enju_biblio/porta_cql.rb +7 -8
  171. data/lib/enju_biblio/sru.rb +11 -12
  172. data/lib/enju_biblio/version.rb +1 -1
  173. data/lib/generators/enju_biblio/setup/templates/config/schedule.rb +2 -2
  174. data/lib/tasks/agent_type.rb +2 -2
  175. data/lib/tasks/content_type.rb +2 -2
  176. data/lib/tasks/enju_biblio_tasks.rake +4 -4
  177. data/lib/tasks/identifier_type.rb +2 -2
  178. data/spec/cassette_library/ResourceImportFile/when_its_mode_is_create_/NDLBibID/should_import_NDLBibID.yml +65 -0
  179. data/spec/controllers/agent_import_files_controller_spec.rb +23 -24
  180. data/spec/controllers/agent_import_results_controller_spec.rb +4 -5
  181. data/spec/controllers/agent_merge_lists_controller_spec.rb +48 -48
  182. data/spec/controllers/agent_merges_controller_spec.rb +44 -44
  183. data/spec/controllers/agent_relationship_types_controller_spec.rb +45 -45
  184. data/spec/controllers/agent_relationships_controller_spec.rb +45 -45
  185. data/spec/controllers/agent_types_controller_spec.rb +18 -18
  186. data/spec/controllers/agents_controller_spec.rb +59 -59
  187. data/spec/controllers/carrier_types_controller_spec.rb +20 -20
  188. data/spec/controllers/content_types_controller_spec.rb +18 -18
  189. data/spec/controllers/countries_controller_spec.rb +47 -47
  190. data/spec/controllers/create_types_controller_spec.rb +17 -17
  191. data/spec/controllers/creates_controller_spec.rb +46 -46
  192. data/spec/controllers/donates_controller_spec.rb +45 -45
  193. data/spec/controllers/form_of_works_controller_spec.rb +17 -17
  194. data/spec/controllers/frequencies_controller_spec.rb +18 -18
  195. data/spec/controllers/identifier_types_controller_spec.rb +17 -17
  196. data/spec/controllers/import_requests_controller_spec.rb +48 -48
  197. data/spec/controllers/items_controller_spec.rb +69 -88
  198. data/spec/controllers/languages_controller_spec.rb +31 -31
  199. data/spec/controllers/licenses_controller_spec.rb +17 -17
  200. data/spec/controllers/manifestation_relationship_types_controller_spec.rb +45 -45
  201. data/spec/controllers/manifestation_relationships_controller_spec.rb +45 -45
  202. data/spec/controllers/manifestations_controller_spec.rb +95 -117
  203. data/spec/controllers/medium_of_performances_controller_spec.rb +17 -17
  204. data/spec/controllers/owns_controller_spec.rb +45 -45
  205. data/spec/controllers/picture_files_controller_spec.rb +46 -46
  206. data/spec/controllers/produce_types_controller_spec.rb +17 -17
  207. data/spec/controllers/produces_controller_spec.rb +46 -46
  208. data/spec/controllers/realize_types_controller_spec.rb +17 -17
  209. data/spec/controllers/realizes_controller_spec.rb +47 -47
  210. data/spec/controllers/resource_export_files_controller_spec.rb +23 -23
  211. data/spec/controllers/resource_import_files_controller_spec.rb +24 -24
  212. data/spec/controllers/resource_import_results_controller_spec.rb +12 -13
  213. data/spec/controllers/series_statement_merge_lists_controller_spec.rb +46 -46
  214. data/spec/controllers/series_statement_merges_controller_spec.rb +44 -44
  215. data/spec/controllers/series_statements_controller_spec.rb +46 -46
  216. data/spec/dummy/app/controllers/application_controller.rb +1 -1
  217. data/spec/dummy/app/helpers/application_helper.rb +2 -2
  218. data/spec/dummy/app/models/local_agent.rb +1 -1
  219. data/spec/dummy/app/models/user.rb +0 -2
  220. data/spec/dummy/bin/rails +1 -1
  221. data/spec/dummy/bin/setup +21 -12
  222. data/spec/dummy/bin/update +29 -0
  223. data/spec/dummy/bin/yarn +11 -0
  224. data/spec/dummy/config/application.rb +8 -22
  225. data/spec/dummy/config/boot.rb +2 -2
  226. data/spec/dummy/config/cable.yml +10 -0
  227. data/spec/dummy/config/database.yml +17 -22
  228. data/spec/dummy/config/environment.rb +1 -1
  229. data/spec/dummy/config/environments/development.rb +24 -11
  230. data/spec/dummy/config/environments/production.rb +28 -16
  231. data/spec/dummy/config/environments/test.rb +8 -7
  232. data/spec/dummy/config/initializers/application_controller_renderer.rb +8 -0
  233. data/spec/dummy/config/initializers/assets.rb +6 -3
  234. data/spec/dummy/config/initializers/cookies_serializer.rb +5 -0
  235. data/spec/dummy/config/initializers/filter_parameter_logging.rb +4 -0
  236. data/spec/dummy/config/initializers/inflections.rb +7 -7
  237. data/spec/dummy/config/initializers/mime_types.rb +0 -1
  238. data/spec/dummy/config/initializers/wrap_parameters.rb +5 -5
  239. data/spec/dummy/config/locales/en.yml +32 -207
  240. data/spec/dummy/config/puma.rb +56 -0
  241. data/spec/dummy/config/secrets.yml +32 -0
  242. data/spec/dummy/config/spring.rb +6 -0
  243. data/spec/dummy/config/sunspot.yml +23 -0
  244. data/spec/dummy/db/migrate/002_devise_create_users.rb +6 -6
  245. data/spec/dummy/db/migrate/029_create_subjects.rb +4 -4
  246. data/spec/dummy/db/migrate/032_create_checkins.rb +2 -2
  247. data/spec/dummy/db/migrate/033_create_checkouts.rb +5 -5
  248. data/spec/dummy/db/migrate/035_create_reserves.rb +6 -6
  249. data/spec/dummy/db/migrate/041_create_roles.rb +3 -3
  250. data/spec/dummy/db/migrate/055_create_bookmarks.rb +3 -3
  251. data/spec/dummy/db/migrate/059_create_libraries.rb +1 -1
  252. data/spec/dummy/db/migrate/069_create_shelves.rb +1 -1
  253. data/spec/dummy/db/migrate/077_create_user_groups.rb +2 -2
  254. data/spec/dummy/db/migrate/080_create_library_groups.rb +1 -1
  255. data/spec/dummy/db/migrate/113_create_events.rb +4 -4
  256. data/spec/dummy/db/migrate/114_create_event_categories.rb +2 -2
  257. data/spec/dummy/db/migrate/120_create_baskets.rb +1 -1
  258. data/spec/dummy/db/migrate/121_create_checked_items.rb +4 -4
  259. data/spec/dummy/db/migrate/124_create_bookstores.rb +2 -2
  260. data/spec/dummy/db/migrate/127_create_use_restrictions.rb +2 -2
  261. data/spec/dummy/db/migrate/129_create_item_has_use_restrictions.rb +3 -3
  262. data/spec/dummy/db/migrate/130_create_request_status_types.rb +2 -2
  263. data/spec/dummy/db/migrate/131_create_request_types.rb +2 -2
  264. data/spec/dummy/db/migrate/132_create_circulation_statuses.rb +2 -2
  265. data/spec/dummy/db/migrate/142_create_classifications.rb +3 -3
  266. data/spec/dummy/db/migrate/144_create_classification_types.rb +2 -2
  267. data/spec/dummy/db/migrate/145_create_subject_heading_types.rb +2 -2
  268. data/spec/dummy/db/migrate/146_create_subject_types.rb +2 -2
  269. data/spec/dummy/db/migrate/149_create_message_templates.rb +6 -6
  270. data/spec/dummy/db/migrate/154_create_messages.rb +3 -3
  271. data/spec/dummy/db/migrate/20080819181903_create_message_requests.rb +1 -1
  272. data/spec/dummy/db/migrate/20081006090811_create_subscriptions.rb +1 -1
  273. data/spec/dummy/db/migrate/20081006093246_create_subscribes.rb +1 -1
  274. data/spec/dummy/db/migrate/20081023092436_create_search_engines.rb +6 -6
  275. data/spec/dummy/db/migrate/20081028093607_create_event_import_files.rb +1 -1
  276. data/spec/dummy/db/migrate/20081030023412_create_checkout_types.rb +2 -2
  277. data/spec/dummy/db/migrate/20081030023518_create_user_group_has_checkout_types.rb +9 -9
  278. data/spec/dummy/db/migrate/20081030023615_create_carrier_type_has_checkout_types.rb +4 -4
  279. data/spec/dummy/db/migrate/20081117143156_create_inventory_files.rb +1 -1
  280. data/spec/dummy/db/migrate/20081117143455_create_inventories.rb +1 -1
  281. data/spec/dummy/db/migrate/20081212075554_create_checkout_stat_has_manifestations.rb +5 -5
  282. data/spec/dummy/db/migrate/20081212080038_create_manifestation_checkout_stats.rb +1 -1
  283. data/spec/dummy/db/migrate/20081212151614_create_bookmark_stats.rb +1 -1
  284. data/spec/dummy/db/migrate/20081212151820_create_bookmark_stat_has_manifestations.rb +3 -3
  285. data/spec/dummy/db/migrate/20081215094302_create_user_checkout_stats.rb +1 -1
  286. data/spec/dummy/db/migrate/20081215094955_create_checkout_stat_has_users.rb +4 -4
  287. data/spec/dummy/db/migrate/20081216190517_create_reserve_stat_has_manifestations.rb +4 -4
  288. data/spec/dummy/db/migrate/20081216190724_create_manifestation_reserve_stats.rb +1 -1
  289. data/spec/dummy/db/migrate/20081220023628_create_user_reserve_stats.rb +1 -1
  290. data/spec/dummy/db/migrate/20081220034117_create_reserve_stat_has_users.rb +3 -3
  291. data/spec/dummy/db/migrate/20090321130448_add_completed_at_to_user_checkout_stat.rb +1 -1
  292. data/spec/dummy/db/migrate/20090519203307_create_participates.rb +3 -3
  293. data/spec/dummy/db/migrate/20090706125521_add_attachments_inventory_to_inventory_file.rb +1 -1
  294. data/spec/dummy/db/migrate/20090831220301_create_lending_policies.rb +7 -7
  295. data/spec/dummy/db/migrate/20091202124834_create_versions.rb +4 -4
  296. data/spec/dummy/db/migrate/20100211105551_add_admin_networks_to_library_group.rb +1 -1
  297. data/spec/dummy/db/migrate/20100222124420_add_allow_bookmark_external_url_to_library_group.rb +2 -2
  298. data/spec/dummy/db/migrate/20100314190054_add_opening_hour_to_library.rb +1 -1
  299. data/spec/dummy/db/migrate/20100525171356_acts_as_taggable_on_migration.rb +3 -3
  300. data/spec/dummy/db/migrate/20100606065209_create_user_has_roles.rb +1 -1
  301. data/spec/dummy/db/migrate/20100925074639_create_event_import_results.rb +1 -1
  302. data/spec/dummy/db/migrate/20110222073537_add_url_to_library_group.rb +2 -2
  303. data/spec/dummy/db/migrate/20110301134521_add_expire_date_to_reserve.rb +1 -1
  304. data/spec/dummy/db/migrate/20110318183304_add_valid_period_for_new_user_to_user_group.rb +2 -2
  305. data/spec/dummy/db/migrate/20110328130826_add_current_checkout_count_to_user_group_has_checkout_type.rb +1 -1
  306. data/spec/dummy/db/migrate/20110621093332_remove_expire_date_from_reserve.rb +1 -1
  307. data/spec/dummy/db/migrate/20110627122938_add_number_of_day_to_notify_overdue_to_user_group.rb +4 -4
  308. data/spec/dummy/db/migrate/20110913115320_add_lft_and_rgt_to_message.rb +1 -1
  309. data/spec/dummy/db/migrate/20110913120629_add_lft_and_rgt_to_classification.rb +1 -1
  310. data/spec/dummy/db/migrate/20111217234412_add_save_checkout_history_to_user.rb +2 -2
  311. data/spec/dummy/db/migrate/20111218002349_add_checkout_icalendar_token_to_user.rb +2 -2
  312. data/spec/dummy/db/migrate/20120105074911_add_isil_to_library.rb +1 -1
  313. data/spec/dummy/db/migrate/20120125050502_add_depth_to_message.rb +1 -1
  314. data/spec/dummy/db/migrate/20120129014038_create_budget_types.rb +1 -1
  315. data/spec/dummy/db/migrate/20120319173203_create_accepts.rb +1 -1
  316. data/spec/dummy/db/migrate/20120406020752_add_url_to_subject.rb +1 -1
  317. data/spec/dummy/db/migrate/20120413051535_add_event_import_fingerprint_to_event_import_file.rb +1 -1
  318. data/spec/dummy/db/migrate/20120413100431_add_fingerprint_to_inventory_file.rb +1 -1
  319. data/spec/dummy/db/migrate/20120413170734_add_error_message_to_event_import_file.rb +1 -1
  320. data/spec/dummy/db/migrate/20120415060342_rename_event_import_file_imported_at_to_executed_at.rb +1 -1
  321. data/spec/dummy/db/migrate/20120424103932_add_librarian_id_to_checked_item.rb +1 -1
  322. data/spec/dummy/db/migrate/20120510140958_add_closed_to_shelf.rb +2 -2
  323. data/spec/dummy/db/migrate/20130221154434_add_additional_attributes_to_user.rb +4 -4
  324. data/spec/dummy/db/migrate/20130303124821_add_retained_at_to_reserve.rb +1 -1
  325. data/spec/dummy/db/migrate/20130304015019_add_postponed_at_to_reserve.rb +1 -1
  326. data/spec/dummy/db/migrate/20130412083556_add_latitude_and_longitude_to_library.rb +1 -1
  327. data/spec/dummy/db/migrate/20130416054135_add_circulation_status_id_to_item.rb +3 -3
  328. data/spec/dummy/db/migrate/20130504133816_add_manifestation_id_to_subject.rb +1 -1
  329. data/spec/dummy/db/migrate/20130504143515_add_manifestation_id_to_classification.rb +1 -1
  330. data/spec/dummy/db/migrate/20130504195916_add_subject_heading_type_id_to_subject.rb +1 -1
  331. data/spec/dummy/db/migrate/20130519065638_add_lock_version_to_reserve.rb +2 -2
  332. data/spec/dummy/db/migrate/20130519065837_add_lock_version_to_checkin.rb +2 -2
  333. data/spec/dummy/db/migrate/20140110122216_create_user_import_files.rb +1 -1
  334. data/spec/dummy/db/migrate/20140110131010_create_user_import_results.rb +1 -1
  335. data/spec/dummy/db/migrate/20140122054321_create_profiles.rb +2 -2
  336. data/spec/dummy/db/migrate/20140518050147_create_reserve_transitions.rb +1 -1
  337. data/spec/dummy/db/migrate/20140518111006_create_message_transitions.rb +1 -1
  338. data/spec/dummy/db/migrate/20140518135713_create_message_request_transitions.rb +1 -1
  339. data/spec/dummy/db/migrate/20140523171309_create_event_import_file_transitions.rb +1 -1
  340. data/spec/dummy/db/migrate/20140524074813_create_user_import_file_transitions.rb +1 -1
  341. data/spec/dummy/db/migrate/20140524135607_create_bookmark_stat_transitions.rb +1 -1
  342. data/spec/dummy/db/migrate/20140528045518_create_user_checkout_stat_transitions.rb +1 -1
  343. data/spec/dummy/db/migrate/20140528045539_create_user_reserve_stat_transitions.rb +1 -1
  344. data/spec/dummy/db/migrate/20140528045600_create_manifestation_checkout_stat_transitions.rb +1 -1
  345. data/spec/dummy/db/migrate/20140528045617_create_manifestation_reserve_stat_transitions.rb +1 -1
  346. data/spec/dummy/db/migrate/20140610123439_drop_email_unique_constraint_enju_leaf_rc10.rb +1 -1
  347. data/spec/dummy/db/migrate/20140628071719_add_user_encoding_to_event_import_file.rb +1 -1
  348. data/spec/dummy/db/migrate/20140628072217_add_user_encoding_to_user_import_file.rb +1 -1
  349. data/spec/dummy/db/migrate/20140709113413_create_user_export_files.rb +1 -1
  350. data/spec/dummy/db/migrate/20140709113905_create_user_export_file_transitions.rb +1 -1
  351. data/spec/dummy/db/migrate/20140720170714_add_default_library_id_to_user_import_file.rb +1 -1
  352. data/spec/dummy/db/migrate/20140720170735_add_default_user_group_id_to_user_import_file.rb +1 -1
  353. data/spec/dummy/db/migrate/20140720192418_add_default_library_id_to_event_import_file.rb +1 -1
  354. data/spec/dummy/db/migrate/20140810061942_add_user_id_to_user_checkout_stat.rb +1 -1
  355. data/spec/dummy/db/migrate/20140810091231_add_checkout_icalendar_token_to_profile.rb +2 -2
  356. data/spec/dummy/db/migrate/20140810091417_add_save_checkout_history_to_profile.rb +2 -2
  357. data/spec/dummy/db/migrate/20140811031145_add_expired_at_to_profile.rb +1 -1
  358. data/spec/dummy/db/migrate/20140812093836_add_share_bookmarks_to_profile.rb +1 -1
  359. data/spec/dummy/db/migrate/20140812152348_create_event_export_files.rb +1 -1
  360. data/spec/dummy/db/migrate/20140812153137_create_event_export_file_transitions.rb +1 -1
  361. data/spec/dummy/db/migrate/20140814070854_add_default_event_category_id_to_event_import_file.rb +1 -1
  362. data/spec/dummy/db/migrate/20140821151023_create_colors.rb +1 -1
  363. data/spec/dummy/db/migrate/20141003181336_add_full_name_transcription_to_profile.rb +1 -1
  364. data/spec/dummy/db/migrate/20141003182825_add_date_of_birth_to_profile.rb +1 -1
  365. data/spec/dummy/db/migrate/20141014065831_add_shelf_id_to_checkout.rb +1 -1
  366. data/spec/dummy/db/migrate/20150221063719_add_settings_to_library_group.rb +1 -1
  367. data/spec/dummy/db/migrate/20150506105356_add_error_message_to_user_import_result.rb +1 -1
  368. data/spec/dummy/db/migrate/20150924115059_create_withdraws.rb +1 -1
  369. data/spec/dummy/db/migrate/20151213070943_add_translation_table_to_library_group.rb +1 -1
  370. data/spec/dummy/db/migrate/20151213072705_add_footer_banner_to_library_group.rb +1 -1
  371. data/spec/dummy/db/migrate/20160610093229_add_html_snippet_to_library_group.rb +1 -1
  372. data/spec/dummy/db/migrate/20160627232219_add_most_recent_to_user_import_file_transitions.rb +1 -1
  373. data/spec/dummy/db/migrate/20160627232316_add_most_recent_to_user_export_file_transitions.rb +1 -1
  374. data/spec/dummy/db/migrate/20160703184619_add_most_recent_to_reserve_transitions.rb +1 -1
  375. data/spec/dummy/db/migrate/20160703184650_add_most_recent_to_manifestation_checkout_stat_transitions.rb +1 -1
  376. data/spec/dummy/db/migrate/20160703184723_add_most_recent_to_manifestation_reserve_stat_transitions.rb +1 -1
  377. data/spec/dummy/db/migrate/20160703184747_add_most_recent_to_user_checkout_stat_transitions.rb +1 -1
  378. data/spec/dummy/db/migrate/20160703184805_add_most_recent_to_user_reserve_stat_transitions.rb +1 -1
  379. data/spec/dummy/db/migrate/20160703185015_add_most_recent_to_message_transitions.rb +1 -1
  380. data/spec/dummy/db/migrate/20160703190209_add_foreign_key_on_manifestation_id_to_reserve.rb +1 -1
  381. data/spec/dummy/db/migrate/20160813191533_add_book_jacket_source_to_library_group.rb +1 -1
  382. data/spec/dummy/db/migrate/20160813191647_add_max_number_of_results_to_library_group.rb +1 -1
  383. data/spec/dummy/db/migrate/20160813191733_add_family_name_first_to_library_group.rb +1 -1
  384. data/spec/dummy/db/migrate/20160813191820_add_screenshot_generator_to_library_group.rb +1 -1
  385. data/spec/dummy/db/migrate/20160813192542_add_pub_year_facet_range_interval_to_library_group.rb +1 -1
  386. data/spec/dummy/db/migrate/20160813203039_add_user_id_to_library_group.rb +1 -1
  387. data/spec/dummy/db/migrate/20160814165332_add_most_recent_to_message_request_transitions.rb +1 -1
  388. data/spec/dummy/db/migrate/20170305064014_add_csv_charset_conversion_to_library_group.rb +1 -1
  389. data/spec/dummy/db/migrate/20171014084528_add_header_logo_to_library_group.rb +1 -1
  390. data/spec/dummy/db/migrate/20171126133835_rename_login_banner_to_old_login_banner.rb +1 -1
  391. data/spec/dummy/db/migrate/20171126135238_add_foreign_key_to_library_group_id_on_library.rb +1 -1
  392. data/spec/dummy/db/migrate/20180102162311_add_header_logo_meta_to_library_group.rb +1 -1
  393. data/spec/dummy/db/migrate/20180107160726_add_constraints_to_most_recent_for_user_import_file_transitions.rb +1 -1
  394. data/spec/dummy/db/migrate/20180107160740_add_constraints_to_most_recent_for_user_export_file_transitions.rb +1 -1
  395. data/spec/dummy/db/schema.rb +930 -1014
  396. data/spec/factories/agent.rb +1 -1
  397. data/spec/factories/{patron_relationship.rb → agent_relationship.rb} +1 -0
  398. data/spec/factories/{patron_relationship_type.rb → agent_relationship_type.rb} +0 -0
  399. data/spec/factories/{patron_type.rb → agent_type.rb} +0 -0
  400. data/spec/factories/bookstores.rb +5 -0
  401. data/spec/factories/budget_types.rb +5 -0
  402. data/spec/factories/checkout.rb +1 -1
  403. data/spec/factories/create.rb +4 -3
  404. data/spec/factories/identifier.rb +3 -3
  405. data/spec/factories/import_request.rb +3 -2
  406. data/spec/factories/item.rb +6 -4
  407. data/spec/factories/library.rb +1 -1
  408. data/spec/factories/manifestation_relationship.rb +4 -3
  409. data/spec/factories/manifestation_relationship_type.rb +2 -2
  410. data/spec/factories/profile.rb +1 -1
  411. data/spec/models/agent_import_file_spec.rb +18 -10
  412. data/spec/models/agent_import_result_spec.rb +1 -2
  413. data/spec/models/agent_merge_list_spec.rb +1 -2
  414. data/spec/models/agent_merge_spec.rb +1 -2
  415. data/spec/models/agent_relationship_spec.rb +1 -2
  416. data/spec/models/agent_relationship_type_spec.rb +1 -2
  417. data/spec/models/agent_spec.rb +4 -5
  418. data/spec/models/agent_type_spec.rb +1 -2
  419. data/spec/models/carrier_type_spec.rb +0 -1
  420. data/spec/models/content_type_spec.rb +1 -2
  421. data/spec/models/country_spec.rb +1 -2
  422. data/spec/models/create_spec.rb +1 -2
  423. data/spec/models/donate_spec.rb +1 -2
  424. data/spec/models/form_of_work_spec.rb +1 -2
  425. data/spec/models/frequency_spec.rb +0 -1
  426. data/spec/models/identifier_spec.rb +1 -2
  427. data/spec/models/identifier_type_spec.rb +1 -2
  428. data/spec/models/import_request_spec.rb +2 -3
  429. data/spec/models/item_spec.rb +2 -3
  430. data/spec/models/language_spec.rb +1 -2
  431. data/spec/models/license_spec.rb +1 -2
  432. data/spec/models/manifestation_relationship_spec.rb +1 -2
  433. data/spec/models/manifestation_relationship_type_spec.rb +1 -2
  434. data/spec/models/manifestation_spec.rb +57 -48
  435. data/spec/models/medium_of_performance_spec.rb +1 -2
  436. data/spec/models/own_spec.rb +1 -2
  437. data/spec/models/picture_file_spec.rb +1 -2
  438. data/spec/models/produce_spec.rb +1 -2
  439. data/spec/models/realize_spec.rb +1 -2
  440. data/spec/models/resource_export_file_spec.rb +0 -1
  441. data/spec/models/resource_import_file_spec.rb +99 -55
  442. data/spec/models/resource_import_result_spec.rb +1 -2
  443. data/spec/models/series_statement_merge_spec.rb +1 -1
  444. data/spec/rails_helper.rb +0 -14
  445. data/spec/requests/agents_spec.rb +1 -1
  446. data/spec/requests/items_spec.rb +3 -2
  447. data/spec/requests/manifestations_spec.rb +1 -1
  448. data/spec/routing/agent_relationship_types_routing_spec.rb +7 -7
  449. data/spec/routing/agent_relationships_routing_spec.rb +7 -7
  450. data/spec/routing/agents_routing_spec.rb +7 -7
  451. data/spec/routing/content_types_routing_spec.rb +7 -7
  452. data/spec/routing/create_types_routing_spec.rb +4 -4
  453. data/spec/routing/creates_routing_spec.rb +7 -7
  454. data/spec/routing/items_routing_spec.rb +7 -7
  455. data/spec/routing/licenses_routing_spec.rb +7 -7
  456. data/spec/routing/manifestation_relationship_types_routing_spec.rb +7 -7
  457. data/spec/routing/manifestation_relationships_routing_spec.rb +7 -7
  458. data/spec/routing/manifestations_routing_spec.rb +8 -8
  459. data/spec/routing/produce_types_routing_spec.rb +4 -4
  460. data/spec/routing/realize_types_routing_spec.rb +4 -4
  461. data/spec/routing/realizes_routing_spec.rb +7 -7
  462. data/spec/routing/resource_export_files_routing_spec.rb +4 -4
  463. data/spec/routing/series_statement_merge_lists_routing_spec.rb +4 -4
  464. data/spec/routing/series_statement_merges_routing_spec.rb +4 -4
  465. data/spec/support/resque.rb +2 -2
  466. data/spec/views/agent_types/edit.html.erb_spec.rb +8 -8
  467. data/spec/views/agent_types/index.html.erb_spec.rb +8 -9
  468. data/spec/views/agent_types/new.html.erb_spec.rb +8 -8
  469. data/spec/views/agent_types/show.html.erb_spec.rb +4 -4
  470. data/spec/views/create_types/edit.html.erb_spec.rb +8 -8
  471. data/spec/views/create_types/index.html.erb_spec.rb +8 -9
  472. data/spec/views/create_types/new.html.erb_spec.rb +8 -8
  473. data/spec/views/create_types/show.html.erb_spec.rb +4 -4
  474. data/spec/views/creates/edit.html.erb_spec.rb +4 -4
  475. data/spec/views/creates/index.html.erb_spec.rb +5 -5
  476. data/spec/views/creates/new.html.erb_spec.rb +4 -4
  477. data/spec/views/creates/show.html.erb_spec.rb +2 -2
  478. data/spec/views/import_requests/edit.html.erb_spec.rb +4 -4
  479. data/spec/views/import_requests/index.html.erb_spec.rb +9 -10
  480. data/spec/views/import_requests/new.html.erb_spec.rb +6 -6
  481. data/spec/views/import_requests/show.html.erb_spec.rb +2 -2
  482. data/spec/views/items/index.html.erb_spec.rb +2 -2
  483. data/spec/views/manifestations/index.rdf.builder_spec.rb +2 -2
  484. data/spec/views/manifestations/index.txt.erb_spec.rb +1 -1
  485. data/spec/views/owns/edit.html.erb_spec.rb +4 -4
  486. data/spec/views/owns/index.html.erb_spec.rb +5 -5
  487. data/spec/views/owns/new.html.erb_spec.rb +4 -4
  488. data/spec/views/owns/show.html.erb_spec.rb +2 -2
  489. data/spec/views/produce_types/edit.html.erb_spec.rb +8 -8
  490. data/spec/views/produce_types/index.html.erb_spec.rb +8 -9
  491. data/spec/views/produce_types/new.html.erb_spec.rb +8 -8
  492. data/spec/views/produce_types/show.html.erb_spec.rb +4 -4
  493. data/spec/views/produces/edit.html.erb_spec.rb +5 -5
  494. data/spec/views/produces/index.html.erb_spec.rb +5 -5
  495. data/spec/views/produces/new.html.erb_spec.rb +5 -5
  496. data/spec/views/produces/show.html.erb_spec.rb +2 -2
  497. data/spec/views/realize_types/edit.html.erb_spec.rb +8 -8
  498. data/spec/views/realize_types/index.html.erb_spec.rb +8 -9
  499. data/spec/views/realize_types/new.html.erb_spec.rb +8 -8
  500. data/spec/views/realize_types/show.html.erb_spec.rb +4 -4
  501. data/spec/views/realizes/edit.html.erb_spec.rb +5 -5
  502. data/spec/views/realizes/index.html.erb_spec.rb +5 -5
  503. data/spec/views/realizes/new.html.erb_spec.rb +5 -5
  504. data/spec/views/realizes/show.html.erb_spec.rb +2 -2
  505. data/spec/views/resource_export_files/index.html.erb_spec.rb +1 -1
  506. data/spec/views/series_statement_merge_lists/edit.html.erb_spec.rb +3 -3
  507. data/spec/views/series_statement_merge_lists/index.html.erb_spec.rb +5 -5
  508. data/spec/views/series_statement_merge_lists/new.html.erb_spec.rb +3 -3
  509. data/spec/views/series_statement_merge_lists/show.html.erb_spec.rb +1 -1
  510. data/spec/views/series_statement_merges/edit.html.erb_spec.rb +5 -5
  511. data/spec/views/series_statement_merges/index.html.erb_spec.rb +5 -5
  512. data/spec/views/series_statement_merges/new.html.erb_spec.rb +5 -5
  513. metadata +67 -68
@@ -1,8 +1,7 @@
1
- # -*- encoding: utf-8 -*-
2
1
  require 'rails_helper'
3
2
 
4
3
  describe ManifestationRelationship do
5
- #pending "add some examples to (or delete) #{__FILE__}"
4
+ # pending "add some examples to (or delete) #{__FILE__}"
6
5
 
7
6
  end
8
7
 
@@ -1,8 +1,7 @@
1
- # -*- encoding: utf-8 -*-
2
1
  require 'rails_helper'
3
2
 
4
3
  describe ManifestationRelationshipType do
5
- #pending "add some examples to (or delete) #{__FILE__}"
4
+ # pending "add some examples to (or delete) #{__FILE__}"
6
5
 
7
6
  end
8
7
 
@@ -1,165 +1,164 @@
1
- # -*- encoding: utf-8 -*-
2
1
  require 'rails_helper'
3
2
 
4
- describe Manifestation, :solr => true do
3
+ describe Manifestation, solr: true do
5
4
  fixtures :all
6
5
  before do
7
6
  Manifestation.reindex
8
7
  end
9
8
 
10
9
  it "should set year_of_publication" do
11
- manifestation = FactoryBot.create(:manifestation, :pub_date => '2000')
10
+ manifestation = FactoryBot.create(:manifestation, pub_date: '2000')
12
11
  manifestation.year_of_publication.should eq 2000
13
12
  manifestation.date_of_publication.should eq Time.zone.parse('2000-01-01')
14
13
  end
15
14
 
16
15
  it "should set date_of_publication" do
17
- manifestation = FactoryBot.create(:manifestation, :pub_date => '2000-01')
16
+ manifestation = FactoryBot.create(:manifestation, pub_date: '2000-01')
18
17
  manifestation.year_of_publication.should eq 2000
19
18
  manifestation.month_of_publication.should eq 1
20
19
  manifestation.date_of_publication.should eq Time.zone.parse('2000-01-01')
21
20
  end
22
21
 
23
22
  it "should set volume_number" do
24
- manifestation = FactoryBot.create(:manifestation, :volume_number_string => '第1巻', :issue_number_string => '20号分冊1', :edition_string => '第3版')
23
+ manifestation = FactoryBot.create(:manifestation, volume_number_string: '第1巻', issue_number_string: '20号分冊1', edition_string: '第3版')
25
24
  manifestation.volume_number.should eq 1
26
25
  manifestation.issue_number.should eq 20
27
26
  manifestation.edition.should eq 3
28
27
  end
29
28
 
30
29
  it "should search title in openurl" do
31
- openurl = Openurl.new({:title => "プログラミング"})
30
+ openurl = Openurl.new({title: "プログラミング"})
32
31
  results = openurl.search
33
32
  openurl.query_text.should eq "btitle_text:プログラミング"
34
33
  results.size.should eq 7
35
- openurl = Openurl.new({:jtitle => "テスト"})
34
+ openurl = Openurl.new({jtitle: "テスト"})
36
35
  results = openurl.search
37
36
  results.size.should eq 3
38
37
  openurl.query_text.should eq "jtitle_text:テスト"
39
- openurl = Openurl.new({:atitle => "2005"})
38
+ openurl = Openurl.new({atitle: "2005"})
40
39
  results = openurl.search
41
40
  results.size.should eq 1
42
41
  openurl.query_text.should eq "atitle_text:2005"
43
- openurl = Openurl.new({:atitle => "テスト", :jtitle => "テスト雑誌"})
42
+ openurl = Openurl.new({atitle: "テスト", jtitle: "テスト雑誌"})
44
43
  results = openurl.search
45
44
  results.size.should eq 2
46
45
  end
47
46
 
48
47
  it "should search agent in openurl" do
49
- openurl = Openurl.new({:aulast => "Administrator"})
48
+ openurl = Openurl.new({aulast: "Administrator"})
50
49
  results = openurl.search
51
50
  openurl.query_text.should eq "au_text:Administrator"
52
51
  results.size.should eq 2
53
- openurl = Openurl.new({:aufirst => "名称"})
52
+ openurl = Openurl.new({aufirst: "名称"})
54
53
  results = openurl.search
55
54
  openurl.query_text.should eq "au_text:名称"
56
55
  results.size.should eq 1
57
- openurl = Openurl.new({:au => "テスト"})
56
+ openurl = Openurl.new({au: "テスト"})
58
57
  results = openurl.search
59
58
  openurl.query_text.should eq "au_text:テスト"
60
59
  results.size.should eq 1
61
- openurl = Openurl.new({:pub => "Administrator"})
60
+ openurl = Openurl.new({pub: "Administrator"})
62
61
  results = openurl.search
63
62
  openurl.query_text.should eq "publisher_text:Administrator"
64
63
  results.size.should eq 4
65
64
  end
66
65
 
67
66
  it "should search isbn in openurl" do
68
- openurl = Openurl.new({:api => "openurl", :isbn => "4798"})
67
+ openurl = Openurl.new({api: "openurl", isbn: "4798"})
69
68
  results = openurl.search
70
69
  openurl.query_text.should eq "isbn_sm:4798*"
71
70
  results.size.should eq 2
72
71
  end
73
72
 
74
73
  it "should search issn in openurl" do
75
- openurl = Openurl.new({:api => "openurl", :issn => "0913"})
74
+ openurl = Openurl.new({api: "openurl", issn: "0913"})
76
75
  results = openurl.search
77
76
  openurl.query_text.should eq "issn_sm:0913*"
78
77
  results.size.should eq 1
79
78
  end
80
79
 
81
80
  it "should search any in openurl" do
82
- openurl = Openurl.new({:any => "テスト"})
81
+ openurl = Openurl.new({any: "テスト"})
83
82
  results = openurl.search
84
83
  results.size.should eq 9
85
84
  end
86
85
 
87
86
  it "should search multi in openurl" do
88
- openurl = Openurl.new({:btitle => "CGI Perl プログラミング"})
87
+ openurl = Openurl.new({btitle: "CGI Perl プログラミング"})
89
88
  results = openurl.search
90
89
  results.size.should eq 2
91
- openurl = Openurl.new({:jtitle => "テスト", :pub => "テスト"})
90
+ openurl = Openurl.new({jtitle: "テスト", pub: "テスト"})
92
91
  results = openurl.search
93
92
  results.size.should eq 2
94
93
  end
95
94
 
96
95
  it "shoulld get search_error in openurl" do
97
- lambda{Openurl.new({:isbn => "12345678901234"})}.should raise_error(OpenurlQuerySyntaxError)
98
- lambda{Openurl.new({:issn => "1234abcd"})}.should raise_error(OpenurlQuerySyntaxError)
99
- lambda{Openurl.new({:aufirst => "テスト 名称"})}.should raise_error(OpenurlQuerySyntaxError)
96
+ lambda{Openurl.new({isbn: "12345678901234"})}.should raise_error(OpenurlQuerySyntaxError)
97
+ lambda{Openurl.new({issn: "1234abcd"})}.should raise_error(OpenurlQuerySyntaxError)
98
+ lambda{Openurl.new({aufirst: "テスト 名称"})}.should raise_error(OpenurlQuerySyntaxError)
100
99
  end
101
100
 
102
101
  it "should search in sru" do
103
- sru = Sru.new({:query => "title=Ruby"})
102
+ sru = Sru.new({query: "title=Ruby"})
104
103
  sru.search
105
104
  sru.manifestations.size.should eq 18
106
105
  sru.manifestations.first.titles.first.should eq 'Ruby'
107
- sru = Sru.new({:query => "title=^ruby"})
106
+ sru = Sru.new({query: "title=^ruby"})
108
107
  sru.search
109
108
  sru.manifestations.size.should eq 9
110
- sru = Sru.new({:query => 'title ALL "awk sed"'})
109
+ sru = Sru.new({query: 'title ALL "awk sed"'})
111
110
  sru.search
112
111
  sru.manifestations.size.should eq 2
113
112
  sru.manifestations.collect{|m| m.id}.should eq [184, 116]
114
- sru = Sru.new({:query => 'title ANY "ruby awk sed"'})
113
+ sru = Sru.new({query: 'title ANY "ruby awk sed"'})
115
114
  sru.search
116
115
  sru.manifestations.size.should eq 22
117
- sru = Sru.new({:query => 'isbn=9784756137470'})
116
+ sru = Sru.new({query: 'isbn=9784756137470'})
118
117
  sru.search
119
118
  sru.manifestations.first.id.should eq 114
120
- sru = Sru.new({:query => "creator=テスト"})
119
+ sru = Sru.new({query: "creator=テスト"})
121
120
  sru.search
122
121
  sru.manifestations.size.should eq 1
123
122
  end
124
123
 
125
124
  it "should search date in sru" do
126
- sru = Sru.new({:query => "from = 2000-09 AND until = 2000-11-01"})
125
+ sru = Sru.new({query: "from = 2000-09 AND until = 2000-11-01"})
127
126
  sru.search
128
127
  sru.manifestations.size.should eq 1
129
128
  sru.manifestations.first.id.should eq 120
130
- sru = Sru.new({:query => "from = 1993-02-24"})
129
+ sru = Sru.new({query: "from = 1993-02-24"})
131
130
  sru.search
132
131
  sru.manifestations.size.should eq 5
133
- sru = Sru.new({:query => "until = 2006-08-06"})
132
+ sru = Sru.new({query: "until = 2006-08-06"})
134
133
  sru.search
135
134
  sru.manifestations.size.should eq 4
136
135
  end
137
136
 
138
137
  it "should accept sort_by in sru" do
139
- sru = Sru.new({:query => "title=Ruby"})
140
- sru.sort_by.should eq({:sort_by => 'created_at', :order => 'desc'})
141
- sru = Sru.new({:query => 'title=Ruby AND sortBy="title/sort.ascending"', :sortKeys => 'creator,0', :version => '1.2'})
142
- sru.sort_by.should eq({:sort_by => 'sort_title', :order => 'asc'})
143
- sru = Sru.new({:query => 'title=Ruby AND sortBy="title/sort.ascending"', :sortKeys => 'creator,0', :version => '1.1'})
144
- sru.sort_by.should eq({:sort_by => 'creator', :order => 'desc'})
145
- sru = Sru.new({:query => 'title=Ruby AND sortBy="title/sort.ascending"', :sortKeys => 'creator,1', :version => '1.1'})
146
- sru.sort_by.should eq({:sort_by => 'creator', :order => 'asc'})
147
- sru = Sru.new({:query => 'title=Ruby AND sortBy="title'})
148
- sru.sort_by.should eq({:sort_by => 'sort_title', :order => 'asc'})
149
- #TODO ソート基準が入手しやすさの場合の処理
138
+ sru = Sru.new({query: "title=Ruby"})
139
+ sru.sort_by.should eq({sort_by: 'created_at', order: 'desc'})
140
+ sru = Sru.new({query: 'title=Ruby AND sortBy="title/sort.ascending"', sortKeys: 'creator,0', version: '1.2'})
141
+ sru.sort_by.should eq({sort_by: 'sort_title', order: 'asc'})
142
+ sru = Sru.new({query: 'title=Ruby AND sortBy="title/sort.ascending"', sortKeys: 'creator,0', version: '1.1'})
143
+ sru.sort_by.should eq({sort_by: 'creator', order: 'desc'})
144
+ sru = Sru.new({query: 'title=Ruby AND sortBy="title/sort.ascending"', sortKeys: 'creator,1', version: '1.1'})
145
+ sru.sort_by.should eq({sort_by: 'creator', order: 'asc'})
146
+ sru = Sru.new({query: 'title=Ruby AND sortBy="title'})
147
+ sru.sort_by.should eq({sort_by: 'sort_title', order: 'asc'})
148
+ # TODO ソート基準が入手しやすさの場合の処理
150
149
  end
151
150
 
152
151
  it "should accept ranges in sru" do
153
- sru = Sru.new({:query => "from = 1993-02-24 AND until = 2006-08-06 AND title=プログラミング"})
152
+ sru = Sru.new({query: "from = 1993-02-24 AND until = 2006-08-06 AND title=プログラミング"})
154
153
  sru.search
155
154
  sru.manifestations.size.should eq 2
156
- sru = Sru.new({:query => "until = 2000 AND title=プログラミング"})
155
+ sru = Sru.new({query: "until = 2000 AND title=プログラミング"})
157
156
  sru.search
158
157
  sru.manifestations.size.should eq 1
159
- sru = Sru.new({:query => "from = 2006 AND title=プログラミング"})
158
+ sru = Sru.new({query: "from = 2006 AND title=プログラミング"})
160
159
  sru.search
161
160
  sru.manifestations.size.should eq 1
162
- sru = Sru.new({:query => "from = 2007 OR title=awk"})
161
+ sru = Sru.new({query: "from = 2007 OR title=awk"})
163
162
  sru.search
164
163
  sru.manifestations.size.should eq 6
165
164
  end
@@ -201,7 +200,7 @@ describe Manifestation, :solr => true do
201
200
  end
202
201
 
203
202
  it "should respond to pickup" do
204
- lambda{Manifestation.pickup}.should_not raise_error #(ActiveRecord::RecordNotFound)
203
+ lambda{Manifestation.pickup}.should_not raise_error # (ActiveRecord::RecordNotFound)
205
204
  end
206
205
 
207
206
  it "should be periodical if its series_statement is periodical" do
@@ -214,14 +213,14 @@ describe Manifestation, :solr => true do
214
213
  manifestation.should_not be_valid
215
214
  end
216
215
 
217
- #it "should set series_statement if the manifestation is periodical" do
216
+ # it "should set series_statement if the manifestation is periodical" do
218
217
  # manifestation = series_statements(:two).manifestations.new
219
218
  # manifestation.set_series_statements([series_statements(:two)])
220
219
  # #manifestation.original_title.should eq 'テスト雑誌2月号'
221
220
  # #manifestation.serial_number.should eq 3
222
221
  # #manifestation.issue_number.should eq 3
223
222
  # #manifestation.volume_number.should eq 1
224
- #end
223
+ # end
225
224
 
226
225
  context ".export" do
227
226
  it "should export a header line" do
@@ -268,6 +267,16 @@ describe Manifestation, :solr => true do
268
267
  expect(m["volume_number"]).to eq "15"
269
268
  expect(m["volume_number_string"]).to eq "Vol.15"
270
269
  end
270
+ it "should export multiple identifiers" do
271
+ manifestation = FactoryBot.create(:manifestation)
272
+ isbn_type = IdentifierType.where(name: :isbn).first
273
+ manifestation.identifiers << FactoryBot.create(:identifier, body: "978-4043898039", identifier_type: isbn_type)
274
+ manifestation.identifiers << FactoryBot.create(:identifier, body: "978-4840239219", identifier_type: isbn_type)
275
+ lines = Manifestation.export()
276
+ csv = CSV.parse(lines, headers: true, col_sep: "\t")
277
+ m = csv.find{|row| row["manifestation_id"].to_i == manifestation.id }
278
+ expect(m["isbn"]).to eq "9784043898039//9784840239219"
279
+ end
271
280
 
272
281
  it "should respect the role of the user" do
273
282
  FactoryBot.create(:item, bookstore_id: 1, price: 100, budget_type_id: 1)
@@ -1,8 +1,7 @@
1
- # -*- encoding: utf-8 -*-
2
1
  require 'rails_helper'
3
2
 
4
3
  describe MediumOfPerformance do
5
- #pending "add some examples to (or delete) #{__FILE__}"
4
+ # pending "add some examples to (or delete) #{__FILE__}"
6
5
 
7
6
  end
8
7
 
@@ -1,8 +1,7 @@
1
- # -*- encoding: utf-8 -*-
2
1
  require 'rails_helper'
3
2
 
4
3
  describe Own do
5
- #pending "add some examples to (or delete) #{__FILE__}"
4
+ # pending "add some examples to (or delete) #{__FILE__}"
6
5
 
7
6
  end
8
7
 
@@ -1,8 +1,7 @@
1
- # -*- encoding: utf-8 -*-
2
1
  require 'rails_helper'
3
2
 
4
3
  describe PictureFile do
5
- #pending "add some examples to (or delete) #{__FILE__}"
4
+ # pending "add some examples to (or delete) #{__FILE__}"
6
5
 
7
6
  end
8
7
 
@@ -1,8 +1,7 @@
1
- # -*- encoding: utf-8 -*-
2
1
  require 'rails_helper'
3
2
 
4
3
  describe Produce do
5
- #pending "add some examples to (or delete) #{__FILE__}"
4
+ # pending "add some examples to (or delete) #{__FILE__}"
6
5
 
7
6
  end
8
7
 
@@ -1,8 +1,7 @@
1
- # -*- encoding: utf-8 -*-
2
1
  require 'rails_helper'
3
2
 
4
3
  describe Realize do
5
- #pending "add some examples to (or delete) #{__FILE__}"
4
+ # pending "add some examples to (or delete) #{__FILE__}"
6
5
 
7
6
  end
8
7
 
@@ -1,4 +1,3 @@
1
- # -*- encoding: utf-8 -*-
2
1
  require 'rails_helper'
3
2
 
4
3
  describe ResourceExportFile do
@@ -1,4 +1,3 @@
1
- # -*- encoding: utf-8 -*-
2
1
  require 'rails_helper'
3
2
 
4
3
  describe ResourceImportFile do
@@ -7,8 +6,11 @@ describe ResourceImportFile do
7
6
  describe "when its mode is 'create'" do
8
7
  describe "when it is written in utf-8" do
9
8
  before(:each) do
10
- @file = ResourceImportFile.create resource_import: File.new("#{Rails.root.to_s}/../../examples/resource_import_file_sample1.tsv"), default_shelf_id: 3
11
- @file.user = users(:admin)
9
+ @file = ResourceImportFile.create(
10
+ resource_import: File.new("#{Rails.root}/../../examples/resource_import_file_sample1.tsv"),
11
+ default_shelf_id: 3,
12
+ user: users(:admin)
13
+ )
12
14
  end
13
15
 
14
16
  it "should be imported", vcr: true do
@@ -16,8 +18,8 @@ describe ResourceImportFile do
16
18
  old_items_count = Item.count
17
19
  old_agents_count = Agent.count
18
20
  old_import_results_count = ResourceImportResult.count
19
- @file.import_start.should eq({:manifestation_imported => 9, :item_imported => 9, :manifestation_found => 6, :item_found => 3, :failed => 7})
20
- manifestation = Item.where(item_identifier: '11111').first.manifestation
21
+ @file.import_start.should eq({manifestation_imported: 9, item_imported: 9, manifestation_found: 6, item_found: 3, failed: 7})
22
+ manifestation = Item.find_by(item_identifier: '11111').manifestation
21
23
  manifestation.publishers.first.full_name.should eq 'test4'
22
24
  manifestation.publishers.first.full_name_transcription.should eq 'てすと4'
23
25
  manifestation.publishers.second.full_name_transcription.should eq 'てすと5'
@@ -30,7 +32,7 @@ describe ResourceImportFile do
30
32
  @file.resource_import_results.order(:id).first.body.split("\t").first.should eq 'manifestation_identifier'
31
33
  ResourceImportResult.count.should eq old_import_results_count + 22
32
34
 
33
- manifestation_101 = Manifestation.where(manifestation_identifier: '101').first
35
+ manifestation_101 = Manifestation.find_by(manifestation_identifier: '101')
34
36
  manifestation_101.series_statements.count.should eq 1
35
37
  manifestation_101.series_statements.first.original_title.should eq '主シリーズ'
36
38
  manifestation_101.series_statements.first.title_transcription.should eq 'しゅしりーず'
@@ -38,7 +40,7 @@ describe ResourceImportFile do
38
40
  manifestation_101.series_statements.first.title_subseries_transcription.should eq 'ふくしりーず'
39
41
  manifestation_101.items.order(:id).last.call_number.should eq '007|A'
40
42
 
41
- item_10101 = Item.where(item_identifier: '10101').first
43
+ item_10101 = Item.find_by(item_identifier: '10101')
42
44
  item_10101.manifestation.creators.size.should eq 2
43
45
  item_10101.manifestation.creates.order(:id).first.create_type.name.should eq 'author'
44
46
  item_10101.manifestation.creates.order(:id).second.agent.full_name.should eq 'test1'
@@ -64,7 +66,7 @@ describe ResourceImportFile do
64
66
  item_10101.manifestation.extent.should eq 'xv, 213 pages'
65
67
  item_10101.manifestation.dimensions.should eq '20cm'
66
68
 
67
- item_10102 = Item.where(item_identifier: '10102').first
69
+ item_10102 = Item.find_by(item_identifier: '10102')
68
70
  item_10102.manifestation.date_of_publication.should eq Time.zone.parse('2001-01-01')
69
71
  item_10102.manifestation.language.name.should eq 'Japanese'
70
72
  item_10102.manifestation.height.should eq 257
@@ -75,18 +77,18 @@ describe ResourceImportFile do
75
77
  item_10102.manifestation.series_statements.first.creator_string.should eq 'シリーズの著者'
76
78
  item_10102.manifestation.series_statements.first.volume_number_string.should eq 'シリーズ1号'
77
79
 
78
- Manifestation.where(manifestation_identifier: '103').first.original_title.should eq 'ダブル"クォート"を含む資料'
79
- item = Item.where(item_identifier: '11111').first
80
+ Manifestation.find_by(manifestation_identifier: '103').original_title.should eq 'ダブル"クォート"を含む資料'
81
+ item = Item.find_by(item_identifier: '11111')
80
82
  item.shelf.name.should eq Shelf.find(3).name
81
83
  item.manifestation.price.should eq 1000
82
84
  item.price.should eq 0
83
85
  item.manifestation.publishers.size.should eq 2
84
86
 
85
- item_10103 = Item.where(item_identifier: '10103').first
87
+ item_10103 = Item.find_by(item_identifier: '10103')
86
88
  item_10103.budget_type.should be_nil
87
89
  item_10103.bookstore.name.should eq 'Example store'
88
90
 
89
- item_10104 = Item.where(item_identifier: '10104').first
91
+ item_10104 = Item.find_by(item_identifier: '10104')
90
92
  item_10104.manifestation.date_of_publication.should eq Time.zone.parse('2001-01-01')
91
93
  item_10104.budget_type.name.should eq 'Public fund'
92
94
  item_10104.bookstore.should be_nil
@@ -108,7 +110,7 @@ describe ResourceImportFile do
108
110
  item_10104.manifestation.subjects.order(:id).map{|s| {s.subject_heading_type.name => s.term}}.should eq [{"ndlsh" => "コンピュータ"}, {"ndlsh" => "図書館"}]
109
111
  item_10104.manifestation.classifications.order(:id).map{|c| {c.classification_type.name => c.category}}.should eq [{"ndc9" => "007"}, {"ddc" => "003"}, {"ddc" => "004"}]
110
112
 
111
- manifestation_104 = Manifestation.where(manifestation_identifier: '104').first
113
+ manifestation_104 = Manifestation.find_by(manifestation_identifier: '104')
112
114
  manifestation_104.identifier_contents(:isbn).should eq ['9784797327038']
113
115
  manifestation_104.original_title.should eq 'test10'
114
116
  manifestation_104.creators.collect(&:full_name).should eq ['test3']
@@ -117,8 +119,8 @@ describe ResourceImportFile do
117
119
  ResourceImportResult.where(manifestation_id: manifestation_101.id).order(:id).last.error_message.should eq "line 22: #{I18n.t('import.manifestation_found')}"
118
120
  ResourceImportResult.where(item_id: item_10101.id).order(:id).last.error_message.should eq "line 9: #{I18n.t('import.item_found')}"
119
121
 
120
- Item.where(item_identifier: '11113').first.manifestation.original_title.should eq 'test10'
121
- Item.where(item_identifier: '11114').first.manifestation.id.should eq 1
122
+ Item.find_by(item_identifier: '11113').manifestation.original_title.should eq 'test10'
123
+ Item.find_by(item_identifier: '11114').manifestation.id.should eq 1
122
124
 
123
125
  @file.resource_import_fingerprint.should be_truthy
124
126
  @file.executed_at.should be_truthy
@@ -137,9 +139,20 @@ describe ResourceImportFile do
137
139
  it "should be searchable right after the import", solr: true, vcr: true do
138
140
  @file.import_start
139
141
  Manifestation.search{ keywords "10101" }.total.should > 0
140
- Manifestation.search{ keywords "10101", :fields => [:item_identifier] }.total.should > 0
142
+ Manifestation.search{ keywords "10101", fields: [:item_identifier] }.total.should > 0
141
143
  Manifestation.search{ keywords "item_identifier_sm:10101" }.total.should > 0
142
144
  end
145
+
146
+ it "should import multiple ISBNs", vcr: true do
147
+ file = ResourceImportFile.create resource_import: StringIO.new("original_title\tisbn\noriginal_title_multiple_isbns\t978-4840239219//978-4043898039\n"), user: users(:admin)
148
+ result = file.import_start
149
+ expect(result[:manifestation_imported]).to eq 1
150
+ resource_import_result = file.resource_import_results.last
151
+ expect(resource_import_result.manifestation).not_to be_blank
152
+ manifestation = resource_import_result.manifestation
153
+ expect(manifestation.identifier_contents(:isbn)).to include("9784840239219")
154
+ expect(manifestation.identifier_contents(:isbn)).to include("9784043898039")
155
+ end
143
156
  end
144
157
 
145
158
  describe "ISBN import" do
@@ -176,10 +189,23 @@ describe ResourceImportFile do
176
189
  end
177
190
  end
178
191
 
192
+ describe "NDLBibID" do
193
+ it "should import NDLBibID", vcr: true do
194
+ file = ResourceImportFile.create resource_import: StringIO.new("ndl_bib_id\n000000471440\n"), user: users(:admin)
195
+ result = file.import_start
196
+ expect(result[:manifestation_imported]).to eq 1
197
+ resource_import_result = file.resource_import_results.last
198
+ manifestation = resource_import_result.manifestation
199
+ expect(manifestation.manifestation_identifier).to eq "http://iss.ndl.go.jp/books/R100000002-I000000471440-00"
200
+ end
201
+ end
202
+
179
203
  describe "when it is written in shift_jis" do
180
204
  before(:each) do
181
- @file = ResourceImportFile.create resource_import: File.new("#{Rails.root.to_s}/../../examples/resource_import_file_sample2.tsv")
182
- @file.user = users(:admin)
205
+ @file = ResourceImportFile.create!(
206
+ resource_import: File.new("#{Rails.root}/../../examples/resource_import_file_sample2.tsv"),
207
+ user: users(:admin)
208
+ )
183
209
  end
184
210
 
185
211
  it "should be imported", vcr: true do
@@ -187,8 +213,8 @@ describe ResourceImportFile do
187
213
  old_items_count = Item.count
188
214
  old_agents_count = Agent.count
189
215
  old_import_results_count = ResourceImportResult.count
190
- @file.import_start.should eq({:manifestation_imported => 9, :item_imported => 8, :manifestation_found => 5, :item_found => 3, :failed => 7})
191
- manifestation = Item.where(item_identifier: '11111').first.manifestation
216
+ @file.import_start.should eq({manifestation_imported: 9, item_imported: 8, manifestation_found: 5, item_found: 3, failed: 7})
217
+ manifestation = Item.find_by(item_identifier: '11111').manifestation
192
218
  manifestation.publishers.first.full_name.should eq 'test4'
193
219
  manifestation.publishers.first.full_name_transcription.should eq 'てすと4'
194
220
  manifestation.publishers.second.full_name_transcription.should eq 'てすと5'
@@ -196,13 +222,13 @@ describe ResourceImportFile do
196
222
  Item.count.should eq old_items_count + 8
197
223
  Agent.count.should eq old_agents_count + 9
198
224
  ResourceImportResult.count.should eq old_import_results_count + 21
199
- Item.where(item_identifier: '10101').first.manifestation.creators.size.should eq 2
200
- Item.where(item_identifier: '10101').first.manifestation.date_of_publication.should eq Time.zone.parse('2001-01-01')
201
- Item.where(item_identifier: '10102').first.manifestation.date_of_publication.should eq Time.zone.parse('2001-01-01')
202
- Item.where(item_identifier: '10104').first.manifestation.date_of_publication.should eq Time.zone.parse('2001-01-01')
203
- Manifestation.where(manifestation_identifier: '103').first.original_title.should eq 'ダブル"クォート"を含む資料'
204
- item = Item.where(item_identifier: '11111').first
205
- item.shelf.name.should eq Shelf.where(name: 'web').first.name
225
+ Item.find_by(item_identifier: '10101').manifestation.creators.size.should eq 2
226
+ Item.find_by(item_identifier: '10101').manifestation.date_of_publication.should eq Time.zone.parse('2001-01-01')
227
+ Item.find_by(item_identifier: '10102').manifestation.date_of_publication.should eq Time.zone.parse('2001-01-01')
228
+ Item.find_by(item_identifier: '10104').manifestation.date_of_publication.should eq Time.zone.parse('2001-01-01')
229
+ Manifestation.find_by(manifestation_identifier: '103').original_title.should eq 'ダブル"クォート"を含む資料'
230
+ item = Item.find_by(item_identifier: '11111')
231
+ item.shelf.name.should eq Shelf.find_by(name: 'web').name
206
232
  item.manifestation.price.should eq 1000
207
233
  item.price.should eq 0
208
234
  item.manifestation.publishers.size.should eq 2
@@ -214,8 +240,10 @@ describe ResourceImportFile do
214
240
 
215
241
  describe "when it has only isbn" do
216
242
  before(:each) do
217
- @file = ResourceImportFile.create resource_import: File.new("#{Rails.root.to_s}/../../examples/isbn_sample.txt")
218
- @file.user = users(:admin)
243
+ @file = ResourceImportFile.create!(
244
+ resource_import: File.new("#{Rails.root}/../../examples/isbn_sample.txt"),
245
+ user: users(:admin)
246
+ )
219
247
  end
220
248
 
221
249
  it "should be imported", vcr: true do
@@ -234,8 +262,10 @@ describe ResourceImportFile do
234
262
  original_title call_number item_note
235
263
  resource_import_file_test1 007.6 note for the item.
236
264
  EOF
237
- file = ResourceImportFile.create(resource_import: StringIO.new(import_file))
238
- file.user = users(:admin)
265
+ file = ResourceImportFile.create(
266
+ resource_import: StringIO.new(import_file),
267
+ user: users(:admin)
268
+ )
239
269
  old_manifestations_count = Manifestation.count
240
270
  old_items_count = Item.count
241
271
  result = file.import_start
@@ -253,8 +283,10 @@ resource_import_file_test1 007.6 note for the item.
253
283
  original_title edition edition_string
254
284
  resource_import_file_test_edition 2 Revised Ed.
255
285
  EOF
256
- file = ResourceImportFile.create(resource_import: StringIO.new(import_file))
257
- file.user = users(:admin)
286
+ file = ResourceImportFile.create(
287
+ resource_import: StringIO.new(import_file),
288
+ user: users(:admin)
289
+ )
258
290
  old_manifestations_count = Manifestation.count
259
291
  result = file.import_start
260
292
  expect(Manifestation.count).to eq old_manifestations_count + 1
@@ -269,8 +301,10 @@ resource_import_file_test_edition 2 Revised Ed.
269
301
  original_title title_transcription
270
302
  resource_import_file_test_transcription transcription
271
303
  EOF
272
- file = ResourceImportFile.create(resource_import: StringIO.new(import_file))
273
- file.user = users(:admin)
304
+ file = ResourceImportFile.create(
305
+ resource_import: StringIO.new(import_file),
306
+ user: users(:admin)
307
+ )
274
308
  old_manifestations_count = Manifestation.count
275
309
  result = file.import_start
276
310
  expect(Manifestation.count).to eq old_manifestations_count + 1
@@ -285,15 +319,16 @@ resource_import_file_test_transcription transcription
285
319
  original_title description note call_number item_note
286
320
  resource_import_file_test_description test\\ntest test\\ntest test_description test\\ntest
287
321
  EOF
288
- file = ResourceImportFile.create(resource_import: StringIO.new(import_file))
289
- file.user = users(:admin)
322
+ file = ResourceImportFile.create(
323
+ resource_import: StringIO.new(import_file),
324
+ user: users(:admin)
325
+ )
290
326
  old_manifestations_count = Manifestation.count
291
327
  result = file.import_start
292
328
  expect(Manifestation.count).to eq old_manifestations_count + 1
293
329
  manifestation = Manifestation.all.find{|m| m.original_title == "resource_import_file_test_description" }
294
330
  expect(manifestation.description).to eq "test\ntest"
295
331
  expect(manifestation.note).to eq "test\ntest"
296
- p manifestation.items
297
332
  expect(manifestation.items.first.note).to eq "test\ntest"
298
333
  end
299
334
  end
@@ -301,40 +336,44 @@ resource_import_file_test_description test\\ntest test\\ntest test_description t
301
336
 
302
337
  describe "when its mode is 'update'" do
303
338
  it "should update items", vcr: true do
304
- @file = ResourceImportFile.create resource_import: File.new("#{Rails.root.to_s}/../../examples/item_update_file.tsv"), edit_mode: 'update'
305
- @file.modify
306
- expect(@file.resource_import_results.first).to be_truthy
307
- expect(@file.resource_import_results.first.body).to match /item_identifier/
308
- item_00001 = Item.where(item_identifier: '00001').first
339
+ file = ResourceImportFile.create!(
340
+ resource_import: File.new("#{Rails.root}/../../examples/item_update_file.tsv"),
341
+ user: users(:admin),
342
+ edit_mode: 'update'
343
+ )
344
+ file.modify
345
+ expect(file.resource_import_results.first).to be_truthy
346
+ expect(file.resource_import_results.first.body).to match /item_identifier/
347
+ item_00001 = Item.find_by(item_identifier: '00001')
309
348
  item_00001.manifestation.creators.order('agents.id').collect(&:full_name).should eq ['たなべ', 'こうすけ']
310
349
  item_00001.binding_item_identifier.should eq '900001'
311
350
  item_00001.binding_call_number.should eq '336|A'
312
351
  item_00001.binded_at.should eq Time.zone.parse('2014-08-16')
313
352
  item_00001.manifestation.subjects.order(:id).map{|subject| {subject.subject_heading_type.name => subject.term}}.should eq [{"ndlsh" => "test1"}, {"ndlsh" => "test2"}]
314
353
  item_00001.manifestation.identifier_contents(:isbn).should eq ["4798002062", "12345678"]
315
- Item.where(item_identifier: '00002').first.manifestation.publishers.collect(&:full_name).should eq ['test2']
354
+ Item.find_by(item_identifier: '00002').manifestation.publishers.collect(&:full_name).should eq ['test2']
316
355
 
317
- item_00003 = Item.where(item_identifier: '00003').first
356
+ item_00003 = Item.find_by(item_identifier: '00003')
318
357
  item_00003.acquired_at.should eq Time.zone.parse('2012-01-01')
319
358
  item_00003.include_supplements.should be_truthy
320
359
 
321
- Item.where(item_identifier: '00004').first.include_supplements.should be_falsy
322
- Item.where(item_identifier: '00025').first.call_number.should eq "547|ヤ"
360
+ Item.find_by(item_identifier: '00004').include_supplements.should be_falsy
361
+ Item.find_by(item_identifier: '00025').call_number.should eq "547|ヤ"
323
362
  end
324
363
 
325
- #it "should update series_statement", vcr: true do
364
+ # it "should update series_statement", vcr: true do
326
365
  # manifestation = Manifestation.find(10)
327
366
  # file = ResourceImportFile.create resource_import: File.new("#{Rails.root.to_s}/../../examples/update_series_statement.tsv"), edit_mode: 'update'
328
367
  # file.modify
329
368
  # manifestation.reload
330
369
  # manifestation.series_statements.should eq [SeriesStatement.find(2)]
331
- #end
370
+ # end
332
371
 
333
372
  describe "NCID import" do
334
373
  it "should import ncid value" do
335
374
  file = ResourceImportFile.create resource_import: StringIO.new("manifestation_id\tncid\n1\tBA67656964\n"), user: users(:admin), edit_mode: 'update'
336
375
  result = file.import_start
337
- #expect(result[:manifestation_found]).to eq 1
376
+ # expect(result[:manifestation_found]).to eq 1
338
377
  expect(file.error_message).to be_nil
339
378
  resource_import_result = file.resource_import_results.last
340
379
  expect(resource_import_result.error_message).to be_blank
@@ -348,16 +387,21 @@ resource_import_file_test_description test\\ntest test\\ntest test_description t
348
387
  describe "when its mode is 'destroy'" do
349
388
  it "should remove items", vcr: true do
350
389
  old_count = Item.count
351
- @file = ResourceImportFile.create resource_import: File.new("#{Rails.root.to_s}/../../examples/item_delete_file.tsv"), edit_mode: 'destroy'
352
- @file.remove
390
+ file = ResourceImportFile.create!(
391
+ resource_import: File.new("#{Rails.root}/../../examples/item_delete_file.tsv"),
392
+ user: users(:admin),
393
+ edit_mode: 'destroy'
394
+ )
395
+ file.remove
353
396
  Item.count.should eq old_count - 2
354
397
  end
355
398
  end
356
399
 
357
400
  it "should import in background", vcr: true do
358
- file = ResourceImportFile.create resource_import: File.new("#{Rails.root.to_s}/../../examples/resource_import_file_sample1.tsv")
359
- file.user = users(:admin)
360
- file.save
401
+ file = ResourceImportFile.create!(
402
+ resource_import: File.new("#{Rails.root}/../../examples/resource_import_file_sample1.tsv"),
403
+ user: users(:admin)
404
+ )
361
405
  ResourceImportFileJob.perform_later(file).should be_truthy
362
406
  end
363
407
  end