[ViewVC] Diff of: cvs/JSON-XS/XS.pm

Comparing JSON-XS/XS.pm (file contents):
Revision 1.68 by root, Tue Oct 23 03:30:02 2007 UTC vs.
Revision 1.79 by root, Wed Dec 19 11:42:52 2007 UTC

  use JSON::XS;
  # exported functions, they croak on error
  # and expect/generate UTF-8
- $utf8_encoded_json_text = to_json $perl_hash_or_arrayref;
+ $utf8_encoded_json_text = encode_json $perl_hash_or_arrayref;
- $perl_hash_or_arrayref  = from_json $utf8_encoded_json_text;
+ $perl_hash_or_arrayref  = decode_json $utf8_encoded_json_text;
  # OO-interface
  $coder = JSON::XS->new->ascii->pretty->allow_nonref;
  $pretty_printed_unencoded = $coder->encode ($perl_scalar);
  $perl_scalar = $coder->decode ($unicode_json_text);
+ # Note that JSON version 2.0 and above will automatically use JSON::XS
+ # if available, at virtually no speed overhead either, so you should
+ # be able to just:
+ use JSON;
+ # and do the same things, except that you have a pure-perl fallback now.
 =head1 DESCRIPTION
 This module converts Perl data structures to JSON and vice versa. Its
 primary goal is to be I<correct> and its secondary goal is to be
 I<fast>. To reach the latter goal it was written in C.
+Beginning with version 2.0 of the JSON module, when both JSON and
+JSON::XS are installed, then JSON will fall back on JSON::XS (this can be
+overriden) with no overhead due to emulation (by inheritign constructor
+and methods). If JSON::XS is not available, it will fall back to the
+compatible JSON::PP module as backend, so using JSON instead of JSON::XS
+gives you a portable JSON API that can be fast when you need and doesn't
+require a C compiler when that is a problem.
 As this is the n-th-something JSON module on CPAN, what was the reason
 to write yet another JSON module? While it seems there are many JSON
 modules, none of them correctly handle all corner cases, and in most cases
 their maintainers are unresponsive, gone missing, or not listening to bug
 package JSON::XS;
 use strict;
-our $VERSION = '1.52';
+our $VERSION = '2.01';
 our @ISA = qw(Exporter);
-our @EXPORT = qw(to_json from_json);
+our @EXPORT = qw(encode_json decode_json to_json from_json);
+sub to_json($) {
+   require Carp;
+   Carp::croak ("JSON::XS::to_json has been renamed to encode_json, either downgrade to pre-2.0 versions of JSON::XS or rename the call");
+}
+sub from_json($) {
+   require Carp;
+   Carp::croak ("JSON::XS::from_json has been renamed to decode_json, either downgrade to pre-2.0 versions of JSON::XS or rename the call");
+}
 use Exporter;
 use XSLoader;
 =head1 FUNCTIONAL INTERFACE
 The following convenience methods are provided by this module. They are
 exported by default:
 =over 4
-=item $json_text = to_json $perl_scalar
+=item $json_text = encode_json $perl_scalar
 Converts the given Perl data structure to a UTF-8 encoded, binary string
 (that is, the string contains octets only). Croaks on error.
 This function call is functionally identical to:
    $json_text = JSON::XS->new->utf8->encode ($perl_scalar)
 except being faster.
-=item $perl_scalar = from_json $json_text
+=item $perl_scalar = decode_json $json_text
-The opposite of C<to_json>: expects an UTF-8 (binary) string and tries
+The opposite of C<encode_json>: expects an UTF-8 (binary) string and tries
 to parse that as an UTF-8 encoded JSON text, returning the resulting
 reference. Croaks on error.
 This function call is functionally identical to:
    my $json = JSON::XS->new->utf8->space_after->encode ({a => [1,2]})
    => {"a": [1, 2]}
 =item $json = $json->ascii ([$enable])
+=item $enabled = $json->get_ascii
 If C<$enable> is true (or missing), then the C<encode> method will not
 generate characters outside the code range C<0..127> (which is ASCII). Any
 Unicode characters outside that range will be escaped using either a
 single \uXXXX (BMP characters) or a double \uHHHH\uLLLLL escape sequence,
   JSON::XS->new->ascii (1)->encode ([chr 0x10401])
   => ["\ud801\udc01"]
 =item $json = $json->latin1 ([$enable])
+=item $enabled = $json->get_latin1
 If C<$enable> is true (or missing), then the C<encode> method will encode
 the resulting JSON text as latin1 (or iso-8859-1), escaping any characters
 outside the code range C<0..255>. The resulting string can be treated as a
 latin1-encoded JSON text or a native Unicode string. The C<decode> method
 will not be affected in any way by this flag, as C<decode> by default
   JSON::XS->new->latin1->encode (["\x{89}\x{abc}"]
   => ["\x{89}\\u0abc"]    # (perl syntax, U+abc escaped, U+89 not)
 =item $json = $json->utf8 ([$enable])
+=item $enabled = $json->get_utf8
 If C<$enable> is true (or missing), then the C<encode> method will encode
 the JSON result into UTF-8, as required by many protocols, while the
 C<decode> method expects to be handled an UTF-8-encoded string.  Please
 note that UTF-8-encoded strings do not contain any characters outside the
       ]
    }
 =item $json = $json->indent ([$enable])
+=item $enabled = $json->get_indent
 If C<$enable> is true (or missing), then the C<encode> method will use a multiline
 format as output, putting every array member or object/hash key-value pair
 into its own line, indenting them properly.
 If C<$enable> is false, no newlines or indenting will be produced, and the
 This setting has no effect when decoding JSON texts.
 =item $json = $json->space_before ([$enable])
+=item $enabled = $json->get_space_before
 If C<$enable> is true (or missing), then the C<encode> method will add an extra
 optional space before the C<:> separating keys from values in JSON objects.
 If C<$enable> is false, then the C<encode> method will not add any extra
 space at those places.
 Example, space_before enabled, space_after and indent disabled:
    {"key" :"value"}
 =item $json = $json->space_after ([$enable])
+=item $enabled = $json->get_space_after
 If C<$enable> is true (or missing), then the C<encode> method will add an extra
 optional space after the C<:> separating keys from values in JSON objects
 and extra whitespace after the C<,> separating key-value pairs and array
 members.
 Example, space_before and indent disabled, space_after enabled:
    {"key": "value"}
 =item $json = $json->relaxed ([$enable])
+=item $enabled = $json->get_relaxed
 If C<$enable> is true (or missing), then C<decode> will accept some
 extensions to normal JSON syntax (see below). C<encode> will not be
 affected in anyway. I<Be aware that this option makes you accept invalid
 JSON texts as if they were valid!>. I suggest only to use this option to
 =back
 =item $json = $json->canonical ([$enable])
+=item $enabled = $json->get_canonical
 If C<$enable> is true (or missing), then the C<encode> method will output JSON objects
 by sorting their keys. This is adding a comparatively high overhead.
 If C<$enable> is false, then the C<encode> method will output key-value
 pairs in the order Perl stores them (which will likely change between runs
 This setting has no effect when decoding JSON texts.
 =item $json = $json->allow_nonref ([$enable])
+=item $enabled = $json->get_allow_nonref
 If C<$enable> is true (or missing), then the C<encode> method can convert a
 non-reference into its corresponding string, number or null JSON value,
 which is an extension to RFC4627. Likewise, C<decode> will accept those JSON
 values instead of croaking.
    JSON::XS->new->allow_nonref->encode ("Hello, World!")
    => "Hello, World!"
 =item $json = $json->allow_blessed ([$enable])
+=item $enabled = $json->get_allow_blessed
 If C<$enable> is true (or missing), then the C<encode> method will not
 barf when it encounters a blessed reference. Instead, the value of the
 B<convert_blessed> option will decide whether C<null> (C<convert_blessed>
-disabled or no C<to_json> method found) or a representation of the
+disabled or no C<TO_JSON> method found) or a representation of the
-object (C<convert_blessed> enabled and C<to_json> method found) is being
+object (C<convert_blessed> enabled and C<TO_JSON> method found) is being
 encoded. Has no effect on C<decode>.
 If C<$enable> is false (the default), then C<encode> will throw an
 exception when it encounters a blessed object.
 =item $json = $json->convert_blessed ([$enable])
+=item $enabled = $json->get_convert_blessed
 If C<$enable> is true (or missing), then C<encode>, upon encountering a
 blessed object, will check for the availability of the C<TO_JSON> method
 on the object's class. If found, it will be called in scalar context
 and the resulting scalar will be encoded instead of the object. If no
 The C<TO_JSON> method may safely call die if it wants. If C<TO_JSON>
 returns other blessed objects, those will be handled in the same
 way. C<TO_JSON> must take care of not causing an endless recursion cycle
 (== crash) in this case. The name of C<TO_JSON> was chosen because other
 methods called by the Perl core (== not by the user of the object) are
-usually in upper case letters and to avoid collisions with the C<to_json>
+usually in upper case letters and to avoid collisions with any C<to_json>
-function.
+function or method.
 This setting does not yet influence C<decode> in any way, but in the
 future, global hooks might get installed that influence C<decode> and are
 enabled by this setting.
       { __widget__ => $self->{id} }
    }
 =item $json = $json->shrink ([$enable])
+=item $enabled = $json->get_shrink
 Perl usually over-allocates memory a bit when allocating space for
 strings. This flag optionally resizes strings generated by either
 C<encode> or C<decode> to their minimum size possible. This can save
 memory when your JSON texts are either very very long or you have many
 strings that look like integers or floats into integers or floats
 internally (there is no difference on the Perl level), saving space.
 =item $json = $json->max_depth ([$maximum_nesting_depth])
+=item $max_depth = $json->get_max_depth
 Sets the maximum nesting level (default C<512>) accepted while encoding
 or decoding. If the JSON text or Perl data structure has an equal or
 higher nesting level then this limit, then the encoder and decoder will
 stop and croak at that point.
 used, which is rarely useful.
 See SECURITY CONSIDERATIONS, below, for more info on why this is useful.
 =item $json = $json->max_size ([$maximum_string_size])
+=item $max_size = $json->get_max_size
 Set the maximum length a JSON text may have (in bytes) where decoding is
 being attempted. The default is C<0>, meaning no limit. When C<decode>
 is called on a string longer then this number of characters it will not
 attempt to decode the string but throw an exception. This setting has no
 Other unblessed references are generally not allowed and will cause an
 exception to be thrown, except for references to the integers C<0> and
 C<1>, which get turned into C<false> and C<true> atoms in JSON. You can
 also use C<JSON::XS::false> and C<JSON::XS::true> to improve readability.
-   to_json [\0,JSON::XS::true]      # yields [false,true]
+   encode_json [\0,JSON::XS::true]      # yields [false,true]
 =item JSON::XS::true, JSON::XS::false
 These special values become JSON true and JSON false values,
 respectively. You can also use C<\1> and C<\0> directly if you want.
 difficult objects to encode: JSON::XS will encode undefined scalars as
 JSON null value, scalars that have last been used in a string context
 before encoding as JSON strings and anything else as number value:
    # dump as number
-   to_json [2]                      # yields [2]
+   encode_json [2]                      # yields [2]
-   to_json [-3.0e17]                # yields [-3e+17]
+   encode_json [-3.0e17]                # yields [-3e+17]
-   my $value = 5; to_json [$value]  # yields [5]
+   my $value = 5; encode_json [$value]  # yields [5]
    # used as string, so dump as string
    print $value;
-   to_json [$value]                 # yields ["5"]
+   encode_json [$value]                 # yields ["5"]
    # undef becomes null
-   to_json [undef]                  # yields [null]
+   encode_json [undef]                  # yields [null]
 You can force the type to be a JSON string by stringifying it:
    my $x = 3.1; # some variable containing a number
    "$x";        # stringified
 Undocumented/buggy Unicode handling (how JSON handles Unicode values is
 undocumented. One can get far by feeding it Unicode strings and doing
 en-/decoding oneself, but Unicode escapes are not working properly).
-No roundtripping (strings get clobbered if they look like numbers, e.g.
+No round-tripping (strings get clobbered if they look like numbers, e.g.
 the string C<2.0> will encode to C<2.0> instead of C<"2.0">, and that will
 decode into the number 2.
 =item JSON::PC 0.01
 Very fast.
 Undocumented/buggy Unicode handling.
-No roundtripping.
+No round-tripping.
 Has problems handling many Perl values (e.g. regex results and other magic
 values will make it croak).
 Does not even generate valid JSON (C<{1,2}> gets converted to C<{1:2}>
 Completely broken (and confusingly documented) Unicode handling (Unicode
 escapes are not working properly, you need to set ImplicitUnicode to
 I<different> values on en- and decoding to get symmetric behaviour).
-No roundtripping (simple cases work, but this depends on whether the scalar
+No round-tripping (simple cases work, but this depends on whether the scalar
 value was used in a numeric context or not).
 Dumping hashes may skip hash values depending on iterator state.
 Unmaintained (maintainer unresponsive for many months, bugs are not
 Undocumented Unicode handling (but the best of the pack. Unicode escapes
 still don't get parsed properly).
 Very inflexible.
-No roundtripping.
+No round-tripping.
 Does not generate valid JSON texts (key strings are often unquoted, empty keys
 result in nothing being output)
 Does not check input for validity.
 It shows the number of encodes/decodes per second (JSON::XS uses
 the functional interface, while JSON::XS/2 uses the OO interface
 with pretty-printing and hashkey sorting enabled, JSON::XS/3 enables
 shrink). Higher is better:
-   Storable   |  15779.925 |  14169.946 |
-   -----------+------------+------------+
    module     |     encode |     decode |
    -----------|------------|------------|
-   JSON       |   4990.842 |   4088.813 |
+   JSON 1.x   |   4990.842 |   4088.813 |
    JSON::DWIW |  51653.990 |  71575.154 |
    JSON::PC   |  65948.176 |  74631.744 |
    JSON::PP   |   8931.652 |   3817.168 |
    JSON::Syck |  24877.248 |  27776.848 |
    JSON::XS   | 388361.481 | 227951.304 |
 Using a longer test string (roughly 18KB, generated from Yahoo! Locals
 search API (http://nanoref.com/yahooapis/mgPdGg):
    module     |     encode |     decode |
    -----------|------------|------------|
-   JSON       |     55.260 |     34.971 |
+   JSON 1.x   |     55.260 |     34.971 |
    JSON::DWIW |    825.228 |   1082.513 |
    JSON::PC   |   3571.444 |   2394.829 |
    JSON::PP   |    210.987 |     32.574 |
    JSON::Syck |    552.551 |    787.544 |
    JSON::XS   |   5780.463 |   4854.519 |
 Third, JSON::XS recurses using the C stack when decoding objects and
 arrays. The C stack is a limited resource: for instance, on my amd64
 machine with 8MB of stack size I can decode around 180k nested arrays but
 only 14k nested JSON objects (due to perl itself recursing deeply on croak
-to free the temporary). If that is exceeded, the program crashes. to be
+to free the temporary). If that is exceeded, the program crashes. To be
 conservative, the default nesting limit is set to 512. If your process
 has a smaller stack, you should adjust this setting accordingly with the
 C<max_depth> method.
 And last but least, something else could bomb you that I forgot to think
 If you are using JSON::XS to return packets to consumption
 by JavaScript scripts in a browser you should have a look at
 L<http://jpsykes.com/47/practical-csrf-and-json-security> to see whether
 you are vulnerable to some common attack vectors (which really are browser
 design bugs, but it is still you who will have to deal with it, as major
-browser developers care only for features, not about doing security
+browser developers care only for features, not about getting security
 right).
 =head1 THREADS

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing JSON-XS/XS.pm (file contents): Revision 1.68 by root, Tue Oct 23 03:30:02 2007 UTC vs. Revision 1.79 by root, Wed Dec 19 11:42:52 2007 UTC

Diff Legend

Comparing JSON-XS/XS.pm (file contents):
Revision 1.68 by root, Tue Oct 23 03:30:02 2007 UTC vs.
Revision 1.79 by root, Wed Dec 19 11:42:52 2007 UTC