summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | 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
| * | | | Move options from #generate and #parse to common areaBurdetteLamar2020-06-302-177/+181
| | | | |
* | | | | Bump version to 2.3.1v2.3.1Hiroshi SHIBATA2020-07-013-2/+24
| | | | |
* | | | | Merge pull request #387 from keithrbennett/add-load-file-methodsHiroshi SHIBATA2020-07-012-0/+66
|\ \ \ \ \ | | | | | | | | | | | | Add `load_file` and `load_file!` methods, with tests. Fixes issue #386.
| * | | | | Add `load_file` and `load_file!` methods, with tests. Fixes issue #386.Keith Bennett2020-06-302-0/+66
|/ / / / /
* | | | | Merge pull request #429 from flori/remove-generate-task-for-gemspecHiroshi SHIBATA2020-06-302-49/+2
|\ \ \ \ \ | | | | | | | | | | | | Remove generate task for gemspec
| * | | | | Removed gemspec task from default task on Rakefileremove-generate-task-for-gemspecHiroshi SHIBATA2020-06-301-1/+1
| | | | | |
| * | | | | Use VERSION file instead of hard-coded valueHiroshi SHIBATA2020-06-301-1/+1
| | | | | |
| * | | | | Removed explicitly date field in gemspec, it will assign by rubygems.orgHiroshi SHIBATA2020-06-301-1/+0
| | | | | |
| * | | | | Removed task for json_pure.gemspecHiroshi SHIBATA2020-06-302-46/+0
| | | | | |
* | | | | | Merge pull request #426 from marcandre/indentHiroshi SHIBATA2020-06-301-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Trivial whitespace fix
| * | | | | | Fix alignmentMarc-Andre Lafortune2020-06-301-1/+1
| | | | | | |
* | | | | | | Merge pull request #428 from marcandre/change_fixHiroshi SHIBATA2020-06-301-1/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Make changes more precise [#424]
| * | | | | | | Make changes more precise [#424]Marc-Andre Lafortune2020-06-301-1/+4
|/ / / / / / /
* | | | | | | Merge pull request #424 from marcandre/update_changesHiroshi SHIBATA2020-06-301-0/+8
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Update Changes for 2.3.0 [Fixes #397]
| * | | | | | Update Changes for 2.3.0 [Fixes #397]Marc-Andre Lafortune2020-06-301-0/+8
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #423 from marcandre/typoHiroshi SHIBATA2020-06-301-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Small typo fix
| * | | | | Typo fixMarc-Andre Lafortune2020-06-301-1/+1
|/ / / / /
* | | | | Merge pull request #422 from BurdetteLamar/masterHiroshi SHIBATA2020-06-291-0/+12
|\ \ \ \ \ | | |/ / / | |/| | | Added :call-seq: to RDoc for some methods
| * | | | Added :call-seq: to RDOc for some methodsBurdetteLamar2020-06-281-0/+12
|/ / / /
* | | | Merge pull request #413 from BurdetteLamar/masterHiroshi SHIBATA2020-06-282-154/+691
|\ \ \ \ | |/ / / |/| | | Rdoc enhancements
| * | | RDoc enhancementsBurdetteLamar2020-06-251-17/+1
| | | |
| * | | RDoc enhancementsBurdetteLamar2020-06-252-22/+22
| | | |
| * | | RDoc enhancementsBurdetteLamar2020-06-252-28/+3
| | | |
| * | | Rdoc enhancementsBurdetteLamar2020-05-062-154/+732
| | | |
* | | | Merge pull request #420 from marcandre/performance_345Hiroshi SHIBATA2020-06-262-67/+69
|\ \ \ \ | |_|/ / |/| | | Use frozen string for hash key
| * | | Use frozen string for hash keyWatson2020-06-252-67/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When use non-frozen string for hash key with `rb_hash_aset()`, it will duplicate and freeze it internally. To avoid duplicate and freeze, this patch will give a frozen string in `rb_hash_aset()`. ``` Warming up -------------------------------------- json 14.000 i/100ms Calculating ------------------------------------- json 148.844 (± 1.3%) i/s - 756.000 in 5.079969s ``` ``` Warming up -------------------------------------- json 16.000 i/100ms Calculating ------------------------------------- json 165.608 (± 1.8%) i/s - 832.000 in 5.025367s ``` ``` require 'json' require 'securerandom' require 'benchmark/ips' obj = [] 1000.times do |i| obj << { "id": i, "uuid": SecureRandom.uuid, "created_at": Time.now } end json = obj.to_json Benchmark.ips do |x| x.report "json" do |iter| count = 0 while count < iter JSON.parse(json) count += 1 end end end ```
* | | | Merge pull request #418 from nobu/sync-rubyHiroshi SHIBATA2020-06-253-4/+5
|\ \ \ \ | | | | | | | | | | Sync ruby
| * | | | Removed nonsense `rubygems_version` in input gemspec filesNobuyoshi Nakada2020-06-251-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As it is ignored and set at building packages automatically, it is just nonsense to set in gemspec file for input. ruby/ruby@9a78e24f7d269c9688a0fa50c82751b5ec8d512a