RubyGems - instiki - Versions diffs - 0.9.2 → 0.10.0 - Mend

instiki 0.9.2 → 0.10.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 (102) hide show

data/CHANGELOG +165 -0
data/README +68 -172
data/app/controllers/admin_controller.rb +94 -0
data/app/controllers/application.rb +131 -0
data/app/controllers/file_controller.rb +129 -0
data/app/controllers/wiki_controller.rb +354 -0
data/{libraries/view_helper.rb → app/helpers/application_helper.rb} +68 -33
data/app/models/author.rb +3 -3
data/app/models/chunks/category.rb +33 -31
data/app/models/chunks/chunk.rb +86 -20
data/app/models/chunks/engines.rb +54 -38
data/app/models/chunks/include.rb +41 -29
data/app/models/chunks/literal.rb +31 -19
data/app/models/chunks/nowiki.rb +28 -31
data/app/models/chunks/test.rb +18 -18
data/app/models/chunks/uri.rb +182 -97
data/app/models/chunks/wiki.rb +141 -82
data/app/models/file_yard.rb +58 -0
data/app/models/page.rb +112 -86
data/app/models/page_lock.rb +22 -23
data/app/models/page_set.rb +89 -64
data/app/models/revision.rb +123 -90
data/app/models/web.rb +176 -89
data/app/models/wiki_content.rb +207 -105
data/app/models/wiki_service.rb +233 -83
data/app/models/wiki_words.rb +23 -25
data/app/views/{wiki/new_system.rhtml → admin/create_system.rhtml} +83 -78
data/app/views/{wiki/new_web.rhtml → admin/create_web.rhtml} +69 -64
data/app/views/admin/edit_web.rhtml +136 -0
data/app/views/file/file.rhtml +19 -0
data/app/views/file/import.rhtml +23 -0
data/app/views/layouts/default.rhtml +85 -0
data/app/views/markdown_help.rhtml +12 -16
data/app/views/mixed_help.rhtml +7 -0
data/app/views/navigation.rhtml +30 -19
data/app/views/rdoc_help.rhtml +12 -16
data/app/views/textile_help.rhtml +24 -28
data/app/views/wiki/authors.rhtml +11 -13
data/app/views/wiki/edit.rhtml +39 -31
data/app/views/wiki/export.rhtml +12 -14
data/app/views/wiki/feeds.rhtml +14 -10
data/app/views/wiki/list.rhtml +64 -57
data/app/views/wiki/locked.rhtml +23 -14
data/app/views/wiki/login.rhtml +14 -11
data/app/views/wiki/new.rhtml +31 -27
data/app/views/wiki/page.rhtml +115 -81
data/app/views/wiki/print.rhtml +14 -16
data/app/views/wiki/published.rhtml +9 -10
data/app/views/wiki/recently_revised.rhtml +27 -30
data/app/views/wiki/revision.rhtml +103 -81
data/app/views/wiki/rollback.rhtml +14 -9
data/app/views/wiki/rss_feed.rhtml +22 -22
data/app/views/wiki/search.rhtml +38 -15
data/app/views/wiki/tex.rhtml +22 -22
data/app/views/wiki/tex_web.rhtml +34 -34
data/app/views/wiki/web_list.rhtml +18 -13
data/app/views/wiki_words_help.rhtml +9 -8
data/config/environment.rb +82 -0
data/config/environments/development.rb +5 -0
data/config/environments/production.rb +4 -0
data/config/environments/test.rb +17 -0
data/config/routes.rb +18 -0
data/instiki +6 -67
data/instiki.rb +3 -0
data/lib/active_record_stub.rb +31 -0
data/{libraries/diff → lib}/diff.rb +444 -475
data/lib/instiki_errors.rb +15 -0
data/{libraries → lib}/rdocsupport.rb +151 -155
data/lib/redcloth_for_tex.rb +736 -0
data/natives/osx/desktop_launcher/AppDelegate.h +18 -0
data/natives/osx/desktop_launcher/AppDelegate.mm +109 -0
data/natives/osx/desktop_launcher/Credits.html +16 -0
data/natives/osx/desktop_launcher/English.lproj/InfoPlist.strings +0 -0
data/natives/osx/desktop_launcher/English.lproj/MainMenu.nib/classes.nib +13 -0
data/natives/osx/desktop_launcher/English.lproj/MainMenu.nib/info.nib +24 -0
data/natives/osx/desktop_launcher/English.lproj/MainMenu.nib/objects.nib +0 -0
data/natives/osx/desktop_launcher/Info.plist +13 -0
data/natives/osx/desktop_launcher/Instiki.xcode/project.pbxproj +592 -0
data/natives/osx/desktop_launcher/Instiki_Prefix.pch +7 -0
data/natives/osx/desktop_launcher/MakeDMG.sh +9 -0
data/natives/osx/desktop_launcher/main.mm +14 -0
data/natives/osx/desktop_launcher/version.plist +16 -0
data/public/404.html +6 -0
data/public/500.html +6 -0
data/public/dispatch.rb +10 -0
data/public/favicon.ico +0 -0
data/public/javascripts/edit_web.js +52 -0
data/public/javascripts/prototype.js +336 -0
data/{app/views/static_style_sheet.rhtml → public/stylesheets/instiki.css} +221 -198
data/script/breakpointer +4 -0
data/script/server +93 -0
metadata +59 -32
data/app/controllers/wiki.rb +0 -389
data/app/models/chunks/match.rb +0 -19
data/app/views/bottom.rhtml +0 -4
data/app/views/top.rhtml +0 -49
data/app/views/wiki/edit_web.rhtml +0 -138
data/libraries/action_controller_servlet.rb +0 -177
data/libraries/erb.rb +0 -490
data/libraries/madeleine_service.rb +0 -68
data/libraries/redcloth_for_tex.rb +0 -869
data/libraries/web_controller_server.rb +0 -81

data/app/models/chunks/match.rb DELETED

@@ -1,19 +0,0 @@
-# This module is to be included in unit tests that involve matching chunks.
-# It provides a easy way to test whether a chunk matches a particular string
-# and any the values of any fields that should be set after a match.
-module ChunkMatch
-  # Asserts a number of tests for the given type and text.
-  def match(type, test_text, expected)
-	pattern = type.pattern
-    assert_match(pattern, test_text)
-    pattern =~ test_text   # Previous assertion guarantees match
-    chunk = type.new($~)
-    # Test if requested parts are correct.
-    for method_sym, value in expected do
-      assert_respond_to(chunk, method_sym)
-      assert_equal(value, chunk.method(method_sym).call, "Checking value of '#{method_sym}'")
-    end
-  end
-end

data/app/views/bottom.rhtml DELETED

@@ -1,4 +0,0 @@
-  </div>
-</div>
-</body>
-</html>

data/app/views/top.rhtml DELETED

@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <title>
-    <% if @web && @page && @page.name == "HomePage" && %( show published print ).include?(@action_name) %>
-      <%= @web.name %>
-    <% elsif @web %>
-      <%= @title %> in <%= @web.name %>
-    <% else %>
-      <%= @title %>
-    <% end %>
-  </title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <style type="text/css">
-    h1#pageName, .newWikiWord a, a.existingWikiWord, .newWikiWord a:hover, #TextileHelp h3 {
-      color: #<%= @web ? @web.color : "393" %>;
-    }
-    #Container, #Content {
-      width: <%= @content_width || "600" %>px;
-    }
-    <%= sub_template("static_style_sheet") if @inline_style %>
-  </style>
-  <link rel="Stylesheet" href="../static_style_sheet/" type="text/css" media="screen" />
-  <style type="text/css">
-    <%= @style_additions %>
-    <%= @web ? web.additional_style : "" %>
-  </style>
-</head>
-<body>
-<div id="Container">
-  <div id="Content">
-  <h1 id="pageName">
-    <% if @web && @page && @page.name == "HomePage" && %( show published print ).include?(@action_name) %>
-      <%= @web.name %>
-    <% elsif @web %>
-      <small><%= @web.name %></small><br />
-      <%= @title %>
-    <% else %>
-      <%= @title %>
-    <% end %>
-  </h1>
-  <%= sub_template "navigation" unless @web.nil? || @hide_navigation %>

data/app/views/wiki/edit_web.rhtml DELETED

@@ -1,138 +0,0 @@
-<% @title = "Edit Web" %><%= sub_template "top" %>
-<form action="../update_web" id="setup" method="post" onSubmit="cleanAddress(); return validateSetup()">
-  <h2 style="margin-bottom: 3px">Name and address</h2>
-  <div class="help">
-    The name of the web is included in the title on all pages. The address is the base path that all pages within the web live beneath.
-    Ex: the address "rails" gives URLs like <i>/rails/show/HomePage</i>.
-  </div>
-  <div class="inputBox">
-    Name: <input type="text" id="name" name="name" value="<%= @web.name %>" onChange="proposeAddress();"> &nbsp;&nbsp;
-    Address: <input type="text" id="address" name="address" value="<%= @web.address %>" onChange="cleanAddress();">
-    <i>(Letters & digits only)</i>
-  </div>
-  <h2 style="margin-bottom: 3px">Specialize</h2>
-  <div class="help">
-    Turning safe mode on will strip HTML tags and stylesheet options from the content of all pages.
-    Turning on "brackets only" will require all wiki words to be as [[wiki word]] and WikiWord won't work.
-    Additions to the stylesheet take precedence over the existing styles. <i>Hint:</i> View source on a page you want to
-    style to find ID names on individual tags. <a href="#" onClick="document.getElementById('additionalStyle').style.display='block';return false;">See styles >></a>
-  </div>
-  <div class="inputBox">
-    Markup:
-    <select name="markup">
-      <%= html_options({ "Textile" => :textile, "Markdown" => :markdown, "RDoc" => :rdoc }, @web.markup) %>
-    </select>
-    &nbsp;&nbsp;
-    Color:
-    <select name="color">
-      <%= html_options({ "Green" => "008B26", "Purple" => "504685", "Red" => "DA0006", "Orange" => "FA6F00", "Grey" => "8BA2B0" },
-          @web.color) %>
-    </select>
-    &nbsp;&nbsp;
-    <small>
-    <input type="checkbox" name="safe_mode"<%= " CHECKED" if @web.safe_mode %>> Safe mode
-    &nbsp;&nbsp;
-    <input type="checkbox" name="brackets_only"<%= " CHECKED" if @web.brackets_only %>> Brackets only
-    &nbsp;&nbsp;
-    <input type="checkbox" name="count_pages"<%= " CHECKED" if @web.count_pages %>> Count pages
-    </small>
-    <textarea id="additionalStyle" style="display: none; margin-top: 10px; margin-bottom: 5px; width: 560px; height: 200px" name="additional_style"><%= @web.additional_style %></textarea>
-  </div>
-  <h2 style="margin-bottom: 3px">Password protection for this web (<%= @web.name %>)</h2>
-  <div class="help">
-    This is the password that visitors need to view and edit this web. Setting the password to nothing will remove the password protection.
-  </div>
-  <div class="inputBox">
-    Password: <input type="password" id="password" name="password" value="<%= @web.password %>"> &nbsp;&nbsp;
-    Verify: <input type="password" id="password_check" value="<%= @web.password %>" name="password_check">
-  </div>
-  <h2 style="margin-bottom: 3px">Publish read-only version of this web (<%= @web.name %>)</h2>
-  <div class="help">
-    You can turn on a read-only version of this web that's accessible even when the regular web is password protected.
-    The published version is accessible through URLs like /wiki/published/HomePage.
-  </div>
-  <div class="inputBox">
-    <input type="checkbox" name="published"<%= " CHECKED" if @web.published %>> Publish this web
-  </div>
-<p align="right">
-  <small>
-    Enter system password
-    <input type="password" id="system_password" name="system_password">
-    and
-    <input type="submit" value="Update Web">
-    <br/><br/>
-    ...or forget changes and <a href="/new_web/">create a new web</a>
-  </small>
-</p>
-</form>
-<br/>
-<h1>Other administrative tasks</h1>
-<form action="../remove_orphaned_pages" id="remove_orphaned_pages" method="post">
-<p align="right">
-  <small>
-    Clean up by entering system password
-    <input type="password" id="system_password" name="system_password">
-    and
-    <input type="submit" value="Delete Orphan Pages">
-  </small>
-</p>
-<script>
-function proposeAddress() {
-  document.getElementById('address').value =
-    document.getElementById('name').value.replace(/[^a-zA-Z0-9]/g, "").toLowerCase();
-}
-function cleanAddress() {
-  document.getElementById('address').value =
-    document.getElementById('address').value.replace(/[^a-zA-Z0-9]/g, "").toLowerCase();
-}
-function validateSetup() {
-  if (document.getElementById('system_password').value == "") {
-    alert("You must enter the system password");
-    return false;
-  }
-  if (document.getElementById('name').value == "") {
-    alert("You must pick a name for the web");
-    return false;
-  }
-  if (document.getElementById('address').value == "") {
-    alert("You must pick an address for the web");
-    return false;
-  }
-  if (document.getElementById('password').value != "" &&
-      document.getElementById('password').value != document.getElementById('password_check').value) {
-    alert("The password and its verification doesn't match");
-    return false;
-  }
-  return true;
-}
-</script>
-<%= sub_template "bottom" %>

data/libraries/action_controller_servlet.rb DELETED

@@ -1,177 +0,0 @@
-require 'erb'
-require 'cgi'
-require 'webrick'
-include WEBrick
-require 'view_helper'
-class ActionControllerServlet < HTTPServlet::AbstractServlet
-  @@template_root = "./views"
-  def self.template_root() @@template_root end
-  def self.template_root=(template_root) @@template_root = template_root end
-  include ViewHelper
-  def do_POST(req, res) do_GET(req, res) end
-  def do_GET(req, res)
-    @req, @res = req, res
-    @res['Content-Type']  = "text/html; charset=utf-8"
-    @res['Pragma']        = "no-cache"
-    @res['Cache-Control'] = "no-cache"
-    @params = @req.query
-    @assigns = {}
-    @performed_render = @performed_redirect = false
-    @logger.info "Performing #{action_name}"
-    @logger.info "  Parameters: #{@params.inspect}"
-    @logger.info "  Cookies: #{@req.cookies.collect { |c| "#{c.name} => #{c.value}" }.join(", ") }"
-    perform_action
-    @res
-  end
-  protected
-    def template_root() self.class.template_root end
-    # Issues a HTTP 302 (location) redirect to the specified <tt>path</tt>. Query string
-    # parameters can be specified in the <tt>params</tt> hash and are automatically URL escaped.
-    # An <tt>anchor</tt> can also be specified (as a string).
-    def redirect_path(path, params = nil, anchor = nil)
-      path << build_query_string(params) unless params.nil?
-      path << "\##{anchor}" unless anchor.nil?
-      @res.set_redirect WEBrick::HTTPStatus::MovedPermanently, path
-      @performed_redirect = true
-    end
-    # Redirects the browser to another action within the current controller, so redirect_path "pages"
-    # within a controller called WikiController would take the user to "http://www.example.com/wiki/pages"
-    def redirect_action(action, params = nil, anchor = nil)
-      redirect_path "/#{controller_name}/#{action}", params, anchor
-    end
-    # Compiles the template response and adds it to the response. If no template_name has been
-    # supplied, the action parameter parsed to the controller is used. So invoking
-    # render on a object initialized with myController.new("show_person") will compile the template
-    # located at "../views/show_person.rhtml". Notice that the ".rhtml" extension is postfixed
-    # to the template_name regardless of one was passed or that the action parameter was used.
-    def render(template_name = "#{controller_name}/#{action_name}")
-      @performed_render = true
-      @logger.info "Rendering: #{template_name}"
-      add_instance_variables_to_assigns
-      @res.body = template_result "#{template_root}/#{template_name}.rhtml"
-    end
-    def render_text(text)
-      @performed_render = true
-      @logger.info "Rendering in text"
-      @res.body = text
-    end
-    # Wrapper around render that presumes the current controller is used as a base for the action,
-    # so render_action("page") in WikiController will be equal to render("wiki/page")
-    def render_action(action_name)
-      render "#{controller_name}/#{action_name}"
-    end
-    def sub_template(template_name)
-      template_result "#{template_root}/#{template_name}.rhtml"
-    end
-    # Returns the value of the cookie matching +name+ (or nil if none is found).
-    def read_cookie(key)
-      cookies = @req.cookies.select { |cookie| cookie.name == key }
-      cookies.empty? ? nil : cookies.first.value
-    end
-    def write_cookie(key, value, permanent = false)
-      @logger.info "Writing cookie: #{key} => #{value}"
-      cookie = WEBrick::Cookie.new(key, value)
-      cookie.path = "/"
-      cookie.expires = Time.local(2030) if permanent
-      @res.cookies << cookie
-    end
-    # Returns the last part of the uri path ("page" in "/wiki/page") by default, but
-    # can be overwritten to implement mod_rewrite-like behaviour, such as "page" in "/wiki/page/home"
-    def action_name
-      @req.path.to_s.split(/\//).last
-    end
-    # Returns an array with each of the parts in the request as an element. So /something/cool/dude
-    # returns ["something", "cool", "dude"]
-    def request_path
-      request_path_parts = @req.path.to_s.split(/\//)
-      request_path_parts.length > 1 ? request_path_parts[1..-1] : []
-    end
-    # Can be overwritten by a controller class to implement shared behaviour for all the actions in
-    # the class, such as security measures
-    def before_action() end
-  private
-    # Wraps around all action calls to ensure the session is properly updated and closed.
-    # Figures out whether an action, such as "list", is implemented as show_list or do_list.
-    # The show_* type has precedence and automatically calls render after execution.
-    def perform_action
-      if before_action == false then return end
-      if action_methods.include?(action_name)
-        send(action_name)
-        render unless @performed_render || @performed_redirect || !@res.body.empty?
-      elsif template_exists_for_action
-        render
-      else
-        raise "No action responded to #{action_name}", caller
-      end
-    end
-    def add_instance_variables_to_assigns
-      instance_variables.each { |var|
-        next if protected_instance_variables.include?(var)
-        @assigns[var[1..-1]] = instance_variable_get(var)
-      }
-    end
-    def protected_instance_variables
-      [ "@assigns", "@performed_redirect", "@performed_render" ]
-    end
-    def action_methods
-      methods - Object.instance_methods
-    end
-    # Returns true if a template exists in the controller directory for the specified <tt>action_name</tt>,
-    # which would mean true if called for WikiController#changes and "/views/wiki/changes.rhtml" existed.
-    def template_exists_for_action
-      File.exist? action_template_path
-    end
-    def action_template_path(action = action_name)
-      "#{template_root}/#{controller_name}/#{action}.rhtml"
-    end
-    def template_result(template_path)
-      @assigns.each { |key, value| instance_variable_set "@#{key}", value }
-      ERB.new(IO.readlines(template_path).join).result(binding)
-    end
-    # Converts the class name from something like "OneModule::TwoModule::NeatController"
-    # to "neat".
-    def controller_name
-      self.class.to_s.split("::").last.sub(/Controller/, "").downcase
-    end
-    # Returns a query string with escaped keys and values from the passed hash.
-    def build_query_string(hash)
-      elements = []
-      hash.each { |key, value| elements << "#{CGI.escape(key)}=#{CGI.escape(value.to_s)}" }
-      "?" + elements.join("&")
-    end
-end

data/libraries/erb.rb DELETED

@@ -1,490 +0,0 @@
-# Tiny eRuby --- ERB2
-# Copyright (c) 1999-2000,2002,2003 Masatoshi SEKI
-# You can redistribute it and/or modify it under the same terms as Ruby.
-class ERB
-  Revision = '$Date: 2004/02/23 23:40:09 $' 	#'
-  def self.version
-    "erb.rb [2.0.4 #{ERB::Revision.split[1]}]"
-  end
-end
-# ERB::Compiler
-class ERB
-  class Compiler
-    class PercentLine
-      def initialize(str)
-        @value = str
-      end
-      attr_reader :value
-      alias :to_s :value
-    end
-    class Scanner
-      SplitRegexp = /(<%%)|(%%>)|(<%=)|(<%#)|(<%)|(%>)|(\n)/
-      @scanner_map = {}
-      def self.regist_scanner(klass, trim_mode, percent)
-	@scanner_map[[trim_mode, percent]] = klass
-      end
-      def self.default_scanner=(klass)
-	@default_scanner = klass
-      end
-      def self.make_scanner(src, trim_mode, percent)
-	klass = @scanner_map.fetch([trim_mode, percent], @default_scanner)
-	klass.new(src, trim_mode, percent)
-      end
-      def initialize(src, trim_mode, percent)
-	@src = src
-	@stag = nil
-      end
-      attr_accessor :stag
-      def scan; end
-    end
-    class TrimScanner < Scanner
-      TrimSplitRegexp = /(<%%)|(%%>)|(<%=)|(<%#)|(<%)|(%>\n)|(%>)|(\n)/
-      def initialize(src, trim_mode, percent)
-	super
-	@trim_mode = trim_mode
-	@percent = percent
-	if @trim_mode == '>'
-	  @scan_line = self.method(:trim_line1)
-	elsif @trim_mode == '<>'
-	  @scan_line = self.method(:trim_line2)
-	elsif @trim_mode == '-'
-	  @scan_line = self.method(:explicit_trim_line)
-	else
-	  @scan_line = self.method(:scan_line)
-	end
-      end
-      attr_accessor :stag
-      def scan(&block)
-	@stag = nil
-	if @percent
-	  @src.each do |line|
-	    percent_line(line, &block)
-	  end
-	else
-	  @src.each do |line|
-	    @scan_line.call(line, &block)
-	  end
-	end
-	nil
-      end
-      def percent_line(line, &block)
-	if @stag || line[0] != ?%
-	  return @scan_line.call(line, &block)
-	end
-	line[0] = ''
-	if line[0] == ?%
-	  @scan_line.call(line, &block)
-	else
-          yield(PercentLine.new(line.chomp))
-	end
-      end
-      def scan_line(line)
-	line.split(SplitRegexp).each do |token|
-	  next if token.empty?
-	  yield(token)
-	end
-      end
-      def trim_line1(line)
-	line.split(TrimSplitRegexp).each do |token|
-	  next if token.empty?
-	  if token == "%>\n"
-	    yield('%>')
-	    yield(:cr)
-	    break
-	  end
-	  yield(token)
-	end
-      end
-      def trim_line2(line)
-	head = nil
-	line.split(TrimSplitRegexp).each do |token|
-	  next if token.empty?
-	  head = token unless head
-	  if token == "%>\n"
-	    yield('%>')
-	    if  is_erb_stag?(head)
-	      yield(:cr)
-	    else
-	      yield("\n")
-	    end
-	    break
-	  end
-	  yield(token)
-	end
-      end
-      ExplicitTrimRegexp = /(^[ \t]*<%-)|(-%>\n?\z)|(<%-)|(-%>)|(<%%)|(%%>)|(<%=)|(<%#)|(<%)|(%>)|(\n)/
-      def explicit_trim_line(line)
-	line.split(ExplicitTrimRegexp).each do |token|
-	  next if token.empty?
-	  if @stag.nil? && /[ \t]*<%-/ =~ token
-	    yield('<%')
-	  elsif @stag && /-%>\n/ =~ token
-	    yield('%>')
-	    yield(:cr)
-	  elsif @stag && token == '-%>'
-	    yield('%>')
-	  else
-	    yield(token)
-	  end
-	end
-      end
-      ERB_STAG = %w(<%= <%# <%)
-      def is_erb_stag?(s)
-	ERB_STAG.member?(s)
-      end
-    end
-    Scanner.default_scanner = TrimScanner
-    class SimpleScanner < Scanner
-      def scan
-	@src.each do |line|
-	  line.split(SplitRegexp).each do |token|
-	    next if token.empty?
-	    yield(token)
-	  end
-	end
-      end
-    end
-    Scanner.regist_scanner(SimpleScanner, nil, false)
-    begin
-      require 'strscan'
-      class SimpleScanner2 < Scanner
-        def scan
-          stag_reg = /(.*?)(<%%|<%=|<%#|<%|\n|\z)/
-          etag_reg = /(.*?)(%%>|%>|\n|\z)/
-          scanner = StringScanner.new(@src)
-          while ! scanner.eos?
-            scanner.scan(@stag ? etag_reg : stag_reg)
-            text = scanner[1]
-            elem = scanner[2]
-            yield(text) unless text.empty?
-            yield(elem) unless elem.empty?
-          end
-        end
-      end
-      Scanner.regist_scanner(SimpleScanner2, nil, false)
-      class PercentScanner < Scanner
-	def scan
-	  new_line = true
-          stag_reg = /(.*?)(<%%|<%=|<%#|<%|\n|\z)/
-          etag_reg = /(.*?)(%%>|%>|\n|\z)/
-          scanner = StringScanner.new(@src)
-          while ! scanner.eos?
-	    if new_line && @stag.nil?
-	      if scanner.scan(/%%/)
-		yield('%')
-		new_line = false
-		next
-	      elsif scanner.scan(/%/)
-		yield(PercentLine.new(scanner.scan(/.*?(\n|\z)/).chomp))
-		next
-	      end
-	    end
-	    scanner.scan(@stag ? etag_reg : stag_reg)
-            text = scanner[1]
-            elem = scanner[2]
-            yield(text) unless text.empty?
-            yield(elem) unless elem.empty?
-	    new_line = (elem == "\n")
-          end
-        end
-      end
-      Scanner.regist_scanner(PercentScanner, nil, true)
-      class ExplicitScanner < Scanner
-	def scan
-	  new_line = true
-          stag_reg = /(.*?)(<%%|<%=|<%#|<%-|<%|\n|\z)/
-          etag_reg = /(.*?)(%%>|-%>|%>|\n|\z)/
-          scanner = StringScanner.new(@src)
-          while ! scanner.eos?
-	    if new_line && @stag.nil? && scanner.scan(/[ \t]*<%-/)
-	      yield('<%')
-	      new_line = false
-	      next
-	    end
-	    scanner.scan(@stag ? etag_reg : stag_reg)
-            text = scanner[1]
-            elem = scanner[2]
-	    new_line = (elem == "\n")
-            yield(text) unless text.empty?
-	    if elem == '-%>'
-	      yield('%>')
-	      if scanner.scan(/(\n|\z)/)
-		yield(:cr)
-		new_line = true
-	      end
-	    elsif elem == '<%-'
-	      yield('<%')
-	    else
-	      yield(elem) unless elem.empty?
-	    end
-          end
-        end
-      end
-      Scanner.regist_scanner(ExplicitScanner, '-', false)
-    rescue LoadError
-    end
-    class Buffer
-      def initialize(compiler)
-	@compiler = compiler
-	@line = []
-	@script = ''
-	@compiler.pre_cmd.each do |x|
-	  push(x)
-	end
-      end
-      attr_reader :script
-      def push(cmd)
-	@line << cmd
-      end
-      def cr
-	@script << (@line.join('; '))
-	@line = []
-	@script << "\n"
-      end
-      def close
-	return unless @line
-	@compiler.post_cmd.each do |x|
-	  push(x)
-	end
-	@script << (@line.join('; '))
-	@line = nil
-      end
-    end
-    class Buffer16 < Buffer
-      def initialize(compiler)
-	super(compiler)
-	@script = []
-      end
-      def script
-	@script.join('')
-      end
-    end
-    def make_buffer
-      if RUBY_VERSION > '1.8'
-	Buffer.new(self)
-      else
-	Buffer16.new(self)
-      end
-    end
-    def compile(s)
-      out = make_buffer
-      content = ''
-      scanner = make_scanner(s)
-      scanner.scan do |token|
-	if scanner.stag.nil?
-	  case token
-          when PercentLine
-	    out.push("#{@put_cmd} #{content.dump}") if content.size > 0
-	    content = ''
-            out.push(token.to_s)
-            out.cr
-	  when :cr
-	    out.cr
-	  when '<%', '<%=', '<%#'
-	    scanner.stag = token
-	    out.push("#{@put_cmd} #{content.dump}") if content.size > 0
-	    content = ''
-	  when "\n"
-	    content << "\n"
-	    out.push("#{@put_cmd} #{content.dump}")
-	    out.cr
-	    content = ''
-	  when '<%%'
-	    content << '<%'
-	  else
-	    content << token
-	  end
-	else
-	  case token
-	  when '%>'
-	    case scanner.stag
-	    when '<%'
-	      if content[-1] == ?\n
-		content.chop!
-		out.push(content)
-		out.cr
-	      else
-		out.push(content)
-	      end
-	    when '<%='
-	      out.push("#{@put_cmd}((#{content}).to_s)")
-	    when '<%#'
-	      # out.push("# #{content.dump}")
-	    end
-	    scanner.stag = nil
-	    content = ''
-	  when '%%>'
-	    content << '%>'
-	  else
-	    content << token
-	  end
-	end
-      end
-      out.push("#{@put_cmd} #{content.dump}") if content.size > 0
-      out.close
-      out.script
-    end
-    def prepare_trim_mode(mode)
-      case mode
-      when 1
-	return [false, '>']
-      when 2
-	return [false, '<>']
-      when 0
-	return [false, nil]
-      when String
-	perc = mode.include?('%')
-	if mode.include?('-')
-	  return [perc, '-']
-	elsif mode.include?('<>')
-	  return [perc, '<>']
-	elsif mode.include?('>')
-	  return [perc, '>']
-	else
-	  [perc, nil]
-	end
-      else
-	return [false, nil]
-      end
-    end
-    def make_scanner(src)
-      Scanner.make_scanner(src, @trim_mode, @percent)
-    end
-    def initialize(trim_mode)
-      @percent, @trim_mode = prepare_trim_mode(trim_mode)
-      @put_cmd = 'print'
-      @pre_cmd = []
-      @post_cmd = []
-    end
-    attr_reader :percent, :trim_mode
-    attr_accessor :put_cmd, :pre_cmd, :post_cmd
-  end
-end
-# ERB
-class ERB
-  def initialize(str, safe_level=nil, trim_mode=nil, eoutvar='_erbout')
-    @safe_level = safe_level
-    compiler = ERB::Compiler.new(trim_mode)
-    set_eoutvar(compiler, eoutvar)
-    @src = compiler.compile(str)
-  end
-  attr :src
-  def set_eoutvar(compiler, eoutvar = '_erbout')
-    compiler.put_cmd = "#{eoutvar}.concat"
-    cmd = []
-    cmd.push "#{eoutvar} = ''"
-    compiler.pre_cmd = cmd
-    cmd = []
-    cmd.push(eoutvar)
-    compiler.post_cmd = cmd
-  end
-  def run(b=TOPLEVEL_BINDING)
-    print self.result(b)
-  end
-  def result(b=TOPLEVEL_BINDING)
-    if @safe_level
-      th = Thread.start {
-	$SAFE = @safe_level
-	eval(@src, b)
-      }
-      return th.value
-    else
-      return eval(@src, b)
-    end
-  end
-  def def_method(mod, methodname, fname='(ERB)')
-    mod.module_eval("def #{methodname}\n" + self.src + "\nend\n", fname, 0)
-  end
-  def def_module(methodname='erb')
-    mod = Module.new
-    def_method(mod, methodname)
-    mod
-  end
-  def def_class(superklass=Object, methodname='result')
-    cls = Class.new(superklass)
-    def_method(cls, methodname)
-    cls
-  end
-end
-# ERB::Util
-class ERB
-  module Util
-    public
-    def html_escape(s)
-      s.to_s.gsub(/&/, "&amp;").gsub(/\"/, "&quot;").gsub(/>/, "&gt;").gsub(/</, "&lt;")
-    end
-    alias h html_escape
-    def url_encode(s)
-      s.to_s.gsub(/[^a-zA-Z0-9_\-.]/n){ sprintf("%%%02X", $&.unpack("C")[0]) }
-    end
-    alias u url_encode
-  end
-end
-# ERB::DefMethod
-class ERB
-  module DefMethod
-    public
-    def def_erb_method(methodname, erb)
-      if erb.kind_of? String
-	fname = erb
-	File.open(fname) {|f| erb = ERB.new(f.read) }
-	erb.def_method(self, methodname, fname)
-      else
-	erb.def_method(self, methodname)
-      end
-    end
-    module_function :def_erb_method
-  end
-end