chore: small tweaks for namespace functionality.

.gitignore

@@ -0,0 +1 @@
+statik

.travis.yml

@@ -10,7 +10,7 @@ go_import_path: github.com/rakyll/statik
 
 install:
   - go build -v
-  - ./statik -f -src=./example/public -dest=./example/ -include=*.jpg,*.txt,*.html,*.css,*.js
+  - ./statik -f -src=./example/public -dest=./example/ -include=*.jpg,*.txt,*.html,*.css,*.js -ns=web
 
 script:
   - go test -v -bench=. ./...

fs/fs.go

@@ -48,24 +48,24 @@ type statikFS struct {
 // Register registers zip contents data, later used to initialize
 // the statik file system.
 func Register(data string) {
-	RegisterWithName("default", data)
+	RegisterWithNamespace("default", data)
 }
 
-// RegisterWithName registers zip contents data and set asset namespace,
+// RegisterWithNamespace registers zip contents data and set asset namespace,
 // later used to initialize the statik file system.
-func RegisterWithName(assetNamespace string, data string) {
+func RegisterWithNamespace(assetNamespace string, data string) {
 	zipData[assetNamespace] = data
 }
 
 // New creates a new file system with the default registered zip contents data.
 // It unzips all files and stores them in an in-memory map.
 func New() (http.FileSystem, error) {
-	return NewWithName("default")
+	return NewWithNamespace("default")
 }
 
-// NewWithName creates a new file system with the registered zip contents data.
+// NewWithNamespace creates a new file system with the registered zip contents data.
 // It unzips all files and stores them in an in-memory map.
-func NewWithName(assetNamespace string) (http.FileSystem, error) {
+func NewWithNamespace(assetNamespace string) (http.FileSystem, error) {
 	asset, ok := zipData[assetNamespace]
 	if !ok {
 		return nil, errors.New("statik/fs: no zip data registered")

fs/fs_test.go

@@ -40,15 +40,15 @@ type wantFile struct {
 	err     error
 }
 
-func TestRegisterWithName(t *testing.T) {
+func TestRegisterWithNamespace(t *testing.T) {
 	tests := []struct {
 		description string
 		assetName   string
 		zipData     string
 		condition   func() error
 	}{
 		{
-			description: "RegisterWithName() should set zipData with assetName to be key",
+			description: "RegisterWithNamespace() should set zipData with assetName to be key",
 			assetName:   "file",
 			zipData:     "file test",
 			condition: func() error {
@@ -78,11 +78,11 @@ func TestRegisterWithName(t *testing.T) {
 			},
 		},
 		{
-			description: "zipData[\"foo\"] should be able to open by OpenWithName(\"foo\")",
+			description: "zipData[\"foo\"] should be able to open by Open()",
 			assetName:   "foo",
 			zipData:     mustZipTree("../testdata/file"),
 			condition: func() error {
-				fs, err := NewWithName("foo")
+				fs, err := NewWithNamespace("foo")
 				if err != nil {
 					return err
 				}
@@ -95,7 +95,7 @@ func TestRegisterWithName(t *testing.T) {
 	}
 	for _, tc := range tests {
 		t.Run(tc.description, func(t *testing.T) {
-			RegisterWithName(tc.assetName, tc.zipData)
+			RegisterWithNamespace(tc.assetName, tc.zipData)
 			if err := tc.condition(); err != nil {
 				t.Error(err)
 			}

statik.go

@@ -44,18 +44,18 @@ var (
 	flagForce      = flag.Bool("f", false, "")
 	flagTags       = flag.String("tags", "", "")
 	flagPkg        = flag.String("p", "statik", "")
-	flagAstName    = flag.String("a", "default", "")
-  flagPkgCmt     = flag.String("c", "", "")
+	flagNamespace  = flag.String("ns", "default", "")
+	flagPkgCmt     = flag.String("c", "", "")
 	flagInclude    = flag.String("include", "*.*", "")
 )
 
 const helpText = `statik [options]
 
 Options:
--src     The source directory of the assets. "public" by default.
--dest    The destination directory of the generated package. "." by default.
+-src     The source directory of the assets, "public" by default.
+-dest    The destination directory of the generated package, "." by default.
 
--a       Support different asset namespaces
+-ns      The namespace where assets will exist, "default" by default.
 -f       Override destination if it already exists, false by default.
 -include Wildcard to filter files to include, "*.*" by default.
 -m       Ignore modification times on files, false by default.
@@ -265,7 +265,7 @@ func generateSource(srcPath string, includes string) (file *os.File, err error)
 	// e.g.)
 	// assetNamespaceIdentify is "AbcDeF_G"
 	// when assetNamespace is "abc de f-g"
-	assetNamespace := *flagAstName
+	assetNamespace := *flagNamespace
 	assetNamespaceIdentify := toSymbolSafe(assetNamespace)
 
 	// then embed it as a quoted string
@@ -289,7 +289,7 @@ func init() {
 	data := "`)
 	FprintZipData(&qb, buffer.Bytes())
 	fmt.Fprintf(&qb, `"
-	fs.RegisterWithName("%s", data)
+	fs.RegisterWithNamespace("%s", data)
 }
 `, assetNamespace)