Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pass context to partials #57

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

pass context to partials #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/main/scala/com/gilt/handlebars/scala/CachingHandlebars.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package com.gilt.handlebars.scala
import java.io.File

import com.gilt.handlebars.scala.binding.{Binding, BindingFactory}
import com.gilt.handlebars.scala.context.Context
import com.gilt.handlebars.scala.helper.Helper
import com.gilt.handlebars.scala.parser.{HandlebarsGrammar, Program}
import com.gilt.handlebars.scala.partial.PartialHelper
Expand Down Expand Up @@ -62,4 +63,10 @@ case class CachingHandlebarsImpl[T](
data: Map[String, Binding[T]] = Map.empty[String, Binding[T]],
partials: Map[String, Handlebars[T]] = Map.empty[String, Handlebars[T]],
helpers: Map[String, Helper[T]] = Map.empty[String, Helper[T]])(implicit c: BindingFactory[T]): String = "" // Call to HandlebarsVisitor
}

def c(
context: Context[T],
data: Map[String, Binding[T]],
partials: Map[String, Handlebars[T]],
helpers: Map[String, Helper[T]])(implicit c: BindingFactory[T]): String = "" // Call to HandlebarsVisitor
}
17 changes: 16 additions & 1 deletion src/main/scala/com/gilt/handlebars/scala/Handlebars.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,16 @@ trait Handlebars[T] {
def helpers: Map[String, Helper[T]]

def apply(
context: Binding[T],
binding: Binding[T],
data: Map[String, Binding[T]] = Map.empty[String, Binding[T]],
partials: Map[String, Handlebars[T]] = Map.empty[String, Handlebars[T]],
helpers: Map[String, Helper[T]] = Map.empty[String, Helper[T]])(implicit c: BindingFactory[T]): String

def c(
context: Context[T],
data: Map[String, Binding[T]],
partials: Map[String, Handlebars[T]],
helpers: Map[String, Helper[T]])(implicit c: BindingFactory[T]): String
}

class HandlebarsImpl[T](
Expand All @@ -38,6 +44,15 @@ class HandlebarsImpl[T](

DefaultVisitor(Context(binding), PartialHelper.normalizePartialNames(partials ++ providedPartials), helpers ++ providedHelpers, data).visit(program)
}

override def c(
context: Context[T],
data: Map[String, Binding[T]],
providedPartials: Map[String, Handlebars[T]],
providedHelpers: Map[String, Helper[T]])(implicit c: BindingFactory[T]): String = {

DefaultVisitor(context, PartialHelper.normalizePartialNames(partials ++ providedPartials), helpers ++ providedHelpers, data).visit(program)
}
}

object Handlebars {
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/com/gilt/handlebars/scala/visitor/DefaultVisitor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ class DefaultVisitor[T](context: Context[T], partials: Map[String, Handlebars[T]

val partialContext = partial.context.map(context.lookup(_)).getOrElse(context)
partials.get(partialName).map {
_(partialContext.binding, data, partials, helpers) // TODO - partial rendering should receive a context
_.c(partialContext, data, partials, helpers)
}.getOrElse {
warn(s"Could not find partial: $partialName")
""
Expand Down