instiki 0.9.2 → 0.10.0

data/app/views/wiki/tex_web.rhtml

@@ -1,35 +1,35 @@
-\documentclass[12pt,titlepage]{article}
-
-\usepackage{fancyhdr}
-\pagestyle{fancy}
-
-\fancyhead[LE,RO]{}
-\fancyhead[LO,RE]{\nouppercase{\bfseries \leftmark}}
-\fancyfoot[C]{\thepage}
-
-\usepackage[danish]{babel}      %danske tekster
-\usepackage{a4}
-\usepackage{graphicx}
-\usepackage{ucs}
-\usepackage[utf8]{inputenc}
-\input epsf 
-
-
-%-------------------------------------------------------------------
-
-\title{<%= @web_name %>}
-
-\begin{document}
-
-\maketitle
-
-\tableofcontents
-\pagebreak
-
-\sloppy
-
-%-------------------------------------------------------------------
-
-<%= @tex_content %>
-
+\documentclass[12pt,titlepage]{article}
+
+\usepackage{fancyhdr}
+\pagestyle{fancy}
+
+\fancyhead[LE,RO]{}
+\fancyhead[LO,RE]{\nouppercase{\bfseries \leftmark}}
+\fancyfoot[C]{\thepage}
+
+\usepackage[danish]{babel}      %danske tekster
+\usepackage{a4}
+\usepackage{graphicx}
+\usepackage{ucs}
+\usepackage[utf8]{inputenc}
+\input epsf 
+
+
+%-------------------------------------------------------------------
+
+\title{<%= @web_name %>}
+
+\begin{document}
+
+\maketitle
+
+\tableofcontents
+\pagebreak
+
+\sloppy
+
+%-------------------------------------------------------------------
+
+<%= @tex_content %>
+
 \end{document}

data/app/views/wiki/web_list.rhtml

@@ -1,13 +1,18 @@
-<% @title = "Wiki webs" %><%= sub_template "top" %>
-
-<ul>
-<% for web in @webs %>
-  <li>
-    <a href="/<%= web.address %>/show/HomePage"><%= web.name %></a>
-    (<%= web.pages.length %> pages by <%= web.authors.length %> authors)
-    <% if web.published then %>(<a href="/<%= web.address %>/published/HomePage">published</a>)<% end %>
-  </li>
-<% end %>
-</ul>
-
-<%= sub_template "bottom" %>
+<% @title = "Wiki webs" %>
+
+<ul>
+<% @webs.each do |web| %>
+  <li>
+    <% if web.published %>
+      <%= link_to_page 'HomePage', web, web.name, :mode => 'publish' %>
+      (read-only) /
+      <%= link_to_page 'HomePage', web, 'editable version', :mode => 'show' %> (requires login)
+    <% else %>
+      <%= link_to_page 'HomePage', web, web.name, :mode => 'show' %>
+    <% end %>
+    <div class="byline" style="margin-bottom: 0px">
+      <%= web.pages.length %> pages by <%= web.authors.length %> authors
+    </div>
+  </li>
+<% end %>
+</ul>

data/app/views/wiki_words_help.rhtml

@@ -1,8 +1,9 @@
-<h3>Wiki words</h3>
-<p style="border-top: 1px dotted #ccc; margin-top: 0px">
-  Two or more uppercase words stuck together (camel case) or any phrase surrounded by doubble brackets is a wiki word. A camel-case wiki word can be escaped by putting \ in front of it.
-</p>
-<p>
-  Wiki words: <i>HomePage, ThreeWordsTogether, [[C++]], [[Let's play again!]]</i><br/>
-  Not wiki words: <i>IBM, School</i>
-</p>
+<h3>Wiki words</h3>
+<p style="border-top: 1px dotted #ccc; margin-top: 0px">
+  Two or more uppercase words stuck together (camel case) or any phrase surrounded by double 
+  brackets is a wiki word. A camel-case wiki word can be escaped by putting \ in front of it.
+</p>
+<p>
+  Wiki words: <i>HomePage, ThreeWordsTogether, [[C++]], [[Let's play again!]]</i><br/>
+  Not wiki words: <i>IBM, School</i>
+</p>

data/config/environment.rb

@@ -0,0 +1,82 @@
+if RUBY_VERSION < '1.8.1' 
+  puts 'Instiki requires Ruby 1.8.1+'
+  exit
+end
+
+# Enable UTF-8 support
+$KCODE = 'u'
+require 'jcode'
+
+RAILS_ROOT = File.expand_path(File.dirname(__FILE__) + '/../') unless defined? RAILS_ROOT
+RAILS_ENV  = ENV['RAILS_ENV'] || 'production' unless defined? RAILS_ENV
+
+unless defined? ADDITIONAL_LOAD_PATHS
+  # Mocks first.
+  ADDITIONAL_LOAD_PATHS = ["#{RAILS_ROOT}/test/mocks/#{RAILS_ENV}"]
+
+  # Then model subdirectories.
+  ADDITIONAL_LOAD_PATHS.concat(Dir["#{RAILS_ROOT}/app/models/[_a-z]*"]) 
+  ADDITIONAL_LOAD_PATHS.concat(Dir["#{RAILS_ROOT}/components/[_a-z]*"])
+
+  # Followed by the standard includes.
+  ADDITIONAL_LOAD_PATHS.concat %w(
+    app 
+    app/models 
+    app/controllers 
+    app/helpers 
+    app/apis 
+    components 
+    config 
+    lib 
+    vendor 
+    vendor/rails/railties
+    vendor/rails/railties/lib
+    vendor/rails/actionpack/lib
+    vendor/rails/activesupport/lib
+    vendor/rails/activerecord/lib
+    vendor/rails/actionmailer/lib
+    vendor/rails/actionwebservice/lib
+    vendor/madeleine-0.7.1/lib
+    vendor/RedCloth-3.0.3/lib
+    vendor/rubyzip-0.5.6
+  ).map { |dir| "#{File.expand_path(File.join(RAILS_ROOT, dir))}"
+  }.delete_if { |dir| not File.exist?(dir) }
+
+  # Prepend to $LOAD_PATH
+  ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(dir) }
+end
+
+# Require Rails libraries.
+require 'rubygems' unless File.directory?("#{RAILS_ROOT}/vendor/rails")
+
+require 'active_support'
+require 'action_controller'
+
+require_dependency 'instiki_errors'
+require_dependency 'active_record_stub'
+
+# Environment specific configuration
+require_dependency "environments/#{RAILS_ENV}"
+
+# Configure defaults if the included environment did not.
+unless defined? RAILS_DEFAULT_LOGGER
+  RAILS_DEFAULT_LOGGER = Logger.new(STDERR)
+  ActionController::Base.logger ||= RAILS_DEFAULT_LOGGER
+  if defined? INSTIKI_DEBUG_LOG and INSTIKI_DEBUG_LOG
+    RAILS_DEFAULT_LOGGER.level = Logger::DEBUG
+    ActionController::Base.logger.level = Logger::DEBUG
+  else
+    RAILS_DEFAULT_LOGGER.level = Logger::INFO
+    ActionController::Base.logger.level = Logger::INFO
+  end
+end
+
+ActionController::Base.template_root ||= "#{RAILS_ROOT}/app/views/"
+ActionController::Routing::Routes.reload
+Controllers = Dependencies::LoadingModule.root(
+  File.join(RAILS_ROOT, 'app', 'controllers'),
+  File.join(RAILS_ROOT, 'components')
+)
+
+require 'wiki_service'
+Socket.do_not_reverse_lookup = true

data/config/environments/development.rb

@@ -0,0 +1,5 @@
+Dependencies.mechanism = :require
+ActionController::Base.consider_all_requests_local = true
+ActionController::Base.perform_caching = false
+BREAKPOINT_SERVER_PORT = 42531
+INSTIKI_DEBUG_LOG = true unless defined? INSTIKI_DEBUG_LOG

data/config/environments/production.rb

@@ -0,0 +1,4 @@
+Dependencies.mechanism = :require
+ActionController::Base.consider_all_requests_local = false
+ActionController::Base.perform_caching = false
+

data/config/environments/test.rb

@@ -0,0 +1,17 @@
+Dependencies.mechanism = :require
+ActionController::Base.consider_all_requests_local = true
+ActionController::Base.perform_caching = false
+
+require 'fileutils'
+FileUtils.mkdir_p(RAILS_ROOT + "/log")
+
+unless defined? TEST_LOGGER
+  timestamp = Time.now.strftime('%Y%m%d%H%M%S')
+  log_name = RAILS_ROOT + "/log/instiki_test.#{timestamp}.log"
+  $stderr.puts "To see the Rails log:\n    less #{log_name}"
+  
+  TEST_LOGGER = ActionController::Base.logger = Logger.new(log_name)
+  INSTIKI_DEBUG_LOG = true unless defined? INSTIKI_DEBUG_LOG
+  
+  WikiService.storage_path = RAILS_ROOT + '/storage/test/'
+end

data/config/routes.rb

@@ -0,0 +1,18 @@
+ActionController::Routing.draw do |map|
+  map.connect 'create_system', :controller => 'admin', :action => 'create_system'
+  map.connect 'create_web', :controller => 'admin', :action => 'create_web'
+  map.connect ':web/edit_web', :controller => 'admin', :action => 'edit_web'
+  map.connect 'remove_orphaned_pages', :controller => 'admin', :action => 'remove_orphaned_pages'
+
+  map.connect ':web/file/:id', :controller => 'file', :action => 'file'
+  map.connect ':web/pic/:id', :controller => 'file', :action => 'pic'
+  map.connect ':web/import/:id', :controller => 'file', :action => 'import'
+
+  map.connect ':web/login', :controller => 'wiki', :action => 'login'
+  map.connect 'web_list', :controller => 'wiki', :action => 'web_list'
+  map.connect ':web/web_list', :controller => 'wiki', :action => 'web_list'
+  map.connect ':web/:action/:id', :controller => 'wiki'
+  map.connect ':web/:action', :controller => 'wiki'
+  map.connect ':web', :controller => 'wiki', :action => 'index'
+  map.connect '', :controller => 'wiki', :action => 'index'
+end

data/instiki

@@ -1,67 +1,6 @@
-#!/usr/local/bin/ruby
-
-if RUBY_VERSION < "1.8.1" 
-  puts "Instiki requires Ruby 1.8.1+" 
-  exit
-end
- 
-require 'optparse'
-require 'fileutils'
-
-cdir = File.expand_path(File.dirname(__FILE__))
-%w( /libraries/ /app/models /app/controllers ).each { |dir| $:.unshift(cdir + dir) }
-%w( web_controller_server action_controller_servlet wiki_service wiki ).each { |lib| require lib }
-
-fork_available = true
-begin
-  exit unless fork
-rescue NotImplementedError
-  fork_available = false
-end
-
-begin
-  pdflatex_available = system "pdflatex -version"
-rescue Errno::ENOENT
-  pdflatex_available = false
-end
-
-OPTIONS = {
-  :server_type => fork_available ? Daemon : SimpleServer,
-  :port        => 2500,
-  :storage     => "#{File.expand_path(FileUtils.pwd)}/storage",
-  :pdflatex    => pdflatex_available
-}
-
-ARGV.options do |opts|
-  script_name = File.basename($0)
-  opts.banner = "Usage: ruby #{script_name} [options]"
-
-  opts.separator ""
-
-  opts.on("-p", "--port=port", Integer,
-          "Runs Instiki on the specified port.",
-          "Default: 2500") { |OPTIONS[:port]| }
-  opts.on("-s", "--simple", "--simple-server",
-          "Forces Instiki not to run as a Daemon if fork is available."
-          ) { OPTIONS[:server_type] = SimpleServer }
-  opts.on("-t", "--storage=storage", String,
-          "Makes Instiki use the specified directory for storage.",
-          "Default: ./storage/[port]") { |OPTIONS[:storage]| }
-
-  opts.separator ""
-
-  opts.on("-h", "--help",
-          "Show this help message.") { puts opts; exit }
-
-  opts.parse!
-end
-
-Socket.do_not_reverse_lookup = true
-
-storage_dir = OPTIONS[:storage] + "/" + OPTIONS[:port].to_s
-FileUtils.mkdir_p(storage_dir)
-WikiService.storage_path = storage_dir
-
-WikiController.template_root = "#{cdir}/app/views/"
-
-WebControllerServer.new(OPTIONS[:port], OPTIONS[:server_type], "#{cdir}/app/controllers/")
+#!/usr/bin/ruby
+
+# Executable file for a gem
+# must be same as ./instiki.rb
+
+load File.dirname(__FILE__) + '/script/server'

data/instiki.rb

@@ -0,0 +1,3 @@
+#!/usr/bin/ruby
+
+load File.dirname(__FILE__) + '/script/server'

data/lib/active_record_stub.rb

@@ -0,0 +1,31 @@
+# This project uses Railties, which has an external dependency on ActiveRecord
+# Since ActiveRecord may not be present in Instiki runtime environment, this 
+# file provides a stub replacement for it
+
+module ActiveRecord
+  class Base
+    
+      # dependency in railties/lib/dispatcher.rb
+    def self.reset_column_information_and_inheritable_attributes_for_all_subclasses
+       # noop
+    end
+      
+    # dependency in actionpack/lib/action_controller/benchmarking.rb
+    def self.connected?
+      false
+    end
+      
+    # dependency in actionpack/lib/action_controller/benchmarking.rb
+    def self.connection
+      return ConnectionStub
+    end
+      
+  end
+
+  module ConnectionStub
+    def self.reset_runtime
+      0
+    end
+  end
+  
+end

data/{libraries/diff → lib}/diff.rb

@@ -1,475 +1,444 @@
-# heavily based off difflib.py - see that file for documentation
-# ported from Python by Bill Atkins
-
-# This does not support all features offered by difflib; it 
-# implements only the subset of features necessary
-# to support a Ruby version of HTML Differ.  You're welcome to finish this off.
-
-# By default, String#each iterates by line.  This isn't really appropriate
-# for diff, so often a string will be split by // to get an array of one-
-# character strings.
-
-# Some methods in Diff are untested and are not guaranteed to work.  The
-# methods in HTMLDiff and any methods it calls should work quite well.
-
-# changes by DenisMertz
-# * main change:
-# ** get the tag soup away
-#    the tag soup problem was first reported with <p> tags, but it appeared also with
-#    <li>, <ul> etc... tags 
-#   this version should mostly fix these problems
-# ** added a Builder class to manage the creation of the final htmldiff
-# * minor changes:
-# ** use symbols instead of string to represent opcodes 
-# ** small fix to html2list
-#
-
-module Enumerable
-  def reduce(init)
-    result = init
-    each { |item| result = yield(result, item) }
-    result
-  end
-end
-
-module Diff
-
-  class SequenceMatcher
-    def initialize(a=[''], b=[''], isjunk=nil, byline=false)
-      a = (!byline and a.kind_of? String) ? a.split(//) : a
-      b = (!byline and b.kind_of? String) ? b.split(//) : b
-      @isjunk = isjunk || proc {}
-      set_seqs a, b
-    end
-
-    def set_seqs(a, b)
-      set_seq_a a
-      set_seq_b b
-    end
-
-    def set_seq_a(a)
-      @a = a
-      @matching_blocks = @opcodes = nil
-    end
-
-    def set_seq_b(b)
-      @b = b
-      @matching_blocks = @opcodes = nil
-      chain_b
-    end
-
-    def chain_b
-      @fullbcount = nil
-      @b2j = {}
-      pophash = {}
-      junkdict = {}
-      
-      @b.each_with_index do |elt, i|
-        if @b2j.has_key? elt
-          indices = @b2j[elt]
-          if @b.length >= 200 and indices.length * 100 > @b.length
-            pophash[elt] = 1
-            indices.clear
-          else
-            indices.push i
-          end
-        else
-          @b2j[elt] = [i]
-        end
-      end
-        
-      pophash.each_key { |elt| @b2j.delete elt }
-      
-      junkdict = {}
-        
-      unless @isjunk.nil?
-        [pophash, @b2j].each do |d|
-          d.each_key do |elt|
-            if @isjunk.call(elt)
-              junkdict[elt] = 1
-              d.delete elt
-            end
-          end
-        end
-      end
-      
-      @isbjunk = junkdict.method(:has_key?)
-      @isbpopular = junkdict.method(:has_key?)
-    end
-    
-    def find_longest_match(alo, ahi, blo, bhi)
-      besti, bestj, bestsize = alo, blo, 0
-      
-      j2len = {}
-      
-      (alo..ahi).step do |i|
-        newj2len = {}
-        (@b2j[@a[i]] || []).each do |j|
-          if j < blo
-            next
-          end
-          if j >= bhi
-            break
-          end
-          
-          k = newj2len[j] = (j2len[j - 1] || 0) + 1
-          if k > bestsize
-            besti, bestj, bestsize = i - k + 1, j - k + 1, k
-          end
-        end
-        j2len = newj2len
-      end
-      
-      while besti > alo and bestj > blo and
-          not @isbjunk.call(@b[bestj-1]) and
-          @a[besti-1] == @b[bestj-1]
-        besti, bestj, bestsize = besti-1, bestj-1, bestsize+1
-      end
-      
-      while besti+bestsize < ahi and bestj+bestsize < bhi and
-          not @isbjunk.call(@b[bestj+bestsize]) and
-          @a[besti+bestsize] == @b[bestj+bestsize]
-        bestsize += 1
-      end
-      
-      while besti > alo and bestj > blo and
-          @isbjunk.call(@b[bestj-1]) and
-          @a[besti-1] == @b[bestj-1]
-        besti, bestj, bestsize = besti-1, bestj-1, bestsize+1
-      end
-      
-      while besti+bestsize < ahi and bestj+bestsize < bhi and
-          @isbjunk.call(@b[bestj+bestsize]) and
-          @a[besti+bestsize] == @b[bestj+bestsize]
-        bestsize += 1
-      end
-      
-      [besti, bestj, bestsize]
-    end
-    
-    def get_matching_blocks
-      return @matching_blocks unless @matching_blocks.nil? or 
-        @matching_blocks.empty?
-      
-      @matching_blocks = []
-      la, lb = @a.length, @b.length
-      match_block_helper(0, la, 0, lb, @matching_blocks)
-      @matching_blocks.push [la, lb, 0]
-    end
-    
-    def match_block_helper(alo, ahi, blo, bhi, answer)
-      i, j, k = x = find_longest_match(alo, ahi, blo, bhi)
-      if not k.zero?
-        if alo < i and blo < j
-          match_block_helper(alo, i, blo, j, answer)
-        end
-        answer.push x
-        if i + k < ahi and j + k < bhi
-          match_block_helper(i + k, ahi, j + k, bhi, answer)
-        end
-      end
-    end
-    
-    def get_opcodes
-      unless @opcodes.nil? or @opcodes.empty?
-        return @opcodes
-      end
-
-      i = j = 0
-      @opcodes = answer = []
-      get_matching_blocks.each do |ai, bj, size|
-        tag = if i < ai and j < bj
-                :replace
-              elsif i < ai
-                :delete
-              elsif j < bj 
-                :insert
-              end
-
-        answer.push [tag, i, ai, j, bj] if tag
-        
-        i, j = ai + size, bj + size
-        
-        answer.push [:equal, ai, i, bj, j] unless size.zero?
-        
-      end
-      return answer
-    end
-
-    # XXX: untested
-    def get_grouped_opcodes(n=3)
-      codes = get_opcodes
-      if codes[0][0] == :equal
-        tag, i1, i2, j1, j2 = codes[0]
-        codes[0] = tag, [i1, i2 - n].max, i2, [j1, j2-n].max, j2
-      end
-      
-      if codes[-1][0] == :equal
-        tag, i1, i2, j1, j2 = codes[-1]
-        codes[-1] = tag, i1, min(i2, i1+n), j1, min(j2, j1+n)
-      end
-      nn = n + n
-      group = []
-      codes.each do |tag, i1, i2, j1, j2|
-        if tag == :equal and i2-i1 > nn
-          group.push [tag, i1, [i2, i1 + n].min, j1, [j2, j1 + n].min]
-          yield group
-          group = []
-          i1, j1 = [i1, i2-n].max, [j1, j2-n].max
-          group.push [tag, i1, i2, j1 ,j2]
-        end
-      end
-      if group and group.length != 1 and group[0][0] == :equal
-        yield group
-      end
-    end
-
-    def ratio
-      matches = get_matching_blocks.reduce(0) do |sum, triple|
-        sum + triple[-1]
-      end
-      Diff.calculate_ratio(matches, @a.length + @b.length)
-    end
-
-    def quick_ratio
-      if @fullbcount.nil? or @fullbcount.empty?
-        @fullbcount = {}
-        @b.each do |elt|
-          @fullbcount[elt] = (@fullbcount[elt] || 0) + 1
-        end
-      end
-      
-      avail = {}
-      matches = 0
-      @a.each do |elt|
-        if avail.has_key? elt
-          numb = avail[elt]
-        else
-          numb = @fullbcount[elt] || 0
-        end
-        avail[elt] = numb - 1
-        if numb > 0
-          matches += 1
-        end
-      end
-      Diff.calculate_ratio matches, @a.length + @b.length
-    end
-
-    def real_quick_ratio
-      la, lb = @a.length, @b.length
-      Diff.calculate_ratio([la, lb].min, la + lb)
-    end
-
-    protected :chain_b, :match_block_helper
-  end # end class SequenceMatcher
-
-  def self.calculate_ratio(matches, length)
-    return 1.0 if length.zero?
-    2.0 * matches / length
-  end
-
-  # XXX: untested
-  def self.get_close_matches(word, possibilities, n=3, cutoff=0.6)
-    unless n > 0
-      raise "n must be > 0: #{n}"
-    end
-    unless 0.0 <= cutoff and cutoff <= 1.0
-      raise "cutoff must be in (0.0..1.0): #{cutoff}"
-    end
-
-    result = []
-    s = SequenceMatcher.new
-    s.set_seq_b word
-    possibilities.each do |x|
-      s.set_seq_a x
-      if s.real_quick_ratio >= cutoff and
-          s.quick_ratio >= cutoff and
-          s.ratio >= cutoff
-        result.push [s.ratio, x]
-      end
-    end
-    
-    unless result.nil? or result.empty?
-      result.sort
-      result.reverse!
-      result = result[-n..-1]
-    end
-    result.collect { |score, x| x }
-  end
-
-  def self.count_leading(line, ch)
-    i, n = 0, line.length
-    while i < n and line[i].chr == ch
-      i += 1
-    end
-    i
-  end
-end
-
-
-module HTMLDiff
-  include Diff
-  class Builder
-    VALID_METHODS = [:replace, :insert, :delete, :equal]
-    def initialize(a, b)
-      @a = a
-      @b = b
-      @content = []
-    end
-
-    def do_op(opcode)
-      @opcode = opcode
-      op = @opcode[0]
-      VALID_METHODS.include?(op) or raise(NameError, "Invalid opcode #{op}")
-      self.method(op).call
-    end
-
-    def result
-      @content.join('')
-    end
-
-    #this methods have to be called via do_op(opcode) so that @opcode is set properly
-    private
-
-    def replace
-      delete("diffmod")
-      insert("diffmod")
-    end
-    
-    def insert(tagclass="diffins")
-      op_helper("ins", tagclass, @b[@opcode[3]...@opcode[4]])
-    end
-    
-    def delete(tagclass="diffdel")
-       op_helper("del", tagclass, @a[@opcode[1]...@opcode[2]])
-    end
-    
-    def equal
-      @content += @b[@opcode[3]...@opcode[4]]
-    end
-  
-    # using this as op_helper would be equivalent to the first version of diff.rb by Bill Atkins
-    def op_helper_simple(tagname, tagclass, to_add)
-      @content << "<#{tagname} class=\"#{tagclass}\">" 
-      @content += to_add
-      @content << "</#{tagname}>"
-    end
-    
-    # this tries to put <p> tags or newline chars before the opening diff tags (<ins> or <del>)
-    # or after the ending diff tags
-    # as a result the diff tags should be the "more inside" possible.
-    # this seems to work nice with html containing only paragraphs
-    # but not sure it works if there are other tags (div, span ... ? ) around
-    def op_helper(tagname, tagclass, to_add)
-      @content << to_add.shift while ( HTMLDiff.is_newline(to_add.first) or 
-                                         HTMLDiff.is_p_close_tag(to_add.first) or
-                                         HTMLDiff.is_p_open_tag(to_add.first) )
-      @content << "<#{tagname} class=\"#{tagclass}\">" 
-      @content += to_add
-      last_tags = []
-      last_tags.unshift(@content.pop) while ( HTMLDiff.is_newline(@content.last) or 
-                                         HTMLDiff.is_p_close_tag(@content.last) or
-                                         HTMLDiff.is_p_open_tag(@content.last) )
-      last_tags.unshift "</#{tagname}>"
-      @content += last_tags
-      remove_empty_diff(tagname, tagclass)
-    end
-
-    def remove_empty_diff(tagname, tagclass)
-      if @content[-2] == "<#{tagname} class=\"#{tagclass}\">" and @content[-1] == "</#{tagname}>" then
-        @content.pop
-        @content.pop
-      end
-    end
-
-  end
-  
-  def self.is_newline(x)
-    (x == "\n") or (x == "\r") or (x == "\t")
-  end
-
-  def self.is_p_open_tag(x)
-    x =~ /\A<(p|li|ul|ol|dir|dt|dl)/
-  end
-
-  def self.is_p_close_tag(x)
-    x =~ %r!\A</(p|li|ul|ol|dir|dt|dl)!
-  end
-
-  def self.diff(a, b)
-    a, b = a.split(//), b.split(//) if a.kind_of? String and b.kind_of? String
-    a, b = html2list(a), html2list(b)
-
-    out = Builder.new(a, b)
-    s = SequenceMatcher.new(a, b)
-
-    s.get_opcodes.each do |opcode|
-      out.do_op(opcode)
-    end
-
-    out.result 
-  end
-  
-  def self.html2list(x, b=false)
-    mode = 'char'
-    cur = ''
-    out = []
-    
-    x = x.split(//) if x.kind_of? String
-    
-    x.each do |c|
-      if mode == 'tag'
-        if c == '>'
-          if b
-            cur += ']'
-          else
-            cur += c
-          end
-          out.push(cur)
-          cur = ''
-          mode = 'char'
-        else
-          cur += c
-        end
-      elsif mode == 'char'
-        if c == '<'
-          out.push cur
-          if b
-            cur = '['
-          else
-            cur = c
-          end
-          mode = 'tag'
-        elsif /\s/.match c
-          out.push cur + c
-          cur = ''
-        else
-          cur += c
-        end
-      end
-    end
-    
-    out.push cur
-    # TODO: make something better here
-    out.each{|x| x.chomp! unless is_newline(x)}
-    out.find_all { |x| x != '' }
-  end
-  
-  
-end
-
-if __FILE__ == $0
-
-  require 'pp'
-  # a = "<p>this is the original string</p>" # \n<p>but around the world</p>"
-  # b = "<p>this is the original </p><p>other parag</p><p>string</p>"
-  a = "<ul>\n\t<li>one</li>\n\t<li>two</li>\n</ul>"
-  b = "<ul>\n\t<li>one</li>\n\t<li>two\n\t<ul><li>abc</li></ul></li>\n</ul>"
-  puts a
-  pp HTMLDiff.html2list(a)
-  puts
-  puts b
-  pp HTMLDiff.html2list(b)
- puts
-  puts HTMLDiff.diff(a, b)
-end
+# heavily based off difflib.py - see that file for documentation
+# ported from Python by Bill Atkins
+
+# This does not support all features offered by difflib; it 
+# implements only the subset of features necessary
+# to support a Ruby version of HTML Differ.  You're welcome to finish this off.
+
+# By default, String#each iterates by line.  This isn't really appropriate
+# for diff, so often a string will be split by // to get an array of one-
+# character strings.
+
+# Some methods in Diff are untested and are not guaranteed to work.  The
+# methods in HTMLDiff and any methods it calls should work quite well.
+
+# changes by DenisMertz
+# * main change:
+# ** get the tag soup away
+#    the tag soup problem was first reported with <p> tags, but it appeared also with
+#    <li>, <ul> etc... tags 
+#   this version should mostly fix these problems
+# ** added a Builder class to manage the creation of the final htmldiff
+# * minor changes:
+# ** use symbols instead of string to represent opcodes 
+# ** small fix to html2list
+#
+
+module Enumerable
+  def reduce(init)
+    result = init
+    each { |item| result = yield(result, item) }
+    result
+  end
+end
+
+module Diff
+
+  class SequenceMatcher
+    def initialize(a=[''], b=[''], isjunk=nil, byline=false)
+      a = (!byline and a.kind_of? String) ? a.split(//) : a
+      b = (!byline and b.kind_of? String) ? b.split(//) : b
+      @isjunk = isjunk || proc {}
+      set_seqs a, b
+    end
+
+    def set_seqs(a, b)
+      set_seq_a a
+      set_seq_b b
+    end
+
+    def set_seq_a(a)
+      @a = a
+      @matching_blocks = @opcodes = nil
+    end
+
+    def set_seq_b(b)
+      @b = b
+      @matching_blocks = @opcodes = nil
+      chain_b
+    end
+
+    def chain_b
+      @fullbcount = nil
+      @b2j = {}
+      pophash = {}
+      junkdict = {}
+      
+      @b.each_with_index do |elt, i|
+        if @b2j.has_key? elt
+          indices = @b2j[elt]
+          if @b.length >= 200 and indices.length * 100 > @b.length
+            pophash[elt] = 1
+            indices.clear
+          else
+            indices.push i
+          end
+        else
+          @b2j[elt] = [i]
+        end
+      end
+        
+      pophash.each_key { |elt| @b2j.delete elt }
+      
+      junkdict = {}
+        
+      unless @isjunk.nil?
+        [pophash, @b2j].each do |d|
+          d.each_key do |elt|
+            if @isjunk.call(elt)
+              junkdict[elt] = 1
+              d.delete elt
+            end
+          end
+        end
+      end
+      
+      @isbjunk = junkdict.method(:has_key?)
+      @isbpopular = junkdict.method(:has_key?)
+    end
+    
+    def find_longest_match(alo, ahi, blo, bhi)
+      besti, bestj, bestsize = alo, blo, 0
+      
+      j2len = {}
+      
+      (alo..ahi).step do |i|
+        newj2len = {}
+        (@b2j[@a[i]] || []).each do |j|
+          if j < blo
+            next
+          end
+          if j >= bhi
+            break
+          end
+          
+          k = newj2len[j] = (j2len[j - 1] || 0) + 1
+          if k > bestsize
+            besti, bestj, bestsize = i - k + 1, j - k + 1, k
+          end
+        end
+        j2len = newj2len
+      end
+      
+      while besti > alo and bestj > blo and
+          not @isbjunk.call(@b[bestj-1]) and
+          @a[besti-1] == @b[bestj-1]
+        besti, bestj, bestsize = besti-1, bestj-1, bestsize+1
+      end
+      
+      while besti+bestsize < ahi and bestj+bestsize < bhi and
+          not @isbjunk.call(@b[bestj+bestsize]) and
+          @a[besti+bestsize] == @b[bestj+bestsize]
+        bestsize += 1
+      end
+      
+      while besti > alo and bestj > blo and
+          @isbjunk.call(@b[bestj-1]) and
+          @a[besti-1] == @b[bestj-1]
+        besti, bestj, bestsize = besti-1, bestj-1, bestsize+1
+      end
+      
+      while besti+bestsize < ahi and bestj+bestsize < bhi and
+          @isbjunk.call(@b[bestj+bestsize]) and
+          @a[besti+bestsize] == @b[bestj+bestsize]
+        bestsize += 1
+      end
+      
+      [besti, bestj, bestsize]
+    end
+    
+    def get_matching_blocks
+      return @matching_blocks unless @matching_blocks.nil? or 
+        @matching_blocks.empty?
+      
+      @matching_blocks = []
+      la, lb = @a.length, @b.length
+      match_block_helper(0, la, 0, lb, @matching_blocks)
+      @matching_blocks.push [la, lb, 0]
+    end
+    
+    def match_block_helper(alo, ahi, blo, bhi, answer)
+      i, j, k = x = find_longest_match(alo, ahi, blo, bhi)
+      if not k.zero?
+        if alo < i and blo < j
+          match_block_helper(alo, i, blo, j, answer)
+        end
+        answer.push x
+        if i + k < ahi and j + k < bhi
+          match_block_helper(i + k, ahi, j + k, bhi, answer)
+        end
+      end
+    end
+    
+    def get_opcodes
+      unless @opcodes.nil? or @opcodes.empty?
+        return @opcodes
+      end
+
+      i = j = 0
+      @opcodes = answer = []
+      get_matching_blocks.each do |ai, bj, size|
+        tag = if i < ai and j < bj
+                :replace
+              elsif i < ai
+                :delete
+              elsif j < bj 
+                :insert
+              end
+
+        answer.push [tag, i, ai, j, bj] if tag
+        
+        i, j = ai + size, bj + size
+        
+        answer.push [:equal, ai, i, bj, j] unless size.zero?
+        
+      end
+      return answer
+    end
+
+    # XXX: untested
+    def get_grouped_opcodes(n=3)
+      codes = get_opcodes
+      if codes[0][0] == :equal
+        tag, i1, i2, j1, j2 = codes[0]
+        codes[0] = tag, [i1, i2 - n].max, i2, [j1, j2-n].max, j2
+      end
+      
+      if codes[-1][0] == :equal
+        tag, i1, i2, j1, j2 = codes[-1]
+        codes[-1] = tag, i1, min(i2, i1+n), j1, min(j2, j1+n)
+      end
+      nn = n + n
+      group = []
+      codes.each do |tag, i1, i2, j1, j2|
+        if tag == :equal and i2-i1 > nn
+          group.push [tag, i1, [i2, i1 + n].min, j1, [j2, j1 + n].min]
+          yield group
+          group = []
+          i1, j1 = [i1, i2-n].max, [j1, j2-n].max
+          group.push [tag, i1, i2, j1 ,j2]
+        end
+      end
+      if group and group.length != 1 and group[0][0] == :equal
+        yield group
+      end
+    end
+
+    def ratio
+      matches = get_matching_blocks.reduce(0) do |sum, triple|
+        sum + triple[-1]
+      end
+      Diff.calculate_ratio(matches, @a.length + @b.length)
+    end
+
+    def quick_ratio
+      if @fullbcount.nil? or @fullbcount.empty?
+        @fullbcount = {}
+        @b.each do |elt|
+          @fullbcount[elt] = (@fullbcount[elt] || 0) + 1
+        end
+      end
+      
+      avail = {}
+      matches = 0
+      @a.each do |elt|
+        if avail.has_key? elt
+          numb = avail[elt]
+        else
+          numb = @fullbcount[elt] || 0
+        end
+        avail[elt] = numb - 1
+        if numb > 0
+          matches += 1
+        end
+      end
+      Diff.calculate_ratio matches, @a.length + @b.length
+    end
+
+    def real_quick_ratio
+      la, lb = @a.length, @b.length
+      Diff.calculate_ratio([la, lb].min, la + lb)
+    end
+
+    protected :chain_b, :match_block_helper
+  end # end class SequenceMatcher
+
+  def self.calculate_ratio(matches, length)
+    return 1.0 if length.zero?
+    2.0 * matches / length
+  end
+
+  # XXX: untested
+  def self.get_close_matches(word, possibilities, n=3, cutoff=0.6)
+    unless n > 0
+      raise "n must be > 0: #{n}"
+    end
+    unless 0.0 <= cutoff and cutoff <= 1.0
+      raise "cutoff must be in (0.0..1.0): #{cutoff}"
+    end
+
+    result = []
+    s = SequenceMatcher.new
+    s.set_seq_b word
+    possibilities.each do |x|
+      s.set_seq_a x
+      if s.real_quick_ratio >= cutoff and
+          s.quick_ratio >= cutoff and
+          s.ratio >= cutoff
+        result.push [s.ratio, x]
+      end
+    end
+    
+    unless result.nil? or result.empty?
+      result.sort
+      result.reverse!
+      result = result[-n..-1]
+    end
+    result.collect { |score, x| x }
+  end
+
+  def self.count_leading(line, ch)
+    i, n = 0, line.length
+    while i < n and line[i].chr == ch
+      i += 1
+    end
+    i
+  end
+end
+
+
+module HTMLDiff
+  include Diff
+  class Builder
+    VALID_METHODS = [:replace, :insert, :delete, :equal]
+    def initialize(a, b)
+      @a = a
+      @b = b
+      @content = []
+    end
+
+    def do_op(opcode)
+      @opcode = opcode
+      op = @opcode[0]
+      VALID_METHODS.include?(op) or raise(NameError, "Invalid opcode #{op}")
+      self.method(op).call
+    end
+
+    def result
+      @content.join('')
+    end
+
+    #this methods have to be called via do_op(opcode) so that @opcode is set properly
+    private
+
+    def replace
+      delete("diffmod")
+      insert("diffmod")
+    end
+    
+    def insert(tagclass="diffins")
+      op_helper("ins", tagclass, @b[@opcode[3]...@opcode[4]])
+    end
+    
+    def delete(tagclass="diffdel")
+       op_helper("del", tagclass, @a[@opcode[1]...@opcode[2]])
+    end
+    
+    def equal
+      @content += @b[@opcode[3]...@opcode[4]]
+    end
+  
+    # using this as op_helper would be equivalent to the first version of diff.rb by Bill Atkins
+    def op_helper_simple(tagname, tagclass, to_add)
+      @content << "<#{tagname} class=\"#{tagclass}\">" 
+      @content += to_add
+      @content << "</#{tagname}>"
+    end
+    
+    # this tries to put <p> tags or newline chars before the opening diff tags (<ins> or <del>)
+    # or after the ending diff tags
+    # as a result the diff tags should be the "more inside" possible.
+    # this seems to work nice with html containing only paragraphs
+    # but not sure it works if there are other tags (div, span ... ? ) around
+    def op_helper(tagname, tagclass, to_add)
+      @content << to_add.shift while ( HTMLDiff.is_newline(to_add.first) or 
+                                         HTMLDiff.is_p_close_tag(to_add.first) or
+                                         HTMLDiff.is_p_open_tag(to_add.first) )
+      @content << "<#{tagname} class=\"#{tagclass}\">" 
+      @content += to_add
+      last_tags = []
+      last_tags.unshift(@content.pop) while ( HTMLDiff.is_newline(@content.last) or 
+                                         HTMLDiff.is_p_close_tag(@content.last) or
+                                         HTMLDiff.is_p_open_tag(@content.last) )
+      last_tags.unshift "</#{tagname}>"
+      @content += last_tags
+      remove_empty_diff(tagname, tagclass)
+    end
+
+    def remove_empty_diff(tagname, tagclass)
+      if @content[-2] == "<#{tagname} class=\"#{tagclass}\">" and @content[-1] == "</#{tagname}>" then
+        @content.pop
+        @content.pop
+      end
+    end
+
+  end
+  
+  def self.is_newline(x)
+    (x == "\n") or (x == "\r") or (x == "\t")
+  end
+
+  def self.is_p_open_tag(x)
+    x =~ /\A<(p|li|ul|ol|dir|dt|dl)/
+  end
+
+  def self.is_p_close_tag(x)
+    x =~ %r!\A</(p|li|ul|ol|dir|dt|dl)!
+  end
+
+  def self.diff(a, b)
+    a = html2list(a)
+    b = html2list(b)
+
+    out = Builder.new(a, b)
+    s = SequenceMatcher.new(a, b)
+
+    s.get_opcodes.each do |opcode|
+      out.do_op(opcode)
+    end
+
+    out.result 
+  end
+  
+  def self.html2list(x)
+    mode = :char
+    cur = ''
+    out = []
+    
+    x.split('').each do |c|
+      if mode == :tag
+        cur += c
+        if c == '>'
+          out.push(cur)
+          cur = ''
+          mode = :char
+        end
+      elsif mode == :char
+        if c == '<'
+          out.push cur
+          cur = c
+          mode = :tag
+        elsif c =~ /\s/
+          out.push cur + c
+          cur = ''
+        else
+          cur += c
+        end
+      end
+    end
+
+    out.push cur
+    out.find_all { |x| x != '' }
+  end
+  
+end