aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/active_support/json/encoding.rb23
1 files changed, 8 insertions, 15 deletions
diff --git a/activesupport/lib/active_support/json/encoding.rb b/activesupport/lib/active_support/json/encoding.rb
index 832d1ce6d5..b3475c2569 100644
--- a/activesupport/lib/active_support/json/encoding.rb
+++ b/activesupport/lib/active_support/json/encoding.rb
@@ -38,7 +38,6 @@ module ActiveSupport
class CircularReferenceError < StandardError; end
class Encoder
- attr_reader :options
def initialize(options = nil)
@options = options || {}
@@ -63,9 +62,9 @@ module ActiveSupport
if value.is_a?(Array) || value.is_a?(Hash)
# hashes and arrays need to get encoder in the options, so that
# they can detect circular references.
- options.merge(:encoder => self)
+ @options.merge(:encoder => self)
else
- options.dup
+ @options.dup
end
end
@@ -253,18 +252,6 @@ end
module Enumerable
def as_json(options = nil) #:nodoc:
- to_a.as_json(options)
- end
-end
-
-class Range
- def as_json(options = nil) #:nodoc:
- to_s
- end
-end
-
-class Array
- def as_json(options = nil) #:nodoc:
# use encoder as a proxy to call as_json on all elements, to protect from circular references
encoder = options && options[:encoder] || ActiveSupport::JSON::Encoding::Encoder.new(options)
map { |v| encoder.as_json(v, options) }
@@ -276,6 +263,12 @@ class Array
end
end
+class Range
+ def as_json(options = nil) #:nodoc:
+ to_s
+ end
+end
+
class Hash
def as_json(options = nil) #:nodoc:
# create a subset of the hash by applying :only or :except