synchronisable 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d472312f04fe1b5f1c9b93c9a10c8336add0affb
-  data.tar.gz: 9466cb83ab74a066516de65962e5505e00bd29c5
+  metadata.gz: 46e5d5f7aa22b3aba79572bb609e1944e14e5d6d
+  data.tar.gz: 5858c6ad336fa0e59ef3c682d29beb8c0be80aed
 SHA512:
-  metadata.gz: a04fcd0b63eda8d9cfd03565529ecb99517bbd4a5b23fc7e84d2814053bc75f112eade1f86eae28a2ae7cfccccdb83eef7ebd2844b088033e1f0189961171d76
-  data.tar.gz: b73604ecaf8e88c71ab83ffaac56849dd4751ed9a84a2545daf23543db7bee05b50794cb5c4ca31ae9307e31769d8f6ad7b3ce0695401a7d6ad1fd93a87d162d
+  metadata.gz: e925cf5b4ecf118c8f74dfa0837fde9c9942581826d9d907d88c23b135a6633dce8f6a6ce4a745d7eaa4a18e80ed7adab9f3cb188496e537bac8fbc7fb32f634
+  data.tar.gz: 0d40c8a690b4e03fb8770f63e5d425be912aca8c7bacec78f0f3ec13b40ac6bcb38008a37e3cb7c93ceb4ef6b31b6f19f3dbebe858a7cc568f805e155c384ebe

data/lib/synchronisable/context.rb

@@ -12,7 +12,7 @@ module Synchronisable
 
     # @return [String] summary synchronization info.
     def summary_message
-      I18n.t('messages.result',
+      msg = I18n.t('messages.result',
         :model   => model,
         :parent  => @parent.try(:model) || 'nil',
         :before  => before,
@@ -20,6 +20,13 @@ module Synchronisable
         :deleted => deleted,
         :errors  => errors.count
       )
+
+      msg << I18n.t(
+        'messages.errors',
+        :errors => errors.join('. ')
+      ) if errors.present?
+
+      msg
     end
   end
 end

data/lib/synchronisable/locale/en.yml

@@ -12,7 +12,9 @@ en:
       local record: %{local_record}
     gateway_method_missing: Method %{method} is not implemented for gateway
   messages:
-    result: |
+    result: >
       parent: %{parent},
       records before: %{before}, records after: %{after},
       deleted records: %{deleted}, errors: %{errors}
+    errors: >
+      Errors: %{errors}

data/lib/synchronisable/locale/ru.yml

@@ -16,3 +16,5 @@ ru:
       Синхронизация %{model}, родительская запись: %{parent}.
       Количество записей до: %{before}, количество записей после: %{after},
       количество удаленных записей: %{deleted}, количество ошибок: %{errors}
+    errors: >
+      Ошибки: %{errors}

data/lib/synchronisable/source.rb

@@ -1,3 +1,5 @@
+require 'pry-byebug'
+
 module Synchronisable
   # TODO: Massive refactoring needed
 
@@ -33,12 +35,12 @@ module Synchronisable
 
       @remote_id    = @synchronizer.extract_remote_id(@remote_attrs)
       @local_attrs  = @synchronizer.map_attributes(@remote_attrs)
+      @unique_id    = @synchronizer.uid(@local_attrs)
       @associations = @synchronizer.associations_for(@local_attrs)
 
       @parent_associations = filter_associations(PARENT_ASSOCIATION_KEYS)
       @child_associations  = filter_associations(CHILD_ASSOCIATION_KEYS)
 
-      @unique_id = @local_attrs[@synchronizer.unique_id]
       @import_record = find_import
 
       remove_association_keys_from_local_attrs

data/lib/synchronisable/synchronizer.rb

@@ -19,7 +19,7 @@ module Synchronisable
     attribute :remote_id, default: :id
 
     # The unique id to prevent sync of duplicate records.
-    attribute :unique_id
+    method :unique_id, default: -> (attrs) { nil }
 
     # Mapping configuration between local model attributes and
     # its remote counterpart (including id attribute).
@@ -123,6 +123,10 @@ module Synchronisable
         data.present? ? data : gateway_instance.try(:find, params)
       end
 
+      def uid(attrs)
+        unique_id.is_a?(Proc) ? unique_id.(attrs) : attrs[unique_id]
+      end
+
       # Extracts remote id from given attribute hash.
       #
       # @param attrs [Hash] remote attributes

data/lib/synchronisable/version.rb

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

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

@@ -2,7 +2,7 @@ class TournamentSynchronizer < Synchronisable::Synchronizer
   has_many :stages
 
   remote_id :tour_id
-  unique_id :name
+  unique_id { |attrs| attrs[:name] }
 
   mappings(
     :eman       => :name,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synchronisable
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Vasiliy Yorkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-30 00:00:00.000000000 Z
+date: 2014-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord