fixed naming conventions, updated data set

country.go

@@ -1,6 +1,8 @@
 package gountries
 
-import "strings"
+import (
+	"strings"
+)
 
 // Country contains all countries and their country codes
 type Country struct {
@@ -36,7 +38,7 @@ func (c Country) MeasurableCoordinates() (lat, long float64) {
 
 }
 
-// BorderingCountries gets the bordering countries for this country
+// BorderingCountries returns the bordering countries the given Country
 func (c *Country) BorderingCountries() (countries []Country) {
 
 	query := New()
@@ -53,6 +55,7 @@ func (c *Country) BorderingCountries() (countries []Country) {
 
 }
 
+// SubDivisions returns the subdivisions for the given Country
 func (c *Country) SubDivisions() (subdivisions []SubDivision) {
 
 	query := New()

error.go

@@ -0,0 +1,10 @@
+package gountries
+
+import (
+	"fmt"
+)
+
+// Error returns a formatted error
+func makeError(errMsg, errType string) error {
+	return fmt.Errorf("gountries error. %s: %s", errMsg, errType)
+}

query.go

@@ -1,7 +1,6 @@
 package gountries
 
 import (
-	"fmt"
 	"strings"
 )
 
@@ -22,7 +21,7 @@ func (q *Query) FindCountryByName(name string) (result Country, err error) {
 	lowerName := strings.ToLower(name)
 	alpha2, exists := q.NameToAlpha2[lowerName]
 	if !exists {
-		return Country{}, fmt.Errorf("Could not find country with name %s", name)
+		return Country{}, makeError("Could not find country with name", name)
 	}
 	return q.Countries[alpha2], nil
 }
@@ -34,20 +33,21 @@ func (q *Query) FindCountryByAlpha(code string) (result Country, err error) {
 	case len(code) == 2:
 		country, exists := q.Countries[codeU]
 		if !exists {
-			return Country{}, fmt.Errorf("Could not find country with code %s", code)
+			return Country{}, makeError("Could not find country with code %s", code)
 		}
 		return country, nil
 	case len(code) == 3:
 		alpha2, exists := q.Alpha3ToAlpha2[codeU]
 		if !exists {
-			return Country{}, fmt.Errorf("Could not find country with code %s", code)
+			return Country{}, makeError("Could not find country with code", code)
 		}
 		return q.Countries[alpha2], nil
 	default:
-		return Country{}, fmt.Errorf("%s is an invalid code format", code)
+		return Country{}, makeError("Invalid code format", code)
 	}
 }
 
+// FindCountries finds a Country based on the given struct data
 func (q Query) FindCountries(c Country) (countries []Country) {
 
 	for _, country := range q.Countries {

query_test.go

@@ -117,7 +117,7 @@ func TestFindCountryByAlpha(t *testing.T) {
 	result, err = query.FindCountryByAlpha("SEE")
 
 	if err != nil {
-		assert.EqualError(t, err, "Could not find country with code SEE")
+		assert.EqualError(t, err, "gountries error. Could not find country with code: SEE")
 
 	} else {
 		t.Fail()
@@ -129,7 +129,7 @@ func TestFindCountryByAlpha(t *testing.T) {
 	result, err = query.FindCountryByAlpha("SEEE")
 
 	if err != nil {
-		assert.EqualError(t, err, "SEEE is an invalid code format")
+		assert.EqualError(t, err, "gountries error. Invalid code format: SEEE")
 
 	} else {
 		t.Fail()
@@ -141,7 +141,7 @@ func TestFindCountryByAlpha(t *testing.T) {
 	result, err = query.FindCountryByAlpha("S")
 
 	if err != nil {
-		assert.EqualError(t, err, "S is an invalid code format")
+		assert.EqualError(t, err, "gountries error. Invalid code format: S")
 
 	} else {
 		t.Fail()

readme.md

@@ -142,7 +142,7 @@ fmt.Println(distance)
 The data in the `data/yaml` subdirectory is embedded using go-bindata.  Once you include this library in your project, you won't need to access the data directory.  To add or update the data, make changes to the YAML files then run:
 
 ```
-go-bindata data/yaml/*
+go-bindata -pkg gountries data/yaml/*
 ```
 
 # Testing

setup.go

@@ -69,14 +69,16 @@ func populateCountries(dataPath string) map[string]Country {
 
 	if info, err := ioutil.ReadDir(countriesPath); err == nil {
 
+		var file []byte
+
 		for _, v := range info {
 
 			if !v.IsDir() {
 
-				if file, err := ioutil.ReadFile(filepath.Join(countriesPath, v.Name())); err == nil {
+				if file, err = ioutil.ReadFile(filepath.Join(countriesPath, v.Name())); err == nil {
 
 					country := Country{}
-					if err := yaml.Unmarshal(file, &country); err == nil {
+					if err = yaml.Unmarshal(file, &country); err == nil {
 
 						// Save
 						countries[country.Codes.Alpha2] = country
@@ -131,7 +133,6 @@ func populateSubdivisions(dataPath string) (list map[string][]SubDivision) {
 	if info, err := ioutil.ReadDir(subdivisionsPath); err == nil {
 
 		for _, v := range info {
-			//fmt.Println(v.IsDir())
 
 			if !v.IsDir() {