summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Security fix create_additons problem 1.5.5v1.5.5fix-additions-problem-v1.5.5Florian Frank2013-02-1016-73/+124
|
* Add some documentationv1.5.4Florian Frank2011-08-3110-35/+58
|
* Move rational and complex additions in own filesFlorian Frank2011-08-305-39/+48
| | | | | | | | | Also do not require Ruby's complex.rb and rational.rb if the top level constants are already defined. This means Ruby 1.9 implementations are extendend, but Ruby 1.8 implementations will require rational/complex before they are extended. Having rational and complex additions in their own files is an especially good thing, if one wants to avoid loading complex and rational under Ruby 1.8.
* We don't need RB_GC_GUARD for rbx.Florian Frank2011-08-301-0/+5
|
* Apply patch by Eric Wong <nocode@yhbt.net>Florian Frank2011-08-293-5/+26
| | | | See https://github.com/flori/json/issues/46
* Merge branch 'quirks-mode'Florian Frank2011-08-2921-436/+1223
|\
| * Merge branch 'quirks-mode-parser' into quirks-modeFlorian Frank2011-07-316-162/+486
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: java/src/json/ext/Parser.java java/src/json/ext/Parser.rl json.gemspec json_pure.gemspec tests/test_json.rb
| | * Implement quirks_modeFlorian Frank2011-07-3110-375/+1059
| | | | | | | | | | | | This allows parsing of primitive values
| * | Merge branch 'quirks-mode-parser' into quirks-modeFlorian Frank2011-07-277-262/+622
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: json.gemspec json_pure.gemspec
| | * | Implement quirks_modeFlorian Frank2011-07-277-266/+605
| | |/ | | | | | | | | | This allows parsing of primitive values
| * | started quirks mode for generatorFlorian Frank2011-07-2716-104/+207
| |/
* | Merge pull request #89 from drbrain/masterFlorian Frank2011-08-272-36/+36
|\ \ | | | | | | Fix typos and grammar mistakes. Patch by Luke Gruber. [Ruby 1.9 - Bug #5203]
| * | Fix typos and grammar mistakes. Patch by Luke Gruber. [Ruby 1.9 - Bug 35203]Eric Hodel2011-08-262-36/+36
|/ /
* | Merge pull request #88 from michaelklishin/patch-1Florian Frank2011-08-251-0/+1
|\ \ | | | | | | travis-ci.org provides 1.9.3[-preview1]
| * | travis-ci.org provides 1.9.3[-preview1]Michael Klishin2011-08-261-0/+1
|/ /
* | sdoc requires rdoc from >= 1.8.7 nowFlorian Frank2011-08-251-1/+0
| |
* | Try to include RbConfig if it existsFlorian Frank2011-08-251-2/+7
| |
* | Add (de-)serialisation methods f. Complex/RationalFlorian Frank2011-08-252-2/+45
|/
* delete after having been obsoletedFlorian Frank2011-07-251-8/+0
|
* Oh, look loading the extension is much easier nowFlorian Frank2011-07-243-21/+8
|
* Merge branch 'master' of https://github.com/nobu/json into developmentFlorian Frank2011-07-0813-50/+52
|\ | | | | | | | | Conflicts: ext/json/ext/parser/parser.c
| * remove trailing spaces.Nobuyoshi Nakada2011-07-0810-42/+43
| |
| * Duplicate the argument of convert_encoding() only.Nobuyoshi Nakada2011-07-082-1/+2
| |
| * Adjust indent.Nobuyoshi Nakada2011-07-081-2/+2
| |
| * should not modify argumentNobuyoshi Nakada2011-07-082-1/+7
| | | | | | | | | | * ext/json/ext/parser/parser.h (FORCE_UTF8): should not modify encoding of the argument.
| * no force_encodingNobuyoshi Nakada2011-07-082-35/+15
| | | | | | | | | | * ext/json/ext/parser/parser.rl (JSON_parse_string): no needs to use force_encoding.
| * re-initialize testNobuyoshi Nakada2011-07-081-2/+4
| | | | | | | | * tests/test_json.rb (test_allocate): add re-initialize test.
| * remove trailing spaces.Nobuyoshi Nakada2011-07-081-0/+2
| | | | | | | | * Rakefile (EXT_PARSER_SRC): remove trailing spaces.
* | Ported fixes from fix_memory_leak into Parser.rlFlorian Frank2011-07-082-85/+107
| | | | | | | | | | Ported semantic of the desired behaviour in ruby-core:35079 to java as well.
* | use default rake targetFlorian Frank2011-07-081-1/+1
| |
* | should not modify argumentNobuyoshi Nakada2011-07-082-1/+7
| | | | | | | | | | * ext/json/ext/parser/parser.h (FORCE_UTF8): should not modify encoding of the argument.
* | no force_encodingNobuyoshi Nakada2011-07-082-35/+15
| | | | | | | | | | * ext/json/ext/parser/parser.rl (JSON_parse_string): no needs to use force_encoding.
* | re-initialize testNobuyoshi Nakada2011-07-081-2/+4
| | | | | | | | * tests/test_json.rb (test_allocate): add re-initialize test.
* | remove trailing spaces.Nobuyoshi Nakada2011-07-081-0/+2
|/ | | | * Rakefile (EXT_PARSER_SRC): remove trailing spaces.
* * remove trailing spaces.nobu2011-07-073-114/+114
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31573 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/json/common.rb (JSON::MissingUnicodeSupport.iconv): should not drop ↵nobu2011-07-071-1/+1
| | | | | | 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/ext/parser/parser.h (GET_PARSER): raise TypeError.nobu2011-07-074-3/+10
| | | | | | * ext/json/ext/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/ext/parser/parser.h (GET_PARSER): check if initialized. ↵nobu2011-07-073-7/+20
| | | | | | | | [ruby-core:35079] * ext/json/ext/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/ext/parser/parser.rl: add local variables for emacs.nobu2011-07-072-18/+32
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30790 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/ext/generator/generator.{c,h} (fbuffer_free_only_buffer): unused.nobu2011-07-071-1/+0
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30346 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/json/generator/ext/generator.c (fbuffer_free): unused.nobu2011-07-071-5/+0
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30338 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Appy patch by Laurent Arnoud <laurent@spkdev.net>Florian Frank2011-07-043-40/+14
| | | | Use Spruz::GO.go for options parsing
* Merge branch 'max_nesting_for_prettify_json' of https://github.com/spk/json ↵Florian Frank2011-07-041-9/+12
|\ | | | | | | into development
| * bin/prettify_json.rb: Set max_nesting and create_additions to false like ↵Laurent Arnoud2010-10-091-9/+12
| | | | | | | | | | | | | | | | edit_json it refers to http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=561839 Signed-off-by: Laurent Arnoud <laurent@spkdev.net>
* | Add rake as development dependencyFlorian Frank2011-07-043-2/+6
| |
* | Bump up version to 1.5.4Florian Frank2011-07-048-13/+30
| |
* | Merge branch 'fix_memory_leak' of https://github.com/bigfix/json into ↵Florian Frank2011-07-049-46/+51
|\ \ | | | | | | | | | development
| * | Fix memory leak when used from multiple JRuby runtimes.John Firebaugh2011-05-189-46/+51
| | |
* | | Make default rake target testFlorian Frank2011-07-041-1/+2
| | |
* | | new orderv1.5.3Florian Frank2011-06-202-2/+2
| | |
View Lorry Controller Status