Migration from Rails 2.3.5 to Rails 8.1 successful.

Merging dev branch.

7 files changed, 29 insertions, 26 deletions

diff --git a/lib/authenticated_system.rb b/lib/authenticated_system.rb
index 838b734..217f79e 100644
--- a/lib/authenticated_system.rb
+++ b/lib/authenticated_system.rb
@@ -74,7 +74,7 @@ module AuthenticatedSystem
     #
     # We can return to this location by calling #redirect_back_or_default.
     def store_location
-      session[:return_to] = request.request_uri
+      session[:return_to] = request.fullpath
     end
 
     # Redirect to the URI stored by the most recent store_location call or
diff --git a/lib/authors_importer.rb b/lib/authors_importer.rb
index 8532a95..e0b16bd 100644
--- a/lib/authors_importer.rb
+++ b/lib/authors_importer.rb
@@ -4,7 +4,7 @@ require 'digest/sha1'
 class AuthorsImporter
   
   def initialize path
-    @parsed_file = CSV::Reader.parse(File.open(path, "r")) if File.exists? path
+    @parsed_file = CSV::Reader.parse(File.open(path, "r")) if File.exist? path
   end
   
   def import_authors
diff --git a/lib/awesome_patch.rb b/lib/awesome_patch.rb
deleted file mode 100644
index d9f738c..0000000
--- a/lib/awesome_patch.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-module CollectiveIdea
-  module Acts #:nodoc:
-    module NestedSet
-      module InstanceMethods
-        alias_method :move_to_original, :move_to
-        
-        def move_to target, position
-          move_to_original target, position
-          if self.class == Node
-            self.update_unique_name
-          end
-        end
-      end
-    end
-  end
-end
\ No newline at end of file
diff --git a/lib/chaos_importer.rb b/lib/chaos_importer.rb
index db2a96b..41dca30 100644
--- a/lib/chaos_importer.rb
+++ b/lib/chaos_importer.rb
@@ -148,7 +148,7 @@ class ChaosImporter
       :body     => extract_body(html)
     }
     
-    draft.update_attributes options
+    draft.update options
     draft
   end
   
@@ -215,7 +215,7 @@ class ChaosImporter
     unless tmp_event = node.event
       tmp_event = Event.create! event_options.merge({:node_id => node.id})
     else
-      tmp_event.update_attributes event_options
+      tmp_event.update event_options
     end
   end
   
diff --git a/lib/tasks/development_init.rake b/lib/tasks/development_init.rake
index 2ac9a83..94f323c 100644
--- a/lib/tasks/development_init.rake
+++ b/lib/tasks/development_init.rake
@@ -25,19 +25,19 @@ namespace :cccms do
   
   desc "Import the authors"
   task :import_authors  => :environment do |t|
-    importer = AuthorsImporter.new("#{RAILS_ROOT}/db/authors.csv")
+    importer = AuthorsImporter.new(Rails.root.join('db', 'authors.csv').to_s)
     importer.import_authors
   end  
   
   desc "Update authors on pages"
   task :update_authors_on_pages => :environment do |t|
-    i = ChaosImporter.new("#{RAILS_ROOT}/db/updates")
+    i = ChaosImporter.new(Rails.root.join('db', 'updates').to_s)
     i.update_authors_on_pages
   end
   
   desc "Import the old XML Files"
   task :import_updates  => :environment do |t|
-    i = ChaosImporter.new("#{RAILS_ROOT}/db/updates")
+    i = ChaosImporter.new(Rails.root.join('db', 'updates').to_s)
     i.import_updates
   end
   
@@ -134,4 +134,4 @@ namespace :cccms do
     orphans.each { |page| page.destroy }
   end
   
-end
\ No newline at end of file
+end
diff --git a/lib/tasks/test_db.rake b/lib/tasks/test_db.rake
new file mode 100644
index 0000000..0a7a17d
--- /dev/null
+++ b/lib/tasks/test_db.rake
@@ -0,0 +1,19 @@
+namespace :db do
+  namespace :test do
+    task :load_schema do
+      ActiveRecord::Base.establish_connection(:test)
+      ActiveRecord::Schema.verbose = false
+      load "#{Rails.root}/db/schema.rb"
+    end
+
+    task :prepare => :environment do
+      begin
+        ActiveRecord::Base.establish_connection(:test)
+        ActiveRecord::Base.connection
+      rescue
+        system("psql -U postgres postgres -c \"CREATE DATABASE psql_test OWNER psql ENCODING 'UTF8';\"")
+      end
+      Rake::Task['db:test:load_schema'].invoke
+    end
+  end
+end
diff --git a/lib/update_importer.rb b/lib/update_importer.rb
index 103ac5a..2978c43 100644
--- a/lib/update_importer.rb
+++ b/lib/update_importer.rb
@@ -82,7 +82,7 @@ class UpdateImporter
     I18n.locale = lang
     
     unless node.head
-      page.update_attributes(
+      page.update(
         :title => xhtml.elements['title'].get_text.to_s,
         :abstract => xhtml.elements['abstract'].get_text.to_s,
         :body => body
@@ -176,7 +176,7 @@ class UpdateImporter
         unless tmp_event = node.event
           tmp_event = Event.create! event_options.merge({:node_id => node.id})
         else
-          tmp_event.update_attributes event_options
+          tmp_event.update event_options
         end
       end
     end