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

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

app/helpers/repositories_helper.rb +4 0

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

app/models/user_preference.rb +4 -2

                 if attribute_present? attr_name
                   super
                 else
-                  self.others ||= {}
+                  h = read_attribute(:others).dup || {}
-                  self.others.store attr_name, value
+                  h.update(attr_name => value)
+                  write_attribute(:others, h)
+                  value
                 end
               end

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

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

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

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

app/views/repositories/_revisions.rhtml +1 -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>

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

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

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

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

config/boot.rb +104 -14

@@ -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
8	end	34	end
9	RAILS_ROOT = root_path
10	end
11		35
12	if File.directory?("#{RAILS_ROOT}/vendor/rails")	36	class Boot
13	require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"	37	def run
14	else	38	load_initializer
15	require 'rubygems'	39	Rails::Initializer.run(:set_load_path)
16	require 'initializer'	40	end
		41	end
		42
		43	class VendorBoot < Boot
		44	def load_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
		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
		84	require 'rubygems'
		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
		89	end
		90
		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
17	end	106	end
18		107
19	Rails::Initializer.run(:set_load_path)	108	# All that for this:
		109	Rails.boot!

config/environment.rb +1 -30

@@ -5,7 +5,7
5	# ENV['RAILS_ENV'] \|\|= 'production'	5	# ENV['RAILS_ENV'] \|\|= 'production'
6		6
7	# Specifies gem version of Rails to use when vendor/rails is not present	7	# Specifies gem version of Rails to use when vendor/rails is not present
8	RAILS_GEM_VERSION = '2.~~0.2~~' unless defined? RAILS_GEM_VERSION	8	RAILS_GEM_VERSION = '2.1.0' unless defined? RAILS_GEM_VERSION
9		9
10	# Bootstrap the Rails environment, frameworks, and default configuration	10	# Bootstrap the Rails environment, frameworks, and default configuration
11	require File.join(File.dirname(__FILE__), 'boot')	11	require File.join(File.dirname(__FILE__), 'boot')
@@ -71,32 +71,3 Rails::Initializer.run do \|config\|
71	config.action_mailer.delivery_method = :smtp	71	config.action_mailer.delivery_method = :smtp
72		72
73	end	73	end
74
75	ActiveRecord::Errors.default_error_messages = {
76	:inclusion => "activerecord_error_inclusion",
77	:exclusion => "activerecord_error_exclusion",
78	:invalid => "activerecord_error_invalid",
79	:confirmation => "activerecord_error_confirmation",
80	:accepted => "activerecord_error_accepted",
81	:empty => "activerecord_error_empty",
82	:blank => "activerecord_error_blank",
83	:too_long => "activerecord_error_too_long",
84	:too_short => "activerecord_error_too_short",
85	:wrong_length => "activerecord_error_wrong_length",
86	:taken => "activerecord_error_taken",
87	:not_a_number => "activerecord_error_not_a_number"
88	}
89
90	ActionView::Base.field_error_proc = Proc.new{ \|html_tag, instance\| "#{html_tag}" }
91
92	Mime::SET << Mime::CSV unless Mime::SET.include?(Mime::CSV)
93	Mime::Type.register 'application/pdf', :pdf
94
95	GLoc.set_config :default_language => :en
96	GLoc.clear_strings
97	GLoc.set_kcode
98	GLoc.load_localized_strings
99	GLoc.set_config(:raise_string_not_found_errors => false)
100
101	require 'redmine'
102

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}

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}

lib/tabular_form_builder.rb +1 -1

               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|

test/functional/projects_controller_test.rb +1 -1

                 assert_template 'index'
                 assert_not_nil assigns(:project_tree)
                 # Root project as hash key
-                assert assigns(:project_tree).has_key?(Project.find(1))
+                assert assigns(:project_tree).keys.include?(Project.find(1))
                 # Subproject in corresponding value
                 assert assigns(:project_tree)[Project.find(1)].include?(Project.find(3))
               end

test/integration/issues_test.rb +3 0

             class IssuesTest < ActionController::IntegrationTest
               fixtures :projects,
                        :users,
+                       :roles,
+                       :members,
                        :trackers,
                        :projects_trackers,
+                       :enabled_modules,
                        :issue_statuses,
                        :issues,
                        :enumerations,

test/test_helper.rb 0 -17

@@ -65,20 +65,3 class Test::Unit::TestCase
65	Attachment.storage_path = "#{RAILS_ROOT}/tmp/test/attachments"	65	Attachment.storage_path = "#{RAILS_ROOT}/tmp/test/attachments"
66	end	66	end
67	end	67	end
68
69
70	# ActionController::TestUploadedFile bug
71	# see http://dev.rubyonrails.org/ticket/4635
72	class String
73	def original_filename
74	"testfile.txt"
75	end
76
77	def content_type
78	"text/plain"
79	end
80
81	def read
82	self.to_s
83	end
84	end

test/unit/role_test.rb +1 -1

                 target = Role.new(:name => 'Target')
                 assert target.save
-                assert target.workflows.copy(source)
+                target.workflows.copy(source)
                 target.reload
                 assert_equal 90, target.workflows.size
               end

test/unit/tracker_test.rb +1 -1

                 target = Tracker.new(:name => 'Target')
                 assert target.save
-                assert target.workflows.copy(source)
+                target.workflows.copy(source)
                 target.reload
                 assert_equal 89, target.workflows.size
               end

vendor/plugins/acts_as_versioned/Rakefile +181 -181

@@ -1,182 +1,182
1	require 'rubygems'	1	require 'rubygems'
2		2
3	Gem::manage_gems	3	Gem::manage_gems
4		4
5	require 'rake/rdoctask'	5	require 'rake/rdoctask'
6	require 'rake/packagetask'	6	require 'rake/packagetask'
7	require 'rake/gempackagetask'	7	require 'rake/gempackagetask'
8	require 'rake/testtask'	8	require 'rake/testtask'
9	require 'rake/contrib/rubyforgepublisher'	9	require 'rake/contrib/rubyforgepublisher'
10		10
11	PKG_NAME = 'acts_as_versioned'	11	PKG_NAME = 'acts_as_versioned'
12	PKG_VERSION = '0.3.1'	12	PKG_VERSION = '0.3.1'
13	PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"	13	PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
14	PROD_HOST = "technoweenie@bidwell.textdrive.com"	14	PROD_HOST = "technoweenie@bidwell.textdrive.com"
15	RUBY_FORGE_PROJECT = 'ar-versioned'	15	RUBY_FORGE_PROJECT = 'ar-versioned'
16	RUBY_FORGE_USER = 'technoweenie'	16	RUBY_FORGE_USER = 'technoweenie'
17		17
18	desc 'Default: run unit tests.'	18	desc 'Default: run unit tests.'
19	task :default => :test	19	task :default => :test
20		20
21	desc 'Test the calculations plugin.'	21	desc 'Test the calculations plugin.'
22	Rake::TestTask.new(:test) do \|t\|	22	Rake::TestTask.new(:test) do \|t\|
23	t.libs << 'lib'	23	t.libs << 'lib'
24	t.pattern = 'test/*/_test.rb'	24	t.pattern = 'test/*/_test.rb'
25	t.verbose = true	25	t.verbose = true
26	end	26	end
27		27
28	desc 'Generate documentation for the calculations plugin.'	28	desc 'Generate documentation for the calculations plugin.'
29	Rake::RDocTask.new(:rdoc) do \|rdoc\|	29	Rake::RDocTask.new(:rdoc) do \|rdoc\|
30	rdoc.rdoc_dir = 'rdoc'	30	rdoc.rdoc_dir = 'rdoc'
31	rdoc.title = "#{PKG_NAME} -- Simple versioning with active record models"	31	rdoc.title = "#{PKG_NAME} -- Simple versioning with active record models"
32	rdoc.options << '--line-numbers --inline-source'	32	rdoc.options << '--line-numbers --inline-source'
33	rdoc.rdoc_files.include('README', 'CHANGELOG', 'RUNNING_UNIT_TESTS')	33	rdoc.rdoc_files.include('README', 'CHANGELOG', 'RUNNING_UNIT_TESTS')
34	rdoc.rdoc_files.include('lib/*/.rb')	34	rdoc.rdoc_files.include('lib/*/.rb')
35	end	35	end
36		36
37	spec = Gem::Specification.new do \|s\|	37	spec = Gem::Specification.new do \|s\|
38	s.name = PKG_NAME	38	s.name = PKG_NAME
39	s.version = PKG_VERSION	39	s.version = PKG_VERSION
40	s.platform = Gem::Platform::RUBY	40	s.platform = Gem::Platform::RUBY
41	s.summary = "Simple versioning with active record models"	41	s.summary = "Simple versioning with active record models"
42	s.files = FileList["{lib,test}/*/"].to_a + %w(README MIT-LICENSE CHANGELOG RUNNING_UNIT_TESTS)	42	s.files = FileList["{lib,test}/*/"].to_a + %w(README MIT-LICENSE CHANGELOG RUNNING_UNIT_TESTS)
43	s.files.delete "acts_as_versioned_plugin.sqlite.db"	43	s.files.delete "acts_as_versioned_plugin.sqlite.db"
44	s.files.delete "acts_as_versioned_plugin.sqlite3.db"	44	s.files.delete "acts_as_versioned_plugin.sqlite3.db"
45	s.files.delete "test/debug.log"	45	s.files.delete "test/debug.log"
46	s.require_path = 'lib'	46	s.require_path = 'lib'
47	s.autorequire = 'acts_as_versioned'	47	s.autorequire = 'acts_as_versioned'
48	s.has_rdoc = true	48	s.has_rdoc = true
49	s.test_files = Dir['test/*/_test.rb']	49	s.test_files = Dir['test/*/_test.rb']
50	s.add_dependency 'activerecord', '>= 1.10.1'	50	s.add_dependency 'activerecord', '>= 1.10.1'
51	s.add_dependency 'activesupport', '>= 1.1.1'	51	s.add_dependency 'activesupport', '>= 1.1.1'
52	s.author = "Rick Olson"	52	s.author = "Rick Olson"
53	s.email = "technoweenie@gmail.com"	53	s.email = "technoweenie@gmail.com"
54	s.homepage = "http://techno-weenie.net"	54	s.homepage = "http://techno-weenie.net"
55	end	55	end
56		56
57	Rake::GemPackageTask.new(spec) do \|pkg\|	57	Rake::GemPackageTask.new(spec) do \|pkg\|
58	pkg.need_tar = true	58	pkg.need_tar = true
59	end	59	end
60		60
61	desc "Publish the API documentation"	61	desc "Publish the API documentation"
62	task :pdoc => [:rdoc] do	62	task :pdoc => [:rdoc] do
63	Rake::RubyForgePublisher.new(RUBY_FORGE_PROJECT, RUBY_FORGE_USER).upload	63	Rake::RubyForgePublisher.new(RUBY_FORGE_PROJECT, RUBY_FORGE_USER).upload
64	end	64	end
65		65
66	desc 'Publish the gem and API docs'	66	desc 'Publish the gem and API docs'
67	task :publish => [:pdoc, :rubyforge_upload]	67	task :publish => [:pdoc, :rubyforge_upload]
68		68
69	desc "Publish the release files to RubyForge."	69	desc "Publish the release files to RubyForge."
70	task :rubyforge_upload => :package do	70	task :rubyforge_upload => :package do
71	files = %w(gem tgz).map { \|ext\| "pkg/#{PKG_FILE_NAME}.#{ext}" }	71	files = %w(gem tgz).map { \|ext\| "pkg/#{PKG_FILE_NAME}.#{ext}" }
72		72
73	if RUBY_FORGE_PROJECT then	73	if RUBY_FORGE_PROJECT then
74	require 'net/http'	74	require 'net/http'
75	require 'open-uri'	75	require 'open-uri'
76		76
77	project_uri = "http://rubyforge.org/projects/#{RUBY_FORGE_PROJECT}/"	77	project_uri = "http://rubyforge.org/projects/#{RUBY_FORGE_PROJECT}/"
78	project_data = open(project_uri) { \|data\| data.read }	78	project_data = open(project_uri) { \|data\| data.read }
79	group_id = project_data[/[?&]group_id=(\d+)/, 1]	79	group_id = project_data[/[?&]group_id=(\d+)/, 1]
80	raise "Couldn't get group id" unless group_id	80	raise "Couldn't get group id" unless group_id
81		81
82	# This echos password to shell which is a bit sucky	82	# This echos password to shell which is a bit sucky
83	if ENV["RUBY_FORGE_PASSWORD"]	83	if ENV["RUBY_FORGE_PASSWORD"]
84	password = ENV["RUBY_FORGE_PASSWORD"]	84	password = ENV["RUBY_FORGE_PASSWORD"]
85	else	85	else
86	print "#{RUBY_FORGE_USER}@rubyforge.org's password: "	86	print "#{RUBY_FORGE_USER}@rubyforge.org's password: "
87	password = STDIN.gets.chomp	87	password = STDIN.gets.chomp
88	end	88	end
89		89
90	login_response = Net::HTTP.start("rubyforge.org", 80) do \|http\|	90	login_response = Net::HTTP.start("rubyforge.org", 80) do \|http\|
91	data = [	91	data = [
92	"login=1",	92	"login=1",
93	"form_loginname=#{RUBY_FORGE_USER}",	93	"form_loginname=#{RUBY_FORGE_USER}",
94	"form_pw=#{password}"	94	"form_pw=#{password}"
95	].join("&")	95	].join("&")
96	http.post("/account/login.php", data)	96	http.post("/account/login.php", data)
97	end	97	end
98		98
99	cookie = login_response["set-cookie"]	99	cookie = login_response["set-cookie"]
100	raise "Login failed" unless cookie	100	raise "Login failed" unless cookie
101	headers = { "Cookie" => cookie }	101	headers = { "Cookie" => cookie }
102		102
103	release_uri = "http://rubyforge.org/frs/admin/?group_id=#{group_id}"	103	release_uri = "http://rubyforge.org/frs/admin/?group_id=#{group_id}"
104	release_data = open(release_uri, headers) { \|data\| data.read }	104	release_data = open(release_uri, headers) { \|data\| data.read }
105	package_id = release_data[/[?&]package_id=(\d+)/, 1]	105	package_id = release_data[/[?&]package_id=(\d+)/, 1]
106	raise "Couldn't get package id" unless package_id	106	raise "Couldn't get package id" unless package_id
107		107
108	first_file = true	108	first_file = true
109	release_id = ""	109	release_id = ""
110		110
111	files.each do \|filename\|	111	files.each do \|filename\|
112	basename = File.basename(filename)	112	basename = File.basename(filename)
113	file_ext = File.extname(filename)	113	file_ext = File.extname(filename)
114	file_data = File.open(filename, "rb") { \|file\| file.read }	114	file_data = File.open(filename, "rb") { \|file\| file.read }
115		115
116	puts "Releasing #{basename}..."	116	puts "Releasing #{basename}..."
117		117
118	release_response = Net::HTTP.start("rubyforge.org", 80) do \|http\|	118	release_response = Net::HTTP.start("rubyforge.org", 80) do \|http\|
119	release_date = Time.now.strftime("%Y-%m-%d %H:%M")	119	release_date = Time.now.strftime("%Y-%m-%d %H:%M")
120	type_map = {	120	type_map = {
121	".zip" => "3000",	121	".zip" => "3000",
122	".tgz" => "3110",	122	".tgz" => "3110",
123	".gz" => "3110",	123	".gz" => "3110",
124	".gem" => "1400"	124	".gem" => "1400"
125	}; type_map.default = "9999"	125	}; type_map.default = "9999"
126	type = type_map[file_ext]	126	type = type_map[file_ext]
127	boundary = "rubyqMY6QN9bp6e4kS21H4y0zxcvoor"	127	boundary = "rubyqMY6QN9bp6e4kS21H4y0zxcvoor"
128		128
129	query_hash = if first_file then	129	query_hash = if first_file then
130	{	130	{
131	"group_id" => group_id,	131	"group_id" => group_id,
132	"package_id" => package_id,	132	"package_id" => package_id,
133	"release_name" => PKG_FILE_NAME,	133	"release_name" => PKG_FILE_NAME,
134	"release_date" => release_date,	134	"release_date" => release_date,
135	"type_id" => type,	135	"type_id" => type,
136	"processor_id" => "8000", # Any	136	"processor_id" => "8000", # Any
137	"release_notes" => "",	137	"release_notes" => "",
138	"release_changes" => "",	138	"release_changes" => "",
139	"preformatted" => "1",	139	"preformatted" => "1",
140	"submit" => "1"	140	"submit" => "1"
141	}	141	}
142	else	142	else
143	{	143	{
144	"group_id" => group_id,	144	"group_id" => group_id,
145	"release_id" => release_id,	145	"release_id" => release_id,
146	"package_id" => package_id,	146	"package_id" => package_id,
147	"step2" => "1",	147	"step2" => "1",
148	"type_id" => type,	148	"type_id" => type,
149	"processor_id" => "8000", # Any	149	"processor_id" => "8000", # Any
150	"submit" => "Add This File"	150	"submit" => "Add This File"
151	}	151	}
152	end	152	end
153		153
154	query = "?" + query_hash.map do \|(name, value)\|	154	query = "?" + query_hash.map do \|(name, value)\|
155	[name, URI.encode(value)].join("=")	155	[name, URI.encode(value)].join("=")
156	end.join("&")	156	end.join("&")
157		157
158	data = [	158	data = [
159	"--" + boundary,	159	"--" + boundary,
160	"Content-Disposition: form-data; name=\"userfile\"; filename=\"#{basename}\"",	160	"Content-Disposition: form-data; name=\"userfile\"; filename=\"#{basename}\"",
161	"Content-Type: application/octet-stream",	161	"Content-Type: application/octet-stream",
162	"Content-Transfer-Encoding: binary",	162	"Content-Transfer-Encoding: binary",
163	"", file_data, ""	163	"", file_data, ""
164	].join("\x0D\x0A")	164	].join("\x0D\x0A")
165		165
166	release_headers = headers.merge(	166	release_headers = headers.merge(
167	"Content-Type" => "multipart/form-data; boundary=#{boundary}"	167	"Content-Type" => "multipart/form-data; boundary=#{boundary}"
168	)	168	)
169		169
170	target = first_file ? "/frs/admin/qrs.php" : "/frs/admin/editrelease.php"	170	target = first_file ? "/frs/admin/qrs.php" : "/frs/admin/editrelease.php"
171	http.post(target + query, data, release_headers)	171	http.post(target + query, data, release_headers)
172	end	172	end
173		173
174	if first_file then	174	if first_file then
175	release_id = release_response.body[/release_id=(\d+)/, 1]	175	release_id = release_response.body[/release_id=(\d+)/, 1]
176	raise("Couldn't get release id") unless release_id	176	raise("Couldn't get release id") unless release_id
177	end	177	end
178		178
179	first_file = false	179	first_file = false
180	end	180	end
181	end	181	end
182	end No newline at end of file	182	end

vendor/plugins/acts_as_versioned/lib/acts_as_versioned.rb +124 -71

             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
                 #   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
                     #     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)
                     #       # that create_table does
                     #       Post.create_versioned_table
                     #     end
+                    #
                     #     def self.down
                     #       Post.drop_versioned_table
                     #     end
                       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=
                         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.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] || {})
                         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|
                             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}",
                       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
                       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
                       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
                     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?
                         version_condition.call(self)
                       else
                         version_condition
                       end
                     end
                     # Executes the block with the versioning callbacks disabled.
                     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, {
                       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
                         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
                       #
                       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
                         result = block.call
                         ActiveRecord::Base.lock_optimistically = true if current
                         result
                       end
                     end
                   end
                 end

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

@@ -1,12 +1,21
		1	$:.unshift(File.dirname(__FILE__) + '/../../../rails/activesupport/lib')
		2	$:.unshift(File.dirname(__FILE__) + '/../../../rails/activerecord/lib')
1	$:.unshift(File.dirname(__FILE__) + '/../lib')	3	$:.unshift(File.dirname(__FILE__) + '/../lib')
2
3	require 'test/unit'	4	require 'test/unit'
4	require File.expand_path(File.join(File.dirname(__FILE__), '../../../../config/environment.rb'))	5	begin
5	require 'active_~~record/fixtures~~'	6	require 'active_support'
		7	require 'active_record'
		8	require 'active_record/fixtures'
		9	rescue LoadError
		10	require 'rubygems'
		11	retry
		12	end
		13	require 'acts_as_versioned'
6		14
7	config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))	15	config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
8	ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")	16	ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
9	ActiveRecord::Base.~~establish_connection~~(config[ENV['DB'] \|\| 'sqlite'])	17	ActiveRecord::Base.configurations = {'test' => config[ENV['DB'] \|\| 'sqlite3']}
		18	ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations['test'])
10		19
11	load(File.dirname(__FILE__) + "/schema.rb")	20	load(File.dirname(__FILE__) + "/schema.rb")
12		21
@@ -19,17 +28,9 if ENV['DB'] == 'postgresql'
19	end	28	end
20		29
21	Test::Unit::TestCase.fixture_path = File.dirname(__FILE__) + "/fixtures/"	30	Test::Unit::TestCase.fixture_path = File.dirname(__FILE__) + "/fixtures/"
22	$~~LOAD_PATH~~.unshift(Test::Unit::TestCase.fixture_path)	31	$:.unshift(Test::Unit::TestCase.fixture_path)
23		32
24	class Test::Unit::TestCase #:nodoc:	33	class Test::Unit::TestCase #:nodoc:
25	def create_fixtures(*table_names)
26	if block_given?
27	Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names) { yield }
28	else
29	Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names)
30	end
31	end
32
33	# Turn off transactional fixtures if you're working with MyISAM tables in MySQL	34	# Turn off transactional fixtures if you're working with MyISAM tables in MySQL
34	self.use_transactional_fixtures = true	35	self.use_transactional_fixtures = true
35		36

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 +18 -4

               class MigrationTest < Test::Unit::TestCase
                 self.use_transactional_fixtures = false
                 def teardown
-                  ActiveRecord::Base.connection.initialize_schema_information
+                  if ActiveRecord::Base.connection.respond_to?(:initialize_schema_information)
-                  ActiveRecord::Base.connection.update "UPDATE schema_info SET version = 0"
+                    ActiveRecord::Base.connection.initialize_schema_information
+                    ActiveRecord::Base.connection.update "UPDATE schema_info SET version = 0"
+                  else
+                    ActiveRecord::Base.connection.initialize_schema_migrations_table
+                    ActiveRecord::Base.connection.assume_migrated_upto_version(0)
+                  end
                   Thing.connection.drop_table "things" rescue nil
                   Thing.connection.drop_table "thing_versions" rescue nil
                   Thing.reset_column_information
                   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/')

vendor/plugins/acts_as_versioned/test/versioned_test.rb +103 -69

             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
               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
                 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
                 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
               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
               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
                   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|
               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 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 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_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
                 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
-            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
  No newline at end of file

vendor/plugins/rfpdf/init.rb +7 -1

@@ -1,3 +1,9
1	require 'rfpdf'	1	require 'rfpdf'
2		2
3	ActionView::Base::register_template_handler 'rfpdf', RFPDF::View No newline at end of file	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
		8	ActionView::Base::register_template_handler 'rfpdf', RFPDF::View
		9	end

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

             module RFPDF
               class View
+                @@backward_compatibility_mode = false
+                cattr_accessor :backward_compatibility_mode
                 def initialize(action_view)
                   @action_view = action_view
                     :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?
             			  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

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