aboutsummaryrefslogtreecommitdiffstats
path: root/ext/json/lib
Commit message (Collapse)AuthorAgeFilesLines
* * ext/json: merge JSON 1.8.1.naruse2013-11-204-9/+14
| | | | | | | | | | | | | | | | https://github.com/nurse/json/compare/002ac2771ce32776b32ccd2d06e5604de6c36dcd...e09ffc0d7da25d0393873936c118c188c78dbac3 * Remove Rubinius exception since transcoding should be working now. * Fix https://github.com/flori/json/issues/162 reported by Marc-Andre Lafortune <github_rocks@marc-andre.ca>. Thanks! * Applied patches by Yui NARUSE <naruse@airemix.jp> to suppress warning with -Wchar-subscripts and better validate UTF-8 strings. * Applied patch by ginriki@github to remove unnecessary if. * Add load/dump interface to JSON::GenericObject to make serialize :some_attribute, JSON::GenericObject work in Rails active models for convenient SomeModel#some_attribute.foo.bar access to serialised JSON data. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43731 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* json/add/range.rb: use Range#endnobu2013-08-061-1/+1
| | | | | | | | * ext/json/lib/json/add/range.rb (Range#as_json): use Range#end instead of Range#last which can be affected by Range#exclusive?. ref [Bug #8739] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42404 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* fixup stying of `Json#generate` parameter docs by @daveworth [fixes GH-339]hsbt2013-07-091-2/+3
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41862 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json: merge JSON 1.7.7.naruse2013-02-124-10/+46
| | | | | | | | This includes security fix. [CVE-2013-0269] https://github.com/flori/json/commit/d0a62f3ced7560daba2ad546d83f0479a5ae2cf2 https://groups.google.com/d/topic/rubyonrails-security/4_YvCpLzL58/discussion git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39208 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/lib/json.rb: Move module overview definition for rdoczzak2013-02-041-2/+2
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39046 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json: merge JSON 1.7.5.naruse2012-12-123-4/+16
| | | | | | fix tests and other fixes. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38346 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/lib/json/generic_object.rb: missing file.nobu2012-05-071-0/+39
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35573 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json: Merge JSON 1.7.1.naruse2012-05-072-1/+2
| | | | | | https://github.com/flori/json/commit/e5b9a9465c1159fae533bca320d950b772bcb4ac git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Add missing files of r34971,naruse2012-03-1110-0/+316
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34973 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json: Merge 164a75c8bd2007d32c4d7665d53140d8fc126dcd.naruse2012-03-114-247/+56
| | | | | | [ruby-core:41917] [Bug #5846] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34971 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json: Merge json gem v1.5.4 (3dab4c5a6a97fac03dac).naruse2011-08-313-36/+44
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33142 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Don't include complex and rational; fix r33122.naruse2011-08-301-2/+0
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33124 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json: Merge json gem 1.5.4+ (2149f4185c598fb97db1).naruse2011-08-304-56/+93
| | | | | | [Bug #5173] [ruby-core:38866] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33122 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json: Merge json gem 1.5.4+ (f7f78896607b6f6226cd).naruse2011-07-105-34/+217
| | | | | | [Bug #4700] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32493 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * remove trailing spaces.nobu2011-05-151-1/+1
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31573 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/lib/json/common.rb (JSON::MissingUnicodeSupport.iconv):nobu2011-02-061-1/+1
| | | | | | should not drop rest of the result. use Iconv.conv instead. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30807 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/lib/json/add/rails.rb: removed.naruse2010-12-021-58/+0
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30053 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/lib/json/common.rb: don't use iconv on 1.9.naruse2010-12-011-3/+9
| | | | | | patched by Shota Fukumori [ruby-core:33164] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30004 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json: Update github/flori/json from 1.4.2+ tonaruse2010-12-014-1393/+19
| | | | | | e22b2f2bdfe6a9b0. this fixes some bugs. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30003 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json: Update to JSON 1.4.2.naruse2010-04-281-1/+1
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27535 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Recommit of JSON; fix mixed declarations.naruse2010-04-265-66/+122
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27501 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/jason: revert r27493. came again after canceling gcc-ism.usa2010-04-265-122/+66
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json: Update to JSON 1.4.1.naruse2010-04-265-66/+122
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27493 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/lib/**/*.rb: not executable.nobu2010-03-043-0/+0
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26811 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/lib/json/common.rb (recurse_proc): removed needlessnobu2009-09-291-1/+0
| | | | | | | module_function, since visibility is already module_function. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25153 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* NaN is now 0.0/0 because of 1.8/1.9 compat.naruse2009-09-011-1/+1
| | | | | | | * ext/json/lib/json/common.rb (NaN): Change definition of NaN to 0.0/0 for 1.8/1.9 compatibility. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24730 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json: Update to JSON 1.1.9.naruse2009-09-0112-2093/+6
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24727 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/lib/json/common.rb (JSON#recurse_proc): removematz2009-07-281-1/+0
| | | | | | unnecessary private specifier. [ruby-dev:38929] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24310 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Update to JSON 1.1.4.naruse2009-05-059-739/+127
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23346 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * {ext,lib,test}/**/*.rb: removed trailing spaces.nobu2009-03-065-26/+26
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22784 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/lib/json/pure/generator.rb (utf8_to_json):naruse2008-10-081-2/+3
| | | | | | process each unpacked Unicode character. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19714 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/lib/json/pure/parser.rbnaruse2008-10-081-1/+1
| | | | | | (JSON::Pure::Parser#parse_string): force_encoding("UTF-8"). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19713 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/lib/json/pure/generator.rb (utf8_to_json):naruse2008-10-071-2/+2
| | | | | | force_encoding before gsub. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19704 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/lib/json/pure/generator.rb (utf8_to_json):naruse2008-10-071-1/+1
| | | | | | downcase the result of Unicode escape. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19703 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/lib/json/pure.rb (module JSON): remove Iconv dependency.naruse2008-10-033-65/+21
| | | | | | | | | * ext/json/lib/json/pure/generator.rb (utf8_to_json): process as binary and remove Iconv dependency. * ext/json/lib/json/pure/parser.rb (parse_string): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19666 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/ext/parser/parse.c: use ruby_xfree().naruse2008-09-201-1/+1
| | | | | | | | * ext/json/ext/parser/parse.rl: ditto. * ext/json/ext/parser/unicode.c: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19438 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json: import JSON v 1.1.3.naruse2008-09-205-23/+36
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19436 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/lib/json/pure/generator.rb,naruse2008-02-122-2/+3
| | | | | | | | | | | | | | | ext/json/lib/json/pure/parser.rb, ext/openssl/lib/openssl/x509.rb, ext/win32ole/sample/olegen.rb, lib/date/format.rb, lib/irb/context.rb, lib/irb/workspace.rb, lib/net/http.rb, lib/net/imap.rb, lib/rdoc/generator.rb, lib/rdoc/markup/to_html.rb, lib/rdoc/markup/to_latex.rb, lib/rdoc/parsers/parse_c.rb, lib/rdoc/ri/formatter.rb, lib/rexml/parsers/baseparser.rb, lib/rexml/quickpath.rb, lib/rexml/text.rb, lib/rss/parser.rb, lib/uri/common.rb, lib/uri/generic.rb, lib/webrick/httpresponse.rb, lib/webrick/httpservlet/filehandler.rb, lib/yaml/baseemitter.rb, lib/yaml/encoding.rb: performance tuning arround String#gsub. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15442 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/json.rb, lib/json/*: moved to ext/json/lib.naruse2007-12-0419-0/+4681
-- M trunk/ChangeLog D trunk/lib/json D trunk/lib/json.rb A trunk/ext/json/lib A trunk/ext/json/lib/json A trunk/ext/json/lib/json.rb A trunk/ext/json/extconf.rb git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14100 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-27 12:57:30 +0000