RubyGems - codex - Versions diffs - 1.0.2 → 1.1.0 - Mend

codex 1.0.2 → 1.1.0

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 (105) hide show

data/app_generators/codex/templates/readme.txt CHANGED

@@ -1,4 +1,4 @@
 Run 'rake all' to generate the sample presentation, which includes
-explanations about the syntax of the slides.
+explanations about the syntax.

data/app_generators/codex/templates/templates/layout.erb ADDED

@@ -0,0 +1,67 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title><%= @title %></title>
+<!-- metadata -->
+<meta name="generator" content="S5" />
+<meta name="version" content="S5 1.1" />
+<meta name="presdate" content="<%= @date %>" />
+<meta name="author" content="<%= @author %>" />
+<meta name="company" content="<%= @company %>" />
+<!-- configuration parameters -->
+<meta name="defaultView" content="slideshow" />
+<meta name="controlVis" content="hidden" />
+<!-- style sheet links -->
+<link rel="stylesheet" href="../assets/ui/default/slides.css" type="text/css" media="projection" id="slideProj" />
+<link rel="stylesheet" href="../assets/ui/default/outline.css" type="text/css" media="screen" id="outlineStyle" />
+<link rel="stylesheet" href="../assets/stylesheets/print.css" type="text/css" media="print" id="slidePrint" />
+<link rel="stylesheet" href="../assets/ui/default/opera.css" type="text/css" media="projection" id="operaFix" />
+<link rel="stylesheet" href="../assets/stylesheets/pressie.css" type="text/css" />
+<!-- S5 JS -->
+<script src="../assets/ui/default/slides.js" type="text/javascript"></script>
+<!-- Syntax Highlighter -->
+<link rel="stylesheet"  href="../assets/dp.SyntaxHighlighter/Styles/SyntaxHighlighter.css"></link>
+</head>
+<body>
+<div class="layout">
+<div id="controls"><!-- DO NOT EDIT --></div>
+<div id="currentSlide"><!-- DO NOT EDIT --></div>
+<div id="header"></div>
+<div id="footer">
+<h2>Copyright © <%= @copyright %></h2>
+</div>
+</div>
+<div class="presentation">
+  <%= content %>
+</div>
+<!-- Syntax Highlighter -->
+<script class="javascript" src="../assets/dp.SyntaxHighlighter/Scripts/shCore.js"></script>
+<script class="javascript" src="../assets/dp.SyntaxHighlighter/Scripts/shBrushCSharp.js"></script>
+<script class="javascript" src="../assets/dp.SyntaxHighlighter/Scripts/shBrushPhp.js"></script>
+<script class="javascript" src="../assets/dp.SyntaxHighlighter/Scripts/shBrushJScript.js"></script>
+<script class="javascript" src="../assets/dp.SyntaxHighlighter/Scripts/shBrushJava.js"></script>
+<script class="javascript" src="../assets/dp.SyntaxHighlighter/Scripts/shBrushVb.js"></script>
+<script class="javascript" src="../assets/dp.SyntaxHighlighter/Scripts/shBrushSql.js"></script>
+<script class="javascript" src="../assets/dp.SyntaxHighlighter/Scripts/shBrushXml.js"></script>
+<script class="javascript" src="../assets/dp.SyntaxHighlighter/Scripts/shBrushDelphi.js"></script>
+<script class="javascript" src="../assets/dp.SyntaxHighlighter/Scripts/shBrushPython.js"></script>
+<script class="javascript" src="../assets/dp.SyntaxHighlighter/Scripts/shBrushRuby.js"></script>
+<script class="javascript" src="../assets/dp.SyntaxHighlighter/Scripts/shBrushCss.js"></script>
+<script class="javascript" src="../assets/dp.SyntaxHighlighter/Scripts/shBrushCpp.js"></script>
+<script language="javascript">
+dp.SyntaxHighlighter.ClipboardSwf = '/flash/clipboard.swf';
+dp.SyntaxHighlighter.HighlightAll('code');
+</script>
+</body>
+</html>

data/bin/codex CHANGED

File without changes

data/codex.gemspec CHANGED

@@ -1,18 +1,18 @@
+# -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name = %q{codex}
-  s.version = "1.0.2"
-  s.specification_version = 2 if s.respond_to? :specification_version=
+  s.version = "1.1.0"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dave Thomas"]
-  s.date = %q{2008-05-19}
+  s.date = %q{2009-10-09}
   s.default_executable = %q{codex}
   s.description = %q{Simple tool for creating source-code intensive presentations and courses}
   s.email = ["dave@pragprog.com"]
   s.executables = ["codex"]
   s.extra_rdoc_files = ["History.txt", "LICENSE.txt", "Manifest.txt", "PostInstall.txt", "README.txt", "app_generators/codex/templates/readme.txt"]
-  s.files = ["History.txt", "LICENSE.txt", "Manifest.txt", "PostInstall.txt", "README.txt", "Rakefile", "app_generators/codex/USAGE", "app_generators/codex/codex_generator.rb", "app_generators/codex/templates/Rakefile", "app_generators/codex/templates/bin/build_all.rb", "app_generators/codex/templates/bin/postprocess_all.rb", "app_generators/codex/templates/bin/pressie.rb", "app_generators/codex/templates/code/control/basic_continuation.rb", "app_generators/codex/templates/code/control/cc_throw_catch.rb", "app_generators/codex/templates/code/control/closure_continuation.rb", "app_generators/codex/templates/code/control/closure_continuation_2.rb", "app_generators/codex/templates/dp.SyntaxHighlighter/CSS.html", "app_generators/codex/templates/dp.SyntaxHighlighter/CSharp.html", "app_generators/codex/templates/dp.SyntaxHighlighter/CollapseCode.html", "app_generators/codex/templates/dp.SyntaxHighlighter/Cpp.html", "app_generators/codex/templates/dp.SyntaxHighlighter/CrashTest.html", "app_generators/codex/templates/dp.SyntaxHighlighter/Delphi.html", "app_generators/codex/templates/dp.SyntaxHighlighter/FirstLine.html", "app_generators/codex/templates/dp.SyntaxHighlighter/Index.html", "app_generators/codex/templates/dp.SyntaxHighlighter/Java.html", "app_generators/codex/templates/dp.SyntaxHighlighter/JavaScript.html", "app_generators/codex/templates/dp.SyntaxHighlighter/NoControls.html", "app_generators/codex/templates/dp.SyntaxHighlighter/NoGutter.html", "app_generators/codex/templates/dp.SyntaxHighlighter/PHP.html", "app_generators/codex/templates/dp.SyntaxHighlighter/Python.html", "app_generators/codex/templates/dp.SyntaxHighlighter/Ruby.html", "app_generators/codex/templates/dp.SyntaxHighlighter/SQL.html", "app_generators/codex/templates/dp.SyntaxHighlighter/Scripts/clipboard.swf", "app_generators/codex/templates/dp.SyntaxHighlighter/Scripts/shBrushCSharp.js", "app_generators/codex/templates/dp.SyntaxHighlighter/Scripts/shBrushCpp.js", "app_generators/codex/templates/dp.SyntaxHighlighter/Scripts/shBrushCss.js", "app_generators/codex/templates/dp.SyntaxHighlighter/Scripts/shBrushDelphi.js", "app_generators/codex/templates/dp.SyntaxHighlighter/Scripts/shBrushJScript.js", "app_generators/codex/templates/dp.SyntaxHighlighter/Scripts/shBrushJava.js", "app_generators/codex/templates/dp.SyntaxHighlighter/Scripts/shBrushPhp.js", "app_generators/codex/templates/dp.SyntaxHighlighter/Scripts/shBrushPython.js", "app_generators/codex/templates/dp.SyntaxHighlighter/Scripts/shBrushRuby.js", "app_generators/codex/templates/dp.SyntaxHighlighter/Scripts/shBrushSql.js", "app_generators/codex/templates/dp.SyntaxHighlighter/Scripts/shBrushVb.js", "app_generators/codex/templates/dp.SyntaxHighlighter/Scripts/shBrushXml.js", "app_generators/codex/templates/dp.SyntaxHighlighter/Scripts/shCore.js", "app_generators/codex/templates/dp.SyntaxHighlighter/Scripts/shCore.uncompressed.js", "app_generators/codex/templates/dp.SyntaxHighlighter/ShowColumns.html", "app_generators/codex/templates/dp.SyntaxHighlighter/SmartTabs.html", "app_generators/codex/templates/dp.SyntaxHighlighter/Styles/SyntaxHighlighter.css", "app_generators/codex/templates/dp.SyntaxHighlighter/Styles/TestPages.css", "app_generators/codex/templates/dp.SyntaxHighlighter/Templates/Test.dwt", "app_generators/codex/templates/dp.SyntaxHighlighter/VB.html", "app_generators/codex/templates/dp.SyntaxHighlighter/XML.html", "app_generators/codex/templates/html/all.html", "app_generators/codex/templates/readme.txt", "app_generators/codex/templates/slides/basics.slides", "app_generators/codex/templates/slides/building.slides", "app_generators/codex/templates/slides/example.slides", "app_generators/codex/templates/slides/including_code.slides", "app_generators/codex/templates/slides/metadata.yml", "app_generators/codex/templates/slides/table_of_contents.slides", "app_generators/codex/templates/ui/default/blank.gif", "app_generators/codex/templates/ui/default/bodybg.gif", "app_generators/codex/templates/ui/default/framing.css", "app_generators/codex/templates/ui/default/iepngfix.htc", "app_generators/codex/templates/ui/default/opera.css", "app_generators/codex/templates/ui/default/outline.css", "app_generators/codex/templates/ui/default/pretty.css", "app_generators/codex/templates/ui/default/print.css", "app_generators/codex/templates/ui/default/s5-core.css", "app_generators/codex/templates/ui/default/slides.css", "app_generators/codex/templates/ui/default/slides.js", "bin/codex", "codex.gemspec", "config/hoe.rb", "config/requirements.rb", "lib/codex.rb", "lib/codex/content.rb", "lib/codex/pressie.rb", "lib/codex/version.rb", "lib/stylesheets/pressie.css", "lib/stylesheets/print.css", "lib/stylesheets/ruby.png", "script/console", "script/destroy", "script/generate", "setup.rb", "tasks/deployment.rake", "tasks/environment.rake", "tasks/website.rake", "test/test_codex.rb", "test/test_codex_generator.rb", "test/test_generator_helper.rb", "test/test_helper.rb"]
+  s.files = ["History.txt", "LICENSE.txt", "Manifest.txt", "PostInstall.txt", "README.txt", "Rakefile", "app_generators/codex/USAGE", "app_generators/codex/codex_generator.rb", "app_generators/codex/templates/Rakefile", "app_generators/codex/templates/assets/dp.SyntaxHighlighter/CSS.html", "app_generators/codex/templates/assets/dp.SyntaxHighlighter/CSharp.html", "app_generators/codex/templates/assets/dp.SyntaxHighlighter/CollapseCode.html", "app_generators/codex/templates/assets/dp.SyntaxHighlighter/Cpp.html", "app_generators/codex/templates/assets/dp.SyntaxHighlighter/CrashTest.html", "app_generators/codex/templates/assets/dp.SyntaxHighlighter/Delphi.html", "app_generators/codex/templates/assets/dp.SyntaxHighlighter/FirstLine.html", "app_generators/codex/templates/assets/dp.SyntaxHighlighter/Index.html", "app_generators/codex/templates/assets/dp.SyntaxHighlighter/Java.html", "app_generators/codex/templates/assets/dp.SyntaxHighlighter/JavaScript.html", "app_generators/codex/templates/assets/dp.SyntaxHighlighter/NoControls.html", "app_generators/codex/templates/assets/dp.SyntaxHighlighter/NoGutter.html", "app_generators/codex/templates/assets/dp.SyntaxHighlighter/PHP.html", "app_generators/codex/templates/assets/dp.SyntaxHighlighter/Python.html", "app_generators/codex/templates/assets/dp.SyntaxHighlighter/Ruby.html", "app_generators/codex/templates/assets/dp.SyntaxHighlighter/SQL.html", "app_generators/codex/templates/assets/dp.SyntaxHighlighter/Scripts/clipboard.swf", "app_generators/codex/templates/assets/dp.SyntaxHighlighter/Scripts/shBrushCSharp.js", "app_generators/codex/templates/assets/dp.SyntaxHighlighter/Scripts/shBrushCpp.js", "app_generators/codex/templates/assets/dp.SyntaxHighlighter/Scripts/shBrushCss.js", "app_generators/codex/templates/assets/dp.SyntaxHighlighter/Scripts/shBrushDelphi.js", "app_generators/codex/templates/assets/dp.SyntaxHighlighter/Scripts/shBrushJScript.js", "app_generators/codex/templates/assets/dp.SyntaxHighlighter/Scripts/shBrushJava.js", "app_generators/codex/templates/assets/dp.SyntaxHighlighter/Scripts/shBrushPhp.js", "app_generators/codex/templates/assets/dp.SyntaxHighlighter/Scripts/shBrushPython.js", "app_generators/codex/templates/assets/dp.SyntaxHighlighter/Scripts/shBrushRuby.js", "app_generators/codex/templates/assets/dp.SyntaxHighlighter/Scripts/shBrushSql.js", "app_generators/codex/templates/assets/dp.SyntaxHighlighter/Scripts/shBrushVb.js", "app_generators/codex/templates/assets/dp.SyntaxHighlighter/Scripts/shBrushXml.js", "app_generators/codex/templates/assets/dp.SyntaxHighlighter/Scripts/shCore.js", "app_generators/codex/templates/assets/dp.SyntaxHighlighter/Scripts/shCore.uncompressed.js", "app_generators/codex/templates/assets/dp.SyntaxHighlighter/ShowColumns.html", "app_generators/codex/templates/assets/dp.SyntaxHighlighter/SmartTabs.html", "app_generators/codex/templates/assets/dp.SyntaxHighlighter/Styles/SyntaxHighlighter.css", "app_generators/codex/templates/assets/dp.SyntaxHighlighter/Styles/TestPages.css", "app_generators/codex/templates/assets/dp.SyntaxHighlighter/Templates/Test.dwt", "app_generators/codex/templates/assets/dp.SyntaxHighlighter/VB.html", "app_generators/codex/templates/assets/dp.SyntaxHighlighter/XML.html", "app_generators/codex/templates/assets/stylesheets/pressie.css", "app_generators/codex/templates/assets/stylesheets/print.css", "app_generators/codex/templates/assets/stylesheets/ruby.png", "app_generators/codex/templates/assets/ui/default/blank.gif", "app_generators/codex/templates/assets/ui/default/bodybg.gif", "app_generators/codex/templates/assets/ui/default/framing.css", "app_generators/codex/templates/assets/ui/default/iepngfix.htc", "app_generators/codex/templates/assets/ui/default/opera.css", "app_generators/codex/templates/assets/ui/default/outline.css", "app_generators/codex/templates/assets/ui/default/pretty.css", "app_generators/codex/templates/assets/ui/default/print.css", "app_generators/codex/templates/assets/ui/default/s5-core.css", "app_generators/codex/templates/assets/ui/default/slides.css", "app_generators/codex/templates/assets/ui/default/slides.js", "app_generators/codex/templates/bin/build_all.rb", "app_generators/codex/templates/code/control/basic_continuation.rb", "app_generators/codex/templates/code/control/cc_throw_catch.rb", "app_generators/codex/templates/code/control/closure_continuation.rb", "app_generators/codex/templates/code/control/closure_continuation_2.rb", "app_generators/codex/templates/code/graphviz/graph.dot", "app_generators/codex/templates/config/metadata.yml", "app_generators/codex/templates/content/basics.textile", "app_generators/codex/templates/content/building.textile", "app_generators/codex/templates/content/example.textile", "app_generators/codex/templates/content/graphviz.textile", "app_generators/codex/templates/content/including_code.textile", "app_generators/codex/templates/content/including_tex.textile", "app_generators/codex/templates/content/table_of_contents.textile", "app_generators/codex/templates/content/user_defined.textile", "app_generators/codex/templates/filters/example_filter.rb", "app_generators/codex/templates/html/all.html", "app_generators/codex/templates/post_processors/change_code_urls.rb", "app_generators/codex/templates/post_processors/upcase_titles.rb", "app_generators/codex/templates/readme.txt", "app_generators/codex/templates/templates/layout.erb", "bin/codex", "codex.gemspec", "config/hoe.rb", "config/requirements.rb", "lib/codex.rb", "lib/codex/content.rb", "lib/codex/filter.rb", "lib/codex/filters/code_filter.rb", "lib/codex/filters/graphviz_filter.rb", "lib/codex/filters/ritex_filter.rb", "lib/codex/post_processor.rb", "lib/codex/post_processors/01_slides_processor.rb", "lib/codex/post_processors/02_add_title_slides.rb", "lib/codex/pressie.rb", "lib/codex/rake/codextask.rb", "lib/codex/template_handler.rb", "lib/codex/version.rb", "script/console", "script/destroy", "script/generate", "setup.rb", "tasks/deployment.rake", "tasks/environment.rake", "tasks/website.rake", "test/codex/post_processor/test_add_title_slides_processor.rb", "test/codex/post_processor/test_post_processors.rb", "test/codex/post_processor/test_slides_processor.rb", "test/codex/rake/test_codextask.rb", "test/codex/test_pressie.rb", "test/codex/test_template_handler.rb", "test/test_codex_generator.rb", "test/test_filter.rb", "test/test_helper.rb"]
   s.has_rdoc = true
   s.homepage = %q{http://codex.rubyforge.org}
   s.post_install_message = %q{
@@ -24,7 +24,20 @@ To create new presentations:
   s.rdoc_options = ["--main", "README.txt"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{codex}
-  s.rubygems_version = %q{1.1.1}
+  s.rubygems_version = %q{1.3.1}
   s.summary = %q{Simple tool for creating source-code intensive presentations and courses}
-  s.test_files = ["test/test_codex.rb", "test/test_codex_generator.rb", "test/test_generator_helper.rb", "test/test_helper.rb"]
+  s.test_files = ["test/codex/post_processor/test_add_title_slides_processor.rb", "test/codex/post_processor/test_post_processors.rb", "test/codex/post_processor/test_slides_processor.rb", "test/codex/rake/test_codextask.rb", "test/codex/test_pressie.rb", "test/codex/test_template_handler.rb", "test/test_codex_generator.rb", "test/test_filter.rb", "test/test_helper.rb"]
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<hoe>, [">= 2.3.3"])
+    else
+      s.add_dependency(%q<hoe>, [">= 2.3.3"])
+    end
+  else
+    s.add_dependency(%q<hoe>, [">= 2.3.3"])
+  end
 end

data/config/hoe.rb CHANGED

@@ -10,6 +10,7 @@ DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
 EXTRA_DEPENDENCIES = [
  ['rake', '>= 0.8.1'],
  ['RedCloth', '>= 3.0.4'],
+ ['ritex', '>= 0.1'],
  ['rubigen', '>=1.3.2']
 ]    # An array of rubygem dependencies [name, version]
@@ -72,4 +73,4 @@ CHANGES = $hoe.paragraphs_of('History.txt', 0..1).join("\\n\\n")
 PATH    = (RUBYFORGE_PROJECT == GEM_NAME) ? RUBYFORGE_PROJECT : "#{RUBYFORGE_PROJECT}/#{GEM_NAME}"
 $hoe.remote_rdoc_dir = File.join(PATH.gsub(/^#{RUBYFORGE_PROJECT}\/?/,''), 'rdoc')
 $hoe.rsync_args = '-av --delete --ignore-errors'
-$hoe.spec.post_install_message = File.open(File.dirname(__FILE__) + "/../PostInstall.txt").read rescue ""
+$hoe.spec.post_install_message = File.open(File.dirname(__FILE__) + "/../PostInstall.txt").read rescue ""

data/config/requirements.rb CHANGED

@@ -12,4 +12,4 @@ require 'rubygems'
   end
 end
-$:.unshift(File.join(File.dirname(__FILE__), %w[.. lib]))
+$:.unshift(File.join(File.dirname(__FILE__), %w[.. lib lib/filters]))

data/lib/codex.rb CHANGED

@@ -1,7 +1,19 @@
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+module Codex
+  class << self
+    # Where the codex slides are located
+    attr_accessor :root
+    # Where the codex libraries are located (it may be a gem or in vendor dir)
+    attr_accessor :lib_root
+  end
+end
-module Codex; end
+base_dir = File.dirname(__FILE__)
+$:.unshift(base_dir) unless
+  $:.include?(base_dir) || $:.include?(File.expand_path(base_dir))
+Codex.lib_root = base_dir
 require 'codex/content'
-require 'codex/pressie'
+require 'codex/pressie'
+require 'codex/filter'
+require 'codex/post_processor'
+require 'codex/template_handler'

data/lib/codex/content.rb CHANGED

@@ -2,159 +2,15 @@ require 'redcloth'
 class Codex::Content
-  # Wrap the parameters to :code
-  #
-  #  :code file.rb[:part class=xxx]
-  class Descriptor
-    attr_reader :file_name, :part
-    attr_reader :css_class
-    attr_reader :lang
-    def initialize(string)
-      @css_class = "code-normal"
-      @lang = "ruby"
-      if string && string =~ /(.*?)\[(.*)\]/
-        @file_name = $1
-        parse_params($2.dup)
-      else
-        @file_name = string
-      end
-    end
-    def parse_params(params)
-      params.split.each do |param|
-        if param =~ /(.*?)=(.*)/
-          case $1
-          when "class"
-            @css_class = $2
-          when "lang"
-            @lang = $2
-          else
-            fail "Unknown parameter #{$1} in '#{params}'"
-          end
-        else
-          @part = param
-        end
-      end
-    end
-  end
-  START_SLIDE = %{<div class="slide">\n}
-  END_SLIDE   = %{</div>\n}
-  BETWEEN_SLIDES = END_SLIDE + "\n" + START_SLIDE
-  CODE_PATTERN = /^:code\s+(.+)/
-  # Temporarily prepended to lines of incldued code to stop them being processed
-  # as Textfile
-  INCLUDED_CODE_PREFIX = "XXX\001"
-  INCLUDED_CODE_PREFIX_REGEXP = /#{INCLUDED_CODE_PREFIX}/mo
-  def initialize(original)
-    @original = original.sub(/__END__.*/m, '').gsub(/__SKIP__.*?__ENDSKIP__/m, '')
+  def initialize(filename)
+    @filename = filename
+    @original = File.read(@filename).sub(/__END__.*/m, '').gsub(/__SKIP__.*?__ENDSKIP__/m, '')
   end
   def to_html
-    textile = preprocess_inlinecode(@original)
-    textile = preprocess_code(textile)
-    content = split_into_slides(textile)
-    html = RedCloth.new(content).to_html
-    remove_code_escaping_from(html)
-  end
-  # look for :code filename[part] and substitute in the appropriate part
-  # of the given file. Do in two steps because the regexp engine isn;t reentrant
-  def preprocess_code(text)
-    chunks = {}
-    text.scan(CODE_PATTERN) do |file,|
-      desc = Descriptor.new(file)
-      chunks[file] = find_content_from(desc)
-    end
-    text.gsub(CODE_PATTERN) { file = $1.dup; format_code(Descriptor.new(file), chunks[file]) }
-  end
-  # Look for :inlinecode /.../:endinlinecode and substitute in as if it came from a file
-  def preprocess_inlinecode(text)
-    state = :copying
-    result = []
-    text.split(/\n/).each do |line|
-      case state
-      when :copying
-        if line =~ /^:inlinecode(.*)/
-          args = $1.strip
-          desc = Descriptor.new("--[#{args}]")
-          result << %{<div class="#{desc.css_class}">\n}
-          result << %{\n<pre name="code" class="#{desc.lang}:nogutter:nocontrols">\n}
-          state = :incode
-        else
-          result << line
-        end
-      when :incode
-        if line =~ /^:endinlinecode/
-          result << "</pre></div>\n\n"
-          state = :copying
-        else
-          result << INCLUDED_CODE_PREFIX + line
-        end
-      end
-    end
-    result.join("\n")
-  end
-  def split_into_slides(textile)
-    result = []
-    slides = textile.split(/^h1/).each do |slide|
-      unless slide.empty?
-        result << START_SLIDE << "\nh1" << slide << END_SLIDE
-      end
-    end
-    result.join
-  end
-  def find_content_from(desc)
-    begin
-      content = File.read(desc.file_name)
-    rescue   Exception => e
-      STDERR.puts e.message
-      exit 2
-    end
-   find_part_in(content, desc.part)
-  end
-  def find_part_in(content, part_name)
-    result = []
-    state = part_name ? :skipping : :normal
-    content.each_line do |line|
-      if line.sub!(/(START|END):(\w+)/, '')
-        if $2 == part_name
-          if $1 == "START"
-            state = :normal
-          else
-            state = :skipping
-          end
-        end
-        next
-      end
-      result << line unless state == :skipping
-    end
-    result.join
-  end
-  def format_code(desc, code)
-    code = code.gsub(/^/m, INCLUDED_CODE_PREFIX)
-    %{<div class="#{desc.css_class}">\n} +
-    %{\n<pre name="code" class="#{desc.lang}:nogutter:nocontrols">#{code}} +
-    %{</pre></div>} +
-    %{<div class="codeurl"><a href="txmt://open?url=file://#{File.expand_path(desc.file_name)}">#{desc.file_name}</a></div>\n\n}
-  end
-  def remove_code_escaping_from(html)
-    html.gsub(INCLUDED_CODE_PREFIX_REGEXP, '')
+    content = Codex::Filters.instance.filter_all(@original)
+    html = Codex::TemplateHandler.choose(@filename).call(content)
+    Codex::PostProcessors.instance.process_all(html)
   end
 end

data/lib/codex/filter.rb ADDED

@@ -0,0 +1,101 @@
+require 'singleton'
+module Codex
+  # Filter is an abstract class for user defined filters.
+  # It lets them declare the tag they wish to use.
+  # When declaring a tag, it also registers with Filters.
+  class Filter
+    attr_accessor :tag
+    def self.tag(tag)
+      @tag = tag
+      Filters.instance[tag] = self.new
+    end
+  end
+  # Filters contains a hash of all loaded filters. It does all parsing of the input file
+  # and send chunks to be filtered to the individual filters.
+  class Filters
+    include Singleton
+    attr_accessor :filter_file_tags, :filter_inline_tags, :filter_inline_end_tags, :log
+    def []=(idx,val)
+      @filters[idx] = val
+    end
+    def [](idx)
+      @filters[idx]
+    end
+    # Parse the input text and parse chunks over to filters when encountering tags
+    def filter_all(text)
+      state = :copying
+      result = []
+      tagged_lines = []
+      tag = args = nil
+      text.split(/\n/).each do |line|
+        case state
+        when :copying
+          if line =~ inline_tag
+            tag = $1
+            args = $2.strip
+            state = :inside_tag
+          elsif line =~ single_tag
+            tag = $1
+            args = $2.strip
+            result << @filters[tag.to_sym].filter_single(args)
+          else
+            result << line
+          end
+        when :inside_tag
+          # :endinlinewhatever, :endwhatever or just plain :end
+          if line =~ /^:end(inline#{tag}|#{tag})?(\s.*)?$/
+            result << @filters[tag.to_sym].filter_inline(tagged_lines.join("\n"),args)
+            tagged_lines = []
+            state = :copying
+          else
+            tagged_lines << line
+          end
+        end
+      end
+      result.join("\n")
+    end
+    # Creates instance and loads all the user-defined filters in the generated filter/ subdirectory
+    private
+    def initialize
+      @filters = {}
+    end
+    # Create regular expression to match single tags (tags with no end tag)
+    def single_tag
+      @single_tag_regex ||= tag_regexp
+    end
+    # Create regular expression to match inline tags. By convention these are all prefixed "inline"
+    def inline_tag
+      @inline_tag_regex ||= tag_regexp("inline")
+    end
+    # Does the actually work of creating matcher regular expressions
+    def tag_regexp(prefix = "")
+      Regexp.new("^:#{prefix}(" + @filters.keys.join('|') + ")(.*)")
+    end
+  end
+end
+# Loads all the filters:
+# If a filter fails to load, simply ignore it (it may be a missing local gem, such
+# as ritex). This means that folks who write filters must ensure that their source
+# throws an exception should it fail to find all its dependencies
+Dir.glob([
+    File.join(File.dirname(__FILE__), 'filters/*.rb'),
+    File.join(APP_ROOT, 'filters/*.rb')
+    ]) do |filter|
+  begin
+    require(filter)
+  rescue Exception => e
+    ;
+  end
+end

data/lib/codex/filters/code_filter.rb ADDED

@@ -0,0 +1,92 @@
+module Codex::CodeFilter
+  class Descriptor
+    attr_reader :file_name, :part
+    attr_reader :css_class
+    attr_reader :lang
+    def initialize(string)
+      @css_class = "code-normal"
+      @lang = "ruby"
+      if string && string =~ /^\[(.*)\]/
+        @file_name = nil
+        parse_params($1.dup)
+      elsif string && string =~ /(.*?)\[(.*)\]/
+        @file_name = $1
+        parse_params($2.dup)
+      else
+        @file_name = string
+      end
+    end
+    def parse_params(params)
+      params.split.each do |param|
+        if param =~ /(.*?)=(.*)/
+          case $1
+          when "class"
+            @css_class = $2
+          when "lang"
+            @lang = $2
+          else
+            fail "Unknown parameter #{$1} in '#{params}'"
+          end
+        else
+          @part = param
+        end
+      end
+    end
+  end
+  class CodeFilter < Codex::Filter
+    tag :code
+    def filter_single(args)
+      desc = Descriptor.new(args)
+      content = find_content_from(desc)
+      format_code(desc, content)
+    end
+    def filter_inline(text,args)
+      desc = Descriptor.new(args)
+      format_code(desc, text)
+    end
+    def format_code(desc, code)
+      %{<div class="#{desc.css_class}">\n} +
+      %{\n<pre name="code" class="#{desc.lang}:nogutter:nocontrols">#{code}} +
+      %{</pre></div>} +
+      format_link(desc)
+    end
+    def format_link(desc)
+      if desc.file_name.nil?
+        "\n\n"
+      else
+        %{<div class="codeurl"><a href="txmt://open?url=file://#{File.expand_path(desc.file_name)}">#{desc.file_name}</a></div>\n\n}
+      end
+    end
+    def find_content_from(desc)
+      find_part_in(File.read(desc.file_name), desc.part)
+    end
+    def find_part_in(content, part_name)
+      result = []
+      state = part_name ? :skipping : :normal
+      content.each_line do |line|
+        if line.sub!(/(START|END):(\w+)/, '')
+          if $2 == part_name
+            if $1 == "START"
+              state = :normal
+            else
+              state = :skipping
+            end
+          end
+          next
+        end
+        result << line unless state == :skipping
+      end
+      result.join
+    end
+  end
+end