rules: use yaml lists in fuzzy rules, update CHANGES.rst

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
 ~~~~~~~~~~~~~~~~~~~~~
 

pywb/rules.yaml

@@ -16,28 +16,26 @@ rules:
               
     - url_prefix: 'com,facebook)/ajax/ufi/'
       
-      fuzzy_lookup: ['ft_ent_identifier', 'lsd']      
+      fuzzy_lookup:
-      #fuzzy_lookup: '(ft_ent_identifier=[^&]+).*(lsd=[^&]+)'
+          - ft_ent_identifier
+          - lsd
 
     - url_prefix: 'com,facebook)/ajax/chat/hovercard/sidebar.php'
 
-      fuzzy_lookup: ['ids[0]']
+      fuzzy_lookup: 
-      #fuzzy_lookup: '(ids\[0\]=[^&]+)'
+          - ids[0]
-
-    - url_prefix: 'com,facebook)/ajax/'
-
-      fuzzy_lookup: '([?&][^_]\w+=[^&]+)+'
 
     - url_prefix: 'com,facebook)/login.php'
 
-      #fuzzy_lookup: '(email=[^&]+).*(lgnrnd=[^&]+).*(lsd=[^&]+)'
+      fuzzy_lookup:
-      fuzzy_lookup: ['email', 'lgnrnd', 'lsd']
+          - email
+          - lgnrnd
+          - lsd
 
- # not actually needed, fuzzy match is used instead here
+    # fallback for all /ajax/
-#      canonicalize:
+    - url_prefix: 'com,facebook)/ajax/'
-#        match: 'com,facebook\)/.*[?&]data=([^&]+).*'
-#        replace: 'com,facebook)/ajax/pagelet/generic.php/profiletimelinesectionpagelet?data=\1'
 
+      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