Navigation

Changeset 4760

Timestamp:

08/14/06 18:15:44 (2 years ago)

Author:

ulysses

Message:

Add silencing to deprecations; avoid self-scolding.

Files:

r4754	r4760
1	1	SVN
	2
	3	* Add Deprecation.silence so that Reloadable does not scold itself. [Nicholas Seckar]
2	4
3	5	* Add debugging logging to Dependencies. Currently can be enabled with Dependencies.log_activity = true; adding to Initializer and documenting is forthcoming. [Nicholas Seckar]

r4728	r4760
10	10	class << self
11	11	def warn(message = nil, callstack = caller)
12		behavior.call(deprecation_message(callstack, message)) if behavior
	12	behavior.call(deprecation_message(callstack, message)) if behavior && ! silenced?
13	13	end
14	14
15	15	def default_behavior
16	16	DEFAULT_BEHAVIORS[RAILS_ENV.to_s] if defined?(RAILS_ENV)
	17	end
	18
	19	# Have deprecations been silenced?
	20	def silenced?
	21	@silenced
	22	end
	23
	24	# Silence deprecations for the duration of the provided block. For internal
	25	# use only.
	26	def silence
	27	old_silenced, @silenced = @silenced, true # We could have done behavior = nil...
	28	yield
	29	ensure
	30	@silenced = old_silenced
17	31	end
18	32

r4728	r4760
26	26
27	27	def reloadable_classes
28		included_in_classes.select { \|klass\| klass.reloadable? }
	28	ActiveSupport::Deprecation.silence do
	29	included_in_classes.select { \|klass\| klass.reloadable? }
	30	end
29	31	end
30		# Commented out so dispatcher doesn't warn. Should we just disable Reloadable?
31		# deprecate :reloadable_classes
	32	deprecate :reloadable_classes
32	33	end
33	34

r4728	r4760
79	79	end
80	80
	81	def test_silence
	82	ActiveSupport::Deprecation.silence do
	83	assert_not_deprecated { @dtc.partially }
	84	end
	85	end
	86
81	87	end

r4742	r4760
1	1	SVN
	2
	3	* Don't warn dispatcher of Reloadable deprecations. [Nicholas Seckar]
2	4
3	5	* Rearrange application resetting and preparation, fix bug with leaking subclasses hash in ActiveRecord::Base [Rick Olson]

r4742	r4760
57	57	ActiveRecord::Base.reset_subclasses if defined?(ActiveRecord)
58	58	Dependencies.clear
59		Class.remove_class(*Reloadable.reloadable_classes)
	59	ActiveSupport::Deprecation.silence do # TODO: Remove after 1.2
	60	Class.remove_class(*Reloadable.reloadable_classes)
	61	end
60	62	end
61	63