eternity 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a63e70964889425618e513c2b015c4dab49df29
-  data.tar.gz: 9469a0aaef5ade727668538d82037bf6b37e2df7
+  metadata.gz: 9bb28d44f6a6270e1aa8d7da6b66067d5a097dbb
+  data.tar.gz: 1b316ac4f934458b9807717928f8bfd093453a1b
 SHA512:
-  metadata.gz: c4ef8f7b20359f19675244b29e75d72fcd994af5c87bad10db3a1557177a460684d70295a0a173f1edabf12693ae7697f9beb557f88540a7c3c139627e86ed6e
-  data.tar.gz: 0a7f43754360afb66f62dc9c7486baa455cb7c6513fee2c5ec62096f702bcd6a19bf19ca0cf31a9a4bc42c594447896a9583571168cff4b658d7dc455eae6acb
+  metadata.gz: 4dc81d334ca41182d027060ec32d1761856f80f8ca5de8e1ad79c5aca4de91026ce439a7ee9d68da1ed32d1a833021588a65653af195881d7da5f3f3af531fcc
+  data.tar.gz: 72308247b234e76c85ad6428860914ed8cce6bc54c073de199c41bb94354d984542baad5dd28a28a3e577ed699ea04a1fc0a6e22f275aa8a491a7e4dcdbafb3d

data/lib/eternity/commit.rb

@@ -12,7 +12,7 @@ module Eternity
     end
 
     def time
-      Time.parse(data['time']) if data['time']
+      Time.parse data['time'] if data['time']
     end
 
     def author
@@ -46,10 +46,6 @@ module Eternity
       Commit.new data['base']
     end
 
-    def base_delta
-      data['base_delta'] ? Blob.read(:delta, data['base_delta']) : {}
-    end
-
     def history_times
       data['history_times'] ? Blob.read(:history_times, data['history_times']) : {}
     end
@@ -65,14 +61,6 @@ module Eternity
       history_times.key? commit.id
     end
 
-    def base_history_at(commit)
-      return [] unless commit
-      history = [base]
-      history += base.base_history_at commit unless base.id == commit.id
-      raise "History not include commit #{commit.id}" unless history.map(&:id).include? commit.id
-      history
-    end
-
     def first?
       parent_ids.compact.empty?
     end
@@ -91,6 +79,14 @@ module Eternity
     end
     alias_method :eql?, :==
 
+    def hash
+      id.hash
+    end
+
+    def to_s
+      "#{time} - #{short_id} - #{author}: #{message}"
+    end
+
     def self.create(options)
       raise 'Author must be present' if options[:author].to_s.strip.empty?
       raise 'Message must be present' if options[:message].to_s.strip.empty?
@@ -109,7 +105,6 @@ module Eternity
         index:         options.fetch(:index),
         delta:         options.fetch(:delta),
         base:          options[:parents].count == 2 ? options.fetch(:base) : options[:parents].first,
-        base_delta:    options[:parents].count == 2 ? options.fetch(:base_delta) : options.fetch(:delta),
         history_times: Blob.write(:history_times, history_times)
       }
 

data/lib/eternity/delta.rb

@@ -24,6 +24,11 @@ module Eternity
         end
       end
 
+      def between(commit_1, commit_2)
+        commits = ([commit_2] + commit_2.history) - ([commit_1] + commit_1.history)
+        merge commits.reverse.map(&:delta)
+      end
+
       def revert(delta, commit)
         commit.with_index do |index|
           delta.each_with_object({}) do |(collection, changes), hash|

data/lib/eternity/patch.rb

@@ -26,22 +26,6 @@ module Eternity
         @delta ||= TransparentProxy.new { calculate_delta }
       end
 
-      private
-
-      def current_delta
-        @current_delta ||= base_delta_of current_commit, base_commit
-      end
-
-      def target_delta
-        @target_delta ||= base_delta_of target_commit, base_commit
-      end
-
-      def base_delta_of(commit, base)
-        return {} if commit == base
-        history = [commit] + commit.base_history_at(base)[0..-2]
-        Delta.merge history.reverse.map(&:base_delta)
-      end
-
     end
 
 
@@ -62,6 +46,14 @@ module Eternity
 
       private
 
+      def current_delta
+        @current_delta ||= Delta.between target_commit, current_commit
+      end
+
+      def target_delta
+        @target_delta ||= Delta.between current_commit, target_commit
+      end
+
       def calculate_delta
         return {} if merged?
 
@@ -106,7 +98,6 @@ module Eternity
       end
 
       log :calculate_delta
-
     end
 
 
@@ -117,12 +108,38 @@ module Eternity
 
       private
 
+      def current_delta
+        @current_delta ||= Delta.between base_commit, current_commit
+      end
+
+      def target_delta
+        @target_delta ||= Delta.between base_commit, target_commit
+      end
+
+      def diff_delta
+        @diff_delta ||= Delta.merge [Delta.revert(current_delta, base_commit), target_delta]
+      end
+
       def calculate_delta
-        Delta.merge [Delta.revert(current_delta, base_commit), target_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
+
+            hash.delete collection if hash[collection].empty?
+          end
+        end
       end
 
       log :calculate_delta
-
     end
 
   end

data/lib/eternity/repository.rb

@@ -189,7 +189,7 @@ module Eternity
 
         raise 'Already merged' if patch.merged?
 
-        commit! message:    "Merge #{target_commit.short_id} into #{current_commit.short_id}",
+        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),

data/lib/eternity/version.rb

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

data/spec/commit_spec.rb

@@ -27,6 +27,7 @@ describe Repository, 'Commit' do
       current_commit.wont_be :merge?
       current_commit.delta.must_equal 'countries' => {'AR' => {'action' => 'insert', 'data' => {'name' => 'Argentina'}}}
       current_commit.must_equal_index 'countries' => {'AR' => digest(name: 'Argentina')}
+      current_commit.to_s.must_equal "#{current_commit.time} - #{current_commit.short_id} - #{current_commit.author}: #{current_commit.message}"
     end
   end
 
@@ -42,7 +43,7 @@ describe Repository, 'Commit' do
       current_commit.time.must_be_instance_of Time
       current_commit.author.must_equal 'User'
       current_commit.message.must_equal 'Commit 2'
-      current_commit.parent_ids.must_equal [commit_1.id]
+      current_commit.parents.must_equal [commit_1]
       current_commit.wont_be :first?
       current_commit.wont_be :merge?
       current_commit.delta.must_equal 'countries' => {'UY' => {'action' => 'insert', 'data' => {'name' => 'Uruguay'}}}
@@ -50,6 +51,7 @@ describe Repository, 'Commit' do
         'AR' => digest(name: 'Argentina'), 
         'UY' => digest(name: 'Uruguay')
       }
+      current_commit.to_s.must_equal "#{current_commit.time} - #{current_commit.short_id} - #{current_commit.author}: #{current_commit.message}"
     end
   end
 

data/spec/delta_spec.rb

@@ -1,12 +1,12 @@
 require 'minitest_helper'
 
-describe Repository, 'Pull' do
+describe 'Delta' do
 
   let(:repo_1) { Repository.new :test_1 }
   let(:repo_2) { Repository.new :test_2 }
   let(:repo_3) { Repository.new :test_3 }
 
-  it 'test' do
+  it 'Merge and Checkout' do
     repo_1[:countries].insert 'AR', name: 'Argentina'
     commit_1 = repo_1.commit author: 'User 1', message: 'Commit 1'
     repo_1.push
@@ -107,4 +107,113 @@ describe Repository, 'Pull' do
     }
   end
 
+  it 'Commit -> Pull -> Push (multiple times)' do
+    repo_1[:countries].insert 'AR', name: 'Argentina'
+    repo_1.commit author: 'User 1', message: 'Added Argentina'
+    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')
+    }
+
+    repo_2[:countries].insert 'BR', name: 'Brasil'
+    repo_2.commit author: 'User 2', message: 'Added Brasil'
+    
+    delta = repo_2.pull
+    delta.must_be_empty
+
+    repo_2.current_commit.must_equal_index 'countries' => {
+      'AR' => digest(name: 'Argentina'),
+      'BR' => digest(name: 'Brasil')
+    }
+
+    repo_2.push
+
+    repo_1[:countries].insert 'UY', name: 'Uruguay'
+    repo_1.commit author: 'User 1', message: 'Added Uruguay'
+    
+    delta = repo_1.pull
+    delta.must_equal 'countries' => {
+      'BR' => {'action' => 'insert', 'data' => {'name' => 'Brasil'}}
+    }
+    
+    repo_1.current_commit.must_equal_index 'countries' => {
+      'AR' => digest(name: 'Argentina'),
+      'BR' => digest(name: 'Brasil'),
+      'UY' => digest(name: 'Uruguay')
+    }
+
+    repo_1.push
+
+    repo_2[:countries].insert 'CL', name: 'Chile'
+    repo_2.commit author: 'User 2', message: 'Added Chile'
+    
+    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'),
+      'BR' => digest(name: 'Brasil'),
+      'UY' => digest(name: 'Uruguay'),
+      'CL' => digest(name: 'Chile')
+    }
+
+    repo_2.push
+
+    repo_1[:countries].update 'UY', name: 'Republica Oriental del Uruguay'
+    repo_1.commit author: 'User 1', message: 'Updated Uruguay'
+    
+    delta = repo_1.pull
+    delta.must_equal 'countries' => {
+      'CL' => {'action' => 'insert', 'data' => {'name' => 'Chile'}}
+    }
+
+    repo_1.current_commit.must_equal_index 'countries' => {
+      'AR' => digest(name: 'Argentina'),
+      'BR' => digest(name: 'Brasil'),
+      'UY' => digest(name: 'Republica Oriental del Uruguay'),
+      'CL' => digest(name: 'Chile')
+    }
+
+    repo_1.push
+
+    repo_2[:countries].delete 'CL'
+    repo_2.commit author: 'User 2', message: 'Deleted Chile'
+    
+    delta = repo_2.pull
+    delta.must_equal 'countries' => {
+      'UY' => {'action' => 'update', 'data' => {'name' => 'Republica Oriental del Uruguay'}}
+    }
+    
+    repo_2.current_commit.must_equal_index 'countries' => {
+      'AR' => digest(name: 'Argentina'),
+      'BR' => digest(name: 'Brasil'),
+      'UY' => digest(name: 'Republica Oriental del Uruguay')
+    }
+
+    repo_2.push
+
+    repo_1[:countries].insert 'CO', name: 'Colombia'
+    repo_1.commit author: 'User 1', message: 'Added Colombia'
+    
+    delta = repo_1.pull
+    delta.must_equal 'countries' => {
+      'CL' => {'action' => 'delete'}
+    }
+
+    repo_1.current_commit.must_equal_index 'countries' => {
+      'AR' => digest(name: 'Argentina'),
+      'BR' => digest(name: 'Brasil'),
+      'UY' => digest(name: 'Republica Oriental del Uruguay'),
+      'CO' => digest(name: 'Colombia')
+    }
+  end
+
 end

data/spec/minitest_helper.rb

@@ -20,6 +20,14 @@ 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

data/spec/pull_spec.rb

@@ -111,12 +111,8 @@ describe Repository, 'Pull' do
 
     repository.current_commit.tap do |commit|
       commit.must_be :merge?
-      commit.parent_ids.must_equal [commit_4.id, commit_3.id]
+      commit.parents.must_equal [commit_4, commit_3]
       commit.base.id.must_equal commit_1.id
-      commit.base_delta.must_equal 'countries' => {
-        'BR' => {'action' => 'insert', 'data' => {'name' => 'Brasil'}}, 
-        'UY' => {'action' => 'insert', 'data' => {'name' => 'Uruguay'}}
-      }
       commit.delta.must_be_empty
       commit.must_equal_index 'countries' => {
         'AR' => digest(name: 'Argentina'), 
@@ -150,9 +146,8 @@ describe Repository, 'Pull' do
 
     repository.current_commit.tap do |commit|
       commit.must_be :merge?
-      commit.parent_ids.must_equal [commit_3.id, commit_2.id]
+      commit.parents.must_equal [commit_3, commit_2]
       commit.base.id.must_equal commit_1.id
-      commit.base_delta.must_equal 'countries' => {'AR' => {'action' => 'update', 'data' => {'name' => 'Argentina 2'}}}
       commit.delta.must_be_empty
       commit.must_equal_index 'countries' => {'AR' => digest(name: 'Argentina 2')}
     end
@@ -182,9 +177,8 @@ describe Repository, 'Pull' do
 
     repository.current_commit.tap do |commit|
       commit.must_be :merge?
-      commit.parent_ids.must_equal [commit_3.id, commit_2.id]
+      commit.parents.must_equal [commit_3, commit_2]
       commit.base.id.must_equal commit_1.id
-      commit.base_delta.must_equal 'countries' => {'AR' => {'action' => 'update', 'data' => {'name' => 'Argentina', 'code' => 'ARG', 'number' => 54}}}
       commit.delta.must_be_empty
       commit.must_equal_index 'countries' => {'AR' => digest(name: 'Argentina', code: 'ARG', number: 54)}
     end
@@ -214,9 +208,8 @@ describe Repository, 'Pull' do
     
     repository.current_commit.tap do |commit|
       commit.must_be :merge?
-      commit.parent_ids.must_equal [commit_3.id, commit_2.id]
+      commit.parents.must_equal [commit_3, commit_2]
       commit.base.id.must_equal commit_1.id
-      commit.base_delta.must_equal 'countries' => {'X' => {'action' => 'insert', 'data' => {'name' => 'X1', 'number' => 2, 'code' => 1}}}
       commit.delta.must_be_empty
       commit.must_equal_index 'countries' => {
         'AR' => digest(name: 'Argentina'),
@@ -249,9 +242,8 @@ describe Repository, 'Pull' do
     
     repository.current_commit.tap do |commit|
       commit.must_be :merge?
-      commit.parent_ids.must_equal [commit_3.id, commit_2.id]
+      commit.parents.must_equal [commit_3, commit_2]
       commit.base.id.must_equal commit_1.id
-      commit.base_delta.must_equal 'countries' => {'AR' => {'action' => 'delete'}}
       commit.delta.must_be_empty
       commit.must_have_empty_index
     end
@@ -281,9 +273,8 @@ describe Repository, 'Pull' do
 
     repository.current_commit.tap do |commit|
       commit.must_be :merge?
-      commit.parent_ids.must_equal [commit_3.id, commit_2.id]
+      commit.parents.must_equal [commit_3, commit_2]
       commit.base.id.must_equal commit_1.id
-      commit.base_delta.must_equal 'countries' => {'AR' => {'action' => 'update', 'data' => {'name' => 'Argentina', 'code' => 'ARG'}}}
       commit.delta.must_be_empty
       commit.must_equal_index 'countries' => {'AR' => digest(name: 'Argentina', code: 'ARG')}
     end

data/spec/push_spec.rb

@@ -66,7 +66,7 @@ describe Repository, 'Push' do
     other_repository.push
 
     Branch[:master].id.must_equal other_repository.current_commit.id
-    Branch[:master].parent_ids.must_equal [commit_2.id, commit_1.id]
+    Branch[:master].parents.must_equal [commit_2, commit_1]
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eternity
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redic
@@ -247,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Distributed database version control system