rebased with master. added default type to configuration.

jbake-org · May 9, 2017 · a788ee1 · a788ee1
1 parent 9f91a7f
commit a788ee1
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 9 deletions.
diff --git a/src/main/java/org/jbake/app/configuration/DefaultJBakeConfiguration.java b/src/main/java/org/jbake/app/configuration/DefaultJBakeConfiguration.java
@@ -171,6 +171,13 @@ public String getDefaultStatus() {
         return getAsString(DEFAULT_STATUS);
     }
 
+    @Override
+    public String getDefaultType() {
+        String type = getAsString(DEFAULT_TYPE);
+        if ( type.isEmpty() ) return null;
+        return type;
+    }
+
     @Override
     public String getDateFormat() {
         return getAsString(DATE_FORMAT);
@@ -413,6 +420,15 @@ public void setDatabasePath(String path) {
         setProperty(DB_PATH, path);
     }
 
+    public void setDefaultStatus(String status) {
+        setProperty(DEFAULT_STATUS, status);
+    }
+
+    public void setDefaultType(String type) {
+        setProperty(DEFAULT_TYPE, type);
+    }
+
+
     private File getAsFolder(String key) {
         return (File) get(key);
     }
@@ -465,11 +481,4 @@ private void setupDefaultTemplateFolder() {
         String destinationPath = getAsString(TEMPLATE_FOLDER);
         setTemplateFolder(new File(getSourceFolder(),destinationPath));
     }
-
-    public void setDefaultStatus(String status) {
-    }
-
-    public void setDefaultType(String type) {
-
-    }
 }
diff --git a/src/main/java/org/jbake/app/configuration/JBakeConfiguration.java b/src/main/java/org/jbake/app/configuration/JBakeConfiguration.java
@@ -156,6 +156,13 @@ public interface JBakeConfiguration {
      */
     String getDefaultStatus();
 
+    String DEFAULT_TYPE = "default.type";
+
+    /**
+     * Default type to use (in order to avoid putting it in all files)
+     */
+    String getDefaultType();
+
     String DATE_FORMAT = "date.format";
 
     /**

diff --git a/src/main/java/org/jbake/parser/MarkupEngine.java b/src/main/java/org/jbake/parser/MarkupEngine.java
@@ -98,11 +98,11 @@ public Map<String, Object> parse(JBakeConfiguration config, File file) {
         	}
         }
 
-        if (config.getString(Keys.DEFAULT_TYPE) != null) {
+        if (config.getDefaultType() != null) {
         	// default type has been set
             if (content.get(Crawler.Attributes.TYPE) == null) {
                 // file hasn't got type so use default
-                content.put(Crawler.Attributes.TYPE, config.getString(Keys.DEFAULT_TYPE));
+                content.put(Crawler.Attributes.TYPE, config.getDefaultType());
             }
         }
 

diff --git a/src/main/resources/default.properties b/src/main/resources/default.properties
@@ -82,6 +82,8 @@ asciidoctor.attributes.export.prefix=
 date.format=yyyy-MM-dd
 # default status
 default.status=draft
+# default type
+default.type=
 # comma delimited default markdown extensions; for available extensions:
 # http://www.decodified.com/pegdown/api/org/pegdown/Extensions.html
 markdown.extensions=HARDWRAPS,AUTOLINKS,FENCED_CODE_BLOCKS,DEFINITIONS