d2e 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebf25325129055695b160e58c493df766f0787e8
-  data.tar.gz: f0415f0a3107a3152b7f00e2edac610b8d49582d
+  metadata.gz: db5e19dcaada1ee97b3d8b8b946da212d55f4205
+  data.tar.gz: accd01fc39e29419877ea3c960b73629d5bf39d3
 SHA512:
-  metadata.gz: 73592465f0eab3aa88ce550150f036966000a6a518c548e3f485c6bf9435e41606e4eb4187f7bc1ea002ad523d60ed9a7aa3e1611f386b7095ec67f35c0ef27d
-  data.tar.gz: 48e1f6036b27a5c85ef5907565a8dfb9ea1846464ecf4c41ec141f5520e050435af86cc465ca53780597b56edbc0a2244f676cff5c51d96b90ede52a0019eb05
+  metadata.gz: 6fcd3df8538f7cff766ba4c4e27ed40c0abb844f8e49166a9f75c33f8d9903a19876ba7ca41b6e7579c9f492ac214102e5a303c27e014431b3908c05b9abff0c
+  data.tar.gz: 4004690f7443b32516399c2e4a91abd3a62812840fe083cfebe20f2645868f1213b18f5726984e824d50f83bd3ba01f58e4aeae80a48613fb9ccc9f7b1a84620

data/README.md

@@ -2,22 +2,10 @@
 
 Utility for converting diff to events.
 
-## Installation
-
-Add this line to your application's Gemfile:
-
-    gem 'd2e'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install d2e
-
 ## Usage
 
+### Basic
+
 ```
 require 'd2e'
 require 'json'
@@ -35,8 +23,8 @@ curr = [
   {'id' => 6, 'name' => 'Biggie', 'description' => 'Rap'},
 ]
 
-d2e = D2E.new(key: 'id')
-events = d2e.diff(prev, curr)
+d2e = D2E.new(id: 'id')
+events = d2e.d2e(prev, curr)
 puts JSON.pretty_generate(events)
 ```
 
@@ -78,7 +66,9 @@ output:
   },
   {
     "type": "update",
-    "id": 2,
+    "id": {
+      "id": 2
+    },
     "diff": {
       "description": [
         "Bass",
@@ -89,6 +79,124 @@ output:
 ]
 ```
 
+### Multiple Primary Keys
+
+```
+prev = [
+  {'groupName' => 'web', 'ipProtocol' => 'TCP', 'inOut' => 'IN', 'fromPort' => 80, 'toPort' => 80, 'ipRange' => '0.0.0.0/0'},
+  {'groupName' => 'web', 'ipProtocol' => 'TCP', 'inOut' => 'IN', 'fromPort' => 443, 'toPort' => 443, 'ipRange' => '0.0.0.0/0'},
+  {'groupName' => 'mon', 'ipProtocol' => 'ICMP', 'inOut' => 'OUT', 'group' => 'web'},
+]
+curr = [
+  {'groupName' => 'web', 'ipProtocol' => 'TCP', 'inOut' => 'IN', 'fromPort' => 443, 'toPort' => 443, 'ipRange' => '0.0.0.0/0'},
+  {'groupName' => 'mon', 'ipProtocol' => 'ICMP', 'inOut' => 'OUT', 'group' => 'web', 'description' => 'for ping monitoring'},
+  {'groupName' => 'app', 'ipProtocol' => 'TCP', 'inOut' => 'IN', 'fromPort' => 8080, 'toPort' => 8080, 'group' => 'web'},
+]
+
+d2e = D2E.new(id: ['groupName', 'ipProtocol', 'inOut', 'fromPort', 'toPort', 'ipRange', 'group'])
+events = d2e.d2e(prev, curr)
+puts JSON.pretty_generate(events)
+```
+
+output:
+
+```
+[
+  {
+    "type": "create",
+    "item": {
+      "groupName": "app",
+      "ipProtocol": "TCP",
+      "inOut": "IN",
+      "fromPort": 8080,
+      "toPort": 8080,
+      "group": "web"
+    }
+  },
+  {
+    "type": "delete",
+    "item": {
+      "groupName": "web",
+      "ipProtocol": "TCP",
+      "inOut": "IN",
+      "fromPort": 80,
+      "toPort": 80,
+      "ipRange": "0.0.0.0/0"
+    }
+  },
+  {
+    "type": "update",
+    "id": {
+      "groupName": "mon",
+      "ipProtocol": "ICMP",
+      "inOut": "OUT",
+      "fromPort": null,
+      "toPort": null,
+      "ipRange": null,
+      "group": "web"
+    },
+    "diff": {
+      "description": [
+        null,
+        "for ping monitoring"
+      ]
+    }
+  }
+]
+```
+
+### Ignoring Specific Keys
+
+```
+prev = [
+  {'groupName' => 'web', 'groupDescription' => 'Web Instances', 'ipPermissions' => nil},
+  {'groupName' => 'apl', 'groupDescription' => 'Apl Instances', 'ipPermissions' => nil},
+  {'groupName' => 'db', 'groupDescription' => 'DB Instances', 'ipPermissions' => nil},
+]
+curr = [
+  {'groupName' => 'web', 'groupDescription' => 'Web Instances', 'ipPermissions' => {'item' => ['some ingresses']}},
+  {'groupName' => 'apl', 'groupDescription' => 'Apl Instances', 'ipPermissions' => {'item' => ['other ingresses']}},
+  {'groupName' => 'db', 'groupDescription' => 'Description changed', 'ipPermissions' => {'item' => ['blah blah']}},
+]
+
+d2e = D2E.new(id: 'groupName', ignore: 'ipPermissions')
+events = d2e.d2e(prev, curr)
+puts JSON.pretty_generate(events) 
+```
+
+output:
+
+```
+[
+  {
+    "type": "update",
+    "id": {
+      "groupName": "db"
+    },
+    "diff": {
+      "groupDescription": [
+        "DB Instances",
+        "Description changed"
+      ]
+    }
+  }
+]
+```
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'd2e'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install d2e
+
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/d2e/fork )

data/lib/d2e.rb

@@ -2,34 +2,33 @@ require "d2e/version"
 
 class D2E
   def initialize(options)
-    @key = options[:key]
+    @id = [options[:id]].flatten
+    if options[:ignore]
+      @ignore = [options[:ignore]].flatten
+    end
   end
 
-  def diff(prev, curr)
+  def d2e(prev, curr)
     events = []
 
-    prev_ids = prev.map {|item| item[@key] }
-    curr_ids = curr.map {|item| item[@key] }
-
-    deleted = prev_ids - curr_ids
-    created = curr_ids - prev_ids
-    updated = prev_ids & curr_ids
+    deleted = difference(prev, curr)
+    created = difference(curr, prev)
+    remained = intersection(prev, curr)
 
-    created.each do |id|
-      item = curr.find {|item| item[@key] == id }
+    created.each do |item|
       events << {'type' => 'create', 'item' => item}
     end
 
-    deleted.each do |id|
-      item = prev.find {|item| item[@key] == id }
+    deleted.each do |item|
       events << {'type' => 'delete', 'item' => item}
     end
 
-    updated.each do |id|
+    remained.each do |prev_item, curr_item|
       diff = {}
-      prev_item = prev.find {|item| item[@key] == id }
-      curr_item = curr.find {|item| item[@key] == id }
       keys = prev_item.keys | curr_item.keys
+      if @ignore
+        keys = keys - @ignore
+      end
       keys.each do |key|
         prev_value = prev_item[key]
         curr_value = curr_item[key]
@@ -38,11 +37,32 @@ class D2E
         end
       end
       if !diff.empty?
+        id = Hash[@id.map {|id| [id, prev_item[id]] }]
         events << {'type' => 'update', 'id' => id, 'diff' => diff}
       end
     end
 
     events
   end
+
+  def difference(list_a, list_b)
+    list = []
+    list_a.each do |item_a|
+      if !list_b.find {|item_b| @id.all? {|id| item_a[id] == item_b[id] } }
+        list << item_a
+      end
+    end
+    list
+  end
+
+  def intersection(list_a, list_b)
+    list = []
+    list_a.each do |item_a|
+      if item_b = list_b.find {|item_b| @id.all? {|id| item_a[id] == item_b[id] } }
+        list << [item_a, item_b]
+      end
+    end
+    list
+  end
 end
 

data/lib/d2e/version.rb

@@ -1,3 +1,3 @@
 class D2E
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: d2e
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - tily
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-28 00:00:00.000000000 Z
+date: 2015-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler