0
@@ -39,6 +39,13 @@ class Version < DataMapper::Base
0
   def self.recent(number = 10)
0
     all(:limit => number, :order => 'id DESC', :spam => false)
0
   end
0
+
0
+  # Generate the diff between the version and another
0
+  # send by params
0
+  # You can define the format, by default is unified
0
+  def diff(other_version, format=:unified)
0
+    Diff.cs_diff(content, other_version.content)
0
+  end
0
   
0
 private
0
   def linkify_bracketed_phrases(string)

0
@@ -25,7 +25,7 @@ use_test :rspec
0
 dependencies 'iconv', 'merb-action-args', 'merb-assets', 'merb_has_flash',
0
              'merb-haml', 'merb_helpers', 'merb_http_basic_auth',
0
              'merb-parts', 'uri'
0
-             
0
+
0
 # dependency "RedCloth", "> 3.0"
0
 # OR
0
 # dependencies "RedCloth" => "> 3.0", "ruby-aes-cext" => "= 1.0"
0
@@ -37,6 +37,10 @@ dependencies 'iconv', 'merb-action-args', 'merb-assets', 'merb_has_flash',
0
 require 'redcloth'
0
 require 'viking'
0
 
0
+#Require needed for Diff module (/lib/diff.rb)
0
+require 'diff/lcs'
0
+require 'diff/lcs/hunk'
0
+
0
 # Load initializers
0
 Dir[Merb.root / 'config' / 'initializers' / '*.rb'].each do |initializer|
0
   load(initializer)