synchronisable 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d260ffbc99b38098b73f2b2899406534c0057db
-  data.tar.gz: 2092b4fb9b983b906fa8f6965e6ca776152b31b4
+  metadata.gz: 97bddcbfca63402c0394e535b25bef1c7d1f8a9e
+  data.tar.gz: cebba95741ae03eec51bfc4ba1c333fd5a8574cd
 SHA512:
-  metadata.gz: e8fd530e99e19a584c54789c38a79417101fe28100086ef0e4120f83f1799aeda9f430db1b876fecf5da3455e05aeac4de251e1392f9490ea95bf6e6c4fece9c
-  data.tar.gz: 3deb07640739440fabda1e25c8053045429097a7d8d6535ca27c01576aa644fdbcd1abc700633dc077f4308e42bbde061d55bd757a583eb27e51f85b5bb56a87
+  metadata.gz: ad86504ab1870a6f6f535ae0162093971dacac5c3d38d7208e5495ddd4d52acaacc6181e758246250b99b7c7535b2e9da7cd394c3a882101d84bf5db8b9e02ed
+  data.tar.gz: 7cfdc9b259f064693b096c79555aaa11124114c01bab4a2ffa1a37de9b24d0b97a3752772c0232e0bb138c36d797ea83d9a35f8461051c51225d741436bfeda9

data/lib/generators/synchronisable/templates/create_imports_migration.rb

@@ -5,17 +5,22 @@ class CreateImports < ActiveRecord::Migration
       t.integer :synchronisable_id, null: false
       t.text    :attrs
       t.string  :remote_id, null: false
+      t.string  :unique_id
 
       t.timestamps
     end
 
     add_index :imports, :remote_id
     add_index :imports, [:synchronisable_type, :synchronisable_id]
+    add_index :imports, [:synchronisable_type, :remote_id]
+    add_index :imports, [:synchronisable_type, :unique_id]
   end
 
   def self.down
     remove_index :imports, :remote_id
     remove_index :imports, [:synchronisable_type, :synchronisable_id]
+    remove_index :imports, [:synchronisable_type, :remote_id]
+    remove_index :imports, [:synchronisable_type, :unique_id]
     drop_table :imports
   end
 end

data/lib/synchronisable/models/import.rb

@@ -10,10 +10,6 @@ module Synchronisable
     scope :with_remote_id,  ->(id)  { where(remote_id: id.to_s) }
     scope :with_remote_ids, ->(ids) { where(remote_id: ids.map(&:to_s)) }
 
-    def self.find_by_remote_id(id)
-      with_remote_id(id).first
-    end
-
     def destroy_with_synchronisable
       ActiveRecord::Base.transaction do
         synchronisable.try :destroy

data/lib/synchronisable/source.rb

@@ -8,9 +8,8 @@ module Synchronisable
 
     attr_accessor :import_record
     attr_reader :parent_associations, :child_associations
-    attr_reader :model, :remote_attrs, :remote_id,
-                :local_attrs, :import_ids, :parent,
-                :includes, :data
+    attr_reader :model, :remote_attrs, :remote_id, :unique_id,
+                :local_attrs, :import_ids, :parent, :includes, :data
 
     def initialize(model, parent, includes)
       @model, @parent, @synchronizer = model, parent, model.synchronizer
@@ -39,17 +38,32 @@ module Synchronisable
       @parent_associations = filter_associations(PARENT_ASSOCIATION_KEYS)
       @child_associations  = filter_associations(CHILD_ASSOCIATION_KEYS)
 
-      @import_record = Import.find_by(
-        :remote_id => @remote_id.to_s,
-        :synchronisable_type => @model
-      )
+      @unique_id = @local_attrs[@synchronizer.unique_id]
+      @import_record = find_import
 
       remove_association_keys_from_local_attrs
-
-      # TODO: This should be in Synchronisable::RecordWorker
       set_belongs_to_parent_foreign_key
     end
 
+    def find_import
+      (@unique_id.present? && find_import_by_unique_id) ||
+        find_import_by_remote_id
+    end
+
+    def find_import_by_unique_id
+      Import.find_by(
+        unique_id: @unique_id.to_s,
+        synchronisable_type: @model
+      )
+    end
+
+    def find_import_by_remote_id
+      Import.find_by(
+        remote_id: @remote_id.to_s,
+        synchronisable_type: @model
+      )
+    end
+
     def updatable?
       import_record.present? &&
       local_record.present?
@@ -62,6 +76,7 @@ module Synchronisable
     def dump_message
       %Q(
         remote id: '#{remote_id}',
+        unique_id: '#{unique_id}',
         remote attributes: #{remote_attrs},
         local attributes: #{local_attrs}
       )

data/lib/synchronisable/synchronizer.rb

@@ -18,6 +18,9 @@ module Synchronisable
     # The name of remote `id` attribute.
     attribute :remote_id, default: :id
 
+    # The unique id to prevent sync of duplicate records.
+    attribute :unique_id
+
     # Mapping configuration between local model attributes and
     # its remote counterpart (including id attribute).
     attribute :mappings, converter: ->(source) {

data/lib/synchronisable/version.rb

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

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

@@ -2,6 +2,7 @@ class TournamentSynchronizer < Synchronisable::Synchronizer
   has_many :stages
 
   remote_id :tour_id
+  unique_id :name
 
   mappings(
     :eman       => :name,

data/spec/dummy/db/migrate/20140422135244_create_imports.rb

@@ -5,17 +5,23 @@ class CreateImports < ActiveRecord::Migration
       t.integer :synchronisable_id, null: false
       t.text    :attrs
       t.string  :remote_id, null: false
+      t.string  :unique_id
 
       t.timestamps
     end
 
     add_index :imports, :remote_id
     add_index :imports, [:synchronisable_type, :synchronisable_id]
+    add_index :imports, [:synchronisable_type, :remote_id]
+    add_index :imports, [:synchronisable_type, :unique_id]
   end
 
   def self.down
     remove_index :imports, :remote_id
     remove_index :imports, [:synchronisable_type, :synchronisable_id]
+    remove_index :imports, [:synchronisable_type, :remote_id]
+    remove_index :imports, [:synchronisable_type, :unique_id]
     drop_table :imports
   end
 end
+

data/spec/dummy/db/schema.rb

@@ -18,12 +18,15 @@ ActiveRecord::Schema.define(version: 20140609133855) do
     t.integer  "synchronisable_id",   null: false
     t.text     "attrs"
     t.string   "remote_id",           null: false
+    t.string   "unique_id"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   add_index "imports", ["remote_id"], name: "index_imports_on_remote_id"
+  add_index "imports", ["synchronisable_type", "remote_id"], name: "index_imports_on_synchronisable_type_and_remote_id"
   add_index "imports", ["synchronisable_type", "synchronisable_id"], name: "index_imports_on_synchronisable_type_and_synchronisable_id"
+  add_index "imports", ["synchronisable_type", "unique_id"], name: "index_imports_on_synchronisable_type_and_unique_id"
 
   create_table "match_players", force: true do |t|
     t.integer  "match_id"

data/spec/models/tournament_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe Tournament do
+  describe 'synchronization' do
+    let!(:remote_attrs) do
+      [
+        build(:remote_tournament, tour_id: '1', eman: 'tour-1'),
+        build(:remote_tournament, tour_id: '2', eman: 'tour-1'),
+        build(:remote_tournament, tour_id: '1', eman: 'tour-2')
+      ]
+    end
+
+    subject { -> { Tournament.sync(remote_attrs) } }
+
+    it { is_expected.to change { Tournament.count }.by(2) }
+    it { is_expected.to change { Synchronisable::Import.count }.by(2) }
+  end
+end

data/spec/synchronisable/synchronisable_spec.rb

@@ -12,12 +12,12 @@ describe Synchronisable do
           Synchronisable.models = %w(Match Team)
         end
 
-        it { should change { Match.count }.by(1) }
-        it { should change { Team.count }.by(2) }
-        it { should change { Player.count }.by(4) }
-        it { should change { MatchPlayer.count }.by(4) }
+        it { is_expected.to change { Match.count }.by(1) }
+        it { is_expected.to change { Team.count }.by(2) }
+        it { is_expected.to change { Player.count }.by(4) }
+        it { is_expected.to change { MatchPlayer.count }.by(4) }
 
-        it { should change { Synchronisable::Import.count }.by(11) }
+        it { is_expected.to change { Synchronisable::Import.count }.by(11) }
       end
 
       context 'all' do
@@ -28,18 +28,16 @@ describe Synchronisable do
           )
         end
 
-        it { should change { Tournament.count }.by(1) }
-        it { should change { Stage.count }.by(2) }
-        it { should change { Match.count }.by(1) }
-        it { should change { Team.count }.by(2) }
-        it { should change { MatchPlayer.count }.by(4) }
-        it { should change { Player.count }.by(4) }
+        it { is_expected.to change { Tournament.count }.by(1) }
+        it { is_expected.to change { Stage.count }.by(2) }
+        it { is_expected.to change { Match.count }.by(1) }
+        it { is_expected.to change { Team.count }.by(2) }
+        it { is_expected.to change { MatchPlayer.count }.by(4) }
+        it { is_expected.to change { Player.count }.by(4) }
 
-        it { should change { Synchronisable::Import.count }.by(14) }
+        it { is_expected.to change { Synchronisable::Import.count }.by(14) }
       end
 
-      # TODO: Left here until :include option is implemented
-      #
       # context 'when models setting is overriden in method call' do
       #   before :all do
       #     Synchronisable.models = %w(Team Match)
@@ -49,11 +47,11 @@ describe Synchronisable do
       #     -> { Synchronisable.sync(Match, Player) }
       #   end
 
-      #   it { should change { Match.count }.by(1) }
-      #   it { should change { Player.count }.by(22) }
-      #   it { should_not change { Team.count }.by(2) }
+      #   it { is_expected.to change { Match.count }.by(1) }
+      #   it { is_expected.to change { Player.count }.by(22) }
+      #   it { is_expected.not_to change { Team.count }.by(2) }
 
-      #   it { should change { Synchronisable::Import.count }.by(5) }
+      #   it { is_expected.to change { Synchronisable::Import.count }.by(5) }
       # end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synchronisable
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Vasiliy Yorkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2014-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -419,6 +419,7 @@ files:
 - spec/models/match_spec.rb
 - spec/models/team_group_statistic_spec.rb
 - spec/models/team_spec.rb
+- spec/models/tournament_spec.rb
 - spec/spec_helper.rb
 - spec/synchronisable/dsl/macro_spec.rb
 - spec/synchronisable/models/import_spec.rb
@@ -544,6 +545,7 @@ test_files:
 - spec/models/match_spec.rb
 - spec/models/team_group_statistic_spec.rb
 - spec/models/team_spec.rb
+- spec/models/tournament_spec.rb
 - spec/spec_helper.rb
 - spec/synchronisable/dsl/macro_spec.rb
 - spec/synchronisable/models/import_spec.rb