upgrade to rails 2.3.12 and fix deprecation warning and fix some version numbers of gems used for testing

This commit is contained in:
Reinier Balt 2011-06-09 17:04:00 +02:00
parent a3c5920a2b
commit ceda51b5bf
34 changed files with 2451 additions and 11266 deletions

View file

@ -29,8 +29,8 @@ dependencies:
segments:
- 2
- 3
- 11
version: 2.3.11
- 12
version: 2.3.12
type: :runtime
version_requirements: *id001
- !ruby/object:Gem::Dependency
@ -45,8 +45,8 @@ dependencies:
segments:
- 2
- 3
- 11
version: 2.3.11
- 12
version: 2.3.12
type: :runtime
version_requirements: *id002
description: Adds WSDL/SOAP and XML-RPC web service support to Action Pack

View file

@ -72,8 +72,8 @@ spec = Gem::Specification.new do |s|
s.rubyforge_project = "aws"
s.homepage = "http://www.rubyonrails.org"
s.add_dependency('actionpack', '= 2.3.11' + PKG_BUILD)
s.add_dependency('activerecord', '= 2.3.11' + PKG_BUILD)
s.add_dependency('actionpack', '= 2.3.12' + PKG_BUILD)
s.add_dependency('activerecord', '= 2.3.12' + PKG_BUILD)
s.has_rdoc = true
s.requirements << 'none'

View file

@ -340,7 +340,7 @@ Be aware, however, that <tt>NULL != 'Spot'</tt> returns <tt>false</tt> due to SQ
options[:parent_extend] = spiked_create_extension_module(association_id, Array(options[:parent_extend]), "Parent")
# create the reflection object
returning(create_reflection(:has_many_polymorphs, association_id, options, self)) do |reflection|
create_reflection(:has_many_polymorphs, association_id, options, self).tap do |reflection|
# set up the other related associations
create_join_association(association_id, reflection)
create_has_many_through_associations_for_parent_to_children(association_id, reflection)
@ -355,7 +355,7 @@ Be aware, however, that <tt>NULL != 'Spot'</tt> returns <tt>false</tt> due to SQ
def build_table_aliases(from)
# for the targets
returning({}) do |aliases|
{}.tap do |aliases|
from.map(&:to_s).sort.map(&:to_sym).each_with_index do |plural, t_index|
begin
table = plural._as_class.table_name