lib/octopress/page.rb in octopress-3.0.0.rc.12 vs lib/octopress/page.rb in octopress-3.0.0.rc.13

@@ -61,11 +61,13 @@
     end
 
     def set_default_options
       @options['type']      ||= 'page'
       @options['layout']      = @config['page_layout']
-      @options['date']        = convert_date @options['date']
+      if @options['date']
+        @options['date']        = convert_date @options['date']
+      end
       @options['extension'] ||= @config['page_ext']
       @options['template']  ||= @config['page_template']
     end
 
     def convert_date(date)
@@ -93,12 +95,14 @@
       if file
         file.sub(/^_templates\//, '')
         file = File.join(source, '_templates', file) if file
         if File.exist? file
           parse_template File.open(file).read
-        else
+        elsif @options['template']
           abort "No #{@options['type']} template found at #{file}"
+        else
+          parse_template default_content
         end
       else
         parse_template default_content
       end
     end
@@ -108,22 +112,29 @@
     end
 
     # Render Liquid vars in YAML front-matter.
     def parse_template(input)
 
-      Octopress::Utils.titlecase!(@options['title']) if @config['titlecase']
+      if @config['titlecase']
+        @options['title'] = Octopress::Filters.titlecase(@options['title'])
+      end
       # If possible only parse the YAML front matter.
       # If YAML front-matter dashes aren't present parse the whole 
       # template and add dashes.
       #
 
       parsed = if input =~ /\A-{3}\s+(.+?)\s+-{3}(.+)?/m
-        template = Liquid::Template.parse($1)
-        "---\n#{template.render(@options).strip}\n---\n#{$2}"
+        input = $1
+        content = $2
+        if @options['date'] && !(input =~ /date:/)
+          input += "\ndate: #{@options['date']}"
+        end
       else
-        template = Liquid::Template.parse(input)
-        "---\n#{template.render(@options).strip}\n---\n"
+        content = ''
       end
+
+      template = Liquid::Template.parse(input)
+      "---\n#{template.render(@options).strip}\n---\n#{content}"
     end
 
     def date_slug
       @options['date'].split('T')[0]
     end