hriki/preprocess/basic_clean.rb @@ -71,14 +71,17 @@ module Hriki # Config.numbacklinks = b # end - opts.on("--srcdir SRCDIR", "The directory to draw from!") do |s| - Config.srcdir = s - end - - opts.on("--destdir DESTDIR", "The destination!") do |d| - Config.destdir = d - end - + opts.on("--srcdir SRCDIR", "The directory to draw from!") do |s| + Config.srcdir = s + end + + opts.on("--destdir DESTDIR", "The destination!") do |d| + Config.destdir = d + end + + opts.on("--preprocdir PROCDIR", "Where plugins are held") do |d| + Config.preprocdir = d + end # opts.on("--rcs RCS", [:git, :svn, :hg], "Set the RCS type to pull the wiki from") do |r| # Config.rcs = r # end @@ -147,9 +150,9 @@ module Hriki # Config.underlaydir = u # end -# opts.on("--plugin x,y,z", Array, "List of plugins to use") do |p| -# Config.plugin = p -# end + opts.on("--plugin x,y,z", Array, "List of plugins to use") do |p| + Config.plugin = p + end # opts.on("--disable-plugin x,y,z", Array, "List of plugns to not use") do |d| # Config.disable_plugin = d @@ -178,10 +181,11 @@ module Hriki def self.run Opts.parse(ARGV) - Config.srcdir = "~/code/test/hriki/src" - Config.destdir = "~/code/test/hriki/dest" + Config.srcdir = "~/code/hriki/test/src" + Config.destdir = "~/code/hriki/test/dest" Config.htmlext = ".html" Config.srcext = ".mdwn" + Config.plugin = ['basic_clean'] puts "Oh, this wont go well..." Render.all end hriki.rb @@ -80,6 +80,8 @@ module Hriki #:nodoc: @@destdir = "~/www" @@htmlext = ".html" @@srcext = ".mdwn" + @@preprocdir = "~/code/hriki/hriki/preprocess" + @@plugin = ['basic_clean'] # give them some getters and setters! class_variables.each { |v| mattr_accessor v[(2..-1)] } hriki/config.rb @@ -12,8 +12,8 @@ module Hriki Config.destdir, File.basename(path, Config.srcext) ) + Config.htmlext), "w") - preproc = Preprocess.new(File.read(path)) - mdwnsrc = Maruku.new(preproc).to_html + preproc = PreProcess.run_plugins(File.read(path)) + mdwnsrc = Maruku.new(preproc.to_s).to_html hengine = Haml::Engine.new(mdwnsrc) @destfile.write(hengine.to_html) end hriki/page.rb @@ -1,8 +1,48 @@ +require 'hriki/config' + module Hriki - class PreProcess - attr_accessor :src - def initialize str - @src = str + module PreProcess + module PluginSugar + def def_field(*names) + class_eval do + names.each do |name| + define_method(name) do |*args| + case args.size + when 0: instance_variable_get("@#{name}") + else instance_variable_set("@#{name}", *args) + end + end + end + end + end + end + + class Plugin + @registered_plugins = {} + + class << self + attr_reader :registered_plugins + private :new + end + + def self.define(name, &block) + p = new + p.instance_eval(&block) + Plugin.registered_plugins[name] = p + end + + extend PluginSugar + def_field :author, :version, :url + end + + def self.load_plugins + Dir["#{Config.preprocdir}/*.rb"].each { |p| load p } + end + + def self.run_plugins(str) + Plugin.registered_plugins.each { |k, p| + str = p.process(str) if Config.plugin.include(k) + } end end end hriki/preprocess.rb @@ -4,6 +4,7 @@ require 'find' require 'hriki/page' require 'hriki/config' +require 'hriki/preprocess' module Hriki class Render @@ -12,6 +13,7 @@ module Hriki # plug markdown into haml # markdown.to_html def self.all + PreProcess.load_plugins Find.find(File.expand_path(Config.srcdir)) do |path| if File.extname(path).downcase != Config.srcext puts "Skipping incorrect extenion: #{path}" hriki/render.rb hriki/.#preprocess.rb 716f3e98d2b7e05362a7323833f78b9ff21ce7c2 Jeff Mickey jeff@archlinux.org http://github.com/codemac/hriki/commit/dc26cc70d54cee167c83a3ccecb21298cc64728b dc26cc70d54cee167c83a3ccecb21298cc64728b 2008-06-13T15:37:28-07:00 2008-06-13T15:37:28-07:00 This surely doesn't work yet, but I'm getting somewhere. Signed-off-by: Jeff Mickey <jeff@archlinux.org> 51eb618905f582127b473a726e5fac6fa2d86981 Jeff Mickey jeff@archlinux.org