6873fc8026
Upgraded to Rails 2.0.2, except that we maintain vendor/rails/actionpack/lib/action_controller/routing.rb from Rail 1.2.6 (at least for now), so that Routes don't change. We still get to enjoy Rails's many new features. Also fixed a bug in Chunk-handling: disable WikiWord processing in tags (for real this time).
39 lines
1 KiB
Ruby
39 lines
1 KiB
Ruby
require 'active_support/json/variable'
|
|
|
|
require 'active_support/json/encoders/object' # Require explicitly for rdoc.
|
|
Dir["#{File.dirname(__FILE__)}/encoders/**/*.rb"].each do |file|
|
|
basename = File.basename(file, '.rb')
|
|
unless basename == 'object'
|
|
require "active_support/json/encoders/#{basename}"
|
|
end
|
|
end
|
|
|
|
module ActiveSupport
|
|
module JSON
|
|
class CircularReferenceError < StandardError
|
|
end
|
|
|
|
class << self
|
|
REFERENCE_STACK_VARIABLE = :json_reference_stack #:nodoc:
|
|
|
|
# Converts a Ruby object into a JSON string.
|
|
def encode(value, options = {})
|
|
raise_on_circular_reference(value) do
|
|
value.send(:to_json, options)
|
|
end
|
|
end
|
|
|
|
protected
|
|
def raise_on_circular_reference(value) #:nodoc:
|
|
stack = Thread.current[REFERENCE_STACK_VARIABLE] ||= []
|
|
raise CircularReferenceError, 'object references itself' if
|
|
stack.include? value
|
|
stack << value
|
|
yield
|
|
ensure
|
|
stack.pop
|
|
end
|
|
end
|
|
end
|
|
end
|