deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Update Rails, rails_xss and Bundler

Browse source 
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 ....
This commit is contained in:
Jacques Distler 2011-06-15 00:43:38 -05:00
parent ec443685a6
commit 9e909d5be3
1105 changed files with 14278 additions and 4667 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/chunks/chunk.rb
View file

@ -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