mongo_mapper 0.13.1 → 0.14.0.rc1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +13 -5
- data/README.rdoc +3 -6
- data/lib/mongo_mapper.rb +1 -0
- data/lib/mongo_mapper/document.rb +2 -0
- data/lib/mongo_mapper/extensions/array.rb +14 -6
- data/lib/mongo_mapper/extensions/hash.rb +15 -3
- data/lib/mongo_mapper/extensions/object.rb +4 -0
- data/lib/mongo_mapper/extensions/string.rb +13 -5
- data/lib/mongo_mapper/plugins/accessible.rb +12 -11
- data/lib/mongo_mapper/plugins/associations.rb +7 -6
- data/lib/mongo_mapper/plugins/associations/base.rb +13 -12
- data/lib/mongo_mapper/plugins/associations/belongs_to_polymorphic_proxy.rb +9 -8
- data/lib/mongo_mapper/plugins/associations/belongs_to_proxy.rb +12 -11
- data/lib/mongo_mapper/plugins/associations/embedded_collection.rb +4 -4
- data/lib/mongo_mapper/plugins/associations/in_array_proxy.rb +24 -23
- data/lib/mongo_mapper/plugins/associations/many_documents_as_proxy.rb +18 -16
- data/lib/mongo_mapper/plugins/associations/many_documents_proxy.rb +55 -48
- data/lib/mongo_mapper/plugins/associations/many_embedded_polymorphic_proxy.rb +14 -13
- data/lib/mongo_mapper/plugins/associations/many_embedded_proxy.rb +7 -6
- data/lib/mongo_mapper/plugins/associations/many_polymorphic_proxy.rb +7 -5
- data/lib/mongo_mapper/plugins/associations/one_as_proxy.rb +14 -11
- data/lib/mongo_mapper/plugins/associations/one_embedded_polymorphic_proxy.rb +14 -13
- data/lib/mongo_mapper/plugins/associations/one_embedded_proxy.rb +9 -9
- data/lib/mongo_mapper/plugins/associations/one_proxy.rb +27 -26
- data/lib/mongo_mapper/plugins/associations/proxy.rb +29 -26
- data/lib/mongo_mapper/plugins/callbacks.rb +13 -0
- data/lib/mongo_mapper/plugins/counter_cache.rb +23 -4
- data/lib/mongo_mapper/plugins/dirty.rb +2 -2
- data/lib/mongo_mapper/plugins/dynamic_querying.rb +10 -9
- data/lib/mongo_mapper/plugins/dynamic_querying/dynamic_finder.rb +17 -16
- data/lib/mongo_mapper/plugins/embedded_callbacks.rb +1 -1
- data/lib/mongo_mapper/plugins/identity_map.rb +1 -1
- data/lib/mongo_mapper/plugins/indexes.rb +1 -1
- data/lib/mongo_mapper/plugins/keys.rb +158 -158
- data/lib/mongo_mapper/plugins/keys/key.rb +16 -10
- data/lib/mongo_mapper/plugins/keys/static.rb +45 -0
- data/lib/mongo_mapper/plugins/modifiers.rb +27 -26
- data/lib/mongo_mapper/plugins/partial_updates.rb +86 -0
- data/lib/mongo_mapper/plugins/persistence.rb +7 -6
- data/lib/mongo_mapper/plugins/protected.rb +6 -5
- data/lib/mongo_mapper/plugins/querying.rb +80 -43
- data/lib/mongo_mapper/plugins/querying/decorated_plucky_query.rb +14 -9
- data/lib/mongo_mapper/plugins/scopes.rb +78 -7
- data/lib/mongo_mapper/plugins/timestamps.rb +1 -0
- data/lib/mongo_mapper/plugins/validations.rb +0 -0
- data/lib/mongo_mapper/version.rb +1 -1
- data/lib/rails/generators/mongo_mapper/config/config_generator.rb +12 -13
- data/lib/rails/generators/mongo_mapper/model/model_generator.rb +9 -9
- data/spec/functional/accessible_spec.rb +12 -12
- data/spec/functional/associations/belongs_to_polymorphic_proxy_spec.rb +11 -11
- data/spec/functional/associations/belongs_to_proxy_spec.rb +14 -15
- data/spec/functional/associations/in_array_proxy_spec.rb +6 -6
- data/spec/functional/associations/many_documents_proxy_spec.rb +89 -18
- data/spec/functional/associations/many_embedded_polymorphic_proxy_spec.rb +11 -11
- data/spec/functional/associations/many_embedded_proxy_spec.rb +1 -1
- data/spec/functional/associations/one_as_proxy_spec.rb +14 -14
- data/spec/functional/associations/one_embedded_polymorphic_proxy_spec.rb +9 -9
- data/spec/functional/associations/one_embedded_proxy_spec.rb +3 -3
- data/spec/functional/associations/one_proxy_spec.rb +14 -14
- data/spec/functional/caching_spec.rb +8 -8
- data/spec/functional/callbacks_spec.rb +87 -0
- data/spec/functional/counter_cache_spec.rb +89 -0
- data/spec/functional/dirty_spec.rb +41 -41
- data/spec/functional/document_spec.rb +3 -3
- data/spec/functional/embedded_document_spec.rb +18 -18
- data/spec/functional/identity_map_spec.rb +28 -15
- data/spec/functional/indexes_spec.rb +4 -4
- data/spec/functional/keys_spec.rb +12 -3
- data/spec/functional/logger_spec.rb +1 -1
- data/spec/functional/modifiers_spec.rb +2 -2
- data/spec/functional/partial_updates_spec.rb +577 -0
- data/spec/functional/protected_spec.rb +13 -13
- data/spec/functional/querying_spec.rb +11 -10
- data/spec/functional/safe_spec.rb +2 -2
- data/spec/functional/sci_spec.rb +3 -3
- data/spec/functional/scopes_spec.rb +234 -1
- data/spec/functional/static_keys_spec.rb +153 -0
- data/spec/functional/stats_spec.rb +0 -4
- data/spec/functional/touch_spec.rb +1 -1
- data/spec/functional/validations_spec.rb +59 -57
- data/spec/quality_spec.rb +1 -1
- data/spec/spec_helper.rb +7 -3
- data/spec/support/matchers.rb +4 -13
- data/spec/unit/associations/base_spec.rb +12 -12
- data/spec/unit/associations/belongs_to_association_spec.rb +2 -2
- data/spec/unit/associations/many_association_spec.rb +2 -2
- data/spec/unit/associations/one_association_spec.rb +2 -2
- data/spec/unit/associations/proxy_spec.rb +13 -15
- data/spec/unit/document_spec.rb +5 -5
- data/spec/unit/dynamic_finder_spec.rb +8 -8
- data/spec/unit/embedded_document_spec.rb +14 -14
- data/spec/unit/extensions_spec.rb +17 -17
- data/spec/unit/identity_map_middleware_spec.rb +5 -5
- data/spec/unit/key_spec.rb +24 -21
- data/spec/unit/keys_spec.rb +5 -5
- data/spec/unit/mongo_mapper_spec.rb +26 -26
- data/spec/unit/rails_spec.rb +2 -2
- data/spec/unit/serialization_spec.rb +1 -1
- data/spec/unit/time_zones_spec.rb +2 -2
- data/spec/unit/validations_spec.rb +28 -15
- metadata +16 -14
- data/lib/mongo_mapper/connections/10gen.rb +0 -0
- data/lib/mongo_mapper/connections/moped.rb +0 -0
@@ -80,63 +80,70 @@ module MongoMapper
|
|
80
80
|
load_target.each(&block)
|
81
81
|
end
|
82
82
|
|
83
|
-
|
84
|
-
def query(options={})
|
85
|
-
klass.
|
86
|
-
query(association.query_options).
|
87
|
-
amend(options).amend(criteria)
|
88
|
-
end
|
83
|
+
protected
|
89
84
|
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
# If we got a single record of this classas a result, return it
|
98
|
-
when klass
|
99
|
-
result
|
100
|
-
|
101
|
-
# If we got an array of this class as a result, return it
|
102
|
-
when Array
|
103
|
-
if result[0].is_a? klass
|
104
|
-
result
|
105
|
-
else
|
106
|
-
super
|
107
|
-
end
|
108
|
-
else
|
109
|
-
super
|
110
|
-
end
|
111
|
-
else
|
112
|
-
super
|
113
|
-
end
|
114
|
-
end
|
85
|
+
def query(options={})
|
86
|
+
klass.
|
87
|
+
query(association.query_options).
|
88
|
+
amend(options).
|
89
|
+
amend(criteria)
|
90
|
+
end
|
115
91
|
|
116
|
-
|
117
|
-
|
118
|
-
|
92
|
+
def criteria
|
93
|
+
{self.foreign_key => proxy_owner.id}
|
94
|
+
end
|
119
95
|
|
120
|
-
|
121
|
-
|
122
|
-
|
96
|
+
def find_target
|
97
|
+
all
|
98
|
+
end
|
123
99
|
|
124
|
-
|
125
|
-
|
126
|
-
|
100
|
+
def ensure_owner_saved
|
101
|
+
proxy_owner.save unless proxy_owner.persisted?
|
102
|
+
end
|
127
103
|
|
128
|
-
|
129
|
-
|
130
|
-
|
104
|
+
def prepare(doc)
|
105
|
+
klass === doc ? apply_scope(doc) : build(doc)
|
106
|
+
end
|
131
107
|
|
132
|
-
|
133
|
-
|
134
|
-
|
108
|
+
def apply_scope(doc)
|
109
|
+
criteria.each { |key, value| doc[key] = value }
|
110
|
+
doc
|
111
|
+
end
|
112
|
+
|
113
|
+
def foreign_key
|
114
|
+
options[:foreign_key] || proxy_owner.class.name.foreign_key
|
115
|
+
end
|
116
|
+
|
117
|
+
private
|
118
|
+
|
119
|
+
def method_missing(method, *args, &block)
|
120
|
+
return super unless klass.respond_to?(method)
|
121
|
+
|
122
|
+
result = nil
|
123
|
+
|
124
|
+
query.with_scope(query.criteria_hash) do
|
125
|
+
result = klass.send(method, *args, &block)
|
135
126
|
end
|
136
127
|
|
137
|
-
|
138
|
-
|
128
|
+
case result
|
129
|
+
when Plucky::Query
|
130
|
+
query.merge result
|
131
|
+
|
132
|
+
# If we got a single record of this class as a result, return it
|
133
|
+
when klass
|
134
|
+
result
|
135
|
+
|
136
|
+
# If we got an array of this class as a result, return it
|
137
|
+
when Array
|
138
|
+
if result[0].is_a? klass
|
139
|
+
result
|
140
|
+
else
|
141
|
+
super
|
142
|
+
end
|
143
|
+
else
|
144
|
+
super
|
139
145
|
end
|
146
|
+
end
|
140
147
|
end
|
141
148
|
end
|
142
149
|
end
|
@@ -10,22 +10,23 @@ module MongoMapper
|
|
10
10
|
reset
|
11
11
|
end
|
12
12
|
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
13
|
+
protected
|
14
|
+
|
15
|
+
def find_target
|
16
|
+
(@_values || []).map do |hash|
|
17
|
+
child = polymorphic_class(hash).load(hash, true)
|
18
|
+
assign_references(child)
|
19
|
+
child
|
20
20
|
end
|
21
|
+
end
|
21
22
|
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
end
|
23
|
+
def polymorphic_class(doc)
|
24
|
+
if class_name = doc[association.type_key_name]
|
25
|
+
class_name.constantize
|
26
|
+
else
|
27
|
+
klass
|
28
28
|
end
|
29
|
+
end
|
29
30
|
end
|
30
31
|
end
|
31
32
|
end
|
@@ -10,14 +10,15 @@ module MongoMapper
|
|
10
10
|
reset
|
11
11
|
end
|
12
12
|
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
13
|
+
private
|
14
|
+
|
15
|
+
def find_target
|
16
|
+
(@_values ||= []).map do |attrs|
|
17
|
+
klass.load(attrs, true).tap do |child|
|
18
|
+
assign_references(child)
|
19
19
|
end
|
20
20
|
end
|
21
|
+
end
|
21
22
|
end
|
22
23
|
end
|
23
24
|
end
|
@@ -3,11 +3,13 @@ module MongoMapper
|
|
3
3
|
module Plugins
|
4
4
|
module Associations
|
5
5
|
class ManyPolymorphicProxy < ManyDocumentsProxy
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
6
|
+
|
7
|
+
private
|
8
|
+
|
9
|
+
def apply_scope(doc)
|
10
|
+
doc[association.type_key_name] = doc.class.name
|
11
|
+
super
|
12
|
+
end
|
11
13
|
end
|
12
14
|
end
|
13
15
|
end
|
@@ -3,19 +3,22 @@ module MongoMapper
|
|
3
3
|
module Plugins
|
4
4
|
module Associations
|
5
5
|
class OneAsProxy < OneProxy
|
6
|
-
protected
|
7
|
-
def criteria
|
8
|
-
{type_key_name => proxy_owner.class.name, id_key_name => proxy_owner.id}
|
9
|
-
end
|
10
6
|
|
11
|
-
|
12
|
-
def type_key_name
|
13
|
-
"#{options[:as]}_type"
|
14
|
-
end
|
7
|
+
protected
|
15
8
|
|
16
|
-
|
17
|
-
|
18
|
-
|
9
|
+
def criteria
|
10
|
+
{type_key_name => proxy_owner.class.name, id_key_name => proxy_owner.id}
|
11
|
+
end
|
12
|
+
|
13
|
+
private
|
14
|
+
|
15
|
+
def type_key_name
|
16
|
+
"#{options[:as]}_type"
|
17
|
+
end
|
18
|
+
|
19
|
+
def id_key_name
|
20
|
+
"#{options[:as]}_id"
|
21
|
+
end
|
19
22
|
end
|
20
23
|
end
|
21
24
|
end
|
@@ -8,22 +8,23 @@ module MongoMapper
|
|
8
8
|
reset
|
9
9
|
end
|
10
10
|
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
11
|
+
protected
|
12
|
+
|
13
|
+
def find_target
|
14
|
+
if @value
|
15
|
+
child = polymorphic_class(@value).load(@value, true)
|
16
|
+
assign_references(child)
|
17
|
+
child
|
18
18
|
end
|
19
|
+
end
|
19
20
|
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
end
|
21
|
+
def polymorphic_class(doc)
|
22
|
+
if class_name = doc[association.type_key_name]
|
23
|
+
class_name.constantize
|
24
|
+
else
|
25
|
+
klass
|
26
26
|
end
|
27
|
+
end
|
27
28
|
end
|
28
29
|
end
|
29
30
|
end
|
@@ -25,19 +25,19 @@ module MongoMapper
|
|
25
25
|
@target.persist(options) if @target
|
26
26
|
end
|
27
27
|
|
28
|
-
|
28
|
+
protected
|
29
29
|
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
end
|
30
|
+
def find_target
|
31
|
+
if @value
|
32
|
+
klass.load(@value, true).tap do |child|
|
33
|
+
assign_references(child)
|
35
34
|
end
|
36
35
|
end
|
36
|
+
end
|
37
37
|
|
38
|
-
|
39
|
-
|
40
|
-
|
38
|
+
def assign_references(doc)
|
39
|
+
doc._parent_document = proxy_owner if doc
|
40
|
+
end
|
41
41
|
end
|
42
42
|
end
|
43
43
|
end
|
@@ -57,38 +57,39 @@ module MongoMapper
|
|
57
57
|
reset
|
58
58
|
end
|
59
59
|
|
60
|
-
|
61
|
-
def find_target
|
62
|
-
target_class.first(association.query_options.merge(criteria))
|
63
|
-
end
|
60
|
+
protected
|
64
61
|
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
@target
|
69
|
-
end
|
62
|
+
def find_target
|
63
|
+
target_class.first(association.query_options.merge(criteria))
|
64
|
+
end
|
70
65
|
|
71
|
-
|
72
|
-
|
73
|
-
|
66
|
+
def instantiate_target(instantiator, attrs={}, &block)
|
67
|
+
@target = target_class.send(instantiator, attrs.update(criteria), &block)
|
68
|
+
loaded
|
69
|
+
@target
|
70
|
+
end
|
74
71
|
|
75
|
-
|
76
|
-
|
77
|
-
|
72
|
+
def target_class
|
73
|
+
@target_class ||= options[:class] || (options[:class_name] || association.name.to_s.camelize).constantize
|
74
|
+
end
|
78
75
|
|
79
|
-
|
80
|
-
|
81
|
-
|
76
|
+
def foreign_key
|
77
|
+
options[:foreign_key] || proxy_owner.class.name.foreign_key
|
78
|
+
end
|
82
79
|
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
end
|
80
|
+
def criteria
|
81
|
+
{self.foreign_key => proxy_owner.id}
|
82
|
+
end
|
87
83
|
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
84
|
+
def nullify_scope(doc)
|
85
|
+
criteria.each { |key, value| doc[key] = nil }
|
86
|
+
doc
|
87
|
+
end
|
88
|
+
|
89
|
+
def apply_scope(doc)
|
90
|
+
criteria.each { |key, value| doc[key] = value }
|
91
|
+
doc
|
92
|
+
end
|
92
93
|
end
|
93
94
|
end
|
94
95
|
end
|
@@ -100,38 +100,41 @@ module MongoMapper
|
|
100
100
|
end
|
101
101
|
end
|
102
102
|
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
103
|
+
protected
|
104
|
+
|
105
|
+
def load_target
|
106
|
+
unless loaded?
|
107
|
+
if @target.is_a?(Array) && @target.any?
|
108
|
+
@target = find_target + @target.find_all { |record| !record.persisted? }
|
109
|
+
else
|
110
|
+
@target = find_target
|
107
111
|
end
|
112
|
+
loaded
|
108
113
|
end
|
114
|
+
@target
|
115
|
+
rescue MongoMapper::DocumentNotFound
|
116
|
+
reset
|
117
|
+
end
|
109
118
|
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
|
114
|
-
|
115
|
-
@target = find_target
|
116
|
-
end
|
117
|
-
loaded
|
118
|
-
end
|
119
|
-
@target
|
120
|
-
rescue MongoMapper::DocumentNotFound
|
121
|
-
reset
|
122
|
-
end
|
119
|
+
# :nocov:
|
120
|
+
def find_target
|
121
|
+
raise NotImplementedError
|
122
|
+
end
|
123
|
+
# :nocov:
|
123
124
|
|
124
|
-
|
125
|
-
|
126
|
-
|
127
|
-
end
|
128
|
-
|
125
|
+
def flatten_deeper(array)
|
126
|
+
array.collect do |element|
|
127
|
+
(element.respond_to?(:flatten) && !element.is_a?(Hash)) ? element.flatten : element
|
128
|
+
end.flatten
|
129
|
+
end
|
129
130
|
|
130
|
-
|
131
|
-
|
132
|
-
|
133
|
-
|
131
|
+
private
|
132
|
+
|
133
|
+
def method_missing(method, *args, &block)
|
134
|
+
if load_target
|
135
|
+
target.send(method, *args, &block)
|
134
136
|
end
|
137
|
+
end
|
135
138
|
end
|
136
139
|
end
|
137
140
|
end
|
@@ -4,6 +4,18 @@ module MongoMapper
|
|
4
4
|
module Callbacks
|
5
5
|
extend ActiveSupport::Concern
|
6
6
|
|
7
|
+
def initialize(*)
|
8
|
+
run_callbacks(:initialize) { super }
|
9
|
+
end
|
10
|
+
|
11
|
+
def initialize_from_database(*)
|
12
|
+
run_callbacks(:initialize) do
|
13
|
+
run_callbacks(:find) do
|
14
|
+
super
|
15
|
+
end
|
16
|
+
end
|
17
|
+
end
|
18
|
+
|
7
19
|
def destroy
|
8
20
|
run_callbacks(:destroy) { super }
|
9
21
|
end
|
@@ -13,6 +25,7 @@ module MongoMapper
|
|
13
25
|
end
|
14
26
|
|
15
27
|
private
|
28
|
+
|
16
29
|
def create_or_update(*)
|
17
30
|
run_callbacks(:save) { super }
|
18
31
|
end
|