colibri 0.0.1

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2008 [name of plugin creator]
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Manifest

@@ -0,0 +1,12 @@
+MIT-LICENSE
+README
+Rakefile
+init.rb
+lib/colibri.rb
+lib/diff_helper.rb
+lib/output/simple_correction_diff.rb
+lib/output/simple_html_diff.rb
+lib/output/string_simple_correction_diff.rb
+lib/output/vc_diff.rb
+sample.css
+Manifest

data/README

@@ -0,0 +1,54 @@
+=Colibri
+====
+
+This is a small plug-in to provide an easy way to display a diff of two "files"
+(long strings...) as html. It uses the diff-lcs gem to calculate the diff.
+The default output "generator" creates table-rows in the following scheme:
+
+| Old-Line-Nr | Old-File | New-File | Old-Line-Nr |
+
+It applies different css classes to the elements depending on match/difference.
+
+==Source
+====
+https://github.com/IgorDobryn/colibri
+
+==Requirements
+====
+
+This plug-in relies on the diff-lcs gem.
+
+==Installation
+====
+
+install it as any other plug-in and be sure to include the provided sample css or
+your own css rules to the applications-stylesheet.
+
+==Example
+====
+
+in your view simply call:
+
+<%= diff(@difftest.old, @difftest.new) %>
+
+which results in:
+
+<tr><td>1. </td><td><pre class="only_a">require 'digest/sha1'</pre></td><td><pre class="only_b">require 'digest/sha2'</pre></td><td>1. </td></tr>
+
+<tr><td>2. </td><td colspan="2"><pre class="match"></pre></td><td>2. </td></tr>
+
+<tr><td>3. </td><td colspan="2"><pre class="match">class User < ActiveRecord::Base</pre></td><td>3. </td></tr>
+
+...
+
+==Credits
+====
+diff-lcs author and the provided exampels ;)
+
+==ToDo
+====
+
+Tests...
+
+Copyright (c) 2011 [Igor Dobryn / IgorDobryn@gmail.com], released under the MIT license
+

data/Rakefile

@@ -0,0 +1,17 @@
+require 'psych'
+require 'rubygems'
+require 'rake'
+require 'echoe'
+
+Echoe.new('colibri', '0.0.1') do |p|
+  p.description     = "Display a diff of two files (long strings...) as html"
+  p.url             = "https://github.com/IgorDobryn/colibri"
+  p.author          = "Igor Dobryn"
+  p.email           = "IgorDobryn@gmail.com"
+  p.ignore_pattern  = ["tmp/*", "script/*"]
+  p.development_dependencies = ["diff-lcs", "erubis"]
+  p.summary = "This gem provide functionality for displaying defference between two files(long strings) as html"
+end
+
+Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each { |ext| load ext }
+

data/colibri.gemspec

@@ -0,0 +1,35 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "colibri"
+  s.version = "0.0.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Igor Dobryn"]
+  s.date = "2011-08-30"
+  s.description = "Display a diff of two files (long strings...) as html"
+  s.email = "IgorDobryn@gmail.com"
+  s.extra_rdoc_files = ["README", "lib/colibri.rb", "lib/diff_helper.rb", "lib/output/simple_correction_diff.rb", "lib/output/simple_html_diff.rb", "lib/output/string_simple_correction_diff.rb", "lib/output/vc_diff.rb"]
+  s.files = ["MIT-LICENSE", "README", "Rakefile", "init.rb", "lib/colibri.rb", "lib/diff_helper.rb", "lib/output/simple_correction_diff.rb", "lib/output/simple_html_diff.rb", "lib/output/string_simple_correction_diff.rb", "lib/output/vc_diff.rb", "sample.css", "Manifest", "colibri.gemspec"]
+  s.homepage = "https://github.com/IgorDobryn/colibri"
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Colibri", "--main", "README"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = "colibri"
+  s.rubygems_version = "1.8.10"
+  s.summary = "This gem provide functionality for displaying defference between two files(long strings) as html"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<diff-lcs>, [">= 0"])
+      s.add_development_dependency(%q<erubis>, [">= 0"])
+    else
+      s.add_dependency(%q<diff-lcs>, [">= 0"])
+      s.add_dependency(%q<erubis>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<diff-lcs>, [">= 0"])
+    s.add_dependency(%q<erubis>, [">= 0"])
+  end
+end

data/init.rb

@@ -0,0 +1,7 @@
+require 'erubis'
+require 'colibri'
+config.after_initialize do
+  # Include our helper into every view
+  ActionView::Base.send :include, DiffHelper
+end
+

data/lib/colibri.rb

@@ -0,0 +1,16 @@
+class Colibri
+  # add html_escape to class level ;)
+  extend ERB::Util
+  def self.diff(old, new, output = Output::SimpleHtmlDiff)
+    # html_escape code for display and split strings into lines array
+    a = html_escape(old).split(/\015?\012/)
+    b = html_escape(new).split(/\015?\012/)
+    #remove trailing.. whitespace
+    #a.map{|c| c.strip!}
+    #b.map{|c| c.strip!}
+    out = output.new
+    Diff::LCS.traverse_balanced(a, b, out)
+    out.content
+  end
+end
+

data/lib/diff_helper.rb

@@ -0,0 +1,19 @@
+module ColibriHelper
+  protected
+  # generates a simple line diff
+  def line_diff(old, new)
+    Colibri.diff(old,new)
+  end
+
+  # generates a simple correction diff with "inline-diffs"
+  def correction_diff(old, new)
+    Colibri.diff(old, new, Output::SimpleCorrectionDiff)
+  end
+
+  # generates a simple vc similar diff, where only the changes + some preceding
+  # lines are shown
+  def vc_diff(old,new)
+    Colibri.diff(old,new, Output::VcDiff)
+  end
+end
+

data/lib/output/simple_correction_diff.rb

@@ -0,0 +1,31 @@
+class Output::SimpleCorrectionDiff #:nodoc:
+  include ERB::Util
+
+  attr_accessor :content
+
+  def initialize
+    @content = ""
+  end
+
+  def change(event)
+    out = Output::StringSimpleCorrectionDiff.new
+    Diff::LCS.traverse_sequences(event.old_element, event.new_element, out)
+    @content << %Q|<span class="change">#{out.content}#{out.closing}</span><br/></span><br/>\n|
+  end
+
+    # This will be called with both lines are the same
+  def match(event)
+    @content << %Q|<span class="match">#{event.new_element}</span><br/>\n|
+  end
+
+    # This will be called when there is a line in A that isn't in B
+  def discard_a(event)
+    @content << %Q|<span class="only_a"><del>#{event.old_element}</del></span><br/>\n|
+  end
+
+    # This will be called when there is a line in B that isn't in A
+  def discard_b(event)
+    @content << %Q|<span class="only_b"><ins>#{event.new_element}</ins></span><br/>\n|
+  end
+end
+

data/lib/output/simple_html_diff.rb

@@ -0,0 +1,36 @@
+class Output::SimpleHtmlDiff #:nodoc:
+  attr_accessor :content
+  attr_accessor :old_line
+  attr_accessor :new_line
+
+  def initialize
+    @content = ""
+    @old_line = 1
+    @new_line = 1
+  end
+    
+  def change(event)
+    @content << %Q|<tr><td>#{old_line}. </td><td><pre class="only_a">#{event.old_element}</pre></td><td><pre class="only_b">#{event.new_element}</pre></td><td>#{new_line}. </td></tr>\n|
+    @old_line += 1
+    @new_line += 1
+  end
+
+    # This will be called with both lines are the same
+  def match(event)
+    @content << %Q|<tr><td>#{old_line}. </td><td colspan="2"><pre class="match">#{event.old_element}</pre></td><td>#{new_line}. </td></tr>\n|
+    @old_line += 1
+    @new_line += 1
+  end
+
+    # This will be called when there is a line in A that isn't in B
+  def discard_a(event)
+    @content << %Q|<tr><td>#{old_line}. </td><td><pre class="only_a">#{event.old_element}</pre></td><td></td><td></td></tr>\n|
+    @old_line += 1
+  end
+
+    # This will be called when there is a line in B that isn't in A
+  def discard_b(event)
+    @content << %Q|<tr><td></td><td></td><td><pre class="only_b">#{event.new_element}</pre></td><td>#{new_line}. </td></tr>\n|
+    @new_line += 1
+  end
+end

data/lib/output/string_simple_correction_diff.rb

@@ -0,0 +1,57 @@
+class Output::StringSimpleCorrectionDiff #:nodoc:
+
+  attr_accessor :content, :last, :closing
+
+  def initialize
+    @content = ""
+
+  end
+
+  def change(event)
+    if @last.nil?
+      @content << %Q|<span class="change">|
+    elsif @last != :change
+      @content << %Q|#{closing}</span><span class="change">|
+    end
+    @content << %Q|<del class="only_a">#{event.old_element}</del><ins class="only_b">#{event.new_element.to_s}</ins>|
+    @last = :change
+    @closing = ""
+  end
+
+    # This will be called with both lines are the same
+  def match(event)
+    if @last.nil?
+      @content << %Q|<span class="match">|
+    elsif @last != :match
+      @content << %Q|#{closing}</span><span class="match">|
+    end
+    @content << event.old_element.to_s
+    @last = :match
+    @closing = ""
+  end
+
+    # This will be called when there is a line in A that isn't in B
+  def discard_a(event)
+    if @last.nil?
+      @content << %Q|<span class="only_a"><del>|
+    elsif @last != :only_a
+      @content << %Q|#{closing}</span><span class="only_a"><del>|
+    end
+    @content << %Q|#{event.old_element.to_s}|
+    @last = :only_a
+    @closing = "</del>"
+  end
+
+    # This will be called when there is a line in B that isn't in A
+  def discard_b(event)
+    if @last.nil?
+      @content << %Q|<span class="only_b"><ins>|
+    elsif @last != :only_b
+      @content << %Q|#{closing}</span><span class="only_b"><ins>|
+    end
+    @content << %Q|#{event.new_element.to_s}|
+    @last = :only_b
+    @closing = "</ins>"
+  end
+end
+

data/lib/output/vc_diff.rb

@@ -0,0 +1,59 @@
+class Output::VcDiff #:nodoc:
+  attr_accessor :content
+  attr_accessor :old_line
+  attr_accessor :new_line
+  attr_accessor :last_lines
+  attr_accessor :last
+
+  def initialize
+    @content = ""
+    @last_lines = []
+    @old_line = 1
+    @new_line = 1
+  end
+    
+  def change(event)
+    add_last_lines unless @last == :change
+    @content << %Q|<tr><td>#{old_line}. </td><td><pre class="only_a">#{event.old_element}</pre></td><td><pre class="only_b">#{event.new_element}</pre></td><td>#{new_line}. </td></tr>\n|
+    
+    @last = :change
+    @old_line += 1
+    @new_line += 1
+  end
+
+    # This will be called with both lines are the same
+  def match(event)
+    @last_lines.push %Q|<tr><td>#{old_line}. </td><td colspan="2"><pre class="match">#{event.old_element}</pre></td><td>#{new_line}. </td></tr>\n|
+    @old_line += 1
+    @new_line += 1
+  end
+
+    # This will be called when there is a line in A that isn't in B
+  def discard_a(event)
+    add_last_lines unless @last == :discard_a
+    @content << %Q|<tr><td>#{old_line}. </td><td><pre class="only_a">#{event.old_element}</pre></td><td></td><td></td></tr>\n|
+
+    @last = :discard_a    
+    @old_line += 1
+  end
+
+    # This will be called when there is a line in B that isn't in A
+  def discard_b(event)
+    add_last_lines unless @last == :discard_b
+    @content << %Q|<tr><td></td><td></td><td><pre class="only_b">#{event.new_element}</pre></td><td>#{new_line}. </td></tr>\n|
+    
+    @last = :discard_b
+    @new_line += 1
+  end
+  
+  def add_last_lines(n = 3)
+    @content << %Q|<tr><td colspan="4">Next Change: </td></tr>\n|
+    start = @last_lines.length - n
+    start = 0 if start < 0
+    start.upto @last_lines.length do |i|
+      @content << @last_lines[i] if @last_lines[i]
+    end
+    @last_lines = []
+  end
+  
+end

data/sample.css

@@ -0,0 +1,24 @@
+.diff {
+    border: 1px solid black;
+    margin: 1em 2em;
+}
+pre {
+  padding-left: 1em;
+  margin: 0;
+  font-family: Lucida, Courier, monospaced;
+}
+.change {
+  background-color: #A6A6A6;
+}
+
+.match {
+  background-color: #DDFFDD; 
+}
+.only_a {
+  background-color: #fdd;
+  color: red;
+}
+.only_b {
+  background-color: #ddf;
+  color: blue;
+}

metadata

@@ -0,0 +1,93 @@
+--- !ruby/object:Gem::Specification
+name: colibri
+version: !ruby/object:Gem::Version
+  version: 0.0.1
+  prerelease: 
+platform: ruby
+authors:
+- Igor Dobryn
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2011-08-30 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: diff-lcs
+  requirement: &71500150 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *71500150
+- !ruby/object:Gem::Dependency
+  name: erubis
+  requirement: &71499760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *71499760
+description: Display a diff of two files (long strings...) as html
+email: IgorDobryn@gmail.com
+executables: []
+extensions: []
+extra_rdoc_files:
+- README
+- lib/colibri.rb
+- lib/diff_helper.rb
+- lib/output/simple_correction_diff.rb
+- lib/output/simple_html_diff.rb
+- lib/output/string_simple_correction_diff.rb
+- lib/output/vc_diff.rb
+files:
+- MIT-LICENSE
+- README
+- Rakefile
+- init.rb
+- lib/colibri.rb
+- lib/diff_helper.rb
+- lib/output/simple_correction_diff.rb
+- lib/output/simple_html_diff.rb
+- lib/output/string_simple_correction_diff.rb
+- lib/output/vc_diff.rb
+- sample.css
+- Manifest
+- colibri.gemspec
+homepage: https://github.com/IgorDobryn/colibri
+licenses: []
+post_install_message: 
+rdoc_options:
+- --line-numbers
+- --inline-source
+- --title
+- Colibri
+- --main
+- README
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '1.2'
+requirements: []
+rubyforge_project: colibri
+rubygems_version: 1.8.10
+signing_key: 
+specification_version: 3
+summary: This gem provide functionality for displaying defference between two files(long
+  strings) as html
+test_files: []