synchronisable 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00ba5533ba3d705a1e3c245124ceb78afd57da1d
-  data.tar.gz: abdedfecc1bf48eb0554cace0b9c323ccefe6fa6
+  metadata.gz: 46c5332c053921eb44021c59a846a1451eede185
+  data.tar.gz: d33c7cdb48f1266ebb3737a20c7a6c4b3688b12c
 SHA512:
-  metadata.gz: 2cd022bab4b92cd95a3b738c0b49f935a5fdcb9abac8c38b2716ae506baa371e893881e0524f3495db65c44f10b9c032ba52d93fc5812a549fa97dfed934c401
-  data.tar.gz: fd464896a1dce4ff99789b5e595186d5a6c043b0051759917a6a1479512484403fb31905bca4fae3f921bdfede5a102685b40d34d2f41540e21f12e34fbdcb70
+  metadata.gz: a42307f344f720d63a7519969481e94fffcc9a9010510cf39791ea43b93ad5e64304c80074aa1b5f5133d720fc16cbaf829650dfeb3da50d814efe3608eb72a4
+  data.tar.gz: 7b35e861d0ea8c002d4215b2965713c2c2ebb30f509f24e652f687f95e0237bb69be0dee671aa66fc944f4a714e417a9a4c85f59c1862f6d8f727879b0cff6f9

data/lib/synchronisable/context.rb

@@ -5,12 +5,12 @@ module Synchronisable
                   :before, :after, :deleted
 
     def initialize(model, parent)
-      @model, @parent  = model, parent
+      @model, @parent = model, parent
       @errors = []
       @before, @after, @deleted = 0, 0, 0
     end
 
-    # @return [String] summary synchronization info.
+    # @return [String] summary synchronization info
     def summary_message
       msg = I18n.t('messages.result',
         :model   => model,
@@ -21,12 +21,7 @@ module Synchronisable
         :errors  => errors.count
       )
 
-      msg << I18n.t(
-        'messages.errors',
-        :errors => errors.join('. ')
-      ) if errors.present?
-
-      msg
+      msg << I18n.t('messages.errors', errors: errors.join('. '))
     end
   end
 end

data/lib/synchronisable/error_handler.rb

@@ -11,31 +11,38 @@ module Synchronisable
       @logger, @context = logger, context
     end
 
-    # Wraps the given block in transaction.
-    # Rescued exceptions are written to log and saved to errors array.
+    # Wraps the given block in transaction if it's source for a model
+    # on which #sync method was called and not a parent/child association.
+    # Rescued exceptions are written to log and saved to the errors array.
     #
     # @param source [Synchronisable::Source] synchronization source
     #
     # @return [Boolean] `true` if syncronization was completed
     #   without errors, `false` otherwise
     def handle(source)
-      block = ->() {
+      invoke(source) do
         yield
         return true
-      }
-
-      source.parent ? block.() : ActiveRecord::Base.transaction(&block)
+      end
     rescue Exception => e
-      @context.errors << e
-      log(e, source)
+      err_msg = error_message(e, source)
+
+      @context.errors << err_msg
+      @logger.error err_msg
+
       return false
     end
 
     private
 
-    def log(e, source)
-      msg = error_message(e, source)
-      @logger.error msg
+    # Invokes a given block.
+    # Won't start a new transation if its not a "sync root".
+    def invoke(source, &block)
+      if source.parent
+        block.()
+      else
+        ActiveRecord::Base.transaction(&block)
+      end
     end
 
     def error_message(e, source)

data/lib/synchronisable/model/methods.rb

@@ -42,7 +42,7 @@ module Synchronisable
       #     :match_players => :player
       #   })
       #
-      # @example Here is all possible ways to call #sync:
+      # @example Here is all possible ways to call #sync
       #   Model.sync
       #   Model.sync({ :a1 => 1, :a2 => 2 })
       #   Model.sync({ :includes => {...}, :parent => xxx })

data/lib/synchronisable/source.rb

@@ -22,9 +22,6 @@ module Synchronisable
     # Prepares synchronization source:
     # `remote_id`, `local_attributes`, `import_record` and `associations`.
     #
-    # Sets foreign key if current model is specified as `has_one` or `has_many`
-    # association of parent model.
-    #
     # @api private
     def prepare(data, remote_attrs)
       @data = @parent

data/lib/synchronisable/version.rb

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

data/lib/synchronisable/worker/associations.rb

@@ -34,12 +34,13 @@ module Synchronisable
 
           if import_record.nil? || association.force_sync
             data = @source.data.try(:merge, { id: id }) || id
-            Controller.call(association.model, data, {})
+            Controller.call(association.model, data, { :parent => @source })
 
             import_record = find_import(id, association)
           end
 
-          @source.local_attrs[association.key] = import_record.synchronisable.id
+          @source.local_attrs[association.key] = import_record
+            .try(:synchronisable).try(:id) # yep, it can happen
         end
       end
 

data/lib/synchronisable.rb

@@ -45,7 +45,7 @@ module Synchronisable
     }
   end
 
-  # Syncs models that is defined in {Synchronisable#models}
+  # Syncs models that are defined in {Synchronisable#models}
   #
   # @param models [Array] array of models that should be synchronized.
   #   This take a precedence over models defined in {Synchronisable#models}.

data/spec/dummy/app/synchronizers/stage_synchronizer.rb

@@ -14,4 +14,8 @@ class StageSynchronizer < Synchronisable::Synchronizer
   except :ignored_1, :ignored_2
 
   gateway StageGateway
+
+  before_sync do |source|
+    source.local_attrs[:name] != 'ignored'
+  end
 end

data/spec/models/stage_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe Stage do
+  describe 'synchronization' do
+    let!(:remote_attrs) do
+      [
+        build(:remote_stage, tour_id: '1', eman: 'ignored'),
+        build(:remote_stage, tour_id: '2'),
+        build(:remote_stage, tour_id: '3')
+      ]
+    end
+
+    describe 'skipping with before_sync hook' do
+      subject { -> { Stage.sync(remote_attrs, :includes => {}) } }
+
+      it { is_expected.to change { Stage.count }.by(2) }
+      it { is_expected.to change { Synchronisable::Import.count }.by(2) }
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synchronisable
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Vasiliy Yorkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-05 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -417,6 +417,7 @@ files:
 - spec/factories/stadium.rb
 - spec/factories/team.rb
 - spec/models/match_spec.rb
+- spec/models/stage_spec.rb
 - spec/models/team_group_statistic_spec.rb
 - spec/models/team_spec.rb
 - spec/models/tournament_spec.rb
@@ -543,6 +544,7 @@ test_files:
 - spec/factories/stadium.rb
 - spec/factories/team.rb
 - spec/models/match_spec.rb
+- spec/models/stage_spec.rb
 - spec/models/team_group_statistic_spec.rb
 - spec/models/team_spec.rb
 - spec/models/tournament_spec.rb