mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
Recommit of JSON; fix mixed declarations.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27501 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse
parent
27be3056dc
commit
3642494ce5
20 changed files with 2238 additions and 1766 deletions
|
|
@ -7,6 +7,19 @@ unless Object.const_defined?(:JSON) and ::JSON.const_defined?(:JSON_LOADED) and
|
|||
end
|
||||
require 'date'
|
||||
|
||||
class Symbol
|
||||
def to_json(*a)
|
||||
{
|
||||
JSON.create_id => self.class.name,
|
||||
's' => to_s,
|
||||
}.to_json(*a)
|
||||
end
|
||||
|
||||
def self.json_create(o)
|
||||
o['s'].to_sym
|
||||
end
|
||||
end
|
||||
|
||||
class Time
|
||||
def self.json_create(object)
|
||||
if usec = object.delete('u') # used to be tv_usec -> tv_nsec
|
||||
|
|
@ -21,7 +34,7 @@ class Time
|
|||
|
||||
def to_json(*args)
|
||||
{
|
||||
'json_class' => self.class.name,
|
||||
JSON.create_id => self.class.name,
|
||||
's' => tv_sec,
|
||||
'n' => respond_to?(:tv_nsec) ? tv_nsec : tv_usec * 1000
|
||||
}.to_json(*args)
|
||||
|
|
@ -37,7 +50,7 @@ class Date
|
|||
|
||||
def to_json(*args)
|
||||
{
|
||||
'json_class' => self.class.name,
|
||||
JSON.create_id => self.class.name,
|
||||
'y' => year,
|
||||
'm' => month,
|
||||
'd' => day,
|
||||
|
|
@ -63,7 +76,7 @@ class DateTime
|
|||
|
||||
def to_json(*args)
|
||||
{
|
||||
'json_class' => self.class.name,
|
||||
JSON.create_id => self.class.name,
|
||||
'y' => year,
|
||||
'm' => month,
|
||||
'd' => day,
|
||||
|
|
@ -83,7 +96,7 @@ class Range
|
|||
|
||||
def to_json(*args)
|
||||
{
|
||||
'json_class' => self.class.name,
|
||||
JSON.create_id => self.class.name,
|
||||
'a' => [ first, last, exclude_end? ]
|
||||
}.to_json(*args)
|
||||
end
|
||||
|
|
@ -98,7 +111,7 @@ class Struct
|
|||
klass = self.class.name
|
||||
klass.to_s.empty? and raise JSON::JSONError, "Only named structs are supported!"
|
||||
{
|
||||
'json_class' => klass,
|
||||
JSON.create_id => klass,
|
||||
'v' => values,
|
||||
}.to_json(*args)
|
||||
end
|
||||
|
|
@ -113,7 +126,7 @@ class Exception
|
|||
|
||||
def to_json(*args)
|
||||
{
|
||||
'json_class' => self.class.name,
|
||||
JSON.create_id => self.class.name,
|
||||
'm' => message,
|
||||
'b' => backtrace,
|
||||
}.to_json(*args)
|
||||
|
|
@ -127,7 +140,7 @@ class Regexp
|
|||
|
||||
def to_json(*)
|
||||
{
|
||||
'json_class' => self.class.name,
|
||||
JSON.create_id => self.class.name,
|
||||
'o' => options,
|
||||
's' => source,
|
||||
}.to_json
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ class Object
|
|||
def self.json_create(object)
|
||||
obj = new
|
||||
for key, value in object
|
||||
next if key == 'json_class'
|
||||
next if key == JSON.create_id
|
||||
instance_variable_set "@#{key}", value
|
||||
end
|
||||
obj
|
||||
|
|
@ -18,7 +18,7 @@ class Object
|
|||
|
||||
def to_json(*a)
|
||||
result = {
|
||||
'json_class' => self.class.name
|
||||
JSON.create_id => self.class.name
|
||||
}
|
||||
instance_variables.inject(result) do |r, name|
|
||||
r[name[1..-1]] = instance_variable_get name
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
require 'json/version'
|
||||
require 'iconv'
|
||||
|
||||
module JSON
|
||||
class << self
|
||||
|
|
@ -32,12 +33,16 @@ module JSON
|
|||
# level (absolute namespace path?). If there doesn't exist a constant at
|
||||
# the given path, an ArgumentError is raised.
|
||||
def deep_const_get(path) # :nodoc:
|
||||
path = path.to_s
|
||||
path.split(/::/).inject(Object) do |p, c|
|
||||
path.to_s.split(/::/).inject(Object) do |p, c|
|
||||
case
|
||||
when c.empty? then p
|
||||
when p.const_defined?(c) then p.const_get(c)
|
||||
else raise ArgumentError, "can't find const #{path}"
|
||||
else
|
||||
begin
|
||||
p.const_missing(c)
|
||||
rescue NameError
|
||||
raise ArgumentError, "can't find const #{path}"
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -58,6 +63,20 @@ module JSON
|
|||
end
|
||||
self.state = generator::State
|
||||
const_set :State, self.state
|
||||
const_set :SAFE_STATE_PROTOTYPE, State.new.freeze
|
||||
const_set :FAST_STATE_PROTOTYPE, State.new(
|
||||
:indent => '',
|
||||
:space => '',
|
||||
:object_nl => "",
|
||||
:array_nl => "",
|
||||
:max_nesting => false
|
||||
).freeze
|
||||
const_set :PRETTY_STATE_PROTOTYPE, State.new(
|
||||
:indent => ' ',
|
||||
:space => ' ',
|
||||
:object_nl => "\n",
|
||||
:array_nl => "\n"
|
||||
).freeze
|
||||
end
|
||||
|
||||
# Returns the JSON generator modul, that is used by JSON. This might be
|
||||
|
|
@ -90,22 +109,22 @@ module JSON
|
|||
# deep.
|
||||
class NestingError < ParserError; end
|
||||
|
||||
# :stopdoc:
|
||||
class CircularDatastructure < NestingError; end
|
||||
# :startdoc:
|
||||
|
||||
# This exception is raised, if a generator or unparser error occurs.
|
||||
class GeneratorError < JSONError; end
|
||||
# For backwards compatibility
|
||||
UnparserError = GeneratorError
|
||||
|
||||
# If a circular data structure is encountered while unparsing
|
||||
# this exception is raised.
|
||||
class CircularDatastructure < GeneratorError; end
|
||||
|
||||
# This exception is raised, if the required unicode support is missing on the
|
||||
# system. Usually this means, that the iconv library is not installed.
|
||||
class MissingUnicodeSupport < JSONError; end
|
||||
|
||||
module_function
|
||||
|
||||
# Parse the JSON string _source_ into a Ruby data structure and return it.
|
||||
# Parse the JSON document _source_ into a Ruby data structure and return it.
|
||||
#
|
||||
# _opts_ can have the following
|
||||
# keys:
|
||||
|
|
@ -115,16 +134,21 @@ module JSON
|
|||
# * *allow_nan*: If set to true, allow NaN, Infinity and -Infinity in
|
||||
# defiance of RFC 4627 to be parsed by the Parser. This option defaults
|
||||
# to false.
|
||||
# * *symbolize_names*: If set to true, returns symbols for the names
|
||||
# (keys) in a JSON object. Otherwise strings are returned, which is also
|
||||
# the default.
|
||||
# * *create_additions*: If set to false, the Parser doesn't create
|
||||
# additions even if a matchin class and create_id was found. This option
|
||||
# defaults to true.
|
||||
# * *object_class*: Defaults to Hash
|
||||
# * *array_class*: Defaults to Array
|
||||
def parse(source, opts = {})
|
||||
JSON.parser.new(source, opts).parse
|
||||
Parser.new(source, opts).parse
|
||||
end
|
||||
|
||||
# Parse the JSON string _source_ into a Ruby data structure and return it.
|
||||
# Parse the JSON document _source_ into a Ruby data structure and return it.
|
||||
# The bang version of the parse method, defaults to the more dangerous values
|
||||
# for the _opts_ hash, so be sure only to parse trusted _source_ strings.
|
||||
# for the _opts_ hash, so be sure only to parse trusted _source_ documents.
|
||||
#
|
||||
# _opts_ can have the following keys:
|
||||
# * *max_nesting*: The maximum depth of nesting allowed in the parsed data
|
||||
|
|
@ -139,15 +163,14 @@ module JSON
|
|||
# defaults to true.
|
||||
def parse!(source, opts = {})
|
||||
opts = {
|
||||
:max_nesting => false,
|
||||
:allow_nan => true
|
||||
:max_nesting => false,
|
||||
:allow_nan => true
|
||||
}.update(opts)
|
||||
JSON.parser.new(source, opts).parse
|
||||
Parser.new(source, opts).parse
|
||||
end
|
||||
|
||||
# Unparse the Ruby data structure _obj_ into a single line JSON string and
|
||||
# return it. _state_ is
|
||||
# * a JSON::State object,
|
||||
# Generate a JSON document from the Ruby data structure _obj_ and return
|
||||
# it. _state_ is * a JSON::State object,
|
||||
# * or a Hash like object (responding to to_hash),
|
||||
# * an object convertible into a hash by a to_h method,
|
||||
# that is used as or to configure a State object.
|
||||
|
|
@ -160,10 +183,8 @@ module JSON
|
|||
# * *indent*: a string used to indent levels (default: ''),
|
||||
# * *space*: a string that is put after, a : or , delimiter (default: ''),
|
||||
# * *space_before*: a string that is put before a : pair delimiter (default: ''),
|
||||
# * *object_nl*: a string that is put at the end of a JSON object (default: ''),
|
||||
# * *object_nl*: a string that is put at the end of a JSON object (default: ''),
|
||||
# * *array_nl*: a string that is put at the end of a JSON array (default: ''),
|
||||
# * *check_circular*: true if checking for circular data structures
|
||||
# should be done (the default), false otherwise.
|
||||
# * *allow_nan*: true if NaN, Infinity, and -Infinity should be
|
||||
# generated, otherwise an exception is thrown, if these values are
|
||||
# encountered. This options defaults to false.
|
||||
|
|
@ -174,13 +195,21 @@ module JSON
|
|||
# See also the fast_generate for the fastest creation method with the least
|
||||
# amount of sanity checks, and the pretty_generate method for some
|
||||
# defaults for a pretty output.
|
||||
def generate(obj, state = nil)
|
||||
if state
|
||||
state = State.from_state(state)
|
||||
def generate(obj, opts = nil)
|
||||
if opts
|
||||
if opts.respond_to? :to_hash
|
||||
opts = opts.to_hash
|
||||
elsif opts.respond_to? :to_h
|
||||
opts = opts.to_h
|
||||
else
|
||||
raise TypeError, "can't convert #{opts.class} into Hash"
|
||||
end
|
||||
state = SAFE_STATE_PROTOTYPE.dup
|
||||
state = state.configure(opts)
|
||||
else
|
||||
state = State.new
|
||||
state = SAFE_STATE_PROTOTYPE
|
||||
end
|
||||
obj.to_json(state)
|
||||
state.generate(obj)
|
||||
end
|
||||
|
||||
# :stopdoc:
|
||||
|
|
@ -190,35 +219,12 @@ module JSON
|
|||
module_function :unparse
|
||||
# :startdoc:
|
||||
|
||||
# Unparse the Ruby data structure _obj_ into a single line JSON string and
|
||||
# return it. This method disables the checks for circles in Ruby objects, and
|
||||
# also generates NaN, Infinity, and, -Infinity float values.
|
||||
# Generate a JSON document from the Ruby data structure _obj_ and return it.
|
||||
# This method disables the checks for circles in Ruby objects.
|
||||
#
|
||||
# *WARNING*: Be careful not to pass any Ruby data structures with circles as
|
||||
# _obj_ argument, because this will cause JSON to go into an infinite loop.
|
||||
def fast_generate(obj)
|
||||
obj.to_json(nil)
|
||||
end
|
||||
|
||||
# :stopdoc:
|
||||
# I want to deprecate these later, so I'll first be silent about them, and later delete them.
|
||||
alias fast_unparse fast_generate
|
||||
module_function :fast_unparse
|
||||
# :startdoc:
|
||||
|
||||
# Unparse the Ruby data structure _obj_ into a JSON string and return it. The
|
||||
# returned string is a prettier form of the string returned by #unparse.
|
||||
#
|
||||
# The _opts_ argument can be used to configure the generator, see the
|
||||
# generate method for a more detailed explanation.
|
||||
def pretty_generate(obj, opts = nil)
|
||||
state = JSON.state.new(
|
||||
:indent => ' ',
|
||||
:space => ' ',
|
||||
:object_nl => "\n",
|
||||
:array_nl => "\n",
|
||||
:check_circular => true
|
||||
)
|
||||
def fast_generate(obj, opts = nil)
|
||||
if opts
|
||||
if opts.respond_to? :to_hash
|
||||
opts = opts.to_hash
|
||||
|
|
@ -227,9 +233,41 @@ module JSON
|
|||
else
|
||||
raise TypeError, "can't convert #{opts.class} into Hash"
|
||||
end
|
||||
state = FAST_STATE_PROTOTYPE.dup
|
||||
state.configure(opts)
|
||||
else
|
||||
state = FAST_STATE_PROTOTYPE
|
||||
end
|
||||
obj.to_json(state)
|
||||
state.generate(obj)
|
||||
end
|
||||
|
||||
# :stopdoc:
|
||||
# I want to deprecate these later, so I'll first be silent about them, and later delete them.
|
||||
alias fast_unparse fast_generate
|
||||
module_function :fast_unparse
|
||||
# :startdoc:
|
||||
|
||||
# Generate a JSON document from the Ruby data structure _obj_ and return it.
|
||||
# The returned document is a prettier form of the document returned by
|
||||
# #unparse.
|
||||
#
|
||||
# The _opts_ argument can be used to configure the generator, see the
|
||||
# generate method for a more detailed explanation.
|
||||
def pretty_generate(obj, opts = nil)
|
||||
if opts
|
||||
if opts.respond_to? :to_hash
|
||||
opts = opts.to_hash
|
||||
elsif opts.respond_to? :to_h
|
||||
opts = opts.to_h
|
||||
else
|
||||
raise TypeError, "can't convert #{opts.class} into Hash"
|
||||
end
|
||||
state = PRETTY_STATE_PROTOTYPE.dup
|
||||
state.configure(opts)
|
||||
else
|
||||
state = PRETTY_STATE_PROTOTYPE
|
||||
end
|
||||
state.generate(obj)
|
||||
end
|
||||
|
||||
# :stopdoc:
|
||||
|
|
@ -305,6 +343,11 @@ module JSON
|
|||
rescue JSON::NestingError
|
||||
raise ArgumentError, "exceed depth limit"
|
||||
end
|
||||
|
||||
# Shortuct for iconv.
|
||||
def self.iconv(to, from, string)
|
||||
Iconv.iconv(to, from, string).first
|
||||
end
|
||||
end
|
||||
|
||||
module ::Kernel
|
||||
|
|
|
|||
|
|
@ -48,14 +48,14 @@ module JSON
|
|||
# Opens an error dialog on top of _window_ showing the error message
|
||||
# _text_.
|
||||
def Editor.error_dialog(window, text)
|
||||
dialog = MessageDialog.new(window, Dialog::MODAL,
|
||||
MessageDialog::ERROR,
|
||||
dialog = MessageDialog.new(window, Dialog::MODAL,
|
||||
MessageDialog::ERROR,
|
||||
MessageDialog::BUTTONS_CLOSE, text)
|
||||
dialog.show_all
|
||||
dialog.run
|
||||
rescue TypeError
|
||||
dialog = MessageDialog.new(Editor.window, Dialog::MODAL,
|
||||
MessageDialog::ERROR,
|
||||
dialog = MessageDialog.new(Editor.window, Dialog::MODAL,
|
||||
MessageDialog::ERROR,
|
||||
MessageDialog::BUTTONS_CLOSE, text)
|
||||
dialog.show_all
|
||||
dialog.run
|
||||
|
|
@ -67,8 +67,8 @@ module JSON
|
|||
# message _text_. If yes was answered _true_ is returned, otherwise
|
||||
# _false_.
|
||||
def Editor.question_dialog(window, text)
|
||||
dialog = MessageDialog.new(window, Dialog::MODAL,
|
||||
MessageDialog::QUESTION,
|
||||
dialog = MessageDialog.new(window, Dialog::MODAL,
|
||||
MessageDialog::QUESTION,
|
||||
MessageDialog::BUTTONS_YES_NO, text)
|
||||
dialog.show_all
|
||||
dialog.run do |response|
|
||||
|
|
@ -465,7 +465,7 @@ module JSON
|
|||
add_separator
|
||||
add_item("Append new node", ?a, &method(:append_new_node))
|
||||
add_item("Insert new node before", ?i, &method(:insert_new_node))
|
||||
add_separator
|
||||
add_separator
|
||||
add_item("Collapse/Expand node (recursively)", ?e,
|
||||
&method(:collapse_expand))
|
||||
|
||||
|
|
@ -504,7 +504,7 @@ module JSON
|
|||
# Revert the current JSON document in the editor to the saved version.
|
||||
def revert(item)
|
||||
window.instance_eval do
|
||||
@filename and file_open(@filename)
|
||||
@filename and file_open(@filename)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -666,7 +666,7 @@ module JSON
|
|||
collapse_all
|
||||
else
|
||||
self.expanded = true
|
||||
expand_all
|
||||
expand_all
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -885,7 +885,7 @@ module JSON
|
|||
dialog.signal_connect(:'key-press-event', &DEFAULT_DIALOG_KEY_PRESS_HANDLER)
|
||||
dialog.show_all
|
||||
self.focus = dialog
|
||||
dialog.run do |response|
|
||||
dialog.run do |response|
|
||||
if response == Dialog::RESPONSE_ACCEPT
|
||||
@key = key_input.text
|
||||
type = ALL_TYPES[@type = type_input.active]
|
||||
|
|
@ -937,7 +937,7 @@ module JSON
|
|||
dialog.signal_connect(:'key-press-event', &DEFAULT_DIALOG_KEY_PRESS_HANDLER)
|
||||
dialog.show_all
|
||||
self.focus = dialog
|
||||
dialog.run do |response|
|
||||
dialog.run do |response|
|
||||
if response == Dialog::RESPONSE_ACCEPT
|
||||
type = types[type_input.active]
|
||||
@content = case type
|
||||
|
|
@ -982,7 +982,7 @@ module JSON
|
|||
dialog.signal_connect(:'key-press-event', &DEFAULT_DIALOG_KEY_PRESS_HANDLER)
|
||||
dialog.show_all
|
||||
self.focus = dialog
|
||||
dialog.run do |response|
|
||||
dialog.run do |response|
|
||||
if response == Dialog::RESPONSE_ACCEPT
|
||||
return @order = order_input.text, reverse_checkbox.active?
|
||||
end
|
||||
|
|
@ -1017,7 +1017,7 @@ module JSON
|
|||
dialog.signal_connect(:'key-press-event', &DEFAULT_DIALOG_KEY_PRESS_HANDLER)
|
||||
dialog.show_all
|
||||
self.focus = dialog
|
||||
dialog.run do |response|
|
||||
dialog.run do |response|
|
||||
if response == Dialog::RESPONSE_ACCEPT
|
||||
begin
|
||||
return Regexp.new(regex_input.text, icase_checkbox.active? ? Regexp::IGNORECASE : 0)
|
||||
|
|
@ -1216,7 +1216,7 @@ module JSON
|
|||
end
|
||||
end
|
||||
|
||||
# Save the current file as the filename
|
||||
# Save the current file as the filename
|
||||
def file_save_as
|
||||
filename = select_file('Save as a JSON file')
|
||||
store_file(filename)
|
||||
|
|
@ -1242,7 +1242,7 @@ module JSON
|
|||
rescue SystemCallError => e
|
||||
Editor.error_dialog(self, "Failed to store JSON file: #{e}!")
|
||||
end
|
||||
|
||||
|
||||
# Load the file named _filename_ into the editor as a JSON document.
|
||||
def load_file(filename)
|
||||
if filename
|
||||
|
|
@ -1335,7 +1335,7 @@ module JSON
|
|||
|
||||
dialog.signal_connect(:'key-press-event', &DEFAULT_DIALOG_KEY_PRESS_HANDLER)
|
||||
dialog.show_all
|
||||
dialog.run do |response|
|
||||
dialog.run do |response|
|
||||
if response == Dialog::RESPONSE_ACCEPT
|
||||
return @location = location_input.text
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
module JSON
|
||||
# JSON version
|
||||
VERSION = '1.1.8'
|
||||
VERSION = '1.4.1'
|
||||
VERSION_ARRAY = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
|
||||
VERSION_MAJOR = VERSION_ARRAY[0] # :nodoc:
|
||||
VERSION_MINOR = VERSION_ARRAY[1] # :nodoc:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue