RubyGems - ruhoh - Versions diffs - 0.3.0 → 1.0.0.alpha - Mend

ruhoh 0.3.0 → 1.0.0.alpha

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (71) hide show

data/Gemfile +1 -0
data/README.md +0 -33
data/dash.html +1 -0
data/history.json +29 -0
data/lib/ruhoh/client/client.rb +30 -22
data/lib/ruhoh/client/help.yml +6 -2
data/lib/ruhoh/compiler.rb +8 -20
data/lib/ruhoh/compilers/rss.rb +36 -0
data/lib/ruhoh/compilers/theme.rb +41 -0
data/lib/ruhoh/config.rb +49 -0
data/lib/ruhoh/converters/converter.rb +17 -4
data/lib/ruhoh/converters/markdown.rb +2 -2
data/lib/ruhoh/db.rb +29 -2
data/lib/ruhoh/deployers/s3.rb +1 -1
data/lib/ruhoh/logger.rb +1 -1
data/lib/ruhoh/page.rb +38 -22
data/lib/ruhoh/parsers/javascripts.rb +67 -0
data/lib/ruhoh/parsers/layouts.rb +6 -10
data/lib/ruhoh/parsers/pages.rb +17 -24
data/lib/ruhoh/parsers/partials.rb +6 -14
data/lib/ruhoh/parsers/payload.rb +47 -0
data/lib/ruhoh/parsers/posts.rb +27 -29
data/lib/ruhoh/parsers/site.rb +2 -2
data/lib/ruhoh/parsers/stylesheets.rb +75 -0
data/lib/ruhoh/parsers/widgets.rb +104 -0
data/lib/ruhoh/paths.rb +75 -0
data/lib/ruhoh/previewer.rb +11 -5
data/lib/ruhoh/program.rb +35 -4
data/lib/ruhoh/templaters/asset_helpers.rb +66 -0
data/lib/ruhoh/templaters/base_helpers.rb +143 -0
data/lib/ruhoh/templaters/helpers.rb +1 -148
data/lib/ruhoh/templaters/rmustache.rb +45 -4
data/lib/ruhoh/urls.rb +46 -0
data/lib/ruhoh/utils.rb +59 -17
data/lib/ruhoh/version.rb +2 -2
data/lib/ruhoh/watch.rb +26 -14
data/lib/ruhoh.rb +38 -96
data/ruhoh.gemspec +29 -10
data/scaffolds/draft.html +9 -0
data/scaffolds/page.html +0 -2
data/scaffolds/post.html +0 -4
data/scaffolds/theme/{images → javascripts}/.gitkeep +0 -0
data/scaffolds/theme/layouts/default.html +2 -4
data/scaffolds/theme/layouts/page.html +1 -1
data/scaffolds/theme/layouts/post.html +1 -1
data/scaffolds/theme/{css/style.css → media/.gitkeep} +0 -0
data/scaffolds/theme/stylesheets/style.css +0 -0
data/scaffolds/theme/theme.yml +27 -0
data/scaffolds/theme/widgets/.gitkeep +0 -0
data/spec/config_spec.rb +50 -0
data/spec/db_spec.rb +28 -14
data/spec/page_spec.rb +24 -35
data/spec/parsers/layouts_spec.rb +5 -13
data/spec/parsers/pages_spec.rb +13 -11
data/spec/parsers/posts_spec.rb +34 -29
data/spec/parsers/routes_spec.rb +2 -1
data/spec/parsers/site_spec.rb +6 -5
data/spec/setup_spec.rb +3 -47
data/widgets/analytics/config.yml +5 -0
data/{system_partials/analytics/getclicky → widgets/analytics/layouts/getclicky.html} +2 -2
data/{system_partials/analytics/google → widgets/analytics/layouts/google.html} +1 -1
data/widgets/comments/config.yml +12 -0
data/{system_partials/comments/disqus → widgets/comments/layouts/disqus.html} +2 -2
data/{system_partials/comments/facebook → widgets/comments/layouts/facebook.html} +1 -1
data/{system_partials/comments/intensedebate → widgets/comments/layouts/intensedebate.html} +1 -1
data/{system_partials/comments/livefyre → widgets/comments/layouts/livefyre.html} +1 -1
data/widgets/google_prettify/config.yml +1 -0
data/widgets/google_prettify/layouts/google_prettify.html +10 -0
metadata +54 -31
data/lib/ruhoh/templaters/base.rb +0 -57
data/system_partials/syntax/google_prettify +0 -11

data/Gemfile CHANGED Viewed

@@ -5,6 +5,7 @@ gem 'rack', "~> 1.4"
 gem 'directory_watcher', "~> 1.4"
 gem 'psych', "~> 1.3"
 gem 'redcarpet', "~> 2.1"
+gem 'nokogiri', "~> 1.5"
 group :development do
   gem 'rspec'

data/README.md CHANGED Viewed

@@ -7,36 +7,3 @@
     $ gem install ruhoh
     $ ruhoh help
-- setup
-- database
-- page
-  - templater
-  - converter
-- preview
-- compiler
-### Plugins
-1. Mustache method additions
-   Extend the templating language
-   * Mounted onto the page object
-2. Add additional converter support (textile)
-  * Mounted onto the page object
-3. Generators ? compose extra pages?
-  I'm leaning toward why? any page should be able to be made
-  by calling a custom mustache method within a given textfile.
-  Jekyll's relevant example is to create mass-pages per each category.
-  Generating extra pages can be mounted onto the compiler

data/dash.html CHANGED Viewed

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+  <meta charset="utf-8">
   <style type="text/css">
     /*!
      * Bootstrap v2.0.2

data/history.json CHANGED Viewed

@@ -1,4 +1,33 @@
 [
+  {
+    "version" : "1.0.0.alpha",
+    "date" : "05.06.2012",
+    "changes" : [
+      "Converters now take in (content, id), rather than page object: (page).",
+      "Client now has both post and draft generation. Optionally can pass in a title.",
+      "Change config format for pages and posts; now must be namespaced respectively.",
+      "Major changes to theme directory API",
+      "Re-implement how internal config, path, and url parameters are generated and accessed.",
+      "Payload object 'paths' is now 'urls' and namespaced with theme_* for consistency",
+      "Master and sub layout templating is now handled entirely by mustache.",
+      "Add nokogiri as dependency"
+    ],
+    "features" : [
+      "YAML meta-data is now optional",
+      "Provide default, global layout attribute for post/page",
+      "Add summary and posts_latest helper methods",
+      "Add widget system",
+      "Add stylesheets asset manager",
+      "Add javascripts asset manager",
+      "Add RSS compiler",
+      "Add ability to run previewer in production mode",
+      "Make post filename available to permalink"
+    ],
+    "bugs" : [
+      "Fix permalinks and titlelize methods to support international characters",
+      "Transform all extensions registered in a convertable module to .html"
+    ]
+  },
   {
     "version" : "0.3.0",
     "date" : "13.5.2012",

data/lib/ruhoh/client/client.rb CHANGED Viewed

@@ -3,7 +3,7 @@ require 'ruhoh/compiler'
 class Ruhoh
   class Client
-    Paths = Struct.new(:page_template, :post_template, :layout_template, :theme_template)
+    Paths = Struct.new(:page_template, :draft_template, :post_template, :layout_template, :theme_template)
     BlogScaffold = 'git://github.com/ruhoh/blog.git'
     def initialize(data)
@@ -17,7 +17,7 @@ class Ruhoh
         exit
       } unless self.respond_to?(cmd)
-      Ruhoh.setup unless ['help','blog'].include?(cmd)
+      Ruhoh.setup unless ['help','blog','compile'].include?(cmd)
       self.__send__(cmd)
     end
@@ -32,6 +32,7 @@ class Ruhoh
     def setup_paths
       @paths = Paths.new
       @paths.page_template    = File.join(Ruhoh::Root, "scaffolds", "page.html")
+      @paths.draft_template   = File.join(Ruhoh::Root, "scaffolds", "draft.html")
       @paths.post_template    = File.join(Ruhoh::Root, "scaffolds", "post.html")
       @paths.layout_template  = File.join(Ruhoh::Root, "scaffolds", "layout.html")
       @paths.theme_template   = File.join(Ruhoh::Root, "scaffolds", "theme")
@@ -40,7 +41,7 @@ class Ruhoh
     # Internal: Show Client Utility help documentation.
     def help
       file = File.join(Ruhoh::Root, 'lib', 'ruhoh', 'client', 'help.yml')
-      content = Ruhoh::Utils.parse_file_as_yaml(file)
+      content = Ruhoh::Utils.parse_yaml_file(file)
       options = @opt_parser.help
       Ruhoh::Friend.say {
         plain content['description']
@@ -56,27 +57,35 @@ class Ruhoh
       }
     end
-    # Public: Create a new draft file.
-    # Requires no settings as it is meant to be fastest way to create content.
     def draft
+      self.draft_or_post(:draft)
+    end
+    def post
+      self.draft_or_post(:post)
+    end
+    def draft_or_post(type)
       begin
-        filename = File.join(Ruhoh.paths.posts, "untitled-#{@iterator}.#{@options.ext}")
+        name = @args[1] || "untitled-#{type}"
+        name = "#{name}-#{@iterator}" unless @iterator.zero?
+        name = Ruhoh::Urls.to_slug(name)
+        filename = File.join(Ruhoh.paths.posts, "#{name}.#{@options.ext}")
         @iterator += 1
       end while File.exist?(filename)
       FileUtils.mkdir_p File.dirname(filename)
-      output = File.open(@paths.post_template) { |f| f.read }
+      output = File.open(@paths.send("#{type}_template"), 'r:UTF-8') { |f| f.read }
       output = output.gsub('{{DATE}}', Ruhoh::Parsers::Posts.formatted_date(Time.now))
-      File.open(filename, 'w') {|f| f.puts output }
+      File.open(filename, 'w:UTF-8') {|f| f.puts output }
       Ruhoh::Friend.say {
-        green "New draft:"
-        green Ruhoh.relative_path(filename)
+        green "New #{type}:"
+        green Ruhoh::Utils.relative_path(filename)
         green 'View drafts at the URL: /dash'
       }
     end
-    alias_method :post, :draft
     # Public: Create a new page file.
     def page
@@ -94,15 +103,15 @@ class Ruhoh
       end
       FileUtils.mkdir_p File.dirname(filename)
-      File.open(@paths.page_template) do |template|
-        File.open(filename, 'w') do |page|
+      File.open(@paths.page_template, 'r:UTF-8') do |template|
+        File.open(filename, 'w:UTF-8') do |page|
           page.puts template.read
         end
       end
       Ruhoh::Friend.say {
         green "New page:"
-        plain Ruhoh.relative_path(filename)
+        plain Ruhoh::Utils.relative_path(filename)
       }
     end
@@ -110,9 +119,9 @@ class Ruhoh
     def titleize
        Ruhoh::Parsers::Posts.files.each do |file|
           next unless File.basename(file) =~ /^untitled/
-          parsed_page = Ruhoh::Utils.parse_file(file)
+          parsed_page = Ruhoh::Utils.parse_page_file(file)
           next unless parsed_page['data']['title']
-          new_name = Ruhoh::Parsers::Posts.to_slug(parsed_page['data']['title'])
+          new_name = Ruhoh::Urls.to_slug(parsed_page['data']['title'])
           new_file = File.join(File.dirname(file), "#{new_name}#{File.extname(file)}")
           FileUtils.mv(file, new_file)
           Ruhoh::Friend.say { green "Renamed #{file} to: #{new_file}" }
@@ -121,8 +130,7 @@ class Ruhoh
     # Public: Compile to static website.
     def compile
-      Ruhoh::DB.update_all
-      Ruhoh::Compiler.compile(@args[1])
+      Ruhoh::Program.compile(@args[1])
     end
     # Public: Create a new blog at the directory provided.
@@ -191,21 +199,21 @@ class Ruhoh
         exit
       } if name.nil?
-      filename = File.join(Ruhoh.paths.layouts, name.gsub(/\s/, '-').downcase) + ".html"
+      filename = File.join(Ruhoh.paths.theme_layouts, name.gsub(/\s/, '-').downcase) + ".html"
       if File.exist?(filename)
         abort("Create new layout: aborted!") if ask("#{filename} already exists. Do you want to overwrite?", ['y', 'n']) == 'n'
       end
       FileUtils.mkdir_p File.dirname(filename)
       File.open(@paths.layout_template) do |template|
-        File.open(filename, 'w') do |page|
+        File.open(filename, 'w:UTF-8') do |page|
           page.puts template.read
         end
       end
       Ruhoh::Friend.say {
         green "New layout:"
-        plain Ruhoh.relative_path(filename)
+        plain Ruhoh::Utils.relative_path(filename)
       }
     end
@@ -229,7 +237,7 @@ class Ruhoh
       require 'pp'
       Ruhoh::DB.update_all
       Ruhoh::Friend.say {
-        plain Ruhoh::Templaters::Base.build_payload.pretty_inspect
+        plain Ruhoh::DB.payload.pretty_inspect
       }
     end

data/lib/ruhoh/client/help.yml CHANGED Viewed

@@ -15,9 +15,13 @@ commands:
     "desc" : |
       Compile to static website.
   -
-    "command" : "post | draft"
+    "command" : "draft <title>"
     "desc" : |
-      Create a new draft.
+      Create a new draft. Post title is optional.
+  -
+    "command" : "post <title>"
+    "desc" : |
+      Create a new post. Post title is optional.
   -
     "command" : "page <path>"
     "desc" : |

data/lib/ruhoh/compiler.rb CHANGED Viewed

@@ -1,11 +1,13 @@
+require 'ruhoh/compilers/theme'
+require 'ruhoh/compilers/rss'
 class Ruhoh
   module Compiler
     # TODO: seems rather dangerous to delete the incoming target directory?
     def self.compile(target_directory = nil, page = nil)
-      Ruhoh.config.env ||= 'production'
       Ruhoh::Friend.say { plain "Compiling for environment: '#{Ruhoh.config.env}'" }
-      target = target_directory || "./#{Ruhoh.folders.compiled}"
+      target = target_directory || "./#{Ruhoh.names.compiled}"
       page = page || Ruhoh::Page.new
       FileUtils.rm_r target if File.exist?(target)
@@ -23,9 +25,7 @@ class Ruhoh
       def self.run(target, page)
         self.pages(target, page)
-        self.theme(target, page)
         self.media(target, page)
-        self.syntax(target, page)
       end
       def self.pages(target, page)
@@ -40,24 +40,12 @@ class Ruhoh
           end
         }
       end
-      def self.theme(target, page)
-        return unless FileTest.directory? Ruhoh.paths.theme
-        FileUtils.mkdir_p File.join(target, Ruhoh.config.theme_path)
-        FileUtils.cp_r Ruhoh.paths.theme, File.join(target, Ruhoh.folders.templates, Ruhoh.folders.themes)
-      end
       def self.media(target, page)
         return unless FileTest.directory? Ruhoh.paths.media
-        FileUtils.mkdir_p File.join(target, Ruhoh.folders.media)
-        FileUtils.cp_r Ruhoh.paths.media, target
-      end
-      def self.syntax(target, page)
-        return unless FileTest.directory? Ruhoh.paths.syntax
-        syntax_path = File.join(target, Ruhoh.folders.templates, Ruhoh.folders.syntax)
-        FileUtils.mkdir_p syntax_path
-        FileUtils.cp_r "#{Ruhoh.paths.syntax}/.", syntax_path
+        media = Ruhoh::Utils.url_to_path(Ruhoh.urls.media, target)
+        FileUtils.mkdir_p media
+        FileUtils.cp_r File.join(Ruhoh.paths.media, '.'), media
       end
     end #Defaults

data/lib/ruhoh/compilers/rss.rb ADDED Viewed

@@ -0,0 +1,36 @@
+require 'nokogiri'
+class Ruhoh
+  module Compiler
+    # This rss compiler is provided by David Long
+    # http://www.davejlong.com/
+    # https://github.com/davejlong
+    # Thanks David!
+    module Rss
+      # TODO: This renders the page content even though we already need to
+      # render the content to save to disk. This will be a problem when
+      # posts numbers expand. Merge this in later.
+      def self.run(target, page)
+        feed = Nokogiri::XML::Builder.new do |xml|
+         xml.rss(:version => '2.0') {
+           xml.channel {
+             xml.title_ Ruhoh::DB.site['title']
+             xml.link_ Ruhoh::DB.site['config']['production_url']
+             xml.pubDate_ Time.now
+             Ruhoh::DB.posts['chronological'].each do |post_id|
+               post = Ruhoh::DB.posts['dictionary'][post_id]
+               page.change(post_id)
+               xml.item {
+                 xml.title_ post['title']
+                 xml.link "#{Ruhoh::DB.site['config']['production_url']}#{post['url']}"
+                 xml.pubDate_ post['date']
+                 xml.description_ (post['description'] ? post['description'] : page.render)
+               }
+             end
+           }
+         }
+        end
+        File.open(File.join(target, 'rss.xml'), 'w'){ |p| p.puts feed.to_xml }
+      end
+    end #Rss
+  end #Compiler
+end #Ruhoh

data/lib/ruhoh/compilers/theme.rb ADDED Viewed

@@ -0,0 +1,41 @@
+class Ruhoh
+  module Compiler
+    module Theme
+      def self.run(target, page)
+        self.stylesheets(target, page)
+        self.javascripts(target, page)
+        self.media(target, page)
+      end
+      def self.stylesheets(target, page)
+        Ruhoh::DB.stylesheets.each do |type, assets|
+          assets.each do |asset|
+            next unless File.exist?(asset['id'])
+            file_path = Ruhoh::Utils.url_to_path(File.dirname(asset['url']), target)
+            FileUtils.mkdir_p file_path
+            FileUtils.cp(asset['id'], file_path)
+          end
+        end
+      end
+      def self.javascripts(target, page)
+        Ruhoh::DB.javascripts.each do |type, assets|
+          assets.each do |asset|
+            next unless File.exist?(asset['id'])
+            file_path = Ruhoh::Utils.url_to_path(File.dirname(asset['url']), target)
+            FileUtils.mkdir_p file_path
+            FileUtils.cp(asset['id'], file_path)
+          end
+        end
+      end
+      def self.media(target, page)
+        return unless FileTest.directory? Ruhoh.paths.theme_media
+        theme_media = Ruhoh::Utils.url_to_path(Ruhoh.urls.theme_media, target)
+        FileUtils.mkdir_p theme_media
+        FileUtils.cp_r File.join(Ruhoh.paths.theme_media, '.'), theme_media
+      end
+    end #Theme
+  end #Compiler
+end #Ruhoh

data/lib/ruhoh/config.rb ADDED Viewed

@@ -0,0 +1,49 @@
+class Ruhoh
+  # Structured container for global configuration parameters.
+  module Config
+    Config = Struct.new(
+      :env,
+      :pages_exclude,
+      :pages_permalink,
+      :pages_layout,
+      :posts_exclude,
+      :posts_layout,
+      :posts_permalink,
+      :theme
+    )
+    def self.generate(path_to_config)
+      site_config = Ruhoh::Utils.parse_yaml_file(path_to_config)
+      unless site_config
+        Ruhoh.log.error("Empty site_config.\nEnsure ./#{Ruhoh.names.config_data} exists and contains valid YAML")
+        return false
+      end
+      theme = site_config['theme'] ? site_config['theme'].to_s.gsub(/\s/, '') : ''
+      if theme.empty?
+        Ruhoh.log.error("Theme not specified in #{Ruhoh.names.config_data}")
+        return false
+      end
+      config = Config.new
+      config.theme = theme
+      config.env = site_config['env'] || nil
+      config.posts_permalink = site_config['posts']['permalink'] rescue nil
+      config.posts_layout = site_config['posts']['layout'] rescue nil
+      config.posts_layout = 'post' if config.posts_layout.nil?
+      excluded_posts = site_config['posts']['exclude'] rescue nil
+      config.posts_exclude = Array(excluded_posts)
+      config.posts_exclude = config.posts_exclude.map {|node| Regexp.new(node) }
+      config.pages_permalink = site_config['pages']['permalink'] rescue nil
+      config.pages_layout = site_config['pages']['layout'] rescue nil
+      config.pages_layout = 'page' if config.pages_layout.nil?
+      excluded_pages = site_config['pages']['exclude'] rescue nil
+      config.pages_exclude = Array(excluded_pages)
+      config.pages_exclude = config.pages_exclude.map {|node| Regexp.new(node) }
+      config
+    end
+  end #Config
+end #Ruhoh

data/lib/ruhoh/converters/converter.rb CHANGED Viewed

@@ -1,18 +1,31 @@
+require 'ruhoh/converters/markdown'
 class Ruhoh
   module Converter
-    def self.convert(page)
-      extension = File.extname(page.data['id']).downcase
+    def self.convert(content, id)
+      extension = File.extname(id).downcase
       Ruhoh::Converter.constants.each {|c|
         converter = Ruhoh::Converter.const_get(c)
         next unless converter.respond_to?(:convert)
         next unless converter.respond_to?(:extensions)
         next unless Array(converter.extensions).include?(extension)
-        return converter.convert(page)
+        return converter.convert(content)
       }
-      page.content
+      content
+    end
+    # Return an Array of all regestered extensions
+    def self.extensions
+      collection = []
+      Ruhoh::Converter.constants.each {|c|
+        converter = Ruhoh::Converter.const_get(c)
+        next unless converter.respond_to?(:extensions)
+        collection += Array(converter.extensions)
+      }
+      collection
     end
   end #Converter

data/lib/ruhoh/converters/markdown.rb CHANGED Viewed

@@ -6,13 +6,13 @@ class Ruhoh
         ['.md', '.markdown']
       end
-      def self.convert(page)
+      def self.convert(content)
         require 'redcarpet'
         markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML.new(:with_toc_data => true),
           :autolink => true,
           :fenced_code_blocks => true,
         )
-        markdown.render(page.content)
+        markdown.render(content)
       end
     end
   end

data/lib/ruhoh/db.rb CHANGED Viewed

@@ -1,8 +1,20 @@
+require 'ruhoh/parsers/posts'
+require 'ruhoh/parsers/pages'
+require 'ruhoh/parsers/routes'
+require 'ruhoh/parsers/layouts'
+require 'ruhoh/parsers/partials'
+require 'ruhoh/parsers/widgets'
+require 'ruhoh/parsers/stylesheets'
+require 'ruhoh/parsers/javascripts'
+require 'ruhoh/parsers/payload'
+require 'ruhoh/parsers/site'
 class Ruhoh
   # Public: Database class for interacting with "data" in Ruhoh.
   class DB
+    WhiteList = [:site, :posts, :pages, :routes, :layouts, :partials, :widgets, :stylesheets, :javascripts, :payload]
     class << self
-      WhiteList = [:site, :posts, :pages, :routes, :layouts, :partials]
       self.__send__ :attr_reader, *WhiteList
       def update(name)
@@ -20,19 +32,34 @@ class Ruhoh
             Ruhoh::Parsers::Layouts.generate
           when :partials
             Ruhoh::Parsers::Partials.generate
+          when :widgets
+            Ruhoh::Parsers::Widgets.generate
+          when :stylesheets
+            Ruhoh::Parsers::Stylesheets.generate
+          when :javascripts
+            Ruhoh::Parsers::Javascripts.generate
+          when :payload
+            Ruhoh::Parsers::Payload.generate
           else
             raise "Data type: '#{name}' is not a valid data type."
           end
         )
       end
+      # Always regenerate a fresh payload since it
+      # references other generated data.
+      def payload
+        self.update(:payload)
+        @payload
+      end
       def all_pages
         self.posts['dictionary'].merge(self.pages)
       end
       def update_all
         WhiteList.each do |var|
-          self.__send__ :update, var
+          self.__send__(:update, var)
         end
       end

data/lib/ruhoh/deployers/s3.rb CHANGED Viewed

@@ -9,7 +9,7 @@ class Ruhoh
     class AmazonS3 < AWS::S3::S3Object
       def initialize
-        credentials = Ruhoh::Utils.parse_file_as_yaml(Ruhoh.paths.site_source, "_deploy.yml")['s3']
+        credentials = Ruhoh::Utils.parse_yaml_file(Ruhoh.paths.base, "_deploy.yml")['s3']
         self.connect(credentials)
         self.ensure_bucket(credentials["bucket"])
         #set_current_bucket_to(credentials["bucket"])

data/lib/ruhoh/logger.rb CHANGED Viewed

@@ -26,7 +26,7 @@ class Ruhoh
     def to_file
       return unless self.log_file && @buffer.size > 0
-      File.open(self.log_file, "a") { |f|
+      File.open(self.log_file, 'a:UTF-8') { |f|
         f.puts '---'
         f.puts Time.now.utc
         f.puts @buffer.slice!(0..-1).join

data/lib/ruhoh/page.rb CHANGED Viewed

@@ -1,21 +1,20 @@
 class Ruhoh
   class Page
-    attr_reader :id, :data, :content, :sub_layout, :master_layout
-    attr_accessor :templater, :converter
+    attr_reader :id, :data, :sub_layout, :master_layout
+    attr_accessor :templater
     def initialize
-      @templater = Ruhoh::Templaters::Base
-      @converter = Ruhoh::Converter
+      @templater = Ruhoh::Templaters::RMustache
     end
     # Public: Change this page using an id.
     def change(id)
       self.reset
       @path = id
-      @data = if id =~ Regexp.new("^#{Ruhoh.folders.posts}")
+      @data = if id =~ Regexp.new("^#{Ruhoh.names.posts}")
         Ruhoh::DB.posts['dictionary'][id]
       else
-        @path = "#{Ruhoh.folders.pages}/#{id}"
+        @path = "#{Ruhoh.names.pages}/#{id}"
         Ruhoh::DB.pages[id]
       end
@@ -26,8 +25,7 @@ class Ruhoh
     def render
       self.ensure_id
       self.process_layouts
-      self.process_content
-      @templater.render(self)
+      @templater.render(self.expand_layouts, self.payload)
     end
     def process_layouts
@@ -41,26 +39,44 @@ class Ruhoh
         @master_layout = Ruhoh::DB.layouts[@sub_layout['data']['layout']]
         raise "Layout does not exist: #{@sub_layout['data']['layout']}" unless @master_layout
       end
+      @data['sub_layout'] = @sub_layout['id'] rescue nil
+      @data['master_layout'] = @master_layout['id'] rescue nil
+      @data
     end
-    # We need to pre-process the content data
-    # in order to invoke converters on the result.
-    # Converters (markdown) always choke on the templating language.
-    def process_content
-      self.ensure_id
-      data = Ruhoh::Utils.parse_file(Ruhoh.paths.site_source, @path)
-      raise "Invalid Frontmatter in page: #{@path}" if data.empty?
+    # Expand the layout(s).
+    # Pages may have a single master_layout, a master_layout + sub_layout, or no layout.
+    def expand_layouts
+      if @sub_layout
+        layout = @sub_layout['content']
+        # If a master_layout is found we need to process the sub_layout
+        # into the master_layout using mustache.
+        if @master_layout && @master_layout['content']
+          payload = self.payload
+          payload['content'] = layout
+          layout = @templater.render(@master_layout['content'], payload)
+        end
+      else
+        # Minimum layout if no layout defined.
+        layout = '{{{content}}}'
+      end
-      @content = @templater.parse(data['content'], self)
-      @content = @converter.convert(self)
+      layout
     end
-    # Public: Return page attributes suitable for inclusion in the
-    # 'payload' of the given templater.
-    def attributes
+    def payload
       self.ensure_id
-      @data['content'] = @content
-      @data
+      payload = Ruhoh::DB.payload.dup
+      payload['page'] = @data
+      payload
+    end
+    # Provide access to the page content.
+    def content
+      self.ensure_id
+      Ruhoh::Utils.parse_page_file(Ruhoh.paths.base, @path)['content']
     end
     # Public: Formats the path to the compiled file based on the URL.