standard-file 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b764c25dbf3350742c153673d75bbaceaac2c77e
-  data.tar.gz: c2216bcc99380e629902a8530c6e29cb1c1de8ce
+  metadata.gz: 9aedc31c0aa95bb4a0ae123be4fb2586c907698d
+  data.tar.gz: 28ad97ff10532060e4b9ea501064c1f2d8bfaf0e
 SHA512:
-  metadata.gz: 244e9829c182e952d0070ae349b0ccc7e2adfe721200a7290abfd6c0dc900d9cae472d179bb40c1c9e70a69b33b143f7cb9ee4babe679f02d167ec51ae507afc
-  data.tar.gz: 02f1467f662af80b8b942cf69fef04656d51b68b199baa28296f46275b1063db02d01aa5fb631e97fa2b0a35ee911a1386412a08e1bea721efae1308b919ff64
+  metadata.gz: e88485ce13f7fe0b5c08994094b1173c336e5ca6f6cb92cd8b298fbc178befabbbf69647529b59720354bd24f437a88103d826073cfbbb397f9befe4b1a14542
+  data.tar.gz: c00e5e286926200e5505c42a9a2e8acb5cc9e979d764c38fc23aa478b16df86ff9589f5a4184d1c7c8565a40b795f0aafaed6ba8dc440d05e46e1c1236d6db6b

data/lib/standard_file/sync_manager.rb

@@ -16,7 +16,7 @@ module StandardFile
       return @sync_fields || [:content, :enc_item_key, :content_type, :auth_hash, :deleted, :created_at]
     end
 
-    def sync(item_hashes, options)
+    def sync(item_hashes, options, request)
 
       in_sync_token = options[:sync_token]
       in_cursor_token = options[:cursor_token]
@@ -24,7 +24,7 @@ module StandardFile
 
       retrieved_items, cursor_token = _sync_get(in_sync_token, in_cursor_token, limit).to_a
       last_updated = DateTime.now
-      saved_items, unsaved_items = _sync_save(item_hashes)
+      saved_items, unsaved_items = _sync_save(item_hashes, request)
       if saved_items.length > 0
         last_updated = saved_items.sort_by{|m| m.updated_at}.last.updated_at
       end
@@ -48,6 +48,10 @@ module StandardFile
       # conflicts occur when you are trying to save an item for which there is a pending change already
       min_conflict_interval = 20
 
+      if Rails.env.development?
+        min_conflict_interval = 1
+      end
+
       saved_ids = saved_items.map{|x| x.uuid }
       retrieved_ids = retrieved_items.map{|x| x.uuid }
       conflicts = saved_ids & retrieved_ids # & is the intersection
@@ -66,6 +70,10 @@ module StandardFile
           })
 
         end
+
+        # We remove the item from retrieved items whether or not it satisfies the min_conflict_interval
+        # This is because the 'saved' value takes precedence, since that's the current value in the database.
+        # So by removing it from retrieved, we are forcing the client to ignore this change.
         retrieved_items.delete(conflicted)
       end
     end
@@ -97,7 +105,7 @@ module StandardFile
       return date
     end
 
-    def _sync_save(item_hashes)
+    def _sync_save(item_hashes, request)
       if !item_hashes
         return [], []
       end
@@ -115,10 +123,12 @@ module StandardFile
           next
         end
 
+        item.last_user_agent = request.user_agent
         item.update(item_hash.permit(*permitted_params))
         # we want to force update the updated_at field, even if no changes were made
         # item.touch
 
+
         if item.deleted == true
           set_deleted(item)
           item.save

data/lib/standard_file/version.rb

@@ -1,3 +1,3 @@
 module StandardFile
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: standard-file
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Standard File
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-08 00:00:00.000000000 Z
+date: 2017-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails