diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-22 17:00:33 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-22 17:07:04 -0700 |
| commit | b2d6fdae353be4fca41d7ac1839f30d9737162fd (patch) | |
| tree | 168675745b5001d8a5b807d0102d3a1cdd639f3d | |
| parent | 7f6779c1d5e4ec7f642839caa7e86320720f77c8 (diff) | |
| download | rails-b2d6fdae353be4fca41d7ac1839f30d9737162fd.tar.gz rails-b2d6fdae353be4fca41d7ac1839f30d9737162fd.tar.bz2 rails-b2d6fdae353be4fca41d7ac1839f30d9737162fd.zip | |
Fix tests on 1.9
4 files changed, 6 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/number_helper.rb b/actionpack/lib/action_view/helpers/number_helper.rb index dea958deaf..c02692b09a 100644 --- a/actionpack/lib/action_view/helpers/number_helper.rb +++ b/actionpack/lib/action_view/helpers/number_helper.rb @@ -1,3 +1,5 @@ +require 'active_support/core_ext/float/rounding' + module ActionView module Helpers #:nodoc: # Provides methods for converting numbers into formatted strings. diff --git a/activemodel/lib/active_model/core.rb b/activemodel/lib/active_model/core.rb index 6b2bee53d9..b4b020defc 100644 --- a/activemodel/lib/active_model/core.rb +++ b/activemodel/lib/active_model/core.rb @@ -1,7 +1,7 @@ begin require 'active_support' rescue LoadError - activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib" + activesupport_path = "#{File.dirname(__FILE__)}/../../../activesupport/lib" if File.directory?(activesupport_path) $:.unshift activesupport_path require 'active_support' diff --git a/activesupport/lib/active_support/core_ext/class/attribute_accessors.rb b/activesupport/lib/active_support/core_ext/class/attribute_accessors.rb index 75e481fc54..74ce85a1c2 100644 --- a/activesupport/lib/active_support/core_ext/class/attribute_accessors.rb +++ b/activesupport/lib/active_support/core_ext/class/attribute_accessors.rb @@ -1,3 +1,5 @@ +require 'active_support/core_ext/array/extract_options' + # Extends the class object with class and instance accessors for class attributes, # just like the native attr* accessors for instance attributes. # diff --git a/activesupport/lib/active_support/core_ext/class/delegating_attributes.rb b/activesupport/lib/active_support/core_ext/class/delegating_attributes.rb index b0784d8416..fd029544c3 100644 --- a/activesupport/lib/active_support/core_ext/class/delegating_attributes.rb +++ b/activesupport/lib/active_support/core_ext/class/delegating_attributes.rb @@ -1,4 +1,4 @@ -require 'active_support/core_ext/blank' +require 'active_support/core_ext/object/blank' class Class def superclass_delegating_reader(*names) |