standard-file 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b119105d8253ec0363b7eacef2f93de2f15ad39c
-  data.tar.gz: fce8a2904b7b5cb291a0d0588e21de6074adfcce
+  metadata.gz: ab9c9510debb2155ec3271b1997a11ff3997df23
+  data.tar.gz: 802ae9e8e6b97ded28df5561f1c60f4bd3d27339
 SHA512:
-  metadata.gz: 3029ce76229b771a8820819ea790ea32d66c01c821d68c72a30280b0a43e66936d7ad78c9b43a0512ac13b16e7b12bd8ff5fe2a27e868d08c5d139ffe744d1bd
-  data.tar.gz: a85108a38988fc9a126bc7751a86434c592a8305180fe45e6e5ee4b7fc6cf320eb86200f707aea1c3522c85c696d4f258b9070f2cd8270452d1b46ae9c2a3888
+  metadata.gz: d87fae4c82dc1d61a8bcb6546588a7321d1de94e1dd5d02929b37b97614c16b2735e7bb43d019213f44eb7fb1052313755a280043d29bb32d53b2d86cc1a623f
+  data.tar.gz: 9fadc2eb44affaaf1747f972698ba7fe6a9eaa650f9dc8bf725cc7c34740c84f5ecf41a3303e9cb3ac68a369d3c35b84fa7e53b82575aac902cd12dfa7a1dc91

data/lib/standard_file/sync_manager.rb

@@ -24,12 +24,12 @@ module StandardFile
 
       retrieved_items, cursor_token = _sync_get(in_sync_token, in_cursor_token, limit).to_a
       last_updated = DateTime.now
-      saved_items, unsaved = _sync_save(item_hashes)
+      saved_items, unsaved_items = _sync_save(item_hashes)
       if saved_items.length > 0
         last_updated = saved_items.sort_by{|m| m.updated_at}.last.updated_at
       end
 
-      last_updated = check_for_conflicts(saved_items, retrieved_items, last_updated)
+      check_for_conflicts(saved_items, retrieved_items, unsaved_items)
 
       # add 1 microsecond to avoid returning same object in subsequent sync
       last_updated = (last_updated.to_time + 1/100000.0).to_datetime.utc
@@ -38,13 +38,13 @@ module StandardFile
       return {
         :retrieved_items => retrieved_items,
         :saved_items => saved_items,
-        :unsaved => unsaved,
+        :unsaved => unsaved_items,
         :sync_token => sync_token,
         :cursor_token => cursor_token
       }
     end
 
-    def check_for_conflicts(saved_items, retrieved_items, last_updated)
+    def check_for_conflicts(saved_items, retrieved_items, unsaved_items)
       # conflicts occur when you are trying to save an item for which there is a pending change already
       min_conflict_interval = 20
 
@@ -53,24 +53,21 @@ module StandardFile
       conflicts = saved_ids & retrieved_ids # & is the intersection
       # saved items take precedence, retrieved items are duplicated with a new uuid
       conflicts.each do |conflicted_uuid|
-        # if changes are greater than min_conflict_interval seconds apart, create conflicted copy, otherwise discard conflicted
+        # if changes are greater than min_conflict_interval seconds apart,
+        # push the retrieved item in the unsaved array so that the client can duplicate it
         saved = saved_items.find{|i| i.uuid == conflicted_uuid}
         conflicted = retrieved_items.find{|i| i.uuid == conflicted_uuid}
         if (saved.updated_at - conflicted.updated_at).abs > min_conflict_interval
-          puts "\n\n\n Creating conflicted copy of #{saved.uuid}\n\n\n"
-          dup = conflicted.dup
-          dup.user = conflicted.user
-          dup.save
-          dup_json = dup.as_json({})
-          dup_json[:conflict_of] = conflicted.uuid
-          retrieved_items.push(dup_json)
-
-          last_updated = dup.updated_at
+          # puts "\n\n\n Creating conflicted copy of #{saved.uuid}\n\n\n"
+
+          unsaved_items.push({
+            :item => conflicted,
+            :error => {:tag => "sync_conflict"}
+          })
+
+          retrieved_items.delete(conflicted)
         end
-        retrieved_items.delete(conflicted)
       end
-
-      return last_updated
     end
 
     def destroy_items(uuids)

data/lib/standard_file/version.rb

@@ -1,3 +1,3 @@
 module StandardFile
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: standard-file
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Standard File
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-10 00:00:00.000000000 Z
+date: 2017-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails