contact_sync 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d0781f453be7d54f3779c149d146a8a879c1e98
-  data.tar.gz: b4239cab5b7cae346308696aaec17cc7a40651c9
+  metadata.gz: 26d68d12a21bf1a35d0c0e9f7992b93555b86af8
+  data.tar.gz: e43cd2f1ceecce72e477a2c03d97735a12e6a674
 SHA512:
-  metadata.gz: dd436dc6f4dd4ae9e6aff18c4da45446ef75b944c6f6732f262fc3bf74cc03501ce1ce43976681b26cd1756f434626ba8b6069e0a5cf6f57daf3d0242cd0934c
-  data.tar.gz: fd2c45e3b28ccfcb816aa6105ede29021339f58dd85e4d7b11de32e60ca53a0abe1f91ce57994cf97faf3e5f023d3af3076bbe0bada0f2e7d368c62fca6145ec
+  metadata.gz: b2b09f6a4d89b9040fb4fadcb86139e31b82741ae116aed519453822486ffe8b968c8af37f9a92684d70f86ab88cfa3c741ba97e30ff9033ea503f4445f3581b
+  data.tar.gz: 272d6f5dbdc9a3e0b3963cf06f818b1f8c5dcff5212a6077134c5cca5ee50af9aa4897866fff7948c3d8a807d88b1a8ba040eae43ff463d06cbc0dba9c551334

data/lib/contact_sync/syncable.rb

@@ -18,9 +18,9 @@ module ContactSync
       end
     end
     def sync_contacts(contact_hash = {})
-      result = {:new => {success:[], failed:[]}, modified: {success:[], failed:[]}, deleted: {success:[], failed:[]}}
+      result = {:new => {success:[], failed:[], duplicate: []}, modified: {success:[], failed:[]}, deleted: {success:[], failed:[]}}
       raise ArgumentError, "You need to provide contacts hash." if contact_hash.blank?
-
+      raise ArgumentError, "You need to provide Device Identifier as deviceID" if contact_hash[:device_id].blank?
       ##########################################################################
       #########################Create new Contacts##############################
       if !contact_hash[:new].blank?
@@ -31,23 +31,28 @@ module ContactSync
 
           aContact.delete :phones
           aContact.delete :emails
-
-          newContact = Contact.new(contact_params(aContact))
-          if phones
-            phones.each do |aPhone|
-              newContact.phones.build(phone_params(aPhone))
+          begin
+            newContact = Contact.new(contact_params(aContact))
+            newContact.device_id = contact_hash[:device_id]
+            if phones
+              phones.each do |aPhone|
+                newContact.phones.build(phone_params(aPhone))
+              end
             end
-          end
-          if emails
-            emails.each do |anEmail|
-              newContact.emails.build(email_params(anEmail))
+            if emails
+              emails.each do |anEmail|
+                newContact.emails.build(email_params(anEmail))
+              end
             end
-          end
-          if newContact.save
-            # result[:new][:success] << newContact.record_id
-            self.contacts << newContact
-          else
-            result[:new][:failed] << newContact.record_id
+            if newContact.save
+              # result[:new][:success] << newContact.record_id
+              self.contacts << newContact
+            else
+              result[:new][:failed] << newContact.record_id
+            end
+          rescue ActiveRecord::RecordNotUnique => e
+            puts "Rescuing Duplicate Record"
+            result[:new][:duplicate] << newContact.record_id
           end
         end
       end
@@ -139,11 +144,11 @@ module ContactSync
     end
 
     def phone_params aPhone
-      aPhone.permit(:label, :number)
+      aPhone.permit(:label, :number, :encrypted_number, :cc_prefix)
     end
 
     def email_params anEmail
-      anEmail.permit(:label, :email)
+      anEmail.permit(:label, :email, :encrypted_email)
     end
 
     def after_contact_sync

data/lib/contact_sync/version.rb

@@ -1,3 +1,3 @@
 module ContactSync
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contact_sync
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Saad Masood