Fix strip whitespace ordering (#264)

* Switched order of strip_whitespace to before length checks

* Changed logic of string length test

* Changed pattern test to match whitespace stripping

Author: huyta55

src/validators/string.rs

@@ -92,6 +92,9 @@ impl Validator for StrConstrainedValidator {
         let either_str = input.validate_str(extra.strict.unwrap_or(self.strict))?;
         let cow = either_str.as_cow()?;
         let mut str = cow.as_ref();
+        if self.strip_whitespace {
+            str = str.trim();
+        }
         if let Some(min_length) = self.min_length {
             if str.len() < min_length {
                 // return py_error!("{} is shorter than {}", str, min_length);
@@ -114,10 +117,6 @@ impl Validator for StrConstrainedValidator {
             }
         }
 
-        if self.strip_whitespace {
-            str = str.trim();
-        }
-
         let py_string = if self.to_lower {
             PyString::new(py, &str.to_lowercase())
         } else if self.to_upper {

tests/validators/test_string.py

@@ -79,10 +79,10 @@ def test_str_not_json(input_value, expected):
         ({'pattern': r'\d+$'}, 'foobar 123', 'foobar 123'),
         ({'pattern': r'^\d+$'}, '12345a', Err("String should match pattern '^\\d+$' [kind=str_pattern_mismatch")),
         # strip comes after length check
-        ({'max_length': 5, 'strip_whitespace': True}, '1234  ', Err('String should have at most 5 characters')),
+        ({'max_length': 5, 'strip_whitespace': True}, '1234  ', '1234'),
         # to_upper and strip comes after pattern check
         ({'to_upper': True, 'pattern': 'abc'}, 'abc', 'ABC'),
-        ({'strip_whitespace': True, 'pattern': r'\d+$'}, 'foobar 123 ', Err("String should match pattern '\\d+$'")),
+        ({'strip_whitespace': True, 'pattern': r'\d+$'}, 'foobar 123 ', 'foobar 123'),
         ({'min_length': 1}, '🐈 Hello', '🐈 Hello'),
     ],
 )