From 4a8d6eefe083c5d4bcd65604b0b6cc9b7cfb1da5 Mon Sep 17 00:00:00 2001
From: Alexey Verkhovsky <averkhov@thoughtworks.com>
Date: Wed, 14 Sep 2005 02:01:20 +0000
Subject: [PATCH] Fixed chunk mask to handle negative object_id values [Venkat]

---
 lib/chunks/chunk.rb   | 2 +-
 lib/chunks/include.rb | 7 +++++--
 rakefile.rb           | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/chunks/chunk.rb b/lib/chunks/chunk.rb
index ad0fb148..18de7d0c 100644
--- a/lib/chunks/chunk.rb
+++ b/lib/chunks/chunk.rb
@@ -28,7 +28,7 @@ module Chunk
     # a regexp that matches all chunk_types masks
     def Abstract::mask_re(chunk_types)
       chunk_classes = chunk_types.map{|klass| klass.mask_string}.join("|")
-      /chunk(\d+)(#{chunk_classes})chunk/
+      /chunk(-?\d+)(#{chunk_classes})chunk/
     end
     
     attr_reader :text, :unmask_text, :unmask_mode
diff --git a/lib/chunks/include.rb b/lib/chunks/include.rb
index 72c89b54..d58ff22c 100644
--- a/lib/chunks/include.rb
+++ b/lib/chunks/include.rb
@@ -30,8 +30,11 @@ class Include < WikiChunk::WikiReference
         return "<em>Recursive include detected; #{@page_name} --> #{@content.page_name} " + 
                "--> #{@page_name}</em>\n"
       else
-        @content.merge_chunks(renderer.display_content)
-        return renderer.display_content.pre_rendered
+require 'breakpoint'
+breakpoint
+        included_content = renderer.display_content
+        @content.merge_chunks(included_content)
+        return included_content.pre_rendered
       end
     else
       return "<em>Could not include #{@page_name}</em>\n"
diff --git a/rakefile.rb b/rakefile.rb
index fb2dfd40..af9c997f 100755
--- a/rakefile.rb
+++ b/rakefile.rb
@@ -202,4 +202,4 @@ task :migrate => :environment do
 end
 
 task :ft => :test_functional
-task :ut => :test_unit
\ No newline at end of file
+task :ut => :test_units
\ No newline at end of file