From a82318b425a38a4c1a89fc2b243e94c22ff8e61a Mon Sep 17 00:00:00 2001
From: gered <gered@blarg.ca>
Date: Sat, 27 Feb 2016 18:24:15 -0500
Subject: [PATCH] rename "type" to "aura-type" for aura gained events

---
 vwowrla.core/src/vwowrla/core/handlers.clj         |  2 +-
 vwowrla.core/src/vwowrla/core/matchers.clj         |  4 ++--
 .../vwowrla/core/matchers/aura_gained_test.clj     | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/vwowrla.core/src/vwowrla/core/handlers.clj b/vwowrla.core/src/vwowrla/core/handlers.clj
index 67e89e5..7179dbe 100644
--- a/vwowrla.core/src/vwowrla/core/handlers.clj
+++ b/vwowrla.core/src/vwowrla/core/handlers.clj
@@ -134,7 +134,7 @@
   data)
 
 (defmethod handle-event :aura-gained
-  [{:keys [target-name aura-name type stacks timestamp] :as parsed} data]
+  [{:keys [target-name aura-name aura-type stacks timestamp] :as parsed} data]
   data)
 
 (defmethod handle-event :aura-lost
diff --git a/vwowrla.core/src/vwowrla/core/matchers.clj b/vwowrla.core/src/vwowrla/core/matchers.clj
index e421b9e..d581e54 100644
--- a/vwowrla.core/src/vwowrla/core/matchers.clj
+++ b/vwowrla.core/src/vwowrla/core/matchers.clj
@@ -698,7 +698,7 @@
               :target-name %1
               :aura-name   %2
               :stacks      (->int %3)
-              :type        :buff)}
+              :aura-type   :buff)}
 
    {:regex  #"^(.+) (?:is|are) afflicted by (.+?)(?: \((\d+)\))?\.$"
     :id     :aura-debuff-gained
@@ -708,7 +708,7 @@
               :target-name %1
               :aura-name   %2
               :stacks      (->int %3)
-              :type        :debuff)}
+              :aura-type   :debuff)}
 
    {:regex  #"^(.+) fades from (.+)\.$"
     :id     :aura-fades
diff --git a/vwowrla.core/test/vwowrla/core/matchers/aura_gained_test.clj b/vwowrla.core/test/vwowrla/core/matchers/aura_gained_test.clj
index 1bb8368..fdaf192 100644
--- a/vwowrla.core/test/vwowrla/core/matchers/aura_gained_test.clj
+++ b/vwowrla.core/test/vwowrla/core/matchers/aura_gained_test.clj
@@ -29,7 +29,7 @@
           :timestamp   (parse-log-timestamp "5/25 21:21:16.385" options)
           :target-name "Vasling"
           :aura-name   "Blink"
-          :type        :buff
+          :aura-type   :buff
           :stacks      nil}))
 
   (is (= (parse-line "5/25 21:16:27.257  Eggs gains Renew." options)
@@ -40,7 +40,7 @@
           :timestamp   (parse-log-timestamp "5/25 21:16:27.257" options)
           :target-name "Eggs"
           :aura-name   "Renew"
-          :type        :buff
+          :aura-type   :buff
           :stacks      nil}))
 
   (is (= (parse-line "5/25 23:26:03.093  Victore gains Bonereaver's Edge (2)." options)
@@ -51,7 +51,7 @@
           :timestamp   (parse-log-timestamp "5/25 23:26:03.093" options)
           :target-name "Victore"
           :aura-name   "Bonereaver's Edge"
-          :type        :buff
+          :aura-type   :buff
           :stacks      2}))
 
   (is (= (parse-line "5/25 21:42:59.537  You gain Regrowth." options)
@@ -62,7 +62,7 @@
           :timestamp   (parse-log-timestamp "5/25 21:42:59.537" options)
           :target-name owner-char-name
           :aura-name   "Regrowth"
-          :type        :buff
+          :aura-type   :buff
           :stacks      nil})))
 
 (deftest aura-debuff-gained
@@ -76,7 +76,7 @@
           :timestamp   (parse-log-timestamp "5/25 21:16:46.564" options)
           :target-name "Vasling"
           :aura-name   "Gnomish Death Ray"
-          :type        :debuff
+          :aura-type   :debuff
           :stacks      nil}))
 
   (is (= (parse-line "5/25 21:16:43.064  Onyxia is afflicted by Shadow Vulnerability (5)." options)
@@ -87,7 +87,7 @@
           :timestamp   (parse-log-timestamp "5/25 21:16:43.064" options)
           :target-name "Onyxia"
           :aura-name   "Shadow Vulnerability"
-          :type        :debuff
+          :aura-type   :debuff
           :stacks      5}))
 
   (is (= (parse-line "5/25 21:43:05.511  You are afflicted by Weakened Soul." options)
@@ -98,5 +98,5 @@
           :timestamp   (parse-log-timestamp "5/25 21:43:05.511" options)
           :target-name owner-char-name
           :aura-name   "Weakened Soul"
-          :type        :debuff
+          :aura-type   :debuff
           :stacks      nil})))