Multiple leading capital letters in a WikiWord

CMyApp  is a WikiWord (at least, on other Wiki systems, like TWiki).
Should allow that here

Also, choose a more obscure name for the thread-local variable tracking
included chunks.

lib/chunks/include.rb

@@ -45,21 +45,22 @@ class Include < WikiChunk::WikiReference
   end
   
   # We track included pages in a thread-local variable.
-  # This allows a multi-threaded Rails to handle one request/thread,
-  #   without getting confused.
-  
-  def clear_include_list
-    Thread.current[:included_by] = []  
-  end
+  # This allows a multi-threaded Rails to handle multiple
+  #   simultaneous requests (one request/thread), without
+  #   getting confused.
   
   def add_to_include_list
-    Thread.current[:included_by] ?
-      Thread.current[:included_by].push(@content.page_name) :
-      Thread.current[:included_by] = [@content.page_name]
+    Thread.current[:chunk_included_by] ?
+      Thread.current[:chunk_included_by].push(@content.page_name) :
+      Thread.current[:chunk_included_by] = [@content.page_name]
+  end
+
+  def clear_include_list
+    Thread.current[:chunk_included_by] = []  
   end
     
   def self_inclusion(refpage)
-    if Thread.current[:included_by].include?(refpage.page.name)
+    if Thread.current[:chunk_included_by].include?(refpage.page.name)
       @content.delete_chunk(self)
       clear_include_list
     else

lib/wiki_words.rb

@@ -14,7 +14,7 @@ module WikiWords
     "абвгдежзийклмнопрстуфхцчшщъыьэюяѐёђѓєѕіїјљћќѝўџѡѣѥѧѩѫѭѯѱѳѵѷѹѻѽѿҁҋҌҍҏґғҕҗҙқҝҟҡңҥҧҩҫҭүұҳҵҷҹһҽҿӀӂӄӆӈӊӌӎӑӓӕӗәӛӝӟӡӣӥӧөӫӭӯӱӳӵӹ" +
     "աբգդեզէըթժիլխծկհձղճմյնշոչպջռսվտրցւփքօֆև"
 
-  WIKI_WORD_PATTERN = '[A-Z' + I18N_HIGHER_CASE_LETTERS + '][a-z' + I18N_LOWER_CASE_LETTERS + ']+[A-Z' + I18N_HIGHER_CASE_LETTERS + ']\w+'
+  WIKI_WORD_PATTERN = '[A-Z' + I18N_HIGHER_CASE_LETTERS + ']+[a-z' + I18N_LOWER_CASE_LETTERS + ']+[A-Z' + I18N_HIGHER_CASE_LETTERS + ']\w+'
   CAMEL_CASED_WORD_BORDER = /([a-z#{I18N_LOWER_CASE_LETTERS}])([A-Z#{I18N_HIGHER_CASE_LETTERS}])/u
 
   def self.separate(wiki_word)

test/unit/wiki_words_test.rb

@@ -11,4 +11,8 @@ class WikiWordsTest < Test::Unit::TestCase
     assert_equal "Æe ÅØle Øen", WikiWords.separate("ÆeÅØleØen")
     assert_equal "Legetøj", WikiWords.separate("Legetøj")
   end
+  
+  def test_multiple_leading_capital_letters
+    assert_equal "CMy App", WikiWords.separate("CMyApp")
+  end
 end