Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Changes

* Deprecate `JSON.fast_generate` (it's not any faster, so pointless).
* Deprecate `JSON.load_default_options`.
* Deprecate `JSON.unsafe_load_default_options`.
* Deprecate `JSON.dump_default_options`.
Expand Down
18 changes: 4 additions & 14 deletions lib/json/common.rb
Original file line number Diff line number Diff line change
Expand Up @@ -74,16 +74,6 @@ def generator=(generator) # :nodoc:
$VERBOSE = old
end

def create_fast_state
State.new(
:indent => '',
:space => '',
:object_nl => "",
:array_nl => "",
:max_nesting => false
)
end

def create_pretty_state
State.new(
:indent => ' ',
Expand Down Expand Up @@ -368,12 +358,12 @@ def generate(obj, opts = nil)
# # Raises SystemStackError (stack level too deep):
# JSON.fast_generate(a)
def fast_generate(obj, opts = nil)
if State === opts
state = opts
if RUBY_VERSION >= "3.0"
warn "JSON.fast_generate is deprecated and will be removed in json 3.0.0, just use JSON.generate", uplevel: 1, category: :deprecated
else
state = JSON.create_fast_state.configure(opts)
warn "JSON.fast_generate is deprecated and will be removed in json 3.0.0, just use JSON.generate", uplevel: 1
end
state.generate(obj)
generate(obj, opts)
end

# :call-seq:
Expand Down
19 changes: 0 additions & 19 deletions test/json/json_generator_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -237,25 +237,6 @@ def test_safe_state
}.sort_by { |n,| n.to_s }, state.to_h.sort_by { |n,| n.to_s })
end

def test_fast_state
state = JSON.create_fast_state
assert_equal({
:allow_nan => false,
:array_nl => "",
:as_json => false,
:ascii_only => false,
:buffer_initial_length => 1024,
:depth => 0,
:script_safe => false,
:strict => false,
:indent => "",
:max_nesting => 0,
:object_nl => "",
:space => "",
:space_before => "",
}.sort_by { |n,| n.to_s }, state.to_h.sort_by { |n,| n.to_s })
end

def test_allow_nan
error = assert_raise(GeneratorError) { generate([JSON::NaN]) }
assert_same JSON::NaN, error.invalid_object
Expand Down