standard-file 0.1.28 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f29eb575bd0c5bd444a76a67e53e315feed44df0
-  data.tar.gz: e242e69a9fc97893dfce0d229f6c70e50dc36062
+  metadata.gz: 1a69077337f48d6974151f5aa9fbdb6d03a55c29
+  data.tar.gz: db6a54182bb62b35ec2bed3a3e7e4aefbf67acd3
 SHA512:
-  metadata.gz: 6d6047b2f20d25f51900cfad388adcdb1e4c25c21aae9ab0bb51c612f5db419084a7add457f0f587f1707ca92c906028802a81058e46f7a84f7a4d4fa52f8189
-  data.tar.gz: 6c99a3c29eaa3c5f03dede443547ac1a4826af1de20322c08172ad70debf620c1de39dbebbabf859f40bcf8689ae67970b14f2b83f64ded80c4831993e95231e
+  metadata.gz: cab4b67da5c58816fb5e7f070ca21b5c47d8999f797b81c0d86d58686ec0229cd86e38a84b19158aa5f713d3df4b2b677af31481e75388774a0580049b0a8ed1
+  data.tar.gz: fe42b466e4fe00fdbbd19cbc3f5e267e1447f40db844b9048790ab02e985c9ea15af5ff1094415916a08ebfd682523b1243246a1fbc37702a4423b5d45fd9357

data/lib/standard_file/sync_manager.rb

@@ -29,24 +29,33 @@ module StandardFile
       end
 
       # manage conflicts
+      min_conflict_interval = 20
+
       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
           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,
@@ -66,15 +75,21 @@ module StandardFile
     private
 
     def sync_token_from_datetime(datetime)
-      version = 1
-      Base64.encode64("#{version}:" + "#{datetime.to_i}")
+      version = 2
+      Base64.encode64("#{version}:" + "#{datetime.to_f}")
     end
 
     def datetime_from_sync_token(sync_token)
       decoded = Base64.decode64(sync_token)
       parts = decoded.rpartition(":")
       timestamp_string = parts.last
-      date = DateTime.strptime(timestamp_string,'%s')
+      version = parts.first
+      if version == "1"
+        date = DateTime.strptime(timestamp_string,'%s')
+      elsif version == "2"
+        date = Time.at(timestamp_string.to_f).to_datetime.utc
+      end
+
       return date
     end
 

data/lib/standard_file/user_manager.rb

@@ -18,7 +18,7 @@ module StandardFile
     def register(email, password, params)
       user = @user_class.find_by_email(email)
       if user
-        return {:error => {:message => "Unable to register.", :status => 401}}
+        return {:error => {:message => "This email is already registered.", :status => 401}}
       else
         user = @user_class.new(:email => email, :encrypted_password => hash_password(password))
         user.update!(registration_params(params))
@@ -26,6 +26,12 @@ module StandardFile
       end
     end
 
+    def change_pw(user, password, params)
+      user.encrypted_password = hash_password(password)
+      user.update!(registration_params(params))
+      return { user: user, token: jwt(user) }
+    end
+
     def auth_params(email)
       user = @user_class.find_by_email(email)
       pw_salt = user ? Digest::SHA1.hexdigest(email + "SN" + user.pw_nonce) : Digest::SHA1.hexdigest(email + "SN" + @salt_psuedo_nonce)
@@ -53,7 +59,7 @@ module StandardFile
     end
 
     def jwt(user)
-      JwtHelper.encode({:user_uuid => user.uuid})
+      JwtHelper.encode({:user_uuid => user.uuid, :pw_hash => Digest::SHA256.hexdigest(user.encrypted_password)})
     end
 
     def registration_params(params)

data/lib/standard_file/version.rb

@@ -1,3 +1,3 @@
 module StandardFile
-  VERSION = '0.1.28'
+  VERSION = '0.2.0'
 end

metadata

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