synchronisable 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef3f05db3248f6b97f08228ce7efb74b4e515272
-  data.tar.gz: b973aef1b36c665a89cfcbb350863eea51034ba0
+  metadata.gz: 6ff0416f9aaa7ad646b5b32ee6b488199ad877cc
+  data.tar.gz: e65f189c879d42824993ebe70ebb28b3dcfc4856
 SHA512:
-  metadata.gz: 4ef0a3f27605d49e471f170c889ac92a3895406765a770aa86ab907325c55077081cee6c0b12c809303dff7c2c3232ec0a90499c3e99ad8f966d58e09858c07c
-  data.tar.gz: 3c0ef536eb6433a0f421ea4d4f1f161aac67a2898e1314e13438857edaa4b9af12e394be6c222b8be465b75ba61d213bffe89bf04f4f146d9a67901532c42ba3
+  metadata.gz: 581aa6d3cbbbd3de78d80bb87e809ffa172cdae973b8a52009514cc1ce1e5327ef8849e8e9ee743d68195213e81ce2e713f5308ffd5cd474b1a15de9293cf808
+  data.tar.gz: 7b5fc2d204e008b189d01359d52721dbdd0b476b16bd23e0a2b2ecf650ceba7ead3cb54ee08491c67620e9901ad968a4881cd7c28c55cb34c63a62b4a6994d18

data/lib/synchronisable/controller.rb

@@ -53,14 +53,14 @@ module Synchronisable
     def call(data)
       sync do |context|
         error_handler = ErrorHandler.new(logger, context)
+        source = Source.new(@model, @parent, @includes)
+
         context.before = @model.imports_count
 
         hashes = @input.parse(data)
         hashes.each do |attrs|
-          source = Source.new(@model, @parent, @includes, attrs)
-
           error_handler.handle(source) do
-            source.prepare
+            source.prepare(data, attrs)
 
             record_worker = Worker::Record.new(@synchronizer, source)
             associations_worker = Worker::Associations.new(@synchronizer, source)

data/lib/synchronisable/source.rb

@@ -10,13 +10,12 @@ module Synchronisable
     attr_reader :parent_associations, :child_associations
     attr_reader :model, :remote_attrs, :remote_id,
                 :local_attrs, :import_ids, :parent,
-                :includes
+                :includes, :data
 
-    def initialize(model, parent, includes, remote_attrs)
+    def initialize(model, parent, includes)
       @model, @parent, @synchronizer = model, parent, model.synchronizer
       @model_name = @model.to_s.demodulize.underscore.to_sym
       @includes = includes
-      @remote_attrs = remote_attrs.with_indifferent_access
     end
 
     # Prepares synchronization source:
@@ -26,9 +25,15 @@ module Synchronisable
     # association of parent model.
     #
     # @api private
-    def prepare
-      @remote_id = @synchronizer.extract_remote_id(@remote_attrs)
-      @local_attrs = @synchronizer.map_attributes(@remote_attrs)
+    def prepare(data, remote_attrs)
+      @data = @parent
+        .try(:source).try(:data)
+        .try(:merge, data) || data
+
+      @remote_attrs = remote_attrs.with_indifferent_access
+
+      @remote_id    = @synchronizer.extract_remote_id(@remote_attrs)
+      @local_attrs  = @synchronizer.map_attributes(@remote_attrs)
       @associations = @synchronizer.associations_for(@local_attrs)
 
       @parent_associations = filter_associations(PARENT_ASSOCIATION_KEYS)

data/lib/synchronisable/version.rb

@@ -2,7 +2,7 @@ module Synchronisable
   module VERSION
     MAJOR = 1
     MINOR = 0
-    PATCH = 5
+    PATCH = 6
     SUFFIX = nil
 
     STRING = [MAJOR, MINOR, PATCH, SUFFIX].compact.join('.')

data/lib/synchronisable/worker/associations.rb

@@ -30,8 +30,8 @@ module Synchronisable
         log_info("synchronizing parent association with id: #{id}", :blue)
 
         @synchronizer.with_association_sync_callbacks(@source, id, association) do
-          attrs = association.model.synchronizer.find(id)
-          Controller.call(association.model, [attrs])
+          data = @source.data.try(:merge, { id: id }) || id
+          Controller.call(association.model, data, {})
 
           import_record = Import.find_by(
             :remote_id => id.to_s,
@@ -47,9 +47,9 @@ module Synchronisable
         log_info("synchronizing child association with id: #{id}", :blue)
 
         @synchronizer.with_association_sync_callbacks(@source, id, association) do
-          attrs = association.model.synchronizer.find(id)
+          data = @source.data.try(:merge, { id: id }) || id
 
-          Controller.call(association.model, [attrs],
+          Controller.call(association.model, data,
             child_association_options(association))
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: synchronisable
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Vasiliy Yorkin