remote_record 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d657d0ec1a8c4606cc656d2c557e592637fa50d165cd95e118a8efa3094bc7a7
-  data.tar.gz: 6bd9609c2617e49b9701e84cd1011236978233856864791e7126c221228addf3
+  metadata.gz: 95e6b11dd488bf26b81544c37471498737a26598429ba8290e4e9c8e0f6d79a0
+  data.tar.gz: cb125226d35be488de6d72651bb1249539d4d2dec487f75e242fc949593b008c
 SHA512:
-  metadata.gz: 4a115d1e2e29d138e67a70c574d66cb7efca0c1ab239d9f47146d8e157410c68d700c8c4bf2c19db647d45a3831f669984117db4823b16691d53af07245ccec1
-  data.tar.gz: 7325785485edb863a7d5c91e10b80b8119c93c1ec8b5ff7b1f570ffd498ac297b4c1ba8e3e86549d19ba654e6a578dc2f705a0470fbc2c19aac9e6f5bf49d488
+  metadata.gz: '08872bedccc7008cbf05129c2e9e791ee73c88bdc222dbaab1ff973bf32b0e24a284690072394c4b6e9a5126f7c0c851e6a2ffbf7ef855909397fbc77d870cbd'
+  data.tar.gz: d86cd65b6db39f4191d39b0be6e954b56b118daa02534eb0b8c20e10fcf988d9e07ada0fef2fc418e787b1a112dfc300b31df2f7afde199df88bb3fab68d04ca

data/lib/remote_record/reference.rb

@@ -40,23 +40,49 @@ module RemoteRecord
       end
 
       def remote_all(&authz_proc)
+        find_or_initialize_all(remote_record_class.all(&authz_proc))
+      end
+
+      def remote_where(params, &authz_proc)
+        find_or_initialize_all(remote_record_class.where(params, &authz_proc))
+      end
+
+      private
+
+      def find_or_initialize_all(remote_resources)
         no_fetching do
-          remote_record_class.all(&authz_proc).map do |remote_resource|
-            where(remote_resource_id: remote_resource['id']).first_or_initialize.tap do |record|
-              record.attrs = remote_resource
+          pair_remote_resources_with_records(remote_resources) do |unsaved_resources, relation|
+            new_resources = unsaved_resources.map do |resource|
+              new(remote_resource_id: resource['id']).tap { |record| record.attrs = resource }
             end
+            relation.to_a + new_resources
           end
         end
       end
 
-      def remote_where(params, &authz_proc)
-        no_fetching do
-          remote_record_class.where(params, &authz_proc).map do |remote_resource|
-            where(remote_resource_id: remote_resource['id']).first_or_initialize.tap do |record|
-              record.attrs = remote_resource
-            end
+      def pair_remote_resources_with_records(remote_resources)
+        # get resource ids
+        ids = remote_resource_ids(remote_resources)
+        # get what exists in the database
+        relation = where(remote_resource_id: ids)
+        # for each record, set its attrs
+        relation.map do |record|
+          record.attrs = remote_resources.find do |r|
+            r['id'].to_s == record.remote_resource_id.to_s
           end
         end
+        unsaved_resources = resources_without_persisted_references(remote_resources, relation)
+        yield(unsaved_resources, relation)
+      end
+
+      def remote_resource_ids(remote_resources)
+        remote_resources.map { |remote_resource| remote_resource['id'] }
+      end
+
+      def resources_without_persisted_references(remote_resources, relation)
+        remote_resources.reject do |resource|
+          relation.pluck(:remote_resource_id).include? resource['id']
+        end
       end
     end
 
@@ -102,8 +128,6 @@ module RemoteRecord
         self
       end
 
-      private
-
       delegate :attrs=, to: :@instance
 
       def instance

data/lib/remote_record/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RemoteRecord
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: remote_record
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Simon Fish
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-10 00:00:00.000000000 Z
+date: 2021-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord