summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | ext/json/parser/prereq.mk: remove type-limit warning if char is unsignedYusuke Endoh2020-06-252-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ragel generates a code `0 <= (*p)` where `*p` is char. As char is unsigned by default on arm and RISC-V, it is warned by gcc: ``` compiling parser.c parser.c: In function ‘JSON_parse_string’: parser.c:1566:2: warning: comparison is always true due to limited range of data type [-Wtype-limits] if ( 0 <= (*p) && (*p) <= 31 ) ^ parser.c:1596:2: warning: comparison is always true due to limited range of data type [-Wtype-limits] if ( 0 <= (*p) && (*p) <= 31 ) ^ ``` This change removes the warning by substituting the condition with `0 <= (signed char)(*p)`. ruby/ruby@8bd27c547c3260ce72dc5edbab248bb858c84cf2
| * | | ext/json/parser/prereq.mk: Add a "automatically generated" headerYusuke Endoh2020-06-252-1/+2
|/ / / | | | | | | | | | | | | | | | | | | to parser.c. ruby/ruby@5717e55e9a7790c938afa694a9bf558c0e54bb83 ruby/ruby@70e3fda2eb45c841e5fb4574273d20f8df5455e5
* | | Merge pull request #415 from marcandre/cleanupHiroshi SHIBATA2020-06-254-19/+20
|\ \ \ | | | | | | | | Cleanup gemspec
| * | | Fix rake task descriptionMarc-Andre Lafortune2020-06-251-1/+1
| | | |
| * | | Accept test-unit v3.x tooMarc-Andre Lafortune2020-06-254-7/+7
| | | |
| * | | Update gemspec.Marc-Andre Lafortune2020-06-251-11/+9
| | | | | | | | | | | | | | | | This fixes required_ruby_version
| * | | Add comment that gemspec is generated automaticallyMarc-Andre Lafortune2020-06-251-1/+4
| |/ /
* | | Merge pull request #416 from marcandre/red_green_pleaseHiroshi SHIBATA2020-06-251-1/+6
|\ \ \ | | | | | | | | fixtures/ are not being tested...
| * | | Fix test that wasn't testing anythingMarc-Andre Lafortune2020-06-251-1/+6
| |/ /
* | | Merge pull request #371 from kares/jruby-baselineHiroshi SHIBATA2020-06-251-6/+5
|\ \ \ | |/ / |/| | baseline changes to help (JRuby) development
| * | [build] make test_xxx work standalone + avoid bundle execkares2019-01-121-6/+5
| | |
| * | [build] let's build with Java 1.6kares2019-01-121-1/+1
| | | | | | | | | | | | JRuby 1.7 was Java6+ compatible (9.2 is Java8+)
| * | [build] no need to clean on rake test_pure (similar to test_ext)kares2019-01-121-1/+1
| | |
* | | Merge pull request #191 from jkanywhere/spell-fixesHiroshi SHIBATA2020-06-252-2/+2
|\ \ \ | |_|/ |/| | Spelling and grammar fixes for comments.
| * | Spelling and grammar fixes for comments.Josh Kline2013-12-282-2/+2
| | |
* | | Merge pull request #402 from eregon/patch-1Hiroshi SHIBATA2020-03-191-0/+2
|\ \ \ | | | | | | | | Test with TruffleRuby in CI
| * | | Add truffleruby in allow_failures as requestedBenoit Daloze2020-03-191-0/+1
| | | |
| * | | Test with TruffleRuby in CIBenoit Daloze2020-01-161-0/+1
|/ / /
* | | Merge pull request #347 from zverok/enhance-docsSHIBATA Hiroshi2020-01-062-18/+61
|\ \ \ | | | | | | | | Enhance generic JSON and #generate docs
| * | | Fix examples syntaxzverok2019-12-291-2/+2
| | | |
| * | | Enchance generic JSON and #generate docszverok2019-12-292-18/+61
| | | |
* | | | Merge pull request #379 from noraj/patch-1SHIBATA Hiroshi2020-01-061-0/+8
|\ \ \ \ | |/ / / |/| | | add metadata for rubygems.org
| * | | add metadatanoraj2020-01-031-0/+8
|/ / /
View Lorry Controller Status