colibri 0.0.2 → 0.0.3

data/Manifest

@@ -4,7 +4,7 @@ README
 Rakefile
 init.rb
 lib/colibri.rb
-lib/diff_helper.rb
+lib/colibri_helper.rb
 lib/output/simple_correction_diff.rb
 lib/output/simple_html_diff.rb
 lib/output/string_simple_correction_diff.rb

data/Rakefile

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('colibri', '0.0.2') do |p|
+Echoe.new('colibri', '0.0.3') 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"

data/colibri.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "colibri"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Igor Dobryn"]
@@ -10,8 +10,8 @@ Gem::Specification.new do |s|
   s.date = "2011-08-31"
   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", "Manifest", "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", "colibri.gemspec"]
+  s.extra_rdoc_files = ["README", "lib/colibri.rb", "lib/colibri_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", "Manifest", "README", "Rakefile", "init.rb", "lib/colibri.rb", "lib/colibri_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", "colibri.gemspec"]
   s.homepage = "https://github.com/IgorDobryn/colibri"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Colibri", "--main", "README"]
   s.require_paths = ["lib"]

data/lib/colibri.rb

@@ -6,7 +6,7 @@ require 'output/vc_diff'
 class Colibri
   # add html_escape to class level ;)
   extend ERB::Util
-  def self.diff(old, new, output = Output::SimpleHtmlDiff)
+  def self.diff(old, new, 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/)

data/lib/{diff_helper.rb → colibri_helper.rb}

@@ -7,13 +7,13 @@ module ColibriHelper
 
   # generates a simple correction diff with "inline-diffs"
   def correction_diff(old, new)
-    Colibri.diff(old, new, Output::SimpleCorrectionDiff)
+    Colibri.diff(old, new, 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)
+    Colibri.diff(old,new, VcDiff)
   end
 end
 

data/lib/output/simple_correction_diff.rb

@@ -1,4 +1,4 @@
-class Output::SimpleCorrectionDiff #:nodoc:
+class SimpleCorrectionDiff #:nodoc:
   include ERB::Util
 
   attr_accessor :content
@@ -8,7 +8,7 @@ class Output::SimpleCorrectionDiff #:nodoc:
   end
 
   def change(event)
-    out = Output::StringSimpleCorrectionDiff.new
+    out = 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

data/lib/output/simple_html_diff.rb

@@ -1,4 +1,4 @@
-class Output::SimpleHtmlDiff #:nodoc:
+class SimpleHtmlDiff #:nodoc:
   attr_accessor :content
   attr_accessor :old_line
   attr_accessor :new_line
@@ -8,7 +8,7 @@ class Output::SimpleHtmlDiff #:nodoc:
     @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
@@ -34,3 +34,4 @@ class Output::SimpleHtmlDiff #:nodoc:
     @new_line += 1
   end
 end
+

data/lib/output/string_simple_correction_diff.rb

@@ -1,4 +1,4 @@
-class Output::StringSimpleCorrectionDiff #:nodoc:
+class StringSimpleCorrectionDiff #:nodoc:
 
   attr_accessor :content, :last, :closing
 

data/lib/output/vc_diff.rb

@@ -1,4 +1,4 @@
-class Output::VcDiff #:nodoc:
+class VcDiff #:nodoc:
   attr_accessor :content
   attr_accessor :old_line
   attr_accessor :new_line
@@ -11,11 +11,11 @@ class Output::VcDiff #:nodoc:
     @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
@@ -33,7 +33,7 @@ class Output::VcDiff #:nodoc:
     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    
+    @last = :discard_a
     @old_line += 1
   end
 
@@ -41,11 +41,11 @@ class Output::VcDiff #:nodoc:
   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
@@ -55,5 +55,6 @@ class Output::VcDiff #:nodoc:
     end
     @last_lines = []
   end
-  
+
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: colibri
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -54,7 +54,7 @@ date: 2011-08-31 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &76912900 !ruby/object:Gem::Requirement
+  requirement: &70461610 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -62,10 +62,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76912900
+  version_requirements: *70461610
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &76912470 !ruby/object:Gem::Requirement
+  requirement: &70461190 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -73,7 +73,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76912470
+  version_requirements: *70461190
 description: Display a diff of two files (long strings...) as html
 email: IgorDobryn@gmail.com
 executables: []
@@ -81,7 +81,7 @@ extensions: []
 extra_rdoc_files:
 - README
 - lib/colibri.rb
-- lib/diff_helper.rb
+- lib/colibri_helper.rb
 - lib/output/simple_correction_diff.rb
 - lib/output/simple_html_diff.rb
 - lib/output/string_simple_correction_diff.rb
@@ -93,7 +93,7 @@ files:
 - Rakefile
 - init.rb
 - lib/colibri.rb
-- lib/diff_helper.rb
+- lib/colibri_helper.rb
 - lib/output/simple_correction_diff.rb
 - lib/output/simple_html_diff.rb
 - lib/output/string_simple_correction_diff.rb