From d328c9d1286fda1a9d263c1f5e96f098e18ff84e Mon Sep 17 00:00:00 2001
From: Sergey Obukhov <sergey.obykhov@mailgunhq.com>
Date: Fri, 18 Sep 2015 05:19:59 -0700
Subject: [PATCH] fixes mailgun/talon#43

---
 talon/signature/data/classifier               | Bin 608 -> 608 bytes
 talon/signature/data/classifier_02.npy        | Bin 176 -> 176 bytes
 talon/signature/data/classifier_03.npy        | Bin 88 -> 88 bytes
 talon/signature/learning/helpers.py           |   4 ++--
 tests/signature/learning/featurespace_test.py |   7 +++++--
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/talon/signature/data/classifier b/talon/signature/data/classifier
index b7d72eb989596b74547efcbbcfbe280cc79f855d..1c3a4b0865f3e951b1b3b17fb31bacc48d8d005b 100644
GIT binary patch
delta 13
VcmaFB@_=Q-WJbn)lczAA0RSk*1;79R

delta 13
VcmaFB@_=Q-WJbmplczAA0RSnO1?m6*

diff --git a/talon/signature/data/classifier_02.npy b/talon/signature/data/classifier_02.npy
index 0f965baa69b0df1b8f38acd7fa1e76f2c1a0a897..2cec7290a8fe3f33ddbaa3ea9d539fb58f1ad3ac 100644
GIT binary patch
delta 103
zcmdnMxPfs(K*BKz``g+l-`a1Sa&`ZyLktIYW$p6Qz5C1FZ(?1q{<SCeFBKVY9bWap
zzC~MNA8+Lkd!`yy=K~^d>^qPD=jLqrX)lp7HMp#4zx_Kw6|)8I+xNrh)#hJvOkRGs
F2LM_jGJ^mB

delta 103
zcmdnMxPfs(K!U+mhRX6IZ|(nxTfCM##Bg9HKf^yZ)8F<fE9+MITzz7H_kYahJF7m}
zKUnna`Lv23_6M9-_^OM%vEQ+|^nF0fPy3!<6+SA>`|Zmd7JU!**uEb|H$FN1A@1dO
FdjO|9H;VuO

diff --git a/talon/signature/data/classifier_03.npy b/talon/signature/data/classifier_03.npy
index 5a35962eb9617631417f9bf564c051e71818867b..e5762ae5b684a67b4ad4e2b5bc42615db45d2e46 100644
GIT binary patch
delta 13
Ucma!um=M5GIqS%#a_Lw50VfRxT>t<8

delta 13
Ucma!um=M5GCOx}8PWsh;03jm<W&i*H

diff --git a/talon/signature/learning/helpers.py b/talon/signature/learning/helpers.py
index 953662b..7085a74 100644
--- a/talon/signature/learning/helpers.py
+++ b/talon/signature/learning/helpers.py
@@ -16,7 +16,7 @@ from talon.signature.constants import SIGNATURE_MAX_LINES
 
 rc = re.compile
 
-RE_EMAIL = rc('@')
+RE_EMAIL = rc('\S@\S')
 RE_RELAX_PHONE = rc('(\(? ?[\d]{2,3} ?\)?.{,3}?){2,}')
 RE_URL = rc(r'''https?://|www\.[\S]+\.[\S]''')
 
@@ -120,7 +120,7 @@ def contains_sender_names(sender):
     names = names or sender
     if names != '':
         return binary_regex_search(re.compile(names))
-    return lambda s: False
+    return lambda s: 0
 
 
 def extract_names(sender):
diff --git a/tests/signature/learning/featurespace_test.py b/tests/signature/learning/featurespace_test.py
index a2c81cb..70df62b 100644
--- a/tests/signature/learning/featurespace_test.py
+++ b/tests/signature/learning/featurespace_test.py
@@ -6,7 +6,9 @@ from talon.signature.learning import featurespace as fs
 
 
 def test_apply_features():
-    s = '''John Doe
+    s = '''This is John Doe
+
+Tuesday @3pm suits. I'll chat to you then.
 
 VP Research and Development, Xxxx Xxxx Xxxxx
 
@@ -19,11 +21,12 @@ john@example.com'''
     # note that we don't consider the first line because signatures don't
     # usually take all the text, empty lines are not considered
     eq_(result, [[1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1],
+                 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
                  [1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
                  [0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0],
                  [0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0]])
 
-    with patch.object(fs, 'SIGNATURE_MAX_LINES', 4):
+    with patch.object(fs, 'SIGNATURE_MAX_LINES', 5):
         features = fs.features(sender)
         new_result = fs.apply_features(s, features)
         # result remains the same because we don't consider empty lines