tree_delta 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df6e2308561f7c2800ec01e8e1205db41e3fbdd2
-  data.tar.gz: 678b3ee7309db439390356c716229f8fd9afd271
+  metadata.gz: 132981c95ed21fd232a44c1f93aca5477da0afa6
+  data.tar.gz: 591ba9d6faf95b30b565a4622e5224f6a6c6a384
 SHA512:
-  metadata.gz: dc0433f176917897f6175fa7cba1a70b69d51d76d67cbfee924f2604005559a981c40a887d29ed23babe0515d9deaa5e9d70b541cbc810bc9adf273f66475815
-  data.tar.gz: cabc88fd38856bbd3dc53e57b3ddf1fda5f33decafc7eb5e72e9bcbd2b678fd8002b8ed81727c59f171353d14fbe1b8b731f2c02b36e8fa7faccf9d51bf41c0b
+  metadata.gz: d43ea4013511758125d18b1ff31c38610d9c50f3142a58e248817fc012df0843f22d210be2b191e67ee70d4d55c726f3f3d6db28c756513cb108770c15bcd448
+  data.tar.gz: db22eb1b9992dd0c7da0ed491734f81905e7be29b67a67c999fa0adf0ff1d175704d913dfccd3d76d4f564e3362db31c82c0b23a2345f9464c8e7a347bc915e1

data/README.md

@@ -1,5 +1,7 @@
 ## Tree Delta
 
+[![Build Status](https://travis-ci.org/whichdigital/tree_delta.svg?branch=master)](https://travis-ci.org/whichdigital/tree_delta)
+
 Calculates the minimum set of operations that transform one tree into another.
 
 ## Overview
@@ -49,7 +51,7 @@ value object for a node. This is where you'd store the node's attributes.
 You must first define a node class with the following methods:
 
 ```ruby
-#id
+#identity
 Returns an identifier that uniquely identifies the node across trees.
 
 #parent
@@ -100,7 +102,7 @@ An operation is a simple object that describes a transformation.
 
 It can contain up to five pieces of information, as shown here:
 
-|          | type     | id       | value    | parent   | position |
+|          | type     | identity | value    | parent   | position |
 | --------:|:--------:|:--------:|:--------:|:--------:|:--------:|
 |   create | ✓        | ✓        | ✓        | ✓        | ✓        |
 |   update | ✓        | ✓        | ✓        |          |          |
@@ -114,7 +116,7 @@ Here is an example:
 operation.type
 #=> :create
 
-operation.id
+operation.identity
 #=> "foo"
 
 operation.value

data/lib/tree_delta/intermediate.rb

@@ -11,9 +11,9 @@ class TreeDelta::Intermediate
       additions.each do |node|
         y.yield TreeDelta::Operation.new(
           type:     :create,
-          id:       node.id,
+          identity: node.identity,
           value:    node.value,
-          parent:   parent_id(node),
+          parent:   parent_identity(node),
           position: position(node)
         )
       end
@@ -25,7 +25,7 @@ class TreeDelta::Intermediate
       updated_nodes.each do |node|
         y.yield TreeDelta::Operation.new(
           type:     :update,
-          id:       node.id,
+          identity: node.identity,
           value:    node.value,
         )
       end
@@ -36,8 +36,8 @@ class TreeDelta::Intermediate
     Enumerator.new do |y|
       normalised_deletions.each do |node|
         y.yield TreeDelta::Operation.new(
-          type: :delete,
-          id:   node.id
+          type:     :delete,
+          identity: node.identity
         )
       end
     end
@@ -48,8 +48,8 @@ class TreeDelta::Intermediate
       moves.each do |node|
         unless previous_root?(node)
           y.yield TreeDelta::Operation.new(
-            type: :detach,
-            id:   node.id
+            type:     :detach,
+            identity: node.identity
           )
         end
       end
@@ -62,8 +62,8 @@ class TreeDelta::Intermediate
         unless root?(node)
           y.yield TreeDelta::Operation.new(
             type:     :attach,
-            id:       node.id,
-            parent:   parent_id(node),
+            identity: node.identity,
+            parent:   parent_identity(node),
             position: position(node)
           )
         end
@@ -106,11 +106,11 @@ class TreeDelta::Intermediate
   end
 
   def subtract(a, b)
-    a.reject { |e| b.any? { |f| e.id == f.id } }
+    a.reject { |e| b.any? { |f| e.identity == f.identity } }
   end
 
-  def parent_id(node)
-    node && node.parent ? node.parent.id : nil
+  def parent_identity(node)
+    node && node.parent ? node.parent.identity : nil
   end
 
   def position(node)
@@ -128,11 +128,11 @@ class TreeDelta::Intermediate
 
   def changed_parent?(from_node)
     to_node = to_node_for(from_node)
-    to_node && parent_id(to_node) != parent_id(from_node)
+    to_node && parent_identity(to_node) != parent_identity(from_node)
   end
 
   def normalised_position_changes
-    groups = position_changes.group_by { |n| parent_id(n) }
+    groups = position_changes.group_by { |n| parent_identity(n) }
 
     groups.map do |_, nodes|
       TreeDelta::Normaliser.normalise_position_changes(nodes)
@@ -148,16 +148,16 @@ class TreeDelta::Intermediate
     to_node = to_node_for(from_node)
 
     to_node &&
-      parent_id(from_node) == parent_id(to_node) &&
+      parent_identity(from_node) == parent_identity(to_node) &&
       position(from_node) != position(to_node)
   end
 
   def from_node_for(to_node)
-    from_nodes.detect { |n| n.id == to_node.id }
+    from_nodes.detect { |n| n.identity == to_node.identity }
   end
 
   def to_node_for(from_node)
-    to_nodes.detect { |n| n.id == from_node.id }
+    to_nodes.detect { |n| n.identity == from_node.identity }
   end
 
   def root?(to_node)

data/lib/tree_delta/operation.rb

@@ -1,20 +1,20 @@
 class TreeDelta::Operation
 
-  attr_reader :type, :id, :value, :parent, :position
+  attr_reader :type, :identity, :value, :parent, :position
 
-  def initialize(type:, id:, value: nil, parent: nil, position: nil)
+  def initialize(type:, identity:, value: nil, parent: nil, position: nil)
     @type     = type
-    @id       = id
+    @identity = identity
     @value    = value    if value
     @parent   = parent   if parent
     @position = position if position
   end
 
   def ==(other)
-    @type       == other.type   &&
-      @id       == other.id     &&
-      @value    == other.value  &&
-      @parent   == other.parent &&
+    @type       == other.type     &&
+      @identity == other.identity &&
+      @value    == other.value    &&
+      @parent   == other.parent   &&
       @position == other.position
   end
 

data/lib/tree_delta/sorter.rb

@@ -3,7 +3,7 @@ module TreeDelta::Sorter
     sorted_array = []
 
     enumerator.each do |object|
-      element = array.detect { |e| e.id == object.id }
+      element = array.detect { |e| e.identity == object.identity }
       sorted_array << element if element
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tree_delta
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Chris Patuzzo
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake