Merge pull request #17 from woothee/update-v1_11

Update: v1.11.0

.travis.yml

@@ -1,13 +1,12 @@
 language: go
 go:
-    - 1.1
-    - 1.2
-    - 1.3
-    - 1.4
-    - 1.5
-    - 1.6
-    - 1.7
-    - 1.8
+    - "1.8"
+    - "1.9"
+    - "1.10"
+    - "1.11"
+    - "1.12"
+    - "1.13"
+    - "1.14"
     - tip
 install:
     - echo "Do Nothing, please"

dataset.go

@@ -42,6 +42,11 @@ var DefaultDataSet DataSet = DataSet{
 		Type:   "",
 		Vendor: "Fenrir Inc.",
 	},
+	"GSA": &Result{
+		Name:   "Google Search App",
+		Type:   "",
+		Vendor: "Google",
+	},
 	"Webview": &Result{
 		Name:   "Webview",
 		Type:   "",

parser.go

@@ -12,6 +12,7 @@ var (
 	rxFirefoxOSPattern       = regexp.MustCompile(`^Mozilla/[.0-9]+ \((?:Mobile|Tablet);(?:.*;)? rv:([.0-9]+)\) Gecko/[.0-9]+ Firefox/[.0-9]+$`)
 	rxFirefoxiOSPattern      = regexp.MustCompile(`FxiOS/([.0-9]+)`)
 	rxFOMAVersionPattern     = regexp.MustCompile(`\(([^;)]+);FOMA;`)
+	rxGsaPattern             = regexp.MustCompile(`GSA/([.0-9]+)`)
 	rxHeadlineReaderPattern  = regexp.MustCompile(`(?i)headline-reader`)
 	rxJigPattern             = regexp.MustCompile(`jig browser[^;]+; ([^);]+)`)
 	rxKDDIPattern            = regexp.MustCompile(`KDDI-([^- /;()"']+)`)
@@ -1192,6 +1193,16 @@ func (p *Parser) ChallengeSafariChrome(agent string, result *Result) error {
 		return nil
 	}
 
+	if match := rxGsaPattern.FindStringSubmatchIndex(agent); match != nil {
+		version := agent[match[2]:match[3]]
+		err := p.PopulateDataSet(result, "GSA")
+		if err != nil {
+			return err
+		}
+		result.Version = version
+		return nil
+	}
+
 	version := ValueUnknown
 	if match := rxSafariPattern.FindStringSubmatchIndex(agent); match != nil {
 		version = agent[match[2]:match[3]]

smartphone_ios_test.go

@@ -228,6 +228,26 @@ func Test_smartphone_ios(t *testing.T) {
 			t.Errorf("Expected result.Version for '%s' to be '41.1.35.1', but got '%s'", `Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_2 like Mac OS X) AppleWebKit/603.2.4 (KHTML, like Gecko) Mobile/14F89 Safari/603.2.4 EdgiOS/41.1.35.1`, result.Version)
 		}
 	}
+	result, err = Parse(`Mozilla/5.0 (iPhone; CPU iPhone OS 11_1_1 like Mac OS X) AppleWebKit/604.1.34 (KHTML, like Gecko) GSA/41.0.178428663 Mobile/15B150 Safari/604.1`)
+	if err != nil {
+		t.Errorf(`Failed to parse 'Mozilla/5.0 (iPhone; CPU iPhone OS 11_1_1 like Mac OS X) AppleWebKit/604.1.34 (KHTML, like Gecko) GSA/41.0.178428663 Mobile/15B150 Safari/604.1': %s`, err)
+	} else {
+		if result.Category != "smartphone" {
+			t.Errorf("Expected result.Category for '%s' to be 'smartphone', but got '%s'", `Mozilla/5.0 (iPhone; CPU iPhone OS 11_1_1 like Mac OS X) AppleWebKit/604.1.34 (KHTML, like Gecko) GSA/41.0.178428663 Mobile/15B150 Safari/604.1`, result.Category)
+		}
+		if result.Name != "Google Search App" {
+			t.Errorf("Expected result.Name for '%s' to be 'Google Search App', but got '%s'", `Mozilla/5.0 (iPhone; CPU iPhone OS 11_1_1 like Mac OS X) AppleWebKit/604.1.34 (KHTML, like Gecko) GSA/41.0.178428663 Mobile/15B150 Safari/604.1`, result.Name)
+		}
+		if true && result.Os != "iPhone" {
+			t.Errorf("Expected result.Os for '%s' to be 'iPhone', but got '%s'", `Mozilla/5.0 (iPhone; CPU iPhone OS 11_1_1 like Mac OS X) AppleWebKit/604.1.34 (KHTML, like Gecko) GSA/41.0.178428663 Mobile/15B150 Safari/604.1`, result.Os)
+		}
+		if true && result.OsVersion != "11.1.1" {
+			t.Errorf("Expected result.OsVersion for '%s' to be '11.1.1', but got '%s'", `Mozilla/5.0 (iPhone; CPU iPhone OS 11_1_1 like Mac OS X) AppleWebKit/604.1.34 (KHTML, like Gecko) GSA/41.0.178428663 Mobile/15B150 Safari/604.1`, result.OsVersion)
+		}
+		if true && result.Version != "41.0.178428663" {
+			t.Errorf("Expected result.Version for '%s' to be '41.0.178428663', but got '%s'", `Mozilla/5.0 (iPhone; CPU iPhone OS 11_1_1 like Mac OS X) AppleWebKit/604.1.34 (KHTML, like Gecko) GSA/41.0.178428663 Mobile/15B150 Safari/604.1`, result.Version)
+		}
+	}
 	result, err = Parse(`Girls/2.0 (livedoor Co.,Ltd.; Peachy 2.1; iPhone; RSS Version 2.0; +http://girls.livedoor.com/)`)
 	if err != nil {
 		t.Errorf(`Failed to parse 'Girls/2.0 (livedoor Co.,Ltd.; Peachy 2.1; iPhone; RSS Version 2.0; +http://girls.livedoor.com/)': %s`, err)