mongoid 3.1.6 → 4.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (571) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +479 -8
  3. data/README.md +10 -7
  4. data/lib/config/locales/en.yml +34 -20
  5. data/lib/mongoid.rb +10 -76
  6. data/lib/mongoid/atomic.rb +3 -14
  7. data/lib/mongoid/atomic/paths/embedded.rb +0 -30
  8. data/lib/mongoid/atomic/paths/embedded/many.rb +1 -1
  9. data/lib/mongoid/atomic/paths/embedded/one.rb +1 -1
  10. data/lib/mongoid/atomic/paths/root.rb +0 -13
  11. data/lib/mongoid/attributes.rb +65 -101
  12. data/lib/mongoid/attributes/dynamic.rb +154 -0
  13. data/lib/mongoid/attributes/nested.rb +82 -0
  14. data/lib/mongoid/attributes/processing.rb +13 -66
  15. data/lib/mongoid/{dirty.rb → changeable.rb} +32 -2
  16. data/lib/mongoid/composable.rb +105 -0
  17. data/lib/mongoid/config.rb +3 -9
  18. data/lib/mongoid/config/options.rb +1 -1
  19. data/lib/mongoid/contextual.rb +2 -0
  20. data/lib/mongoid/contextual/aggregable/memory.rb +2 -2
  21. data/lib/mongoid/contextual/aggregable/mongo.rb +7 -9
  22. data/lib/mongoid/contextual/atomic.rb +53 -53
  23. data/lib/mongoid/contextual/geo_near.rb +1 -1
  24. data/lib/mongoid/contextual/map_reduce.rb +4 -2
  25. data/lib/mongoid/contextual/memory.rb +23 -11
  26. data/lib/mongoid/contextual/mongo.rb +75 -57
  27. data/lib/mongoid/contextual/none.rb +90 -0
  28. data/lib/mongoid/contextual/text_search.rb +178 -0
  29. data/lib/mongoid/copyable.rb +2 -3
  30. data/lib/mongoid/criteria.rb +39 -34
  31. data/lib/mongoid/criteria/#findable.rb# +141 -0
  32. data/lib/mongoid/{criterion → criteria}/findable.rb +7 -47
  33. data/lib/mongoid/{criterion/inspection.rb → criteria/inspectable.rb} +2 -2
  34. data/lib/mongoid/{criterion → criteria}/marshalable.rb +3 -1
  35. data/lib/mongoid/{criterion → criteria}/modifiable.rb +28 -8
  36. data/lib/mongoid/criteria/permission.rb +70 -0
  37. data/lib/mongoid/{criterion/scoping.rb → criteria/scopable.rb} +2 -2
  38. data/lib/mongoid/document.rb +39 -24
  39. data/lib/mongoid/errors.rb +4 -1
  40. data/lib/mongoid/errors/document_not_destroyed.rb +25 -0
  41. data/lib/mongoid/errors/document_not_found.rb +2 -1
  42. data/lib/mongoid/errors/invalid_storage_options.rb +1 -1
  43. data/lib/mongoid/errors/invalid_storage_parent.rb +26 -0
  44. data/lib/mongoid/errors/invalid_value.rb +16 -0
  45. data/lib/mongoid/errors/mongoid_error.rb +1 -1
  46. data/lib/mongoid/errors/readonly_document.rb +24 -0
  47. data/lib/mongoid/extensions.rb +15 -7
  48. data/lib/mongoid/extensions/array.rb +3 -3
  49. data/lib/mongoid/extensions/big_decimal.rb +1 -1
  50. data/lib/mongoid/extensions/boolean.rb +15 -17
  51. data/lib/mongoid/extensions/date.rb +1 -1
  52. data/lib/mongoid/extensions/date_time.rb +3 -3
  53. data/lib/mongoid/extensions/float.rb +2 -1
  54. data/lib/mongoid/extensions/hash.rb +3 -3
  55. data/lib/mongoid/extensions/integer.rb +1 -1
  56. data/lib/mongoid/extensions/object.rb +7 -7
  57. data/lib/mongoid/extensions/object_id.rb +5 -5
  58. data/lib/mongoid/extensions/range.rb +9 -3
  59. data/lib/mongoid/extensions/regexp.rb +1 -1
  60. data/lib/mongoid/extensions/set.rb +1 -1
  61. data/lib/mongoid/extensions/string.rb +6 -18
  62. data/lib/mongoid/extensions/symbol.rb +1 -1
  63. data/lib/mongoid/extensions/time.rb +3 -3
  64. data/lib/mongoid/extensions/time_with_zone.rb +1 -1
  65. data/lib/mongoid/factory.rb +8 -6
  66. data/lib/mongoid/fields.rb +41 -8
  67. data/lib/mongoid/fields/foreign_key.rb +3 -3
  68. data/lib/mongoid/fields/localized.rb +1 -1
  69. data/lib/mongoid/fields/standard.rb +5 -17
  70. data/lib/mongoid/fields/validators/macro.rb +15 -5
  71. data/lib/mongoid/{finders.rb → findable.rb} +35 -7
  72. data/lib/mongoid/{indexes.rb → indexable.rb} +50 -55
  73. data/lib/mongoid/indexable/specification.rb +104 -0
  74. data/lib/mongoid/{indexes → indexable}/validators/options.rb +2 -1
  75. data/lib/mongoid/{inspection.rb → inspectable.rb} +15 -11
  76. data/lib/mongoid/{callbacks.rb → interceptable.rb} +30 -62
  77. data/lib/mongoid/log_subscriber.rb +55 -0
  78. data/lib/mongoid/matchable.rb +152 -0
  79. data/lib/mongoid/{matchers → matchable}/all.rb +1 -1
  80. data/lib/mongoid/{matchers → matchable}/and.rb +2 -2
  81. data/lib/mongoid/{matchers → matchable}/default.rb +1 -1
  82. data/lib/mongoid/{matchers → matchable}/exists.rb +1 -1
  83. data/lib/mongoid/{matchers → matchable}/gt.rb +1 -1
  84. data/lib/mongoid/{matchers → matchable}/gte.rb +1 -1
  85. data/lib/mongoid/{matchers → matchable}/in.rb +2 -2
  86. data/lib/mongoid/{matchers → matchable}/lt.rb +1 -1
  87. data/lib/mongoid/{matchers → matchable}/lte.rb +1 -1
  88. data/lib/mongoid/{matchers → matchable}/ne.rb +2 -2
  89. data/lib/mongoid/{matchers → matchable}/nin.rb +3 -2
  90. data/lib/mongoid/{matchers → matchable}/or.rb +2 -2
  91. data/lib/mongoid/{matchers → matchable}/size.rb +1 -1
  92. data/lib/mongoid/persistable.rb +216 -0
  93. data/lib/mongoid/persistable/creatable.rb +189 -0
  94. data/lib/mongoid/persistable/deletable.rb +149 -0
  95. data/lib/mongoid/persistable/destroyable.rb +60 -0
  96. data/lib/mongoid/persistable/incrementable.rb +36 -0
  97. data/lib/mongoid/persistable/logical.rb +38 -0
  98. data/lib/mongoid/persistable/poppable.rb +39 -0
  99. data/lib/mongoid/persistable/pullable.rb +55 -0
  100. data/lib/mongoid/persistable/pushable.rb +62 -0
  101. data/lib/mongoid/persistable/renamable.rb +35 -0
  102. data/lib/mongoid/persistable/savable.rb +52 -0
  103. data/lib/mongoid/persistable/settable.rb +33 -0
  104. data/lib/mongoid/persistable/unsettable.rb +36 -0
  105. data/lib/mongoid/persistable/updatable.rb +153 -0
  106. data/lib/mongoid/persistable/upsertable.rb +55 -0
  107. data/lib/mongoid/positional.rb +71 -0
  108. data/lib/mongoid/query_cache.rb +255 -0
  109. data/lib/mongoid/railtie.rb +34 -60
  110. data/lib/mongoid/railties/database.rake +9 -25
  111. data/lib/mongoid/relations.rb +11 -25
  112. data/lib/mongoid/relations/accessors.rb +15 -51
  113. data/lib/mongoid/relations/auto_save.rb +15 -36
  114. data/lib/mongoid/relations/binding.rb +2 -25
  115. data/lib/mongoid/relations/bindings/embedded/in.rb +1 -1
  116. data/lib/mongoid/relations/bindings/embedded/many.rb +1 -3
  117. data/lib/mongoid/relations/bindings/referenced/in.rb +3 -8
  118. data/lib/mongoid/relations/bindings/referenced/many_to_many.rb +4 -2
  119. data/lib/mongoid/relations/builder.rb +1 -1
  120. data/lib/mongoid/relations/builders.rb +2 -2
  121. data/lib/mongoid/relations/builders/embedded/one.rb +1 -1
  122. data/lib/mongoid/relations/builders/nested_attributes/many.rb +10 -13
  123. data/lib/mongoid/relations/builders/nested_attributes/one.rb +5 -6
  124. data/lib/mongoid/relations/builders/referenced/in.rb +1 -1
  125. data/lib/mongoid/relations/builders/referenced/many.rb +1 -2
  126. data/lib/mongoid/relations/builders/referenced/many_to_many.rb +1 -2
  127. data/lib/mongoid/relations/builders/referenced/one.rb +1 -1
  128. data/lib/mongoid/relations/cascading.rb +3 -5
  129. data/lib/mongoid/relations/constraint.rb +1 -1
  130. data/lib/mongoid/relations/conversions.rb +1 -1
  131. data/lib/mongoid/relations/counter_cache.rb +39 -15
  132. data/lib/mongoid/relations/eager.rb +46 -0
  133. data/lib/mongoid/relations/eager/base.rb +149 -0
  134. data/lib/mongoid/relations/eager/belongs_to.rb +31 -0
  135. data/lib/mongoid/relations/eager/has_and_belongs_to_many.rb +47 -0
  136. data/lib/mongoid/relations/eager/has_many.rb +38 -0
  137. data/lib/mongoid/relations/eager/has_one.rb +30 -0
  138. data/lib/mongoid/relations/embedded/batchable.rb +4 -5
  139. data/lib/mongoid/relations/embedded/in.rb +4 -4
  140. data/lib/mongoid/relations/embedded/many.rb +14 -32
  141. data/lib/mongoid/relations/embedded/one.rb +1 -1
  142. data/lib/mongoid/relations/macros.rb +3 -4
  143. data/lib/mongoid/relations/many.rb +51 -31
  144. data/lib/mongoid/relations/marshalable.rb +3 -3
  145. data/lib/mongoid/relations/metadata.rb +14 -79
  146. data/lib/mongoid/relations/nested_builder.rb +2 -2
  147. data/lib/mongoid/relations/one.rb +1 -1
  148. data/lib/mongoid/relations/options.rb +1 -0
  149. data/lib/mongoid/relations/polymorphic.rb +0 -1
  150. data/lib/mongoid/relations/proxy.rb +21 -41
  151. data/lib/mongoid/relations/referenced/in.rb +4 -20
  152. data/lib/mongoid/relations/referenced/many.rb +22 -35
  153. data/lib/mongoid/relations/referenced/many_to_many.rb +19 -42
  154. data/lib/mongoid/relations/referenced/one.rb +6 -25
  155. data/lib/mongoid/relations/synchronization.rb +4 -4
  156. data/lib/mongoid/relations/targets/enumerable.rb +10 -10
  157. data/lib/mongoid/relations/touchable.rb +34 -1
  158. data/lib/mongoid/{reloading.rb → reloadable.rb} +7 -5
  159. data/lib/mongoid/{scoping.rb → scopable.rb} +36 -36
  160. data/lib/mongoid/selectable.rb +59 -0
  161. data/lib/mongoid/{serialization.rb → serializable.rb} +11 -2
  162. data/lib/mongoid/sessions.rb +37 -345
  163. data/lib/mongoid/sessions/factory.rb +2 -0
  164. data/lib/mongoid/sessions/options.rb +185 -0
  165. data/lib/mongoid/sessions/storage_options.rb +140 -0
  166. data/lib/mongoid/sessions/thread_options.rb +19 -0
  167. data/lib/mongoid/sessions/validators/storage.rb +16 -3
  168. data/lib/mongoid/{sharding.rb → shardable.rb} +5 -1
  169. data/lib/mongoid/{state.rb → stateful.rb} +13 -1
  170. data/lib/mongoid/support/query_counter.rb +23 -0
  171. data/lib/mongoid/tasks/database.rake +31 -0
  172. data/lib/mongoid/tasks/database.rb +107 -0
  173. data/lib/mongoid/threaded.rb +26 -172
  174. data/lib/mongoid/threaded/lifecycle.rb +0 -28
  175. data/lib/mongoid/timestamps/updated/short.rb +2 -2
  176. data/lib/mongoid/{hierarchy.rb → traversable.rb} +15 -7
  177. data/lib/mongoid/{validations.rb → validatable.rb} +23 -10
  178. data/lib/mongoid/{validations → validatable}/associated.rb +4 -2
  179. data/lib/mongoid/{validations → validatable}/format.rb +1 -1
  180. data/lib/mongoid/{validations → validatable}/length.rb +1 -1
  181. data/lib/mongoid/{validations → validatable}/localizable.rb +1 -1
  182. data/lib/mongoid/{validations → validatable}/macros.rb +4 -3
  183. data/lib/mongoid/{validations → validatable}/presence.rb +1 -1
  184. data/lib/mongoid/{validations → validatable}/queryable.rb +1 -2
  185. data/lib/mongoid/{validations → validatable}/uniqueness.rb +25 -21
  186. data/lib/mongoid/version.rb +1 -1
  187. data/lib/rails/generators/mongoid/config/templates/mongoid.yml +46 -25
  188. data/lib/rails/generators/mongoid/model/model_generator.rb +0 -1
  189. data/lib/rails/generators/mongoid/model/templates/model.rb.tt +0 -3
  190. data/lib/rails/generators/mongoid_generator.rb +3 -40
  191. data/lib/rails/mongoid.rb +0 -122
  192. data/lib/support/ruby_version.rb +1 -1
  193. data/spec/app/models/account.rb +2 -6
  194. data/spec/app/models/acolyte.rb +2 -1
  195. data/spec/app/models/actor.rb +0 -1
  196. data/spec/app/models/address.rb +8 -3
  197. data/spec/app/models/animal.rb +1 -1
  198. data/spec/app/models/appointment.rb +3 -3
  199. data/spec/app/models/article.rb +1 -4
  200. data/spec/app/models/audio.rb +5 -0
  201. data/spec/app/models/author.rb +0 -2
  202. data/spec/app/models/band.rb +3 -2
  203. data/spec/app/models/bar.rb +1 -0
  204. data/spec/app/models/book.rb +1 -0
  205. data/spec/app/models/building.rb +0 -2
  206. data/spec/app/models/building_address.rb +0 -2
  207. data/spec/app/models/bus.rb +1 -1
  208. data/spec/app/models/canvas.rb +1 -1
  209. data/spec/app/models/contextable_item.rb +5 -0
  210. data/spec/app/models/contractor.rb +0 -2
  211. data/spec/app/models/country_code.rb +1 -1
  212. data/spec/app/models/definition.rb +2 -2
  213. data/spec/app/models/dog.rb +1 -1
  214. data/spec/app/models/draft.rb +9 -0
  215. data/spec/app/models/dragon.rb +4 -0
  216. data/spec/app/models/drug.rb +1 -3
  217. data/spec/app/models/dungeon.rb +4 -0
  218. data/spec/app/models/edit.rb +5 -0
  219. data/spec/app/models/even.rb +7 -0
  220. data/spec/app/models/event.rb +1 -1
  221. data/spec/app/models/filesystem.rb +1 -0
  222. data/spec/app/models/fish.rb +0 -1
  223. data/spec/app/models/fruits.rb +6 -0
  224. data/spec/app/models/game.rb +0 -2
  225. data/spec/app/models/house.rb +1 -3
  226. data/spec/app/models/id_key.rb +6 -0
  227. data/spec/app/models/item.rb +1 -5
  228. data/spec/app/models/jar.rb +1 -1
  229. data/spec/app/models/label.rb +4 -4
  230. data/spec/app/models/line_item.rb +1 -1
  231. data/spec/app/models/login.rb +1 -1
  232. data/spec/app/models/message.rb +8 -0
  233. data/spec/app/models/movie.rb +1 -0
  234. data/spec/app/models/name.rb +3 -3
  235. data/spec/app/models/note.rb +3 -1
  236. data/spec/app/models/odd.rb +7 -0
  237. data/spec/app/models/oscar.rb +1 -1
  238. data/spec/app/models/parent_doc.rb +1 -1
  239. data/spec/app/models/person.rb +16 -10
  240. data/spec/app/models/phone.rb +1 -3
  241. data/spec/app/models/player.rb +3 -3
  242. data/spec/app/models/post.rb +5 -3
  243. data/spec/app/models/preference.rb +1 -1
  244. data/spec/app/models/quiz.rb +0 -3
  245. data/spec/app/models/record.rb +10 -5
  246. data/spec/app/models/registry.rb +1 -1
  247. data/spec/app/models/server.rb +1 -1
  248. data/spec/app/models/service.rb +3 -3
  249. data/spec/app/models/sound.rb +5 -0
  250. data/spec/app/models/symptom.rb +1 -1
  251. data/spec/app/models/template.rb +1 -1
  252. data/spec/app/models/title.rb +0 -1
  253. data/spec/app/models/track.rb +5 -5
  254. data/spec/app/models/tree.rb +3 -3
  255. data/spec/app/models/video.rb +1 -5
  256. data/spec/app/models/wiki_page.rb +2 -5
  257. data/spec/app/models/word.rb +3 -0
  258. data/spec/app/models/word_origin.rb +1 -1
  259. data/spec/config/mongoid.yml +7 -8
  260. data/spec/helpers.rb +18 -0
  261. data/spec/mongoid/#atomic_spec.rb# +365 -0
  262. data/spec/mongoid/atomic/modifiers_spec.rb +22 -22
  263. data/spec/mongoid/atomic/paths/embedded/many_spec.rb +8 -49
  264. data/spec/mongoid/atomic/paths/embedded/one_spec.rb +7 -49
  265. data/spec/mongoid/atomic/paths/root_spec.rb +3 -61
  266. data/spec/mongoid/atomic/paths_spec.rb +19 -19
  267. data/spec/mongoid/atomic_spec.rb +19 -19
  268. data/spec/mongoid/{nested_attributes_spec.rb → attributes/nested_spec.rb} +474 -592
  269. data/spec/mongoid/attributes/readonly_spec.rb +58 -18
  270. data/spec/mongoid/attributes_spec.rb +349 -434
  271. data/spec/mongoid/{dirty_spec.rb → changeable_spec.rb} +203 -153
  272. data/spec/mongoid/{components_spec.rb → composable_spec.rb} +3 -3
  273. data/spec/mongoid/config/environment_spec.rb +3 -3
  274. data/spec/mongoid/config/options_spec.rb +6 -6
  275. data/spec/mongoid/config_spec.rb +24 -48
  276. data/spec/mongoid/contextual/aggregable/memory_spec.rb +12 -12
  277. data/spec/mongoid/contextual/aggregable/mongo_spec.rb +78 -38
  278. data/spec/mongoid/contextual/atomic_spec.rb +60 -56
  279. data/spec/mongoid/contextual/find_and_modify_spec.rb +14 -14
  280. data/spec/mongoid/contextual/geo_near_spec.rb +22 -22
  281. data/spec/mongoid/contextual/map_reduce_spec.rb +27 -27
  282. data/spec/mongoid/contextual/memory_spec.rb +156 -94
  283. data/spec/mongoid/contextual/mongo_spec.rb +238 -150
  284. data/spec/mongoid/contextual/none_spec.rb +127 -0
  285. data/spec/mongoid/contextual/text_search_spec.rb +209 -0
  286. data/spec/mongoid/copyable_spec.rb +56 -68
  287. data/spec/mongoid/criteria/findable_spec.rb +991 -0
  288. data/spec/mongoid/{criterion/inspection_spec.rb → criteria/inspectable_spec.rb} +5 -5
  289. data/spec/mongoid/{criterion → criteria}/marshalable_spec.rb +2 -2
  290. data/spec/mongoid/criteria/modifiable_spec.rb +1252 -0
  291. data/spec/mongoid/{criterion/scoping_spec.rb → criteria/scopable_spec.rb} +37 -37
  292. data/spec/mongoid/criteria_spec.rb +715 -2421
  293. data/spec/mongoid/document_spec.rb +171 -121
  294. data/spec/mongoid/equality_spec.rb +22 -22
  295. data/spec/mongoid/errors/ambiguous_relationship_spec.rb +3 -3
  296. data/spec/mongoid/errors/callback_spec.rb +3 -3
  297. data/spec/mongoid/errors/delete_restriction_spec.rb +3 -3
  298. data/spec/mongoid/errors/document_not_destroyed_spec.rb +33 -0
  299. data/spec/mongoid/errors/document_not_found_spec.rb +11 -11
  300. data/spec/mongoid/errors/eager_load_spec.rb +3 -3
  301. data/spec/mongoid/errors/invalid_collection_spec.rb +3 -3
  302. data/spec/mongoid/errors/invalid_config_option_spec.rb +3 -3
  303. data/spec/mongoid/errors/invalid_field_option_spec.rb +3 -3
  304. data/spec/mongoid/errors/invalid_field_spec.rb +3 -3
  305. data/spec/mongoid/errors/invalid_find_spec.rb +3 -3
  306. data/spec/mongoid/errors/invalid_includes_spec.rb +3 -3
  307. data/spec/mongoid/errors/invalid_index_spec.rb +3 -3
  308. data/spec/mongoid/errors/invalid_options_spec.rb +3 -3
  309. data/spec/mongoid/errors/invalid_path_spec.rb +3 -3
  310. data/spec/mongoid/errors/invalid_scope_spec.rb +5 -5
  311. data/spec/mongoid/errors/invalid_set_polymorphic_relation_spec.rb +3 -3
  312. data/spec/mongoid/errors/invalid_storage_options_spec.rb +3 -3
  313. data/spec/mongoid/errors/invalid_time_spec.rb +3 -3
  314. data/spec/mongoid/errors/inverse_not_found_spec.rb +3 -3
  315. data/spec/mongoid/errors/mixed_relations_spec.rb +3 -3
  316. data/spec/mongoid/errors/mixed_session_configuration_spec.rb +3 -3
  317. data/spec/mongoid/errors/mongoid_error_spec.rb +8 -8
  318. data/spec/mongoid/errors/nested_attributes_metadata_not_found_spec.rb +3 -3
  319. data/spec/mongoid/errors/no_environment_spec.rb +3 -3
  320. data/spec/mongoid/errors/no_map_reduce_output_spec.rb +3 -3
  321. data/spec/mongoid/errors/no_metadata_spec.rb +3 -3
  322. data/spec/mongoid/errors/no_parent_spec.rb +3 -3
  323. data/spec/mongoid/errors/no_session_config_spec.rb +3 -3
  324. data/spec/mongoid/errors/no_session_database_spec.rb +3 -3
  325. data/spec/mongoid/errors/no_session_hosts_spec.rb +3 -3
  326. data/spec/mongoid/errors/no_sessions_config_spec.rb +3 -3
  327. data/spec/mongoid/errors/readonly_attribute_spec.rb +3 -3
  328. data/spec/mongoid/errors/readonly_document_spec.rb +29 -0
  329. data/spec/mongoid/errors/scope_overwrite_spec.rb +3 -3
  330. data/spec/mongoid/errors/too_many_nested_attribute_records_spec.rb +3 -3
  331. data/spec/mongoid/errors/unknown_attribute_spec.rb +5 -5
  332. data/spec/mongoid/errors/unsaved_document_spec.rb +3 -3
  333. data/spec/mongoid/errors/unsupported_javascript_spec.rb +3 -3
  334. data/spec/mongoid/errors/validations_spec.rb +7 -7
  335. data/spec/mongoid/extensions/array_spec.rb +61 -61
  336. data/spec/mongoid/extensions/big_decimal_spec.rb +11 -11
  337. data/spec/mongoid/extensions/binary_spec.rb +12 -12
  338. data/spec/mongoid/extensions/boolean_spec.rb +18 -18
  339. data/spec/mongoid/extensions/date_spec.rb +13 -13
  340. data/spec/mongoid/extensions/date_time_spec.rb +8 -8
  341. data/spec/mongoid/extensions/false_class_spec.rb +5 -5
  342. data/spec/mongoid/extensions/float_spec.rb +29 -15
  343. data/spec/mongoid/extensions/hash_spec.rb +29 -29
  344. data/spec/mongoid/extensions/integer_spec.rb +15 -15
  345. data/spec/mongoid/extensions/module_spec.rb +2 -2
  346. data/spec/mongoid/extensions/nil_class_spec.rb +1 -1
  347. data/spec/mongoid/extensions/object_id_spec.rb +134 -134
  348. data/spec/mongoid/extensions/object_spec.rb +26 -26
  349. data/spec/mongoid/extensions/range_spec.rb +61 -12
  350. data/spec/mongoid/extensions/regexp_spec.rb +4 -4
  351. data/spec/mongoid/extensions/set_spec.rb +4 -4
  352. data/spec/mongoid/extensions/string_spec.rb +35 -46
  353. data/spec/mongoid/extensions/symbol_spec.rb +9 -9
  354. data/spec/mongoid/extensions/time_spec.rb +49 -49
  355. data/spec/mongoid/extensions/time_with_zone_spec.rb +34 -34
  356. data/spec/mongoid/extensions/true_class_spec.rb +5 -5
  357. data/spec/mongoid/extensions_spec.rb +29 -0
  358. data/spec/mongoid/factory_spec.rb +15 -15
  359. data/spec/mongoid/fields/foreign_key_spec.rb +73 -66
  360. data/spec/mongoid/fields/internal/foreign_keys/array_spec.rb +15 -15
  361. data/spec/mongoid/fields/internal/foreign_keys/object_spec.rb +22 -22
  362. data/spec/mongoid/fields/localized_spec.rb +38 -23
  363. data/spec/mongoid/fields/standard_spec.rb +12 -12
  364. data/spec/mongoid/fields_spec.rb +263 -217
  365. data/spec/mongoid/findable_spec.rb +509 -0
  366. data/spec/mongoid/indexable/specification_spec.rb +102 -0
  367. data/spec/mongoid/{indexes_spec.rb → indexable_spec.rb} +171 -51
  368. data/spec/mongoid/{inspection_spec.rb → inspectable_spec.rb} +6 -14
  369. data/spec/mongoid/{callbacks_spec.rb → interceptable_spec.rb} +117 -116
  370. data/spec/mongoid/log_subscriber_spec.rb +75 -0
  371. data/spec/mongoid/loggable_spec.rb +1 -1
  372. data/spec/mongoid/{matchers → matchable}/all_spec.rb +4 -4
  373. data/spec/mongoid/{matchers → matchable}/and_spec.rb +11 -11
  374. data/spec/mongoid/{matchers → matchable}/default_spec.rb +15 -15
  375. data/spec/mongoid/{matchers → matchable}/exists_spec.rb +5 -5
  376. data/spec/mongoid/{matchers → matchable}/gt_spec.rb +9 -8
  377. data/spec/mongoid/{matchers → matchable}/gte_spec.rb +7 -7
  378. data/spec/mongoid/matchable/in_spec.rb +49 -0
  379. data/spec/mongoid/{matchers → matchable}/lt_spec.rb +7 -7
  380. data/spec/mongoid/{matchers → matchable}/lte_spec.rb +7 -7
  381. data/spec/mongoid/matchable/ne_spec.rb +46 -0
  382. data/spec/mongoid/matchable/nin_spec.rb +48 -0
  383. data/spec/mongoid/{matchers → matchable}/or_spec.rb +6 -6
  384. data/spec/mongoid/{matchers → matchable}/size_spec.rb +3 -3
  385. data/spec/mongoid/{matchers_spec.rb → matchable_spec.rb} +41 -41
  386. data/spec/mongoid/persistable/creatable_spec.rb +553 -0
  387. data/spec/mongoid/persistable/deletable_spec.rb +218 -0
  388. data/spec/mongoid/persistable/destroyable_spec.rb +192 -0
  389. data/spec/mongoid/persistable/incrementable_spec.rb +173 -0
  390. data/spec/mongoid/persistable/logical_spec.rb +143 -0
  391. data/spec/mongoid/persistable/poppable_spec.rb +115 -0
  392. data/spec/mongoid/persistable/pullable_spec.rb +228 -0
  393. data/spec/mongoid/persistable/pushable_spec.rb +258 -0
  394. data/spec/mongoid/persistable/renamable_spec.rb +135 -0
  395. data/spec/mongoid/persistable/savable_spec.rb +498 -0
  396. data/spec/mongoid/persistable/settable_spec.rb +162 -0
  397. data/spec/mongoid/persistable/unsettable_spec.rb +155 -0
  398. data/spec/mongoid/persistable/updatable_spec.rb +558 -0
  399. data/spec/mongoid/persistable/upsertable_spec.rb +106 -0
  400. data/spec/mongoid/persistable_spec.rb +206 -0
  401. data/spec/mongoid/{atomic/positionable_spec.rb → positional_spec.rb} +14 -19
  402. data/spec/mongoid/query_cache_spec.rb +263 -0
  403. data/spec/mongoid/railties/document_spec.rb +2 -2
  404. data/spec/mongoid/relations/accessors_spec.rb +53 -145
  405. data/spec/mongoid/relations/auto_save_spec.rb +37 -17
  406. data/spec/mongoid/relations/bindings/embedded/in_spec.rb +12 -12
  407. data/spec/mongoid/relations/bindings/embedded/many_spec.rb +3 -3
  408. data/spec/mongoid/relations/bindings/embedded/one_spec.rb +5 -5
  409. data/spec/mongoid/relations/bindings/referenced/in_spec.rb +26 -26
  410. data/spec/mongoid/relations/bindings/referenced/many_spec.rb +10 -10
  411. data/spec/mongoid/relations/bindings/referenced/many_to_many_spec.rb +19 -19
  412. data/spec/mongoid/relations/bindings/referenced/one_spec.rb +12 -12
  413. data/spec/mongoid/relations/builders/embedded/in_spec.rb +4 -4
  414. data/spec/mongoid/relations/builders/embedded/many_spec.rb +18 -18
  415. data/spec/mongoid/relations/builders/embedded/one_spec.rb +11 -11
  416. data/spec/mongoid/relations/builders/nested_attributes/many_spec.rb +12 -13
  417. data/spec/mongoid/relations/builders/nested_attributes/one_spec.rb +14 -14
  418. data/spec/mongoid/relations/builders/referenced/in_spec.rb +24 -35
  419. data/spec/mongoid/relations/builders/referenced/many_spec.rb +15 -15
  420. data/spec/mongoid/relations/builders/referenced/many_to_many_spec.rb +18 -18
  421. data/spec/mongoid/relations/builders/referenced/one_spec.rb +12 -25
  422. data/spec/mongoid/relations/builders_spec.rb +21 -21
  423. data/spec/mongoid/relations/cascading/delete_spec.rb +9 -9
  424. data/spec/mongoid/relations/cascading/destroy_spec.rb +6 -6
  425. data/spec/mongoid/relations/cascading/nullify_spec.rb +4 -4
  426. data/spec/mongoid/relations/cascading/restrict_spec.rb +7 -7
  427. data/spec/mongoid/relations/cascading_spec.rb +16 -16
  428. data/spec/mongoid/relations/constraint_spec.rb +8 -7
  429. data/spec/mongoid/relations/conversions_spec.rb +16 -14
  430. data/spec/mongoid/relations/counter_cache_spec.rb +85 -0
  431. data/spec/mongoid/relations/cyclic_spec.rb +18 -18
  432. data/spec/mongoid/relations/eager/belongs_to_spec.rb +154 -0
  433. data/spec/mongoid/relations/eager/has_and_belongs_to_many_spec.rb +117 -0
  434. data/spec/mongoid/relations/eager/has_many_spec.rb +207 -0
  435. data/spec/mongoid/relations/eager/has_one_spec.rb +163 -0
  436. data/spec/mongoid/relations/eager_spec.rb +228 -0
  437. data/spec/mongoid/relations/embedded/dirty_spec.rb +8 -8
  438. data/spec/mongoid/relations/embedded/in_spec.rb +56 -57
  439. data/spec/mongoid/relations/embedded/many_spec.rb +467 -372
  440. data/spec/mongoid/relations/embedded/one_spec.rb +108 -141
  441. data/spec/mongoid/relations/macros_spec.rb +108 -102
  442. data/spec/mongoid/relations/metadata_spec.rb +180 -255
  443. data/spec/mongoid/relations/options_spec.rb +1 -1
  444. data/spec/mongoid/relations/polymorphic_spec.rb +13 -17
  445. data/spec/mongoid/relations/proxy_spec.rb +2 -2
  446. data/spec/mongoid/relations/referenced/in_spec.rb +128 -303
  447. data/spec/mongoid/relations/referenced/many_spec.rb +587 -527
  448. data/spec/mongoid/relations/referenced/many_to_many_spec.rb +401 -424
  449. data/spec/mongoid/relations/referenced/one_spec.rb +149 -264
  450. data/spec/mongoid/relations/reflections_spec.rb +6 -6
  451. data/spec/mongoid/relations/synchronization_spec.rb +46 -50
  452. data/spec/mongoid/relations/targets/enumerable_spec.rb +118 -118
  453. data/spec/mongoid/relations/touchable_spec.rb +333 -0
  454. data/spec/mongoid/relations_spec.rb +16 -15
  455. data/spec/mongoid/{reloading_spec.rb → reloadable_spec.rb} +38 -55
  456. data/spec/mongoid/{scoping_spec.rb → scopable_spec.rb} +89 -164
  457. data/spec/mongoid/selectable_spec.rb +134 -0
  458. data/spec/mongoid/{serialization_spec.rb → serializable_spec.rb} +129 -82
  459. data/spec/mongoid/sessions/factory_spec.rb +49 -28
  460. data/spec/mongoid/sessions/mongo_uri_spec.rb +7 -7
  461. data/spec/mongoid/sessions/options_spec.rb +108 -0
  462. data/spec/mongoid/sessions_spec.rb +319 -178
  463. data/spec/mongoid/{sharding_spec.rb → shardable_spec.rb} +8 -8
  464. data/spec/mongoid/{state_spec.rb → stateful_spec.rb} +36 -11
  465. data/spec/mongoid/tasks/database_rake_spec.rb +285 -0
  466. data/spec/mongoid/tasks/database_spec.rb +160 -0
  467. data/spec/mongoid/threaded_spec.rb +17 -70
  468. data/spec/mongoid/timestamps/created/short_spec.rb +6 -6
  469. data/spec/mongoid/timestamps/created_spec.rb +5 -5
  470. data/spec/mongoid/timestamps/timeless_spec.rb +6 -6
  471. data/spec/mongoid/timestamps/updated/short_spec.rb +11 -11
  472. data/spec/mongoid/timestamps/updated_spec.rb +9 -13
  473. data/spec/mongoid/timestamps_spec.rb +9 -13
  474. data/spec/mongoid/{hierarchy_spec.rb → traversable_spec.rb} +19 -19
  475. data/spec/mongoid/{validations → validatable}/associated_spec.rb +45 -22
  476. data/spec/mongoid/{validations → validatable}/format_spec.rb +6 -6
  477. data/spec/mongoid/{validations → validatable}/length_spec.rb +14 -14
  478. data/spec/mongoid/{validations → validatable}/numericality_spec.rb +1 -1
  479. data/spec/mongoid/{validations → validatable}/presence_spec.rb +37 -44
  480. data/spec/mongoid/{validations → validatable}/uniqueness_spec.rb +184 -192
  481. data/spec/mongoid/{validations_spec.rb → validatable_spec.rb} +28 -28
  482. data/spec/mongoid_spec.rb +8 -8
  483. data/spec/rails/mongoid_spec.rb +19 -335
  484. data/spec/spec_helper.rb +31 -13
  485. metadata +303 -283
  486. data/lib/mongoid/atomic/positionable.rb +0 -73
  487. data/lib/mongoid/components.rb +0 -92
  488. data/lib/mongoid/config/inflections.rb +0 -6
  489. data/lib/mongoid/contextual/eager.rb +0 -158
  490. data/lib/mongoid/errors/versioning_not_on_root.rb +0 -23
  491. data/lib/mongoid/identity_map.rb +0 -163
  492. data/lib/mongoid/json.rb +0 -16
  493. data/lib/mongoid/matchers.rb +0 -32
  494. data/lib/mongoid/matchers/strategies.rb +0 -97
  495. data/lib/mongoid/multi_parameter_attributes.rb +0 -105
  496. data/lib/mongoid/nested_attributes.rb +0 -78
  497. data/lib/mongoid/observer.rb +0 -192
  498. data/lib/mongoid/paranoia.rb +0 -136
  499. data/lib/mongoid/persistence.rb +0 -357
  500. data/lib/mongoid/persistence/atomic.rb +0 -231
  501. data/lib/mongoid/persistence/atomic/add_to_set.rb +0 -47
  502. data/lib/mongoid/persistence/atomic/bit.rb +0 -35
  503. data/lib/mongoid/persistence/atomic/inc.rb +0 -45
  504. data/lib/mongoid/persistence/atomic/operation.rb +0 -154
  505. data/lib/mongoid/persistence/atomic/pop.rb +0 -32
  506. data/lib/mongoid/persistence/atomic/pull.rb +0 -32
  507. data/lib/mongoid/persistence/atomic/pull_all.rb +0 -32
  508. data/lib/mongoid/persistence/atomic/push.rb +0 -25
  509. data/lib/mongoid/persistence/atomic/push_all.rb +0 -25
  510. data/lib/mongoid/persistence/atomic/rename.rb +0 -30
  511. data/lib/mongoid/persistence/atomic/sets.rb +0 -28
  512. data/lib/mongoid/persistence/atomic/unset.rb +0 -27
  513. data/lib/mongoid/persistence/deletion.rb +0 -31
  514. data/lib/mongoid/persistence/insertion.rb +0 -38
  515. data/lib/mongoid/persistence/modification.rb +0 -35
  516. data/lib/mongoid/persistence/operations.rb +0 -214
  517. data/lib/mongoid/persistence/operations/embedded/insert.rb +0 -46
  518. data/lib/mongoid/persistence/operations/embedded/remove.rb +0 -43
  519. data/lib/mongoid/persistence/operations/insert.rb +0 -34
  520. data/lib/mongoid/persistence/operations/remove.rb +0 -33
  521. data/lib/mongoid/persistence/operations/update.rb +0 -59
  522. data/lib/mongoid/persistence/operations/upsert.rb +0 -28
  523. data/lib/mongoid/persistence/upsertion.rb +0 -31
  524. data/lib/mongoid/unit_of_work.rb +0 -61
  525. data/lib/mongoid/versioning.rb +0 -217
  526. data/lib/rack/mongoid.rb +0 -2
  527. data/lib/rack/mongoid/middleware/identity_map.rb +0 -39
  528. data/lib/rails/generators/mongoid/observer/observer_generator.rb +0 -17
  529. data/lib/rails/generators/mongoid/observer/templates/observer.rb.tt +0 -4
  530. data/spec/app/models/actor_observer.rb +0 -15
  531. data/spec/app/models/callback_recorder.rb +0 -25
  532. data/spec/app/models/paranoid_phone.rb +0 -25
  533. data/spec/app/models/paranoid_post.rb +0 -36
  534. data/spec/app/models/phone_observer.rb +0 -6
  535. data/spec/mongoid/attributes/processing_spec.rb +0 -149
  536. data/spec/mongoid/criterion/destructive_spec.rb +0 -101
  537. data/spec/mongoid/criterion/modifiable_spec.rb +0 -409
  538. data/spec/mongoid/criterion/modification_spec.rb +0 -402
  539. data/spec/mongoid/errors/versioning_not_on_root_spec.rb +0 -29
  540. data/spec/mongoid/finders_spec.rb +0 -321
  541. data/spec/mongoid/identity_map_spec.rb +0 -564
  542. data/spec/mongoid/json_spec.rb +0 -33
  543. data/spec/mongoid/matchers/in_spec.rb +0 -25
  544. data/spec/mongoid/matchers/ne_spec.rb +0 -25
  545. data/spec/mongoid/matchers/nin_spec.rb +0 -25
  546. data/spec/mongoid/multi_parameter_attributes_spec.rb +0 -128
  547. data/spec/mongoid/observer_spec.rb +0 -290
  548. data/spec/mongoid/paranoia_spec.rb +0 -759
  549. data/spec/mongoid/persistence/atomic/add_to_set_spec.rb +0 -262
  550. data/spec/mongoid/persistence/atomic/bit_spec.rb +0 -88
  551. data/spec/mongoid/persistence/atomic/inc_spec.rb +0 -133
  552. data/spec/mongoid/persistence/atomic/pop_spec.rb +0 -111
  553. data/spec/mongoid/persistence/atomic/pull_all_spec.rb +0 -77
  554. data/spec/mongoid/persistence/atomic/pull_spec.rb +0 -80
  555. data/spec/mongoid/persistence/atomic/push_all_spec.rb +0 -77
  556. data/spec/mongoid/persistence/atomic/push_spec.rb +0 -77
  557. data/spec/mongoid/persistence/atomic/rename_spec.rb +0 -42
  558. data/spec/mongoid/persistence/atomic/sets_spec.rb +0 -154
  559. data/spec/mongoid/persistence/atomic/unset_spec.rb +0 -65
  560. data/spec/mongoid/persistence/atomic_spec.rb +0 -216
  561. data/spec/mongoid/persistence/operations/embedded/insert_spec.rb +0 -191
  562. data/spec/mongoid/persistence/operations/embedded/remove_spec.rb +0 -8
  563. data/spec/mongoid/persistence/operations/insert_spec.rb +0 -149
  564. data/spec/mongoid/persistence/operations/remove_spec.rb +0 -113
  565. data/spec/mongoid/persistence/operations/update_spec.rb +0 -141
  566. data/spec/mongoid/persistence/operations/upsert_spec.rb +0 -59
  567. data/spec/mongoid/persistence/operations_spec.rb +0 -313
  568. data/spec/mongoid/persistence_spec.rb +0 -2279
  569. data/spec/mongoid/unit_of_work_spec.rb +0 -196
  570. data/spec/mongoid/versioning_spec.rb +0 -540
  571. data/spec/rack/mongoid/middleware/identity_map_spec.rb +0 -72
@@ -19,7 +19,7 @@ describe Mongoid::Extensions::Module do
19
19
  end
20
20
 
21
21
  it "redefines the existing method" do
22
- Smoochy.new.sing.should eq("singing again")
22
+ expect(Smoochy.new.sing).to eq("singing again")
23
23
  end
24
24
  end
25
25
 
@@ -35,7 +35,7 @@ describe Mongoid::Extensions::Module do
35
35
  end
36
36
 
37
37
  it "redefines the existing method" do
38
- Rhino.new.sing.should eq("singing")
38
+ expect(Rhino.new.sing).to eq("singing")
39
39
  end
40
40
  end
41
41
  end
@@ -5,7 +5,7 @@ describe Mongoid::Extensions::NilClass do
5
5
  describe "#collectionize" do
6
6
 
7
7
  it "returns ''" do
8
- nil.collectionize.should be_empty
8
+ expect(nil.collectionize).to be_empty
9
9
  end
10
10
  end
11
11
  end
@@ -3,7 +3,7 @@ require "spec_helper"
3
3
  describe Mongoid::Extensions::ObjectId do
4
4
 
5
5
  let(:object_id) do
6
- Moped::BSON::ObjectId.new
6
+ BSON::ObjectId.new
7
7
  end
8
8
 
9
9
  let(:composite_key) do
@@ -13,11 +13,11 @@ describe Mongoid::Extensions::ObjectId do
13
13
  describe "#__evolve_object_id__" do
14
14
 
15
15
  it "returns self" do
16
- object_id.__evolve_object_id__.should eq(object_id)
16
+ expect(object_id.__evolve_object_id__).to eq(object_id)
17
17
  end
18
18
 
19
19
  it "returns the same instance" do
20
- object_id.__evolve_object_id__.should equal(object_id)
20
+ expect(object_id.__evolve_object_id__).to equal(object_id)
21
21
  end
22
22
  end
23
23
 
@@ -28,26 +28,26 @@ describe Mongoid::Extensions::ObjectId do
28
28
  context "when provided a single object id" do
29
29
 
30
30
  let(:evolved) do
31
- Moped::BSON::ObjectId.evolve(object_id)
31
+ BSON::ObjectId.evolve(object_id)
32
32
  end
33
33
 
34
34
  it "returns the object id" do
35
- evolved.should eq(object_id)
35
+ expect(evolved).to eq(object_id)
36
36
  end
37
37
  end
38
38
 
39
39
  context "when provided an array of object ids" do
40
40
 
41
41
  let(:other_id) do
42
- Moped::BSON::ObjectId.new
42
+ BSON::ObjectId.new
43
43
  end
44
44
 
45
45
  let(:evolved) do
46
- Moped::BSON::ObjectId.evolve([ object_id, other_id ])
46
+ BSON::ObjectId.evolve([ object_id, other_id ])
47
47
  end
48
48
 
49
49
  it "returns the array of object ids" do
50
- evolved.should eq([ object_id, other_id ])
50
+ expect(evolved).to eq([ object_id, other_id ])
51
51
  end
52
52
  end
53
53
 
@@ -56,18 +56,18 @@ describe Mongoid::Extensions::ObjectId do
56
56
  context "when the string is a valid object id" do
57
57
 
58
58
  let(:evolved) do
59
- Moped::BSON::ObjectId.evolve(object_id.to_s)
59
+ BSON::ObjectId.evolve(object_id.to_s)
60
60
  end
61
61
 
62
62
  it "evolves to an object id" do
63
- evolved.should eq(object_id)
63
+ expect(evolved).to eq(object_id)
64
64
  end
65
65
  end
66
66
 
67
67
  context "when the string is not a valid object id" do
68
68
 
69
69
  it "returns the key" do
70
- Moped::BSON::ObjectId.evolve(composite_key).should eq(
70
+ expect(BSON::ObjectId.evolve(composite_key)).to eq(
71
71
  composite_key
72
72
  )
73
73
  end
@@ -76,11 +76,11 @@ describe Mongoid::Extensions::ObjectId do
76
76
  context "when the string is empty" do
77
77
 
78
78
  let(:evolved) do
79
- Moped::BSON::ObjectId.evolve("")
79
+ BSON::ObjectId.evolve("")
80
80
  end
81
81
 
82
82
  it "evolves to an empty string" do
83
- evolved.should be_empty
83
+ expect(evolved).to be_empty
84
84
  end
85
85
  end
86
86
  end
@@ -90,22 +90,22 @@ describe Mongoid::Extensions::ObjectId do
90
90
  context "when array key of nils" do
91
91
 
92
92
  let(:evolved) do
93
- Moped::BSON::ObjectId.evolve([ nil, nil ])
93
+ BSON::ObjectId.evolve([ nil, nil ])
94
94
  end
95
95
 
96
96
  it "returns the array with nils" do
97
- evolved.should eq([ nil, nil ])
97
+ expect(evolved).to eq([ nil, nil ])
98
98
  end
99
99
  end
100
100
 
101
101
  context "when the array key is empty strings" do
102
102
 
103
103
  let(:evolved) do
104
- Moped::BSON::ObjectId.evolve([ "", "" ])
104
+ BSON::ObjectId.evolve([ "", "" ])
105
105
  end
106
106
 
107
107
  it "returns the array with empty strings" do
108
- evolved.should eq([ "", "" ])
108
+ expect(evolved).to eq([ "", "" ])
109
109
  end
110
110
  end
111
111
 
@@ -114,15 +114,15 @@ describe Mongoid::Extensions::ObjectId do
114
114
  context "when the strings are valid object ids" do
115
115
 
116
116
  let(:other_id) do
117
- Moped::BSON::ObjectId.new
117
+ BSON::ObjectId.new
118
118
  end
119
119
 
120
120
  let(:evolved) do
121
- Moped::BSON::ObjectId.evolve([ object_id.to_s, other_id.to_s ])
121
+ BSON::ObjectId.evolve([ object_id.to_s, other_id.to_s ])
122
122
  end
123
123
 
124
124
  it "evolves to an array of object ids" do
125
- evolved.should eq([ object_id, other_id ])
125
+ expect(evolved).to eq([ object_id, other_id ])
126
126
  end
127
127
  end
128
128
 
@@ -133,11 +133,11 @@ describe Mongoid::Extensions::ObjectId do
133
133
  end
134
134
 
135
135
  let(:evolved) do
136
- Moped::BSON::ObjectId.evolve([ composite_key, other_key ])
136
+ BSON::ObjectId.evolve([ composite_key, other_key ])
137
137
  end
138
138
 
139
139
  it "returns the key" do
140
- Moped::BSON::ObjectId.evolve(composite_key).should eq(
140
+ expect(BSON::ObjectId.evolve(composite_key)).to eq(
141
141
  composite_key
142
142
  )
143
143
  end
@@ -156,18 +156,18 @@ describe Mongoid::Extensions::ObjectId do
156
156
  end
157
157
 
158
158
  let(:evolved) do
159
- Moped::BSON::ObjectId.evolve(hash)
159
+ BSON::ObjectId.evolve(hash)
160
160
  end
161
161
 
162
162
  it "returns the hash" do
163
- evolved.should eq(hash)
163
+ expect(evolved).to eq(hash)
164
164
  end
165
165
  end
166
166
 
167
167
  context "when the value is an array of object ids" do
168
168
 
169
169
  let(:other_id) do
170
- Moped::BSON::ObjectId.new
170
+ BSON::ObjectId.new
171
171
  end
172
172
 
173
173
  let(:hash) do
@@ -175,11 +175,11 @@ describe Mongoid::Extensions::ObjectId do
175
175
  end
176
176
 
177
177
  let(:evolved) do
178
- Moped::BSON::ObjectId.evolve(hash)
178
+ BSON::ObjectId.evolve(hash)
179
179
  end
180
180
 
181
181
  it "returns the hash" do
182
- evolved.should eq(hash)
182
+ expect(evolved).to eq(hash)
183
183
  end
184
184
  end
185
185
 
@@ -190,18 +190,18 @@ describe Mongoid::Extensions::ObjectId do
190
190
  end
191
191
 
192
192
  let(:evolved) do
193
- Moped::BSON::ObjectId.evolve(hash)
193
+ BSON::ObjectId.evolve(hash)
194
194
  end
195
195
 
196
196
  it "returns the hash with evolved value" do
197
- evolved.should eq({ _id: object_id })
197
+ expect(evolved).to eq({ _id: object_id })
198
198
  end
199
199
  end
200
200
 
201
201
  context "when the value is an array of strings" do
202
202
 
203
203
  let(:other_id) do
204
- Moped::BSON::ObjectId.new
204
+ BSON::ObjectId.new
205
205
  end
206
206
 
207
207
  let(:hash) do
@@ -209,11 +209,11 @@ describe Mongoid::Extensions::ObjectId do
209
209
  end
210
210
 
211
211
  let(:evolved) do
212
- Moped::BSON::ObjectId.evolve(hash)
212
+ BSON::ObjectId.evolve(hash)
213
213
  end
214
214
 
215
215
  it "returns the hash with evolved values" do
216
- evolved.should eq({ _id: [ object_id, other_id ] })
216
+ expect(evolved).to eq({ _id: [ object_id, other_id ] })
217
217
  end
218
218
  end
219
219
  end
@@ -227,18 +227,18 @@ describe Mongoid::Extensions::ObjectId do
227
227
  end
228
228
 
229
229
  let(:evolved) do
230
- Moped::BSON::ObjectId.evolve(hash)
230
+ BSON::ObjectId.evolve(hash)
231
231
  end
232
232
 
233
233
  it "returns the hash" do
234
- evolved.should eq(hash)
234
+ expect(evolved).to eq(hash)
235
235
  end
236
236
  end
237
237
 
238
238
  context "when the value is an array of object ids" do
239
239
 
240
240
  let(:other_id) do
241
- Moped::BSON::ObjectId.new
241
+ BSON::ObjectId.new
242
242
  end
243
243
 
244
244
  let(:hash) do
@@ -246,11 +246,11 @@ describe Mongoid::Extensions::ObjectId do
246
246
  end
247
247
 
248
248
  let(:evolved) do
249
- Moped::BSON::ObjectId.evolve(hash)
249
+ BSON::ObjectId.evolve(hash)
250
250
  end
251
251
 
252
252
  it "returns the hash" do
253
- evolved.should eq(hash)
253
+ expect(evolved).to eq(hash)
254
254
  end
255
255
  end
256
256
 
@@ -261,18 +261,18 @@ describe Mongoid::Extensions::ObjectId do
261
261
  end
262
262
 
263
263
  let(:evolved) do
264
- Moped::BSON::ObjectId.evolve(hash)
264
+ BSON::ObjectId.evolve(hash)
265
265
  end
266
266
 
267
267
  it "returns the hash with evolved value" do
268
- evolved.should eq({ id: object_id })
268
+ expect(evolved).to eq({ id: object_id })
269
269
  end
270
270
  end
271
271
 
272
272
  context "when the value is an array of strings" do
273
273
 
274
274
  let(:other_id) do
275
- Moped::BSON::ObjectId.new
275
+ BSON::ObjectId.new
276
276
  end
277
277
 
278
278
  let(:hash) do
@@ -280,11 +280,11 @@ describe Mongoid::Extensions::ObjectId do
280
280
  end
281
281
 
282
282
  let(:evolved) do
283
- Moped::BSON::ObjectId.evolve(hash)
283
+ BSON::ObjectId.evolve(hash)
284
284
  end
285
285
 
286
286
  it "returns the hash with evolved values" do
287
- evolved.should eq({ id: [ object_id, other_id ] })
287
+ expect(evolved).to eq({ id: [ object_id, other_id ] })
288
288
  end
289
289
  end
290
290
  end
@@ -298,11 +298,11 @@ describe Mongoid::Extensions::ObjectId do
298
298
  end
299
299
 
300
300
  let(:evolved) do
301
- Moped::BSON::ObjectId.evolve(hash)
301
+ BSON::ObjectId.evolve(hash)
302
302
  end
303
303
 
304
304
  it "returns the hash" do
305
- evolved.should eq(hash)
305
+ expect(evolved).to eq(hash)
306
306
  end
307
307
  end
308
308
 
@@ -313,11 +313,11 @@ describe Mongoid::Extensions::ObjectId do
313
313
  end
314
314
 
315
315
  let(:evolved) do
316
- Moped::BSON::ObjectId.evolve(hash)
316
+ BSON::ObjectId.evolve(hash)
317
317
  end
318
318
 
319
319
  it "returns the hash" do
320
- evolved.should eq(hash)
320
+ expect(evolved).to eq(hash)
321
321
  end
322
322
  end
323
323
  end
@@ -332,26 +332,26 @@ describe Mongoid::Extensions::ObjectId do
332
332
  context "when provided a single object id" do
333
333
 
334
334
  let(:mongoized) do
335
- Moped::BSON::ObjectId.mongoize(object_id)
335
+ BSON::ObjectId.mongoize(object_id)
336
336
  end
337
337
 
338
338
  it "returns the object id" do
339
- mongoized.should eq(object_id)
339
+ expect(mongoized).to eq(object_id)
340
340
  end
341
341
  end
342
342
 
343
343
  context "when provided an array of object ids" do
344
344
 
345
345
  let(:other_id) do
346
- Moped::BSON::ObjectId.new
346
+ BSON::ObjectId.new
347
347
  end
348
348
 
349
349
  let(:mongoized) do
350
- Moped::BSON::ObjectId.mongoize([ object_id, other_id ])
350
+ BSON::ObjectId.mongoize([ object_id, other_id ])
351
351
  end
352
352
 
353
353
  it "returns the array of object ids" do
354
- mongoized.should eq([ object_id, other_id ])
354
+ expect(mongoized).to eq([ object_id, other_id ])
355
355
  end
356
356
  end
357
357
 
@@ -360,18 +360,18 @@ describe Mongoid::Extensions::ObjectId do
360
360
  context "when the string is a valid object id" do
361
361
 
362
362
  let(:mongoized) do
363
- Moped::BSON::ObjectId.mongoize(object_id.to_s)
363
+ BSON::ObjectId.mongoize(object_id.to_s)
364
364
  end
365
365
 
366
366
  it "mongoizes to an object id" do
367
- mongoized.should eq(object_id)
367
+ expect(mongoized).to eq(object_id)
368
368
  end
369
369
  end
370
370
 
371
371
  context "when the string is not a valid object id" do
372
372
 
373
373
  it "returns the key" do
374
- Moped::BSON::ObjectId.mongoize(composite_key).should eq(
374
+ expect(BSON::ObjectId.mongoize(composite_key)).to eq(
375
375
  composite_key
376
376
  )
377
377
  end
@@ -380,11 +380,11 @@ describe Mongoid::Extensions::ObjectId do
380
380
  context "when the string is empty" do
381
381
 
382
382
  let(:mongoized) do
383
- Moped::BSON::ObjectId.mongoize("")
383
+ BSON::ObjectId.mongoize("")
384
384
  end
385
385
 
386
386
  it "mongoizes to nil" do
387
- mongoized.should be_nil
387
+ expect(mongoized).to be_nil
388
388
  end
389
389
  end
390
390
  end
@@ -394,22 +394,22 @@ describe Mongoid::Extensions::ObjectId do
394
394
  context "when array key of nils" do
395
395
 
396
396
  let(:mongoized) do
397
- Moped::BSON::ObjectId.mongoize([ nil, nil ])
397
+ BSON::ObjectId.mongoize([ nil, nil ])
398
398
  end
399
399
 
400
400
  it "returns an empty array" do
401
- mongoized.should be_empty
401
+ expect(mongoized).to be_empty
402
402
  end
403
403
  end
404
404
 
405
405
  context "when the array key is empty strings" do
406
406
 
407
407
  let(:mongoized) do
408
- Moped::BSON::ObjectId.mongoize([ "", "" ])
408
+ BSON::ObjectId.mongoize([ "", "" ])
409
409
  end
410
410
 
411
411
  it "returns an empty array" do
412
- mongoized.should be_empty
412
+ expect(mongoized).to be_empty
413
413
  end
414
414
  end
415
415
 
@@ -418,15 +418,15 @@ describe Mongoid::Extensions::ObjectId do
418
418
  context "when the strings are valid object ids" do
419
419
 
420
420
  let(:other_id) do
421
- Moped::BSON::ObjectId.new
421
+ BSON::ObjectId.new
422
422
  end
423
423
 
424
424
  let(:mongoized) do
425
- Moped::BSON::ObjectId.mongoize([ object_id.to_s, other_id.to_s ])
425
+ BSON::ObjectId.mongoize([ object_id.to_s, other_id.to_s ])
426
426
  end
427
427
 
428
428
  it "mongoizes to an array of object ids" do
429
- mongoized.should eq([ object_id, other_id ])
429
+ expect(mongoized).to eq([ object_id, other_id ])
430
430
  end
431
431
  end
432
432
 
@@ -437,11 +437,11 @@ describe Mongoid::Extensions::ObjectId do
437
437
  end
438
438
 
439
439
  let(:mongoized) do
440
- Moped::BSON::ObjectId.mongoize([ composite_key, other_key ])
440
+ BSON::ObjectId.mongoize([ composite_key, other_key ])
441
441
  end
442
442
 
443
443
  it "returns the key" do
444
- Moped::BSON::ObjectId.mongoize(composite_key).should eq(
444
+ expect(BSON::ObjectId.mongoize(composite_key)).to eq(
445
445
  composite_key
446
446
  )
447
447
  end
@@ -460,18 +460,18 @@ describe Mongoid::Extensions::ObjectId do
460
460
  end
461
461
 
462
462
  let(:mongoized) do
463
- Moped::BSON::ObjectId.mongoize(hash)
463
+ BSON::ObjectId.mongoize(hash)
464
464
  end
465
465
 
466
466
  it "returns the hash" do
467
- mongoized.should eq(hash)
467
+ expect(mongoized).to eq(hash)
468
468
  end
469
469
  end
470
470
 
471
471
  context "when the value is an array of object ids" do
472
472
 
473
473
  let(:other_id) do
474
- Moped::BSON::ObjectId.new
474
+ BSON::ObjectId.new
475
475
  end
476
476
 
477
477
  let(:hash) do
@@ -479,11 +479,11 @@ describe Mongoid::Extensions::ObjectId do
479
479
  end
480
480
 
481
481
  let(:mongoized) do
482
- Moped::BSON::ObjectId.mongoize(hash)
482
+ BSON::ObjectId.mongoize(hash)
483
483
  end
484
484
 
485
485
  it "returns the hash" do
486
- mongoized.should eq(hash)
486
+ expect(mongoized).to eq(hash)
487
487
  end
488
488
  end
489
489
 
@@ -494,18 +494,18 @@ describe Mongoid::Extensions::ObjectId do
494
494
  end
495
495
 
496
496
  let(:mongoized) do
497
- Moped::BSON::ObjectId.mongoize(hash)
497
+ BSON::ObjectId.mongoize(hash)
498
498
  end
499
499
 
500
500
  it "returns the hash with mongoized value" do
501
- mongoized.should eq({ _id: object_id })
501
+ expect(mongoized).to eq({ _id: object_id })
502
502
  end
503
503
  end
504
504
 
505
505
  context "when the value is an array of strings" do
506
506
 
507
507
  let(:other_id) do
508
- Moped::BSON::ObjectId.new
508
+ BSON::ObjectId.new
509
509
  end
510
510
 
511
511
  let(:hash) do
@@ -513,11 +513,11 @@ describe Mongoid::Extensions::ObjectId do
513
513
  end
514
514
 
515
515
  let(:mongoized) do
516
- Moped::BSON::ObjectId.mongoize(hash)
516
+ BSON::ObjectId.mongoize(hash)
517
517
  end
518
518
 
519
519
  it "returns the hash with mongoized values" do
520
- mongoized.should eq({ _id: [ object_id, other_id ] })
520
+ expect(mongoized).to eq({ _id: [ object_id, other_id ] })
521
521
  end
522
522
  end
523
523
  end
@@ -531,18 +531,18 @@ describe Mongoid::Extensions::ObjectId do
531
531
  end
532
532
 
533
533
  let(:mongoized) do
534
- Moped::BSON::ObjectId.mongoize(hash)
534
+ BSON::ObjectId.mongoize(hash)
535
535
  end
536
536
 
537
537
  it "returns the hash" do
538
- mongoized.should eq(hash)
538
+ expect(mongoized).to eq(hash)
539
539
  end
540
540
  end
541
541
 
542
542
  context "when the value is an array of object ids" do
543
543
 
544
544
  let(:other_id) do
545
- Moped::BSON::ObjectId.new
545
+ BSON::ObjectId.new
546
546
  end
547
547
 
548
548
  let(:hash) do
@@ -550,11 +550,11 @@ describe Mongoid::Extensions::ObjectId do
550
550
  end
551
551
 
552
552
  let(:mongoized) do
553
- Moped::BSON::ObjectId.mongoize(hash)
553
+ BSON::ObjectId.mongoize(hash)
554
554
  end
555
555
 
556
556
  it "returns the hash" do
557
- mongoized.should eq(hash)
557
+ expect(mongoized).to eq(hash)
558
558
  end
559
559
  end
560
560
 
@@ -565,18 +565,18 @@ describe Mongoid::Extensions::ObjectId do
565
565
  end
566
566
 
567
567
  let(:mongoized) do
568
- Moped::BSON::ObjectId.mongoize(hash)
568
+ BSON::ObjectId.mongoize(hash)
569
569
  end
570
570
 
571
571
  it "returns the hash with mongoized value" do
572
- mongoized.should eq({ id: object_id })
572
+ expect(mongoized).to eq({ id: object_id })
573
573
  end
574
574
  end
575
575
 
576
576
  context "when the value is an array of strings" do
577
577
 
578
578
  let(:other_id) do
579
- Moped::BSON::ObjectId.new
579
+ BSON::ObjectId.new
580
580
  end
581
581
 
582
582
  let(:hash) do
@@ -584,11 +584,11 @@ describe Mongoid::Extensions::ObjectId do
584
584
  end
585
585
 
586
586
  let(:mongoized) do
587
- Moped::BSON::ObjectId.mongoize(hash)
587
+ BSON::ObjectId.mongoize(hash)
588
588
  end
589
589
 
590
590
  it "returns the hash with mongoized values" do
591
- mongoized.should eq({ id: [ object_id, other_id ] })
591
+ expect(mongoized).to eq({ id: [ object_id, other_id ] })
592
592
  end
593
593
  end
594
594
  end
@@ -602,11 +602,11 @@ describe Mongoid::Extensions::ObjectId do
602
602
  end
603
603
 
604
604
  let(:mongoized) do
605
- Moped::BSON::ObjectId.mongoize(hash)
605
+ BSON::ObjectId.mongoize(hash)
606
606
  end
607
607
 
608
608
  it "returns the hash" do
609
- mongoized.should eq(hash)
609
+ expect(mongoized).to eq(hash)
610
610
  end
611
611
  end
612
612
 
@@ -617,11 +617,11 @@ describe Mongoid::Extensions::ObjectId do
617
617
  end
618
618
 
619
619
  let(:mongoized) do
620
- Moped::BSON::ObjectId.mongoize(hash)
620
+ BSON::ObjectId.mongoize(hash)
621
621
  end
622
622
 
623
623
  it "returns the hash" do
624
- mongoized.should eq(hash)
624
+ expect(mongoized).to eq(hash)
625
625
  end
626
626
  end
627
627
  end
@@ -636,26 +636,26 @@ describe Mongoid::Extensions::ObjectId do
636
636
  context "when provided a single object id" do
637
637
 
638
638
  let(:mongoized) do
639
- Moped::BSON::ObjectId.mongoize(object_id)
639
+ BSON::ObjectId.mongoize(object_id)
640
640
  end
641
641
 
642
642
  it "returns the object id" do
643
- mongoized.should eq(object_id)
643
+ expect(mongoized).to eq(object_id)
644
644
  end
645
645
  end
646
646
 
647
647
  context "when provided an array of object ids" do
648
648
 
649
649
  let(:other_id) do
650
- Moped::BSON::ObjectId.new
650
+ BSON::ObjectId.new
651
651
  end
652
652
 
653
653
  let(:mongoized) do
654
- Moped::BSON::ObjectId.mongoize([ object_id, other_id ])
654
+ BSON::ObjectId.mongoize([ object_id, other_id ])
655
655
  end
656
656
 
657
657
  it "returns the array of object ids" do
658
- mongoized.should eq([ object_id, other_id ])
658
+ expect(mongoized).to eq([ object_id, other_id ])
659
659
  end
660
660
  end
661
661
 
@@ -664,18 +664,18 @@ describe Mongoid::Extensions::ObjectId do
664
664
  context "when the string is a valid object id" do
665
665
 
666
666
  let(:mongoized) do
667
- Moped::BSON::ObjectId.mongoize(object_id.to_s)
667
+ BSON::ObjectId.mongoize(object_id.to_s)
668
668
  end
669
669
 
670
670
  it "mongoizes to an object id" do
671
- mongoized.should eq(object_id)
671
+ expect(mongoized).to eq(object_id)
672
672
  end
673
673
  end
674
674
 
675
675
  context "when the string is not a valid object id" do
676
676
 
677
677
  it "returns the key" do
678
- Moped::BSON::ObjectId.mongoize(composite_key).should eq(
678
+ expect(BSON::ObjectId.mongoize(composite_key)).to eq(
679
679
  composite_key
680
680
  )
681
681
  end
@@ -684,11 +684,11 @@ describe Mongoid::Extensions::ObjectId do
684
684
  context "when the string is empty" do
685
685
 
686
686
  let(:mongoized) do
687
- Moped::BSON::ObjectId.mongoize("")
687
+ BSON::ObjectId.mongoize("")
688
688
  end
689
689
 
690
690
  it "mongoizes to nil" do
691
- mongoized.should be_nil
691
+ expect(mongoized).to be_nil
692
692
  end
693
693
  end
694
694
  end
@@ -698,22 +698,22 @@ describe Mongoid::Extensions::ObjectId do
698
698
  context "when array key of nils" do
699
699
 
700
700
  let(:mongoized) do
701
- Moped::BSON::ObjectId.mongoize([ nil, nil ])
701
+ BSON::ObjectId.mongoize([ nil, nil ])
702
702
  end
703
703
 
704
704
  it "returns an empty array" do
705
- mongoized.should be_empty
705
+ expect(mongoized).to be_empty
706
706
  end
707
707
  end
708
708
 
709
709
  context "when the array key is empty strings" do
710
710
 
711
711
  let(:mongoized) do
712
- Moped::BSON::ObjectId.mongoize([ "", "" ])
712
+ BSON::ObjectId.mongoize([ "", "" ])
713
713
  end
714
714
 
715
715
  it "returns an empty array" do
716
- mongoized.should be_empty
716
+ expect(mongoized).to be_empty
717
717
  end
718
718
  end
719
719
 
@@ -722,15 +722,15 @@ describe Mongoid::Extensions::ObjectId do
722
722
  context "when the strings are valid object ids" do
723
723
 
724
724
  let(:other_id) do
725
- Moped::BSON::ObjectId.new
725
+ BSON::ObjectId.new
726
726
  end
727
727
 
728
728
  let(:mongoized) do
729
- Moped::BSON::ObjectId.mongoize([ object_id.to_s, other_id.to_s ])
729
+ BSON::ObjectId.mongoize([ object_id.to_s, other_id.to_s ])
730
730
  end
731
731
 
732
732
  it "mongoizes to an array of object ids" do
733
- mongoized.should eq([ object_id, other_id ])
733
+ expect(mongoized).to eq([ object_id, other_id ])
734
734
  end
735
735
  end
736
736
 
@@ -741,11 +741,11 @@ describe Mongoid::Extensions::ObjectId do
741
741
  end
742
742
 
743
743
  let(:mongoized) do
744
- Moped::BSON::ObjectId.mongoize([ composite_key, other_key ])
744
+ BSON::ObjectId.mongoize([ composite_key, other_key ])
745
745
  end
746
746
 
747
747
  it "returns the key" do
748
- Moped::BSON::ObjectId.mongoize(composite_key).should eq(
748
+ expect(BSON::ObjectId.mongoize(composite_key)).to eq(
749
749
  composite_key
750
750
  )
751
751
  end
@@ -764,18 +764,18 @@ describe Mongoid::Extensions::ObjectId do
764
764
  end
765
765
 
766
766
  let(:mongoized) do
767
- Moped::BSON::ObjectId.mongoize(hash)
767
+ BSON::ObjectId.mongoize(hash)
768
768
  end
769
769
 
770
770
  it "returns the hash" do
771
- mongoized.should eq(hash)
771
+ expect(mongoized).to eq(hash)
772
772
  end
773
773
  end
774
774
 
775
775
  context "when the value is an array of object ids" do
776
776
 
777
777
  let(:other_id) do
778
- Moped::BSON::ObjectId.new
778
+ BSON::ObjectId.new
779
779
  end
780
780
 
781
781
  let(:hash) do
@@ -783,11 +783,11 @@ describe Mongoid::Extensions::ObjectId do
783
783
  end
784
784
 
785
785
  let(:mongoized) do
786
- Moped::BSON::ObjectId.mongoize(hash)
786
+ BSON::ObjectId.mongoize(hash)
787
787
  end
788
788
 
789
789
  it "returns the hash" do
790
- mongoized.should eq(hash)
790
+ expect(mongoized).to eq(hash)
791
791
  end
792
792
  end
793
793
 
@@ -798,18 +798,18 @@ describe Mongoid::Extensions::ObjectId do
798
798
  end
799
799
 
800
800
  let(:mongoized) do
801
- Moped::BSON::ObjectId.mongoize(hash)
801
+ BSON::ObjectId.mongoize(hash)
802
802
  end
803
803
 
804
804
  it "returns the hash with mongoized value" do
805
- mongoized.should eq({ _id: object_id })
805
+ expect(mongoized).to eq({ _id: object_id })
806
806
  end
807
807
  end
808
808
 
809
809
  context "when the value is an array of strings" do
810
810
 
811
811
  let(:other_id) do
812
- Moped::BSON::ObjectId.new
812
+ BSON::ObjectId.new
813
813
  end
814
814
 
815
815
  let(:hash) do
@@ -817,11 +817,11 @@ describe Mongoid::Extensions::ObjectId do
817
817
  end
818
818
 
819
819
  let(:mongoized) do
820
- Moped::BSON::ObjectId.mongoize(hash)
820
+ BSON::ObjectId.mongoize(hash)
821
821
  end
822
822
 
823
823
  it "returns the hash with mongoized values" do
824
- mongoized.should eq({ _id: [ object_id, other_id ] })
824
+ expect(mongoized).to eq({ _id: [ object_id, other_id ] })
825
825
  end
826
826
  end
827
827
  end
@@ -835,18 +835,18 @@ describe Mongoid::Extensions::ObjectId do
835
835
  end
836
836
 
837
837
  let(:mongoized) do
838
- Moped::BSON::ObjectId.mongoize(hash)
838
+ BSON::ObjectId.mongoize(hash)
839
839
  end
840
840
 
841
841
  it "returns the hash" do
842
- mongoized.should eq(hash)
842
+ expect(mongoized).to eq(hash)
843
843
  end
844
844
  end
845
845
 
846
846
  context "when the value is an array of object ids" do
847
847
 
848
848
  let(:other_id) do
849
- Moped::BSON::ObjectId.new
849
+ BSON::ObjectId.new
850
850
  end
851
851
 
852
852
  let(:hash) do
@@ -854,11 +854,11 @@ describe Mongoid::Extensions::ObjectId do
854
854
  end
855
855
 
856
856
  let(:mongoized) do
857
- Moped::BSON::ObjectId.mongoize(hash)
857
+ BSON::ObjectId.mongoize(hash)
858
858
  end
859
859
 
860
860
  it "returns the hash" do
861
- mongoized.should eq(hash)
861
+ expect(mongoized).to eq(hash)
862
862
  end
863
863
  end
864
864
 
@@ -869,18 +869,18 @@ describe Mongoid::Extensions::ObjectId do
869
869
  end
870
870
 
871
871
  let(:mongoized) do
872
- Moped::BSON::ObjectId.mongoize(hash)
872
+ BSON::ObjectId.mongoize(hash)
873
873
  end
874
874
 
875
875
  it "returns the hash with mongoized value" do
876
- mongoized.should eq({ id: object_id })
876
+ expect(mongoized).to eq({ id: object_id })
877
877
  end
878
878
  end
879
879
 
880
880
  context "when the value is an array of strings" do
881
881
 
882
882
  let(:other_id) do
883
- Moped::BSON::ObjectId.new
883
+ BSON::ObjectId.new
884
884
  end
885
885
 
886
886
  let(:hash) do
@@ -888,11 +888,11 @@ describe Mongoid::Extensions::ObjectId do
888
888
  end
889
889
 
890
890
  let(:mongoized) do
891
- Moped::BSON::ObjectId.mongoize(hash)
891
+ BSON::ObjectId.mongoize(hash)
892
892
  end
893
893
 
894
894
  it "returns the hash with mongoized values" do
895
- mongoized.should eq({ id: [ object_id, other_id ] })
895
+ expect(mongoized).to eq({ id: [ object_id, other_id ] })
896
896
  end
897
897
  end
898
898
  end
@@ -906,11 +906,11 @@ describe Mongoid::Extensions::ObjectId do
906
906
  end
907
907
 
908
908
  let(:mongoized) do
909
- Moped::BSON::ObjectId.mongoize(hash)
909
+ BSON::ObjectId.mongoize(hash)
910
910
  end
911
911
 
912
912
  it "returns the hash" do
913
- mongoized.should eq(hash)
913
+ expect(mongoized).to eq(hash)
914
914
  end
915
915
  end
916
916
 
@@ -921,11 +921,11 @@ describe Mongoid::Extensions::ObjectId do
921
921
  end
922
922
 
923
923
  let(:mongoized) do
924
- Moped::BSON::ObjectId.mongoize(hash)
924
+ BSON::ObjectId.mongoize(hash)
925
925
  end
926
926
 
927
927
  it "returns the hash" do
928
- mongoized.should eq(hash)
928
+ expect(mongoized).to eq(hash)
929
929
  end
930
930
  end
931
931
  end
@@ -936,11 +936,11 @@ describe Mongoid::Extensions::ObjectId do
936
936
  describe "#__mongoize_object_id__" do
937
937
 
938
938
  it "returns self" do
939
- object_id.__mongoize_object_id__.should eq(object_id)
939
+ expect(object_id.__mongoize_object_id__).to eq(object_id)
940
940
  end
941
941
 
942
942
  it "returns the same instance" do
943
- object_id.__mongoize_object_id__.should equal(object_id)
943
+ expect(object_id.__mongoize_object_id__).to equal(object_id)
944
944
  end
945
945
  end
946
946
  end