standard-file 0.3.2 → 0.3.3
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 05c848ebb3f69c126fa21c0868de2c8a79444fe9
|
4
|
+
data.tar.gz: 6fae684f6e09e53a1b25b89df21a32f249257183
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f208c915128fd925380121d16784f8819e55ad09a883a5481e0b347c918d011a03d3f85dddf5afd21e0cfd95b5c3c06c8e2e1a1ab0fdf0152e8bff686871f1b7
|
7
|
+
data.tar.gz: ca1901640974801646d5eb3390ce24194bd3b2c795feb3021708c56374fdb7bb460a822b123dd0d125a85fa4c30f6390332a3fd7ab036d0c18a899f833a859ea
|
@@ -48,13 +48,10 @@ module StandardFile
|
|
48
48
|
saved = saved_items.find{|i| i.uuid == conflicted_uuid}
|
49
49
|
conflicted = retrieved_items.find{|i| i.uuid == conflicted_uuid}
|
50
50
|
if (saved.updated_at - conflicted.updated_at).abs > min_conflict_interval
|
51
|
-
# puts "\n\n\n Creating conflicted copy of #{saved.uuid}\n\n\n"
|
52
|
-
|
53
51
|
unsaved_items.push({
|
54
52
|
:item => conflicted,
|
55
53
|
:error => {:tag => "sync_conflict"}
|
56
54
|
})
|
57
|
-
|
58
55
|
end
|
59
56
|
|
60
57
|
# We remove the item from retrieved items whether or not it satisfies the min_conflict_interval
|
@@ -86,9 +83,6 @@ module StandardFile
|
|
86
83
|
|
87
84
|
item.last_user_agent = request.user_agent
|
88
85
|
item.update(item_hash.permit(*permitted_params))
|
89
|
-
# we want to force update the updated_at field, even if no changes were made
|
90
|
-
# item.touch
|
91
|
-
|
92
86
|
|
93
87
|
if item.deleted == true
|
94
88
|
set_deleted(item)
|
@@ -45,13 +45,18 @@ module StandardFile
|
|
45
45
|
|
46
46
|
auth_params = {
|
47
47
|
:identifier => user.email,
|
48
|
-
:pw_salt => user.pw_salt,
|
49
48
|
:pw_cost => user.pw_cost,
|
50
49
|
:pw_nonce => user.pw_nonce,
|
51
50
|
:version => user.version
|
52
51
|
}
|
53
52
|
|
53
|
+
if user.pw_salt
|
54
|
+
#v002 only
|
55
|
+
auth_params[:pw_salt] = user.pw_salt
|
56
|
+
end
|
57
|
+
|
54
58
|
if user.pw_func
|
59
|
+
#v001 only
|
55
60
|
auth_params[:pw_func] = user.pw_func
|
56
61
|
auth_params[:pw_alg] = user.pw_alg
|
57
62
|
auth_params[:pw_key_size] = user.pw_key_size
|