ref: 3c3fc45d3c34a7dcd1a0e9fd2636e7a5c5933e03
parent: 480e01eb153b6c6c4c11a7569d9802274772a568
parent: 7a51a8a5a32881c01dcd472d818b4d774a487935
author: spf13 <[email protected]>
date: Wed Aug 14 06:19:59 EDT 2013
Merge branch 'master' of github.com:spf13/hugo
--- /dev/null
+++ b/hugolib/content_directory_test.go
@@ -1,0 +1,25 @@
+package hugolib
+
+import (
+ "testing"
+)
+
+func TestIgnoreDotFiles(t *testing.T) {+ tests := []struct {+ path string
+ ignore bool
+ } {+ {"barfoo.md", false},+ {"foobar/barfoo.md", false},+ {"foobar/.barfoo.md", true},+ {".barfoo.md", true},+ {".md", true},+ {"", true},+ }
+
+ for _, test := range tests {+ if ignored := ignoreDotFile(test.path); test.ignore != ignored {+ t.Errorf("File not ignored. Expected: %t, got: %t", test.ignore, ignored)+ }
+ }
+}
--- a/hugolib/path_seperators_windows_test.go
+++ b/hugolib/path_seperators_windows_test.go
@@ -7,7 +7,7 @@
func TestTemplatePathSeperator(t *testing.T) { config := Config{LayoutDir: "c:\\a\\windows\\path\\layout",
- Path: "c:\\a\\windows\\path",
+ Path: "c:\\a\\windows\\path",
}
s := &Site{Config: config} if name := s.generateTemplateNameFrom("c:\\a\\windows\\path\\layout\\sub1\\index.html"); name != "sub1/index.html" {--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -107,7 +107,9 @@
site.timerStep("render shortcodes")site.AbsUrlify()
site.timerStep("absolute URLify")- site.RenderIndexes()
+ if err = site.RenderIndexes(); err != nil {+ return
+ }
site.RenderIndexesIndexes()
site.timerStep("render and write indexes")site.RenderLists()
@@ -200,12 +202,15 @@
site.Directories = append(site.Directories, path)
return nil
} else {+ if ignoreDotFile(path) {+ return nil
+ }
site.Files = append(site.Files, path)
return nil
}
}
- filepath.Walk(s.Config.GetAbsPath(s.Config.ContentDir), walker)
+ filepath.Walk(s.absContentDir(), walker)
s.Info = SiteInfo{BaseUrl: template.URL(s.Config.BaseUrl),
@@ -215,6 +220,10 @@
}
s.Shortcodes = make(map[string]ShortcodeFunc)
+}
+
+func ignoreDotFile(path string) bool {+ return filepath.Base(path)[0] == '.'
}
func (s *Site) absLayoutDir() string {