Skip to content

Commit

Permalink
Renamed "ProjectPage" to "SitePage".
Browse files Browse the repository at this point in the history
  • Loading branch information
dsoprea committed Jan 7, 2019
1 parent 717ef54 commit e6f4c3d
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ err = childPb.AddContentImage(iw)
log.PanicIf(err)

items := []sitebuilder.LinkWidget{
sitebuilder.NewLinkWidget("Child1", sitebuilder.NewProjectPageLocalResourceLocator(sb, "child1")),
sitebuilder.NewLinkWidget("Child2", sitebuilder.NewProjectPageLocalResourceLocator(sb, "child2")),
sitebuilder.NewLinkWidget("Child1", sitebuilder.NewSitePageLocalResourceLocator(sb, "child1")),
sitebuilder.NewLinkWidget("Child2", sitebuilder.NewSitePageLocalResourceLocator(sb, "child2")),
}

nw := sitebuilder.NewNavbarWidget(items)
Expand Down
12 changes: 6 additions & 6 deletions markdown/page_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ func ExampleMarkdownDialect_RenderHtml() {
log.PanicIf(err)

items := []sitebuilder.LinkWidget{
sitebuilder.NewLinkWidget("Child1", sitebuilder.NewProjectPageLocalResourceLocator(sb, "child1")),
sitebuilder.NewLinkWidget("Child2", sitebuilder.NewProjectPageLocalResourceLocator(sb, "child2")),
sitebuilder.NewLinkWidget("Child1", sitebuilder.NewSitePageLocalResourceLocator(sb, "child1")),
sitebuilder.NewLinkWidget("Child2", sitebuilder.NewSitePageLocalResourceLocator(sb, "child2")),
}

nw := sitebuilder.NewNavbarWidget(items)
Expand Down Expand Up @@ -184,8 +184,8 @@ func TestMarkdownDialect_RenderIntermediate_Navbar(t *testing.T) {
pb := rootNode.Builder()

items := []sitebuilder.LinkWidget{
sitebuilder.NewLinkWidget("Child1", sitebuilder.NewProjectPageLocalResourceLocator(sb, "child1")),
sitebuilder.NewLinkWidget("Child2", sitebuilder.NewProjectPageLocalResourceLocator(sb, "child2")),
sitebuilder.NewLinkWidget("Child1", sitebuilder.NewSitePageLocalResourceLocator(sb, "child1")),
sitebuilder.NewLinkWidget("Child2", sitebuilder.NewSitePageLocalResourceLocator(sb, "child2")),
}

nw := sitebuilder.NewNavbarWidget(items)
Expand Down Expand Up @@ -225,8 +225,8 @@ func TestMarkdownDialect_RenderIntermediate_Link(t *testing.T) {
rootNode := sb.Root()
pb := rootNode.Builder()

pplrl := sitebuilder.NewProjectPageLocalResourceLocator(sb, "child1")
lw := sitebuilder.NewLinkWidget("Child1", pplrl)
splrl := sitebuilder.NewSitePageLocalResourceLocator(sb, "child1")
lw := sitebuilder.NewLinkWidget("Child1", splrl)

err := pb.AddLink(lw)
log.PanicIf(err)
Expand Down
16 changes: 8 additions & 8 deletions resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,25 @@ func (lrl *LocalResourceLocator) Uri() string {
return fmt.Sprintf("file://%s", lrl.LocalFilepath)
}

type ProjectPageLocalResourceLocator struct {
type SitePageLocalResourceLocator struct {
sb *SiteBuilder
PageId string
}

func NewProjectPageLocalResourceLocator(sb *SiteBuilder, pageId string) (pplrl *ProjectPageLocalResourceLocator) {
return &ProjectPageLocalResourceLocator{
func NewSitePageLocalResourceLocator(sb *SiteBuilder, pageId string) (splrl *SitePageLocalResourceLocator) {
return &SitePageLocalResourceLocator{
sb: sb,
PageId: pageId,
}
}

func (pplrl *ProjectPageLocalResourceLocator) Uri() string {
if found := pplrl.sb.PageIsValid(pplrl.PageId); found == false {
log.Panicf("resource refers to invalid page-ID [%s]", pplrl.PageId)
func (splrl *SitePageLocalResourceLocator) Uri() string {
if found := splrl.sb.PageIsValid(splrl.PageId); found == false {
log.Panicf("resource refers to invalid page-ID [%s]", splrl.PageId)
}

outputPath := pplrl.sb.Context().HtmlOutputPath()
filename := pplrl.sb.Context().GetFinalPageFilename(pplrl.PageId)
outputPath := splrl.sb.Context().HtmlOutputPath()
filename := splrl.sb.Context().GetFinalPageFilename(splrl.PageId)
filepath := path.Join(outputPath, filename)

return fmt.Sprintf("file://%s", filepath)
Expand Down

0 comments on commit e6f4c3d

Please sign in to comment.