Allow library to be initialized with a reader

.github/settings.yml

@@ -0,0 +1,12 @@
+repository:
+  default_branch: master
+branches:
+- name: master
+  protection:
+    required_status_checks: null
+    enforce_admins: false
+    required_pull_request_reviews:
+      dismissal_restrictions: {}
+      require_code_owner_reviews: true
+      required_approving_review_count: 1
+    restrictions: null

browscap.go

@@ -4,6 +4,7 @@
 package browscap_go
 
 import (
+	"bufio"
 	"fmt"
 	"io/ioutil"
 	"net/http"
@@ -42,6 +43,20 @@ func InitBrowsCap(path string, force bool) error {
 	return nil
 }
 
+func InitBrowsCapFromReader(reader *bufio.Reader, force bool) error {
+	if initialized && !force {
+		return nil
+	}
+	var err error
+
+	if dict, err = loadFromReader(reader); err != nil {
+		return fmt.Errorf("browscap: An error occurred while loading from reader, %v ", err)
+	}
+
+	initialized = true
+	return nil
+}
+
 func InitializedVersion() string {
 	return version
 }

browscap_test.go

@@ -4,9 +4,11 @@
 package browscap_go
 
 import (
+	"bufio"
 	"io/ioutil"
 	"strings"
 	"testing"
+	"os"
 )
 
 const (
@@ -15,13 +17,34 @@ const (
 	TEST_IPHONE_AGENT = "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_3_2 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8H7 Safari/6533.18.5"
 )
 
-func TestInitBrowsCap(t *testing.T) {
+func initFromTestIniFile(tb testing.TB) {
 	if err := InitBrowsCap(TEST_INI_FILE, false); err != nil {
+		tb.Fatalf("%v", err)
+	}
+}
+
+func TestInitBrowsCap(t *testing.T) {
+	if err := InitBrowsCap(TEST_INI_FILE, true); err != nil {
+		t.Fatalf("%v", err)
+	}
+}
+
+func TestInitBrowsCapFromReader(t *testing.T) {
+	file, err := os.Open(TEST_INI_FILE)
+	if err != nil {
+		t.Fatalf("%v", err)
+	}
+	defer file.Close()
+
+	buf := bufio.NewReader(file)
+
+	if err := InitBrowsCapFromReader(buf, true); err != nil {
 		t.Fatalf("%v", err)
 	}
 }
 
 func TestGetBrowser(t *testing.T) {
+	initFromTestIniFile(t)
 	if browser, ok := GetBrowser(TEST_USER_AGENT); !ok {
 		t.Error("Browser not found")
 	} else if browser.Browser != "Chrome" {
@@ -38,6 +61,7 @@ func TestGetBrowser(t *testing.T) {
 }
 
 func TestGetBrowserIPhone(t *testing.T) {
+	initFromTestIniFile(t)
 	if browser, ok := GetBrowser(TEST_IPHONE_AGENT); !ok {
 		t.Error("Browser not found")
 	} else if browser.DeviceName != "iPhone" {
@@ -52,6 +76,7 @@ func TestGetBrowserIPhone(t *testing.T) {
 }
 
 func TestGetBrowserYandex(t *testing.T) {
+	initFromTestIniFile(t)
 	if browser, ok := GetBrowser("Yandex Browser 1.1"); !ok {
 		t.Error("Browser not found")
 	} else if browser.Browser != "Yandex Browser" {
@@ -61,6 +86,7 @@ func TestGetBrowserYandex(t *testing.T) {
 	}
 }
 func TestGetBrowser360Spider(t *testing.T) {
+	initFromTestIniFile(t)
 	if browser, ok := GetBrowser("360Spider"); !ok {
 		t.Error("Browser not found")
 	} else if browser.Browser != "360Spider" {
@@ -71,6 +97,7 @@ func TestGetBrowser360Spider(t *testing.T) {
 }
 
 func TestGetBrowserIssues(t *testing.T) {
+	initFromTestIniFile(t)
 	// https://github.com/digitalcrab/browscap_go/issues/4
 	ua := "Mozilla/5.0 (iPad; CPU OS 5_0_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A405 Safari/7534.48.3"
 	if browser, ok := GetBrowser(ua); !ok {
@@ -79,6 +106,7 @@ func TestGetBrowserIssues(t *testing.T) {
 		t.Errorf("Expected tablet %q", browser.DeviceType)
 	}
 }
+
 func TestLastVersion(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping test in short mode.")
@@ -127,6 +155,8 @@ func BenchmarkInit(b *testing.B) {
 }
 
 func BenchmarkGetBrowser(b *testing.B) {
+	initFromTestIniFile(b)
+
 	data, err := ioutil.ReadFile("test-data/user_agents_sample.txt")
 	if err != nil {
 		b.Error(err)

catalog-info.yaml

@@ -0,0 +1,11 @@
+# BEGIN TERRAFORM MANAGED BLOCK
+"apiVersion": "backstage.io/v1alpha1"
+"kind": "Location"
+"metadata":
+  "annotations":
+    "github.com/project-slug": "LiveRamp/browscap_go"
+  "description": "GoLang Library for Browser Capabilities Project"
+  "name": "browscap_go"
+  "tags": []
+"spec": {}
+# END TERRAFORM MANAGED BLOCK

go.mod

@@ -0,0 +1,3 @@
+module github.com/LiveRamp/browscap_go
+
+go 1.13

loader.go

@@ -32,9 +32,14 @@ func loadFromIniFile(path string) (*dictionary, error) {
 	}
 	defer file.Close()
 
+	buf := bufio.NewReader(file)
+
+	return loadFromReader(buf)
+}
+
+func loadFromReader(buf *bufio.Reader) (*dictionary, error) {
 	dict := newDictionary()
 
-	buf := bufio.NewReader(file)
 	sectionName := ""
 
 	lineNum := 0