eternity 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f537658382ba4f3dd470886816e95c83318241b
-  data.tar.gz: a1adaa2d8cd91bc760752f08d17029ae992bf278
+  metadata.gz: b0981a07c6d2750de190de34fd06fa69bc36294a
+  data.tar.gz: 48446c1ea896d5d99089ca1b1409d883c666490d
 SHA512:
-  metadata.gz: c8da66be778bc5fc98cb9afb69315d239b438ab9cce05e49a75268293ed6c7357f2f1dfa0c6202518757f4ac3316925ccaddc755c42d7c351783df184e4252df
-  data.tar.gz: 0cd4241e82f74c5d9f87e977847d5a4864d20a003705fb6cde8aa60422182f1eaae88a9fb1ecd13ed121f8cd0509d7f673fb737dde362507ed0702f69ea7f5e0
+  metadata.gz: 51c887426e9faae2f4c2dbaf51003b24f0afbe5e1e3627fd9a70348163c29484f6ab3ea5f6c0ad6bdb2845549afd6e07c92222ae3f741abd45caf83aeb081fb6
+  data.tar.gz: 98df7c4d6301a44c4a100f1a8517a220bede1ce1af42cd3b3fb7e228266c5a65ff0736335d666711a10bdfb3643ba500ce07e5b6c78dfa719afee85c9a0f5864

data/lib/eternity/patch.rb

@@ -45,28 +45,40 @@ module Eternity
       private
 
       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)
-            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
-
-            merged_delta.each_with_object({}) do |(collection, elements), hash|
-              hash[collection] = {}
-
-              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
+        if current_commit.nil?
+          target_commit.with_index do |target_index| 
+            target_index.each_with_object({}) do |(collection, collection_index), hash|
+              hash[collection] = collection_index.ids.each_with_object({}) do |id, h|
+                h[id] = {
+                  'action' => INSERT,
+                  'data' => collection_index[id].data
+                }
               end
+            end
+          end
+        else
+          base_commit.with_index do |base_index|
+            current_commit.with_index do |current_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
+
+              merged_delta.each_with_object({}) do |(collection, elements), hash|
+                hash[collection] = {}
+
+                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
 
-              hash.delete collection if hash[collection].empty?
+                hash.delete collection if hash[collection].empty?
+              end
             end
           end
         end

data/lib/eternity/version.rb

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

metadata

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