eternity 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7844d5b55ae3bf3ee53f5ffebe730e65c586071
-  data.tar.gz: 44489d244b55008ab3a484290e5f9e261ee77c2d
+  metadata.gz: 9885515399a74eeec844fd7a809855e88b85d212
+  data.tar.gz: 2bbb9ff78456c2e88b34b60b59bc7f18294388f4
 SHA512:
-  metadata.gz: a478d2902be86a627498d81fa69b6191cb45c9574d26c520be0142b0ac051a533bb6e8a38772eda97d6579b1d987afeca7febc3cf21240b6ff40f5bba9ad8b33
-  data.tar.gz: 335f532289063578604144fde234b8ec2a62d91fb8ee1a205e9b5aa957f674d987e6307b7f58a614bcbc050d0b0351034350e09baa2cfed224b99432e6be6648
+  metadata.gz: f8bd9bb7f5881c0fd6c1228cffad16bd6c7223203d82001d7396ffe51abe41c100afc8c48398c19d4a08a998736089f0abb721b7b4c24724c8549746bd36d1a0
+  data.tar.gz: d97f7057417ec2bf6a50285d9061776907648d336b640fc7f9d0252553b0c251219c60b3e20494f4d9bb29c69178bb502945f31f06f3c957d3c99796d04d5ebe

data/lib/eternity/patch.rb

@@ -60,6 +60,8 @@ module Eternity
               elements.each do |id, change|
                 if change['action'] == UPDATE && current_index[collection][id].sha1 == Blob.digest(Blob.serialize(change['data']))
                   change = nil 
+                elsif change['action'] == DELETE && !current_index[collection].include?(id)
+                  change = nil
                 end
                 hash[collection][id] = change if change
               end

data/lib/eternity/version.rb

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

data/spec/merge_spec.rb

@@ -4,7 +4,6 @@ describe Repository, 'Merge' do
 
   let(:repo_1) { Repository.new :test_1 }
   let(:repo_2) { Repository.new :test_2 }
-  let(:repo_3) { Repository.new :test_3 }
 
   let(:commits) { Hash.new }
 
@@ -20,6 +19,10 @@ describe Repository, 'Merge' do
     delta
   end
 
+  def checkout(id, repo)
+    repo.checkout commit: commits[id].id
+  end
+
   def assert_history(id, history_ids)
     commits[id].history.must_equal history_ids.map { |c| commits[c] }
   end
@@ -28,6 +31,179 @@ describe Repository, 'Merge' do
     commits[id].must_equal_index 'countries' => expected
   end
 
+  describe 'Merge Errors' do
+
+    it 'case 1' do
+      skip
+      commit 1, repo_1 do
+        insert 'AR', name: 'Argentina'
+      end
+
+      checkout 1, repo_2
+
+      commit 2, repo_2 do
+        insert 'UY', name: 'Uruguay'
+      end
+
+      commit 3, repo_1 do
+        update 'AR', name: 'Brasil'
+      end
+
+      commit 4, repo_1 do
+        update 'AR', name: 'Argentina'
+      end
+
+      merge 5, repo_2, 4 do |delta|
+        #delta['AR'].must_equal => {'action' => 'update', 'data' => {'name' => 'Argentina'}}
+      end
+
+      commits[5].with_index do |index| 
+        index['countries']['AR'].data['name'].must_equal 'Argentina'
+      end
+    end
+
+    it 'case 2' do
+      skip
+      commit 1, repo_1 do
+        insert 'AR', name: 'Argentina'
+      end
+
+      checkout 1, repo_2
+
+      commit 2, repo_2 do
+        insert 'UY', name: 'Uruguay'
+        update 'AR', name: 'Brasil'
+      end
+
+      commit 3, repo_2 do
+        update 'AR', name: 'Argentina'
+      end
+
+      commit 4, repo_1 do
+        update 'AR', name: 'Arg'
+      end
+
+      commit 5, repo_1 do
+        update 'AR', name: 'Argentina'
+      end
+
+      merge 6, repo_2, 5 do |delta|
+        #delta['AR'].must_equal => {'action' => 'update', 'data' => {'name' => 'Argentina'}}
+      end
+
+      commits[6].with_index do |index| 
+        index['countries']['AR'].data['name'].must_equal 'Argentina'
+      end
+    end
+
+    it 'case 3 (patched)' do
+      skip
+      commit 1, repo_1 do
+        insert 'AR', name: 'Argentina'
+      end
+
+      checkout 1, repo_2
+
+      commit 2, repo_2 do
+        insert 'UY', name: 'Uruguay'
+        update 'AR', name: 'Brasil'
+      end
+
+      commit 3, repo_2 do
+        update 'AR', name: 'Argentina '
+      end
+
+      commit 4, repo_1 do
+        update 'AR', name: 'Arg'
+      end
+
+      commit 5, repo_1 do
+        update 'AR', name: 'Argentina'
+      end
+
+      merge 6, repo_2, 5 do |delta|
+        #delta['AR'].must_equal => {'action' => 'update', 'data' => {'name' => 'Argentina'}}
+      end
+
+      commits[6].with_index do |index| 
+        index['countries']['AR'].data['name'].must_equal 'Argentina'
+      end
+
+      merge 7, repo_1, 3 do |delta|
+        #delta['AR'].must_equal => {'action' => 'update', 'data' => {'name' => 'Argentina'}}
+      end
+
+      commits[7].with_index do |index| 
+        index['countries']['AR'].data['name'].must_equal 'Argentina'
+      end      
+
+    end
+
+  end
+
+  it 'Merge deleted element in two commits' do
+    # REPO 1: (*)---(1)----(3)--------(5)
+    #                  \      \         \
+    # REPO 2:           -(2)---(4)--(6)--(7)
+
+    commit 1, repo_1 do
+      insert 'AR', name: 'Argentina'
+    end
+
+    assert_history 1, []
+    assert_index 1, 'AR' => digest(name: 'Argentina')
+
+    checkout 1, repo_2
+
+    commit 2, repo_1 do
+      insert 'UY', name: 'Uruguay'
+    end
+
+    assert_history 2, [1]
+    assert_index 2, 'AR' => digest(name: 'Argentina'),
+                    'UY' => digest(name: 'Uruguay')
+
+    commit 3, repo_2 do
+      insert 'BR', name: 'Brasil'
+    end
+
+    assert_history 3, [1]
+    assert_index 3, 'AR' => digest(name: 'Argentina'),
+                    'BR' => digest(name: 'Brasil')
+    
+    merge 4, repo_2, 2 do |delta|
+      delta.must_equal 'UY' => {'action' => 'insert', 'data' => {'name' => 'Uruguay'}}
+    end
+
+    assert_history 4, [3,2,1]
+    assert_index 4, 'AR' => digest(name: 'Argentina'),
+                    'BR' => digest(name: 'Brasil'),
+                    'UY' => digest(name: 'Uruguay')
+
+    commit 5, repo_1 do
+      delete 'UY'
+    end
+
+    assert_history 5, [2,1]
+    assert_index 5, 'AR' => digest(name: 'Argentina')
+
+    commit 6, repo_2 do
+      delete 'UY'
+    end
+
+    assert_history 6, [4,3,2,1]
+    assert_index 6, 'AR' => digest(name: 'Argentina'),
+                    'BR' => digest(name: 'Brasil')
+
+    merge 7, repo_2, 5 do |delta|
+      delta.must_be_nil
+    end
+
+    assert_history 7, [6,4,3,5,2,1]
+    assert_index 7, 'AR' => digest(name: 'Argentina'),
+                    'BR' => digest(name: 'Brasil')
+  end
+
   it 'Delta, index and history' do
     # REPO 1: (*)---(1)--(2)--(5)---(6)---(9)--(11)
     #                  \          /     \       /
@@ -49,7 +225,7 @@ describe Repository, 'Merge' do
     assert_history 2, [1]
     assert_index 2, 'AR' => digest(name: 'Argentina')
 
-    repo_2.checkout commit: commits[1].id
+    checkout 1, repo_2
 
     commit 3, repo_2 do
       insert 'UY', name: 'Uruguay'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eternity
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-25 00:00:00.000000000 Z
+date: 2015-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redic