Merge pull request woothee#1 from hassanin/fix-macOS-version

fix MacOS version 11 and newer

Author: hassanin

.gitignore

@@ -3,3 +3,5 @@ Cargo.lock
 *.swp
 *.bk
 *.rs.rustfmt
+.idea
+*.iml

src/parser.rs

@@ -49,7 +49,8 @@ lazy_static! {
     static ref RX_BLACKBERRY_OS_VERSION: Regex = Regex::new(r"BlackBerry(?:\d+)/([.0-9]+) ").unwrap();
     static ref RE_OSX_IPHONE_OS_VERSION: Regex =
         Regex::new(r"; CPU(?: iPhone)? OS (\d+_\d+(?:_\d+)?) like Mac OS X").unwrap();
-    static ref RE_OSX_OS_VERSION: Regex = Regex::new(r"Mac OS X (10[._]\d+(?:[._]\d+)?)(?:\)|;)").unwrap();
+    // static ref RE_OSX_OS_VERSION: Regex = Regex::new(r"Mac OS X (10[._]\d+(?:[._]\d+)?)(?:\)|;)").unwrap();
+     static ref RE_OSX_OS_VERSION: Regex = Regex::new(r"Mac OS X (1[0-9][._]\d+(?:[._]\d+)?)(?:\)|;)").unwrap();//[0-9]
     static ref RX_HTTP_CLIENT: Regex =
         Regex::new(r"^(?:Apache-HttpClient/|Jakarta Commons-HttpClient/|Java/)").unwrap();
     static ref RX_HTTP_CLIENT_OTHER: Regex = Regex::new(r"[- ]HttpClient(/|$)").unwrap();

tests/pc_misc.rs

@@ -217,6 +217,16 @@ mod tests {
                 assert_eq!(result.version, "33.0.1750.152");
             }
         }
+        match parser.parse(r#"Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.150 Safari/537.36"#) {
+            None => panic!(r#"invalid parse. "Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.150 Safari/537.36""#),
+            Some(result) => {
+                assert_eq!(result.category, "pc");
+                assert_eq!(result.name, "Chrome");
+                assert_eq!(result.os, "Mac OSX");
+                assert_eq!(result.os_version, "11.2.0".to_string());
+                assert_eq!(result.version, "88.0.4324.150");
+            }
+        }
         match parser.parse(r#"Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.94 YaBrowser/17.11.1.1087 (beta) Yowser/2.5 Safari/537.36"#) {
             None => panic!(r#"invalid parse. "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.94 YaBrowser/17.11.1.1087 (beta) Yowser/2.5 Safari/537.36""#),
             Some(result) => {