Merged default CSS into template.

Made publisher expect a StringTemplate group file rather than a directory when alternative templates are specified.

Author: dwdyer

CHANGELOG.txt

@@ -28,6 +28,10 @@ Changes in version 1.2
 
 * Added filter to exclude articles where headlines match a certain regex.
 
+* Upgraded to StringTemplate 4.0.7.
+
+* Templates are now specified by a StringTemplate group file (.stg).
+
 
 Changes in version 1.1
 ----------------------

publisher/src/java/main/org/uncommons/zeitgeist/publisher/Publisher.java

@@ -43,7 +43,6 @@
 import org.grlea.log.SimpleLogger;
 import org.stringtemplate.v4.ST;
 import org.stringtemplate.v4.STGroup;
-import org.stringtemplate.v4.STGroupDir;
 import org.stringtemplate.v4.STGroupFile;
 import org.uncommons.zeitgeist.Article;
 import org.uncommons.zeitgeist.ArticleFetcher;
@@ -87,11 +86,7 @@ public Publisher()
      */
     public Publisher(File templateDir)
     {
-        if (!templateDir.isDirectory())
-        {
-            throw new IllegalArgumentException("Template path must be a directory.");
-        }
-        this.group = new STGroupDir(templateDir.getAbsolutePath());
+        this.group = new STGroupFile(templateDir.getAbsolutePath());
     }
 
 
@@ -117,44 +112,25 @@ public void publish(List<Topic> topics,
 
         // Publish HTML.
         ST htmlTemplate = group.getInstanceOf("news");
-        publishTemplate(topics, title, feedCount, articleCount, htmlTemplate, new File("index.html"));
-        if (group instanceof STGroupDir)
-        {
-            StreamUtils.copyFile(outputDir,
-                                 new File(((STGroupDir) group).groupDirName, "zeitgeist.css"), "zeitgeist.css");
-        }
-        else
-        {
-            StreamUtils.copyClasspathResource(outputDir, "zeitgeist.css", "zeitgeist.css");
-        }
+        htmlTemplate.add("topics", topics);
+        htmlTemplate.add("title", title);
+        htmlTemplate.add("dateTime", new Date());
+        htmlTemplate.add("feedCount", feedCount);
+        htmlTemplate.add("articleCount", articleCount);
+        publishTemplate(htmlTemplate, new File("index.html"));
 
         if (group.isDefined("snippet"))
         {
             List<Topic> snippetTopics = topics.subList(0, Math.min(5, topics.size())); // Include no more than 5 topics.
             ST syndicateTemplate = group.getInstanceOf("snippet");
-            publishTemplate(snippetTopics,
-                            title,
-                            feedCount,
-                            articleCount,
-                            syndicateTemplate,
-                            new File("snippet.html"));
+            syndicateTemplate.add("topics", snippetTopics);
+            publishTemplate(syndicateTemplate, new File("snippet.html"));
         }
     }
 
 
-    private void publishTemplate(List<Topic> topics,
-                                 String title,
-                                 int feedCount,
-                                 int articleCount,
-                                 ST template,
-                                 File outputFile) throws IOException
+    private void publishTemplate(ST template, File outputFile) throws IOException
     {
-        Date date = new Date();
-        template.add("topics", topics);
-        template.add("title", title);
-        template.add("dateTime", date);
-        template.add("feedCount", feedCount);
-        template.add("articleCount", articleCount);
         Writer writer = new OutputStreamWriter(new FileOutputStream(outputFile), ENCODING);
         try
         {
@@ -370,8 +346,8 @@ public static void main(String[] args) throws IOException
                                            Integer.parseInt(properties.getProperty("zeitgeist.minSourcesPerTopic")),
                                            Integer.parseInt(properties.getProperty("zeitgeist.minArticleRelevance"))).getTopics();
         LOG.info(topics.size() + " topics identified.");
-        String templatesDir = properties.getProperty("zeitgeist.templatesDir");
-        Publisher publisher = templatesDir != null ? new Publisher(new File(templatesDir)) : new Publisher();
+        String templatesFile = properties.getProperty("zeitgeist.templatesFile");
+        Publisher publisher = templatesFile != null ? new Publisher(new File(templatesFile)) : new Publisher();
         publisher.publish(topics,
                           properties.getProperty("zeitgeist.title"),
                           feeds.size(),

publisher/src/java/resources/zeitgeist.css

@@ -41,7 +41,26 @@ news(topics, title, dateTime, feedCount, articleCount) ::= <<
     <html>
       <head>
         <title>$title;format="xml-encode"$</title>
-        <link href="zeitgeist.css" rel="stylesheet" type="text/css" />
+        <style>
+          body {font-family: Lucida Sans Unicode, Lucida Grande, sans-serif; font-size: 62.5%; line-height: 2em; margin: 2em;}
+          a {color: #0077cc; text-decoration: none;}
+          a:hover {color: #004499;}
+          a img {border: 0;}
+          h1 {font-size: 4em; font-family: Palatino Linotype, Palatino, serif; font-weight: bold; margin-top: 0;}
+          h2 {font-size: 3em; font-family: Palatino Linotype, Palatino, serif; line-height: 1.3333em; margin-bottom: .3333em;}
+          h2 a {color: #333333; font-variant: small-caps;}
+          p {font-size: 1.5em; margin-bottom: 1.3333em;}
+
+          .datetime {font-size: 1.2em; margin-top: -1.6667em; margin-bottom: 1.6667em;}
+          .about {color: #666666;}
+          .topic {clear: both; margin-top: 2em; margin-bottom: 2em;}
+          .links {display: table-cell; font-size: 1.5em; padding-left: 1em; padding-bottom: .25em;}
+          .picture {float: left; margin-bottom: 2em; max-width: 200px;}
+          .picture img {max-width: 100%}
+          .credit {font-size: 1em;}
+          .logo {max-height: 30px; max-width: 150px; margin-left: .5em; vertical-align: middle;}
+          .icon {width: 16px; height: 16px; vertical-align: bottom;}
+        </style>
       </head>
       <body>
         <h1>$title;format="xml-encode"$</h1>
@@ -57,7 +76,7 @@ news(topics, title, dateTime, feedCount, articleCount) ::= <<
 >>
 
 
-snippet(topics, title, dateTime, feedCount, articleCount) ::= <<
+snippet(topics) ::= <<
     <div id="snippet">
       $first(topics):{topic|
         $first(topic.images):picture()$