move merge command

goi18n/goi18n.go

@@ -3,7 +3,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"github.com/nicksnyder/go-i18n/i18n"
 	"os"
 )
 
@@ -66,13 +65,13 @@ func main() {
 	format := flag.String("format", "json", "")
 	flag.Parse()
 
-	mc := &i18n.MergeCommand{
-		TranslationFiles: flag.Args(),
-		SourceLocaleID:   *sourceLocale,
-		Outdir:           *outdir,
-		Format:           *format,
+	mc := &mergeCommand{
+		translationFiles: flag.Args(),
+		sourceLocaleID:   *sourceLocale,
+		outdir:           *outdir,
+		format:           *format,
 	}
-	if err := mc.Execute(); err != nil {
+	if err := mc.execute(); err != nil {
 		fmt.Println(err.Error())
 		os.Exit(1)
 	}

i18n/merge.go → goi18n/merge.go

@@ -1,4 +1,4 @@
-package i18n
+package main
 
 import (
 	"encoding/json"
@@ -13,38 +13,36 @@ import (
 	"sort"
 )
 
-// MergeCommand implements the merge functionality of the goi18n command.
-type MergeCommand struct {
-	TranslationFiles []string
-	SourceLocaleID   string
-	Outdir           string
-	Format           string
+type mergeCommand struct {
+	translationFiles []string
+	sourceLocaleID   string
+	outdir           string
+	format           string
 }
 
-// Execute executes the merge command.
-func (mc *MergeCommand) Execute() error {
-	if len(mc.TranslationFiles) < 1 {
+func (mc *mergeCommand) execute() error {
+	if len(mc.translationFiles) < 1 {
 		return fmt.Errorf("need at least one translation file to parse")
 	}
 
-	if _, err := locale.New(mc.SourceLocaleID); err != nil {
-		return fmt.Errorf("invalid source locale %s: %s", mc.SourceLocaleID, err)
+	if _, err := locale.New(mc.sourceLocaleID); err != nil {
+		return fmt.Errorf("invalid source locale %s: %s", mc.sourceLocaleID, err)
 	}
 
-	marshal, err := newMarshalFunc(mc.Format)
+	marshal, err := newMarshalFunc(mc.format)
 	if err != nil {
 		return err
 	}
 
 	bundle := bundle.New()
-	for _, tf := range mc.TranslationFiles {
+	for _, tf := range mc.translationFiles {
 		if err := bundle.LoadTranslationFile(tf); err != nil {
 			return fmt.Errorf("failed to load translation file %s because %s\n", tf, err)
 		}
 	}
 
 	translations := bundle.Translations()
-	sourceTranslations := translations[mc.SourceLocaleID]
+	sourceTranslations := translations[mc.sourceLocaleID]
 	for translationID, src := range sourceTranslations {
 		for _, localeTranslations := range translations {
 			if dst := localeTranslations[translationID]; dst == nil || reflect.TypeOf(src) != reflect.TypeOf(dst) {
@@ -77,13 +75,13 @@ func (mc *MergeCommand) Execute() error {
 
 type marshalFunc func(interface{}) ([]byte, error)
 
-func (mc *MergeCommand) writeFile(label string, translations []translation.Translation, localeID string, marshal marshalFunc) error {
+func (mc *mergeCommand) writeFile(label string, translations []translation.Translation, localeID string, marshal marshalFunc) error {
 	sort.Sort(translation.SortableByID(translations))
 	buf, err := marshal(marshalInterface(translations))
 	if err != nil {
-		return fmt.Errorf("failed to marshal %s strings to %s because %s", localeID, mc.Format, err)
+		return fmt.Errorf("failed to marshal %s strings to %s because %s", localeID, mc.format, err)
 	}
-	filename := filepath.Join(mc.Outdir, fmt.Sprintf("%s.%s.%s", localeID, label, mc.Format))
+	filename := filepath.Join(mc.outdir, fmt.Sprintf("%s.%s.%s", localeID, label, mc.format))
 	if err := ioutil.WriteFile(filename, buf, 0666); err != nil {
 		return fmt.Errorf("failed to write %s because %s", filename, err)
 	}

i18n/merge_test.go → goi18n/merge_test.go

@@ -1,4 +1,4 @@
-package i18n
+package main
 
 import (
 	"bytes"
@@ -17,13 +17,13 @@ func TestMergeExecute(t *testing.T) {
 		"testdata/input/ar-AR.two.json",
 	}
 
-	mc := &MergeCommand{
-		TranslationFiles: files,
-		SourceLocaleID:   "en-US",
-		Outdir:           "testdata/output",
-		Format:           "json",
+	mc := &mergeCommand{
+		translationFiles: files,
+		sourceLocaleID:   "en-US",
+		outdir:           "testdata/output",
+		format:           "json",
 	}
-	if err := mc.Execute(); err != nil {
+	if err := mc.execute(); err != nil {
 		t.Fatal(err)
 	}
 

i18n/example_test.go

@@ -6,7 +6,7 @@ import (
 )
 
 func Example() {
-	i18n.MustLoadTranslationFile("testdata/expected/en-US.all.json")
+	i18n.MustLoadTranslationFile("../goi18n/testdata/expected/en-US.all.json")
 
 	T, _ := i18n.Tfunc("en-US")
 

i18n/exampletemplate_test.go

@@ -22,7 +22,7 @@ var tmpl = template.Must(template.New("").Funcs(funcMap).Parse(`
 `))
 
 func Example_template() {
-	i18n.MustLoadTranslationFile("testdata/expected/en-US.all.json")
+	i18n.MustLoadTranslationFile("../goi18n/testdata/expected/en-US.all.json")
 
 	T, _ := i18n.Tfunc("en-US")
 	tmpl.Funcs(map[string]interface{}{

i18n/plural/plural_test.go

@@ -0,0 +1,30 @@
+package plural
+
+import (
+	"testing"
+)
+
+func TestNewCategory(t *testing.T) {
+	tests := []struct {
+		src string
+		cat Category
+		err bool
+	}{
+		{"zero", Zero, false},
+		{"one", One, false},
+		{"two", Two, false},
+		{"few", Few, false},
+		{"many", Many, false},
+		{"other", Other, false},
+		{"asdf", Invalid, true},
+	}
+
+	for _, test := range tests {
+		cat, err := NewCategory(test.src)
+		wrongErr := (err != nil && !test.err) || (err == nil && test.err)
+		if cat != test.cat || wrongErr {
+			t.Errorf("New(%#v) returned %#v,%#v; expected %#v", test.src, cat, err, test.cat)
+		}
+	}
+
+}