Update Rails, rails_xss and Bundler

Update Bundler to 1.0.15.
Update Rails to 2.3.12.
Update rails_xss plugin.

The latter two were the
source of a considerable
amount of grief, as rails_xss
is now MUCH stricter about what
string methods can be used.

Also made it possible to use
rake 0.9.x with Instiki. But
you probably REALLY want to use

 ruby bundle exec rake ...

instead of just saying

 rake ....

lib/chunks/chunk.rb

@@ -48,11 +48,14 @@ module Chunk
     # chunk for it, and replace the occurance of the chunk
     # in this content with its mask.
 	def self.apply_to(content)
-	  content.gsub!( self.pattern ) do |match|	
+	  text = content.to_str
+	  text.gsub!( self.pattern ) do |match|
+#	    content.replace text	
         new_chunk = self.new($~, content)
         content.add_chunk(new_chunk)
         new_chunk.mask
-      end
+       end
+       content.replace text
     end
 
     # should contain only [a-z0-9]
@@ -61,7 +64,7 @@ module Chunk
     end
 
     def unmask
-      @content.sub!(mask){|s| s.replace @unmask_text}
+      @content.replace  @content.sub(mask){|s| s.replace @unmask_text}
     end
 
     def rendered?
@@ -73,7 +76,7 @@ module Chunk
     end
 
     def revert
-      @content.sub!(mask){|s| s.replace @text}
+      @content.replace  @content.sub(mask){|s| s.replace @text}
       # unregister
       @content.delete_chunk(self)
     end

lib/chunks/engines.rb

@@ -114,7 +114,7 @@ module Engines
   class Mixed < AbstractEngine
     def mask
       @content.as_utf8
-      redcloth = OldRedCloth.new(@content, @content.options[:engine_opts])
+      redcloth = OldRedCloth.new(@content.to_str, @content.options[:engine_opts])
       redcloth.filter_html = false
       redcloth.no_span_caps = false
       html = redcloth.to_html
@@ -123,8 +123,7 @@ module Engines
 
   class RDoc < AbstractEngine
     def mask
-      @content.as_utf8
-      html = RDocSupport::RDocFormatter.new(@content).to_html
+      html = RDocSupport::RDocFormatter.new(@content.as_utf8.to_str).to_html
     end
   end
 

lib/chunks/literal.rb

@@ -30,9 +30,9 @@ module Literal
 
   # A literal chunk that protects equations from wiki rendering.
   class Math < AbstractLiteral
-    MATH_START = '(\${1,2}|' + Regexp.escape('\[') + '|\\begin\{equation\})'
-    MATH_END =   '(\${1,2}|' + Regexp.escape('\]') + '|\\end\{equation\})'
-    MATH_PATTERN = Regexp.new(MATH_START + '([^$]|\\\$)+?' + MATH_END, Regexp::MULTILINE)
+    MATH_START = "(?:\\\\\\[|\\${1,2}|\\\\begin\\{equation\\})"
+    MATH_END   = "(?:\\\\\\]|\\${1,2}|\\\\end\\{equation\\})"
+    MATH_PATTERN = Regexp.new( '(' + MATH_START + "(?:\\\\\\$|(?!\\$|\\\\\\]|\\\\end\\{equation\\}).)+?" + MATH_END + ')', Regexp::MULTILINE)
     def self.pattern() MATH_PATTERN  end
   end
 

lib/chunks/wiki.rb

@@ -34,7 +34,8 @@ module WikiChunk
     end
 
     def self.apply_to(content)
-      content.as_utf8.gsub!( self.pattern ) do |matched_text|
+      text = content.as_utf8.to_str
+      text.gsub!( self.pattern ) do |matched_text|
         chunk = self.new($~, content)
         if chunk.textile_url?
           # do not substitute
@@ -44,6 +45,7 @@ module WikiChunk
           chunk.mask
         end
       end
+      content.replace text
     end
 
     def textile_url?