eternity 2.0.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9e978f431bd3b4d4ae0fa14c7ca7ed317d36c36
-  data.tar.gz: c7d6711d2a6ccbbbca166f46ad8d9d76dba0a590
+  metadata.gz: 3f537658382ba4f3dd470886816e95c83318241b
+  data.tar.gz: a1adaa2d8cd91bc760752f08d17029ae992bf278
 SHA512:
-  metadata.gz: e5e5c155ffad8a236a9b90e54e650cd863acf71d43f88f747a818c2611ee37b1ce4871987658f7b2d8337c19cec7912db8ffd6af8880fbd584d7371f8015e765
-  data.tar.gz: 0d984b22b55280b0b7cf124458c9d6a9e8a7f8f95d0c9b5e39801c74af37f7926151fdabe08afb9286250044b81b490dd3968b127fb3e24c35656444d77a724d
+  metadata.gz: c8da66be778bc5fc98cb9afb69315d239b438ab9cce05e49a75268293ed6c7357f2f1dfa0c6202518757f4ac3316925ccaddc755c42d7c351783df184e4252df
+  data.tar.gz: 0cd4241e82f74c5d9f87e977847d5a4864d20a003705fb6cde8aa60422182f1eaae88a9fb1ecd13ed121f8cd0509d7f673fb737dde362507ed0702f69ea7f5e0

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
+
 rvm:
   - 1.9.3
   - 2.0
@@ -6,8 +7,20 @@ rvm:
   - 2.2
   - 2.3.0
   - 2.4.0
-  - jruby
+  - 2.5.0
+  - jruby-1.7.25
+  - jruby-9.1.7.0
+  - ruby-head
+  - jruby-head
+
+matrix:
+  fast_finish: true
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head
+
 services:
   - redis-server
+
 before_install:
   - gem install bundler

data/lib/eternity/commit.rb

@@ -48,27 +48,7 @@ module Eternity
 
     def history_ids
       return [] if nil?
-      if data['history']
-        Blob.read :history, data['history']
-      else
-        # Backward compatibility
-        cache_key = self.class.history_cache_key[id]
-        return Eternity.connection.call 'LRANGE', cache_key, 0, -1 if Eternity.connection.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.connection.call 'RPUSH', cache_key, *commit_ids
-
-        commit_ids
-      end
+      Blob.read :history, data['history']
     end
 
     def history

data/lib/eternity/delta.rb

@@ -14,16 +14,21 @@ module Eternity
         end
       end
 
-      def merge(deltas, base_index)
+      def merge(deltas, base_index=nil)
         union(deltas).each_with_object({}) do |(collection, elements), hash|
           hash[collection] = {}
           elements.each do |id, changes|
             current_change = TrackFlatter.flatten changes
             if current_change 
               if current_change['action'] == UPDATE
-                base_data = base_index[collection].include?(id) ? base_index[collection][id].data : {}
-                current_change['data'] = changes.select { |c| c['data'] }
-                                                .inject(base_data) { |d,c| ConflictResolver.resolve d, c['data'], base_data }
+                if base_index
+                  base_data = base_index[collection].include?(id) ? base_index[collection][id].data : {}
+                  current_change['data'] = changes.select { |c| c['data'] }
+                                                  .inject(base_data) { |d,c| ConflictResolver.resolve d, c['data'], base_data }
+                else
+                  current_change['data'] = changes.select { |c| c['data'] }
+                                                  .inject({}) { |d,c| ConflictResolver.resolve d, c['data'] }
+                end
               end
               hash[collection][id] = current_change
             end

data/lib/eternity/patch.rb

@@ -48,8 +48,8 @@ module Eternity
         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
+            current_delta = Delta.merge current_history.reverse.map(&:delta)
+            target_delta = Delta.merge target_history.reverse.map(&:delta)
             revert_delta = Delta.revert current_delta, base_index
 
             merged_delta = merge_deltas target_delta, revert_delta, base_index
@@ -93,7 +93,7 @@ module Eternity
       end
 
       def merge_deltas(target_delta, revert_delta, base_index)
-        remaining_delta = Delta.merge remaining_history.reverse.map(&:delta), base_index
+        remaining_delta = Delta.merge remaining_history.reverse.map(&:delta)
         Delta.merge [revert_delta, target_delta, remaining_delta], base_index
       end
 

data/lib/eternity/track_flatter.rb

@@ -45,8 +45,8 @@ module Eternity
       end
 
       def expand(change)
-        return change if change.key? 'data'
-        change.tap do |ch|
+        return change.dup if change.key? 'data'
+        change.dup.tap do |ch|
           sha1 = ch.delete 'blob'
           ch['data'] = Blob.read(:data, sha1) if sha1
         end

data/lib/eternity/version.rb

@@ -1,3 +1,3 @@
 module Eternity
-  VERSION = '2.0.1'
-end
+  VERSION = '3.0.0'
+end

data/spec/merge_spec.rb

@@ -8,7 +8,7 @@ describe Repository, 'Merge' do
   let(:commits) { Hash.new }
 
   def commit(id, repo, &block)
-    repo[:countries].instance_eval &block
+    repo[:countries].instance_eval(&block)
     commits[id] = repo.commit author: repo.name, message: "Commit #{id}"
   end
 
@@ -31,10 +31,9 @@ describe Repository, 'Merge' do
     commits[id].must_equal_index 'countries' => expected
   end
 
-  describe 'Merge Errors' do
+  describe 'Errors' do
 
     it 'case 1' do
-      skip
       commit 1, repo_1 do
         insert 'AR', name: 'Argentina'
       end
@@ -54,16 +53,14 @@ describe Repository, 'Merge' do
       end
 
       merge 5, repo_2, 4 do |delta|
-        #delta['AR'].must_equal => {'action' => 'update', 'data' => {'name' => 'Argentina'}}
+        delta.must_be_nil
       end
 
-      commits[5].with_index do |index| 
-        index['countries']['AR'].data['name'].must_equal 'Argentina'
-      end
+      assert_index 5, 'AR' => digest(name: 'Argentina'),
+                      'UY' => digest(name: 'Uruguay')
     end
 
     it 'case 2' do
-      skip
       commit 1, repo_1 do
         insert 'AR', name: 'Argentina'
       end
@@ -88,16 +85,14 @@ describe Repository, 'Merge' do
       end
 
       merge 6, repo_2, 5 do |delta|
-        #delta['AR'].must_equal => {'action' => 'update', 'data' => {'name' => 'Argentina'}}
+        delta.must_be_nil
       end
 
-      commits[6].with_index do |index| 
-        index['countries']['AR'].data['name'].must_equal 'Argentina'
-      end
+      assert_index 6, 'AR' => digest(name: 'Argentina'),
+                      'UY' => digest(name: 'Uruguay')
     end
 
     it 'case 3 (patched)' do
-      skip
       commit 1, repo_1 do
         insert 'AR', name: 'Argentina'
       end
@@ -110,33 +105,65 @@ describe Repository, 'Merge' do
       end
 
       commit 3, repo_2 do
-        update 'AR', name: 'Argentina '
+        update 'AR', name: 'Republica Argentina'
       end
 
+      assert_index 3, 'AR' => digest(name: 'Republica Argentina'),
+                      'UY' => digest(name: 'Uruguay')
+
       commit 4, repo_1 do
         update 'AR', name: 'Arg'
       end
 
       commit 5, repo_1 do
-        update 'AR', name: 'Argentina'
+        update 'AR', name: 'Argentina', code: 'ARG'
       end
 
       merge 6, repo_2, 5 do |delta|
-        #delta['AR'].must_equal => {'action' => 'update', 'data' => {'name' => 'Argentina'}}
+        delta['AR'].must_equal 'action' => 'update', 'data' => {'name' => 'Republica Argentina', 'code' => 'ARG'}
       end
 
-      commits[6].with_index do |index| 
-        index['countries']['AR'].data['name'].must_equal 'Argentina'
-      end
+      assert_index 6, 'AR' => digest(name: 'Republica Argentina', code: 'ARG'),
+                      'UY' => digest(name: 'Uruguay')
 
       merge 7, repo_1, 3 do |delta|
-        #delta['AR'].must_equal => {'action' => 'update', 'data' => {'name' => 'Argentina'}}
+        delta['AR'].must_equal 'action' => 'update', 'data' => {'name' => 'Republica Argentina', 'code' => 'ARG'}
+      end
+
+      assert_index 7, 'AR' => digest(name: 'Republica Argentina', code: 'ARG'),
+                      'UY' => digest(name: 'Uruguay')
+    end
+
+    it 'case 4' do
+      commit 1, repo_1 do
+        insert 'AR', name: 'Argentina'
       end
 
-      commits[7].with_index do |index| 
-        index['countries']['AR'].data['name'].must_equal 'Argentina'
-      end      
+      checkout 1, repo_2
+
+      commit 2, repo_1 do
+        update 'AR', name: 'Republica Argentina'
+      end
+
+      commit 3, repo_2 do
+        update 'AR', name: 'Argentina', code: 'ARG'
+      end
+
+      merge 4, repo_2, 2 do |delta|
+        delta['AR'].must_equal 'action' => 'update', 'data' => {'name' => 'Republica Argentina', 'code' => 'ARG'}
+      end
+
+      assert_index 4, 'AR' => digest(name: 'Republica Argentina', code: 'ARG')
+
+      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', 'code' => 'ARG'}
+      end
 
+      assert_index 6, 'AR' => digest(name: 'Argentina', code: 'ARG')
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eternity
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-05 00:00:00.000000000 Z
+date: 2018-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: restruct