From 4c5a7d6bcd4cb7066c8876b71043ba8d1733c18f Mon Sep 17 00:00:00 2001
From: Ilya Kreymer <ikreymer@gmail.com>
Date: Sun, 21 Sep 2014 19:48:14 -0700
Subject: [PATCH] rules: use yaml lists in fuzzy rules, update CHANGES.rst

---
 CHANGES.rst     |  6 ++++++
 pywb/rules.yaml | 30 +++++++++++++++---------------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index f6cbb4a7..8dbb4ba3 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+pywb 0.6.1 changelist
+~~~~~~~~~~~~~~~~~~~~~
+
+* New, implified notation for fuzzy match rules on query params (See: `Fuzzy Match Rules <https://github.com/ikreymer/pywb/wiki/Fuzzy-Match-Rules>`_)
+
+
 pywb 0.6.0 changelist
 ~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/pywb/rules.yaml b/pywb/rules.yaml
index b8965c6e..20cc0753 100644
--- a/pywb/rules.yaml
+++ b/pywb/rules.yaml
@@ -16,28 +16,26 @@ rules:
               
     - url_prefix: 'com,facebook)/ajax/ufi/'
       
-      fuzzy_lookup: ['ft_ent_identifier', 'lsd']      
-      #fuzzy_lookup: '(ft_ent_identifier=[^&]+).*(lsd=[^&]+)'
+      fuzzy_lookup:
+          - ft_ent_identifier
+          - lsd
 
     - url_prefix: 'com,facebook)/ajax/chat/hovercard/sidebar.php'
 
-      fuzzy_lookup: ['ids[0]']
-      #fuzzy_lookup: '(ids\[0\]=[^&]+)'
-
-    - url_prefix: 'com,facebook)/ajax/'
-
-      fuzzy_lookup: '([?&][^_]\w+=[^&]+)+'
+      fuzzy_lookup: 
+          - ids[0]
 
     - url_prefix: 'com,facebook)/login.php'
 
-      #fuzzy_lookup: '(email=[^&]+).*(lgnrnd=[^&]+).*(lsd=[^&]+)'
-      fuzzy_lookup: ['email', 'lgnrnd', 'lsd']
+      fuzzy_lookup:
+          - email
+          - lgnrnd
+          - lsd
 
- # not actually needed, fuzzy match is used instead here
-#      canonicalize:
-#        match: 'com,facebook\)/.*[?&]data=([^&]+).*'
-#        replace: 'com,facebook)/ajax/pagelet/generic.php/profiletimelinesectionpagelet?data=\1'
+    # fallback for all /ajax/
+    - url_prefix: 'com,facebook)/ajax/'
 
+      fuzzy_lookup: '([?&][^_]\w+=[^&]+)+'
 
     - url_prefix: 'com,facebook)/'
       rewrite:
@@ -91,7 +89,9 @@ rules:
         match: '(example,example,test\)/.*?)[?].*?(id=value).*'
         replace: '\1?\2'
 
-      fuzzy_lookup: ['param1', 'id']
+      fuzzy_lookup:
+          - param1
+          - id
 
       rewrite:
         js_rewrite_location: False