synced 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45ac855b6dcbc774f96b065d7cca0db58e354724
-  data.tar.gz: e324632b4c8c3dc4bdcf5d9be705a9dc7a639256
+  metadata.gz: 3b57fd9809319aece800d98be7cb7d595af42183
+  data.tar.gz: ceb98bf9015b4877d597f4d89a73c63627ad8353
 SHA512:
-  metadata.gz: bd8f4a9991f7bde53aac5af37f7c1d5c5a41cff58482e6b8729eacfc8de51e9781a25cb3da023d2dd3a06f3cc60f1dfab23a840067db1d5524c35b091690d6b4
-  data.tar.gz: d23988c8e74e182a8612b3845440f27f8c99de4442a2ad77b8d27e6dc6327dce00d62878b4a36827259173b7a39bddb0b7c7b70f3a1b5ccfb7e69dd325921b10
+  metadata.gz: 498ac45444e90dac7dba56d8c79bb644c61a89fd5da85c1225612a86dc0d5fae59cb6570d744d2c5c7b4d3176dd0936c36d304f7aadfa97d672bd4b2a4b38125
+  data.tar.gz: 43493baddef335a7c0602949071ba5602cc0e9519e746fc7f737f86a9fc327a8c6d5dda260bc2ec68249d060e3293dc67a5aac0100cde3527dd4300b49fd0988

data/lib/synced/strategies/check.rb

@@ -25,11 +25,16 @@ module Synced
       end
 
       def remote_objects_tester
-        lambda do |remote_objects|
-          @remote_objects_ids.concat(remote_objects.map(&:id))
+        lambda do |remote_objects_batch|
+          remote_objects_batch_ids = remote_objects_batch.map(&:id)
+          local_objects = relation_scope.where(@id_key => remote_objects_batch_ids)
+          local_objects_hash = local_objects.each_with_object({}) do |local_object, hash|
+            hash[local_object.public_send(@id_key)] = local_object
+          end
+          @remote_objects_ids.concat(remote_objects_batch_ids)
 
-          remote_objects.map do |remote|
-            if local_object = local_object_by_remote_id(remote.id)
+          remote_objects_batch.map do |remote|
+            if local_object = local_objects_hash[remote.id]
               remote.extend(@mapper) if @mapper
               local_object.attributes = default_attributes_mapping(remote)
               local_object.attributes = local_attributes_mapping(remote)

data/lib/synced/strategies/full.rb

@@ -89,14 +89,19 @@ module Synced
       private
 
       def remote_objects_persistor
-        lambda do |remote_objects|
+        lambda do |remote_objects_batch|
           additional_errors_check
-          @remote_objects_ids.concat(remote_objects.map(&:id))
+          remote_objects_batch_ids = remote_objects_batch.map(&:id)
+          local_objects = relation_scope.where(@id_key => remote_objects_batch_ids)
+          local_objects_hash = local_objects.each_with_object({}) do |local_object, hash|
+            hash[local_object.public_send(@id_key)] = local_object
+          end
+          @remote_objects_ids.concat(remote_objects_batch_ids)
 
           processed_objects =
-            remote_objects.map do |remote|
+            remote_objects_batch.map do |remote|
               remote.extend(@mapper) if @mapper
-              local_object = local_object_by_remote_id(remote.id) || relation_scope.new
+              local_object = local_objects_hash[remote.id] || relation_scope.new
               local_object.attributes = default_attributes_mapping(remote)
               local_object.attributes = local_attributes_mapping(remote)
               if @globalized_attributes.present?
@@ -172,14 +177,6 @@ module Synced
         @api ||= closest.try(:api) || raise(MissingAPIClient.new(@scope, @model_class))
       end
 
-      def local_object_by_remote_id(remote_id)
-        local_objects.find { |l| l.public_send(@id_key) == remote_id }
-      end
-
-      def local_objects
-        relation_scope.where(@id_key => remote_objects_ids).to_a
-      end
-
       def remote_objects_ids
         @remote_objects_ids
       end

data/lib/synced/version.rb

@@ -1,3 +1,3 @@
 module Synced
-  VERSION = "1.5.1"
+  VERSION = "1.5.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: synced
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Sebastien Grosjean
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-27 00:00:00.000000000 Z
+date: 2017-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails