Merge pull request #13 from yetanalytics/6_mailto_percent_signs

6 mailto percent signs

Author: canweriotnow

spec/cljx/xapi_schema/schemata/json_spec.cljx

@@ -86,6 +86,7 @@
      (should-satisfy+ MailToIRI
                       "mailto:milt@yetanalytics.com"
                       :bad
+                      "mailto:user%@example.com"
                       "milt@yetanalytics.com")))
 
 (describe

spec/cljx/xapi_schema/schemata/regex_spec.cljx

@@ -39,7 +39,9 @@
           (it "matches valid mailto IRIs"
               (should (re-matches MailToIRIRegEx "mailto:milt@yetanalytics.com"))
               (should-not (re-matches MailToIRIRegEx "http://foo.com"))
-              (should-not (re-matches MailToIRIRegEx "milt@yetanalytics.com"))))
+              (should-not (re-matches MailToIRIRegEx "milt@yetanalytics.com"))
+              (should-not (re-matches MailToIRIRegEx "mi%lt@yetanalytics.com"))
+              (should (re-matches MailToIRIRegEx "mailto:mi%0Alt@yetanalytics.com"))))
 
 (describe "UuidRegEx"
           (it "matches valid 4.0 UUIDs"

src/cljx/xapi_schema/schemata/regex.cljx

@@ -16,7 +16,7 @@
   #+cljs  #"^((([A-Za-z]{3,9}:(?://)?)(?:[\-;:&=\+\$,\w]+@)?[A-Za-z0-9\.\-\[\]\:\+]+)((?:/[\+~%\/\.\w\-_]*)?\??(?:[\-\+=&;%@\.\w_]*)#?(?:[\.\!\/\\\w\-]*))?)$")
 
 (def MailToIRIRegEx
-  #"mailto:[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?\.)+[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?")
+  #"mailto:(?:[a-zA-Z0-9!#$&'*+/=?^_`{|}~-]|%[0-9a-fA-F]{2})+(?:\.(?:[a-zA-Z0-9!#$&'*+/=?^_`{|}~-]|%[0-9a-fA-F]{2})+)*@(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?\.)+[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?")
 
 (def UuidRegEx
   #"[0-9A-Za-z]{8}-[0-9A-Za-z]{4}-4[0-9A-Za-z]{3}-[89ABab][0-9A-Za-z]{3}-[0-9A-Za-z]{12}")