Packr2: Stat().Name() incorrect when packed fixes #150 (#151)

gobuffalo · Jan 31, 2019 · 375ed6b · 375ed6b
1 parent b0dc8ae
commit 375ed6b
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 7 deletions.
diff --git a/v2/go.mod b/v2/go.mod
@@ -2,7 +2,7 @@ module github.com/gobuffalo/packr/v2
 
 require (
 	github.com/gobuffalo/envy v1.6.12
-	github.com/gobuffalo/genny v0.0.0-20190124191459-3310289fa4b4
+	github.com/gobuffalo/genny v0.0.0-20190131150032-1045e97d19fb
 	github.com/gobuffalo/logger v0.0.0-20181127160119-5b956e21995c
 	github.com/gobuffalo/packd v0.0.0-20181212173646-eca3b8fd6687
 	github.com/karrick/godirwalk v1.7.8
@@ -14,5 +14,5 @@ require (
 	github.com/spf13/cobra v0.0.3
 	github.com/stretchr/testify v1.3.0
 	golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4
-	golang.org/x/tools v0.0.0-20190130173957-1c3581914d33
+	golang.org/x/tools v0.0.0-20190131142011-8dbcc66f33bb
 )
diff --git a/v2/go.sum b/v2/go.sum
@@ -94,8 +94,8 @@ github.com/gobuffalo/genny v0.0.0-20181207164119-84844398a37d/go.mod h1:y0ysCHGG
 github.com/gobuffalo/genny v0.0.0-20181211165820-e26c8466f14d/go.mod h1:sHnK+ZSU4e2feXP3PA29ouij6PUEiN+RCwECjCTB3yM=
 github.com/gobuffalo/genny v0.0.0-20190104222617-a71664fc38e7/go.mod h1:QPsQ1FnhEsiU8f+O0qKWXz2RE4TiDqLVChWkBuh1WaY=
 github.com/gobuffalo/genny v0.0.0-20190112155932-f31a84fcacf5/go.mod h1:CIaHCrSIuJ4il6ka3Hub4DR4adDrGoXGEEt2FbBxoIo=
-github.com/gobuffalo/genny v0.0.0-20190124191459-3310289fa4b4 h1:0hgER6ADOc40ws1xYtrSjYq7OQqMz/LsgaGooEz9RqY=
-github.com/gobuffalo/genny v0.0.0-20190124191459-3310289fa4b4/go.mod h1:yIRqxhZV2sAzb+B3iPUMLauTRrYP8tJUlZ1zV9teKik=
+github.com/gobuffalo/genny v0.0.0-20190131150032-1045e97d19fb h1:vKf7PUK8ZYLNg/cXoAlhFYE2FWxxanx3pYDaMaXD3D0=
+github.com/gobuffalo/genny v0.0.0-20190131150032-1045e97d19fb/go.mod h1:yIRqxhZV2sAzb+B3iPUMLauTRrYP8tJUlZ1zV9teKik=
 github.com/gobuffalo/github_flavored_markdown v1.0.4/go.mod h1:uRowCdK+q8d/RF0Kt3/DSalaIXbb0De/dmTqMQdkQ4I=
 github.com/gobuffalo/github_flavored_markdown v1.0.5/go.mod h1:U0643QShPF+OF2tJvYNiYDLDGDuQmJZXsf/bHOJPsMY=
 github.com/gobuffalo/github_flavored_markdown v1.0.7/go.mod h1:w93Pd9Lz6LvyQXEG6DktTPHkOtCbr+arAD5mkwMzXLI=
@@ -392,8 +392,8 @@ golang.org/x/tools v0.0.0-20190104182027-498d95493402/go.mod h1:n7NCudcB/nEzxVGm
 golang.org/x/tools v0.0.0-20190111214448-fc1d57b08d7b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190118193359-16909d206f00/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190124004107-78ee07aa9465/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190130173957-1c3581914d33 h1:vFQfd0ZIPMGfY3UauV2bnnBBXs2H11XphDbkwHZQDK8=
-golang.org/x/tools v0.0.0-20190130173957-1c3581914d33/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190131142011-8dbcc66f33bb h1:Fei+PWP+8I2+LGXs/c2aZvfJhrSQWAo8VK+AQTnkzYw=
+golang.org/x/tools v0.0.0-20190131142011-8dbcc66f33bb/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk=

diff --git a/v2/pointer.go b/v2/pointer.go
@@ -29,5 +29,5 @@ func (p Pointer) Resolve(box string, path string) (file.File, error) {
 		return f, errors.WithStack(errors.Wrap(err, path))
 	}
 	plog.Debug(p, "Resolve", "box", box, "path", path, "file", f)
-	return f, nil
+	return file.NewFileR(path, f)
 }
diff --git a/v2/pointer_test.go b/v2/pointer_test.go
@@ -3,6 +3,7 @@ package packr
 import (
 	"testing"
 
+	"github.com/gobuffalo/packr/v2/file/resolver"
 	"github.com/stretchr/testify/require"
 )
 
@@ -22,3 +23,23 @@ func Test_Pointer_Find(t *testing.T) {
 	r.NoError(err)
 	r.Equal("FOO!", s)
 }
+
+func Test_Pointer_Find_CorrectName(t *testing.T) {
+	r := require.New(t)
+
+	gk := "0b5bab905480ad8c6d0695f615dcd644"
+	g := New(gk, "")
+	hgr, err := resolver.NewHexGzip(map[string]string{
+		"48df4e44f4202fe5f6093beee782cb10": "1f8b08000000000000ff4c8ebdaec2300c46f7fb14bed94b5606a70b3f6283a1083186c46a2225354aad56bc3d6a2304933fdbc73ac6fffd79d7dd2f07089253fb87b5006020eb97008099c4820bb68c24465dbb63b355a07f9783cd64d414697e7211058e07a1418c9aa397603c4dd151b336df4b8992a83d514a0c372ec9a3aea345af3f7e7cb07fad21e61ec6e28cd2897bde8c53af2a5a09d4f5f777000000ffffcfb8b477d3000000",
+	})
+	r.NoError(err)
+	g.DefaultResolver = hgr
+
+	b := New("my box", "./templates")
+	b.SetResolver("index.html", Pointer{ForwardBox: gk, ForwardPath: "48df4e44f4202fe5f6093beee782cb10"})
+	f, err := b.Resolve("index.html")
+	r.NoError(err)
+	fi, err := f.Stat()
+	r.NoError(err)
+	r.Equal("index.html", fi.Name())
+}