standard-file 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39559e4562a8d4f09794b97733ca35d42c330140
-  data.tar.gz: 89c673d3b1e6c9b4d4446a75c39f3756a183a5f9
+  metadata.gz: 6ab8f64216e606826f8cf9724b89725e0e36fa77
+  data.tar.gz: e5fcc42d7de62ebbdc7baf0e30a0773cda1eb2d2
 SHA512:
-  metadata.gz: bcc6730ea94c1ad69e873c64579a36cc9b14ccf8d1b8d4f0a4129efb74638915fd260e4ba29f50e3b18e43fda7b5a40591e52cc856a6f5b7e061c27876443151
-  data.tar.gz: 67ee554182636ef784148d1a6fb2420e188f26d4399357c9a6dde2ac8c97de138d46185f3dbe13effc7c64a416b444a6b2ad3c757461977db193281e2499e3bc
+  metadata.gz: eb025676ebfbe79137614e2c799a8b80a09542450dc11327fd2ca31a757998e6a6a7fcacb143e1f083ac7a502c3193552bb9968eb56be88e48303a7111b228e2
+  data.tar.gz: f20eced00dd47a3a496e8f0ce932d996a85c8f1864de2aab3e9c12631a2eb572fcb84861f2b05d09d58d825213ad4ea0088d7ca867093e47a423c9ef6d6fb778

data/lib/standard_file/sync_manager.rb

@@ -26,8 +26,6 @@ module StandardFile
       saved_items, unsaved = _sync_save(item_hashes)
       if saved_items.length > 0
         last_updated = saved_items.sort_by{|m| m.updated_at}.last.updated_at
-        # add 1 microsecond to avoid returning same object in subsequent sync
-        last_updated = (last_updated.to_time + 1/100000.0).to_datetime.utc
       end
 
       # manage conflicts
@@ -46,11 +44,18 @@ module StandardFile
           dup = conflicted.dup
           dup.user = conflicted.user
           dup.save
-          retrieved_items.push(dup)
+          dup_json = dup.as_json({})
+          dup_json[:conflict_of] = conflicted.uuid
+          retrieved_items.push(dup_json)
+
+          last_updated = dup.updated_at
         end
         retrieved_items.delete(conflicted)
       end
 
+      # add 1 microsecond to avoid returning same object in subsequent sync
+      last_updated = (last_updated.to_time + 1/100000.0).to_datetime.utc
+
       sync_token = sync_token_from_datetime(last_updated)
       return {
         :retrieved_items => retrieved_items,

data/lib/standard_file/version.rb

@@ -1,3 +1,3 @@
 module StandardFile
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: standard-file
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Standard File
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-01 00:00:00.000000000 Z
+date: 2017-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails