eternity 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bb28d44f6a6270e1aa8d7da6b66067d5a097dbb
-  data.tar.gz: 1b316ac4f934458b9807717928f8bfd093453a1b
+  metadata.gz: 319437ad396ef5f306feb9578edf4a890dc2ecfc
+  data.tar.gz: e2ae5f04b986d60ab7a5fdcd26fe3c7614f0c1a7
 SHA512:
-  metadata.gz: 4dc81d334ca41182d027060ec32d1761856f80f8ca5de8e1ad79c5aca4de91026ce439a7ee9d68da1ed32d1a833021588a65653af195881d7da5f3f3af531fcc
-  data.tar.gz: 72308247b234e76c85ad6428860914ed8cce6bc54c073de199c41bb94354d984542baad5dd28a28a3e577ed699ea04a1fc0a6e22f275aa8a491a7e4dcdbafb3d
+  metadata.gz: c95bcefe396e0751d1165ae01b69d7500b277c2ab48228c82fda06f5bae0de1c7b651c02852c9b3b9035d8c68521c05f2ba071e47576507861d0ed8c4976656f
+  data.tar.gz: b1082bb669fedc219e0a82326ecbb8298e70cc0365393935cf49384c1f92533342c1af44891cdb100687d1b6ffc29da32107fe5784474b2080ca59fdfb6b158a

data/lib/eternity/blob.rb

@@ -41,8 +41,15 @@ module Eternity
       end
 
       def normalize(data)
-        sorted_data = Hash[data.sort_by { |k,v| k.to_s }]
-        sorted_data.each { |k,v| sorted_data[k] = v.utc.strftime TIME_FORMAT if v.respond_to? :utc }
+        case data
+          when Hash
+            sorted_data = Hash[data.sort_by { |k,v| k.to_s }]
+            sorted_data.each { |k,v| sorted_data[k] = v.utc.strftime TIME_FORMAT if v.respond_to? :utc }
+          when Array
+            data.map { |d| normalize d }
+          else
+            data
+        end
       end
 
       def clear_cache

data/lib/eternity/commit.rb

@@ -46,19 +46,37 @@ module Eternity
       Commit.new data['base']
     end
 
-    def history_times
-      data['history_times'] ? Blob.read(:history_times, data['history_times']) : {}
+    def history_ids
+      if data['history']
+        Blob.read :history, data['history']
+      else
+        # Backward compatibility
+        cache_key = Eternity.keyspace[:cache][:history][id]
+        return Eternity.redis.call 'LRANGE', cache_key, 0, -1 if Eternity.redis.call('EXISTS', cache_key) == 1
+
+        commit_ids =
+          if parent_ids.count == 2
+            current_history_ids = [parent_ids[0]] + Commit.new(parent_ids[0]).history_ids
+            target_history_ids = [parent_ids[1]] + Commit.new(parent_ids[1]).history_ids
+            current_history_ids - target_history_ids + target_history_ids
+          else
+            parent_id = parent_ids[0]
+            parent_id ? [parent_id] + Commit.new(parent_id).history_ids : []
+          end
+
+        Eternity.redis.call 'RPUSH', cache_key, *commit_ids
+
+        commit_ids
+      end
     end
 
     def history
-      history_times.sort_by { |id, time| time }
-                   .map { |id, time| Commit.new id }
-                   .reverse
+      history_ids.map { |id| Commit.new id }
     end
 
     def fast_forward?(commit)
       return true if commit.nil?
-      history_times.key? commit.id
+      history_ids.include? commit.id
     end
 
     def first?
@@ -91,21 +109,26 @@ module Eternity
       raise 'Author must be present' if options[:author].to_s.strip.empty?
       raise 'Message must be present' if options[:message].to_s.strip.empty?
 
-      history_times = options[:parents].compact.each_with_object({}) do |id, hash|
-        commit = Commit.new id
-        hash.merge! id => commit.time
-        hash.merge! commit.history_times
-      end
+      # TODO: Move to Repository and Patch
+      history =
+        if options[:parents].count == 2
+          current_history_ids = [options[:parents][0]] + Commit.new(options[:parents][0]).history_ids
+          target_history_ids = [options[:parents][1]] + Commit.new(options[:parents][1]).history_ids
+          current_history_ids - target_history_ids + target_history_ids
+        else
+          parent_id = options[:parents][0]
+          parent_id ? [parent_id] + Commit.new(parent_id).history_ids : []
+        end
 
       data = {
-        time:          options.fetch(:time) { Time.now },
+        time:          Time.now,
         author:        options.fetch(:author),
         message:       options.fetch(:message),
         parents:       options.fetch(:parents),
         index:         options.fetch(:index),
         delta:         options.fetch(:delta),
         base:          options[:parents].count == 2 ? options.fetch(:base) : options[:parents].first,
-        history_times: Blob.write(:history_times, history_times)
+        history:       Blob.write(:history, history)
       }
 
       new Blob.write(:commit, data)

data/lib/eternity/delta.rb

@@ -14,33 +14,41 @@ module Eternity
         end
       end
 
-      def merge(deltas)
+      def merge(deltas, base_index)
         union(deltas).each_with_object({}) do |(collection, elements), hash|
           hash[collection] = {}
           elements.each do |id, changes|
-            change = TrackFlatter.flatten changes
-            hash[collection][id] = TrackFlatter.flatten changes if change
+            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'])
+                  current_change['data'] = ConflictResolver.resolve hash[collection][id]['data'] || base_data,
+                                                                    change['data'],
+                                                                    base_data
+                end
+              elsif hash[collection].key?(id) && change['action'] == DELETE
+                current_change = nil
+              end
+              hash[collection][id] = current_change
+            end
+            hash[collection].delete id unless hash[collection][id]
           end
-        end
-      end
-
-      def between(commit_1, commit_2)
-        commits = ([commit_2] + commit_2.history) - ([commit_1] + commit_1.history)
-        merge commits.reverse.map(&:delta)
+          hash.delete collection if hash[collection].empty?
+        end        
       end
 
-      def revert(delta, commit)
-        commit.with_index do |index|
-          delta.each_with_object({}) do |(collection, changes), hash|
-            hash[collection] = {}
-            changes.each do |id, change|
-              hash[collection][id] = 
-                case change['action']
-                  when INSERT then {'action' => DELETE}
-                  when UPDATE then {'action' => UPDATE, 'data' => index[collection][id].data}
-                  when DELETE then {'action' => INSERT, 'data' => index[collection][id].data}
-                end
-            end
+      def revert(delta, index)
+        delta.each_with_object({}) do |(collection, changes), hash|
+          hash[collection] = {}
+          changes.each do |id, change|
+            hash[collection][id] = 
+              case change['action']
+                when INSERT then {'action' => DELETE}
+                when UPDATE then {'action' => UPDATE, 'data' => index[collection][id].data}
+                when DELETE then {'action' => INSERT, 'data' => index[collection][id].data}
+              end
           end
         end
       end

data/lib/eternity/patch.rb

@@ -26,117 +26,87 @@ module Eternity
         @delta ||= TransparentProxy.new { calculate_delta }
       end
 
-    end
-
+      def base_history
+        @base_history ||= [base_commit] + base_commit.history
+      end
 
-    class Merge
-      
-      extend Log
-      include Common
+      def current_history
+        @current_history ||= [current_commit] + current_commit.history - base_history
+      end
 
-      def base_delta
-        @base_delta ||= merged? ? {} : Delta.merge([current_delta, delta])
+      def target_history
+        @target_history ||= [target_commit] + target_commit.history - base_history
       end
 
-      def merged?
-        @merged ||= current_commit == target_commit ||
-                    target_commit.fast_forward?(current_commit) || 
-                    current_commit.fast_forward?(target_commit)
+      def remaining_history
+        @remaining_history ||= current_history - target_history
       end
 
       private
 
-      def current_delta
-        @current_delta ||= Delta.between target_commit, current_commit
-      end
+      def calculate_delta
+        base_commit.with_index do |base_index|
+          current_commit.with_index do |current_index|
+            
+            current_delta = Delta.merge current_history.reverse.map(&:delta), base_index
+            target_delta = Delta.merge target_history.reverse.map(&:delta), base_index
+            revert_delta = Delta.revert current_delta, base_index
 
-      def target_delta
-        @target_delta ||= Delta.between current_commit, target_commit
-      end
+            merged_delta = merge_deltas current_delta, target_delta, revert_delta, base_index
 
-      def calculate_delta
-        return {} if merged?
+            merged_delta.each_with_object({}) do |(collection, elements), hash|
+              hash[collection] = {}
 
-        base_commit.with_index do |base_index|
-          target_delta.each_with_object({}) do |(collection, elements), hash|
-            hash[collection] = {}
-           
-            elements.each do |id, change|
-              if change['action'] == INSERT && current_action_for(collection, id) == INSERT
-                data = ConflictResolver.resolve current_delta[collection][id]['data'], 
-                                                change['data']
-                change = {'action' => UPDATE, 'data' => data}
-              
-              elsif change['action'] == UPDATE
-                if current_action_for(collection, id) == UPDATE
-                  data = ConflictResolver.resolve current_delta[collection][id]['data'], 
-                                                  change['data'], 
-                                                  base_index[collection][id].data
-                  change = change.merge 'data' => data
-                elsif current_action_for(collection, id) == DELETE
-                  change = {'action' => INSERT, 'data' => change['data']}
+              elements.each do |id, change|
+                if change['action'] == UPDATE && current_index[collection][id].sha1 == Blob.digest(Blob.serialize(change['data']))
+                  change = nil 
                 end
-              
-              elsif change['action'] == DELETE && current_action_for(collection, id) == DELETE
-                change = nil
+                hash[collection][id] = change if change
               end
 
-              hash[collection][id] = change if change
+              hash.delete collection if hash[collection].empty?
             end
-
-            hash.delete collection if hash[collection].empty?
           end
         end
       end
 
-      def has_current_changes_for?(collection, id)
-        current_delta.key?(collection) && current_delta[collection].key?(id)
-      end
-
-      def current_action_for(collection, id)
-        current_delta[collection][id]['action'] if has_current_changes_for? collection, id
-      end
-
-      log :calculate_delta
     end
 
 
-    class Diff
-      
+    class Merge
       extend Log
       include Common
 
+      def merged?
+        @merged ||= current_commit == target_commit ||
+                    target_commit.fast_forward?(current_commit) || 
+                    current_commit.fast_forward?(target_commit)
+      end
+
       private
 
-      def current_delta
-        @current_delta ||= Delta.between base_commit, current_commit
+      def calculate_delta
+        return {} if merged?
+        super
       end
 
-      def target_delta
-        @target_delta ||= Delta.between base_commit, target_commit
+      def merge_deltas(current_delta, target_delta, revert_delta, base_index)
+        remaining_delta = Delta.merge remaining_history.reverse.map(&:delta), base_index
+        Delta.merge [revert_delta, target_delta, remaining_delta], base_index
       end
 
-      def diff_delta
-        @diff_delta ||= Delta.merge [Delta.revert(current_delta, base_commit), target_delta]
-      end
+      log :calculate_delta
+    end
 
-      def calculate_delta
-        target_commit.with_index do |target_index|
-          diff_delta.each_with_object({}) do |(collection, elements), hash|
-            hash[collection] = {}
-
-            elements.each do |id, change|
-              if change['data']
-                sha1 = Blob.digest(Blob.serialize(change['data']))
-                change['data'] = target_index[collection][id].data if target_index[collection].include?(id) && sha1 != target_index[collection][id].sha1
-              end
 
-              hash[collection][id] = change if change
-            end
+    class Diff
+      extend Log
+      include Common
 
-            hash.delete collection if hash[collection].empty?
-          end
-        end
+      private
+
+      def merge_deltas(current_delta, target_delta, revert_delta, base_index)
+        Delta.merge [revert_delta, target_delta], base_index
       end
 
       log :calculate_delta

data/lib/eternity/repository.rb

@@ -62,8 +62,7 @@ module Eternity
 
       locker.lock! :commit do
         commit! message: options.fetch(:message), 
-                author:  options.fetch(:author),
-                time:    options.fetch(:time) { Time.now }
+                author:  options.fetch(:author)
       end
     end
 
@@ -134,7 +133,9 @@ module Eternity
 
     def revert
       locker.lock! :revert do
-        Delta.revert(delta, current_commit).tap { tracker.revert }
+        current_commit.with_index do |index|
+          Delta.revert(delta, index).tap { tracker.revert }
+        end
       end
     end
 
@@ -189,12 +190,11 @@ module Eternity
 
         raise 'Already merged' if patch.merged?
 
-        commit! message:    "Merge #{target_commit.short_id} into #{current_commit.short_id} (#{name})",
-                author:     'System',
-                parents:    [current_commit.id, target_commit.id],
-                index:      write_index(patch.delta),
-                base:       patch.base_commit.id,
-                base_delta: Blob.write(:delta, patch.base_delta)
+        commit! message: "Merge #{target_commit.short_id} into #{current_commit.short_id} (#{name})",
+                author:  'System',
+                parents: [current_commit.id, target_commit.id],
+                index:   write_index(patch.delta),
+                base:    patch.base_commit.id
 
         patch.delta
       end

data/lib/eternity/version.rb

@@ -1,3 +1,3 @@
 module Eternity
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/spec/delta_spec.rb

@@ -6,7 +6,15 @@ describe 'Delta' do
   let(:repo_2) { Repository.new :test_2 }
   let(:repo_3) { Repository.new :test_3 }
 
-  it 'Merge and Checkout' do
+  it 'Merge -> Checkout (2 times)' do
+    #               P           P         P
+    # REPO 1: (*)--(1)---(4)---(5)  (6)--(8)       (10)
+    #               \           \   /     \        / \
+    # REPO 2:        -(2)--(3)---(6)--(7)--(9)--(10) \
+    #                \            MP        M    P   \
+    # REPO 3:         ------(11)                    (10)  
+    #
+
     repo_1[:countries].insert 'AR', name: 'Argentina'
     commit_1 = repo_1.commit author: 'User 1', message: 'Commit 1'
     repo_1.push
@@ -17,10 +25,10 @@ describe 'Delta' do
     repo_2[:countries].insert 'BR', name: 'Brasil'
     commit_2 = repo_2.commit author: 'User 2', message: 'Commit 2'
 
-    repo_2[:countries].update 'AR', name: 'Argentina', code: 54, capital: '...'
+    repo_2[:countries].update 'AR', name: 'Argentina', number: 54, capital: 'CABA'
     commit_3 = repo_2.commit author: 'User 2', message: 'Commit 3'
 
-    repo_1[:countries].update 'AR', name: 'Argentina', capital: 'CABA'
+    repo_1[:countries].update 'AR', name: 'Argentina', capital: '...', code: 'ARG'
     commit_4 = repo_1.commit author: 'User 1', message: 'Commit 4'
 
     repo_1[:countries].insert 'CL', name: 'Chile'
@@ -32,12 +40,12 @@ describe 'Delta' do
     commit_6 = repo_2.current_commit # Merge
 
     delta.must_equal 'countries' => {
-      'AR' => {'action' => 'update', 'data' => {'name' => 'Argentina', 'code' => 54, 'capital' => 'CABA'}},
+      'AR' => {'action' => 'update', 'data' => {'name' => 'Argentina', 'number' => 54, 'code' => 'ARG', 'capital' => 'CABA'}},
       'CL' => {'action' => 'insert', 'data' => {'name' => 'Chile'}}
     }
 
     commit_6.must_equal_index 'countries' => {
-      'AR' => digest(name: 'Argentina', code: 54, capital: 'CABA'),
+      'AR' => digest(name: 'Argentina', number: 54, code: 'ARG', capital: 'CABA'),
       'BR' => digest(name: 'Brasil'),
       'CL' => digest(name: 'Chile')
     }
@@ -49,9 +57,8 @@ describe 'Delta' do
     repo_1.current_commit.must_equal commit_6
 
     delta.must_equal 'countries' => {
-      'AR' => {'action' => 'update', 'data' => {'name' => 'Argentina', 'code' => 54, 'capital' => 'CABA'}},
-      'BR' => {'action' => 'insert', 'data' => {'name' => 'Brasil'}},
-      'CL' => {'action' => 'update', 'data' => {'name' => 'Chile'}}
+      'AR' => {'action' => 'update', 'data' => {'name' => 'Argentina', 'number' => 54, 'code' => 'ARG', 'capital' => 'CABA'}},
+      'BR' => {'action' => 'insert', 'data' => {'name' => 'Brasil'}}
     }
 
     repo_2[:countries].delete 'CL'
@@ -71,7 +78,7 @@ describe 'Delta' do
     }
 
     commit_9.must_equal_index 'countries' => {
-      'AR' => digest(name: 'Argentina', code: 54, capital: 'CABA'),
+      'AR' => digest(name: 'Argentina', number: 54, code: 'ARG', capital: 'CABA'),
       'BR' => digest(name: 'Brasil'),
       'PY' => digest(name: 'Paraguay'),
       'CO' => digest(name: 'Colombia')
@@ -101,13 +108,19 @@ describe 'Delta' do
 
     delta.must_equal 'countries' => {
       'UY' => {'action' => 'delete'},
-      'AR' => {'action' => 'update', 'data' => {'name' => 'Argentina', 'code' => 54, 'capital' => 'CABA'}},
+      'AR' => {'action' => 'update', 'data' => {'name' => 'Argentina', 'number' => 54, 'code' => 'ARG', 'capital' => 'CABA'}},
       'BR' => {'action' => 'insert', 'data' => {'name' => 'Brasil'}},
       'PY' => {'action' => 'insert', 'data' => {'name' => 'Paraguay'}}
     }
   end
 
   it 'Commit -> Pull -> Push (multiple times)' do
+    #               P         MP        MP         M
+    # REPO 1: (*)--(1)--(3)--(4)--(7)--(8)--(11)--(12)
+    #               \      /     \   /     \    /
+    # REPO 2:        ---(2)--(5)--(6)--(9)--(10)
+    #                    P         MP        MP
+
     repo_1[:countries].insert 'AR', name: 'Argentina'
     repo_1.commit author: 'User 1', message: 'Added Argentina'
     repo_1.push
@@ -216,4 +229,88 @@ describe 'Delta' do
     }
   end
 
+  it 'Merge -> Merge -> Checkout' do
+    #               P             MP   P
+    # REPO 1: (*)--(1)--(2)------(6)--(7)
+    #                \       MP /       \
+    # REPO 2:         --(3)--(5)         (7)
+    #                 \     /
+    # REPO 3:          -(4)-
+    #                    P
+
+    repo_1[:countries].insert 'AR', name: 'Argentina'
+    repo_1.commit author: 'User 1', message: 'Commit 1'
+    repo_1.push
+
+    delta = repo_2.pull
+    delta.must_equal 'countries' => {
+      'AR' => {'action' => 'insert', 'data' => {'name' => 'Argentina'}}
+    }
+
+    repo_2.current_commit.must_equal_index 'countries' => {
+      'AR' => digest(name: 'Argentina'),
+    }
+
+    delta = repo_3.pull
+    delta.must_equal 'countries' => {
+      'AR' => {'action' => 'insert', 'data' => {'name' => 'Argentina'}}
+    }
+
+    repo_3.current_commit.must_equal_index 'countries' => {
+      'AR' => digest(name: 'Argentina'),
+    }
+
+    repo_1[:countries].insert 'BR', name: 'Brasil'
+    repo_1.commit author: 'User 1', message: 'Commit 2'
+
+    repo_2[:countries].update 'AR', name: 'Argentina', number: 54
+    repo_2.commit author: 'User 2', message: 'Commit 3'
+
+    repo_3[:countries].insert 'UY', name: 'Uruguay'
+    repo_3.commit author: 'User 3', message: 'Commit 4'
+    repo_3.push
+
+    delta = repo_2.pull
+    delta.must_equal 'countries' => {
+      'UY' => {'action' => 'insert', 'data' => {'name' => 'Uruguay'}}
+    }
+
+    repo_2.current_commit.must_equal_index 'countries' => {
+      'AR' => digest(name: 'Argentina', number: 54),
+      'UY' => digest(name: 'Uruguay')
+    }
+
+    repo_2.push
+
+    delta = repo_1.pull
+    delta.must_equal 'countries' => {
+      'AR' => {'action' => 'update', 'data' => {'name' => 'Argentina', 'number' => 54}},
+      'UY' => {'action' => 'insert', 'data' => {'name' => 'Uruguay'}}
+    }
+
+    repo_1.current_commit.must_equal_index 'countries' => {
+      'AR' => digest(name: 'Argentina', number: 54),
+      'BR' => digest(name: 'Brasil'),
+      'UY' => digest(name: 'Uruguay')
+    }
+
+    repo_1.push
+
+    repo_1[:countries].delete 'UY'
+    repo_1.commit author: 'User 1', message: 'Commit 7'
+    repo_1.push
+
+    delta = repo_2.pull
+    delta.must_equal 'countries' => {
+      'BR' => {'action' => 'insert', 'data' => {'name' => 'Brasil'}},
+      'UY' => {'action' => 'delete'}
+    }
+
+    repo_2.current_commit.must_equal_index 'countries' => {
+      'AR' => digest(name: 'Argentina', number: 54),
+      'BR' => digest(name: 'Brasil')
+    }
+
+  end
+
 end

data/spec/history_spec.rb

@@ -0,0 +1,102 @@
+require 'minitest_helper'
+
+describe Commit, 'history' 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 }
+
+  def commit(repo, id)
+    data = {id: SecureRandom.uuid}
+    repo[:countries].insert data[:id], data
+    commits[id] = repo.commit author: repo.name, message: "Commit #{id}"
+  end
+
+  def push(repo)
+    repo.push
+  end
+
+  def pull(repo, merge_id=nil)
+    repo.pull
+    commits[merge_id] = repo.current_commit if merge_id
+  end
+
+  def assert_history(expected)
+    commits.each do |i,c|
+      c.history.must_equal expected[i].map { |e| commits[e] }, "Fail history of ##{i}: #{c}\nExpected: #{expected[i].map{ |c| commits[c].message }} \nActual: #{c.history.map(&:message)}"
+    end
+  end
+
+  it 'Test 1' do
+    #                    P          M     P
+    # REPO 1: (*)--(1)--(2)--(4)---(6)---(7)
+    #                    \        /        \
+    # REPO 2:             -----(3)---(5)---(8)
+    #                           P           M
+
+    commit repo_1, 1
+    commit repo_1, 2
+    push   repo_1
+    pull   repo_2
+    commit repo_2, 3
+    push   repo_2
+    commit repo_1, 4
+    commit repo_2, 5
+    pull   repo_1, 6
+    commit repo_1, 7
+    push   repo_1
+    pull   repo_2, 8
+
+    assert_history 1 => [],
+                   2 => [1],
+                   3 => [2,1],
+                   4 => [2,1],
+                   5 => [3,2,1],
+                   6 => [4,3,2,1],
+                   7 => [6,4,3,2,1],
+                   8 => [5,7,6,4,3,2,1]
+  end
+
+  it 'Test 2' do
+    #               P                         M
+    # REPO 1: (*)--(1)--(2)------------------(11)
+    #               \             M    P     /
+    # REPO 2:        --(3)--(4)--(7)--(8)   /
+    #                \          /      \   /
+    # REPO 3:         -(5)----(6)--(9)--(10)
+    #                          P         MP
+
+    commit repo_1, 1
+    push   repo_1
+    commit repo_1, 2
+    pull   repo_2
+    commit repo_2, 3
+    commit repo_2, 4
+    pull   repo_3
+    commit repo_3, 5
+    commit repo_3, 6
+    push   repo_3
+    pull   repo_2, 7
+    commit repo_2, 8
+    push   repo_2
+    commit repo_3, 9
+    pull   repo_3, 10
+    push   repo_3
+    pull   repo_1, 11
+
+    assert_history 1  => [],
+                   2  => [1],
+                   3  => [1],
+                   4  => [3,1],
+                   5  => [1],
+                   6  => [5,1],
+                   7  => [4,3,6,5,1],
+                   8  => [7,4,3,6,5,1],
+                   9  => [6,5,1],
+                   10 => [9,8,7,4,3,6,5,1],
+                   11 => [2,10,9,8,7,4,3,6,5,1]
+  end
+
+end

data/spec/log_spec.rb

@@ -29,21 +29,20 @@ describe Repository, 'Log' do
   end
 
   it 'Merge' do
-    time = Time.now
     repository[:countries].insert 'AR', name: 'Argentina'
-    commit_1 = repository.commit author: 'User', message: 'Commit 1', time: time
+    commit_1 = repository.commit author: 'User', message: 'Commit 1'
     repository.push
     
     other_repository = Repository.new :other
     other_repository.pull
     
     other_repository[:countries].insert 'UY', name: 'Uruguay'
-    commit_2 = other_repository.commit author: 'User', message: 'Commit 2', time: time + 1
+    commit_2 = other_repository.commit author: 'User', message: 'Commit 2'
 
     other_repository.push
 
     repository[:countries].insert 'BR', name: 'Brasil'
-    commit_3 = repository.commit author: 'User', message: 'Commit 3', time: time + 2
+    commit_3 = repository.commit author: 'User', message: 'Commit 3'
 
     repository.pull
 

data/spec/merge_spec.rb

@@ -0,0 +1,134 @@
+require 'minitest_helper'
+
+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 }
+
+  def commit(id, repo, &block)
+    repo[:countries].instance_eval &block
+    commits[id] = repo.commit author: repo.name, message: "Commit #{id}"
+  end
+
+  def merge(id, repo, target_id)
+    delta = repo.merge commit: commits[target_id].id
+    commits[id] = repo.current_commit
+    yield delta['countries'] if block_given?
+    delta
+  end
+
+  def assert_history(id, history_ids)
+    commits[id].history.must_equal history_ids.map { |c| commits[c] }
+  end
+
+  def assert_index(id, expected)
+    commits[id].must_equal_index 'countries' => expected
+  end
+
+  it 'Delta, index and history' do
+    # REPO 1: (*)---(1)--(2)--(5)---(6)---(9)--(11)
+    #                  \          /     \       /
+    # REPO 2:           -(3)---(4)--(7)--(8)--(10)
+
+    commit 1, repo_1 do
+      insert 'AR', name: 'Argentina'
+      insert 'BR', name: 'Brasil'
+    end
+
+    assert_history 1, []
+    assert_index 1, 'AR' => digest(name: 'Argentina'),
+                    'BR' => digest(name: 'Brasil')
+    
+    commit 2, repo_1 do
+      delete 'BR'
+    end
+
+    assert_history 2, [1]
+    assert_index 2, 'AR' => digest(name: 'Argentina')
+
+    repo_2.checkout commit: commits[1].id
+
+    commit 3, repo_2 do
+      insert 'UY', name: 'Uruguay'
+    end
+
+    assert_history 3, [1]
+    assert_index 3, 'AR' => digest(name: 'Argentina'),
+                    'BR' => digest(name: 'Brasil'),
+                    'UY' => digest(name: 'Uruguay')
+
+    commit 4, repo_2 do
+      update 'BR', name: 'Brasil', number: 55
+    end
+
+    assert_history 4, [3,1]
+    assert_index 4, 'AR' => digest(name: 'Argentina'),
+                    'BR' => digest(name: 'Brasil', number: 55),
+                    'UY' => digest(name: 'Uruguay')
+
+    commit 5, repo_1 do
+      update 'AR', name: 'Argentina', number: 54
+    end
+
+    assert_history 5, [2, 1]
+    assert_index 5, 'AR' => digest(name: 'Argentina', number: 54)
+
+    merge 6, repo_1, 4 do |delta|
+      delta.must_equal 'UY' => {'action' => 'insert', 'data' => {'name' => 'Uruguay'}}
+    end
+    
+    assert_history 6, [5,2,4,3,1]
+    assert_index 6, 'AR' => digest(name: 'Argentina', number: 54),
+                    'UY' => digest(name: 'Uruguay')
+
+    commit 7, repo_2 do
+      update 'AR', name: 'Argentina', code: 'ARG'
+    end
+
+    assert_history 7, [4,3,1]
+    assert_index 7, 'AR' => digest(name: 'Argentina', code: 'ARG'),
+                    'BR' => digest(name: 'Brasil', number: 55),
+                    'UY' => digest(name: 'Uruguay')
+
+    merge 8, repo_2, 6 do |delta|
+      delta.must_equal 'BR' => {'action' => 'delete'}, 
+                       'AR' => {'action' => 'update', 'data' => {'name' => 'Argentina', 'code' => 'ARG', 'number' => 54}}
+    end
+    
+    assert_history 8, [7,6,5,2,4,3,1]
+    assert_index 8, 'AR' => digest(name: 'Argentina', code: 'ARG', number: 54),
+                    'UY' => digest(name: 'Uruguay')
+
+    commit 9, repo_1 do
+      insert 'CL', name: 'Chile', code: 'CHI'
+    end
+
+    assert_history 9, [6,5,2,4,3,1]
+    assert_index 9, 'AR' => digest(name: 'Argentina', number: 54),
+                    'UY' => digest(name: 'Uruguay'),
+                    'CL' => digest(name: 'Chile', code: 'CHI')
+
+    commit 10, repo_2 do
+      insert 'CL', name: 'Republica de Chile', number: 56
+    end
+
+    assert_history 10, [8,7,6,5,2,4,3,1]
+    assert_index 10, 'AR' => digest(name: 'Argentina', code: 'ARG', number: 54),
+                     'UY' => digest(name: 'Uruguay'),
+                     'CL' => digest(name: 'Republica de Chile', number: 56)
+
+    merge 11, repo_1, 10 do |delta|
+      delta.must_equal 'AR' => {'action' => 'update', 'data' => {'name' => 'Argentina', 'number' => 54, 'code' => 'ARG'}},
+                       'CL' => {'action' => 'update', 'data' => {'name' => 'Chile', 'number' => 56, 'code' => 'CHI'}}
+    end
+
+    assert_history 11, [9,10,8,7,6,5,2,4,3,1]
+    assert_index 11, 'AR' => digest(name: 'Argentina', code: 'ARG', number: 54),
+                     'UY' => digest(name: 'Uruguay'),
+                     'CL' => digest(name: 'Chile', number: 56, code: 'CHI')
+  end
+
+end

data/spec/minitest_helper.rb

@@ -20,14 +20,6 @@ Eternity.configure do |config|
   config.logger.level = Logger::ERROR
 end
 
-class Time
-  @last = Time.now
-
-  def self.now
-    @last += 1
-  end
-end
-
 class Minitest::Spec
   def redis
     Eternity.redis
@@ -37,32 +29,6 @@ class Minitest::Spec
     Blob.digest(Blob.serialize(data))
   end
 
-  def print_keys
-    puts Eternity.redis_keys.sort
-  end
-
-  def print_commit(commit)
-    puts "COMMIT: #{commit.author} - #{commit.message}"
-    puts "MERGE: #{commit.merge?}"
-    puts 'DELTA:'
-    puts JSON.pretty_generate(commit.delta)
-    if commit.merge?
-      puts "BASE: #{commit.base.author} - #{commit.base.message}"
-      puts 'BASE DELTA:'
-      puts JSON.pretty_generate(commit.base_delta)
-    end
-    puts 'INDEX:'
-    commit.with_index do |index|
-      index.each do |collection, collection_index|
-        puts collection
-        collection_index.ids.each do |id|
-          puts "#{id} -> #{collection_index[id].data}"
-        end
-      end
-    end
-    puts '------------------------------------'
-  end
-  
   after do
     Eternity.clear_redis
     Eternity.clear_file_system

data/spec/patch_spec.rb

@@ -8,9 +8,9 @@ describe Patch do
   let(:commits) { Hash.new }
 
   before do
-    # Repo 1: X---(1)---(2)---(3)---(4)---(5)---(8)---(9)---(12)---(13)---(14)
-    # Repo 2:  \                 \--(6)---(7)--/           /
-    # Repo 3:   \----------(10)-----------------(11)------/
+    # REPO 1: (*)---(1)---(2)---(3)---(4)---(5)---(8)---(9)---(12)---(13)---(14)
+    # REPO 2:    \                 \--(6)---(7)--/           /
+    # REPO 3:     \----------(10)-----------------(11)------/
 
     repo_1[:countries].insert 'AR', name: 'Argentina'
     commit repo_1, 1
@@ -74,7 +74,6 @@ describe Patch do
 
       patch.delta.must_be_empty
       patch.base_commit.must_equal commits[4]
-      patch.base_delta.must_be_empty
     end
 
     it 'Diff' do
@@ -95,10 +94,6 @@ describe Patch do
         'CO' => {'action' => 'insert', 'data' => {'name' => 'Colombia', 'number' => 57}}
       }
       patch.base_commit.must_be_nil
-      patch.base_delta.must_equal 'countries' => {
-        'AR' => {'action' => 'insert', 'data' => {'name' => 'Argentina'}},
-        'CO' => {'action' => 'insert', 'data' => {'name' => 'Colombia', 'number' => 57}}
-      }
     end
 
     it 'Diff' do
@@ -120,7 +115,6 @@ describe Patch do
 
       patch.delta.must_be_empty
       patch.base_commit.must_equal commits[1]
-      patch.base_delta.must_be_empty
     end
 
     it 'Diff' do
@@ -142,7 +136,6 @@ describe Patch do
 
       patch.delta.must_be_empty
       patch.base_commit.must_equal commits[2]
-      patch.base_delta.must_be_empty
     end
 
     it 'Diff' do
@@ -167,11 +160,6 @@ describe Patch do
         'CL' => {'action' => 'insert', 'data' => {'name' => 'Chile'}}
       }
       patch.base_commit.must_equal commits[3]
-      patch.base_delta.must_equal 'countries' => {
-        'UY' => {'action' => 'update', 'data' => {'name' => 'Republica Oriental del Uruguay'}},
-        'AR' => {'action' => 'update', 'data' => {'name' => 'Republica Argentina', 'number' => 54}},
-        'CL' => {'action' => 'insert', 'data' => {'name' => 'Chile'}},
-      }
     end
 
     it 'Diff' do
@@ -194,7 +182,6 @@ describe Patch do
 
       patch.delta.must_be_empty
       patch.base_commit.must_equal commits[3]
-      patch.base_delta.must_be_empty
     end
 
     it 'Diff' do

data/spec/pull_spec.rb

@@ -132,7 +132,7 @@ describe Repository, 'Pull' do
 
     delta.must_equal 'countries' => {'AR' => {'action' => 'insert', 'data' => {'name' => 'Argentina 1'}}}
 
-    other_repository[:countries].update 'AR', name: 'Argentina 2'
+    other_repository[:countries].update 'AR', name: 'Argentina 2', number: 54
     commit_2 = other_repository.commit author: 'User', message: 'Commit 2'
     other_repository.push
 
@@ -140,7 +140,7 @@ describe Repository, 'Pull' do
     commit_3 = repository.commit author: 'User', message: 'Commit 3'
     delta = repository.pull
 
-    delta.must_equal 'countries' => {'AR' => {'action' => 'update', 'data' => {'name' => 'Argentina 2'}}}
+    delta.must_equal 'countries' => {'AR' => {'action' => 'update', 'data' => {'name' => 'Argentina 3', 'number' => 54}}}
 
     repository.branches[repository.current_branch].must_equal repository.current_commit.id
 
@@ -149,7 +149,7 @@ describe Repository, 'Pull' do
       commit.parents.must_equal [commit_3, commit_2]
       commit.base.id.must_equal commit_1.id
       commit.delta.must_be_empty
-      commit.must_equal_index 'countries' => {'AR' => digest(name: 'Argentina 2')}
+      commit.must_equal_index 'countries' => {'AR' => digest(name: 'Argentina 3', number: 54)}
     end
   end
 
@@ -202,7 +202,7 @@ describe Repository, 'Pull' do
     commit_3 = repository.commit author: 'User', message: 'Commit 3'
     delta = repository.pull
 
-    delta.must_equal 'countries' => {'X' => {'action' => 'update', 'data' => {'name' => 'X1', 'number' => 2, 'code' => 1}}}
+    delta.must_equal 'countries' => {'X' => {'action' => 'update', 'data' => {'name' => 'X2', 'number' => 2, 'code' => 1}}}
 
     repository.branches[repository.current_branch].must_equal repository.current_commit.id
     
@@ -213,7 +213,7 @@ describe Repository, 'Pull' do
       commit.delta.must_be_empty
       commit.must_equal_index 'countries' => {
         'AR' => digest(name: 'Argentina'),
-        'X'  => digest(name: 'X1', 'number' => 2, 'code' => 1)
+        'X'  => digest(name: 'X2', 'number' => 2, 'code' => 1)
       }
     end
   end
@@ -234,6 +234,7 @@ describe Repository, 'Pull' do
 
     repository[:countries].delete 'AR'
     commit_3 = repository.commit author: 'User', message: 'Commit 3'
+
     delta = repository.pull
 
     delta.must_be_empty
@@ -259,15 +260,16 @@ describe Repository, 'Pull' do
 
     delta.must_equal 'countries' => {'AR' => {'action' => 'insert', 'data' => {'name' => 'Argentina'}}}
 
-    other_repository[:countries].update 'AR', name: 'Argentina', code: 'ARG'
+    other_repository[:countries].delete 'AR'
     commit_2 = other_repository.commit author: 'User', message: 'Commit 2'
     other_repository.push
 
-    repository[:countries].delete 'AR'
+    repository[:countries].update 'AR', name: 'Argentina', code: 'ARG'
     commit_3 = repository.commit author: 'User', message: 'Commit 3'
+    
     delta = repository.pull
 
-    delta.must_equal 'countries' => {'AR' => {'action' => 'insert', 'data' => {'name' => 'Argentina', 'code' => 'ARG'}}}
+    delta.must_be_empty
 
     repository.branches[repository.current_branch].must_equal repository.current_commit.id
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eternity
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-18 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redic
@@ -217,9 +217,11 @@ files:
 - spec/commit_spec.rb
 - spec/coverage_helper.rb
 - spec/delta_spec.rb
+- spec/history_spec.rb
 - spec/index_spec.rb
 - spec/locking_spec.rb
 - spec/log_spec.rb
+- spec/merge_spec.rb
 - spec/minitest_helper.rb
 - spec/patch_spec.rb
 - spec/pull_spec.rb
@@ -258,9 +260,11 @@ test_files:
 - spec/commit_spec.rb
 - spec/coverage_helper.rb
 - spec/delta_spec.rb
+- spec/history_spec.rb
 - spec/index_spec.rb
 - spec/locking_spec.rb
 - spec/log_spec.rb
+- spec/merge_spec.rb
 - spec/minitest_helper.rb
 - spec/patch_spec.rb
 - spec/pull_spec.rb