eternity 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9885515399a74eeec844fd7a809855e88b85d212
-  data.tar.gz: 2bbb9ff78456c2e88b34b60b59bc7f18294388f4
+  metadata.gz: f76c2109a42456676af151b6a5cef12a74af248d
+  data.tar.gz: 3868000b435fe7980807d5ea3301d87378ec4602
 SHA512:
-  metadata.gz: f8bd9bb7f5881c0fd6c1228cffad16bd6c7223203d82001d7396ffe51abe41c100afc8c48398c19d4a08a998736089f0abb721b7b4c24724c8549746bd36d1a0
-  data.tar.gz: d97f7057417ec2bf6a50285d9061776907648d336b640fc7f9d0252553b0c251219c60b3e20494f4d9bb29c69178bb502945f31f06f3c957d3c99796d04d5ebe
+  metadata.gz: c56a780bfd908e067fa7477c381f0ccb5b0db796e6f8d57e52109db39ed5baa6dc16832229e7b7223add0d04fdd34da1121555c8e71490eccdfd5be0024ff6f4
+  data.tar.gz: 14a8b29628bce41a2886a5439ab10b28d8c07b523ee8886219b276d4b0f94add1340622d08d3b1183f00c8dddb037132ad35dccfcc11f4428c5c3de17900646f

data/lib/eternity/delta.rb

@@ -18,12 +18,12 @@ module Eternity
         union(deltas).each_with_object({}) do |(collection, elements), hash|
           hash[collection] = {}
           elements.each do |id, changes|
-            base_data = base_index[collection].include?(id) ? base_index[collection][id].data : {}
             changes.each do |change|
               current_change = change
               if hash[collection][id]
                 current_change = TrackFlatter.flatten [hash[collection][id], change]
                 if current_change && [INSERT, UPDATE].include?(current_change['action'])
+                  base_data = base_index[collection].include?(id) ? base_index[collection][id].data : {}
                   current_change['data'] = ConflictResolver.resolve hash[collection][id]['data'] || base_data,
                                                                     change['data'],
                                                                     base_data

data/lib/eternity/version.rb

@@ -1,3 +1,3 @@
 module Eternity
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eternity
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-04 00:00:00.000000000 Z
+date: 2016-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redic
@@ -248,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Distributed database version control system