提交 6ee03a40 编写于 作者: F Francesco Rodriguez

Rename ActiveSupport::BasicObject to ActiveSupport::ProxyObject

AS::BasicObject is used for proxy classes. Let's give it a less concerning
name. Also, it avoids the confusion with Ruby's Basic Object.
上级 7b50dc53
## Rails 4.0.0 (unreleased) ##
* Deprecate `ActiveSupport::BasicObject` in favor of `ActiveSupport::ProxyObject`.
This class is used for proxy classes. It avoids confusion with Ruby's BasicObject
class.
*Francesco Rodriguez*
* Patched Marshal#load to work with constant autoloading.
Fixes autoloading with cache stores that relay on Marshal(MemCacheStore and FileStore). [fixes #8167]
......
......@@ -40,6 +40,7 @@ module ActiveSupport
eager_autoload do
autoload :BacktraceCleaner
autoload :BasicObject
autoload :ProxyObject
autoload :Benchmarkable
autoload :Cache
autoload :Callbacks
......
module ActiveSupport
# A class with no predefined methods that behaves similarly to Builder's
# BlankSlate. Used for proxy classes.
class BasicObject < ::BasicObject
undef_method :==
undef_method :equal?
require 'active_support/deprecation'
# Let ActiveSupport::BasicObject at least raise exceptions.
def raise(*args)
::Object.send(:raise, *args)
end
end
module ActiveSupport
# :nodoc:
# Deprecated in favor of ActiveSupport::ProxyObject
BasicObject = Deprecation::DeprecatedConstantProxy.new('ActiveSupport::BasicObject', 'ActiveSupport::ProxyObject')
end
require 'active_support/basic_object'
require 'active_support/proxy_object'
require 'active_support/core_ext/array/conversions'
require 'active_support/core_ext/object/acts_like'
......@@ -7,7 +7,7 @@ module ActiveSupport
# Time#advance, respectively. It mainly supports the methods on Numeric.
#
# 1.month.ago # equivalent to Time.now.advance(months: -1)
class Duration < BasicObject
class Duration < ProxyObject
attr_accessor :value, :parts
def initialize(value, parts) #:nodoc:
......
module ActiveSupport
# A class with no predefined methods that behaves similarly to Builder's
# BlankSlate. Used for proxy classes.
class ProxyObject < ::BasicObject
undef_method :==
undef_method :equal?
# Let ActiveSupport::BasicObject at least raise exceptions.
def raise(*args)
::Object.send(:raise, *args)
end
end
end
......@@ -21,7 +21,7 @@ def test_threequals
assert ActiveSupport::Duration === 1.day
assert !(ActiveSupport::Duration === 1.day.to_i)
assert !(ActiveSupport::Duration === 'foo')
assert !(ActiveSupport::Duration === ActiveSupport::BasicObject.new)
assert !(ActiveSupport::Duration === ActiveSupport::ProxyObject.new)
end
def test_equals
......@@ -131,7 +131,7 @@ def test_adding_day_across_dst_boundary
assert_equal Time.local(2009,3,29,0,0,0) + 1.day, Time.local(2009,3,30,0,0,0)
end
end
def test_delegation_with_block_works
counter = 0
assert_nothing_raised do
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册