New lib for diffing wiki revisions

linuxfrorg · Apr 4, 2011 · 5e96524 · 5e96524
1 parent 524aadd
commit 5e96524
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 320 deletions.
diff --git a/Gemfile b/Gemfile
@@ -8,6 +8,7 @@ gem "bitfields",               "~>0.3"
 gem "canable",                 "~>0.1"
 gem "carrierwave",             "~>0.5"
 gem "devise",                  "~>1.2"
+gem "differ",                  "~>0.1"
 gem "french_rails",            "~>0.2"
 gem "friendly_id",             "~>3.1"
 gem "haml",                    "~>3.0"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -61,6 +61,7 @@ GEM
       orm_adapter (~> 0.0.3)
       warden (~> 1.0.3)
     diff-lcs (1.1.2)
+    differ (0.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     eventmachine (0.12.10)
@@ -206,6 +207,7 @@ DEPENDENCIES
   capistrano
   carrierwave (~> 0.5)
   devise (~> 1.2)
+  differ (~> 0.1)
   factory_girl_rails (~> 1.0)
   faker (~> 0.9)
   french_rails (~> 0.2)

diff --git a/app/views/wiki_pages/revision.html.haml b/app/views/wiki_pages/revision.html.haml
@@ -6,7 +6,7 @@
   %h3
     #{@version.user.try :name} : #{@version.message}
   %pre
-    = HTMLDiff.diff(h(@was), h(@version.body)).html_safe
+    = Differ.diff_by_char(h(@version.body), h(@was)).to_s.html_safe
 
   - if @version.higher_item || @version.lower_item
     %nav

diff --git a/config/initializers/differ.rb b/config/initializers/differ.rb
@@ -0,0 +1 @@
+Differ.format = :html
diff --git a/config/initializers/require_libs.rb b/config/initializers/require_libs.rb
@@ -1,7 +1,6 @@
 require "digest/md5"
 require "not"
 require "resolvers"
-require "htmldiff"
 require "ar_base_ext"
 require "friendly_id/active_record"
 require "babosa_ext"
diff --git a/lib/htmldiff.rb b/lib/htmldiff.rb