mongoid 7.5.0 → 8.0.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (358) hide show
  1. checksums.yaml +4 -4
  2. checksums.yaml.gz.sig +0 -0
  3. data/README.md +3 -3
  4. data/lib/config/locales/en.yml +47 -30
  5. data/lib/mongoid/association/accessors.rb +38 -9
  6. data/lib/mongoid/association/bindable.rb +50 -2
  7. data/lib/mongoid/association/builders.rb +4 -2
  8. data/lib/mongoid/association/constrainable.rb +0 -1
  9. data/lib/mongoid/association/eager_loadable.rb +29 -7
  10. data/lib/mongoid/association/embedded/batchable.rb +53 -13
  11. data/lib/mongoid/association/embedded/cyclic.rb +1 -1
  12. data/lib/mongoid/association/embedded/embedded_in/binding.rb +24 -2
  13. data/lib/mongoid/association/embedded/embedded_in/proxy.rb +2 -2
  14. data/lib/mongoid/association/embedded/embedded_in.rb +3 -2
  15. data/lib/mongoid/association/embedded/embeds_many/binding.rb +1 -0
  16. data/lib/mongoid/association/embedded/embeds_many/buildable.rb +1 -1
  17. data/lib/mongoid/association/embedded/embeds_many/proxy.rb +50 -28
  18. data/lib/mongoid/association/embedded/embeds_many.rb +2 -2
  19. data/lib/mongoid/association/embedded/embeds_one/buildable.rb +18 -4
  20. data/lib/mongoid/association/embedded/embeds_one/proxy.rb +23 -4
  21. data/lib/mongoid/association/embedded/embeds_one.rb +3 -3
  22. data/lib/mongoid/association/macros.rb +2 -1
  23. data/lib/mongoid/association/many.rb +11 -7
  24. data/lib/mongoid/association/nested/many.rb +5 -4
  25. data/lib/mongoid/association/nested/nested_buildable.rb +4 -4
  26. data/lib/mongoid/association/nested/one.rb +5 -5
  27. data/lib/mongoid/association/one.rb +2 -2
  28. data/lib/mongoid/association/options.rb +9 -9
  29. data/lib/mongoid/association/proxy.rb +14 -3
  30. data/lib/mongoid/association/referenced/auto_save.rb +4 -3
  31. data/lib/mongoid/association/referenced/belongs_to/binding.rb +1 -0
  32. data/lib/mongoid/association/referenced/belongs_to/buildable.rb +1 -1
  33. data/lib/mongoid/association/referenced/belongs_to/proxy.rb +5 -6
  34. data/lib/mongoid/association/referenced/belongs_to.rb +2 -2
  35. data/lib/mongoid/association/referenced/counter_cache.rb +10 -10
  36. data/lib/mongoid/association/referenced/eager.rb +2 -2
  37. data/lib/mongoid/association/referenced/has_and_belongs_to_many/proxy.rb +66 -13
  38. data/lib/mongoid/association/referenced/has_and_belongs_to_many.rb +6 -3
  39. data/lib/mongoid/association/referenced/has_many/enumerable.rb +20 -28
  40. data/lib/mongoid/association/referenced/has_many/proxy.rb +24 -18
  41. data/lib/mongoid/association/referenced/has_many.rb +3 -3
  42. data/lib/mongoid/association/referenced/has_one/buildable.rb +1 -1
  43. data/lib/mongoid/association/referenced/has_one/nested_builder.rb +5 -5
  44. data/lib/mongoid/association/referenced/has_one/proxy.rb +9 -12
  45. data/lib/mongoid/association/referenced/has_one.rb +3 -3
  46. data/lib/mongoid/association/referenced/syncable.rb +4 -4
  47. data/lib/mongoid/association/reflections.rb +2 -2
  48. data/lib/mongoid/association/relatable.rb +44 -10
  49. data/lib/mongoid/association.rb +5 -5
  50. data/lib/mongoid/atomic/modifiers.rb +2 -2
  51. data/lib/mongoid/atomic/paths/embedded/many.rb +19 -0
  52. data/lib/mongoid/attributes/dynamic.rb +3 -3
  53. data/lib/mongoid/attributes/nested.rb +5 -5
  54. data/lib/mongoid/attributes/processing.rb +10 -3
  55. data/lib/mongoid/attributes/projector.rb +1 -1
  56. data/lib/mongoid/attributes/readonly.rb +2 -2
  57. data/lib/mongoid/attributes.rb +43 -40
  58. data/lib/mongoid/changeable.rb +42 -7
  59. data/lib/mongoid/clients/options.rb +5 -1
  60. data/lib/mongoid/clients/sessions.rb +2 -14
  61. data/lib/mongoid/clients/validators/storage.rb +3 -3
  62. data/lib/mongoid/config/validators/client.rb +6 -6
  63. data/lib/mongoid/config.rb +27 -17
  64. data/lib/mongoid/contextual/aggregable/memory.rb +24 -16
  65. data/lib/mongoid/contextual/aggregable/mongo.rb +5 -5
  66. data/lib/mongoid/contextual/aggregable/none.rb +1 -1
  67. data/lib/mongoid/contextual/atomic.rb +1 -1
  68. data/lib/mongoid/contextual/geo_near.rb +7 -7
  69. data/lib/mongoid/contextual/map_reduce.rb +2 -2
  70. data/lib/mongoid/contextual/memory.rb +59 -32
  71. data/lib/mongoid/contextual/mongo.rb +184 -256
  72. data/lib/mongoid/contextual/none.rb +34 -16
  73. data/lib/mongoid/contextual/queryable.rb +1 -1
  74. data/lib/mongoid/contextual.rb +2 -2
  75. data/lib/mongoid/copyable.rb +32 -8
  76. data/lib/mongoid/criteria/findable.rb +7 -4
  77. data/lib/mongoid/criteria/includable.rb +24 -20
  78. data/lib/mongoid/criteria/marshalable.rb +10 -2
  79. data/lib/mongoid/criteria/permission.rb +1 -1
  80. data/lib/mongoid/criteria/queryable/aggregable.rb +2 -2
  81. data/lib/mongoid/criteria/queryable/extensions/array.rb +2 -15
  82. data/lib/mongoid/criteria/queryable/extensions/big_decimal.rb +25 -4
  83. data/lib/mongoid/criteria/queryable/extensions/boolean.rb +2 -2
  84. data/lib/mongoid/criteria/queryable/extensions/date.rb +6 -1
  85. data/lib/mongoid/criteria/queryable/extensions/date_time.rb +6 -1
  86. data/lib/mongoid/criteria/queryable/extensions/hash.rb +0 -16
  87. data/lib/mongoid/criteria/queryable/extensions/numeric.rb +1 -1
  88. data/lib/mongoid/criteria/queryable/extensions/object.rb +2 -1
  89. data/lib/mongoid/criteria/queryable/extensions/range.rb +13 -5
  90. data/lib/mongoid/criteria/queryable/extensions/regexp.rb +3 -3
  91. data/lib/mongoid/criteria/queryable/extensions/set.rb +1 -1
  92. data/lib/mongoid/criteria/queryable/extensions/string.rb +3 -3
  93. data/lib/mongoid/criteria/queryable/extensions/symbol.rb +4 -2
  94. data/lib/mongoid/criteria/queryable/extensions/time.rb +6 -1
  95. data/lib/mongoid/criteria/queryable/extensions/time_with_zone.rb +6 -1
  96. data/lib/mongoid/criteria/queryable/key.rb +3 -3
  97. data/lib/mongoid/criteria/queryable/optional.rb +5 -11
  98. data/lib/mongoid/criteria/queryable/options.rb +2 -2
  99. data/lib/mongoid/criteria/queryable/pipeline.rb +1 -1
  100. data/lib/mongoid/criteria/queryable/selectable.rb +5 -27
  101. data/lib/mongoid/criteria/queryable/selector.rb +92 -7
  102. data/lib/mongoid/criteria/queryable/smash.rb +40 -7
  103. data/lib/mongoid/criteria/queryable.rb +12 -7
  104. data/lib/mongoid/criteria/scopable.rb +2 -2
  105. data/lib/mongoid/criteria.rb +15 -37
  106. data/lib/mongoid/deprecable.rb +36 -0
  107. data/lib/mongoid/deprecation.rb +25 -0
  108. data/lib/mongoid/document.rb +98 -36
  109. data/lib/mongoid/equality.rb +12 -12
  110. data/lib/mongoid/errors/document_not_found.rb +10 -6
  111. data/lib/mongoid/errors/invalid_config_option.rb +1 -1
  112. data/lib/mongoid/errors/invalid_dependent_strategy.rb +1 -1
  113. data/lib/mongoid/errors/invalid_dot_dollar_assignment.rb +23 -0
  114. data/lib/mongoid/errors/invalid_field.rb +6 -2
  115. data/lib/mongoid/errors/invalid_field_type.rb +26 -0
  116. data/lib/mongoid/errors/invalid_relation.rb +1 -1
  117. data/lib/mongoid/errors/invalid_relation_option.rb +1 -1
  118. data/lib/mongoid/errors/invalid_session_use.rb +1 -1
  119. data/lib/mongoid/errors/invalid_storage_options.rb +1 -1
  120. data/lib/mongoid/errors/mongoid_error.rb +3 -3
  121. data/lib/mongoid/errors/nested_attributes_metadata_not_found.rb +1 -1
  122. data/lib/mongoid/errors/no_client_database.rb +1 -1
  123. data/lib/mongoid/errors/no_client_hosts.rb +1 -1
  124. data/lib/mongoid/errors/readonly_attribute.rb +1 -1
  125. data/lib/mongoid/errors/too_many_nested_attribute_records.rb +1 -1
  126. data/lib/mongoid/errors/unknown_attribute.rb +1 -1
  127. data/lib/mongoid/errors.rb +2 -2
  128. data/lib/mongoid/extensions/array.rb +9 -7
  129. data/lib/mongoid/extensions/big_decimal.rb +29 -10
  130. data/lib/mongoid/extensions/binary.rb +42 -0
  131. data/lib/mongoid/extensions/boolean.rb +8 -2
  132. data/lib/mongoid/extensions/date.rb +26 -20
  133. data/lib/mongoid/extensions/date_time.rb +1 -1
  134. data/lib/mongoid/extensions/false_class.rb +1 -1
  135. data/lib/mongoid/extensions/float.rb +4 -5
  136. data/lib/mongoid/extensions/hash.rb +13 -6
  137. data/lib/mongoid/extensions/integer.rb +4 -5
  138. data/lib/mongoid/extensions/module.rb +1 -1
  139. data/lib/mongoid/extensions/object.rb +8 -6
  140. data/lib/mongoid/extensions/range.rb +41 -10
  141. data/lib/mongoid/extensions/regexp.rb +11 -4
  142. data/lib/mongoid/extensions/set.rb +11 -4
  143. data/lib/mongoid/extensions/string.rb +11 -22
  144. data/lib/mongoid/extensions/symbol.rb +4 -15
  145. data/lib/mongoid/extensions/time.rb +27 -16
  146. data/lib/mongoid/extensions/time_with_zone.rb +1 -2
  147. data/lib/mongoid/extensions/true_class.rb +1 -1
  148. data/lib/mongoid/extensions.rb +1 -0
  149. data/lib/mongoid/factory.rb +42 -7
  150. data/lib/mongoid/fields/foreign_key.rb +11 -4
  151. data/lib/mongoid/fields/localized.rb +2 -2
  152. data/lib/mongoid/fields/standard.rb +7 -7
  153. data/lib/mongoid/fields/validators/macro.rb +3 -9
  154. data/lib/mongoid/fields.rb +57 -15
  155. data/lib/mongoid/findable.rb +28 -22
  156. data/lib/mongoid/indexable/specification.rb +2 -2
  157. data/lib/mongoid/indexable/validators/options.rb +6 -2
  158. data/lib/mongoid/interceptable.rb +73 -13
  159. data/lib/mongoid/matchable.rb +1 -1
  160. data/lib/mongoid/matcher.rb +12 -7
  161. data/lib/mongoid/persistable/creatable.rb +18 -9
  162. data/lib/mongoid/persistable/deletable.rb +1 -1
  163. data/lib/mongoid/persistable/destroyable.rb +1 -1
  164. data/lib/mongoid/persistable/savable.rb +2 -2
  165. data/lib/mongoid/persistable/unsettable.rb +1 -1
  166. data/lib/mongoid/persistable/updatable.rb +19 -12
  167. data/lib/mongoid/persistable/upsertable.rb +1 -1
  168. data/lib/mongoid/persistable.rb +3 -3
  169. data/lib/mongoid/persistence_context.rb +22 -5
  170. data/lib/mongoid/query_cache.rb +8 -260
  171. data/lib/mongoid/railties/controller_runtime.rb +1 -1
  172. data/lib/mongoid/reloadable.rb +7 -3
  173. data/lib/mongoid/scopable.rb +17 -15
  174. data/lib/mongoid/selectable.rb +1 -2
  175. data/lib/mongoid/serializable.rb +10 -6
  176. data/lib/mongoid/stateful.rb +35 -9
  177. data/lib/mongoid/tasks/database.rb +0 -2
  178. data/lib/mongoid/threaded/lifecycle.rb +5 -5
  179. data/lib/mongoid/threaded.rb +9 -9
  180. data/lib/mongoid/timestamps/created.rb +1 -1
  181. data/lib/mongoid/timestamps/updated.rb +2 -2
  182. data/lib/mongoid/touchable.rb +2 -3
  183. data/lib/mongoid/traversable.rb +4 -3
  184. data/lib/mongoid/validatable/localizable.rb +1 -1
  185. data/lib/mongoid/validatable/macros.rb +0 -2
  186. data/lib/mongoid/validatable/presence.rb +2 -2
  187. data/lib/mongoid/validatable/uniqueness.rb +9 -8
  188. data/lib/mongoid/validatable.rb +6 -6
  189. data/lib/mongoid/version.rb +1 -1
  190. data/lib/mongoid/warnings.rb +3 -4
  191. data/lib/mongoid.rb +1 -0
  192. data/spec/config/mongoid.yml +16 -0
  193. data/spec/integration/app_spec.rb +8 -12
  194. data/spec/integration/associations/belongs_to_spec.rb +18 -0
  195. data/spec/integration/associations/embedded_spec.rb +15 -0
  196. data/spec/integration/associations/embeds_many_spec.rb +15 -2
  197. data/spec/integration/associations/embeds_one_spec.rb +18 -0
  198. data/spec/integration/associations/foreign_key_spec.rb +9 -0
  199. data/spec/integration/associations/has_and_belongs_to_many_spec.rb +21 -0
  200. data/spec/integration/associations/has_one_spec.rb +97 -1
  201. data/spec/integration/associations/scope_option_spec.rb +1 -1
  202. data/spec/integration/callbacks_models.rb +95 -1
  203. data/spec/integration/callbacks_spec.rb +226 -4
  204. data/spec/integration/criteria/range_spec.rb +95 -1
  205. data/spec/integration/discriminator_key_spec.rb +115 -76
  206. data/spec/integration/dots_and_dollars_spec.rb +277 -0
  207. data/spec/integration/i18n_fallbacks_spec.rb +1 -15
  208. data/spec/integration/matcher_examples_spec.rb +20 -13
  209. data/spec/integration/matcher_operator_data/type_decimal.yml +3 -2
  210. data/spec/integration/matcher_operator_spec.rb +3 -5
  211. data/spec/integration/persistence/range_field_spec.rb +350 -0
  212. data/spec/mongoid/association/counter_cache_spec.rb +1 -1
  213. data/spec/mongoid/association/depending_spec.rb +9 -9
  214. data/spec/mongoid/association/eager_spec.rb +2 -1
  215. data/spec/mongoid/association/embedded/embedded_in/binding_spec.rb +2 -1
  216. data/spec/mongoid/association/embedded/embedded_in/buildable_spec.rb +54 -0
  217. data/spec/mongoid/association/embedded/embedded_in/proxy_spec.rb +69 -9
  218. data/spec/mongoid/association/embedded/embeds_many/buildable_spec.rb +112 -0
  219. data/spec/mongoid/association/embedded/embeds_many/proxy_spec.rb +219 -8
  220. data/spec/mongoid/association/embedded/embeds_many_models.rb +157 -0
  221. data/spec/mongoid/association/embedded/embeds_many_query_spec.rb +12 -0
  222. data/spec/mongoid/association/embedded/embeds_many_spec.rb +68 -0
  223. data/spec/mongoid/association/embedded/embeds_one/buildable_spec.rb +25 -0
  224. data/spec/mongoid/association/embedded/embeds_one_models.rb +19 -0
  225. data/spec/mongoid/association/embedded/embeds_one_spec.rb +28 -0
  226. data/spec/mongoid/association/referenced/belongs_to/binding_spec.rb +2 -1
  227. data/spec/mongoid/association/referenced/belongs_to/buildable_spec.rb +54 -0
  228. data/spec/mongoid/association/referenced/belongs_to/proxy_spec.rb +15 -0
  229. data/spec/mongoid/association/referenced/belongs_to_models.rb +11 -0
  230. data/spec/mongoid/association/referenced/belongs_to_spec.rb +2 -2
  231. data/spec/mongoid/association/referenced/has_and_belongs_to_many/proxy_spec.rb +67 -4
  232. data/spec/mongoid/association/referenced/has_and_belongs_to_many_models.rb +25 -0
  233. data/spec/mongoid/association/referenced/has_and_belongs_to_many_spec.rb +35 -2
  234. data/spec/mongoid/association/referenced/has_many/buildable_spec.rb +109 -0
  235. data/spec/mongoid/association/referenced/has_many/enumerable_spec.rb +2 -56
  236. data/spec/mongoid/association/referenced/has_many/proxy_spec.rb +82 -13
  237. data/spec/mongoid/association/referenced/has_many_models.rb +3 -1
  238. data/spec/mongoid/association/referenced/has_many_spec.rb +25 -0
  239. data/spec/mongoid/association/referenced/has_one/buildable_spec.rb +2 -2
  240. data/spec/mongoid/association/referenced/has_one/proxy_spec.rb +107 -1
  241. data/spec/mongoid/association/referenced/has_one_models.rb +16 -0
  242. data/spec/mongoid/association/syncable_spec.rb +14 -0
  243. data/spec/mongoid/atomic/paths_spec.rb +0 -14
  244. data/spec/mongoid/attributes/nested_spec.rb +80 -11
  245. data/spec/mongoid/attributes/nested_spec_models.rb +48 -0
  246. data/spec/mongoid/attributes/projector_spec.rb +1 -5
  247. data/spec/mongoid/attributes_spec.rb +524 -27
  248. data/spec/mongoid/changeable_spec.rb +130 -13
  249. data/spec/mongoid/clients/factory_spec.rb +23 -30
  250. data/spec/mongoid/clients/sessions_spec.rb +0 -38
  251. data/spec/mongoid/clients_spec.rb +32 -2
  252. data/spec/mongoid/config_spec.rb +58 -13
  253. data/spec/mongoid/contextual/aggregable/memory_spec.rb +396 -158
  254. data/spec/mongoid/contextual/aggregable/memory_table.yml +88 -0
  255. data/spec/mongoid/contextual/aggregable/memory_table_spec.rb +62 -0
  256. data/spec/mongoid/contextual/map_reduce_spec.rb +2 -16
  257. data/spec/mongoid/contextual/memory_spec.rb +521 -14
  258. data/spec/mongoid/contextual/mongo_spec.rb +564 -394
  259. data/spec/mongoid/contextual/none_spec.rb +11 -19
  260. data/spec/mongoid/copyable_spec.rb +451 -1
  261. data/spec/mongoid/criteria/findable_spec.rb +86 -210
  262. data/spec/mongoid/criteria/includable_spec.rb +1492 -0
  263. data/spec/mongoid/criteria/includable_spec_models.rb +54 -0
  264. data/spec/mongoid/criteria/marshalable_spec.rb +18 -1
  265. data/spec/mongoid/criteria/queryable/extensions/array_spec.rb +7 -19
  266. data/spec/mongoid/criteria/queryable/extensions/big_decimal_spec.rb +134 -26
  267. data/spec/mongoid/criteria/queryable/extensions/date_spec.rb +11 -0
  268. data/spec/mongoid/criteria/queryable/extensions/date_time_spec.rb +11 -0
  269. data/spec/mongoid/criteria/queryable/extensions/hash_spec.rb +0 -15
  270. data/spec/mongoid/criteria/queryable/extensions/numeric_spec.rb +73 -7
  271. data/spec/mongoid/criteria/queryable/extensions/time_spec.rb +11 -0
  272. data/spec/mongoid/criteria/queryable/extensions/time_with_zone_spec.rb +11 -0
  273. data/spec/mongoid/criteria/queryable/optional_spec.rb +0 -484
  274. data/spec/mongoid/criteria/queryable/selectable_logical_spec.rb +50 -0
  275. data/spec/mongoid/criteria/queryable/selectable_spec.rb +77 -85
  276. data/spec/mongoid/criteria/queryable/selector_spec.rb +14 -2
  277. data/spec/mongoid/criteria_spec.rb +469 -1201
  278. data/spec/mongoid/document_fields_spec.rb +173 -24
  279. data/spec/mongoid/document_spec.rb +32 -41
  280. data/spec/mongoid/equality_spec.rb +12 -12
  281. data/spec/mongoid/errors/document_not_found_spec.rb +29 -2
  282. data/spec/mongoid/errors/invalid_field_spec.rb +1 -1
  283. data/spec/mongoid/errors/invalid_field_type_spec.rb +55 -0
  284. data/spec/mongoid/errors/mongoid_error_spec.rb +3 -1
  285. data/spec/mongoid/errors/no_environment_spec.rb +3 -3
  286. data/spec/mongoid/errors/too_many_nested_attribute_records_spec.rb +1 -1
  287. data/spec/mongoid/extensions/array_spec.rb +16 -2
  288. data/spec/mongoid/extensions/big_decimal_spec.rb +697 -212
  289. data/spec/mongoid/extensions/binary_spec.rb +44 -9
  290. data/spec/mongoid/extensions/boolean_spec.rb +68 -82
  291. data/spec/mongoid/extensions/date_class_mongoize_spec.rb +7 -3
  292. data/spec/mongoid/extensions/date_spec.rb +71 -1
  293. data/spec/mongoid/extensions/date_time_spec.rb +15 -9
  294. data/spec/mongoid/extensions/float_spec.rb +48 -76
  295. data/spec/mongoid/extensions/hash_spec.rb +30 -0
  296. data/spec/mongoid/extensions/integer_spec.rb +45 -66
  297. data/spec/mongoid/extensions/range_spec.rb +255 -54
  298. data/spec/mongoid/extensions/regexp_spec.rb +58 -33
  299. data/spec/mongoid/extensions/set_spec.rb +106 -0
  300. data/spec/mongoid/extensions/string_spec.rb +53 -25
  301. data/spec/mongoid/extensions/symbol_spec.rb +18 -25
  302. data/spec/mongoid/extensions/time_spec.rb +634 -66
  303. data/spec/mongoid/extensions/time_with_zone_spec.rb +17 -31
  304. data/spec/mongoid/factory_spec.rb +61 -1
  305. data/spec/mongoid/fields_spec.rb +321 -50
  306. data/spec/mongoid/findable_spec.rb +64 -29
  307. data/spec/mongoid/indexable/specification_spec.rb +2 -2
  308. data/spec/mongoid/indexable_spec.rb +39 -20
  309. data/spec/mongoid/interceptable_spec.rb +584 -5
  310. data/spec/mongoid/interceptable_spec_models.rb +235 -4
  311. data/spec/mongoid/matcher/extract_attribute_spec.rb +1 -5
  312. data/spec/mongoid/mongoizable_spec.rb +285 -0
  313. data/spec/mongoid/persistable/creatable_spec.rb +2 -2
  314. data/spec/mongoid/persistable/deletable_spec.rb +2 -2
  315. data/spec/mongoid/persistable/destroyable_spec.rb +2 -2
  316. data/spec/mongoid/persistable/upsertable_spec.rb +14 -0
  317. data/spec/mongoid/persistence_context_spec.rb +50 -1
  318. data/spec/mongoid/query_cache_middleware_spec.rb +0 -18
  319. data/spec/mongoid/query_cache_spec.rb +0 -154
  320. data/spec/mongoid/reloadable_spec.rb +35 -2
  321. data/spec/mongoid/scopable_spec.rb +54 -16
  322. data/spec/mongoid/shardable_spec.rb +14 -0
  323. data/spec/mongoid/stateful_spec.rb +28 -0
  324. data/spec/mongoid/timestamps_spec.rb +390 -0
  325. data/spec/mongoid/timestamps_spec_models.rb +67 -0
  326. data/spec/mongoid/touchable_spec.rb +116 -0
  327. data/spec/mongoid/touchable_spec_models.rb +12 -8
  328. data/spec/mongoid/traversable_spec.rb +4 -11
  329. data/spec/mongoid/validatable/presence_spec.rb +1 -1
  330. data/spec/mongoid/validatable/uniqueness_spec.rb +60 -31
  331. data/spec/mongoid/warnings_spec.rb +35 -0
  332. data/spec/rails/controller_extension/controller_runtime_spec.rb +2 -2
  333. data/spec/rails/mongoid_spec.rb +4 -16
  334. data/spec/shared/lib/mrss/event_subscriber.rb +5 -15
  335. data/spec/support/constraints.rb +24 -0
  336. data/spec/support/macros.rb +30 -0
  337. data/spec/support/models/augmentation.rb +12 -0
  338. data/spec/support/models/band.rb +3 -0
  339. data/spec/support/models/catalog.rb +24 -0
  340. data/spec/support/models/circus.rb +3 -0
  341. data/spec/support/models/fanatic.rb +8 -0
  342. data/spec/support/models/implant.rb +9 -0
  343. data/spec/support/models/label.rb +2 -0
  344. data/spec/support/models/passport.rb +9 -0
  345. data/spec/support/models/person.rb +1 -0
  346. data/spec/support/models/player.rb +2 -0
  347. data/spec/support/models/powerup.rb +12 -0
  348. data/spec/support/models/registry.rb +1 -0
  349. data/spec/support/models/school.rb +14 -0
  350. data/spec/support/models/shield.rb +18 -0
  351. data/spec/support/models/student.rb +14 -0
  352. data/spec/support/models/weapon.rb +12 -0
  353. data.tar.gz.sig +0 -0
  354. metadata +49 -13
  355. metadata.gz.sig +0 -0
  356. data/lib/mongoid/errors/eager_load.rb +0 -23
  357. data/lib/mongoid/errors/invalid_value.rb +0 -17
  358. data/spec/mongoid/errors/eager_load_spec.rb +0 -31
@@ -48,7 +48,7 @@ module Mongoid
48
48
  # proxy.init(person, name, association)
49
49
  #
50
50
  # @param [ Document ] base The base document on the proxy.
51
- # @param [ Document, Array<Document> ] target The target of the proxy.
51
+ # @param [ Document | Array<Document> ] target The target of the proxy.
52
52
  # @param [ Association ] association The association metadata.
53
53
  def init(base, target, association)
54
54
  @_base, @_target, @_association = base, target, association
@@ -117,9 +117,8 @@ module Mongoid
117
117
  # Default behavior of method missing should be to delegate all calls
118
118
  # to the target of the proxy. This can be overridden in special cases.
119
119
  #
120
- # @param [ String, Symbol ] name The name of the method.
120
+ # @param [ String | Symbol ] name The name of the method.
121
121
  # @param [ Array ] args The arguments passed to the method.
122
- #
123
122
  ruby2_keywords def method_missing(name, *args, &block)
124
123
  _target.send(name, *args, &block)
125
124
  end
@@ -169,6 +168,18 @@ module Mongoid
169
168
  end
170
169
  end
171
170
 
171
+ # Execute the before and after callbacks for the given method.
172
+ #
173
+ # @param [ Symbol ] name The name of the callbacks to execute.
174
+ #
175
+ # @return [ Object ] The result of the given block
176
+ def execute_callbacks_around(name, doc)
177
+ execute_callback :"before_#{name.to_s}", doc
178
+ yield.tap do
179
+ execute_callback :"after_#{name.to_s}", doc
180
+ end
181
+ end
182
+
172
183
  class << self
173
184
 
174
185
  # Apply ordering to the criteria if it was defined on the association.
@@ -12,7 +12,7 @@ module Mongoid
12
12
  # @example Is the document autosaved?
13
13
  # document.autosaved?
14
14
  #
15
- # @return [ true, false ] Has the document already been autosaved?
15
+ # @return [ true | false ] Has the document already been autosaved?
16
16
  def autosaved?
17
17
  Threaded.autosaved?(self)
18
18
  end
@@ -56,7 +56,8 @@ module Mongoid
56
56
  __autosaving__ do
57
57
  if assoc_value = ivar(association.name)
58
58
  Array(assoc_value).each do |doc|
59
- doc.with(persistence_context) do |d|
59
+ pc = doc.persistence_context? ? doc.persistence_context : persistence_context
60
+ doc.with(pc) do |d|
60
61
  d.save
61
62
  end
62
63
  end
@@ -64,7 +65,7 @@ module Mongoid
64
65
  end
65
66
  end
66
67
  end
67
- klass.after_save save_method, unless: :autosaved?
68
+ klass.after_persist_parent save_method, unless: :autosaved?
68
69
  end
69
70
  end
70
71
  end
@@ -28,6 +28,7 @@ module Mongoid
28
28
  if _base.referenced_many?
29
29
  _target.__send__(inverse).push(_base)
30
30
  else
31
+ remove_associated(_target)
31
32
  _target.set_relation(inverse, _base)
32
33
  end
33
34
  end
@@ -28,7 +28,7 @@ module Mongoid
28
28
  private
29
29
 
30
30
  def execute_query(object, type)
31
- query_criteria(object, type).limit(1).first(id_sort: :none)
31
+ query_criteria(object, type).take
32
32
  end
33
33
 
34
34
  def query_criteria(object, type)
@@ -18,7 +18,7 @@ module Mongoid
18
18
  # Association::BelongsTo::Proxy.new(game, person, association)
19
19
  #
20
20
  # @param [ Document ] base The document this association hangs off of.
21
- # @param [ Document, Array<Document> ] target The target (parent) of the
21
+ # @param [ Document | Array<Document> ] target The target (parent) of the
22
22
  # association.
23
23
  # @param [ Association ] association The association object.
24
24
  def initialize(base, target, association)
@@ -34,7 +34,6 @@ module Mongoid
34
34
  #
35
35
  # @example Nullify the association.
36
36
  # person.game.nullify
37
- #
38
37
  def nullify
39
38
  unbind_one
40
39
  _target.save
@@ -46,9 +45,9 @@ module Mongoid
46
45
  # @example Substitute the association.
47
46
  # name.substitute(new_name)
48
47
  #
49
- # @param [ Document, Array<Document> ] replacement The replacement.
48
+ # @param [ Document | Array<Document> ] replacement The replacement.
50
49
  #
51
- # @return [ self, nil ] The association or nil.
50
+ # @return [ self | nil ] The association or nil.
52
51
  def substitute(replacement)
53
52
  unbind_one
54
53
  if replacement
@@ -77,7 +76,7 @@ module Mongoid
77
76
  # @example Normalize the substitute.
78
77
  # proxy.normalize(id)
79
78
  #
80
- # @param [ Document, Object ] replacement The replacement object.
79
+ # @param [ Document | Object ] replacement The replacement object.
81
80
  #
82
81
  # @return [ Document ] The document.
83
82
  def normalize(replacement)
@@ -90,7 +89,7 @@ module Mongoid
90
89
  # @example Can we persist the association?
91
90
  # relation.persistable?
92
91
  #
93
- # @return [ true, false ] If the association is persistable.
92
+ # @return [ true | false ] If the association is persistable.
94
93
  def persistable?
95
94
  _target.persisted? && !_binding? && !_building?
96
95
  end
@@ -97,7 +97,7 @@ module Mongoid
97
97
 
98
98
  # Is this association polymorphic?
99
99
  #
100
- # @return [ true, false ] Whether this association is polymorphic.
100
+ # @return [ true | false ] Whether this association is polymorphic.
101
101
  def polymorphic?
102
102
  @polymorphic ||= !!@options[:polymorphic]
103
103
  end
@@ -153,7 +153,7 @@ module Mongoid
153
153
  create_foreign_key_field!
154
154
  setup_index!
155
155
  define_touchable!
156
- @owner_class.validates_associated(name) if validate?
156
+ @owner_class.validates_associated(name) if validate? || require_association?
157
157
  @owner_class.validates(name, presence: true) if require_association?
158
158
  end
159
159
 
@@ -13,7 +13,7 @@ module Mongoid
13
13
  # @example Reset the given counter cache
14
14
  # post.reset_counters(:comments)
15
15
  #
16
- # @param [ Symbol, Array ] counters One or more counter caches to reset
16
+ # @param [ Symbol | Array ] counters One or more counter caches to reset
17
17
  def reset_counters(*counters)
18
18
  self.class.with(persistence_context) do |_class|
19
19
  _class.reset_counters(self, *counters)
@@ -30,7 +30,7 @@ module Mongoid
30
30
  # Post.reset_counters('50e0edd97c71c17ea9000001', :comments)
31
31
  #
32
32
  # @param [ String ] id The id of the object that will be reset.
33
- # @param [ Symbol, Array ] counters One or more counter caches to reset
33
+ # @param [ Symbol | Array ] counters One or more counter caches to reset
34
34
  def reset_counters(id, *counters)
35
35
  document = id.is_a?(Document) ? id : find(id)
36
36
  counters.each do |name|
@@ -97,18 +97,18 @@ module Mongoid
97
97
 
98
98
  association.inverse_class.tap do |klass|
99
99
  klass.after_update do
100
- if record = __send__(name)
101
- foreign_key = association.foreign_key
100
+ foreign_key = association.foreign_key
102
101
 
103
- if attribute_changed?(foreign_key)
104
- original, current = attribute_change(foreign_key)
102
+ if send("#{foreign_key}_previously_changed?")
103
+ original, current = send("#{foreign_key}_previous_change")
105
104
 
106
- unless original.nil?
107
- record.class.with(persistence_context) do |_class|
108
- _class.decrement_counter(cache_column, original)
109
- end
105
+ unless original.nil?
106
+ association.klass.with(persistence_context) do |_class|
107
+ _class.decrement_counter(cache_column, original)
110
108
  end
109
+ end
111
110
 
111
+ if record = __send__(name)
112
112
  unless current.nil?
113
113
  record[cache_column] = (record[cache_column] || 0) + 1
114
114
  record.class.with(record.persistence_context) do |_class|
@@ -85,7 +85,7 @@ module Mongoid
85
85
  # loader.set_on_parent("foo", docs)
86
86
  #
87
87
  # @param [ ObjectId ] id parent`s id
88
- # @param [ Document, Array ] element to push into the parent
88
+ # @param [ Document | Array ] element to push into the parent
89
89
  def set_on_parent(id, element)
90
90
  grouped_docs[id].each do |d|
91
91
  set_relation(d, element)
@@ -140,7 +140,7 @@ module Mongoid
140
140
  # loader.set_relation(doc, docs)
141
141
  #
142
142
  # @param [ Document ] doc The object to set the association on
143
- # @param [ Document, Array ] element to set into the parent
143
+ # @param [ Document | Array ] element to set into the parent
144
144
  def set_relation(doc, element)
145
145
  doc.set_relation(@association.name, element) unless doc.blank?
146
146
  end
@@ -21,17 +21,41 @@ module Mongoid
21
21
  # @example Concat with other documents.
22
22
  # person.posts.concat([ post_one, post_two ])
23
23
  #
24
- # @param [ Document, Array<Document> ] args Any number of documents.
24
+ # @param [ Document | Array<Document> ] args Any number of documents.
25
25
  #
26
26
  # @return [ Array<Document> ] The loaded docs.
27
27
  def <<(*args)
28
28
  docs = args.flatten
29
29
  return concat(docs) if docs.size > 1
30
30
  if doc = docs.first
31
- append(doc)
32
- _base.add_to_set(foreign_key => doc.public_send(_association.primary_key))
33
- if child_persistable?(doc)
34
- doc.save
31
+ append(doc) do
32
+ # We ignore the changes to the value for the foreign key in the
33
+ # changed_attributes hash in this block of code for two reasons:
34
+ #
35
+ # 1) The add_to_set method deletes the value for the foreign
36
+ # key in the changed_attributes hash, but if we enter this
37
+ # method with a value for the foreign key in the
38
+ # changed_attributes hash, then we want it to exist outside
39
+ # this method as well. It's used later on in the Syncable
40
+ # module to set the inverse foreign keys.
41
+ # 2) The reset_unloaded method accesses the value for the foreign
42
+ # key on _base, which causes it to get added to the
43
+ # changed_attributes hash. This happens because when reading
44
+ # a "resizable" attribute, it is automatically added to the
45
+ # changed_attributes hash. This is true only for the foreign
46
+ # key value for HABTM associations as the other associations
47
+ # use strings for their foreign key values. For consistency
48
+ # with the other associations, we ignore this addition to
49
+ # the changed_attributes hash.
50
+ # See MONGOID-4843 for a longer discussion about this.
51
+ reset_foreign_key_changes do
52
+ _base.add_to_set(foreign_key => doc.public_send(_association.primary_key))
53
+
54
+ if child_persistable?(doc)
55
+ doc.save
56
+ end
57
+ reset_unloaded
58
+ end
35
59
  end
36
60
  end
37
61
  unsynced(_base, foreign_key) and self
@@ -81,12 +105,13 @@ module Mongoid
81
105
  #
82
106
  # @return [ Document ] The new document.
83
107
  def build(attributes = {}, type = nil)
84
- doc = Factory.build(type || klass, attributes)
85
- _base.public_send(foreign_key).push(doc.public_send(_association.primary_key))
108
+ doc = Factory.execute_build(type || klass, attributes, execute_callbacks: false)
86
109
  append(doc)
87
110
  doc.apply_post_processed_defaults
111
+ _base.public_send(foreign_key).push(doc.public_send(_association.primary_key))
88
112
  unsynced(doc, inverse_foreign_key)
89
113
  yield(doc) if block_given?
114
+ doc.run_pending_callbacks
90
115
  doc
91
116
  end
92
117
 
@@ -178,6 +203,7 @@ module Mongoid
178
203
  push(replacement.compact.uniq)
179
204
  else
180
205
  reset_unloaded
206
+ clear_foreign_key_changes
181
207
  end
182
208
  self
183
209
  end
@@ -195,6 +221,32 @@ module Mongoid
195
221
 
196
222
  private
197
223
 
224
+ # Clears the foreign key from the changed_attributes hash.
225
+ #
226
+ # This is, in general, used to clear the foreign key from the
227
+ # changed_attributes hash for consistency with the other referenced
228
+ # associations.
229
+ #
230
+ # @api private
231
+ def clear_foreign_key_changes
232
+ _base.changed_attributes.delete(foreign_key)
233
+ end
234
+
235
+ # Reset the value in the changed_attributes hash for the foreign key
236
+ # to its value before executing the given block.
237
+ #
238
+ # @api private
239
+ def reset_foreign_key_changes
240
+ if _base.changed_attributes.key?(foreign_key)
241
+ fk = _base.changed_attributes[foreign_key].dup
242
+ yield if block_given?
243
+ _base.changed_attributes[foreign_key] = fk
244
+ else
245
+ yield if block_given?
246
+ clear_foreign_key_changes
247
+ end
248
+ end
249
+
198
250
  # Appends the document to the target array, updating the index on the
199
251
  # document at the same time.
200
252
  #
@@ -203,11 +255,12 @@ module Mongoid
203
255
  #
204
256
  # @param [ Document ] document The document to append to the target.
205
257
  def append(document)
206
- execute_callback :before_add, document
207
- _target.push(document)
208
- characterize_one(document)
209
- bind_one(document)
210
- execute_callback :after_add, document
258
+ execute_callbacks_around(:add, document) do
259
+ _target.push(document)
260
+ characterize_one(document)
261
+ bind_one(document)
262
+ yield if block_given?
263
+ end
211
264
  end
212
265
 
213
266
  # Instantiate the binding associated with this association.
@@ -229,7 +282,7 @@ module Mongoid
229
282
  #
230
283
  # @param [ Document ] doc The document.
231
284
  #
232
- # @return [ true, false ] If the document can be persisted.
285
+ # @return [ true | false ] If the document can be persisted.
233
286
  def child_persistable?(doc)
234
287
  (persistable? || _creating?) &&
235
288
  !(doc.persisted? && _association.forced_nil_inverse?)
@@ -78,7 +78,7 @@ module Mongoid
78
78
 
79
79
  # Are ids only saved on this side of the association?
80
80
  #
81
- # @return [ true, false ] Whether this association has a forced nil inverse.
81
+ # @return [ true | false ] Whether this association has a forced nil inverse.
82
82
  def forced_nil_inverse?
83
83
  @forced_nil_inverse ||= @options.key?(:inverse_of) && !@options[:inverse_of]
84
84
  end
@@ -119,6 +119,8 @@ module Mongoid
119
119
  @options[:inverse_foreign_key]
120
120
  elsif @options.key?(:inverse_of)
121
121
  inverse_of ? "#{inverse_of.to_s.singularize}#{FOREIGN_KEY_SUFFIX}" : nil
122
+ elsif inv = inverse_association&.foreign_key
123
+ inv
122
124
  else
123
125
  "#{inverse_class_name.demodulize.underscore}#{FOREIGN_KEY_SUFFIX}"
124
126
  end
@@ -129,7 +131,7 @@ module Mongoid
129
131
  #
130
132
  # @param [ Document ] doc The document to be bound.
131
133
  #
132
- # @return [ true, false ] Whether the document can be bound.
134
+ # @return [ true | false ] Whether the document can be bound.
133
135
  def bindable?(doc)
134
136
  forced_nil_inverse? || (!!inverse && doc.fields.keys.include?(foreign_key))
135
137
  end
@@ -219,7 +221,7 @@ module Mongoid
219
221
  def synced_save
220
222
  assoc = self
221
223
  inverse_class.set_callback(
222
- :save,
224
+ :persist_parent,
223
225
  :after,
224
226
  if: ->(doc){ doc._syncable?(assoc) }
225
227
  ) do |doc|
@@ -228,6 +230,7 @@ module Mongoid
228
230
  end
229
231
 
230
232
  def create_foreign_key_field!
233
+ inverse_class.aliased_associations[foreign_key] = name.to_s
231
234
  @owner_class.field(
232
235
  foreign_key,
233
236
  type: FOREIGN_KEY_FIELD_TYPE,
@@ -28,7 +28,7 @@ module Mongoid
28
28
  #
29
29
  # @param [ Enumerable ] other The other enumerable.
30
30
  #
31
- # @return [ true, false ] If the objects are equal.
31
+ # @return [ true | false ] If the objects are equal.
32
32
  def ==(other)
33
33
  return false unless other.respond_to?(:entries)
34
34
  entries == other.entries
@@ -42,7 +42,7 @@ module Mongoid
42
42
  #
43
43
  # @param [ Object ] other The object to check.
44
44
  #
45
- # @return [ true, false ] If the objects are equal in a case.
45
+ # @return [ true | false ] If the objects are equal in a case.
46
46
  def ===(other)
47
47
  return false unless other.respond_to?(:entries)
48
48
  if Mongoid.legacy_triple_equals
@@ -192,7 +192,7 @@ module Mongoid
192
192
  # @example Is the enumerable empty?
193
193
  # enumerable.empty?
194
194
  #
195
- # @return [ true, false ] If the enumerable is empty.
195
+ # @return [ true | false ] If the enumerable is empty.
196
196
  def empty?
197
197
  if _loaded?
198
198
  in_memory.empty?
@@ -224,7 +224,7 @@ module Mongoid
224
224
  # @param [ Object ] condition The condition that documents
225
225
  # must satisfy. See Enumerable documentation for details.
226
226
  #
227
- # @return [ true, false ] If the association has any documents.
227
+ # @return [ true | false ] If the association has any documents.
228
228
  def any?(*args)
229
229
  return super if args.any? || block_given?
230
230
 
@@ -240,19 +240,15 @@ module Mongoid
240
240
  # @note Automatically adding a sort on _id when no other sort is
241
241
  # defined on the criteria has the potential to cause bad performance issues.
242
242
  # If you experience unexpected poor performance when using #first or #last,
243
- # use the option { id_sort: :none }.
244
- # Be aware that #first/#last won't guarantee order in this case.
243
+ # use #take instead.
244
+ # Be aware that #take won't guarantee order.
245
245
  #
246
- # @param [ Integer | Hash ] limit_or_opts The number of documents to
247
- # return, or a hash of options.
248
- #
249
- # @option limit_or_opts [ :none ] :id_sort This option is deprecated.
250
- # Don't apply a sort on _id if no other sort is defined on the criteria.
246
+ # @param [ Integer ] limit The number of documents to return.
251
247
  #
252
248
  # @return [ Document ] The first document found.
253
- def first(limit_or_opts = nil)
249
+ def first(limit = nil)
254
250
  _loaded.try(:values).try(:first) ||
255
- _added[(ul = _unloaded.try(:first, limit_or_opts)).try(:_id)] ||
251
+ _added[(ul = _unloaded.try(:first, limit)).try(:_id)] ||
256
252
  ul ||
257
253
  _added.values.try(:first)
258
254
  end
@@ -265,7 +261,7 @@ module Mongoid
265
261
  # @example Initialize the enumerable with an array.
266
262
  # Enumerable.new([ post ])
267
263
  #
268
- # @param [ Criteria, Array<Document> ] target The wrapped object.
264
+ # @param [ Criteria | Array<Document> ] target The wrapped object.
269
265
  def initialize(target, base = nil, association = nil)
270
266
  @_base = base
271
267
  @_association = association
@@ -287,7 +283,7 @@ module Mongoid
287
283
  #
288
284
  # @param [ Document ] doc The document to check.
289
285
  #
290
- # @return [ true, false ] If the document is in the target.
286
+ # @return [ true | false ] If the document is in the target.
291
287
  def include?(doc)
292
288
  return super unless _unloaded
293
289
  _unloaded.where(_id: doc._id).exists? || _added.has_key?(doc._id)
@@ -329,20 +325,16 @@ module Mongoid
329
325
  # @note Automatically adding a sort on _id when no other sort is
330
326
  # defined on the criteria has the potential to cause bad performance issues.
331
327
  # If you experience unexpected poor performance when using #first or #last,
332
- # use the option { id_sort: :none }.
333
- # Be aware that #first/#last won't guarantee order in this case.
334
- #
335
- # @param [ Integer | Hash ] limit_or_opts The number of documents to
336
- # return, or a hash of options.
328
+ # use #take instead.
329
+ # Be aware that #take won't guarantee order.
337
330
  #
338
- # @option limit_or_opts [ :none ] :id_sort This option is deprecated.
339
- # Don't apply a sort on _id if no other sort is defined on the criteria.
331
+ # @param [ Integer ] limit The number of documents to return.
340
332
  #
341
333
  # @return [ Document ] The last document found.
342
- def last(limit_or_opts = nil)
334
+ def last(limit = nil)
343
335
  _added.values.try(:last) ||
344
336
  _loaded.try(:values).try(:last) ||
345
- _added[(ul = _unloaded.try(:last, limit_or_opts)).try(:_id)] ||
337
+ _added[(ul = _unloaded.try(:last, limit)).try(:_id)] ||
346
338
  ul
347
339
  end
348
340
 
@@ -360,7 +352,7 @@ module Mongoid
360
352
  # @example Is the enumerable _loaded?
361
353
  # enumerable._loaded?
362
354
  #
363
- # @return [ true, false ] If the enumerable has been _loaded.
355
+ # @return [ true | false ] If the enumerable has been _loaded.
364
356
  def _loaded?
365
357
  !!@executed
366
358
  end
@@ -413,11 +405,11 @@ module Mongoid
413
405
  # @example Does the enumerable respond to the method?
414
406
  # enumerable.respond_to?(:sum)
415
407
  #
416
- # @param [ String, Symbol ] name The name of the method.
417
- # @param [ true, false ] include_private Whether to include private
408
+ # @param [ String | Symbol ] name The name of the method.
409
+ # @param [ true | false ] include_private Whether to include private
418
410
  # methods.
419
411
  #
420
- # @return [ true, false ] Whether the enumerable responds.
412
+ # @return [ true | false ] Whether the enumerable responds.
421
413
  def respond_to?(name, include_private = false)
422
414
  [].respond_to?(name, include_private) || super
423
415
  end
@@ -25,7 +25,7 @@ module Mongoid
25
25
  # @example Concat with other documents.
26
26
  # person.posts.concat([ post_one, post_two ])
27
27
  #
28
- # @param [ Document, Array<Document> ] args Any number of documents.
28
+ # @param [ Document | Array<Document> ] args Any number of documents.
29
29
  #
30
30
  # @return [ Array<Document> ] The loaded docs.
31
31
  def <<(*args)
@@ -71,10 +71,11 @@ module Mongoid
71
71
  #
72
72
  # @return [ Document ] The new document.
73
73
  def build(attributes = {}, type = nil)
74
- doc = Factory.build(type || klass, attributes)
74
+ doc = Factory.execute_build(type || klass, attributes, execute_callbacks: false)
75
75
  append(doc)
76
76
  doc.apply_post_processed_defaults
77
77
  yield(doc) if block_given?
78
+ doc.run_pending_callbacks
78
79
  doc.run_callbacks(:build) { doc }
79
80
  doc
80
81
  end
@@ -92,13 +93,15 @@ module Mongoid
92
93
  #
93
94
  # @return [ Document ] The matching document.
94
95
  def delete(document)
95
- execute_callback :before_remove, document
96
- _target.delete(document) do |doc|
97
- if doc
98
- unbind_one(doc)
99
- cascade!(doc) if !_assigning?
96
+ execute_callbacks_around(:remove, document) do
97
+ _target.delete(document) do |doc|
98
+ if doc
99
+ unbind_one(doc)
100
+ cascade!(doc) if !_assigning?
101
+ end
102
+ end.tap do
103
+ reset_unloaded
100
104
  end
101
- execute_callback :after_remove, doc
102
105
  end
103
106
  end
104
107
 
@@ -165,7 +168,7 @@ module Mongoid
165
168
  # @example Are there persisted documents?
166
169
  # person.posts.exists?
167
170
  #
168
- # @return [ true, false ] True is persisted documents exist, false if not.
171
+ # @return [ true | false ] True is persisted documents exist, false if not.
169
172
  def exists?
170
173
  criteria.exists?
171
174
  end
@@ -181,6 +184,9 @@ module Mongoid
181
184
  # of those found by the current Criteria object for which the block
182
185
  # returns a truthy value.
183
186
  #
187
+ # @note Each argument can be an individual id, an array of ids or
188
+ # a nested array. Each array will be flattened.
189
+ #
184
190
  # @example Find by an id.
185
191
  # person.posts.find(BSON::ObjectId.new)
186
192
  #
@@ -193,7 +199,7 @@ module Mongoid
193
199
  # @note This will keep matching documents in memory for iteration
194
200
  # later.
195
201
  #
196
- # @param [ BSON::ObjectId, Array<BSON::ObjectId> ] args The ids.
202
+ # @param [ Object | Array<Object> ] *args The ids.
197
203
  # @param [ Proc ] block Optional block to pass.
198
204
  #
199
205
  # @return [ Document | Array<Document> | nil ] A document or matching documents.
@@ -325,7 +331,7 @@ module Mongoid
325
331
  # relation.with_add_callbacks(document, false)
326
332
  #
327
333
  # @param [ Document ] document The document to append to the target.
328
- # @param [ true, false ] already_related Whether the document is already related
334
+ # @param [ true | false ] already_related Whether the document is already related
329
335
  # to the target.
330
336
  def with_add_callbacks(document, already_related)
331
337
  execute_callback :before_add, document unless already_related
@@ -340,7 +346,7 @@ module Mongoid
340
346
  #
341
347
  # @param [ Document ] document The document to possibly append to the target.
342
348
  #
343
- # @return [ true, false ] Whether the document is already related to the base and the
349
+ # @return [ true | false ] Whether the document is already related to the base and the
344
350
  # association is persisted.
345
351
  def already_related?(document)
346
352
  document.persisted? &&
@@ -388,7 +394,7 @@ module Mongoid
388
394
  #
389
395
  # @param [ Document ] document The document to cascade on.
390
396
  #
391
- # @return [ true, false ] If the association is destructive.
397
+ # @return [ true | false ] If the association is destructive.
392
398
  def cascade!(document)
393
399
  if persistable?
394
400
  case _association.dependent
@@ -407,11 +413,11 @@ module Mongoid
407
413
  #
408
414
  # If the method exists on the array, use the default proxy behavior.
409
415
  #
410
- # @param [ Symbol, String ] name The name of the method.
416
+ # @param [ Symbol | String ] name The name of the method.
411
417
  # @param [ Array ] args The method args
412
418
  # @param [ Proc ] block Optional block to pass.
413
419
  #
414
- # @return [ Criteria, Object ] A Criteria or return value from the target.
420
+ # @return [ Criteria | Object ] A Criteria or return value from the target.
415
421
  ruby2_keywords def method_missing(name, *args, &block)
416
422
  if _target.respond_to?(name)
417
423
  _target.send(name, *args, &block)
@@ -447,7 +453,7 @@ module Mongoid
447
453
  # @example Can we persist the association?
448
454
  # relation.persistable?
449
455
  #
450
- # @return [ true, false ] If the association is persistable.
456
+ # @return [ true | false ] If the association is persistable.
451
457
  def persistable?
452
458
  !_binding? && (_creating? || _base.persisted? && !_building?)
453
459
  end
@@ -469,8 +475,8 @@ module Mongoid
469
475
  selector = conditions || {}
470
476
  removed = klass.send(method, selector.merge!(criteria.selector))
471
477
  _target.delete_if do |doc|
472
- if doc._matches?(selector)
473
- unbind_one(doc) and true
478
+ doc._matches?(selector).tap do |b|
479
+ unbind_one(doc) if b
474
480
  end
475
481
  end
476
482
  removed