standard-file 0.1.9 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ab8f64216e606826f8cf9724b89725e0e36fa77
-  data.tar.gz: e5fcc42d7de62ebbdc7baf0e30a0773cda1eb2d2
+  metadata.gz: fd3197cfdf910c453147dcb98c0d901accb03ea7
+  data.tar.gz: 0354d14c7afdf121ae2c74e8c4b04967afeb8e46
 SHA512:
-  metadata.gz: eb025676ebfbe79137614e2c799a8b80a09542450dc11327fd2ca31a757998e6a6a7fcacb143e1f083ac7a502c3193552bb9968eb56be88e48303a7111b228e2
-  data.tar.gz: f20eced00dd47a3a496e8f0ce932d996a85c8f1864de2aab3e9c12631a2eb572fcb84861f2b05d09d58d825213ad4ea0088d7ca867093e47a423c9ef6d6fb778
+  metadata.gz: 7d79bdc8a0c1453d7b4a99ac634ff6d42d71c77c767dc64a497e243bf06f1a561d5e3ac9c05515e1ccfb4e4b055901816ee3fd5437986d0c6f2573ef5a4ced43
+  data.tar.gz: 8dceaaa77be3404f5f66e38ab9356d828d7d2091ea903702dbe2a2ca57a77f3c2ba4683cc78ca0c14965c6d43bf634c8be76c7af7ed06900a6d2617a7bf3d6e8

data/lib/standard_file/jwt_helper.rb

@@ -1,7 +1,7 @@
 module StandardFile
   module JwtHelper
-    require "jwt"
-
+    require "JWT"
+    
     def self.encode(payload)
       JWT.encode(payload, Rails.application.secrets.secret_key_base, 'HS256')
     end

data/lib/standard_file/sync_manager.rb

@@ -29,33 +29,24 @@ 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 min_conflict_interval seconds apart, create conflicted copy, otherwise discard conflicted
+        # if changes are greater than 60 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 > min_conflict_interval
+        if (saved.updated_at - conflicted.updated_at).abs > 60
           puts "\n\n\n Creating conflicted copy of #{saved.uuid}\n\n\n"
           dup = conflicted.dup
           dup.user = conflicted.user
           dup.save
-          dup_json = dup.as_json({})
-          dup_json[:conflict_of] = conflicted.uuid
-          retrieved_items.push(dup_json)
-
-          last_updated = dup.updated_at
+          retrieved_items.push(dup)
         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,30 +57,19 @@ module StandardFile
       }
     end
 
-    def destroy_items(uuids)
-      items = @user.items.where(uuid: uuids)
-      items.destroy_all
-    end
-
 
     private
 
     def sync_token_from_datetime(datetime)
-      version = 2
-      Base64.encode64("#{version}:" + "#{datetime.to_f}")
+      version = 1
+      Base64.encode64("#{version}:" + "#{datetime.to_i}")
     end
 
     def datetime_from_sync_token(sync_token)
       decoded = Base64.decode64(sync_token)
       parts = decoded.rpartition(":")
       timestamp_string = parts.last
-      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
-
+      date = DateTime.strptime(timestamp_string,'%s')
       return date
     end
 

data/lib/standard_file/user_manager.rb

@@ -9,7 +9,7 @@ module StandardFile
     def sign_in(email, password)
       user = @user_class.find_by_email(email)
       if user and test_password(password, user.encrypted_password)
-        return { user: user, token: jwt(user) }
+        return { user: user, token: jwt(user), items: user.items }
       else
         return {:error => {:message => "Invalid email or password.", :status => 401}}
       end
@@ -18,7 +18,7 @@ module StandardFile
     def register(email, password, params)
       user = @user_class.find_by_email(email)
       if user
-        return {:error => {:message => "This email is already registered.", :status => 401}}
+        return {:error => {:message => "Unable to register.", :status => 401}}
       else
         user = @user_class.new(:email => email, :encrypted_password => hash_password(password))
         user.update!(registration_params(params))
@@ -26,12 +26,6 @@ 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)
@@ -59,7 +53,7 @@ module StandardFile
     end
 
     def jwt(user)
-      JwtHelper.encode({:user_uuid => user.uuid, :pw_hash => Digest::SHA256.hexdigest(user.encrypted_password)})
+      JwtHelper.encode({:user_uuid => user.uuid})
     end
 
     def registration_params(params)

data/lib/standard_file/version.rb

@@ -1,3 +1,3 @@
 module StandardFile
-  VERSION = '0.1.9'
+  VERSION = '0.1.21'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: standard-file
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.21
 platform: ruby
 authors:
 - Standard File
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-21 00:00:00.000000000 Z
+date: 2017-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement