aquasync_model 0.1.1 → 0.1.2
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 +3 -2
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: cdfc373678e7208e1a2e20ccf3d4f143f3cae718
|
4
|
+
data.tar.gz: 3fcccdcf5243e914d9df62a6b6a6ef51fb9dc720
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1f6103937ac58cbfe06276db4b2e92b162275b375c14a7fc67ca8bc5b362216526ecbded76a3c2c98e0597d6e212fa7c955710b776def67d0e6ff801f9c180d6
|
7
|
+
data.tar.gz: 0616a7406bcc8d68233aa5cb92e86f536897ae06db764d2577bae6a2954c6b5a98934f2366d9a18ec9fb72cea43c55d1078edc13bd85cd6da1b1f02c578415da
|
@@ -10,7 +10,8 @@ module Aquasync
|
|
10
10
|
included do
|
11
11
|
# @param [Hash]
|
12
12
|
def resolve_conflict(delta)
|
13
|
-
|
13
|
+
raise "localTimestamp is nil" if delta["localTimestamp"] == nil
|
14
|
+
self.update_attributes!(delta) if delta["localTimestamp"] > self.localTimestamp
|
14
15
|
end
|
15
16
|
end
|
16
17
|
|
@@ -40,7 +41,7 @@ module Aquasync
|
|
40
41
|
|
41
42
|
# @param [Hash]
|
42
43
|
def create_record_from_delta(delta)
|
43
|
-
create(delta)
|
44
|
+
create!(delta)
|
44
45
|
end
|
45
46
|
end
|
46
47
|
end
|