standard-file 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a59d62786a05ab1ca7d8c9b0c3b6bda41405a9aa
-  data.tar.gz: 69dfd3ecc8d0cf67afd0c0d1e2ef6395b16489df
+  metadata.gz: 3539b3967bbb099392cfa19a41dcda6e760d8dc7
+  data.tar.gz: bbc647e2e439f6940a7cacd95239a055cefdaa94
 SHA512:
-  metadata.gz: b3738a096e0f49552c0f1afea404bc849d96d2141eaf2aebc5db7b6c15d59508c7e9b6bbf82b7d7259b8f5e9b1622b5da5275cadadab980804fdb559968e4b4c
-  data.tar.gz: c585d6b12c4b92cb02ed14a08ded3b15762b9f39e96e8299009036aa0e27357f5bc132f4658d488a30240a7beda3518af71a582a51f090a5750d9960d88ee92b
+  metadata.gz: 0eb56de338e0204e67bab6828fddb73f3f983c44e7a3c5ebe29f9c776c376d4ae0f0114c646b2d7db32e6828f4bb470f47c1e0f00c0c13fa05fd685e14e1d503
+  data.tar.gz: 4bae7bf628ee8e4016cefa5d45e83735b083002ab9ac365d1c62782ed3e4944325eea79cf7342128f5af65e555ea8dc665a3fe9799497679554b376ab7dc925f

data/lib/standard_file/sync_manager.rb

@@ -29,15 +29,17 @@ module StandardFile
       end
 
       # manage conflicts
+      min_conflict_interval = 5
+
       saved_ids = saved_items.map{|x| x.uuid }
       retrieved_ids = retrieved_items.map{|x| x.uuid }
       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 60 seconds apart, create conflicted copy, otherwise discard conflicted
+        # if changes are greater than min_conflict_interval seconds apart, create conflicted copy, otherwise discard conflicted
         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 > 60
+        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

data/lib/standard_file/version.rb

@@ -1,3 +1,3 @@
 module StandardFile
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

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