remq 0.0.1a → 0.0.3

data/vendor/bundle/gems/diff-lcs-1.1.3/lib/diff/lcs/change.rb

@@ -0,0 +1,169 @@
+#! /usr/env/bin ruby
+#--
+# Copyright 2004 Austin Ziegler <diff-lcs@halostatue.ca>
+#   adapted from:
+#     Algorithm::Diff (Perl) by Ned Konz <perl@bike-nomad.com>
+#     Smalltalk by Mario I. Wolczko <mario@wolczko.com>
+#   implements McIlroy-Hunt diff algorithm
+#
+# This program is free software. It may be redistributed and/or modified under
+# the terms of the GPL version 2 (or later), the Perl Artistic licence, or the
+# Ruby licence.
+# 
+# $Id$
+#++
+# Provides Diff::LCS::Change and Diff::LCS::ContextChange.
+
+  # Centralises the change test code in Diff::LCS::Change and
+  # Diff::LCS::ContextChange, since it's the same for both classes.
+module Diff::LCS::ChangeTypeTests
+  def deleting?
+    @action == '-'
+  end
+
+  def adding?
+    @action == '+'
+  end
+
+  def unchanged?
+    @action == '='
+  end
+
+  def changed?
+    @changed == '!'
+  end
+
+  def finished_a?
+    @changed == '>'
+  end
+
+  def finished_b?
+    @changed == '<'
+  end
+end
+
+  # Represents a simplistic (non-contextual) change. Represents the removal or
+  # addition of an element from either the old or the new sequenced enumerable.
+class Diff::LCS::Change
+    # Returns the action this Change represents. Can be '+' (#adding?), '-'
+    # (#deleting?), '=' (#unchanged?), # or '!' (#changed?). When created by
+    # Diff::LCS#diff or Diff::LCS#sdiff, it may also be '>' (#finished_a?) or
+    # '<' (#finished_b?).
+  attr_reader :action
+  attr_reader :position
+  attr_reader :element
+
+  include Comparable
+  def ==(other)
+    (self.action == other.action) and
+    (self.position == other.position) and
+    (self.element == other.element)
+  end
+
+  def <=>(other)
+    r = self.action <=> other.action
+    r = self.position <=> other.position if r.zero?
+    r = self.element <=> other.element if r.zero?
+    r
+  end
+
+  def initialize(action, position, element)
+    @action = action
+    @position = position
+    @element = element
+  end
+
+    # Creates a Change from an array produced by Change#to_a.
+  def to_a
+    [@action, @position, @element]
+  end
+
+  def self.from_a(arr)
+    Diff::LCS::Change.new(arr[0], arr[1], arr[2])
+  end
+
+  include Diff::LCS::ChangeTypeTests
+end
+
+  # Represents a contextual change. Contains the position and values of the
+  # elements in the old and the new sequenced enumerables as well as the action
+  # taken.
+class Diff::LCS::ContextChange
+    # Returns the action this Change represents. Can be '+' (#adding?), '-'
+    # (#deleting?), '=' (#unchanged?), # or '!' (#changed?). When
+    # created by Diff::LCS#diff or Diff::LCS#sdiff, it may also be '>'
+    # (#finished_a?) or '<' (#finished_b?).
+  attr_reader :action
+  attr_reader :old_position
+  attr_reader :old_element
+  attr_reader :new_position
+  attr_reader :new_element
+
+  include Comparable
+
+  def ==(other)
+    (@action == other.action) and
+    (@old_position == other.old_position) and
+    (@new_position == other.new_position) and
+    (@old_element == other.old_element) and
+    (@new_element == other.new_element)
+  end
+
+  def inspect(*args)
+    %Q(#<#{self.class.name}:#{__id__} @action=#{action} positions=#{old_position},#{new_position} elements=#{old_element.inspect},#{new_element.inspect}>)
+  end
+
+  def <=>(other)
+    r = @action <=> other.action
+    r = @old_position <=> other.old_position if r.zero?
+    r = @new_position <=> other.new_position if r.zero?
+    r = @old_element <=> other.old_element if r.zero?
+    r = @new_element <=> other.new_element if r.zero?
+    r
+  end
+
+  def initialize(action, old_position, old_element, new_position, new_element)
+    @action = action
+    @old_position = old_position
+    @old_element = old_element
+    @new_position = new_position
+    @new_element = new_element
+  end
+
+  def to_a
+    [@action, [@old_position, @old_element], [@new_position, @new_element]]
+  end
+
+    # Creates a ContextChange from an array produced by ContextChange#to_a.
+  def self.from_a(arr)
+    if arr.size == 5
+      Diff::LCS::ContextChange.new(arr[0], arr[1], arr[2], arr[3], arr[4])
+    else
+      Diff::LCS::ContextChange.new(arr[0], arr[1][0], arr[1][1], arr[2][0],
+                                   arr[2][1])
+    end
+  end
+
+    # Simplifies a context change for use in some diff callbacks. '<' actions
+    # are converted to '-' and '>' actions are converted to '+'. 
+  def self.simplify(event)
+    ea = event.to_a
+
+    case ea[0]
+    when '-'
+      ea[2][1] = nil
+    when '<'
+      ea[0] = '-'
+      ea[2][1] = nil
+    when '+'
+      ea[1][1] = nil
+    when '>'
+      ea[0] = '+'
+      ea[1][1] = nil
+    end
+
+    Diff::LCS::ContextChange.from_a(ea)
+  end
+
+  include Diff::LCS::ChangeTypeTests
+end

data/vendor/bundle/gems/diff-lcs-1.1.3/lib/diff/lcs/htmldiff.rb

@@ -0,0 +1,151 @@
+# -*- ruby encoding: utf-8 -*-
+
+require 'cgi'
+
+class Diff::LCS::HTMLDiff
+  class << self
+    attr_accessor :can_expand_tabs #:nodoc:
+  end
+  self.can_expand_tabs = true
+
+  class Callbacks
+    attr_accessor :output
+    attr_accessor :match_class
+    attr_accessor :only_a_class
+    attr_accessor :only_b_class
+
+    def initialize(output, options = {})
+      @output = output
+      options ||= {}
+
+      @match_class = options[:match_class] || "match"
+      @only_a_class = options[:only_a_class] || "only_a"
+      @only_b_class = options[:only_b_class] || "only_b"
+    end
+
+    def htmlize(element, css_class)
+      element = "&nbsp;" if element.empty?
+      %Q|<pre class="#{__send__(css_class)}">#{element}</pre>\n|
+    end
+    private :htmlize
+
+    # This will be called with both lines are the same
+    def match(event)
+      @output << htmlize(event.old_element, :match_class)
+    end
+
+    # This will be called when there is a line in A that isn't in B
+    def discard_a(event)
+      @output << htmlize(event.old_element, :only_a_class)
+    end
+
+    # This will be called when there is a line in B that isn't in A
+    def discard_b(event)
+      @output << htmlize(event.new_element, :only_b_class)
+    end
+  end
+
+  DEFAULT_OPTIONS = {
+    :expand_tabs => nil,
+    :output => nil,
+    :css => nil,
+    :title => nil,
+  }
+
+  DEFAULT_CSS = <<-CSS
+body { margin: 0; }
+.diff
+{
+  border: 1px solid black;
+  margin: 1em 2em;
+}
+p
+{
+  margin-left: 2em;
+}
+pre
+{
+  padding-left: 1em;
+  margin: 0;
+  font-family: Inconsolata, Consolas, Lucida, Courier, monospaced;
+	white-space: pre;
+}
+.match { }
+.only_a
+{
+  background-color: #fdd;
+  color: red;
+  text-decoration: line-through;
+}
+.only_b
+{
+  background-color: #ddf;
+  color: blue;
+  border-left: 3px solid blue
+}
+h1 { margin-left: 2em; }
+  CSS
+
+  def initialize(left, right, options = nil)
+    @left     = left
+    @right    = right
+    @options  = options
+
+    @options = DEFAULT_OPTIONS.dup if @options.nil?
+  end
+
+  def verify_options
+    @options[:expand_tabs] ||= 4
+    @options[:expand_tabs] = 4 if @options[:expand_tabs] < 0
+
+    @options[:output] ||= $stdout
+
+    @options[:css] ||= DEFAULT_CSS.dup
+
+    @options[:title] ||= "diff"
+  end
+  private :verify_options
+
+  attr_reader :options
+
+  def run
+    verify_options
+
+    if @options[:expand_tabs] > 0 && self.class.can_expand_tabs
+      formatter = Text::Format.new
+      formatter.tabstop = @options[:expand_tabs]
+
+      @left = left.map { |line| formatter.expand(line.chomp) }
+      @right = right.map { |line| formatter.expand(line.chomp) }
+    end
+
+    @left.map! { |line| CGI.escapeHTML(line.chomp) }
+    @right.map! { |line| CGI.escapeHTML(line.chomp) }
+
+    @options[:output] << <<-OUTPUT
+<html>
+  <head>
+    <title>#{@options[:title]}</title>
+    <style type="text/css">
+    #{@options[:css]}
+    </style>
+  </head>
+  <body>
+    <h1>#{@options[:title]}</h1>
+    <p>Legend: <span class="only_a">Only in Old</span>&nbsp;
+    <span class="only_b">Only in New</span></p>
+    <div class="diff">
+    OUTPUT
+
+    callbacks = Callbacks.new(@options[:output])
+    Diff::LCS.traverse_sequences(@left, @right, callbacks)
+
+    @options[:output] << <<-OUTPUT
+    </div>
+  </body>
+</html>
+    OUTPUT
+  end
+end
+
+# vim: ft=ruby

data/vendor/bundle/gems/diff-lcs-1.1.3/lib/diff/lcs/hunk.rb

@@ -0,0 +1,242 @@
+require 'diff/lcs/block'
+
+  # A Hunk is a group of Blocks which overlap because of the context
+  # surrounding each block. (So if we're not using context, every hunk will
+  # contain one block.) Used in the diff program (bin/diff).
+class Diff::LCS::Hunk
+    # Create a hunk using references to both the old and new data, as well as
+    # the piece of data
+  def initialize(data_old, data_new, piece, context, file_length_difference)
+      # At first, a hunk will have just one Block in it
+    @blocks = [ Diff::LCS::Block.new(piece) ]
+    @data_old = data_old
+    @data_new = data_new
+
+    before = after = file_length_difference
+    after += @blocks[0].diff_size
+    @file_length_difference = after # The caller must get this manually
+
+      # Save the start & end of each array. If the array doesn't exist
+      # (e.g., we're only adding items in this block), then figure out the
+      # line number based on the line number of the other file and the
+      # current difference in file lengths.
+    if @blocks[0].remove.empty?
+      a1 = a2 = nil
+    else
+      a1 = @blocks[0].remove[0].position
+      a2 = @blocks[0].remove[-1].position
+    end
+
+    if @blocks[0].insert.empty?
+      b1 = b2 = nil
+    else
+      b1 = @blocks[0].insert[0].position
+      b2 = @blocks[0].insert[-1].position
+    end
+
+    @start_old = a1 || (b1 - before)
+    @start_new = b1 || (a1 + before)
+    @end_old   = a2 || (b2 - after)
+    @end_new   = b2 || (a2 + after)
+
+    self.flag_context = context
+  end
+
+  attr_reader :blocks
+  attr_reader :start_old, :start_new
+  attr_reader :end_old, :end_new
+  attr_reader :file_length_difference
+
+    # Change the "start" and "end" fields to note that context should be added
+    # to this hunk
+  attr_accessor :flag_context
+  undef :flag_context=
+  def flag_context=(context) #:nodoc:
+    return if context.nil? or context.zero?
+
+    add_start = (context > @start_old) ? @start_old : context
+    @start_old -= add_start
+    @start_new -= add_start
+
+    if (@end_old + context) > @data_old.size
+      add_end = @data_old.size - @end_old
+    else
+      add_end = context
+    end
+    @end_old += add_end
+    @end_new += add_end
+  end
+
+  def unshift(hunk)
+    @start_old = hunk.start_old
+    @start_new = hunk.start_new
+    blocks.unshift(*hunk.blocks)
+  end
+
+    # Is there an overlap between hunk arg0 and old hunk arg1? Note: if end
+    # of old hunk is one less than beginning of second, they overlap
+  def overlaps?(hunk = nil)
+    return nil if hunk.nil?
+
+    a = (@start_old - hunk.end_old) <= 1
+    b = (@start_new - hunk.end_new) <= 1
+    return (a or b)
+  end
+
+  def diff(format)
+    case format
+    when :old
+      old_diff
+    when :unified
+      unified_diff
+    when :context
+      context_diff
+    when :ed
+      self
+    when :reverse_ed, :ed_finish
+      ed_diff(format)
+    else
+      raise "Unknown diff format #{format}."
+    end
+  end
+
+  def each_old(block)
+    @data_old[@start_old .. @end_old].each { |e| yield e }
+  end
+
+  private
+    # Note that an old diff can't have any context. Therefore, we know that
+    # there's only one block in the hunk.
+  def old_diff
+    warn "Expecting only one block in an old diff hunk!" if @blocks.size > 1
+    op_act = { "+" => 'a', "-" => 'd', "!" => "c" }
+
+    block = @blocks[0]
+
+      # Calculate item number range. Old diff range is just like a context
+      # diff range, except the ranges are on one line with the action between
+      # them.
+    s = "#{context_range(:old)}#{op_act[block.op]}#{context_range(:new)}\n"
+      # If removing anything, just print out all the remove lines in the hunk
+      # which is just all the remove lines in the block.
+    @data_old[@start_old .. @end_old].each { |e| s << "< #{e}\n" } unless block.remove.empty?
+    s << "---\n" if block.op == "!"
+    @data_new[@start_new .. @end_new].each { |e| s << "> #{e}\n" } unless block.insert.empty?
+    s
+  end
+
+  def unified_diff
+      # Calculate item number range.
+    s = "@@ -#{unified_range(:old)} +#{unified_range(:new)} @@\n"
+
+      # Outlist starts containing the hunk of the old file. Removing an item
+      # just means putting a '-' in front of it. Inserting an item requires
+      # getting it from the new file and splicing it in. We splice in
+      # +num_added+ items. Remove blocks use +num_added+ because splicing
+      # changed the length of outlist.
+      #
+      # We remove +num_removed+ items. Insert blocks use +num_removed+
+      # because their item numbers -- corresponding to positions in the NEW
+      # file -- don't take removed items into account.
+    lo, hi, num_added, num_removed = @start_old, @end_old, 0, 0
+
+    outlist = @data_old[lo .. hi].collect { |e| e.gsub(/^/, ' ') }
+
+    @blocks.each do |block|
+      block.remove.each do |item|
+        op = item.action.to_s # -
+        offset = item.position - lo + num_added
+        outlist[offset].gsub!(/^ /, op.to_s)
+        num_removed += 1
+      end
+      block.insert.each do |item|
+        op = item.action.to_s # +
+        offset = item.position - @start_new + num_removed
+        outlist[offset, 0] = "#{op}#{@data_new[item.position]}"
+        num_added += 1
+      end
+    end
+
+    s << outlist.join("\n")
+  end
+
+  def context_diff
+    s = "***************\n"
+    s << "*** #{context_range(:old)} ****\n"
+    r = context_range(:new)
+
+      # Print out file 1 part for each block in context diff format if there
+      # are any blocks that remove items
+    lo, hi = @start_old, @end_old
+    removes = @blocks.select { |e| not e.remove.empty? }
+    if removes
+      outlist = @data_old[lo .. hi].collect { |e| e.gsub(/^/, '  ') }
+      removes.each do |block|
+        block.remove.each do |item|
+          outlist[item.position - lo].gsub!(/^ /) { block.op } # - or !
+        end
+      end
+      s << outlist.join("\n")
+    end
+
+    s << "\n--- #{r} ----\n"
+    lo, hi = @start_new, @end_new
+    inserts = @blocks.select { |e| not e.insert.empty? }
+    if inserts
+      outlist = @data_new[lo .. hi].collect { |e| e.gsub(/^/, '  ') }
+      inserts.each do |block|
+        block.insert.each do |item|
+          outlist[item.position - lo].gsub!(/^ /) { block.op } # + or !
+        end
+      end
+      s << outlist.join("\n")
+    end
+    s
+  end
+
+  def ed_diff(format)
+    op_act = { "+" => 'a', "-" => 'd', "!" => "c" }
+    warn "Expecting only one block in an old diff hunk!" if @blocks.size > 1
+
+    if format == :reverse_ed
+      s = "#{op_act[@blocks[0].op]}#{context_range(:old)}\n"
+    else
+      s = "#{context_range(:old).gsub(/,/, ' ')}#{op_act[@blocks[0].op]}\n"
+    end
+
+    unless @blocks[0].insert.empty?
+      @data_new[@start_new .. @end_new].each { |e| s << "#{e}\n" }
+      s << ".\n"
+    end
+    s
+  end
+
+    # Generate a range of item numbers to print. Only print 1 number if the
+    # range has only one item in it. Otherwise, it's 'start,end'
+  def context_range(mode)
+    case mode
+    when :old
+      s, e = (@start_old + 1), (@end_old + 1)
+    when :new
+      s, e = (@start_new + 1), (@end_new + 1)
+    end
+
+    (s < e) ? "#{s},#{e}" : "#{e}"
+  end
+
+    # Generate a range of item numbers to print for unified diff. Print
+    # number where block starts, followed by number of lines in the block
+    # (don't print number of lines if it's 1)
+  def unified_range(mode)
+    case mode
+    when :old
+      s, e = (@start_old + 1), (@end_old + 1)
+    when :new
+      s, e = (@start_new + 1), (@end_new + 1)
+    end
+
+    length = e - s + 1
+    first = (length < 2) ? e : s # "strange, but correct"
+    (length == 1) ? "#{first}" : "#{first},#{length}"
+  end
+end