mongoid 7.5.4 → 8.0.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- checksums.yaml.gz.sig +0 -0
- data/README.md +3 -3
- data/Rakefile +0 -25
- data/lib/config/locales/en.yml +46 -30
- data/lib/mongoid/association/accessors.rb +32 -3
- data/lib/mongoid/association/bindable.rb +48 -0
- data/lib/mongoid/association/builders.rb +4 -2
- data/lib/mongoid/association/eager_loadable.rb +29 -7
- data/lib/mongoid/association/embedded/batchable.rb +28 -5
- data/lib/mongoid/association/embedded/embedded_in/binding.rb +24 -2
- data/lib/mongoid/association/embedded/embedded_in.rb +2 -1
- data/lib/mongoid/association/embedded/embeds_many/binding.rb +1 -0
- data/lib/mongoid/association/embedded/embeds_many/buildable.rb +1 -1
- data/lib/mongoid/association/embedded/embeds_many/proxy.rb +40 -18
- data/lib/mongoid/association/embedded/embeds_one/buildable.rb +18 -4
- data/lib/mongoid/association/embedded/embeds_one/proxy.rb +21 -2
- data/lib/mongoid/association/macros.rb +2 -1
- data/lib/mongoid/association/many.rb +5 -0
- data/lib/mongoid/association/nested/many.rb +2 -1
- data/lib/mongoid/association/proxy.rb +12 -0
- data/lib/mongoid/association/referenced/auto_save.rb +3 -2
- data/lib/mongoid/association/referenced/belongs_to/binding.rb +1 -0
- data/lib/mongoid/association/referenced/belongs_to/buildable.rb +1 -1
- data/lib/mongoid/association/referenced/belongs_to.rb +1 -1
- data/lib/mongoid/association/referenced/counter_cache.rb +8 -8
- data/lib/mongoid/association/referenced/has_and_belongs_to_many/proxy.rb +64 -11
- data/lib/mongoid/association/referenced/has_and_belongs_to_many.rb +4 -1
- data/lib/mongoid/association/referenced/has_many/enumerable.rb +10 -18
- data/lib/mongoid/association/referenced/has_many/proxy.rb +12 -9
- data/lib/mongoid/association/referenced/has_one/buildable.rb +1 -1
- data/lib/mongoid/association/referenced/has_one/proxy.rb +8 -11
- data/lib/mongoid/association/referenced/syncable.rb +2 -2
- data/lib/mongoid/association/relatable.rb +38 -4
- data/lib/mongoid/attributes/processing.rb +9 -2
- data/lib/mongoid/attributes.rb +30 -27
- data/lib/mongoid/cacheable.rb +2 -2
- data/lib/mongoid/changeable.rb +37 -2
- data/lib/mongoid/clients/options.rb +4 -0
- data/lib/mongoid/clients/sessions.rb +2 -14
- data/lib/mongoid/config.rb +15 -11
- data/lib/mongoid/contextual/aggregable/memory.rb +23 -15
- data/lib/mongoid/contextual/aggregable/mongo.rb +1 -1
- data/lib/mongoid/contextual/map_reduce.rb +2 -2
- data/lib/mongoid/contextual/memory.rb +55 -28
- data/lib/mongoid/contextual/mongo.rb +173 -262
- data/lib/mongoid/contextual/none.rb +33 -15
- data/lib/mongoid/copyable.rb +32 -8
- data/lib/mongoid/criteria/includable.rb +24 -20
- data/lib/mongoid/criteria/marshalable.rb +10 -2
- data/lib/mongoid/criteria/queryable/extensions/array.rb +2 -15
- data/lib/mongoid/criteria/queryable/extensions/big_decimal.rb +25 -4
- data/lib/mongoid/criteria/queryable/extensions/boolean.rb +1 -1
- data/lib/mongoid/criteria/queryable/extensions/date.rb +6 -1
- data/lib/mongoid/criteria/queryable/extensions/date_time.rb +6 -1
- data/lib/mongoid/criteria/queryable/extensions/hash.rb +0 -16
- data/lib/mongoid/criteria/queryable/extensions/numeric.rb +1 -1
- data/lib/mongoid/criteria/queryable/extensions/object.rb +2 -1
- data/lib/mongoid/criteria/queryable/extensions/range.rb +13 -5
- data/lib/mongoid/criteria/queryable/extensions/regexp.rb +1 -1
- data/lib/mongoid/criteria/queryable/extensions/symbol.rb +3 -1
- data/lib/mongoid/criteria/queryable/extensions/time.rb +6 -1
- data/lib/mongoid/criteria/queryable/extensions/time_with_zone.rb +6 -1
- data/lib/mongoid/criteria/queryable/optional.rb +3 -9
- data/lib/mongoid/criteria/queryable/options.rb +1 -1
- data/lib/mongoid/criteria/queryable/selectable.rb +2 -24
- data/lib/mongoid/criteria/queryable/selector.rb +90 -5
- data/lib/mongoid/criteria/queryable/smash.rb +39 -6
- data/lib/mongoid/criteria/queryable/storable.rb +1 -1
- data/lib/mongoid/criteria/queryable.rb +11 -6
- data/lib/mongoid/criteria.rb +1 -28
- data/lib/mongoid/deprecable.rb +36 -0
- data/lib/mongoid/deprecation.rb +25 -0
- data/lib/mongoid/document.rb +88 -33
- data/lib/mongoid/equality.rb +4 -4
- data/lib/mongoid/errors/document_not_found.rb +6 -2
- data/lib/mongoid/errors/invalid_dot_dollar_assignment.rb +23 -0
- data/lib/mongoid/errors/invalid_field.rb +5 -1
- data/lib/mongoid/errors/invalid_field_type.rb +26 -0
- data/lib/mongoid/errors/too_many_nested_attribute_records.rb +1 -1
- data/lib/mongoid/errors.rb +2 -2
- data/lib/mongoid/extensions/array.rb +8 -6
- data/lib/mongoid/extensions/big_decimal.rb +29 -10
- data/lib/mongoid/extensions/binary.rb +42 -0
- data/lib/mongoid/extensions/boolean.rb +8 -2
- data/lib/mongoid/extensions/date.rb +26 -20
- data/lib/mongoid/extensions/date_time.rb +1 -1
- data/lib/mongoid/extensions/float.rb +4 -5
- data/lib/mongoid/extensions/hash.rb +12 -5
- data/lib/mongoid/extensions/integer.rb +4 -5
- data/lib/mongoid/extensions/object.rb +2 -0
- data/lib/mongoid/extensions/range.rb +41 -10
- data/lib/mongoid/extensions/regexp.rb +11 -4
- data/lib/mongoid/extensions/set.rb +11 -4
- data/lib/mongoid/extensions/string.rb +2 -13
- data/lib/mongoid/extensions/symbol.rb +3 -14
- data/lib/mongoid/extensions/time.rb +27 -16
- data/lib/mongoid/extensions/time_with_zone.rb +1 -2
- data/lib/mongoid/extensions.rb +1 -0
- data/lib/mongoid/factory.rb +42 -7
- data/lib/mongoid/fields/foreign_key.rb +7 -0
- data/lib/mongoid/fields/validators/macro.rb +3 -9
- data/lib/mongoid/fields.rb +49 -7
- data/lib/mongoid/findable.rb +21 -16
- data/lib/mongoid/indexable/specification.rb +1 -1
- data/lib/mongoid/indexable/validators/options.rb +4 -1
- data/lib/mongoid/interceptable.rb +69 -9
- data/lib/mongoid/persistable/creatable.rb +14 -5
- data/lib/mongoid/persistable/updatable.rb +12 -5
- data/lib/mongoid/persistence_context.rb +8 -42
- data/lib/mongoid/query_cache.rb +6 -258
- data/lib/mongoid/railties/controller_runtime.rb +1 -1
- data/lib/mongoid/reloadable.rb +7 -3
- data/lib/mongoid/scopable.rb +9 -11
- data/lib/mongoid/selectable.rb +1 -2
- data/lib/mongoid/shardable.rb +11 -35
- data/lib/mongoid/stateful.rb +27 -1
- data/lib/mongoid/timestamps/created.rb +1 -1
- data/lib/mongoid/timestamps/updated.rb +1 -1
- data/lib/mongoid/touchable.rb +2 -3
- data/lib/mongoid/traversable.rb +1 -0
- data/lib/mongoid/validatable/uniqueness.rb +2 -1
- data/lib/mongoid/version.rb +1 -1
- data/lib/mongoid/warnings.rb +3 -4
- data/lib/mongoid.rb +1 -0
- data/spec/config/mongoid.yml +16 -0
- data/spec/integration/app_spec.rb +8 -12
- data/spec/integration/associations/belongs_to_spec.rb +18 -0
- data/spec/integration/associations/embedded_spec.rb +15 -0
- data/spec/integration/associations/embeds_many_spec.rb +15 -2
- data/spec/integration/associations/embeds_one_spec.rb +18 -0
- data/spec/integration/associations/foreign_key_spec.rb +9 -0
- data/spec/integration/associations/has_and_belongs_to_many_spec.rb +21 -0
- data/spec/integration/associations/has_one_spec.rb +97 -1
- data/spec/integration/associations/scope_option_spec.rb +1 -1
- data/spec/integration/callbacks_models.rb +95 -1
- data/spec/integration/callbacks_spec.rb +226 -4
- data/spec/integration/criteria/range_spec.rb +95 -1
- data/spec/integration/discriminator_key_spec.rb +115 -76
- data/spec/integration/dots_and_dollars_spec.rb +277 -0
- data/spec/integration/i18n_fallbacks_spec.rb +1 -15
- data/spec/integration/matcher_examples_spec.rb +20 -13
- data/spec/integration/matcher_operator_data/type_decimal.yml +3 -2
- data/spec/integration/matcher_operator_spec.rb +3 -5
- data/spec/integration/persistence/range_field_spec.rb +350 -0
- data/spec/mongoid/association/counter_cache_spec.rb +1 -1
- data/spec/mongoid/association/depending_spec.rb +9 -9
- data/spec/mongoid/association/eager_spec.rb +2 -1
- data/spec/mongoid/association/embedded/embedded_in/binding_spec.rb +2 -1
- data/spec/mongoid/association/embedded/embedded_in/buildable_spec.rb +54 -0
- data/spec/mongoid/association/embedded/embedded_in/proxy_spec.rb +69 -9
- data/spec/mongoid/association/embedded/embeds_many/buildable_spec.rb +112 -0
- data/spec/mongoid/association/embedded/embeds_many/proxy_spec.rb +198 -8
- data/spec/mongoid/association/embedded/embeds_many_models.rb +36 -0
- data/spec/mongoid/association/embedded/embeds_many_query_spec.rb +12 -0
- data/spec/mongoid/association/embedded/embeds_many_spec.rb +68 -0
- data/spec/mongoid/association/embedded/embeds_one/buildable_spec.rb +25 -0
- data/spec/mongoid/association/embedded/embeds_one_models.rb +19 -0
- data/spec/mongoid/association/embedded/embeds_one_spec.rb +28 -0
- data/spec/mongoid/association/referenced/belongs_to/binding_spec.rb +2 -1
- data/spec/mongoid/association/referenced/belongs_to/buildable_spec.rb +54 -0
- data/spec/mongoid/association/referenced/belongs_to/proxy_spec.rb +15 -0
- data/spec/mongoid/association/referenced/belongs_to_models.rb +11 -0
- data/spec/mongoid/association/referenced/belongs_to_spec.rb +2 -2
- data/spec/mongoid/association/referenced/has_and_belongs_to_many/proxy_spec.rb +38 -5
- data/spec/mongoid/association/referenced/has_and_belongs_to_many_models.rb +25 -0
- data/spec/mongoid/association/referenced/has_and_belongs_to_many_spec.rb +35 -2
- data/spec/mongoid/association/referenced/has_many/buildable_spec.rb +109 -0
- data/spec/mongoid/association/referenced/has_many/enumerable_spec.rb +2 -56
- data/spec/mongoid/association/referenced/has_many/proxy_spec.rb +62 -13
- data/spec/mongoid/association/referenced/has_many_models.rb +3 -1
- data/spec/mongoid/association/referenced/has_many_spec.rb +25 -0
- data/spec/mongoid/association/referenced/has_one/buildable_spec.rb +2 -2
- data/spec/mongoid/association/referenced/has_one/proxy_spec.rb +107 -1
- data/spec/mongoid/association/referenced/has_one_models.rb +16 -0
- data/spec/mongoid/association/syncable_spec.rb +14 -0
- data/spec/mongoid/atomic/paths_spec.rb +0 -14
- data/spec/mongoid/attributes/nested_spec.rb +80 -11
- data/spec/mongoid/attributes/nested_spec_models.rb +48 -0
- data/spec/mongoid/attributes/projector_spec.rb +1 -5
- data/spec/mongoid/attributes_spec.rb +480 -27
- data/spec/mongoid/cacheable_spec.rb +3 -3
- data/spec/mongoid/changeable_spec.rb +130 -13
- data/spec/mongoid/clients/factory_spec.rb +23 -30
- data/spec/mongoid/clients/sessions_spec.rb +0 -38
- data/spec/mongoid/clients_spec.rb +2 -2
- data/spec/mongoid/config_spec.rb +52 -14
- data/spec/mongoid/contextual/aggregable/memory_spec.rb +396 -158
- data/spec/mongoid/contextual/aggregable/memory_table.yml +88 -0
- data/spec/mongoid/contextual/aggregable/memory_table_spec.rb +62 -0
- data/spec/mongoid/contextual/map_reduce_spec.rb +2 -16
- data/spec/mongoid/contextual/memory_spec.rb +521 -14
- data/spec/mongoid/contextual/mongo_spec.rb +566 -416
- data/spec/mongoid/contextual/none_spec.rb +11 -19
- data/spec/mongoid/copyable_spec.rb +451 -1
- data/spec/mongoid/criteria/findable_spec.rb +86 -210
- data/spec/mongoid/criteria/includable_spec.rb +1492 -0
- data/spec/mongoid/criteria/includable_spec_models.rb +54 -0
- data/spec/mongoid/criteria/marshalable_spec.rb +18 -1
- data/spec/mongoid/criteria/queryable/extensions/array_spec.rb +7 -19
- data/spec/mongoid/criteria/queryable/extensions/big_decimal_spec.rb +134 -26
- data/spec/mongoid/criteria/queryable/extensions/date_spec.rb +11 -0
- data/spec/mongoid/criteria/queryable/extensions/date_time_spec.rb +11 -0
- data/spec/mongoid/criteria/queryable/extensions/hash_spec.rb +0 -15
- data/spec/mongoid/criteria/queryable/extensions/numeric_spec.rb +73 -7
- data/spec/mongoid/criteria/queryable/extensions/time_spec.rb +11 -0
- data/spec/mongoid/criteria/queryable/extensions/time_with_zone_spec.rb +11 -0
- data/spec/mongoid/criteria/queryable/optional_spec.rb +0 -484
- data/spec/mongoid/criteria/queryable/selectable_logical_spec.rb +50 -0
- data/spec/mongoid/criteria/queryable/selectable_spec.rb +77 -85
- data/spec/mongoid/criteria/queryable/selector_spec.rb +16 -77
- data/spec/mongoid/criteria/queryable/storable_spec.rb +0 -72
- data/spec/mongoid/criteria_spec.rb +469 -1201
- data/spec/mongoid/document_fields_spec.rb +173 -24
- data/spec/mongoid/document_spec.rb +32 -41
- data/spec/mongoid/equality_spec.rb +12 -12
- data/spec/mongoid/errors/document_not_found_spec.rb +29 -2
- data/spec/mongoid/errors/invalid_field_spec.rb +1 -1
- data/spec/mongoid/errors/invalid_field_type_spec.rb +55 -0
- data/spec/mongoid/errors/mongoid_error_spec.rb +3 -1
- data/spec/mongoid/errors/no_environment_spec.rb +3 -3
- data/spec/mongoid/errors/too_many_nested_attribute_records_spec.rb +1 -1
- data/spec/mongoid/extensions/array_spec.rb +16 -2
- data/spec/mongoid/extensions/big_decimal_spec.rb +697 -212
- data/spec/mongoid/extensions/binary_spec.rb +44 -9
- data/spec/mongoid/extensions/boolean_spec.rb +68 -82
- data/spec/mongoid/extensions/date_class_mongoize_spec.rb +7 -3
- data/spec/mongoid/extensions/date_spec.rb +71 -1
- data/spec/mongoid/extensions/date_time_spec.rb +15 -9
- data/spec/mongoid/extensions/float_spec.rb +48 -76
- data/spec/mongoid/extensions/hash_spec.rb +30 -0
- data/spec/mongoid/extensions/integer_spec.rb +45 -66
- data/spec/mongoid/extensions/range_spec.rb +255 -54
- data/spec/mongoid/extensions/regexp_spec.rb +58 -33
- data/spec/mongoid/extensions/set_spec.rb +106 -0
- data/spec/mongoid/extensions/string_spec.rb +53 -25
- data/spec/mongoid/extensions/symbol_spec.rb +18 -25
- data/spec/mongoid/extensions/time_spec.rb +634 -66
- data/spec/mongoid/extensions/time_with_zone_spec.rb +17 -31
- data/spec/mongoid/factory_spec.rb +61 -1
- data/spec/mongoid/fields_spec.rb +321 -50
- data/spec/mongoid/findable_spec.rb +64 -29
- data/spec/mongoid/indexable/specification_spec.rb +2 -2
- data/spec/mongoid/indexable_spec.rb +16 -19
- data/spec/mongoid/interceptable_spec.rb +584 -5
- data/spec/mongoid/interceptable_spec_models.rb +235 -4
- data/spec/mongoid/matcher/extract_attribute_spec.rb +1 -5
- data/spec/mongoid/mongoizable_spec.rb +285 -0
- data/spec/mongoid/persistable/creatable_spec.rb +2 -2
- data/spec/mongoid/persistable/deletable_spec.rb +2 -2
- data/spec/mongoid/persistable/destroyable_spec.rb +2 -2
- data/spec/mongoid/persistable/upsertable_spec.rb +14 -0
- data/spec/mongoid/persistence_context_spec.rb +24 -0
- data/spec/mongoid/query_cache_middleware_spec.rb +0 -18
- data/spec/mongoid/query_cache_spec.rb +0 -154
- data/spec/mongoid/reloadable_spec.rb +35 -2
- data/spec/mongoid/scopable_spec.rb +36 -34
- data/spec/mongoid/shardable_models.rb +0 -14
- data/spec/mongoid/shardable_spec.rb +61 -153
- data/spec/mongoid/stateful_spec.rb +28 -0
- data/spec/mongoid/timestamps_spec.rb +390 -0
- data/spec/mongoid/timestamps_spec_models.rb +67 -0
- data/spec/mongoid/touchable_spec.rb +116 -0
- data/spec/mongoid/touchable_spec_models.rb +12 -8
- data/spec/mongoid/traversable_spec.rb +4 -11
- data/spec/mongoid/validatable/presence_spec.rb +1 -1
- data/spec/mongoid/validatable/uniqueness_spec.rb +60 -31
- data/spec/mongoid/warnings_spec.rb +35 -0
- data/spec/mongoid_spec.rb +1 -7
- data/spec/rails/controller_extension/controller_runtime_spec.rb +2 -2
- data/spec/rails/mongoid_spec.rb +4 -16
- data/spec/shared/lib/mrss/event_subscriber.rb +5 -15
- data/spec/shared/lib/mrss/lite_constraints.rb +0 -8
- data/spec/shared/shlib/server.sh +5 -5
- data/spec/support/constraints.rb +24 -0
- data/spec/support/macros.rb +30 -0
- data/spec/support/models/augmentation.rb +12 -0
- data/spec/support/models/band.rb +3 -0
- data/spec/support/models/catalog.rb +24 -0
- data/spec/support/models/circus.rb +3 -0
- data/spec/support/models/fanatic.rb +8 -0
- data/spec/support/models/implant.rb +9 -0
- data/spec/support/models/label.rb +2 -0
- data/spec/support/models/passport.rb +9 -0
- data/spec/support/models/person.rb +1 -0
- data/spec/support/models/player.rb +2 -0
- data/spec/support/models/powerup.rb +12 -0
- data/spec/support/models/registry.rb +1 -0
- data/spec/support/models/school.rb +14 -0
- data/spec/support/models/shield.rb +18 -0
- data/spec/support/models/student.rb +14 -0
- data/spec/support/models/weapon.rb +12 -0
- data.tar.gz.sig +0 -0
- metadata +689 -657
- metadata.gz.sig +0 -0
- data/lib/mongoid/errors/eager_load.rb +0 -23
- data/lib/mongoid/errors/invalid_value.rb +0 -17
- data/spec/mongoid/errors/eager_load_spec.rb +0 -31
@@ -8,8 +8,16 @@ module Mongoid
|
|
8
8
|
class Smash < Hash
|
9
9
|
|
10
10
|
# @attribute [r] aliases The aliases.
|
11
|
+
attr_reader :aliases
|
12
|
+
|
11
13
|
# @attribute [r] serializers The serializers.
|
12
|
-
attr_reader :
|
14
|
+
attr_reader :serializers
|
15
|
+
|
16
|
+
# @attribute [r] associations The associations.
|
17
|
+
attr_reader :associations
|
18
|
+
|
19
|
+
# @attribute [r] aliased_associations The aliased_associations.
|
20
|
+
attr_reader :aliased_associations
|
13
21
|
|
14
22
|
# Perform a deep copy of the smash.
|
15
23
|
#
|
@@ -18,7 +26,7 @@ module Mongoid
|
|
18
26
|
#
|
19
27
|
# @return [ Smash ] The copied hash.
|
20
28
|
def __deep_copy__
|
21
|
-
self.class.new(aliases, serializers) do |copy|
|
29
|
+
self.class.new(aliases, serializers, associations, aliased_associations) do |copy|
|
22
30
|
each_pair do |key, value|
|
23
31
|
copy.store(key, value.__deep_copy__)
|
24
32
|
end
|
@@ -36,8 +44,15 @@ module Mongoid
|
|
36
44
|
# responsible for serializing values. The keys of the hash must be
|
37
45
|
# strings that match the field name, and the values must respond to
|
38
46
|
# #localized? and #evolve(object).
|
39
|
-
|
40
|
-
|
47
|
+
# @param [ Hash ] associations An optional hash of names to association
|
48
|
+
# objects.
|
49
|
+
# @param [ Hash ] aliased_associations An optional hash of mappings from
|
50
|
+
# aliases for associations to their actual field names in the database.
|
51
|
+
def initialize(aliases = {}, serializers = {}, associations = {}, aliased_associations = {})
|
52
|
+
@aliases = aliases
|
53
|
+
@serializers = serializers
|
54
|
+
@associations = associations
|
55
|
+
@aliased_associations = aliased_associations
|
41
56
|
yield(self) if block_given?
|
42
57
|
end
|
43
58
|
|
@@ -86,8 +101,26 @@ module Mongoid
|
|
86
101
|
# serializer.
|
87
102
|
def storage_pair(key)
|
88
103
|
field = key.to_s
|
89
|
-
name =
|
90
|
-
[ name,
|
104
|
+
name = Fields.database_field_name(field, associations, aliases, aliased_associations)
|
105
|
+
[ name, get_serializer(name) ]
|
106
|
+
end
|
107
|
+
|
108
|
+
private
|
109
|
+
|
110
|
+
# Retrieves the serializer for the given name. If the name exists in
|
111
|
+
# the serializers hash then return that immediately, otherwise
|
112
|
+
# recursively look through the associations and find the appropriate
|
113
|
+
# field.
|
114
|
+
#
|
115
|
+
# @param [ String ] name The name of the db field.
|
116
|
+
#
|
117
|
+
# @return [ Object ] The serializer.
|
118
|
+
def get_serializer(name)
|
119
|
+
if s = serializers[name]
|
120
|
+
s
|
121
|
+
else
|
122
|
+
Fields.traverse_association_tree(name, serializers, associations, aliased_associations)
|
123
|
+
end
|
91
124
|
end
|
92
125
|
end
|
93
126
|
end
|
@@ -47,7 +47,7 @@ module Mongoid
|
|
47
47
|
if value.is_a?(Hash) && selector[field].is_a?(Hash) &&
|
48
48
|
value.keys.all? { |key|
|
49
49
|
key_s = key.to_s
|
50
|
-
key_s.start_with?('$') && !selector[field].
|
50
|
+
key_s.start_with?('$') && !selector[field].key?(key_s)
|
51
51
|
}
|
52
52
|
then
|
53
53
|
# Multiple operators can be combined on the same field by
|
@@ -33,9 +33,10 @@ module Mongoid
|
|
33
33
|
include Optional
|
34
34
|
|
35
35
|
# @attribute [r] aliases The aliases.
|
36
|
-
|
36
|
+
attr_reader :aliases
|
37
|
+
|
37
38
|
# @attribute [r] serializers The serializers.
|
38
|
-
attr_reader :
|
39
|
+
attr_reader :serializers
|
39
40
|
|
40
41
|
# Is this queryable equal to another object? Is true if the selector and
|
41
42
|
# options are equal.
|
@@ -59,11 +60,15 @@ module Mongoid
|
|
59
60
|
#
|
60
61
|
# @param [ Hash ] aliases The optional field aliases.
|
61
62
|
# @param [ Hash ] serializers The optional field serializers.
|
63
|
+
# @param [ Hash ] associations The optional associations.
|
64
|
+
# @param [ Hash ] aliased_associations The optional aliased associations.
|
62
65
|
# @param [ Symbol ] driver The driver being used.
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
@
|
66
|
+
#
|
67
|
+
# @api private
|
68
|
+
def initialize(aliases = {}, serializers = {}, associations = {}, aliased_associations = {})
|
69
|
+
@aliases, @serializers = aliases, serializers
|
70
|
+
@options = Options.new(aliases, serializers, associations, aliased_associations)
|
71
|
+
@selector = Selector.new(aliases, serializers, associations, aliased_associations)
|
67
72
|
@pipeline = Pipeline.new(aliases)
|
68
73
|
@aggregating = nil
|
69
74
|
yield(self) if block_given?
|
data/lib/mongoid/criteria.rb
CHANGED
@@ -112,33 +112,6 @@ module Mongoid
|
|
112
112
|
entries.as_json(options)
|
113
113
|
end
|
114
114
|
|
115
|
-
# Tells the criteria that the cursor that gets returned needs to be
|
116
|
-
# cached. This is so multiple iterations don't hit the database multiple
|
117
|
-
# times, however this is not advisable when working with large data sets
|
118
|
-
# as the entire results will get stored in memory.
|
119
|
-
#
|
120
|
-
# @example Flag the criteria as cached.
|
121
|
-
# criteria.cache
|
122
|
-
#
|
123
|
-
# @return [ Criteria ] The cloned criteria.
|
124
|
-
def cache
|
125
|
-
Mongoid::Warnings.warn_criteria_cache_deprecated
|
126
|
-
crit = clone
|
127
|
-
crit.options.merge!(cache: true)
|
128
|
-
crit
|
129
|
-
end
|
130
|
-
|
131
|
-
# Will return true if the cache option has been set.
|
132
|
-
#
|
133
|
-
# @example Is the criteria cached?
|
134
|
-
# criteria.cached?
|
135
|
-
#
|
136
|
-
# @return [ true, false ] If the criteria is flagged as cached.
|
137
|
-
def cached?
|
138
|
-
Mongoid::Warnings.warn_criteria_cache_deprecated
|
139
|
-
options[:cache] == true
|
140
|
-
end
|
141
|
-
|
142
115
|
# Get the documents from the embedded criteria.
|
143
116
|
#
|
144
117
|
# @example Get the documents.
|
@@ -232,7 +205,7 @@ module Mongoid
|
|
232
205
|
@klass = klass
|
233
206
|
@embedded = nil
|
234
207
|
@none = nil
|
235
|
-
klass ? super(klass.aliased_fields, klass.fields) : super({}, {})
|
208
|
+
klass ? super(klass.aliased_fields, klass.fields, klass.relations, klass.aliased_associations) : super({}, {}, {}, {})
|
236
209
|
end
|
237
210
|
|
238
211
|
# Merges another object with this +Criteria+ and returns a new criteria.
|
@@ -0,0 +1,36 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require "mongoid/deprecation"
|
4
|
+
|
5
|
+
module Mongoid
|
6
|
+
|
7
|
+
# Adds ability to declare Mongoid-specific deprecations.
|
8
|
+
#
|
9
|
+
# @api private
|
10
|
+
module Deprecable
|
11
|
+
|
12
|
+
# Declares method(s) as deprecated.
|
13
|
+
#
|
14
|
+
# @example Deprecate a method.
|
15
|
+
# Mongoid.deprecate(Cat, :meow); Cat.new.meow
|
16
|
+
# #=> Mongoid.logger.warn("meow is deprecated and will be removed from Mongoid 8.0")
|
17
|
+
#
|
18
|
+
# @example Deprecate a method and declare the replacement method.
|
19
|
+
# Mongoid.deprecate(Cat, meow: :speak); Cat.new.meow
|
20
|
+
# #=> Mongoid.logger.warn("meow is deprecated and will be removed from Mongoid 8.0 (use speak instead)")
|
21
|
+
#
|
22
|
+
# @example Deprecate a method and give replacement instructions.
|
23
|
+
# Mongoid.deprecate(Cat, meow: 'eat :catnip instead'); Cat.new.meow
|
24
|
+
# #=> Mongoid.logger.warn("meow is deprecated and will be removed from Mongoid 8.0 (eat :catnip instead)")
|
25
|
+
#
|
26
|
+
# @param [ Module ] target_module The parent which contains the method.
|
27
|
+
# @param [ Symbol | Hash<Symbol, [Symbol|String]> ] method_descriptors
|
28
|
+
# The methods to deprecate, with optional replacement instructions.
|
29
|
+
def deprecate(target_module, *method_descriptors)
|
30
|
+
Mongoid::Deprecation.deprecate_methods(target_module, *method_descriptors)
|
31
|
+
end
|
32
|
+
end
|
33
|
+
end
|
34
|
+
|
35
|
+
# Ensure Mongoid.deprecate can be used during initialization
|
36
|
+
Mongoid.extend(Mongoid::Deprecable)
|
@@ -0,0 +1,25 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Mongoid
|
4
|
+
|
5
|
+
# Utility class for logging deprecation warnings.
|
6
|
+
class Deprecation < ::ActiveSupport::Deprecation
|
7
|
+
|
8
|
+
@gem_name = 'Mongoid'
|
9
|
+
|
10
|
+
# Per change policy, deprecations will be removed in the next major version.
|
11
|
+
@deprecation_horizon = "#{Mongoid::VERSION.split('.').first.to_i + 1}.0".freeze
|
12
|
+
|
13
|
+
# Overrides default ActiveSupport::Deprecation behavior
|
14
|
+
# to use Mongoid's logger.
|
15
|
+
#
|
16
|
+
# @return Array<Proc> The deprecation behavior.
|
17
|
+
def behavior
|
18
|
+
@behavior ||= Array(->(message, callstack, _deprecation_horizon, _gem_name) {
|
19
|
+
logger = Mongoid.logger
|
20
|
+
logger.warn(message)
|
21
|
+
logger.debug(callstack.join("\n ")) if debug
|
22
|
+
})
|
23
|
+
end
|
24
|
+
end
|
25
|
+
end
|
data/lib/mongoid/document.rb
CHANGED
@@ -100,21 +100,8 @@ module Mongoid
|
|
100
100
|
# @param [ Hash ] attrs The attributes to set up the document with.
|
101
101
|
#
|
102
102
|
# @return [ Document ] A new document.
|
103
|
-
def initialize(attrs = nil)
|
104
|
-
|
105
|
-
_building do
|
106
|
-
@new_record = true
|
107
|
-
@attributes ||= {}
|
108
|
-
apply_pre_processed_defaults
|
109
|
-
apply_default_scoping
|
110
|
-
process_attributes(attrs) do
|
111
|
-
yield(self) if block_given?
|
112
|
-
end
|
113
|
-
apply_post_processed_defaults
|
114
|
-
# @todo: #2586: Need to have access to parent document in these
|
115
|
-
# callbacks.
|
116
|
-
run_callbacks(:initialize) unless _initialize_callbacks.empty?
|
117
|
-
end
|
103
|
+
def initialize(attrs = nil, &block)
|
104
|
+
construct_document(attrs, execute_callbacks: true, &block)
|
118
105
|
end
|
119
106
|
|
120
107
|
# Return the model name of the document.
|
@@ -137,18 +124,6 @@ module Mongoid
|
|
137
124
|
(persisted? || destroyed?) ? [ _id.to_s ] : nil
|
138
125
|
end
|
139
126
|
|
140
|
-
# Return an array with this +Document+ only in it.
|
141
|
-
#
|
142
|
-
# @example Return the document in an array.
|
143
|
-
# document.to_a
|
144
|
-
#
|
145
|
-
# @return [ Array<Document> ] An array with the document as its only item.
|
146
|
-
#
|
147
|
-
# @deprecated
|
148
|
-
def to_a
|
149
|
-
[ self ]
|
150
|
-
end
|
151
|
-
|
152
127
|
# Return a hash of the entire document hierarchy from this document and
|
153
128
|
# below. Used when the attributes are needed for everything and not just
|
154
129
|
# the current document.
|
@@ -182,7 +157,7 @@ module Mongoid
|
|
182
157
|
def as_json(options = nil)
|
183
158
|
rv = super
|
184
159
|
if options && options[:compact]
|
185
|
-
Mongoid.
|
160
|
+
Mongoid::Warnings.warn_as_json_compact_deprecated
|
186
161
|
rv = rv.compact
|
187
162
|
end
|
188
163
|
rv
|
@@ -230,6 +205,38 @@ module Mongoid
|
|
230
205
|
|
231
206
|
private
|
232
207
|
|
208
|
+
# Does the construction of a document.
|
209
|
+
#
|
210
|
+
# @param [ Hash ] attrs The attributes to set up the document with.
|
211
|
+
# @param [ true | false ] execute_callbacks Flag specifies whether callbacks
|
212
|
+
# should be run.
|
213
|
+
#
|
214
|
+
# @return [ Document ] A new document.
|
215
|
+
#
|
216
|
+
# @api private
|
217
|
+
def construct_document(attrs = nil, execute_callbacks: true)
|
218
|
+
@__parent = nil
|
219
|
+
_building do
|
220
|
+
@new_record = true
|
221
|
+
@attributes ||= {}
|
222
|
+
apply_pre_processed_defaults
|
223
|
+
apply_default_scoping
|
224
|
+
process_attributes(attrs) do
|
225
|
+
yield(self) if block_given?
|
226
|
+
end
|
227
|
+
@attributes_before_type_cast = @attributes.merge(attributes_before_type_cast)
|
228
|
+
|
229
|
+
if execute_callbacks
|
230
|
+
apply_post_processed_defaults
|
231
|
+
run_callbacks(:initialize) unless _initialize_callbacks.empty?
|
232
|
+
else
|
233
|
+
pending_callbacks << :apply_post_processed_defaults
|
234
|
+
pending_callbacks << :initialize
|
235
|
+
end
|
236
|
+
end
|
237
|
+
self
|
238
|
+
end
|
239
|
+
|
233
240
|
# Returns the logger
|
234
241
|
#
|
235
242
|
# @return [ Logger ] The configured logger or a default Logger instance.
|
@@ -247,6 +254,14 @@ module Mongoid
|
|
247
254
|
@model_cache_key ||= self.class.model_name.cache_key
|
248
255
|
end
|
249
256
|
|
257
|
+
# Returns a hash of the attributes.
|
258
|
+
#
|
259
|
+
# Note this method modifies the attributes hash that already exists on the
|
260
|
+
# class and returns it. This means that the hash returned by this method
|
261
|
+
# refers to the same hash as calling #attributes on the instance. See
|
262
|
+
# MONGOID-4476 for an explanation on how this is used.
|
263
|
+
#
|
264
|
+
# @return [ Hash ] The attributes hash.
|
250
265
|
def as_attributes
|
251
266
|
return attributes if frozen?
|
252
267
|
embedded_relations.each_pair do |name, meta|
|
@@ -275,11 +290,26 @@ module Mongoid
|
|
275
290
|
# @param [ Hash ] attrs The hash of attributes to instantiate with.
|
276
291
|
# @param [ Integer ] selected_fields The selected fields from the
|
277
292
|
# criteria.
|
293
|
+
# @param [ true | false ] execute_callbacks Flag specifies whether callbacks
|
294
|
+
# should be run.
|
295
|
+
#
|
296
|
+
# @return [ Document ] A new document.
|
297
|
+
def instantiate(attrs = nil, selected_fields = nil, &block)
|
298
|
+
instantiate_document(attrs, selected_fields, execute_callbacks: true, &block)
|
299
|
+
end
|
300
|
+
|
301
|
+
# Instantiate the document.
|
302
|
+
#
|
303
|
+
# @param [ Hash ] attrs The hash of attributes to instantiate with.
|
304
|
+
# @param [ Integer ] selected_fields The selected fields from the
|
305
|
+
# criteria.
|
306
|
+
# @param [ true | false ] execute_callbacks Flag specifies whether callbacks
|
307
|
+
# should be run.
|
278
308
|
#
|
279
309
|
# @return [ Document ] A new document.
|
280
310
|
#
|
281
311
|
# @api private
|
282
|
-
def
|
312
|
+
def instantiate_document(attrs = nil, selected_fields = nil, execute_callbacks: true)
|
283
313
|
attributes = if Mongoid.legacy_attributes
|
284
314
|
attrs
|
285
315
|
else
|
@@ -289,13 +319,38 @@ module Mongoid
|
|
289
319
|
doc = allocate
|
290
320
|
doc.__selected_fields = selected_fields
|
291
321
|
doc.instance_variable_set(:@attributes, attributes)
|
292
|
-
|
293
|
-
|
294
|
-
|
295
|
-
doc.
|
322
|
+
# TODO: remove the to_h when the legacy_attributes flag is removed.
|
323
|
+
# The to_h ensures that we don't accidentally make attributes_before_type_cast
|
324
|
+
# a BSON::Document.
|
325
|
+
doc.instance_variable_set(:@attributes_before_type_cast, attributes&.to_h.dup)
|
326
|
+
|
327
|
+
if execute_callbacks
|
328
|
+
doc.apply_defaults
|
329
|
+
yield(doc) if block_given?
|
330
|
+
doc.run_callbacks(:find) unless doc._find_callbacks.empty?
|
331
|
+
doc.run_callbacks(:initialize) unless doc._initialize_callbacks.empty?
|
332
|
+
else
|
333
|
+
yield(doc) if block_given?
|
334
|
+
doc.pending_callbacks += [:apply_defaults, :find, :initialize]
|
335
|
+
end
|
336
|
+
|
296
337
|
doc
|
297
338
|
end
|
298
339
|
|
340
|
+
# Allocates and constructs a document.
|
341
|
+
#
|
342
|
+
# @param [ Hash ] attrs The attributes to set up the document with.
|
343
|
+
# @param [ true | false ] execute_callbacks Flag specifies whether callbacks
|
344
|
+
# should be run.
|
345
|
+
#
|
346
|
+
# @return [ Document ] A new document.
|
347
|
+
#
|
348
|
+
# @api private
|
349
|
+
def construct_document(attrs = nil, execute_callbacks: true)
|
350
|
+
doc = allocate
|
351
|
+
doc.send(:construct_document, attrs, execute_callbacks: execute_callbacks)
|
352
|
+
end
|
353
|
+
|
299
354
|
# Returns all types to query for when using this class as the base.
|
300
355
|
#
|
301
356
|
# @example Get the types.
|
data/lib/mongoid/equality.rb
CHANGED
@@ -44,9 +44,9 @@ module Mongoid
|
|
44
44
|
# @return [ true, false ] True if the classes are equal, false if not.
|
45
45
|
def ===(other)
|
46
46
|
if Mongoid.legacy_triple_equals
|
47
|
-
other.class == Class ? self.class === other : self == other
|
48
|
-
else
|
49
47
|
super
|
48
|
+
else
|
49
|
+
other.class == Class ? self.class === other : self == other
|
50
50
|
end
|
51
51
|
end
|
52
52
|
|
@@ -73,9 +73,9 @@ module Mongoid
|
|
73
73
|
# @return [ true, false ] True if the classes are equal, false if not.
|
74
74
|
def ===(other)
|
75
75
|
if Mongoid.legacy_triple_equals
|
76
|
-
other.class == Class ? self <= other : other.is_a?(self)
|
77
|
-
else
|
78
76
|
other.is_a?(self)
|
77
|
+
else
|
78
|
+
other.class == Class ? self <= other : other.is_a?(self)
|
79
79
|
end
|
80
80
|
end
|
81
81
|
end
|
@@ -20,7 +20,8 @@ module Mongoid
|
|
20
20
|
#
|
21
21
|
# @param [ Class ] klass The model class.
|
22
22
|
# @param [ Hash, Array, Object ] params The attributes or ids.
|
23
|
-
# @param [ Array ] unmatched The unmatched ids, if appropriate
|
23
|
+
# @param [ Array, Hash ] unmatched The unmatched ids, if appropriate. If
|
24
|
+
# there is a shard key this will be a hash.
|
24
25
|
def initialize(klass, params, unmatched = nil)
|
25
26
|
if !unmatched && !params.is_a?(Hash)
|
26
27
|
unmatched = Array(params) if params
|
@@ -35,7 +36,8 @@ module Mongoid
|
|
35
36
|
searched: searched(params),
|
36
37
|
attributes: params,
|
37
38
|
total: total(params),
|
38
|
-
missing: missing(unmatched)
|
39
|
+
missing: missing(unmatched),
|
40
|
+
shard_key: shard_key(unmatched)
|
39
41
|
}
|
40
42
|
)
|
41
43
|
)
|
@@ -54,6 +56,8 @@ module Mongoid
|
|
54
56
|
def missing(unmatched)
|
55
57
|
if unmatched.is_a?(::Array)
|
56
58
|
unmatched.join(", ")
|
59
|
+
elsif unmatched.is_a?(::Hash)
|
60
|
+
unmatched[:_id] || unmatched["_id"]
|
57
61
|
else
|
58
62
|
unmatched
|
59
63
|
end
|
@@ -0,0 +1,23 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Mongoid
|
4
|
+
module Errors
|
5
|
+
|
6
|
+
# This error is raised when trying to use the setter for a field that starts
|
7
|
+
# with a dollar sign ($) or contains a dot/period (.).
|
8
|
+
class InvalidDotDollarAssignment < MongoidError
|
9
|
+
|
10
|
+
# Create the new error.
|
11
|
+
#
|
12
|
+
# @param [ Class ] klass The class of the document.
|
13
|
+
# @param [ Class ] attr The attribute attempted to be written.
|
14
|
+
#
|
15
|
+
# @api private
|
16
|
+
def initialize(klass, attr)
|
17
|
+
super(
|
18
|
+
compose_message("invalid_dot_dollar_assignment", { klass: klass, attr: attr })
|
19
|
+
)
|
20
|
+
end
|
21
|
+
end
|
22
|
+
end
|
23
|
+
end
|
@@ -12,14 +12,18 @@ module Mongoid
|
|
12
12
|
# @example Create the error.
|
13
13
|
# InvalidField.new(person, :crazy_method_name)
|
14
14
|
#
|
15
|
+
# @api private
|
16
|
+
#
|
15
17
|
# @param [ Class ] klass The document class.
|
18
|
+
# @param [ Symbol ] field The field name.
|
16
19
|
# @param [ Symbol ] name The method name.
|
17
|
-
def initialize(klass, name)
|
20
|
+
def initialize(klass, field, name)
|
18
21
|
super(
|
19
22
|
compose_message(
|
20
23
|
"invalid_field",
|
21
24
|
{
|
22
25
|
name: name,
|
26
|
+
field: field,
|
23
27
|
origin: origin(klass, name),
|
24
28
|
file: location(klass, name)[0],
|
25
29
|
line: location(klass, name)[1]
|
@@ -0,0 +1,26 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Mongoid
|
4
|
+
module Errors
|
5
|
+
|
6
|
+
# This error is raised when trying to define a field using a :type option value
|
7
|
+
# that is not present in the field type mapping.
|
8
|
+
class InvalidFieldType < MongoidError
|
9
|
+
|
10
|
+
# Create the new error.
|
11
|
+
#
|
12
|
+
# @example Instantiate the error.
|
13
|
+
# InvalidFieldType.new('Person', 'first_name', 'stringgy')
|
14
|
+
#
|
15
|
+
# @param [ String ] klass The model class.
|
16
|
+
# @param [ String ] field The field on which the invalid type is used.
|
17
|
+
# @param [ Symbol | String ] type The value of the field :type option.
|
18
|
+
def initialize(klass, field, type)
|
19
|
+
super(
|
20
|
+
compose_message('invalid_field_type',
|
21
|
+
klass: klass, field: field, type_inspection: type.inspect)
|
22
|
+
)
|
23
|
+
end
|
24
|
+
end
|
25
|
+
end
|
26
|
+
end
|
data/lib/mongoid/errors.rb
CHANGED
@@ -6,7 +6,6 @@ require "mongoid/errors/callback"
|
|
6
6
|
require "mongoid/errors/criteria_argument_required"
|
7
7
|
require "mongoid/errors/document_not_destroyed"
|
8
8
|
require "mongoid/errors/document_not_found"
|
9
|
-
require "mongoid/errors/eager_load"
|
10
9
|
require "mongoid/errors/empty_config_file"
|
11
10
|
require "mongoid/errors/in_memory_collation_not_supported"
|
12
11
|
require "mongoid/errors/invalid_collection"
|
@@ -15,6 +14,7 @@ require "mongoid/errors/invalid_config_option"
|
|
15
14
|
require "mongoid/errors/invalid_dependent_strategy"
|
16
15
|
require "mongoid/errors/invalid_field"
|
17
16
|
require "mongoid/errors/invalid_field_option"
|
17
|
+
require "mongoid/errors/invalid_field_type"
|
18
18
|
require "mongoid/errors/invalid_find"
|
19
19
|
require "mongoid/errors/invalid_includes"
|
20
20
|
require "mongoid/errors/invalid_index"
|
@@ -24,6 +24,7 @@ require "mongoid/errors/invalid_persistence_option"
|
|
24
24
|
require "mongoid/errors/invalid_query"
|
25
25
|
# Must be after invalid_query.
|
26
26
|
require "mongoid/errors/invalid_discriminator_key_target"
|
27
|
+
require "mongoid/errors/invalid_dot_dollar_assignment"
|
27
28
|
require "mongoid/errors/invalid_elem_match_operator"
|
28
29
|
require "mongoid/errors/invalid_estimated_count_criteria"
|
29
30
|
require "mongoid/errors/invalid_expression_operator"
|
@@ -36,7 +37,6 @@ require "mongoid/errors/invalid_set_polymorphic_relation"
|
|
36
37
|
require "mongoid/errors/invalid_storage_options"
|
37
38
|
require "mongoid/errors/invalid_storage_parent"
|
38
39
|
require "mongoid/errors/invalid_time"
|
39
|
-
require "mongoid/errors/invalid_value"
|
40
40
|
require "mongoid/errors/inverse_not_found"
|
41
41
|
require "mongoid/errors/mixed_relations"
|
42
42
|
require "mongoid/errors/mixed_client_configuration"
|
@@ -87,7 +87,7 @@ module Mongoid
|
|
87
87
|
# @example Mongoize the object.
|
88
88
|
# object.mongoize
|
89
89
|
#
|
90
|
-
# @return [ Array ] The object.
|
90
|
+
# @return [ Array | nil ] The object or nil.
|
91
91
|
def mongoize
|
92
92
|
::Array.mongoize(self)
|
93
93
|
end
|
@@ -144,12 +144,12 @@ module Mongoid
|
|
144
144
|
#
|
145
145
|
# @param [ Object ] object The object to mongoize.
|
146
146
|
#
|
147
|
-
# @return [ Array ] The object mongoized.
|
147
|
+
# @return [ Array | nil ] The object mongoized or nil.
|
148
148
|
def mongoize(object)
|
149
|
-
if object.
|
150
|
-
|
151
|
-
|
152
|
-
|
149
|
+
return if object.nil?
|
150
|
+
case object
|
151
|
+
when ::Array, ::Set
|
152
|
+
object.map(&:mongoize)
|
153
153
|
end
|
154
154
|
end
|
155
155
|
|
@@ -169,3 +169,5 @@ end
|
|
169
169
|
|
170
170
|
::Array.__send__(:include, Mongoid::Extensions::Array)
|
171
171
|
::Array.extend(Mongoid::Extensions::Array::ClassMethods)
|
172
|
+
|
173
|
+
::Mongoid.deprecate(Array, :blank_criteria)
|
@@ -20,9 +20,9 @@ module Mongoid
|
|
20
20
|
# @example Mongoize the object.
|
21
21
|
# object.mongoize
|
22
22
|
#
|
23
|
-
# @return [
|
23
|
+
# @return [ String | BSON::Decimal128 | nil ] The object or nil.
|
24
24
|
def mongoize
|
25
|
-
|
25
|
+
::BigDecimal.mongoize(self)
|
26
26
|
end
|
27
27
|
|
28
28
|
# Is the BigDecimal a number?
|
@@ -39,26 +39,45 @@ module Mongoid
|
|
39
39
|
|
40
40
|
# Convert the object from its mongo friendly ruby type to this type.
|
41
41
|
#
|
42
|
-
# @example Demongoize the object.
|
43
|
-
# Object.demongoize(object)
|
44
|
-
#
|
45
42
|
# @param [ Object ] object The object to demongoize.
|
46
43
|
#
|
47
|
-
# @return [ BigDecimal
|
44
|
+
# @return [ BigDecimal | nil ] A BigDecimal derived from the object or nil.
|
48
45
|
def demongoize(object)
|
49
|
-
|
46
|
+
return if object.blank?
|
47
|
+
if object.is_a?(BSON::Decimal128)
|
48
|
+
object.to_big_decimal
|
49
|
+
elsif object.numeric?
|
50
|
+
BigDecimal(object.to_s)
|
51
|
+
elsif object.numeric?
|
52
|
+
object.to_d
|
53
|
+
end
|
50
54
|
end
|
51
55
|
|
52
|
-
# Mongoize an object of any type to how it's stored in the db
|
56
|
+
# Mongoize an object of any type to how it's stored in the db.
|
53
57
|
#
|
54
58
|
# @example Mongoize the object.
|
55
59
|
# BigDecimal.mongoize(123)
|
56
60
|
#
|
57
61
|
# @param [ Object ] object The object to Mongoize
|
58
62
|
#
|
59
|
-
# @return [ String
|
63
|
+
# @return [ String | BSON::Decimal128 | nil ] A String or Decimal128
|
64
|
+
# representing the object or nil. String if Mongoid.map_big_decimal_to_decimal128
|
65
|
+
# is false, BSON::Decimal128 otherwise.
|
60
66
|
def mongoize(object)
|
61
|
-
|
67
|
+
return if object.blank?
|
68
|
+
if Mongoid.map_big_decimal_to_decimal128
|
69
|
+
if object.is_a?(BSON::Decimal128)
|
70
|
+
object
|
71
|
+
elsif object.is_a?(BigDecimal)
|
72
|
+
BSON::Decimal128.new(object)
|
73
|
+
elsif object.numeric?
|
74
|
+
BSON::Decimal128.new(object.to_s)
|
75
|
+
end
|
76
|
+
else
|
77
|
+
if object.is_a?(BSON::Decimal128) || object.numeric?
|
78
|
+
object.to_s
|
79
|
+
end
|
80
|
+
end
|
62
81
|
end
|
63
82
|
end
|
64
83
|
end
|