diff options
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/activesupport.gemspec | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | activesupport/lib/active_support/core_ext/object/to_param.rb | 4 | ||||
| -rw-r--r-- | activesupport/test/core_ext/time_with_zone_test.rb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/activesupport/activesupport.gemspec b/activesupport/activesupport.gemspec index cfd85f61c9..09635c2f18 100644 --- a/activesupport/activesupport.gemspec +++ b/activesupport/activesupport.gemspec @@ -19,7 +19,7 @@ Gem::Specification.new do |s| s.has_rdoc = true - s.add_dependency('i18n', '~> 0.4.0.beta1') + s.add_dependency('i18n', '~> 0.4.0') s.add_dependency('tzinfo', '~> 0.3.16') s.add_dependency('builder', '~> 2.1.2') s.add_dependency('memcache-client', '>= 1.7.5') diff --git a/activesupport/lib/active_support/core_ext/object/to_param.rb b/activesupport/lib/active_support/core_ext/object/to_param.rb index 49e41e919a..06f077e920 100644..100755 --- a/activesupport/lib/active_support/core_ext/object/to_param.rb +++ b/activesupport/lib/active_support/core_ext/object/to_param.rb @@ -38,9 +38,9 @@ class Hash # passed to enclose the param names (see example below). # # ==== Examples - # { :name => 'David', :nationality => 'Danish' }.to_query # => "name=David&nationality=Danish" + # { :name => 'David', :nationality => 'Danish' }.to_param # => "name=David&nationality=Danish" # - # { :name => 'David', :nationality => 'Danish' }.to_query('user') # => "user[name]=David&user[nationality]=Danish" + # { :name => 'David', :nationality => 'Danish' }.to_param('user') # => "user[name]=David&user[nationality]=Danish" def to_param(namespace = nil) collect do |key, value| value.to_query(namespace ? "#{namespace}[#{key}]" : key) diff --git a/activesupport/test/core_ext/time_with_zone_test.rb b/activesupport/test/core_ext/time_with_zone_test.rb index 77b1893f77..2cf5bd6ea9 100644 --- a/activesupport/test/core_ext/time_with_zone_test.rb +++ b/activesupport/test/core_ext/time_with_zone_test.rb @@ -326,7 +326,7 @@ class TimeWithZoneTest < Test::Unit::TestCase def test_is_a assert_kind_of Time, @twz assert_kind_of Time, @twz - assert ActiveSupport::TimeWithZone, @twz + assert_kind_of ActiveSupport::TimeWithZone, @twz end def test_class_name |