standard-file 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a69077337f48d6974151f5aa9fbdb6d03a55c29
-  data.tar.gz: db6a54182bb62b35ec2bed3a3e7e4aefbf67acd3
+  metadata.gz: b119105d8253ec0363b7eacef2f93de2f15ad39c
+  data.tar.gz: fce8a2904b7b5cb291a0d0588e21de6074adfcce
 SHA512:
-  metadata.gz: cab4b67da5c58816fb5e7f070ca21b5c47d8999f797b81c0d86d58686ec0229cd86e38a84b19158aa5f713d3df4b2b677af31481e75388774a0580049b0a8ed1
-  data.tar.gz: fe42b466e4fe00fdbbd19cbc3f5e267e1447f40db844b9048790ab02e985c9ea15af5ff1094415916a08ebfd682523b1243246a1fbc37702a4423b5d45fd9357
+  metadata.gz: 3029ce76229b771a8820819ea790ea32d66c01c821d68c72a30280b0a43e66936d7ad78c9b43a0512ac13b16e7b12bd8ff5fe2a27e868d08c5d139ffe744d1bd
+  data.tar.gz: a85108a38988fc9a126bc7751a86434c592a8305180fe45e6e5ee4b7fc6cf320eb86200f707aea1c3522c85c696d4f258b9070f2cd8270452d1b46ae9c2a3888

data/README.md

@@ -1,28 +0,0 @@
-# StandardFile
-Short description and motivation.
-
-## Usage
-How to use my plugin.
-
-## Installation
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'standard_file'
-```
-
-And then execute:
-```bash
-$ bundle
-```
-
-Or install it yourself as:
-```bash
-$ gem install standard_file
-```
-
-## Contributing
-Contribution directions go here.
-
-## License
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/lib/standard_file/sync_manager.rb

@@ -17,6 +17,7 @@ module StandardFile
     end
 
     def sync(item_hashes, options)
+
       in_sync_token = options[:sync_token]
       in_cursor_token = options[:cursor_token]
       limit = options[:limit]
@@ -28,7 +29,23 @@ module StandardFile
         last_updated = saved_items.sort_by{|m| m.updated_at}.last.updated_at
       end
 
-      # manage conflicts
+      last_updated = check_for_conflicts(saved_items, retrieved_items, last_updated)
+
+      # 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,
+        :saved_items => saved_items,
+        :unsaved => unsaved,
+        :sync_token => sync_token,
+        :cursor_token => cursor_token
+      }
+    end
+
+    def check_for_conflicts(saved_items, retrieved_items, last_updated)
+      # conflicts occur when you are trying to save an item for which there is a pending change already
       min_conflict_interval = 20
 
       saved_ids = saved_items.map{|x| x.uuid }
@@ -53,17 +70,7 @@ module StandardFile
         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,
-        :saved_items => saved_items,
-        :unsaved => unsaved,
-        :sync_token => sync_token,
-        :cursor_token => cursor_token
-      }
+      return last_updated
     end
 
     def destroy_items(uuids)

data/lib/standard_file/user_manager.rb

@@ -32,14 +32,27 @@ module StandardFile
       return { user: user, token: jwt(user) }
     end
 
+    def update(user, params)
+      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)
-      pw_cost = user ? user.pw_cost : 5000
-      pw_alg = user ? user.pw_alg : "sha512"
-      pw_key_size = user ? user.pw_key_size : 512
-      pw_func = user ? user.pw_func : "pbkdf2"
-      return {:pw_func => pw_func, :pw_alg => pw_alg, :pw_salt => pw_salt, :pw_cost => pw_cost, :pw_key_size => pw_key_size}
+
+      if !user
+        return {}
+      end
+      
+      auth_params = {:pw_salt => user.pw_salt, :pw_cost => user.pw_cost, :pw_auth => user.pw_auth}
+
+      if user.pw_func
+        auth_params[:pw_func] = user.pw_func
+        auth_params[:pw_alg] = user.pw_alg
+        auth_params[:pw_key_size] = user.pw_key_size
+      end
+
+      return auth_params
     end
 
     private
@@ -63,7 +76,7 @@ module StandardFile
     end
 
     def registration_params(params)
-      params.permit(:pw_func, :pw_alg, :pw_cost, :pw_key_size, :pw_nonce)
+      params.permit(:pw_func, :pw_alg, :pw_cost, :pw_key_size, :pw_nonce, :pw_salt, :pw_auth)
     end
 
   end

data/lib/standard_file/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: standard-file
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Standard File
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-21 00:00:00.000000000 Z
+date: 2017-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -90,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Standard File User & Sync Engine