aboutsummaryrefslogtreecommitdiffstats
path: root/test/json
Commit message (Collapse)AuthorAgeFilesLines
* Remove tempfiles.akr2014-05-251-0/+2
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46119 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json: merge JSON 1.8.1.naruse2013-11-202-10/+59
| | | | | | | | | | | | | | | | 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
* Use assert_separately to inspect test failure of ↵naruse2013-06-171-22/+10
| | | | | | | | TestJSONGenerate#test_broken_bignum http://fbsd.rubyci.org/~chkbuild/ruby-trunk/log/20130617T010202Z.log.html.gz#test%2F-ext- git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41350 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json: merge JSON 1.7.7.naruse2013-02-129-60/+147
| | | | | | | | 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: merge JSON 1.7.5.naruse2012-12-123-4/+39
| | | | | | fix tests and other fixes. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38346 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* revert r37326 "remove string literal concatenation"nobu2012-10-251-2/+4
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37328 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* remove string literal concatenationnobu2012-10-251-4/+2
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37326 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json: Merge JSON 1.7.1.naruse2012-05-077-10/+22
| | | | | | https://github.com/flori/json/commit/e5b9a9465c1159fae533bca320d950b772bcb4ac git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Run TC_JSONGenerate#test_gc in a separate process.naruse2012-04-191-20/+11
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35397 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Add debug prints to inspect TC_JSONGenerate#test_gc's timeout issue.naruse2012-04-151-15/+15
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35336 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Adds another timeouts.naruse2012-04-141-3/+9
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35329 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* More increae timeout.naruse2012-04-101-1/+1
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35286 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Increae timeout.naruse2012-04-101-1/+1
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35282 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* start GC before GC.stress.naruse2012-04-101-0/+1
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35278 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Add timeout to TC_JSONGenerate#test_gc.naruse2012-04-101-3/+6
| | | | | | http://fb.rubyci.org/~chkbuild/ruby-trunk/log/20120409T230301Z.log.html.gz git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35276 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json: Merge 164a75c8bd2007d32c4d7665d53140d8fc126dcd.naruse2012-03-113-38/+164
| | | | | | [ruby-core:41917] [Bug #5846] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34971 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Remove tests of json/add/{complex, rational}.naruse2011-09-011-5/+0
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33148 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json: Merge json gem v1.5.4 (3dab4c5a6a97fac03dac).naruse2011-08-311-1/+1
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33142 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json: Merge json gem 1.5.4+ (2149f4185c598fb97db1).naruse2011-08-303-1/+75
| | | | | | [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-108-53/+109
| | | | | | [Bug #4700] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32493 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/parser/parser.rl (convert_encoding): should not modifynobu2011-07-081-0/+13
| | | | | | the argument. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32458 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * remove trailing spaces.nobu2011-05-152-2/+2
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31573 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/parser/parser.h (GET_PARSER): raise TypeError.nobu2011-02-051-2/+2
| | | | | | * ext/json/parser/parser.rl (cParser_initialize): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30792 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/parser/parser.h (GET_PARSER): check if initialized.nobu2011-02-051-0/+7
| | | | | | | [ruby-core:35079] * ext/json/parser/parser.rl (cParser_initialize): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30791 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/lib/json/add/rails.rb: removed.naruse2010-12-021-152/+0
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30053 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Setup Symbol#to_json to avoid conflict.naruse2010-12-021-0/+8
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30016 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/lib/json/common.rb: don't use iconv on 1.9.naruse2010-12-011-7/+8
| | | | | | 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-015-19/+127
| | | | | | e22b2f2bdfe6a9b0. this fixes some bugs. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30003 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * properties.nobu2010-06-021-1/+0
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28137 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Setup Symbol#to_json to avoid conflict.naruse2010-05-041-0/+8
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27613 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * test/json/test_json_addition.rb (test_utc_datetime): fixednobu2010-05-021-2/+2
| | | | | | timezone offsets. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27590 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * test: fixed wrong assertions.nobu2010-05-021-4/+4
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27587 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json: Update to JSON 1.4.1.naruse2010-04-266-52/+181
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27493 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Use Array#permutation for permutation tests.naruse2009-10-201-21/+14
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25419 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Add tests of JSON 1.1.9.naruse2009-09-016-70/+153
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24729 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * {ext,lib,test}/**/*.rb: removed trailing spaces.nobu2009-03-063-3/+3
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22784 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Removed json/runner.rb with permission from florian frank. it was serving no ↵ryan2008-12-151-25/+0
| | | | | | purpose git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20769 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * test/json/test_json.rb: remove dependency on permutation gem.mame2008-10-261-21/+13
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19950 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * test: assert_raises has been deprecated since a long time ago.nobu2008-09-246-49/+49
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19536 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Added changes needed for miniunit. usually from using internal calls that ↵ryan2008-09-231-1/+0
| | | | | | aren't needed anymore. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19504 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json: import JSON v 1.1.3.naruse2008-09-207-36/+104
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19436 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/rexml/doctype.rb, test/rss/test_maker_itunes.rb: replacenaruse2008-01-262-0/+2
| | | | | | | | | multi-byte string. * test/json/{test_json.rb, test_json_unicode.rb}: add magic comment. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15249 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * changed constant name: Struct::MyStruct -> Struct::MyJsonStructnahi2007-12-241-1/+1
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14608 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * test/json/test_json_addition.rb (test_core): do not use Time.nowshugo2007-12-211-1/+1
| | | | | | | because JSON can't hold nsec. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14437 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/json.rb, lib/json/add/{core.rb, rails.rb},naruse2007-11-301-0/+113
| | | | | | | | | | | | | | | test/json/test_json_rails.rb: additional files of JSON 1.1.2. [ruby-dev:32405] -- M lib/json.rb A lib/json/add A lib/json/add/core.rb A lib/json/add/rails.rb A test/json/test_json_rails.rb git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14051 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json, lib/json, test/json: Update to JSON 1.1.2.naruse2007-11-286-8/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | (RubyForge#15447) * math.c: fix typo. -- M ChangeLog M math.c M ext/json/ext/generator/generator.c M ext/json/ext/parser/parser.rl M ext/json/ext/parser/parser.c M lib/json/version.rb M lib/json/editor.rb M lib/json/common.rb M lib/json/pure/parser.rb M test/json/test_json_unicode.rb M test/json/test_json_fixtures.rb M test/json/test_json_generate.rb M test/json/test_json_addition.rb M test/json/test_json.rb M test/json/runner.rb git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14044 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/json/common.rb: Ponder offering parse\! method.naruse2007-06-062-7/+9
| | | | | | | | | | * lib/json/editor.rb: be a bit more robust while loading data. * ext/json/ext/{generator,parser}/extconf.rb: add a have_header directive for st.h * test/json: fix some tests. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12456 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json, lib/json, test/json: set properties.nobu2007-06-062-0/+0
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12446 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/json.rb, lib/json, ext/json, test/json:naruse2007-06-0437-0/+636
import JSON library. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12428 b2dd03c8-39d4-4d8f-98ff-823fe69b080e