jro_apps/redmine Commit - r1609:7cdd88a6ce36

Merged Rails 2.1 compatibility branch....

Jean-Philippe Lang -

r1609:7cdd88a6ce36

parent child

Context file:

r1609:7cdd88a6ce36

Expand all files

config/initializers/10-patches.rb created 644 +17 0

@@ -0,0 +1,17
	1
	2	ActiveRecord::Errors.default_error_messages = {
	3	:inclusion => "activerecord_error_inclusion",
	4	:exclusion => "activerecord_error_exclusion",
	5	:invalid => "activerecord_error_invalid",
	6	:confirmation => "activerecord_error_confirmation",
	7	:accepted => "activerecord_error_accepted",
	8	:empty => "activerecord_error_empty",
	9	:blank => "activerecord_error_blank",
	10	:too_long => "activerecord_error_too_long",
	11	:too_short => "activerecord_error_too_short",
	12	:wrong_length => "activerecord_error_wrong_length",
	13	:taken => "activerecord_error_taken",
	14	:not_a_number => "activerecord_error_not_a_number"
	15	}
	16
	17	ActionView::Base.field_error_proc = Proc.new{ \|html_tag, instance\| "#{html_tag}" }

config/initializers/20-mime_types.rb created 644 +4 0

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

config/initializers/30-redmine.rb created 644 +7 0

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

script/dbconsole created 644 +3 0

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

script/performance/request created 644 +3 0

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

script/process/inspector created 644 +3 0

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

app/controllers/projects_controller.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class ProjectsController < ApplicationController
               layout 'base'
               menu_item :overview
               menu_item :activity, :only => :activity
               menu_item :roadmap, :only => :roadmap
               menu_item :files, :only => [:list_files, :add_file]
               menu_item :settings, :only => :settings
               menu_item :issues, :only => [:changelog]
               before_filter :find_project, :except => [ :index, :list, :add, :activity ]
               before_filter :find_optional_project, :only => :activity
               before_filter :authorize, :except => [ :index, :list, :add, :archive, :unarchive, :destroy, :activity ]
               before_filter :require_admin, :only => [ :add, :archive, :unarchive, :destroy ]
               accept_key_auth :activity, :calendar
               helper :sort
               include SortHelper
               helper :custom_fields
               include CustomFieldsHelper
               helper :ifpdf
               include IfpdfHelper
               helper :issues
               helper IssuesHelper
               helper :queries
               include QueriesHelper
               helper :repositories
               include RepositoriesHelper
               include ProjectsHelper
               # Lists visible projects
               def index
                 projects = Project.find :all,
                                         :conditions => Project.visible_by(User.current),
                                         :include => :parent
                 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),
                                               :title => "#{Setting.app_title}: #{l(:label_project_latest)}")
                   }
                 end
               end
               # Add a new project
               def add
                 @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
                 @trackers = Tracker.all
                 @root_projects = Project.find(:all,
                                               :conditions => "parent_id IS NULL AND status = #{Project::STATUS_ACTIVE}",
                                               :order => 'name')
                 @project = Project.new(params[:project])
                 if request.get?
                   @project.trackers = Tracker.all
                   @project.is_public = Setting.default_projects_public?
                   @project.enabled_module_names = Redmine::AccessControl.available_project_modules
                 else
                   @project.enabled_module_names = params[:enabled_modules]
                   if @project.save
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :controller => 'admin', :action => 'projects'
             	  end
                 end
               end
               # Show @project
               def show
                 @members_by_role = @project.members.find(:all, :include => [:user, :role], :order => 'position').group_by {|m| m.role}
                 @subprojects = @project.children.find(:all, :conditions => Project.visible_by(User.current))
                 @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC")
                 @trackers = @project.rolled_up_trackers
                 cond = @project.project_condition(Setting.display_subprojects_issues?)
                 Issue.visible_by(User.current) do
                   @open_issues_by_tracker = Issue.count(:group => :tracker,
                                                         :include => [:project, :status, :tracker],
                                                         :conditions => ["(#{cond}) AND #{IssueStatus.table_name}.is_closed=?", false])
                   @total_issues_by_tracker = Issue.count(:group => :tracker,
                                                         :include => [:project, :status, :tracker],
                                                         :conditions => cond)
                 end
                 TimeEntry.visible_by(User.current) do
                   @total_hours = TimeEntry.sum(:hours,
                                                :include => :project,
                                                :conditions => cond).to_f
                 end
                 @key = User.current.rss_key
               end
               def settings
                 @root_projects = Project.find(:all,
                                               :conditions => ["parent_id IS NULL AND status = #{Project::STATUS_ACTIVE} AND id <> ?", @project.id],
                                               :order => 'name')
                 @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
                 @issue_category ||= IssueCategory.new
                 @member ||= @project.members.new
                 @trackers = Tracker.all
                 @repository ||= @project.repository
                 @wiki ||= @project.wiki
               end
               # Edit @project
               def edit
                 if request.post?
                   @project.attributes = params[:project]
                   if @project.save
                     flash[:notice] = l(:notice_successful_update)
                     redirect_to :action => 'settings', :id => @project
                   else
                     settings
                     render :action => 'settings'
                   end
                 end
               end
               def modules
                 @project.enabled_module_names = params[:enabled_modules]
                 redirect_to :action => 'settings', :id => @project, :tab => 'modules'
               end
               def archive
                 @project.archive if request.post? && @project.active?
                 redirect_to :controller => 'admin', :action => 'projects'
               end
               def unarchive
                 @project.unarchive if request.post? && !@project.active?
                 redirect_to :controller => 'admin', :action => 'projects'
               end
               # Delete @project
               def destroy
                 @project_to_destroy = @project
                 if request.post? and params[:confirm]
                   @project_to_destroy.destroy
                   redirect_to :controller => 'admin', :action => 'projects'
                 end
                 # hide project in layout
                 @project = nil
               end
               # Add a new issue category to @project
               def add_issue_category
                 @category = @project.issue_categories.build(params[:category])
                 if request.post? and @category.save
               	  respond_to do |format|
                     format.html do
                       flash[:notice] = l(:notice_successful_create)
                       redirect_to :action => 'settings', :tab => 'categories', :id => @project
                     end
                     format.js do
                       # IE doesn't support the replace_html rjs method for select box options
                       render(:update) {|page| page.replace "issue_category_id",
                         content_tag('select', '<option></option>' + options_from_collection_for_select(@project.issue_categories, 'id', 'name', @category.id), :id => 'issue_category_id', :name => 'issue[category_id]')
                       }
                     end
                   end
                 end
               end
               # Add a new version to @project
               def add_version
               	@version = @project.versions.build(params[:version])
               	if request.post? and @version.save
               	  flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'settings', :tab => 'versions', :id => @project
               	end
               end
               def add_file
                 if request.post?
                   @version = @project.versions.find_by_id(params[:version_id])
                   attachments = attach_files(@version, params[:attachments])
                   Mailer.deliver_attachments_added(attachments) if !attachments.empty? && Setting.notified_events.include?('file_added')
                   redirect_to :controller => 'projects', :action => 'list_files', :id => @project
                 end
                 @versions = @project.versions.sort
               end
               def list_files
                 sort_init "#{Attachment.table_name}.filename", "asc"
                 sort_update
                 @versions = @project.versions.find(:all, :include => :attachments, :order => sort_clause).sort.reverse
                 render :layout => !request.xhr?
               end
               # Show changelog for @project
               def changelog
                 @trackers = @project.trackers.find(:all, :conditions => ["is_in_chlog=?", true], :order => 'position')
                 retrieve_selected_tracker_ids(@trackers)
                 @versions = @project.versions.sort
               end
               def roadmap
                 @trackers = @project.trackers.find(:all, :conditions => ["is_in_roadmap=?", true])
                 retrieve_selected_tracker_ids(@trackers)
                 @versions = @project.versions.sort
                 @versions = @versions.select {|v| !v.completed? } unless params[:completed]
               end
               def activity
                 @days = Setting.activity_days_default.to_i
                 if params[:from]
                   begin; @date_to = params[:from].to_date; rescue; end
                 end
                 @date_to ||= Date.today + 1
                 @date_from = @date_to - @days
                 @event_types = %w(issues news files documents changesets wiki_pages messages)
                 if @project
                   @event_types.delete('wiki_pages') unless @project.wiki
                   @event_types.delete('changesets') unless @project.repository
                   @event_types.delete('messages') unless @project.boards.any?
                   # only show what the user is allowed to view
                   @event_types = @event_types.select {|o| User.current.allowed_to?("view_#{o}".to_sym, @project)}
                   @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
                 end
                 @scope = @event_types.select {|t| params["show_#{t}"]}
                 # default events if none is specified in parameters
                 @scope = (@event_types - %w(wiki_pages messages))if @scope.empty?
                 @events = []
                 if @scope.include?('issues')
                   cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_issues, :project => @project, :with_subprojects => @with_subprojects))
                   cond.add(["#{Issue.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to])
                   @events += Issue.find(:all, :include => [:project, :author, :tracker], :conditions => cond.conditions)
                   cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_issues, :project => @project, :with_subprojects => @with_subprojects))
                   cond.add(["#{Journal.table_name}.journalized_type = 'Issue' AND #{Journal.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to])
                   cond.add("#{JournalDetail.table_name}.prop_key = 'status_id' OR #{Journal.table_name}.notes <> ''")
                   @events += Journal.find(:all, :include => [{:issue => :project}, :details, :user], :conditions => cond.conditions)
                 end
                 if @scope.include?('news')
                   cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_news, :project => @project, :with_subprojects => @with_subprojects))
                   cond.add(["#{News.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to])
                   @events += News.find(:all, :include => [:project, :author], :conditions => cond.conditions)
                 end
                 if @scope.include?('files')
                   cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_files, :project => @project, :with_subprojects => @with_subprojects))
                   cond.add(["#{Attachment.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to])
                   @events += Attachment.find(:all, :select => "#{Attachment.table_name}.*",
                                                    :joins => "LEFT JOIN #{Version.table_name} ON #{Attachment.table_name}.container_type='Version' AND #{Version.table_name}.id = #{Attachment.table_name}.container_id " +
                                                              "LEFT JOIN #{Project.table_name} ON #{Version.table_name}.project_id = #{Project.table_name}.id",
                                                    :conditions => cond.conditions)
                 end
                 if @scope.include?('documents')
                   cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_documents, :project => @project, :with_subprojects => @with_subprojects))
                   cond.add(["#{Document.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to])
                   @events += Document.find(:all, :include => :project, :conditions => cond.conditions)
                   cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_documents, :project => @project, :with_subprojects => @with_subprojects))
                   cond.add(["#{Attachment.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to])
                   @events += Attachment.find(:all, :select => "#{Attachment.table_name}.*",
                                                    :joins => "LEFT JOIN #{Document.table_name} ON #{Attachment.table_name}.container_type='Document' AND #{Document.table_name}.id = #{Attachment.table_name}.container_id " +
                                                              "LEFT JOIN #{Project.table_name} ON #{Document.table_name}.project_id = #{Project.table_name}.id",
                                                    :conditions => cond.conditions)
                 end
                 if @scope.include?('wiki_pages')
                   select = "#{WikiContent.versioned_table_name}.updated_on, #{WikiContent.versioned_table_name}.comments, " +
                            "#{WikiContent.versioned_table_name}.#{WikiContent.version_column}, #{WikiPage.table_name}.title, " +
                            "#{WikiContent.versioned_table_name}.page_id, #{WikiContent.versioned_table_name}.author_id, " +
                            "#{WikiContent.versioned_table_name}.id"
                   joins = "LEFT JOIN #{WikiPage.table_name} ON #{WikiPage.table_name}.id = #{WikiContent.versioned_table_name}.page_id " +
                           "LEFT JOIN #{Wiki.table_name} ON #{Wiki.table_name}.id = #{WikiPage.table_name}.wiki_id " +
                           "LEFT JOIN #{Project.table_name} ON #{Project.table_name}.id = #{Wiki.table_name}.project_id"
                   cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_wiki_pages, :project => @project, :with_subprojects => @with_subprojects))
                   cond.add(["#{WikiContent.versioned_table_name}.updated_on BETWEEN ? AND ?", @date_from, @date_to])
                   @events += WikiContent.versioned_class.find(:all, :select => select, :joins => joins, :conditions => cond.conditions)
                 end
                 if @scope.include?('changesets')
                   cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_changesets, :project => @project, :with_subprojects => @with_subprojects))
                   cond.add(["#{Changeset.table_name}.committed_on BETWEEN ? AND ?", @date_from, @date_to])
                   @events += Changeset.find(:all, :include => {:repository => :project}, :conditions => cond.conditions)
                 end
                 if @scope.include?('messages')
                   cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_messages, :project => @project, :with_subprojects => @with_subprojects))
                   cond.add(["#{Message.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to])
                   @events += Message.find(:all, :include => [{:board => :project}, :author], :conditions => cond.conditions)
                 end
                 @events_by_day = @events.group_by(&:event_date)
                 respond_to do |format|
                   format.html { render :layout => false if request.xhr? }
                   format.atom { render_feed(@events, :title => "#{@project || Setting.app_title}: #{l(:label_activity)}") }
                 end
               end
               def calendar
                 @trackers = @project.rolled_up_trackers
                 retrieve_selected_tracker_ids(@trackers)
                 if params[:year] and params[:year].to_i > 1900
                   @year = params[:year].to_i
                   if params[:month] and params[:month].to_i > 0 and params[:month].to_i < 13
                     @month = params[:month].to_i
                   end
                 end
                 @year ||= Date.today.year
                 @month ||= Date.today.month
                 @calendar = Redmine::Helpers::Calendar.new(Date.civil(@year, @month, 1), current_language, :month)
                 @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
                 events = []
                 @project.issues_with_subprojects(@with_subprojects) do
                   events += Issue.find(:all,
                                        :include => [:tracker, :status, :assigned_to, :priority, :project],
                                        :conditions => ["((start_date BETWEEN ? AND ?) OR (due_date BETWEEN ? AND ?)) AND #{Issue.table_name}.tracker_id IN (#{@selected_tracker_ids.join(',')})", @calendar.startdt, @calendar.enddt, @calendar.startdt, @calendar.enddt]
                                        ) unless @selected_tracker_ids.empty?
                   events += Version.find(:all, :include => :project,
                                                :conditions => ["effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt])
                 end
                 @calendar.events = events
                 render :layout => false if request.xhr?
               end
               def gantt
                 @trackers = @project.rolled_up_trackers
                 retrieve_selected_tracker_ids(@trackers)
                 if params[:year] and params[:year].to_i >0
                   @year_from = params[:year].to_i
                   if params[:month] and params[:month].to_i >=1 and params[:month].to_i <= 12
                     @month_from = params[:month].to_i
                   else
                     @month_from = 1
                   end
                 else
                   @month_from ||= Date.today.month
                   @year_from ||= Date.today.year
                 end
                 zoom = (params[:zoom] || User.current.pref[:gantt_zoom]).to_i
                 @zoom = (zoom > 0 && zoom < 5) ? zoom : 2
                 months = (params[:months] || User.current.pref[:gantt_months]).to_i
                 @months = (months > 0 && months < 25) ? months : 6
                 # Save gantt paramters as user preference (zoom and months count)
                 if (User.current.logged? && (@zoom != User.current.pref[:gantt_zoom] || @months != User.current.pref[:gantt_months]))
                   User.current.pref[:gantt_zoom], User.current.pref[:gantt_months] = @zoom, @months
                   User.current.preference.save
                 end
                 @date_from = Date.civil(@year_from, @month_from, 1)
                 @date_to = (@date_from >> @months) - 1
                 @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
                 @events = []
                 @project.issues_with_subprojects(@with_subprojects) do
                   # Issues that have start and due dates
                   @events += Issue.find(:all,
                                        :order => "start_date, due_date",
                                        :include => [:tracker, :status, :assigned_to, :priority, :project],
                                        :conditions => ["(((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?) or (start_date<? and due_date>?)) and start_date is not null and due_date is not null and #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')}))", @date_from, @date_to, @date_from, @date_to, @date_from, @date_to]
                                        ) unless @selected_tracker_ids.empty?
                   # Issues that don't have a due date but that are assigned to a version with a date
                   @events += Issue.find(:all,
                                        :order => "start_date, effective_date",
                                        :include => [:tracker, :status, :assigned_to, :priority, :project, :fixed_version],
                                        :conditions => ["(((start_date>=? and start_date<=?) or (effective_date>=? and effective_date<=?) or (start_date<? and effective_date>?)) and start_date is not null and due_date is null and effective_date is not null and #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')}))", @date_from, @date_to, @date_from, @date_to, @date_from, @date_to]
                                        ) unless @selected_tracker_ids.empty?
                   @events += Version.find(:all, :include => :project,
                                                 :conditions => ["effective_date BETWEEN ? AND ?", @date_from, @date_to])
                 end
                 @events.sort! {|x,y| x.start_date <=> y.start_date }
                 if params[:format]=='pdf'
                   @options_for_rfpdf ||= {}
                   @options_for_rfpdf[:file_name] = "#{@project.identifier}-gantt.pdf"
                   render :template => "projects/gantt.rfpdf", :layout => false
                 elsif params[:format]=='png' && respond_to?('gantt_image')
                   image = gantt_image(@events, @date_from, @months, @zoom)
                   image.format = 'PNG'
                   send_data(image.to_blob, :disposition => 'inline', :type => 'image/png', :filename => "#{@project.identifier}-gantt.png")
                 else
                   render :template => "projects/gantt.rhtml"
                 end
               end
             private
               # Find project of id params[:id]
               # if not found, redirect to project list
               # Used as a before_filter
               def find_project
                 @project = Project.find(params[:id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def find_optional_project
                 return true unless params[:id]
                 @project = Project.find(params[:id])
                 authorize
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def retrieve_selected_tracker_ids(selectable_trackers)
                 if ids = params[:tracker_ids]
                   @selected_tracker_ids = (ids.is_a? Array) ? ids.collect { |id| id.to_i.to_s } : ids.split('/').collect { |id| id.to_i.to_s }
                 else
                   @selected_tracker_ids = selectable_trackers.collect {|t| t.id.to_s }
                 end
               end
             end

app/helpers/repositories_helper.rb +4 0

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require 'iconv'
             module RepositoriesHelper
               def format_revision(txt)
                 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)
                 @encodings.each do |encoding|
                   begin
                     return Iconv.conv('UTF-8', encoding, str)
                   rescue Iconv::Failure
                     # do nothing here and try the next encoding
                   end
                 end
                 str
               end
               def repository_field_tags(form, repository)
                 method = repository.class.name.demodulize.underscore + "_field_tags"
                 send(method, form, repository) if repository.is_a?(Repository) && respond_to?(method)
               end
               def scm_select_tag(repository)
                 scm_options = [["--- #{l(:actionview_instancetag_blank_option)} ---", '']]
                 REDMINE_SUPPORTED_SCM.each do |scm|
                   scm_options << ["Repository::#{scm}".constantize.scm_name, scm] if Setting.enabled_scm.include?(scm) || (repository && repository.class.name.demodulize == scm)
                 end
                 select_tag('repository_scm',
                            options_for_select(scm_options, repository.class.name.demodulize),
                            :disabled => (repository && !repository.new_record?),
                            :onchange => remote_function(:url => { :controller => 'repositories', :action => 'edit', :id => @project }, :method => :get, :with => "Form.serialize(this.form)")
                            )
               end
               def with_leading_slash(path)
                 path.to_s.starts_with?('/') ? path : "/#{path}"
               end
               def without_leading_slash(path)
                 path.gsub(%r{^/+}, '')
               end
               def subversion_field_tags(form, repository)
                   content_tag('p', form.text_field(:url, :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)) +
                                    '<br />(http://, https://, svn://, file:///)') +
                   content_tag('p', form.text_field(:login, :size => 30)) +
                   content_tag('p', form.password_field(:password, :size => 30, :name => 'ignore',
                                                        :value => ((repository.new_record? || repository.password.blank?) ? '' : ('x'*15)),
                                                        :onfocus => "this.value=''; this.name='repository[password]';",
                                                        :onchange => "this.name='repository[password]';"))
               end
               def darcs_field_tags(form, repository)
                   content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.new_record?)))
               end
               def mercurial_field_tags(form, repository)
                   content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)))
               end
               def git_field_tags(form, repository)
                   content_tag('p', form.text_field(:url, :label => 'Path to .git directory', :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)))
               end
               def cvs_field_tags(form, repository)
                   content_tag('p', form.text_field(:root_url, :label => 'CVSROOT', :size => 60, :required => true, :disabled => !repository.new_record?)) +
                   content_tag('p', form.text_field(:url, :label => 'Module', :size => 30, :required => true, :disabled => !repository.new_record?))
               end
               def bazaar_field_tags(form, repository)
                   content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.new_record?)))
               end
               def filesystem_field_tags(form, repository)
                 content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)))
               end
             end

app/models/user_preference.rb +4 -2

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class UserPreference < ActiveRecord::Base
               belongs_to :user
               serialize :others
               attr_protected :others
               def initialize(attributes = nil)
                 super
                 self.others ||= {}
               end
               def before_save
                 self.others ||= {}
               end
               def [](attr_name)
                 if attribute_present? attr_name
                   super
                 else
                   others ? others[attr_name] : nil
                 end
               end
               def []=(attr_name, value)
                 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
               def comments_sorting; self[:comments_sorting] end
               def comments_sorting=(order); self[:comments_sorting]=order end
             end

app/views/repositories/_dir_list_content.rhtml +2 -2

             <% @entries.each do |entry| %>
             <% tr_id = Digest::MD5.hexdigest(entry.path)
                depth = params[:depth].to_i %>
             <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>
             <td class="revision"><%= link_to(format_revision(entry.lastrev.name), :action => 'revision', :id => @project, :rev => entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %></td>
             <td class="age"><%= distance_of_time_in_words(entry.lastrev.time, Time.now) if entry.lastrev && entry.lastrev.time %></td>
             <td class="author"><%=h(entry.lastrev.author.to_s.split('<').first) if entry.lastrev %></td>
             <% changeset = @project.repository.changesets.find_by_revision(entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %>
             <td class="comments"><%=h truncate(changeset.comments, 50) unless changeset.nil? %></td>
             </tr>
             <% end %>

app/views/repositories/_navigation.rhtml +2 -2

             <%= link_to 'root', :action => 'browse', :id => @project, :path => '', :rev => @rev %>
             <%
             dirs = path.split('/')
             if 'file' == kind
                 filename = dirs.pop
             end
             link_path = ''
             dirs.each do |dir|
                 next if dir.blank?
                 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 %>
             <% html_title(with_leading_slash(path)) -%>

app/views/repositories/_revisions.rhtml +1 -1

-            <% 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>
             <th></th>
             <th></th>
             <th><%= l(:label_date) %></th>
             <th><%= l(:field_author) %></th>
             <th><%= l(:field_comments) %></th>
             </tr></thead>
             <tbody>
             <% show_diff = entry && entry.is_file? && revisions.size > 1 %>
             <% line_num = 1 %>
             <% revisions.each do |changeset| %>
             <tr class="changeset <%= cycle 'odd', 'even' %>">
             <td class="id"><%= link_to format_revision(changeset.revision), :action => 'revision', :id => project, :rev => changeset.revision %></td>
             <td class="checkbox"><%= radio_button_tag('rev', changeset.revision, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") if show_diff && (line_num < revisions.size) %></td>
             <td class="checkbox"><%= radio_button_tag('rev_to', changeset.revision, (line_num==2), :id => "cbto-#{line_num}", :onclick => "if ($('cb-#{line_num}').checked==true) {$('cb-#{line_num-1}').checked=true;}") if show_diff && (line_num > 1) %></td>
             <td class="committed_on"><%= format_time(changeset.committed_on) %></td>
             <td class="author"><%=h changeset.committer.to_s.split('<').first %></td>
             <td class="comments"><%= textilizable(changeset.comments) %></td>
             </tr>
             <% line_num += 1 %>
             <% end %>
             </tbody>
             </table>
             <%= submit_tag(l(:label_view_diff), :name => nil) if show_diff %>
             <% end %>

app/views/repositories/changes.rhtml +3 -3

             <h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => (@entry ? @entry.kind : nil), :revision => @rev } %></h2>
             <h3><%=h @entry.name %></h3>
             <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>
             <%= render(:partial => 'revisions',
                        :locals => {:project => @project, :path => @path, :revisions => @changesets, :entry => @entry }) unless @changesets.empty? %>
             <% html_title(l(:label_change_plural)) -%>

app/views/repositories/revision.rhtml +1 -1

             <div class="contextual">
               &#171;
               <% unless @changeset.previous.nil? -%>
                 <%= link_to l(:label_previous), :controller => 'repositories', :action => 'revision', :id => @project, :rev => @changeset.previous.revision %>
               <% else -%>
                 <%= l(:label_previous) %>
               <% end -%>
             |
               <% unless @changeset.next.nil? -%>
                 <%= link_to l(:label_next), :controller => 'repositories', :action => 'revision', :id => @project, :rev => @changeset.next.revision %>
               <% else -%>
                 <%= l(:label_next) %>
               <% end -%>
               &#187;&nbsp;
               <% form_tag({:controller => 'repositories', :action => 'revision', :id => @project, :rev => nil}, :method => :get) do %>
                 <%= text_field_tag 'rev', @rev, :size => 5 %>
                 <%= submit_tag 'OK', :name => nil %>
               <% end %>
             </div>
             <h2><%= l(:label_revision) %> <%= format_revision(@changeset.revision) %></h2>
             <p><% if @changeset.scmid %>ID: <%= @changeset.scmid %><br /><% end %>
             <em><%= @changeset.committer.to_s.split('<').first %>, <%= format_time(@changeset.committed_on) %></em></p>
             <%= textilizable @changeset.comments %>
             <% if @changeset.issues.any? %>
             <h3><%= l(:label_related_issues) %></h3>
             <ul>
             <% @changeset.issues.each do |issue| %>
               <li><%= link_to_issue issue %>: <%=h issue.subject %></li>
             <% end %>
             </ul>
             <% end %>
             <h3><%= l(:label_attachment_plural) %></h3>
             <div style="float:right;">
             <div class="square action_A"></div> <div style="float:left;"><%= l(:label_added) %>&nbsp;</div>
             <div class="square action_M"></div> <div style="float:left;"><%= l(:label_modified) %>&nbsp;</div>
             <div class="square action_D"></div> <div style="float:left;"><%= l(:label_deleted) %>&nbsp;</div>
             </div>
             <p><%= link_to(l(:label_view_diff), :action => 'diff', :id => @project, :path => "", :rev => @changeset.revision) if @changeset.changes.any? %></p>
             <table class="list">
             <tbody>
             <% @changes.each do |change| %>
             <tr class="<%= cycle 'odd', 'even' %>">
             <td><div class="square action_<%= change.action %>"></div>
             <% if change.action == "D" -%>
                 <%= change.path -%>
             <% else -%>
                 <%= link_to change.path, :action => 'entry', :id => @project, :path => without_leading_slash(change.relative_path), :rev => @changeset.revision -%>
             <% end -%>
             <%= "(#{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>
             <% end %>
             </tbody>
             </table>
             <p class="pagination"><%= pagination_links_full @changes_pages %></p>
             <% content_for :header_tags do %>
             <%= stylesheet_link_tag "scm" %>
             <% end %>
             <% html_title("#{l(:label_revision)} #{@changeset.revision}") -%>

config/boot.rb +100 -10

@@ -1,19 +1,109
1	# Don't change this file. Configuration is done in config/environment.rb and config/environments/*.rb	1	# Don't change this file!
		2	# Configure your app in config/environment.rb and config/environments/*.rb
2		3
3	unless defined?(RAILS_ROOT)	4	RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
4	root_path = File.join(File.dirname(__FILE__), '..')	5
5	unless RUBY_PLATFORM =~ /mswin32/	6	module Rails
6	require 'pathname'	7	class << self
7	root_path = Pathname.new(root_path).cleanpath(true).to_s	8	def boot!
		9	unless booted?
		10	preinitialize
		11	pick_boot.run
		12	end
		13	end
		14
		15	def booted?
		16	defined? Rails::Initializer
		17	end
		18
		19	def pick_boot
		20	(vendor_rails? ? VendorBoot : GemBoot).new
		21	end
		22
		23	def vendor_rails?
		24	File.exist?("#{RAILS_ROOT}/vendor/rails")
		25	end
		26
		27	def preinitialize
		28	load(preinitializer_path) if File.exist?(preinitializer_path)
		29	end
		30
		31	def preinitializer_path
		32	"#{RAILS_ROOT}/config/preinitializer.rb"
		33	end
		34	end
		35
		36	class Boot
		37	def run
		38	load_initializer
		39	Rails::Initializer.run(:set_load_path)
8	end	40	end
9	RAILS_ROOT = root_path
10	end	41	end
11		42
12	if File.directory?("#{RAILS_ROOT}/vendor/rails")	43	class VendorBoot < Boot
		44	def load_initializer
13	require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"	45	require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
		46	Rails::Initializer.run(:install_gem_spec_stubs)
		47	end
		48	end
		49
		50	class GemBoot < Boot
		51	def load_initializer
		52	self.class.load_rubygems
		53	load_rails_gem
		54	require 'initializer'
		55	end
		56
		57	def load_rails_gem
		58	if version = self.class.gem_version
		59	gem 'rails', version
14	else	60	else
		61	gem 'rails'
		62	end
		63	rescue Gem::LoadError => load_error
		64	$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.)
		65	exit 1
		66	end
		67
		68	class << self
		69	def rubygems_version
		70	Gem::RubyGemsVersion if defined? Gem::RubyGemsVersion
		71	end
		72
		73	def gem_version
		74	if defined? RAILS_GEM_VERSION
		75	RAILS_GEM_VERSION
		76	elsif ENV.include?('RAILS_GEM_VERSION')
		77	ENV['RAILS_GEM_VERSION']
		78	else
		79	parse_gem_version(read_environment_rb)
		80	end
		81	end
		82
		83	def load_rubygems
15	require 'rubygems'	84	require 'rubygems'
16	require 'initializer'	85
		86	unless rubygems_version >= '0.9.4'
		87	$stderr.puts %(Rails requires RubyGems >= 0.9.4 (you have #{rubygems_version}). Please `gem update --system` and try again.)
		88	exit 1
17	end	89	end
18		90
19	Rails::Initializer.run(:set_load_path)	91	rescue LoadError
		92	$stderr.puts %(Rails requires RubyGems >= 0.9.4. Please install RubyGems and try again: http://rubygems.rubyforge.org)
		93	exit 1
		94	end
		95
		96	def parse_gem_version(text)
		97	$1 if text =~ /^[^#]RAILS_GEM_VERSION\s=\s["']([!~<>=]\s*[\d.]+)["']/
		98	end
		99
		100	private
		101	def read_environment_rb
		102	File.read("#{RAILS_ROOT}/config/environment.rb")
		103	end
		104	end
		105	end
		106	end
		107
		108	# All that for this:
		109	Rails.boot!

config/environment.rb +1 -30

             # Be sure to restart your web server when you modify this file.
             # Uncomment below to force Rails into production mode when
             # you don't control web/app server and can't set it the proper way
             # 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')
             # Load Engine plugin if available
             begin
               require File.join(File.dirname(__FILE__), '../vendor/plugins/engines/boot')
             rescue LoadError
               # Not available
             end
             Rails::Initializer.run do |config|
               # Settings in config/environments/* take precedence those specified here
               # Skip frameworks you're not going to use
               # config.frameworks -= [ :action_web_service, :action_mailer ]
               # Add additional load paths for sweepers
               config.load_paths += %W( #{RAILS_ROOT}/app/sweepers )
               # Force all environments to use the same logger level
               # (by default production uses :info, the others :debug)
               # config.log_level = :debug
               # Use the database for sessions instead of the file system
               # (create the session table with 'rake db:sessions:create')
               # config.action_controller.session_store = :active_record_store
               config.action_controller.session_store = :PStore
               # Enable page/fragment caching by setting a file-based store
               # (remember to create the caching directory and make it readable to the application)
               # config.action_controller.fragment_cache_store = :file_store, "#{RAILS_ROOT}/cache"
               # Activate observers that should always be running
               # config.active_record.observers = :cacher, :garbage_collector
               config.active_record.observers = :message_observer
               # Make Active Record use UTC-base instead of local time
               # config.active_record.default_timezone = :utc
               # Use Active Record's schema dumper instead of SQL when creating the test database
               # (enables use of different database adapters for development and test environments)
               # config.active_record.schema_format = :ruby
               # See Rails::Configuration for more options
             	# SMTP server configuration
             	config.action_mailer.smtp_settings = {
             		:address => "127.0.0.1",
             		:port => 25,
             		:domain => "somenet.foo",
             		:authentication => :login,
             		:user_name => "redmine@somenet.foo",
             		:password => "redmine",
             	}
             	config.action_mailer.perform_deliveries = true
             	# Tell ActionMailer not to deliver emails to the real world.
             	# The :test delivery method accumulates sent emails in the
             	# ActionMailer::Base.deliveries array.
             	#config.action_mailer.delivery_method = :test
             	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'

db/migrate/072_add_enumerations_position.rb +1 -1

             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}
                   end
                 end
               end
               def self.down
                 remove_column :enumerations, :position
               end
             end

db/migrate/078_add_custom_fields_position.rb +1 -1

             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}
                   end
                 end
               end
               def self.down
                 remove_column :custom_fields, :position
               end
             end

lib/tabular_form_builder.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require 'action_view/helpers/form_helper'
             class TabularFormBuilder < ActionView::Helpers::FormBuilder
               include GLoc
               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|
                 src = <<-END_SRC
                 def #{selector}(field, options = {})
                   return super if options.delete :no_label
                   label_text = l(options[:label]) if options[:label]
                   label_text ||= l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym)
                   label_text << @template.content_tag("span", " *", :class => "required") if options.delete(:required)
                   label = @template.content_tag("label", label_text,
                                 :class => (@object && @object.errors[field] ? "error" : nil),
                                 :for => (@object_name.to_s + "_" + field.to_s))
                   label + super
                 end
                 END_SRC
                 class_eval src, __FILE__, __LINE__
               end
               def select(field, choices, options = {}, html_options = {})
                 label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
                 label = @template.content_tag("label", label_text,
                               :class => (@object && @object.errors[field] ? "error" : nil),
                               :for => (@object_name.to_s + "_" + field.to_s))
                 label + super
               end
             end

test/functional/projects_controller_test.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.dirname(__FILE__) + '/../test_helper'
             require 'projects_controller'
             # Re-raise errors caught by the controller.
             class ProjectsController; def rescue_action(e) raise e end; end
             class ProjectsControllerTest < Test::Unit::TestCase
               fixtures :projects, :versions, :users, :roles, :members, :issues, :journals, :journal_details,
                        :trackers, :projects_trackers, :issue_statuses, :enabled_modules, :enumerations, :boards, :messages
               def setup
                 @controller = ProjectsController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 @request.session[:user_id] = nil
               end
               def test_index
                 get :index
                 assert_response :success
                 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
               def test_show_by_id
                 get :show, :id => 1
                 assert_response :success
                 assert_template 'show'
                 assert_not_nil assigns(:project)
               end
               def test_show_by_identifier
                 get :show, :id => 'ecookbook'
                 assert_response :success
                 assert_template 'show'
                 assert_not_nil assigns(:project)
                 assert_equal Project.find_by_identifier('ecookbook'), assigns(:project)
               end
               def test_private_subprojects_hidden
                 get :show, :id => 'ecookbook'
                 assert_response :success
                 assert_template 'show'
                 assert_no_tag :tag => 'a', :content => /Private child/
               end
               def test_private_subprojects_visible
                 @request.session[:user_id] = 2 # manager who is a member of the private subproject
                 get :show, :id => 'ecookbook'
                 assert_response :success
                 assert_template 'show'
                 assert_tag :tag => 'a', :content => /Private child/
               end
               def test_settings
                 @request.session[:user_id] = 2 # manager
                 get :settings, :id => 1
                 assert_response :success
                 assert_template 'settings'
               end
               def test_edit
                 @request.session[:user_id] = 2 # manager
                 post :edit, :id => 1, :project => {:name => 'Test changed name',
                                                    :issue_custom_field_ids => ['']}
                 assert_redirected_to 'projects/settings/ecookbook'
                 project = Project.find(1)
                 assert_equal 'Test changed name', project.name
               end
               def test_get_destroy
                 @request.session[:user_id] = 1 # admin
                 get :destroy, :id => 1
                 assert_response :success
                 assert_template 'destroy'
                 assert_not_nil Project.find_by_id(1)
               end
               def test_post_destroy
                 @request.session[:user_id] = 1 # admin
                 post :destroy, :id => 1, :confirm => 1
                 assert_redirected_to 'admin/projects'
                 assert_nil Project.find_by_id(1)
               end
               def test_list_files
                 get :list_files, :id => 1
                 assert_response :success
                 assert_template 'list_files'
                 assert_not_nil assigns(:versions)
               end
               def test_changelog
                 get :changelog, :id => 1
                 assert_response :success
                 assert_template 'changelog'
                 assert_not_nil assigns(:versions)
               end
               def test_roadmap
                 get :roadmap, :id => 1
                 assert_response :success
                 assert_template 'roadmap'
                 assert_not_nil assigns(:versions)
                 # Version with no date set appears
                 assert assigns(:versions).include?(Version.find(3))
                 # Completed version doesn't appear
                 assert !assigns(:versions).include?(Version.find(1))
               end
               def test_roadmap_with_completed_versions
                 get :roadmap, :id => 1, :completed => 1
                 assert_response :success
                 assert_template 'roadmap'
                 assert_not_nil assigns(:versions)
                 # Version with no date set appears
                 assert assigns(:versions).include?(Version.find(3))
                 # Completed version appears
                 assert assigns(:versions).include?(Version.find(1))
               end
               def test_project_activity
                 get :activity, :id => 1, :with_subprojects => 0
                 assert_response :success
                 assert_template 'activity'
                 assert_not_nil assigns(:events_by_day)
                 assert_not_nil assigns(:events)
                 # subproject issue not included by default
                 assert !assigns(:events).include?(Issue.find(5))
                 assert_tag :tag => "h3",
                            :content => /#{2.days.ago.to_date.day}/,
                            :sibling => { :tag => "dl",
                              :child => { :tag => "dt",
                                :attributes => { :class => /issue-edit/ },
                                :child => { :tag => "a",
                                  :content => /(#{IssueStatus.find(2).name})/,
                                }
                              }
                            }
                 get :activity, :id => 1, :from => 3.days.ago.to_date
                 assert_response :success
                 assert_template 'activity'
                 assert_not_nil assigns(:events_by_day)
                 assert_tag :tag => "h3",
                            :content => /#{3.day.ago.to_date.day}/,
                            :sibling => { :tag => "dl",
                              :child => { :tag => "dt",
                                :attributes => { :class => /issue/ },
                                :child => { :tag => "a",
                                  :content => /#{Issue.find(1).subject}/,
                                }
                              }
                            }
               end
               def test_activity_with_subprojects
                 get :activity, :id => 1, :with_subprojects => 1
                 assert_response :success
                 assert_template 'activity'
                 assert_not_nil assigns(:events)
                 assert assigns(:events).include?(Issue.find(1))
                 assert !assigns(:events).include?(Issue.find(4))
                 # subproject issue
                 assert assigns(:events).include?(Issue.find(5))
               end
               def test_global_activity_anonymous
                 get :activity
                 assert_response :success
                 assert_template 'activity'
                 assert_not_nil assigns(:events)
                 assert assigns(:events).include?(Issue.find(1))
                 # Issue of a private project
                 assert !assigns(:events).include?(Issue.find(4))
               end
               def test_global_activity_logged_user
                 @request.session[:user_id] = 2 # manager
                 get :activity
                 assert_response :success
                 assert_template 'activity'
                 assert_not_nil assigns(:events)
                 assert assigns(:events).include?(Issue.find(1))
                 # Issue of a private project the user belongs to
                 assert assigns(:events).include?(Issue.find(4))
               end
               def test_global_activity_with_all_types
                 get :activity, :show_issues => 1, :show_news => 1, :show_files => 1, :show_documents => 1, :show_changesets => 1, :show_wiki_pages => 1, :show_messages => 1
                 assert_response :success
                 assert_template 'activity'
                 assert_not_nil assigns(:events)
                 assert assigns(:events).include?(Issue.find(1))
                 assert !assigns(:events).include?(Issue.find(4))
                 assert assigns(:events).include?(Message.find(5))
               end
               def test_calendar
                 get :calendar, :id => 1
                 assert_response :success
                 assert_template 'calendar'
                 assert_not_nil assigns(:calendar)
               end
               def test_calendar_with_subprojects_should_not_show_private_subprojects
                 get :calendar, :id => 1, :with_subprojects => 1, :tracker_ids => [1, 2]
                 assert_response :success
                 assert_template 'calendar'
                 assert_not_nil assigns(:calendar)
                 assert_no_tag :tag => 'a', :content => /#6/
               end
               def test_calendar_with_subprojects_should_show_private_subprojects
                 @request.session[:user_id] = 2
                 get :calendar, :id => 1, :with_subprojects => 1, :tracker_ids => [1, 2]
                 assert_response :success
                 assert_template 'calendar'
                 assert_not_nil assigns(:calendar)
                 assert_tag :tag => 'a', :content => /#6/
               end
               def test_gantt
                 get :gantt, :id => 1
                 assert_response :success
                 assert_template 'gantt.rhtml'
                 events = assigns(:events)
                 assert_not_nil events
                 # Issue with start and due dates
                 i = Issue.find(1)
                 assert_not_nil i.due_date
                 assert events.include?(Issue.find(1))
                 # Issue with without due date but targeted to a version with date
                 i = Issue.find(2)
                 assert_nil i.due_date
                 assert events.include?(i)
               end
               def test_gantt_with_subprojects_should_not_show_private_subprojects
                 get :gantt, :id => 1, :with_subprojects => 1, :tracker_ids => [1, 2]
                 assert_response :success
                 assert_template 'gantt.rhtml'
                 assert_not_nil assigns(:events)
                 assert_no_tag :tag => 'a', :content => /#6/
               end
               def test_gantt_with_subprojects_should_show_private_subprojects
                 @request.session[:user_id] = 2
                 get :gantt, :id => 1, :with_subprojects => 1, :tracker_ids => [1, 2]
                 assert_response :success
                 assert_template 'gantt.rhtml'
                 assert_not_nil assigns(:events)
                 assert_tag :tag => 'a', :content => /#6/
               end
               def test_gantt_export_to_pdf
                 get :gantt, :id => 1, :format => 'pdf'
                 assert_response :success
                 assert_template 'gantt.rfpdf'
                 assert_equal 'application/pdf', @response.content_type
                 assert_not_nil assigns(:events)
               end
               def test_archive
                 @request.session[:user_id] = 1 # admin
                 post :archive, :id => 1
                 assert_redirected_to 'admin/projects'
                 assert !Project.find(1).active?
               end
               def test_unarchive
                 @request.session[:user_id] = 1 # admin
                 Project.find(1).archive
                 post :unarchive, :id => 1
                 assert_redirected_to 'admin/projects'
                 assert Project.find(1).active?
               end
             end

test/integration/issues_test.rb +3 0

             # redMine - project management software
             # Copyright (C) 2006-2008  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require "#{File.dirname(__FILE__)}/../test_helper"
             class IssuesTest < ActionController::IntegrationTest
               fixtures :projects,
                        :users,
+                       :roles,
+                       :members,
                        :trackers,
                        :projects_trackers,
+                       :enabled_modules,
                        :issue_statuses,
                        :issues,
                        :enumerations,
                        :custom_fields,
                        :custom_values,
                        :custom_fields_trackers
               # create an issue
               def test_add_issue
                 log_user('jsmith', 'jsmith')
                 get 'projects/1/issues/new', :tracker_id => '1'
                 assert_response :success
                 assert_template 'issues/new'
                 post 'projects/1/issues/new', :tracker_id => "1",
                                              :issue => { :start_date => "2006-12-26",
                                                          :priority_id => "3",
                                                          :subject => "new test issue",
                                                          :category_id => "",
                                                          :description => "new issue",
                                                          :done_ratio => "0",
                                                          :due_date => "",
                                                          :assigned_to_id => "" },
                                              :custom_fields => {'2' => 'Value for field 2'}
                 # find created issue
                 issue = Issue.find_by_subject("new test issue")
                 assert_kind_of Issue, issue
                 # check redirection
                 assert_redirected_to "issues/show"
                 follow_redirect!
                 assert_equal issue, assigns(:issue)
                 # check issue attributes
                 assert_equal 'jsmith', issue.author.login
                 assert_equal 1, issue.project.id
                 assert_equal 1, issue.status.id
               end
               # add then remove 2 attachments to an issue
               def test_issue_attachements
                 log_user('jsmith', 'jsmith')
                 set_tmp_attachments_directory
                 post 'issues/edit/1',
                      :notes => 'Some notes',
                      :attachments => {'1' => {'file' => test_uploaded_file('testfile.txt', 'text/plain'), 'description' => 'This is an attachment'}}
                 assert_redirected_to "issues/show/1"
                 # make sure attachment was saved
                 attachment = Issue.find(1).attachments.find_by_filename("testfile.txt")
                 assert_kind_of Attachment, attachment
                 assert_equal Issue.find(1), attachment.container
                 assert_equal 'This is an attachment', attachment.description
                 # verify the size of the attachment stored in db
                 #assert_equal file_data_1.length, attachment.filesize
                 # verify that the attachment was written to disk
                 assert File.exist?(attachment.diskfile)
                 # remove the attachments
                 Issue.find(1).attachments.each(&:destroy)
                 assert_equal 0, Issue.find(1).attachments.length
               end
             end

test/test_helper.rb 0 -17

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             ENV["RAILS_ENV"] ||= "test"
             require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
             require 'test_help'
             require File.expand_path(File.dirname(__FILE__) + '/helper_testcase')
             class Test::Unit::TestCase
               # Transactional fixtures accelerate your tests by wrapping each test method
               # in a transaction that's rolled back on completion.  This ensures that the
               # test database remains unchanged so your fixtures don't have to be reloaded
               # between every test method.  Fewer database queries means faster tests.
               #
               # Read Mike Clark's excellent walkthrough at
               #   http://clarkware.com/cgi/blosxom/2005/10/24#Rails10FastTesting
               #
               # Every Active Record database supports transactions except MyISAM tables
               # in MySQL.  Turn off transactional fixtures in this case; however, if you
               # don't care one way or the other, switching from MyISAM to InnoDB tables
               # is recommended.
               self.use_transactional_fixtures = true
               # Instantiated fixtures are slow, but give you @david where otherwise you
               # would need people(:david).  If you don't want to migrate your existing
               # test cases which use the @david style and don't mind the speed hit (each
               # instantiated fixtures translates to a database query per test method),
               # then set this back to true.
               self.use_instantiated_fixtures  = false
               # Add more helper methods to be used by all tests here...
               def log_user(login, password)
                 get "/account/login"
                 assert_equal nil, session[:user_id]
                 assert_response :success
                 assert_template "account/login"
                 post "/account/login", :username => login, :password => password
                 assert_redirected_to "my/page"
                 assert_equal login, User.find(session[:user_id]).login
               end
               def test_uploaded_file(name, mime)
                 ActionController::TestUploadedFile.new(Test::Unit::TestCase.fixture_path + "/files/#{name}", mime)
               end
               # Use a temporary directory for attachment related tests
               def set_tmp_attachments_directory
                 Dir.mkdir "#{RAILS_ROOT}/tmp/test" unless File.directory?("#{RAILS_ROOT}/tmp/test")
                 Dir.mkdir "#{RAILS_ROOT}/tmp/test/attachments" unless File.directory?("#{RAILS_ROOT}/tmp/test/attachments")
                 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 +1 -1

             # redMine - project management software
             # Copyright (C) 2006-2008  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.dirname(__FILE__) + '/../test_helper'
             class RoleTest < Test::Unit::TestCase
               fixtures :roles, :workflows
               def test_copy_workflows
                 source = Role.find(1)
                 assert_equal 90, source.workflows.size
                 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
             end

test/unit/tracker_test.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006-2008  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.dirname(__FILE__) + '/../test_helper'
             class TrackerTest < Test::Unit::TestCase
               fixtures :trackers, :workflows
               def test_copy_workflows
                 source = Tracker.find(1)
                 assert_equal 89, source.workflows.size
                 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
             end

vendor/plugins/acts_as_versioned/Rakefile 0 0

NO CONTENT: modified file

vendor/plugins/acts_as_versioned/lib/acts_as_versioned.rb +92 -39

             # Copyright (c) 2005 Rick Olson
             #
             # Permission is hereby granted, free of charge, to any person obtaining
             # a copy of this software and associated documentation files (the
             # "Software"), to deal in the Software without restriction, including
             # without limitation the rights to use, copy, modify, merge, publish,
             # distribute, sublicense, and/or sell copies of the Software, and to
             # permit persons to whom the Software is furnished to do so, subject to
             # the following conditions:
             #
             # The above copyright notice and this permission notice shall be
             # included in all copies or substantial portions of the Software.
             #
             # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
             # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
             # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
             # NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
             # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
             # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
             # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
             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
                 # your container for the changes to be reflected. In development mode this usually means restarting WEBrick.
                 #
                 #   class Page < ActiveRecord::Base
                 #     # assumes pages_versions table
                 #     acts_as_versioned
                 #   end
                 #
                 # Example:
                 #
                 #   page = Page.create(:title => 'hello world!')
                 #   page.version       # => 1
                 #
                 #   page.title = 'hello world'
                 #   page.save
                 #   page.version       # => 2
                 #   page.versions.size # => 2
                 #
                 #   page.revert_to(1)  # using version number
                 #   page.title         # => 'hello world!'
                 #
                 #   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
                   module ClassMethods
                     # == Configuration options
                     #
                     # * <tt>class_name</tt> - versioned model class name (default: PageVersion in the above example)
                     # * <tt>table_name</tt> - versioned model table name (default: page_versions in the above example)
                     # * <tt>foreign_key</tt> - foreign key used to relate the versioned model to the original model (default: page_id in the above example)
                     # * <tt>inheritance_column</tt> - name of the column to save the model's inheritance_column value for STI.  (default: versioned_type)
                     # * <tt>version_column</tt> - name of the column in the model that keeps the version number (default: version)
                     # * <tt>sequence_name</tt> - name of the custom sequence to be used by the versioned model.
                     # * <tt>limit</tt> - number of revisions to keep, defaults to unlimited
                     # * <tt>if</tt> - symbol of method to check before saving a new version.  If this method returns false, a new version is not saved.
                     #   For finer control, pass either a Proc or modify Model#version_condition_met?
                     #
                     #     acts_as_versioned :if => Proc.new { |auction| !auction.expired? }
                     #
                     #   or...
                     #
                     #     class Auction
                     #       def version_condition_met? # totally bypasses the <tt>:if</tt> option
                     #         !expired?
                     #       end
                     #     end
                     #
                     # * <tt>if_changed</tt> - Simple way of specifying attributes that are required to be changed before saving a model.  This takes
                     #   either a symbol or array of symbols.  WARNING - This will attempt to overwrite any attribute setters you may have.
                     #   Use this instead if you want to write your own attribute setters (and ignore if_changed):
                     #
                     #     def name=(new_name)
                     #       write_changed_attribute :name, new_name
                     #     end
                     #
                     # * <tt>extend</tt> - Lets you specify a module to be mixed in both the original and versioned models.  You can also just pass a block
                     #   to create an anonymous mixin:
                     #
                     #     class Auction
                     #       acts_as_versioned do
                     #         def started?
                     #           !started_at.nil?
                     #         end
                     #       end
                     #     end
                     #
                     #   or...
                     #
                     #     module AuctionExtension
                     #       def started?
                     #         !started_at.nil?
                     #       end
                     #     end
                     #     class Auction
                     #       acts_as_versioned :extend => AuctionExtension
                     #     end
                     #
                     #  Example code:
                     #
                     #    @auction = Auction.find(1)
                     #    @auction.started?
                     #    @auction.versions.first.started?
                     #
                     # == Database Schema
                     #
                     # The model that you're versioning needs to have a 'version' attribute. The model is versioned
                     # into a table called #{model}_versions where the model name is singlular. The _versions table should
                     # contain all the fields you want versioned, the same version column, and a #{model}_id foreign key field.
                     #
                     # A lock_version field is also accepted if your model uses Optimistic Locking.  If your table uses Single Table inheritance,
                     # then that field is reflected in the versioned model as 'versioned_type' by default.
                     #
                     # Acts_as_versioned comes prepared with the ActiveRecord::Acts::Versioned::ActMethods::ClassMethods#create_versioned_table
                     # method, perfect for a migration.  It will also create the version column if the main model does not already have it.
                     #
                     #   class AddVersions < ActiveRecord::Migration
                     #     def self.up
                     #       # create_versioned_table takes the same options hash
                     #       # that create_table does
                     #       Post.create_versioned_table
                     #     end
                     #
                     #     def self.down
                     #       Post.drop_versioned_table
                     #     end
                     #   end
                     #
                     # == Changing What Fields Are Versioned
                     #
                     # By default, acts_as_versioned will version all but these fields:
                     #
                     #   [self.primary_key, inheritance_column, 'version', 'lock_version', versioned_inheritance_column]
                     #
                     # You can add or change those by modifying #non_versioned_columns.  Note that this takes strings and not symbols.
                     #
                     #   class Post < ActiveRecord::Base
                     #     acts_as_versioned
                     #     self.non_versioned_columns << 'comments_count'
                     #   end
                     #
                     def acts_as_versioned(options = {}, &extension)
                       # don't allow multiple calls
                       return if self.included_modules.include?(ActiveRecord::Acts::Versioned::ActMethods)
                       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
                       alias_method :non_versioned_fields,  :non_versioned_columns
                       alias_method :non_versioned_fields=, :non_versioned_columns=
                       class << self
                         alias_method :non_versioned_fields,  :non_versioned_columns
                         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
                       self.versioned_table_name         = options[:table_name]  || "#{table_name_prefix}#{base_class.name.demodulize.underscore}_versions#{table_name_suffix}"
                       self.versioned_inheritance_column = options[:inheritance_column] || "versioned_#{inheritance_column}"
                       self.version_column               = options[:version_column]     || 'version'
                       self.version_sequence_name        = options[:sequence_name]
                       self.max_version_limit            = options[:limit].to_i
                       self.version_condition            = options[:if] || true
                       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] || {})
                       if block_given?
                         extension_module_name = "#{versioned_class_name}Extension"
                         silence_warnings do
                           self.const_set(extension_module_name, Module.new(&extension))
                         end
                         options[:extend] = self.const_get(extension_module_name)
                       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|
                               write_changed_attribute attr_name, value
                             end
                           end
                         end
                         include options[:extend] if options[:extend].is_a?(Module)
                       end
                       # 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}",
                         :foreign_key => versioned_foreign_key
                       versioned_class.send :include, options[:extend]         if options[:extend].is_a?(Module)
                       versioned_class.set_sequence_name version_sequence_name if version_sequence_name
                     end
                   end
                   module ActMethods
                     def self.included(base) # :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?
                     end
                     # Saves a version of the model in the versioned table.  This is called in the after_save callback by default
                     def save_version_on_create
                       rev = self.class.versioned_class.new
                       self.clone_versioned_model(self, rev)
                       rev.version = send(self.class.version_column)
                       rev.send("#{self.class.versioned_foreign_key}=", self.id)
                       rev.save
                     end
                     # Clears old revisions if a limit is set with the :limit option in <tt>acts_as_versioned</tt>.
                     # Override this method to set your own criteria for clearing old versions.
                     def clear_old_versions
                       return if self.class.max_version_limit == 0
                       excess_baggage = send(self.class.version_column).to_i - self.class.max_version_limit
                       if excess_baggage > 0
                         sql = "DELETE FROM #{self.class.versioned_table_name} WHERE version <= #{excess_baggage} AND #{self.class.versioned_foreign_key} = #{self.id}"
                         self.class.versioned_class.connection.execute sql
                       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
                     def revert_to(version)
                       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)
                       true
                     end
                     # Reverts a model to a given version and saves the model.
                     # Takes either a version number or an instance of the versioned model
                     def revert_to!(version)
                       revert_to(version) ? save_without_revision : false
                     end
                     # Temporarily turns off Optimistic Locking while saving.  Used when reverting so that a new version is not created.
                     def save_without_revision
                       save_without_revision!
                       true
                     rescue
                       false
                     end
                     def save_without_revision!
                       without_locking do
                         without_revision do
                           save!
                         end
                       end
                     end
                     # Returns an array of attribute keys that are versioned.  See non_versioned_columns
                     def versioned_attributes
                       self.attributes.keys.select { |k| !self.class.non_versioned_columns.include?(k) }
                     end
                     # If called with no parameters, gets whether the current model has changed and needs to be versioned.
                     # 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
                     alias_method :dirty?, :changed?
                     # 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)
                         new_model[new_model.class.inheritance_column] = orig_model[self.class.versioned_inheritance_column]
                       elsif new_model.is_a?(self.class.versioned_class)
                         new_model[self.class.versioned_inheritance_column] = orig_model[orig_model.class.inheritance_column]
                       end
                     end
                     # Checks whether a new version shall be saved or not.  Calls <tt>version_condition_met?</tt> and <tt>changed?</tt>.
                     def save_version?
                       version_condition_met? && changed?
                     end
                     # Checks condition set in the :if option to check whether a revision should be created or not.  Override this for
                     # custom version condition checking.
                     def version_condition_met?
                       case
                       when version_condition.is_a?(Symbol)
                         send(version_condition)
                       when version_condition.respond_to?(:call) && (version_condition.arity == 1 || version_condition.arity == -1)
                         version_condition.call(self)
                       else
                         version_condition
                       end
                     end
                     # Executes the block with the versioning callbacks disabled.
                     #
                     #   @foo.without_revision do
                     #     @foo.save
                     #   end
                     #
                     def without_revision(&block)
                       self.class.without_revision(&block)
                     end
                     # Turns off optimistic locking for the duration of the block
                     #
                     #   @foo.without_locking do
                     #     @foo.save
                     #   end
                     #
                     def without_locking(&block)
                       self.class.without_locking(&block)
                     end
                     def empty_callback() end #:nodoc:
                     protected
                       # sets the new version before saving, unless you're using optimistic locking.  In that case, let it take care of the version.
                       def set_new_version
                         self.send("#{self.class.version_column}=", self.next_version) if new_record? || (!locking_enabled? && save_version?)
                       end
                       # Gets the next available version for the current record, or 1 for a new record
                       def next_version
                         return 1 if new_record?
                         (versions.calculate(:max, :version) || 0) + 1
                       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>
                       def find_versions(id, options = {})
                         versioned_class.find :all, {
                           :conditions => ["#{versioned_foreign_key} = ?", id],
                           :order      => 'version' }.merge(options)
                       end
                       # Returns an array of columns that are versioned.  See non_versioned_columns
                       def versioned_columns
                         self.columns.select { |c| !non_versioned_columns.include?(c.name) }
                       end
                       # Returns an instance of the dynamic versioned model
                       def versioned_class
                         const_get versioned_class_name
                       end
                       # Rake migration task to create the versioned table using options passed to acts_as_versioned
                       def create_versioned_table(create_table_options = {})
                         # create version column in main table if it does not exist
                         if !self.content_columns.find { |c| %w(version lock_version).include? c.name }
                           self.connection.add_column table_name, :version, :integer
                         end
                         self.connection.create_table(versioned_table_name, create_table_options) do |t|
                           t.column versioned_foreign_key, :integer
                           t.column :version, :integer
                         end
                         updated_col = nil
                         self.versioned_columns.each do |col|
                           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?
                           self.connection.add_column versioned_table_name, :updated_at, :timestamp
                         end
                       end
                       # Rake migration task to drop the versioned table
                       def drop_versioned_table
                         self.connection.drop_table versioned_table_name
                       end
                       # Executes the block with the versioning callbacks disabled.
                       #
                       #   Foo.without_revision do
                       #     @foo.save
                       #   end
                       #
                       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
                       #
                       #   Foo.without_locking do
                       #     @foo.save
                       #   end
                       #
                       def without_locking(&block)
                         current = ActiveRecord::Base.lock_optimistically
                         ActiveRecord::Base.lock_optimistically = false if current
                         result = block.call
                         ActiveRecord::Base.lock_optimistically = true if current
                         result
                       end
                     end
                   end
                 end
               end
             end
             ActiveRecord::Base.send :include, ActiveRecord::Acts::Versioned

vendor/plugins/acts_as_versioned/test/abstract_unit.rb +13 -12

+            $:.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_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")
             # set up custom sequence on widget_versions for DBs that support sequences
             if ENV['DB'] == 'postgresql'
               ActiveRecord::Base.connection.execute "DROP SEQUENCE widgets_seq;" rescue nil
               ActiveRecord::Base.connection.remove_column :widget_versions, :id
               ActiveRecord::Base.connection.execute "CREATE SEQUENCE widgets_seq START 101;"
               ActiveRecord::Base.connection.execute "ALTER TABLE widget_versions ADD COLUMN id INTEGER PRIMARY KEY DEFAULT nextval('widgets_seq');"
             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
               # Instantiated fixtures are slow, but give you @david where you otherwise would need people(:david)
               self.use_instantiated_fixtures  = false
               # Add more helper methods to be used by all tests here...
             end

vendor/plugins/acts_as_versioned/test/fixtures/widget.rb +1 -1

             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 +15 -1

             require File.join(File.dirname(__FILE__), 'abstract_unit')
             if ActiveRecord::Base.connection.supports_migrations?
               class Thing < ActiveRecord::Base
                 attr_accessor :version
                 acts_as_versioned
               end
               class MigrationTest < Test::Unit::TestCase
                 self.use_transactional_fixtures = false
                 def teardown
+                  if ActiveRecord::Base.connection.respond_to?(:initialize_schema_information)
                     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
                   Thing.reset_column_information
                 end
                 def test_versioned_migration
                   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' }
                 end
               end
             end

vendor/plugins/acts_as_versioned/test/versioned_test.rb +62 -28

             require File.join(File.dirname(__FILE__), 'abstract_unit')
             require File.join(File.dirname(__FILE__), 'fixtures/page')
             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
                 assert_instance_of Page.versioned_class, p.versions.first
               end
               def test_saves_without_revision
                 p = pages(:welcome)
                 old_versions = p.versions.count
                 p.save_without_revision
                 p.without_revision do
                   p.update_attributes :title => 'changed'
                 end
                 assert_equal old_versions, p.versions.count
               end
               def test_rollback_with_version_number
                 p = pages(:welcome)
                 assert_equal 24, p.version
                 assert_equal 'Welcome to the weblog', p.title
                 assert p.revert_to!(p.versions.first.version), "Couldn't revert to 23"
                 assert_equal 23, p.version
                 assert_equal 'Welcome to the weblg', p.title
               end
               def test_versioned_class_name
                 assert_equal 'Version', Page.versioned_class_name
                 assert_equal 'LockedPageRevision', LockedPage.versioned_class_name
               end
               def test_versioned_class
                 assert_equal Page::Version,                  Page.versioned_class
                 assert_equal LockedPage::LockedPageRevision, LockedPage.versioned_class
               end
               def test_special_methods
                 assert_nothing_raised { pages(:welcome).feeling_good? }
                 assert_nothing_raised { pages(:welcome).versions.first.feeling_good? }
                 assert_nothing_raised { locked_pages(:welcome).hello_world }
                 assert_nothing_raised { locked_pages(:welcome).versions.first.hello_world }
               end
               def test_rollback_with_version_class
                 p = pages(:welcome)
                 assert_equal 24, p.version
                 assert_equal 'Welcome to the weblog', p.title
                 assert p.revert_to!(p.versions.first), "Couldn't revert to 23"
                 assert_equal 23, p.version
                 assert_equal 'Welcome to the weblg', p.title
               end
               def test_rollback_fails_with_invalid_revision
                 p = locked_pages(:welcome)
                 assert !p.revert_to!(locked_pages(:thinking))
               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
               end
               def test_rollback_with_version_number_with_options
                 p = locked_pages(:welcome)
                 assert_equal 'Welcome to the weblog', p.title
                 assert_equal 'LockedPage', p.versions.first.version_type
                 assert p.revert_to!(p.versions.first.version), "Couldn't revert to 23"
                 assert_equal 'Welcome to the weblg', p.title
                 assert_equal 'LockedPage', p.versions.first.version_type
               end
               def test_rollback_with_version_class_with_options
                 p = locked_pages(:welcome)
                 assert_equal 'Welcome to the weblog', p.title
                 assert_equal 'LockedPage', p.versions.first.version_type
                 assert p.revert_to!(p.versions.first), "Couldn't revert to 1"
                 assert_equal 'Welcome to the weblg', p.title
                 assert_equal 'LockedPage', p.versions.first.version_type
               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
                 assert_equal 'SpecialLockedPage', p.versions.first.version_type
               end
               def test_rollback_with_version_number_with_sti
                 p = locked_pages(:thinking)
                 assert_equal 'So I was thinking', p.title
                 assert p.revert_to!(p.versions.first.version), "Couldn't revert to 1"
                 assert_equal 'So I was thinking!!!', p.title
                 assert_equal 'SpecialLockedPage', p.versions.first.version_type
               end
               def test_lock_version_works_with_versioning
                 p = locked_pages(:thinking)
                 p2 = LockedPage.find(p.id)
                 p.title = 'fresh title'
                 p.save
                 assert_equal 2, p.versions.size # limit!
                 assert_raises(ActiveRecord::StaleObjectError) do
                   p2.title = 'stale title'
                   p2.save
                 end
               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
                 p.save
                 assert_equal 1, p.version
                 Page.feeling_good = true
               end
               def test_version_if_condition2
                 # set new if condition
                 Page.class_eval do
                   def new_feeling_good() title[0..0] == 'a'; end
                   alias_method :old_feeling_good, :feeling_good?
                   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
                 p.update_attributes(:title => 'new title')
                 assert_equal 1, p.version # version does not increment
                 assert_equal 1, p.versions(true).size
                 p.update_attributes(:title => 'a title')
                 assert_equal 2, p.version
                 assert_equal 2, p.versions(true).size
                 # reset original if condition
                 Page.class_eval { alias_method :feeling_good?, :old_feeling_good }
               end
               def test_version_if_condition_with_block
                 # set new if condition
                 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
                 p.update_attributes(:title => 'a title')
                 assert_equal 1, p.version # version does not increment
                 assert_equal 1, p.versions(true).size
                 p.update_attributes(:title => 'b title')
                 assert_equal 2, p.version
                 assert_equal 2, p.versions(true).size
                 # reset original if condition
                 Page.version_condition = old_condition
               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
 .times do |i|
                   assert_page_title p, i
                 end
               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")
 .times do |i|
                   assert_page_title p, i, :lock_version
                   assert p.versions(true).size <= 2, "locked version can only store 2 versions"
                 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
                 p.title = 'title'
                 assert !p.save_version?
                 p.save
                 assert_equal 2, p.lock_version # still increments version because of optimistic locking
                 assert_equal 1, p.versions(true).size
                 p.title = 'updated title'
                 assert p.save_version?
                 p.save
                 assert_equal 3, p.lock_version
                 assert_equal 1, p.versions(true).size # version 1 deleted
                 p.title = 'updated title!'
                 assert p.save_version?
                 p.save
                 assert_equal 4, p.lock_version
                 assert_equal 2, p.versions(true).size # version 1 deleted
               end
               def assert_page_title(p, i, version_field = :version)
                 p.title = "title#{i}"
                 p.save
                 assert_equal "title#{i}", p.title
                 assert_equal (i+4), p.send(version_field)
               end
               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'
+.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
               def test_has_many_through
                 assert_equal [authors(:caged), authors(:mly)], pages(:welcome).authors
               end
               def test_has_many_through_with_custom_association
                 assert_equal [authors(:caged), authors(:mly)], pages(:welcome).revisors
               end
               def test_referential_integrity
                 pages(:welcome).destroy
                 assert_equal 0, Page.count
                 assert_equal 0, Page::Version.count
               end
               def test_association_options
                 association = Page.reflect_on_association(:versions)
                 options = association.options
                 assert_equal :delete_all, options[:dependent]
                 assert_equal 'version', options[:order]
                 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
                 assert_equal 0, Widget.count
                 assert_equal 1, Widget.versioned_class.count
               end
               def test_versioned_records_should_belong_to_parent
                 page = pages(:welcome)
                 page_version = page.versions.last
                 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 +6 0

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

vendor/plugins/rfpdf/lib/rfpdf/view.rb +11 -1

             # Copyright (c) 2006 4ssoM LLC <www.4ssoM.com>
             #
             # The MIT License
             #
             # Permission is hereby granted, free of charge, to any person obtaining a copy
             # of this software and associated documentation files (the "Software"), to deal
             # in the Software without restriction, including without limitation the rights
             # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
             # copies of the Software, and to permit persons to whom the Software is
             # furnished to do so, subject to the following conditions:
             #
             # The above copyright notice and this permission notice shall be included in
             # all copies or substantial portions of the Software.
             #
             # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
             # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
             # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
             # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
             # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
             # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
             # THE SOFTWARE.
             #
             # Thanks go out to Bruce Williams of codefluency who created RTex. This
             # template handler is modification of his work.
             #
             # Example Registration
             #
             #   ActionView::Base::register_template_handler 'rfpdf', RFpdfView
             module RFPDF
               class View
+                @@backward_compatibility_mode = false
+                cattr_accessor :backward_compatibility_mode
                 def initialize(action_view)
                   @action_view = action_view
                   # Override with @options_for_rfpdf Hash in your controller
                   @options = {
                     # Run through latex first? (for table of contents, etc)
                     :pre_process => false,
                     # Debugging mode; raises exception
                     :debug => false,
                     # Filename of pdf to generate
                     :file_name => "#{@action_view.controller.action_name}.pdf",
                     # Temporary Directory
                     :temp_dir => "#{File.expand_path(RAILS_ROOT)}/tmp"
                   }.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'
             			  @generate = true
             				@action_view.controller.headers["Content-Type"] = 'application/pdf'
             				@action_view.controller.headers["Content-disposition:"] = "inline; filename=\"#{@options[:file_name]}\""
             			end
                   assigns = @action_view.assigns.dup
                   if content_for_layout = @action_view.instance_variable_get("@content_for_layout")
                     assigns['content_for_layout'] = content_for_layout
                   end
                   result = @action_view.instance_eval do
             			  assigns.each do |key,val|
             			    instance_variable_set "@#{key}", val
             		    end
             			  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
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages