Merged Rails 2.1 compatibility branch.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1623 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/controllers/projects_controller.rb

@@ -52,7 +52,7 @@ class ProjectsController < ApplicationController
     respond_to do |format|
       format.html { 
         @project_tree = projects.group_by {|p| p.parent || p}
-        @project_tree.each_key {|p| @project_tree[p] -= [p]} 
+        @project_tree.keys.each {|p| @project_tree[p] -= [p]} 
       }
       format.atom {
         render_feed(projects.sort_by(&:created_on).reverse.slice(0, Setting.feeds_limit.to_i), 

app/helpers/repositories_helper.rb

@@ -22,6 +22,10 @@ module RepositoriesHelper
     txt.to_s[0,8]
   end
   
+  def to_path_param(path)
+    path.to_s.split(%r{[/\\]}).select {|p| !p.blank?}
+  end
+  
   def to_utf8(str)
     return str if /\A[\r\n\t\x20-\x7e]*\Z/n.match(str) # for us-ascii
     @encodings ||= Setting.repositories_encodings.split(',').collect(&:strip)

app/models/user_preference.rb

@@ -42,8 +42,10 @@ class UserPreference < ActiveRecord::Base
     if attribute_present? attr_name
       super
     else
-      self.others ||= {}
+      h = read_attribute(:others).dup || {}
-      self.others.store attr_name, value
+      h.update(attr_name => value)
+      write_attribute(:others, h)
+      value
     end
   end
   

app/views/repositories/_dir_list_content.rhtml

@@ -4,14 +4,14 @@
 <tr id="<%= tr_id %>" class="<%= params[:parent_id] %> entry <%= entry.kind %>">
 <td style="padding-left: <%=18 * depth%>px;" class="filename">
 <% if entry.is_dir? %>
-<span class="expander" onclick="<%=  remote_function :url => {:action => 'browse', :id => @project, :path => entry.path, :rev => @rev, :depth => (depth + 1), :parent_id => tr_id},
+<span class="expander" onclick="<%=  remote_function :url => {:action => 'browse', :id => @project, :path => to_path_param(entry.path), :rev => @rev, :depth => (depth + 1), :parent_id => tr_id},
                   :update => { :success => tr_id },
                   :position => :after,
                   :success => "scmEntryLoaded('#{tr_id}')",
                   :condition => "scmEntryClick('#{tr_id}')"%>">&nbsp</span>
 <% end %>
 <%=  link_to h(entry.name),
-          {:action => (entry.is_dir? ? 'browse' : 'changes'), :id => @project, :path => entry.path, :rev => @rev},
+          {:action => (entry.is_dir? ? 'browse' : 'changes'), :id => @project, :path => to_path_param(entry.path), :rev => @rev},
           :class => (entry.is_dir? ? 'icon icon-folder' : 'icon icon-file')%>
 </td>
 <td class="size"><%= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>

app/views/repositories/_navigation.rhtml

@@ -10,10 +10,10 @@ dirs.each do |dir|
     link_path << '/' unless link_path.empty?
     link_path << "#{dir}" 
     %>
-    / <%= link_to h(dir), :action => 'browse', :id => @project, :path => link_path, :rev => @rev %>
+    / <%= link_to h(dir), :action => 'browse', :id => @project, :path => to_path_param(link_path), :rev => @rev %>
 <% end %>
 <% if filename %>
-    / <%= link_to h(filename), :action => 'changes', :id => @project, :path => "#{link_path}/#{filename}", :rev => @rev %>
+    / <%= link_to h(filename), :action => 'changes', :id => @project, :path => to_path_param("#{link_path}/#{filename}"), :rev => @rev %>
 <% end %>
 
 <%= "@ #{revision}" if revision %>

app/views/repositories/_revisions.rhtml

@@ -1,4 +1,4 @@
-<% form_tag({:controller => 'repositories', :action => 'diff', :id => @project, :path => path}, :method => :get) do %>
+<% form_tag({:controller => 'repositories', :action => 'diff', :id => @project, :path => to_path_param(path)}, :method => :get) do %>
 <table class="list changesets">
 <thead><tr>
 <th>#</th>

app/views/repositories/changes.rhtml

@@ -4,12 +4,12 @@
 
 <p>
 <% if @repository.supports_cat? %>
-    <%= link_to l(:button_view), {:action => 'entry', :id => @project, :path => @path, :rev => @rev } %> |
+    <%= link_to l(:button_view), {:action => 'entry', :id => @project, :path => to_path_param(@path), :rev => @rev } %> |
 <% end %>
 <% if @repository.supports_annotate? %>
-    <%= link_to l(:button_annotate), {:action => 'annotate', :id => @project, :path => @path, :rev => @rev } %> |
+    <%= link_to l(:button_annotate), {:action => 'annotate', :id => @project, :path => to_path_param(@path), :rev => @rev } %> |
 <% end %>
-<%= link_to(l(:button_download), {:action => 'entry', :id => @project, :path => @path, :rev => @rev, :format => 'raw' }) if @repository.supports_cat? %>
+<%= link_to(l(:button_download), {:action => 'entry', :id => @project, :path => to_path_param(@path), :rev => @rev, :format => 'raw' }) if @repository.supports_cat? %>
 <%= "(#{number_to_human_size(@entry.size)})" if @entry.size %>
 </p>
 

app/views/repositories/revision.rhtml

@@ -55,7 +55,7 @@
 <%= "(#{change.revision})" unless change.revision.blank?  %></td>
 <td align="right">
 <% if change.action == "M" %>
-<%= link_to l(:label_view_diff), :action => 'diff', :id => @project, :path => without_leading_slash(change.relative_path), :rev => @changeset.revision %>
+<%= link_to l(:label_view_diff), :action => 'diff', :id => @project, :path => to_path_param(change.relative_path), :rev => @changeset.revision %>
 <% end %>
 </td>
 </tr>

config/boot.rb

@@ -1,19 +1,109 @@
-# Don't change this file. Configuration is done in config/environment.rb and config/environments/*.rb
+# Don't change this file!
+# Configure your app in config/environment.rb and config/environments/*.rb
 
-unless defined?(RAILS_ROOT)
+RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
-  root_path = File.join(File.dirname(__FILE__), '..')
+
-  unless RUBY_PLATFORM =~ /mswin32/
+module Rails
-    require 'pathname'
+  class << self
-    root_path = Pathname.new(root_path).cleanpath(true).to_s
+    def boot!
+      unless booted?
+        preinitialize
+        pick_boot.run
+      end
+    end
+
+    def booted?
+      defined? Rails::Initializer
+    end
+
+    def pick_boot
+      (vendor_rails? ? VendorBoot : GemBoot).new
+    end
+
+    def vendor_rails?
+      File.exist?("#{RAILS_ROOT}/vendor/rails")
+    end
+
+    def preinitialize
+      load(preinitializer_path) if File.exist?(preinitializer_path)
+    end
+
+    def preinitializer_path
+      "#{RAILS_ROOT}/config/preinitializer.rb"
+    end
+  end
+
+  class Boot
+    def run
+      load_initializer
+      Rails::Initializer.run(:set_load_path)
+    end
+  end
+
+  class VendorBoot < Boot
+    def load_initializer
+      require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
+      Rails::Initializer.run(:install_gem_spec_stubs)
+    end
+  end
+
+  class GemBoot < Boot
+    def load_initializer
+      self.class.load_rubygems
+      load_rails_gem
+      require 'initializer'
+    end
+
+    def load_rails_gem
+      if version = self.class.gem_version
+        gem 'rails', version
+      else
+        gem 'rails'
+      end
+    rescue Gem::LoadError => load_error
+      $stderr.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.)
+      exit 1
+    end
+
+    class << self
+      def rubygems_version
+        Gem::RubyGemsVersion if defined? Gem::RubyGemsVersion
+      end
+
+      def gem_version
+        if defined? RAILS_GEM_VERSION
+          RAILS_GEM_VERSION
+        elsif ENV.include?('RAILS_GEM_VERSION')
+          ENV['RAILS_GEM_VERSION']
+        else
+          parse_gem_version(read_environment_rb)
+        end
+      end
+
+      def load_rubygems
+        require 'rubygems'
+
+        unless rubygems_version >= '0.9.4'
+          $stderr.puts %(Rails requires RubyGems >= 0.9.4 (you have #{rubygems_version}). Please `gem update --system` and try again.)
+          exit 1
+        end
+
+      rescue LoadError
+        $stderr.puts %(Rails requires RubyGems >= 0.9.4. Please install RubyGems and try again: http://rubygems.rubyforge.org)
+        exit 1
+      end
+
+      def parse_gem_version(text)
+        $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
+      end
+
+      private
+        def read_environment_rb
+          File.read("#{RAILS_ROOT}/config/environment.rb")
+        end
+    end
   end
-  RAILS_ROOT = root_path
 end
 
-if File.directory?("#{RAILS_ROOT}/vendor/rails")
+# All that for this:
-  require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
+Rails.boot!
-else
-  require 'rubygems'
-  require 'initializer'
-end
-
-Rails::Initializer.run(:set_load_path)

config/environment.rb

@@ -5,7 +5,7 @@
 # ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.0.2' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.1.0' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
@@ -71,32 +71,3 @@ Rails::Initializer.run do |config|
 	config.action_mailer.delivery_method = :smtp  
 
 end
-
-ActiveRecord::Errors.default_error_messages = {
-  :inclusion => "activerecord_error_inclusion",
-  :exclusion => "activerecord_error_exclusion",
-  :invalid => "activerecord_error_invalid",
-  :confirmation => "activerecord_error_confirmation",
-  :accepted  => "activerecord_error_accepted",
-  :empty => "activerecord_error_empty",
-  :blank => "activerecord_error_blank",
-  :too_long => "activerecord_error_too_long",
-  :too_short => "activerecord_error_too_short",
-  :wrong_length => "activerecord_error_wrong_length",
-  :taken => "activerecord_error_taken",
-  :not_a_number => "activerecord_error_not_a_number"
-}
-
-ActionView::Base.field_error_proc = Proc.new{ |html_tag, instance| "#{html_tag}" }
-
-Mime::SET << Mime::CSV unless Mime::SET.include?(Mime::CSV)
-Mime::Type.register 'application/pdf', :pdf
-
-GLoc.set_config :default_language => :en
-GLoc.clear_strings
-GLoc.set_kcode
-GLoc.load_localized_strings
-GLoc.set_config(:raise_string_not_found_errors => false)
-
-require 'redmine'
-

config/initializers/10-patches.rb

@@ -0,0 +1,17 @@
+
+ActiveRecord::Errors.default_error_messages = {
+  :inclusion => "activerecord_error_inclusion",
+  :exclusion => "activerecord_error_exclusion",
+  :invalid => "activerecord_error_invalid",
+  :confirmation => "activerecord_error_confirmation",
+  :accepted  => "activerecord_error_accepted",
+  :empty => "activerecord_error_empty",
+  :blank => "activerecord_error_blank",
+  :too_long => "activerecord_error_too_long",
+  :too_short => "activerecord_error_too_short",
+  :wrong_length => "activerecord_error_wrong_length",
+  :taken => "activerecord_error_taken",
+  :not_a_number => "activerecord_error_not_a_number"
+}
+
+ActionView::Base.field_error_proc = Proc.new{ |html_tag, instance| "#{html_tag}" }

config/initializers/20-mime_types.rb

@@ -0,0 +1,4 @@
+# Add new mime types for use in respond_to blocks:
+
+Mime::SET << Mime::CSV unless Mime::SET.include?(Mime::CSV)
+Mime::Type.register 'application/pdf', :pdf

config/initializers/30-redmine.rb

@@ -0,0 +1,7 @@
+GLoc.set_config :default_language => :en
+GLoc.clear_strings
+GLoc.set_kcode
+GLoc.load_localized_strings
+GLoc.set_config(:raise_string_not_found_errors => false)
+
+require 'redmine'

db/migrate/072_add_enumerations_position.rb

@@ -1,7 +1,7 @@
 class AddEnumerationsPosition < ActiveRecord::Migration
   def self.up
     add_column(:enumerations, :position, :integer, :default => 1) unless Enumeration.column_names.include?('position')
-    Enumeration.find(:all).group_by(&:opt).each_value  do |enums|
+    Enumeration.find(:all).group_by(&:opt).each do |opt, enums|
       enums.each_with_index do |enum, i|
         # do not call model callbacks
         Enumeration.update_all "position = #{i+1}", {:id => enum.id}

db/migrate/078_add_custom_fields_position.rb

@@ -1,7 +1,7 @@
 class AddCustomFieldsPosition < ActiveRecord::Migration
   def self.up
     add_column(:custom_fields, :position, :integer, :default => 1)
-    CustomField.find(:all).group_by(&:type).each_value  do |fields|
+    CustomField.find(:all).group_by(&:type).each  do |t, fields|
       fields.each_with_index do |field, i|
         # do not call model callbacks
         CustomField.update_all "position = #{i+1}", {:id => field.id}

lib/tabular_form_builder.rb

@@ -22,7 +22,7 @@ class TabularFormBuilder < ActionView::Helpers::FormBuilder
   
   def initialize(object_name, object, template, options, proc)
     set_language_if_valid options.delete(:lang)
-    @object_name, @object, @template, @options, @proc = object_name, object, template, options, proc        
+    super
   end      
       
   (field_helpers - %w(radio_button hidden_field) + %w(date_select)).each do |selector|

script/dbconsole

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/dbconsole'

script/performance/request

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/performance/request'

script/process/inspector

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/process/inspector'

test/functional/projects_controller_test.rb

@@ -38,7 +38,7 @@ class ProjectsControllerTest < Test::Unit::TestCase
     assert_template 'index'
     assert_not_nil assigns(:project_tree)
     # Root project as hash key
-    assert assigns(:project_tree).has_key?(Project.find(1))
+    assert assigns(:project_tree).keys.include?(Project.find(1))
     # Subproject in corresponding value
     assert assigns(:project_tree)[Project.find(1)].include?(Project.find(3))
   end

test/integration/issues_test.rb

@@ -20,8 +20,11 @@ require "#{File.dirname(__FILE__)}/../test_helper"
 class IssuesTest < ActionController::IntegrationTest
   fixtures :projects, 
            :users,
+           :roles,
+           :members,
            :trackers,
            :projects_trackers,
+           :enabled_modules,
            :issue_statuses,
            :issues,
            :enumerations,

test/test_helper.rb

@@ -65,20 +65,3 @@ class Test::Unit::TestCase
     Attachment.storage_path = "#{RAILS_ROOT}/tmp/test/attachments"
   end
 end
-
-
-# ActionController::TestUploadedFile bug
-# see http://dev.rubyonrails.org/ticket/4635
-class String
-  def original_filename
-    "testfile.txt"
-  end
-  
-  def content_type
-    "text/plain"
-  end
-  
-  def read
-    self.to_s
-  end
-end

test/unit/role_test.rb

@@ -26,7 +26,7 @@ class RoleTest < Test::Unit::TestCase
     
     target = Role.new(:name => 'Target')
     assert target.save
-    assert target.workflows.copy(source)
+    target.workflows.copy(source)
     target.reload
     assert_equal 90, target.workflows.size
   end

test/unit/tracker_test.rb

@@ -26,7 +26,7 @@ class TrackerTest < Test::Unit::TestCase
     
     target = Tracker.new(:name => 'Target')
     assert target.save
-    assert target.workflows.copy(source)
+    target.workflows.copy(source)
     target.reload
     assert_equal 89, target.workflows.size
   end

vendor/plugins/acts_as_versioned/lib/acts_as_versioned.rb

@@ -22,7 +22,7 @@
 module ActiveRecord #:nodoc:
   module Acts #:nodoc:
     # Specify this act if you want to save a copy of the row in a versioned table.  This assumes there is a 
-    # versioned table ready and that your model has a version field.  This works with optimisic locking if the lock_version
+    # versioned table ready and that your model has a version field.  This works with optimistic locking if the lock_version
     # column is present as well.
     #
     # The class for the versioned model is derived the first time it is seen. Therefore, if you change your database schema you have to restart
@@ -49,9 +49,24 @@ module ActiveRecord #:nodoc:
     #   page.revert_to(page.versions.last) # using versioned instance
     #   page.title         # => 'hello world'
     #
+    #   page.versions.earliest # efficient query to find the first version
+    #   page.versions.latest   # efficient query to find the most recently created version
+    #
+    #
+    # Simple Queries to page between versions
+    #
+    #   page.versions.before(version) 
+    #   page.versions.after(version)
+    #
+    # Access the previous/next versions from the versioned model itself
+    #
+    #   version = page.versions.latest
+    #   version.previous # go back one version
+    #   version.next     # go forward one version
+    #
     # See ActiveRecord::Acts::Versioned::ClassMethods#acts_as_versioned for configuration options
     module Versioned
-      CALLBACKS = [:set_new_version, :save_version_on_create, :save_version?, :clear_changed_attributes]
+      CALLBACKS = [:set_new_version, :save_version_on_create, :save_version?, :clear_altered_attributes]
       def self.included(base) # :nodoc:
         base.extend ClassMethods
       end
@@ -159,7 +174,7 @@ module ActiveRecord #:nodoc:
           send :include, ActiveRecord::Acts::Versioned::ActMethods
 
           cattr_accessor :versioned_class_name, :versioned_foreign_key, :versioned_table_name, :versioned_inheritance_column, 
-            :version_column, :max_version_limit, :track_changed_attributes, :version_condition, :version_sequence_name, :non_versioned_columns,
+            :version_column, :max_version_limit, :track_altered_attributes, :version_condition, :version_sequence_name, :non_versioned_columns,
             :version_association_options
 
           # legacy
@@ -171,7 +186,7 @@ module ActiveRecord #:nodoc:
             alias_method :non_versioned_fields=, :non_versioned_columns=
           end
 
-          send :attr_accessor, :changed_attributes
+          send :attr_accessor, :altered_attributes
 
           self.versioned_class_name         = options[:class_name]  || "Version"
           self.versioned_foreign_key        = options[:foreign_key] || self.to_s.foreign_key
@@ -184,8 +199,7 @@ module ActiveRecord #:nodoc:
           self.non_versioned_columns        = [self.primary_key, inheritance_column, 'version', 'lock_version', versioned_inheritance_column]
           self.version_association_options  = {
                                                 :class_name  => "#{self.to_s}::#{versioned_class_name}",
-                                                :foreign_key => "#{versioned_foreign_key}",
+                                                :foreign_key => versioned_foreign_key,
-                                                :order       => 'version',
                                                 :dependent   => :delete_all
                                               }.merge(options[:association_options] || {})
 
@@ -199,15 +213,25 @@ module ActiveRecord #:nodoc:
           end
 
           class_eval do
-            has_many :versions, version_association_options
+            has_many :versions, version_association_options do
+              # finds earliest version of this record
+              def earliest
+                @earliest ||= find(:first, :order => 'version')
+              end
+
+              # find latest version of this record
+              def latest
+                @latest ||= find(:first, :order => 'version desc')
+              end
+            end
             before_save  :set_new_version
             after_create :save_version_on_create
             after_update :save_version
             after_save   :clear_old_versions
-            after_save   :clear_changed_attributes
+            after_save   :clear_altered_attributes
 
             unless options[:if_changed].nil?
-              self.track_changed_attributes = true
+              self.track_altered_attributes = true
               options[:if_changed] = [options[:if_changed]] unless options[:if_changed].is_a?(Array)
               options[:if_changed].each do |attr_name|
                 define_method("#{attr_name}=") do |value|
@@ -222,8 +246,33 @@ module ActiveRecord #:nodoc:
           # create the dynamic versioned model
           const_set(versioned_class_name, Class.new(ActiveRecord::Base)).class_eval do
             def self.reloadable? ; false ; end
+            # find first version before the given version
+            def self.before(version)
+              find :first, :order => 'version desc',
+                :conditions => ["#{original_class.versioned_foreign_key} = ? and version < ?", version.send(original_class.versioned_foreign_key), version.version]
+            end
+
+            # find first version after the given version.
+            def self.after(version)
+              find :first, :order => 'version',
+                :conditions => ["#{original_class.versioned_foreign_key} = ? and version > ?", version.send(original_class.versioned_foreign_key), version.version]
+            end
+
+            def previous
+              self.class.before(self)
+            end
+
+            def next
+              self.class.after(self)
+            end
+
+            def versions_count
+              page.version
+            end
           end
 
+          versioned_class.cattr_accessor :original_class
+          versioned_class.original_class = self
           versioned_class.set_table_name versioned_table_name
           versioned_class.belongs_to self.to_s.demodulize.underscore.to_sym, 
             :class_name  => "::#{self.to_s}", 
@@ -238,6 +287,11 @@ module ActiveRecord #:nodoc:
           base.extend ClassMethods
         end
 
+        # Finds a specific version of this record
+        def find_version(version = nil)
+          self.class.find_version(id, version)
+        end
+
         # Saves a version of the model if applicable
         def save_version
           save_version_on_create if save_version?
@@ -263,16 +317,8 @@ module ActiveRecord #:nodoc:
           end
         end
 
-        # Finds a specific version of this model.
+        def versions_count
-        def find_version(version)
+          version
-          return version if version.is_a?(self.class.versioned_class)
-          return nil if version.is_a?(ActiveRecord::Base)
-          find_versions(:conditions => ['version = ?', version], :limit => 1).first
-        end
-        
-        # Finds versions of this model.  Takes an options hash like <tt>find</tt>
-        def find_versions(options = {})
-          versions.find(:all, options)
         end
 
         # Reverts a model to a given version.  Takes either a version number or an instance of the versioned model
@@ -280,7 +326,7 @@ module ActiveRecord #:nodoc:
           if version.is_a?(self.class.versioned_class)
             return false unless version.send(self.class.versioned_foreign_key) == self.id and !version.new_record?
           else
-            return false unless version = find_version(version)
+            return false unless version = versions.find_by_version(version)
           end
           self.clone_versioned_model(version, self)
           self.send("#{self.class.version_column}=", version.version)
@@ -318,8 +364,8 @@ module ActiveRecord #:nodoc:
         # If called with a single parameter, gets whether the parameter has changed.
         def changed?(attr_name = nil)
           attr_name.nil? ?
-            (!self.class.track_changed_attributes || (changed_attributes && changed_attributes.length > 0)) :
+            (!self.class.track_altered_attributes || (altered_attributes && altered_attributes.length > 0)) :
-            (changed_attributes && changed_attributes.include?(attr_name.to_s))
+            (altered_attributes && altered_attributes.include?(attr_name.to_s))
         end
 
         # keep old dirty? method
@@ -328,7 +374,7 @@ module ActiveRecord #:nodoc:
         # Clones a model.  Used when saving a new version or reverting a model's version.
         def clone_versioned_model(orig_model, new_model)
           self.versioned_attributes.each do |key|
-            new_model.send("#{key}=", orig_model.attributes[key]) if orig_model.has_attribute?(key)
+            new_model.send("#{key}=", orig_model.send(key)) if orig_model.has_attribute?(key)
           end
 
           if orig_model.is_a?(self.class.versioned_class)
@@ -391,28 +437,30 @@ module ActiveRecord #:nodoc:
           end
 
           # clears current changed attributes.  Called after save.
-          def clear_changed_attributes
+          def clear_altered_attributes
-            self.changed_attributes = []
+            self.altered_attributes = []
           end
 
           def write_changed_attribute(attr_name, attr_value)
             # Convert to db type for comparison. Avoids failing Float<=>String comparisons.
             attr_value_for_db = self.class.columns_hash[attr_name.to_s].type_cast(attr_value)
-            (self.changed_attributes ||= []) << attr_name.to_s unless self.changed?(attr_name) || self.send(attr_name) == attr_value_for_db
+            (self.altered_attributes ||= []) << attr_name.to_s unless self.changed?(attr_name) || self.send(attr_name) == attr_value_for_db
             write_attribute(attr_name, attr_value_for_db)
           end
 
-        private
-          CALLBACKS.each do |attr_name| 
-            alias_method "orig_#{attr_name}".to_sym, attr_name
-          end
-
         module ClassMethods
           # Finds a specific version of a specific row of this model
-          def find_version(id, version)
+          def find_version(id, version = nil)
-            find_versions(id, 
+            return find(id) unless version
-              :conditions => ["#{versioned_foreign_key} = ? AND version = ?", id, version], 
+
-              :limit => 1).first
+            conditions = ["#{versioned_foreign_key} = ? AND version = ?", id, version]
+            options = { :conditions => conditions, :limit => 1 }
+
+            if result = find_versions(id, options).first
+              result
+            else
+              raise RecordNotFound, "Couldn't find #{name} with ID=#{id} and VERSION=#{version}"
+            end
           end
 
           # Finds versions of a specific model.  Takes an options hash like <tt>find</tt>
@@ -449,13 +497,17 @@ module ActiveRecord #:nodoc:
               updated_col = col if !updated_col && %(updated_at updated_on).include?(col.name)
               self.connection.add_column versioned_table_name, col.name, col.type, 
                 :limit => col.limit, 
-                :default => col.default
+                :default => col.default,
+                :scale => col.scale,
+                :precision => col.precision
             end
 
             if type_col = self.columns_hash[inheritance_column]
               self.connection.add_column versioned_table_name, versioned_inheritance_column, type_col.type, 
                 :limit => type_col.limit, 
-                :default => type_col.default
+                :default => type_col.default,
+                :scale => type_col.scale,
+                :precision => type_col.precision
             end
 
             if updated_col.nil?
@@ -477,16 +529,17 @@ module ActiveRecord #:nodoc:
           def without_revision(&block)
             class_eval do 
               CALLBACKS.each do |attr_name|
+                alias_method "orig_#{attr_name}".to_sym, attr_name
                 alias_method attr_name, :empty_callback
               end
             end
-            result = block.call
+            block.call
+          ensure
             class_eval do 
               CALLBACKS.each do |attr_name|
                 alias_method attr_name, "orig_#{attr_name}".to_sym
               end
             end
-            result
           end
 
           # Turns off optimistic locking for the duration of the block

vendor/plugins/acts_as_versioned/test/abstract_unit.rb

@@ -1,12 +1,21 @@
+$:.unshift(File.dirname(__FILE__) + '/../../../rails/activesupport/lib')
+$:.unshift(File.dirname(__FILE__) + '/../../../rails/activerecord/lib')
 $:.unshift(File.dirname(__FILE__) + '/../lib')
-
 require 'test/unit'
-require File.expand_path(File.join(File.dirname(__FILE__), '../../../../config/environment.rb'))
+begin
-require 'active_record/fixtures'
+  require 'active_support'
+  require 'active_record'
+  require 'active_record/fixtures'
+rescue LoadError
+  require 'rubygems'
+  retry
+end
+require 'acts_as_versioned'
 
 config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
 ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
-ActiveRecord::Base.establish_connection(config[ENV['DB'] || 'sqlite'])
+ActiveRecord::Base.configurations = {'test' => config[ENV['DB'] || 'sqlite3']}
+ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations['test'])
 
 load(File.dirname(__FILE__) + "/schema.rb")
 
@@ -19,17 +28,9 @@ if ENV['DB'] == 'postgresql'
 end
 
 Test::Unit::TestCase.fixture_path = File.dirname(__FILE__) + "/fixtures/"
-$LOAD_PATH.unshift(Test::Unit::TestCase.fixture_path)
+$:.unshift(Test::Unit::TestCase.fixture_path)
 
 class Test::Unit::TestCase #:nodoc:
-  def create_fixtures(*table_names)
-    if block_given?
-      Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names) { yield }
-    else
-      Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names)
-    end
-  end
-
   # Turn off transactional fixtures if you're working with MyISAM tables in MySQL
   self.use_transactional_fixtures = true
   

vendor/plugins/acts_as_versioned/test/fixtures/widget.rb

@@ -1,6 +1,6 @@
 class Widget < ActiveRecord::Base
   acts_as_versioned :sequence_name => 'widgets_seq', :association_options => {
-    :dependent => nil, :order => 'version desc'
+    :dependent => :nullify, :order => 'version desc'
   }
   non_versioned_columns << 'foo'
 end

vendor/plugins/acts_as_versioned/test/migration_test.rb

@@ -9,8 +9,13 @@ if ActiveRecord::Base.connection.supports_migrations?
   class MigrationTest < Test::Unit::TestCase
     self.use_transactional_fixtures = false
     def teardown
-      ActiveRecord::Base.connection.initialize_schema_information
+      if ActiveRecord::Base.connection.respond_to?(:initialize_schema_information)
-      ActiveRecord::Base.connection.update "UPDATE schema_info SET version = 0"
+        ActiveRecord::Base.connection.initialize_schema_information
+        ActiveRecord::Base.connection.update "UPDATE schema_info SET version = 0"
+      else
+        ActiveRecord::Base.connection.initialize_schema_migrations_table
+        ActiveRecord::Base.connection.assume_migrated_upto_version(0)
+      end
       
       Thing.connection.drop_table "things" rescue nil
       Thing.connection.drop_table "thing_versions" rescue nil
@@ -21,9 +26,18 @@ if ActiveRecord::Base.connection.supports_migrations?
       assert_raises(ActiveRecord::StatementInvalid) { Thing.create :title => 'blah blah' }
       # take 'er up
       ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/')
-      t = Thing.create :title => 'blah blah'
+      t = Thing.create :title => 'blah blah', :price => 123.45, :type => 'Thing'
       assert_equal 1, t.versions.size
       
+      # check that the price column has remembered its value correctly
+      assert_equal t.price,  t.versions.first.price
+      assert_equal t.title,  t.versions.first.title
+      assert_equal t[:type], t.versions.first[:type]
+      
+      # make sure that the precision of the price column has been preserved
+      assert_equal 7, Thing::Version.columns.find{|c| c.name == "price"}.precision
+      assert_equal 2, Thing::Version.columns.find{|c| c.name == "price"}.scale
+
       # now lets take 'er back down
       ActiveRecord::Migrator.down(File.dirname(__FILE__) + '/fixtures/migrations/')
       assert_raises(ActiveRecord::StatementInvalid) { Thing.create :title => 'blah blah' }

vendor/plugins/acts_as_versioned/test/versioned_test.rb

@@ -4,9 +4,10 @@ require File.join(File.dirname(__FILE__), 'fixtures/widget')
 
 class VersionedTest < Test::Unit::TestCase
   fixtures :pages, :page_versions, :locked_pages, :locked_pages_revisions, :authors, :landmarks, :landmark_versions
+  set_fixture_class :page_versions => Page::Version
 
   def test_saves_versioned_copy
-    p = Page.create :title => 'first title', :body => 'first body'
+    p = Page.create! :title => 'first title', :body => 'first body'
     assert !p.new_record?
     assert_equal 1, p.versions.size
     assert_equal 1, p.version
@@ -69,7 +70,7 @@ class VersionedTest < Test::Unit::TestCase
   end
 
   def test_saves_versioned_copy_with_options
-    p = LockedPage.create :title => 'first title'
+    p = LockedPage.create! :title => 'first title'
     assert !p.new_record?
     assert_equal 1, p.versions.size
     assert_instance_of LockedPage.versioned_class, p.versions.first
@@ -96,7 +97,7 @@ class VersionedTest < Test::Unit::TestCase
   end
 
   def test_saves_versioned_copy_with_sti
-    p = SpecialLockedPage.create :title => 'first title'
+    p = SpecialLockedPage.create! :title => 'first title'
     assert !p.new_record?
     assert_equal 1, p.versions.size
     assert_instance_of LockedPage.versioned_class, p.versions.first
@@ -127,7 +128,7 @@ class VersionedTest < Test::Unit::TestCase
   end
 
   def test_version_if_condition
-    p = Page.create :title => "title"
+    p = Page.create! :title => "title"
     assert_equal 1, p.version
 
     Page.feeling_good = false
@@ -144,7 +145,7 @@ class VersionedTest < Test::Unit::TestCase
       alias_method :feeling_good?, :new_feeling_good
     end
 
-    p = Page.create :title => "title"
+    p = Page.create! :title => "title"
     assert_equal 1, p.version # version does not increment
     assert_equal 1, p.versions(true).size
 
@@ -165,7 +166,7 @@ class VersionedTest < Test::Unit::TestCase
     old_condition = Page.version_condition
     Page.version_condition = Proc.new { |page| page.title[0..0] == 'b' }
 
-    p = Page.create :title => "title"
+    p = Page.create! :title => "title"
     assert_equal 1, p.version # version does not increment
     assert_equal 1, p.versions(true).size
 
@@ -182,7 +183,7 @@ class VersionedTest < Test::Unit::TestCase
   end
 
   def test_version_no_limit
-    p = Page.create :title => "title", :body => 'first body'
+    p = Page.create! :title => "title", :body => 'first body'
     p.save
     p.save
     5.times do |i|
@@ -191,7 +192,7 @@ class VersionedTest < Test::Unit::TestCase
   end
 
   def test_version_max_limit
-    p = LockedPage.create :title => "title"
+    p = LockedPage.create! :title => "title"
     p.update_attributes(:title => "title1")
     p.update_attributes(:title => "title2")
     5.times do |i|
@@ -200,21 +201,19 @@ class VersionedTest < Test::Unit::TestCase
     end
   end
 
-  def test_track_changed_attributes_default_value
+  def test_track_altered_attributes_default_value
-    assert !Page.track_changed_attributes
+    assert !Page.track_altered_attributes
-    assert LockedPage.track_changed_attributes
+    assert LockedPage.track_altered_attributes
-    assert SpecialLockedPage.track_changed_attributes
+    assert SpecialLockedPage.track_altered_attributes
   end
 
   def test_version_order
     assert_equal 23, pages(:welcome).versions.first.version
     assert_equal 24, pages(:welcome).versions.last.version
-    assert_equal 23, pages(:welcome).find_versions.first.version
-    assert_equal 24, pages(:welcome).find_versions.last.version
   end
 
-  def test_track_changed_attributes    
+  def test_track_altered_attributes
-    p = LockedPage.create :title => "title"
+    p = LockedPage.create! :title => "title"
     assert_equal 1, p.lock_version
     assert_equal 1, p.versions(true).size
 
@@ -246,17 +245,28 @@ class VersionedTest < Test::Unit::TestCase
 
   def test_find_versions
     assert_equal 2, locked_pages(:welcome).versions.size
-    assert_equal 1, locked_pages(:welcome).find_versions(:conditions => ['title LIKE ?', '%weblog%']).length
+    assert_equal 1, locked_pages(:welcome).versions.find(:all, :conditions => ['title LIKE ?', '%weblog%']).length
-    assert_equal 2, locked_pages(:welcome).find_versions(:conditions => ['title LIKE ?', '%web%']).length
+    assert_equal 2, locked_pages(:welcome).versions.find(:all, :conditions => ['title LIKE ?', '%web%']).length
-    assert_equal 0, locked_pages(:thinking).find_versions(:conditions => ['title LIKE ?', '%web%']).length
+    assert_equal 0, locked_pages(:thinking).versions.find(:all, :conditions => ['title LIKE ?', '%web%']).length
-    assert_equal 2, locked_pages(:welcome).find_versions.length
+    assert_equal 2, locked_pages(:welcome).versions.length
+  end
+
+  def test_find_version
+    assert_equal page_versions(:welcome_1), Page.find_version(pages(:welcome).id, 23)
+    assert_equal page_versions(:welcome_2), Page.find_version(pages(:welcome).id, 24)
+    assert_equal pages(:welcome), Page.find_version(pages(:welcome).id)
+
+    assert_equal page_versions(:welcome_1), pages(:welcome).find_version(23)
+    assert_equal page_versions(:welcome_2), pages(:welcome).find_version(24)
+    assert_equal pages(:welcome), pages(:welcome).find_version
+
+    assert_raise(ActiveRecord::RecordNotFound) { Page.find_version(pages(:welcome).id, 1) }
+    assert_raise(ActiveRecord::RecordNotFound) { Page.find_version(0, 23) }
   end
 
   def test_with_sequence
     assert_equal 'widgets_seq', Widget.versioned_class.sequence_name
-    Widget.create :name => 'new widget'
+    3.times { Widget.create! :name => 'new widget' }
-    Widget.create :name => 'new widget'
-    Widget.create :name => 'new widget'
     assert_equal 3, Widget.count
     assert_equal 3, Widget.versioned_class.count
   end
@@ -283,11 +293,11 @@ class VersionedTest < Test::Unit::TestCase
 
     association = Widget.reflect_on_association(:versions)
     options = association.options
-    assert_nil options[:dependent]
+    assert_equal :nullify, options[:dependent]
     assert_equal 'version desc', options[:order]
     assert_equal 'widget_id', options[:foreign_key]
 
-    widget = Widget.create :name => 'new widget'
+    widget = Widget.create! :name => 'new widget'
     assert_equal 1, Widget.count
     assert_equal 1, Widget.versioned_class.count
     widget.destroy
@@ -301,13 +311,37 @@ class VersionedTest < Test::Unit::TestCase
     assert_equal page, page_version.page
   end
 
-  def test_unchanged_attributes
+  def test_unaltered_attributes
-    landmarks(:washington).attributes = landmarks(:washington).attributes
+    landmarks(:washington).attributes = landmarks(:washington).attributes.except("id")
     assert !landmarks(:washington).changed?
   end
 
   def test_unchanged_string_attributes
-    landmarks(:washington).attributes = landmarks(:washington).attributes.inject({}) { |params, (key, value)| params.update key => value.to_s }
+    landmarks(:washington).attributes = landmarks(:washington).attributes.except("id").inject({}) { |params, (key, value)| params.update(key => value.to_s) }
     assert !landmarks(:washington).changed?
   end
+
+  def test_should_find_earliest_version
+    assert_equal page_versions(:welcome_1), pages(:welcome).versions.earliest
+  end
+
+  def test_should_find_latest_version
+    assert_equal page_versions(:welcome_2), pages(:welcome).versions.latest
+  end
+
+  def test_should_find_previous_version
+    assert_equal page_versions(:welcome_1), page_versions(:welcome_2).previous
+    assert_equal page_versions(:welcome_1), pages(:welcome).versions.before(page_versions(:welcome_2))
+  end
+
+  def test_should_find_next_version
+    assert_equal page_versions(:welcome_2), page_versions(:welcome_1).next
+    assert_equal page_versions(:welcome_2), pages(:welcome).versions.after(page_versions(:welcome_1))
+  end
+
+  def test_should_find_version_count
+    assert_equal 24, pages(:welcome).versions_count
+    assert_equal 24, page_versions(:welcome_1).versions_count
+    assert_equal 24, page_versions(:welcome_2).versions_count
+  end
 end

vendor/plugins/rfpdf/init.rb

@@ -1,3 +1,9 @@
 require 'rfpdf'
 
-ActionView::Base::register_template_handler 'rfpdf', RFPDF::View
+begin
+  ActionView::Template::register_template_handler 'rfpdf', RFPDF::View
+rescue NameError
+  # Rails < 2.1
+  RFPDF::View.backward_compatibility_mode = true
+  ActionView::Base::register_template_handler 'rfpdf', RFPDF::View
+end

vendor/plugins/rfpdf/lib/rfpdf/view.rb

@@ -30,6 +30,8 @@
 module RFPDF
   
   class View
+    @@backward_compatibility_mode = false
+    cattr_accessor :backward_compatibility_mode
     
     def initialize(action_view)
       @action_view = action_view
@@ -46,6 +48,14 @@ module RFPDF
       }.merge(@action_view.controller.instance_eval{ @options_for_rfpdf } || {}).with_indifferent_access
     end
     
+    def self.compilable?
+      false
+    end
+
+    def compilable?
+      self.class.compilable?
+    end
+
     def render(template, local_assigns = {})
 			@pdf_name = "Default.pdf" if @pdf_name.nil?
 		  unless @action_view.controller.headers["Content-Type"] == 'application/pdf'
@@ -66,7 +76,7 @@ module RFPDF
 			  local_assigns.each do |key,val|
 		  		class << self; self; end.send(:define_method,key){ val }
 				end
-        ERB.new(template).result(binding)
+        ERB.new(@@backward_compatibility_mode == true ? template : template.source).result(binding) 
       end
     end