Skip to content

Commit

Permalink
Merged in #114.
Browse files Browse the repository at this point in the history
  • Loading branch information
jonbullock committed Nov 3, 2014
2 parents d28ee9d + d7aa084 commit 4625fff
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 3 deletions.
6 changes: 6 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
<logback.version>1.1.1</logback.version>
<assertj.version>1.7.0</assertj.version>
<thymeleaf.version>2.1.3.RELEASE</thymeleaf.version>
<json-simple.version>1.1.1</json-simple.version>
</properties>

<build>
Expand Down Expand Up @@ -297,6 +298,11 @@
<artifactId>commons-configuration</artifactId>
<version>${commons.configuration.version}</version>
</dependency>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>${json-simple.version}</version>
</dependency>
<dependency>
<groupId>args4j</groupId>
<artifactId>args4j</artifactId>
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/org/jbake/app/Parser.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import org.jbake.parser.Engines;
import org.jbake.parser.MarkupEngine;
import org.jbake.parser.ParserContext;
import org.json.simple.JSONValue;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -186,6 +187,9 @@ private void processHeader(List<String> contents, final Map<String, Object> cont
for( int i=0; i<tags.length; i++ )
tags[i]=tags[i].trim();
content.put(parts[0], tags);
} else if (parts[1].startsWith("{") && parts[1].endsWith("}")) {
// Json type
content.put(parts[0], JSONValue.parse(parts[1]));
} else {
content.put(parts[0], parts[1]);
}
Expand Down
3 changes: 2 additions & 1 deletion src/test/java/org/jbake/app/RendererTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@ public void renderPost() throws Exception {
.contains("2013</p>")
.contains("Lorem ipsum dolor sit amet")
.contains("<h5>Published Posts</h5>")
.contains("blog/2012/first-post.html");
.contains("blog/2012/first-post.html")
.contains("<meta property=\"og:description\" content=\"Something\"/>");
}

@Test
Expand Down
3 changes: 2 additions & 1 deletion src/test/resources/content/blog/2013/second-post.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
type=post
tags=blog
status=published
og={"description": "Something"}
~~~~~~

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque vel diam purus. Curabitur ut nisi lacus.
Expand All @@ -12,4 +13,4 @@
ligula vehicula et iaculis sem placerat. Fusce dictum, metus at volutpat lacinia, elit massa auctor risus,
id auctor arcu enim eu augue. Donec ultrices turpis in mi imperdiet ac venenatis sapien sodales. In
consequat imperdiet nunc quis bibendum. Nulla semper, erat quis ornare tristique, lectus massa posuere
libero, ut vehicula lectus nunc ut lorem. Aliquam erat volutpat.
libero, ut vehicula lectus nunc ut lorem. Aliquam erat volutpat.
4 changes: 3 additions & 1 deletion src/test/resources/templates/header.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@
}
</style>
<link href="/css/bootstrap-responsive.min.css" rel="stylesheet">
<#if content?? && content.og??>
<meta property="og:description" content="${content.og.description}"/>
</#if>

<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]>
Expand Down Expand Up @@ -74,4 +77,3 @@
</div>

<hr>

0 comments on commit 4625fff

Please sign in to comment.