From 10214ebb262933f9cb94780d499478ce5d291956 Mon Sep 17 00:00:00 2001
From: Alexey Verkhovsky <averkhov@thoughtworks.com>
Date: Sat, 15 Jan 2005 21:10:38 +0000
Subject: [PATCH] Defined externals (for Rails modules), replaced .cvsignore
 files with svn:ignore properties

---
 app/models/chunks/wiki.rb                             | 3 ++-
 config/environment.rb                                 | 2 +-
 natives/osx/desktop_launcher/English.lproj/.cvsignore | 2 --
 rakefile.rb                                           | 1 +
 storage/.cvsignore                                    | 5 -----
 storage/madeleine_snaps_goes_here                     | 0
 test/functional/wiki_controller_test.rb               | 4 ++--
 7 files changed, 6 insertions(+), 11 deletions(-)
 delete mode 100755 natives/osx/desktop_launcher/English.lproj/.cvsignore
 delete mode 100755 storage/.cvsignore
 delete mode 100755 storage/madeleine_snaps_goes_here

diff --git a/app/models/chunks/wiki.rb b/app/models/chunks/wiki.rb
index d68bbd39..bb83c219 100755
--- a/app/models/chunks/wiki.rb
+++ b/app/models/chunks/wiki.rb
@@ -1,5 +1,6 @@
 require 'wiki_words'
 require 'chunks/chunk'
+require 'chunks/wiki'
 require 'cgi'
 
 # Contains all the methods for finding and replacing wiki related
@@ -63,7 +64,7 @@ module WikiChunk
   class Link < WikiLink
     def self.pattern() /\[\[([^\]]+)\]\]/ end
     
-    ALIASED_LINK_PATTERN ||= Regexp.new('^(.*)?\|(.*)$', 0, "utf-8") 
+    ALIASED_LINK_PATTERN = Regexp.new('^(.*)?\|(.*)$', 0, "utf-8") unless defined? ALIASED_LINK_PATTERN
 
     attr_reader :page_name, :link_text
 
diff --git a/config/environment.rb b/config/environment.rb
index f8db9b4e..478514d9 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -42,7 +42,6 @@ end
 
 require 'action_controller'
 require 'active_record_stub'
-require 'dependencies'
 
 unless defined? RAILS_DEFAULT_LOGGER
   RAILS_DEFAULT_LOGGER = Logger.new(STDERR)
@@ -57,3 +56,4 @@ require 'wiki_service'
 Socket.do_not_reverse_lookup = true
 
 ActionController::Base.template_root ||= "#{RAILS_ROOT}/app/views/"
+
diff --git a/natives/osx/desktop_launcher/English.lproj/.cvsignore b/natives/osx/desktop_launcher/English.lproj/.cvsignore
deleted file mode 100755
index 7f2202d4..00000000
--- a/natives/osx/desktop_launcher/English.lproj/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*~.nib
-
diff --git a/rakefile.rb b/rakefile.rb
index 72743186..2b5986f0 100755
--- a/rakefile.rb
+++ b/rakefile.rb
@@ -77,3 +77,4 @@ task :stats do
     ["Libraries", "libraries"]
   ).to_s
 end
+
diff --git a/storage/.cvsignore b/storage/.cvsignore
deleted file mode 100755
index e90e33dc..00000000
--- a/storage/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-2500
-development
-test
-.cvsignore
-*.zip
\ No newline at end of file
diff --git a/storage/madeleine_snaps_goes_here b/storage/madeleine_snaps_goes_here
deleted file mode 100755
index e69de29b..00000000
diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb
index 56998534..eac4e3d9 100755
--- a/test/functional/wiki_controller_test.rb
+++ b/test/functional/wiki_controller_test.rb
@@ -154,7 +154,7 @@ class WikiControllerTest < Test::Unit::TestCase
     
     assert_success
     assert_equal 'application/zip', r.headers['Content-Type']
-    assert_equal 'attachment', r.headers['Content-Disposition']
+    assert_match /attachment; filename="wiki1-html-\d\d\d\d-\d\d-\d\d-\d\d-\d\d-\d\d.zip"/, r.headers['Content-Disposition']
     # TODO assert contents of the output file
   end
 
@@ -163,7 +163,7 @@ class WikiControllerTest < Test::Unit::TestCase
 
     assert_success
     assert_equal 'application/zip', r.headers['Content-Type']
-    assert_equal 'attachment', r.headers['Content-Disposition']
+    assert_match /attachment; filename="wiki1-textile-\d\d\d\d-\d\d-\d\d-\d\d-\d\d-\d\d.zip"/, r.headers['Content-Disposition']
     # TODO assert contents of the output file
   end