active_tools 0.0.27 → 0.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fd6942e7da61204c41ff619e9dd2802240935ad
-  data.tar.gz: 05b5eabb09889693ba6660db6a104b1e7e952abd
+  metadata.gz: 02a14a54d1213611e0c06354ee9484bb0acbc074
+  data.tar.gz: 5d8513542b8e45c4a9acdb0d9d9d16ff853888b1
 SHA512:
-  metadata.gz: 6868f2b6e3f6c78c5d829869ca4cd62758afd90e2f004f426475bd1914df9e3086f590b3c9c4015e47d639264c940e9b9ae4f376ea6c2c0af57a439dee37d7ff
-  data.tar.gz: ca6e0d910eabd61491d38e67a821475c2dbc0fd4e562d01c84421108e2d13a2b954441d337640bac61d533ab5fca6886afa25398e90f395a6b1f2308f8014161
+  metadata.gz: 3824d5cf0f48488d110db5b033732dc4d64265f7301716d99cdd817560f73b91749f46e2d657270225466d8b7e7a955bb6bcbe3beb9cbd6531979e01a1e4e591
+  data.tar.gz: 34bf14f4bf1c4c67147c931841f89cc43b828d95019a6340d2b935640f70aafb4ec5c1068fb2dcf79cb7e131e887c90563ddb022f3d5ab0dffbaa6e761b26f02

data/lib/active_tools/active_record/adaptive_belongs_to/adapter.rb

@@ -4,7 +4,7 @@ module ActiveTools
       class Adapter
         attr_reader :owner, :assoc_name, :options
 
-        delegate :target, :target_id, :reflection, :to => :association
+        delegate :target, :reflection, :to => :association
 
         def initialize(owner, assoc_name, options = {})
           @owner = owner
@@ -39,7 +39,7 @@ module ActiveTools
             store_backup!
             create_template!
             target.send("#{name}=", value)
-            if same_as_backup?
+            if @backup.present? && same_records?(@backup, target, :attributes => @remote_attributes)
               restore_backup!
             end
           end
@@ -87,7 +87,7 @@ module ActiveTools
         end
 
         def try_commit_existed          
-          if @template.present? && @uniq_by.any? && (existed = detect_existed)
+          if @template.present? && @uniq_by.any? && (existed = detect_existed) && !(@backup.present? && same_records?(@backup, existed, :attributes => @uniq_by))
             warn "Adaptive fetching existed <#{existed.class.name}: #{existed.class.primary_key}: #{existed.send(existed.class.primary_key)}>"
             self.target = existed
             if updateable_backup?
@@ -133,6 +133,10 @@ module ActiveTools
         end
 
         private
+        
+        def target_id
+          association.send(:target_id)
+        end
 
         def detect_existed
           outer_values = {}
@@ -198,9 +202,17 @@ module ActiveTools
             @backup ||= target
           end
         end
-
-        def same_as_backup?
-          @backup.present? && eval(@remote_attributes.map {|a| "@backup.send(:#{a}) == target.send(:#{a})"}.join(" && "))
+        
+        def same_records?(*args)
+          options = args.extract_options!
+          attributes = options[:attributes]
+          result = true
+          prev_object = args.shift
+          args.each do |object|
+            result = result && eval(attributes.map {|a| "object.send(:#{a}) == prev_object.send(:#{a})"}.join(" && "))
+            prev_object = object
+          end
+          result
         end
 
         def valid_attribute?(name)

data/lib/active_tools/version.rb

@@ -1,3 +1,3 @@
 module ActiveTools
-  VERSION = "0.0.27"
+  VERSION = "0.0.28"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_tools
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 0.0.28
 platform: ruby
 authors:
 - Valery Kvon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-28 00:00:00.000000000 Z
+date: 2015-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails