standard-file 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4713fd9c76de2ac82f16a1fe84b27a53a25d4c3a
-  data.tar.gz: c85729b0055a6b4df9038f4804a4442905ed4dc5
+  metadata.gz: 05c848ebb3f69c126fa21c0868de2c8a79444fe9
+  data.tar.gz: 6fae684f6e09e53a1b25b89df21a32f249257183
 SHA512:
-  metadata.gz: 6d42f737a016dba90c00cc661170b5b93f21a830664e65a3a2568f778bfd120e2ee344bbb8fa63ebbb9b7eb1a880a320f0685cf042090337c2c13f85535a7da1
-  data.tar.gz: 94fe38ec72e42df859cbae76cb50ac1affd49b131e8fa5e5dc366a4f5134c4003a2e3611663b235d1ae58553c40ee8357d4fb724c315a31863b5c424b806c927
+  metadata.gz: f208c915128fd925380121d16784f8819e55ad09a883a5481e0b347c918d011a03d3f85dddf5afd21e0cfd95b5c3c06c8e2e1a1ab0fdf0152e8bff686871f1b7
+  data.tar.gz: ca1901640974801646d5eb3390ce24194bd3b2c795feb3021708c56374fdb7bb460a822b123dd0d125a85fa4c30f6390332a3fd7ab036d0c18a899f833a859ea

data/lib/standard_file/2016_12_15/sync_manager.rb

@@ -48,13 +48,10 @@ module StandardFile
           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"
-
             unsaved_items.push({
               :item => conflicted,
               :error => {:tag => "sync_conflict"}
             })
-
           end
 
           # We remove the item from retrieved items whether or not it satisfies the min_conflict_interval
@@ -86,9 +83,6 @@ module StandardFile
 
           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)

data/lib/standard_file/abstract/user_manager.rb

@@ -45,13 +45,18 @@ module StandardFile
 
       auth_params = {
         :identifier => user.email,
-        :pw_salt => user.pw_salt,
         :pw_cost => user.pw_cost,
         :pw_nonce => user.pw_nonce,
         :version => user.version
       }
 
+      if user.pw_salt
+        #v002 only
+        auth_params[:pw_salt] = user.pw_salt
+      end
+
       if user.pw_func
+        #v001 only
         auth_params[:pw_func] = user.pw_func
         auth_params[:pw_alg] = user.pw_alg
         auth_params[:pw_key_size] = user.pw_key_size

data/lib/standard_file/version.rb

@@ -1,3 +1,3 @@
 module StandardFile
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: standard-file
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Standard File