aquasync_model 0.2.0 → 0.2.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/models/concerns/aquasync_aggregated_methods.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 21ed94577a5fd1e074183f1d969e931caac6abe7
|
|
4
|
+
data.tar.gz: 34ceea0faf8a972196edb48244cbcfd296732572
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d86e51026d09f14f04b004d0ad35926ff5cad63be2c3322ed14102fbd50f179622a01c58ccbabb00d1e4bc89014fc07ef1ffc1dca92a8d249997a5345288b19a
|
|
7
|
+
data.tar.gz: 919cf92d661933f5488e593ebd3709992e3f66a80bf623f47cc17dddbf89e2abd8ace32f0beff955e473c7810ce58f5ce6d82f23ec9855974bbbca6fab18fbe0
|
|
@@ -12,7 +12,7 @@ module Aquasync
|
|
|
12
12
|
# @param [Hash]
|
|
13
13
|
def resolve_conflict(delta)
|
|
14
14
|
raise "localTimestamp is nil" if delta["localTimestamp"] == nil
|
|
15
|
-
self.update_attributes!(delta) if delta["localTimestamp"] > self.localTimestamp
|
|
15
|
+
self.update_attributes!(delta) if delta["localTimestamp"].to_i > self.localTimestamp
|
|
16
16
|
end
|
|
17
17
|
end
|
|
18
18
|
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: aquasync_model
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.2.
|
|
4
|
+
version: 0.2.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- kaiinui
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2014-08-
|
|
11
|
+
date: 2014-08-05 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: mongoid
|