summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Bump version to 2.4.0v2.4.0Hiroshi SHIBATA2020-12-151-1/+1
|
* SortedSet was removed at a3db08d7b6ff119223f77e3df00b4f6deac971e2Hiroshi SHIBATA2020-12-151-4/+0
|
* Merge pull request #450 from flori/backport-ruby-coreHiroshi SHIBATA2020-11-136-26/+10
|\ | | | | Backport ruby core
| * Drop to support Ruby 2.0backport-ruby-coreHiroshi SHIBATA2020-11-131-1/+0
| |
| * t/json/json_common_interface_test.rb: fix wrong indentationYusuke Endoh2020-11-121-1/+1
| | | | | | | | | | | | | | | | to prevent: ``` test/json/json_common_interface_test.rb:182: warning: mismatched indentations at 'end' with 'def' at 169 ```
| * Remove unneeded `begin` and `end`Kazuhiro NISHIYAMA2020-11-121-6/+4
| |
| * Fix `Leaked tempfile`sKazuhiro NISHIYAMA2020-11-121-15/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://rubyci.s3.amazonaws.com/debian10/ruby-master/log/20200930T033004Z.diff.html.gz ``` [n/n] JSONCommonInterfaceTest#test_load = <elapsed> s [n/n] JSONCommonInterfaceTest#test_load_file = <elapsed> s +Leaked tempfile: JSONCommonInterfaceTest#test_load_file: #<Tempfile:<build-dir>/tmp/20200930-7601-ptnv6i (closed)> [n/n] JSONCommonInterfaceTest#test_load_file! = <elapsed> s +Leaked tempfile: JSONCommonInterfaceTest#test_load_file!: #<Tempfile:<build-dir>/tmp/20200930-7601-1la6m9 (closed)> [n/n] JSONCommonInterfaceTest#test_load_file_with_option = <elapsed> s +Leaked tempfile: JSONCommonInterfaceTest#test_load_file_with_option: #<Tempfile:<build-dir>/tmp/20200930-7601-blf9hz (closed)> [n/n] JSONCommonInterfaceTest#test_load_file_with_option! = <elapsed> s +Leaked tempfile: JSONCommonInterfaceTest#test_load_file_with_option!: #<Tempfile:<build-dir>/tmp/20200930-7601-b5gsdb (closed)> ```
| * Extract assert assertion to assert_include and assert_not_include.Hiroshi SHIBATA2020-11-121-1/+2
| |
| * assert_true is not provided by test-unitHiroshi SHIBATA2020-11-121-1/+1
| |
| * Remove unnecessary executable bit [ci skip]Kazuhiro NISHIYAMA2020-11-121-0/+0
| |
| * test/json/json_parser_test.rb: suppress warningsYusuke Endoh2020-11-121-2/+2
| | | | | | | | | | | | | | | | http://rubyci.s3.amazonaws.com/ubuntu/ruby-master/log/20201021T123003Z.log.html.gz ``` /home/chkbuild/chkbuild/tmp/build/20201021T123003Z/ruby/test/json/json_parser_test.rb:227: warning: ambiguous first argument; put parentheses or a space even after `-' operator /home/chkbuild/chkbuild/tmp/build/20201021T123003Z/ruby/test/json/json_parser_test.rb:228: warning: ambiguous first argument; put parentheses or a space even after `-' operator ```
| * strip trailing spaces [ci skip]Nobuyoshi Nakada2020-11-121-1/+1
| |
| * Complex and Rational is embedded classes nowHiroshi SHIBATA2020-11-122-2/+0
|/
* Merge pull request #447 from Shopify/global-freeze-optionHiroshi SHIBATA2020-10-209-120/+260
|\ | | | | Implement a freeze: parser option
| * Implement a freeze: parser optionJean Boussier2020-09-159-120/+260
| | | | | | | | | | | | | | If set to true all parsed objects will be immediately frozen, and strings will be deduplicated if the Ruby implementation allows it.
* | Merge pull request #449 from chrisseaton/pretty-emptyHiroshi SHIBATA2020-10-203-7/+14
|\ \ | | | | | | Fix an issue with generate_pretty and empty objects in the Ruby and Java implementations
| * | Fix an issue with generate_pretty and empty objects in the Ruby and Java ↵Chris Seaton2020-10-073-7/+14
|/ / | | | | | | implementations
* | Merge pull request #448 from Shopify/fix-load-file-docHiroshi SHIBATA2020-09-101-3/+3
|\ \ | |/ |/| Fix JSON.load_file doc
| * Fix JSON.load_file docJean Boussier2020-09-091-3/+3
|/
* Merge pull request #446 from BurdetteLamar/rdocHiroshi SHIBATA2020-08-251-17/+7
|\ | | | | Partial compliance with doc/method_documentation.rdoc
| * Partial compliance with doc/method_documentation.rdocBurdetteLamar2020-08-201-17/+7
|/
* Merge pull request #425 from marcandre/fix_pure_parserHiroshi SHIBATA2020-08-145-2/+10
|\ | | | | Fix pure parser with unclosed arrays / objects [Fix #314]
| * Fix pure parser with unclosed arrays / objects [Fix #314]Marc-Andre Lafortune2020-06-305-2/+10
| |
* | Enhanced RDoc for JSON.dump (#443)Burdette Lamar2020-08-141-11/+23
| | | | | | * Enhanced RDoc for JSON.dump
* | Merge pull request #444 from jfeltesse-mdsol/fix/licenseHiroshi SHIBATA2020-08-142-2/+2
|\ \ | | | | | | bundle the LICENSE file in the gem
| * | bundle the LICENSE file in the gemJulien Feltesse2020-08-142-2/+2
|/ /
* | Merge pull request #405 from Shopify/escape-slash-2.3.0NARUSE, Yui2020-07-319-17/+129
|\ \ | | | | | | Add an option to escape forward slash character
| * | Add an option to escape forward slash characterJean Boussier2020-07-049-17/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit 26d181059989279a79c433cedcd893b4f52e42ee Author: Francois Chagnon <francois.chagnon@jadedpixel.com> Date: Tue Sep 15 21:17:34 2015 +0000 add config options for escape_slash commit fa282334051b16df91ca097dd7304b46f3bc7719 Author: Francois Chagnon <francois.chagnon@jadedpixel.com> Date: Mon Feb 9 21:09:33 2015 +0000 add forward slash to escape character
* | | Merge pull request #442 from BurdetteLamar/rdocHiroshi SHIBATA2020-07-311-1/+1
|\ \ \ | | | | | | | | Nodoc for recurse_proc
| * | | Nodoc for recurse_procBurdetteLamar2020-07-291-1/+1
|/ / /
* | | Merge pull request #439 from BurdetteLamar/masterHiroshi SHIBATA2020-07-291-18/+58
|\ \ \ | | | | | | | | RDoc for JSON.load with proc
| * | | RDoc for JSON.load with procBurdetteLamar2020-07-281-18/+58
| | | |
* | | | Merge pull request #436 from kares/green-ciHiroshi SHIBATA2020-07-082-4/+1
|\ \ \ \ | | | | | | | | | | [test] properly 'skip' test on JRuby
| * | | | [test] properly 'skip' test on JRubyKarol Bucek2020-07-072-4/+1
|/ / / / | | | | | | | | | | | | | | | | an early return still caused ensure to execute, setting JSON constant to `nil` for later tests!
* | | | Merge pull request #435 from kares/jruby-syncHiroshi SHIBATA2020-07-063-49/+32
|\ \ \ \ | |/ / / |/| | | unify json-java gemspec with the baseline
| * | | [refactor] drop old JRuby 1.7 compat codeKarol Bucek2020-07-061-24/+5
| | | |
| * | | unify json-java gemspec with the baselineKarol Bucek2020-07-062-25/+27
|/ / /
* | | Merge pull request #434 from BurdetteLamar/masterHiroshi SHIBATA2020-07-052-14/+88
|\ \ \ | | | | | | | | RDoc example for JSON.load
| * | | RDoc example for JSON.loadBurdetteLamar2020-07-042-14/+88
|/ / /
* | | Merge pull request #385 from nobu/bug/non-utf8Hiroshi SHIBATA2020-07-040-0/+0
|\ \ \ | | | | | | | | Fixed unexpected illegal/malformed utf-8 error
| * | | Fixed unexpected illegal/malformed utf-8 errorNobuyoshi Nakada2019-10-142-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | flori/json@c34d01ff6a18dac04a90b2e0f820cdb1d5c7e1b2 does not consider US-ASCII compatible but non-UTF-8 encodings, and causes an error in RDoc tests.
* | | | Merge pull request #372 from kares/jruby-ciHiroshi SHIBATA2020-07-041-4/+4
|\ \ \ \ | | | | | | | | | | [CI] setup supported JRubies to test against
| * | | | [CI] setup supported JRubies to test againstkares2020-06-251-4/+4
| | | | |
* | | | | Merge pull request #433 from BurdetteLamar/masterHiroshi SHIBATA2020-07-041-9/+40
|\ \ \ \ \ | |_|_|/ / |/| | | | Enhance RDoc for JSON.parse
| * | | | Enhance RDoc for JSON.parseBurdetteLamar2020-07-031-9/+40
| | | | |
* | | | | Merge pull request #432 from mame/prevent-warning-during-testHiroshi SHIBATA2020-07-031-0/+3
|\ \ \ \ \ | | | | | | | | | | | | test/json/json_fixtures_test.rb: Prevent an "out of range" warning
| * | | | | test/json/json_fixtures_test.rb: Prevent an "out of range" warningYusuke Endoh2020-07-031-0/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with `make test-all RUBYOPT=-w` ``` /home/mame/work/ruby/.ext/common/json/common.rb:263: warning: Float 23456789012E666 out of range ```
* | | | | Merge pull request #431 from mame/avoid-relative-path-in-load-pathHiroshi SHIBATA2020-07-031-3/+3
|\ \ \ \ \ | |/ / / / |/| | | | Do not add a relative path to $LOAD_PATH
| * | | | Do not add a relative path to $LOAD_PATHYusuke Endoh2020-07-031-3/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... because it conflicts with test/ruby/test_m17n.rb. An exception `incompatible character encodings: UTF-8 and UTF-16BE` occurs when: * a non-existence relative path is added to $LOAD_PATH, * ASCII-incompatible encoding is set to default_external, and * some file is loaded. ``` $LOAD_PATH << "no_existing_dir" Encoding.default_external = Encoding::UTF_16BE load "dummy.rb" #=> incompatible character encodings: UTF-8 and UTF-16BE ``` This issue can be actually observed by a combination of out-of-place build and the following command: make test-all TESTS="json ruby/m17n -n test_object_inspect_external" http://ci.rvm.jp/logfiles/brlog.trunk-test-random.20200322-221411 ASCII-incompatible default external encoding assumes that the cwd is the encoding, and it is attempted to beconcatenated with a non-existence relative LOAD_PATH UTF-8 string, which causes the exception. This changeset avoids a relative path.
* | | | Merge pull request #430 from BurdetteLamar/masterHiroshi SHIBATA2020-07-022-177/+181
|\ \ \ \ | | | | | | | | | | Move options from #generate and #parse to common area
View Lorry Controller Status