summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* Small fix: JSON.load('') # => nilFlorian Frank2011-12-017-7/+12
|
* Create new gemspecsv1.6.2Florian Frank2011-11-282-4/+4
|
* Move fbuffer in its own directoryFlorian Frank2011-11-284-3/+3
|
* Add change to CHANGESFlorian Frank2011-11-281-0/+3
|
* Merge branch 'extract-fbuffer'Florian Frank2011-11-2313-305/+408
|\
| * support buffer length settingsFlorian Frank2011-11-231-0/+21
| |
| * avoid symlinkFlorian Frank2011-11-235-4/+3
| |
| * Extract fbuffer and use it in parser and generatorFlorian Frank2011-11-239-253/+271
| |
| * change documentationFlorian Frank2011-11-102-3/+5
| |
| * Merge branch 'configurable-initial-buffer-length' of ↵Florian Frank2011-11-101-0/+20
| |\ | | | | | | | | | gate.dyna.ping.de:/git/json into configurable-initial-buffer-length
| | * start to make buffer_initial_length configurableFlorian Frank2011-11-091-0/+2
| | |
| | * start to make buffer_initial_length configurableFlorian Frank2011-11-098-65/+126
| | |
| * | start to make buffer_initial_length configurableFlorian Frank2011-11-098-65/+128
| | |
* | | Use git ls-files to determine package filesFlorian Frank2011-11-233-6/+5
| | |
* | | Change the CHANGESFlorian Frank2011-11-221-0/+2
| | |
* | | Merge branch 'master' of https://github.com/jpartlow/json into jpartlow-masterFlorian Frank2011-11-222-3/+3
|\ \ \
| * | | Fix for Time.json_create ensures == Time instances for roundtrip through ↵Josh Partlow2011-11-182-3/+3
| | |/ | |/| | | | | | | JSON serialization in Ruby 1.9.2.
* | | Make JSON.dump and JSON.load support Rails betterFlorian Frank2011-11-224-5/+56
| | |
* | | Prepare new version 1.6.2Florian Frank2011-11-225-6/+9
| | |
* | | Add support for OpenStructFlorian Frank2011-11-217-29/+84
|/ /
* | Add testcase for a possible crash with bignumFlorian Frank2011-11-091-0/+20
|/
* probe for read before calling itFlorian Frank2011-11-031-1/+1
|
* always raise type error when parsing nilFlorian Frank2011-11-034-19/+28
|
* Add support for BigDecimal numbersFlorian Frank2011-10-023-3/+27
|
* Merge pull request #91 from nobu/masterFlorian Frank2011-10-010-0/+0
|\ | | | | HAVE_RUBY_RE_H and HAVE_RUBY_RE_H are defined in ruby.h by default.
| * HAVE_RUBY_RE_H and HAVE_RUBY_RE_H are defined in ruby.h by default.Nobuyoshi Nakada2011-09-034-15/+3
| |
* | Merge pull request #92 from nurse/U0456Florian Frank2011-10-011-1/+1
|\ \ | | | | | | Fix typo: U+0456->U+0069.
| * | Fix typo: U+0456->U+0069.NARUSE, Yui2011-09-051-1/+1
| | |
* | | HAVE_RUBY_RE_H and HAVE_RUBY_RE_H are defined in ruby.h by default.Nobuyoshi Nakada2011-10-014-15/+3
| | |
* | | Prepare new release 1.6.1v1.6.1Florian Frank2011-09-185-33/+35
| | |
* | | Fix Rakefile to build JRuby bits using -target 1.5, for Java 1.5 and higher.Charles Oliver Nutter2011-09-141-1/+1
| | |
* | | Extract utils out of this library into json-utilsv1.6.0Florian Frank2011-09-1322-3337/+97
| | |
* | | Hint on encoding in commentFlorian Frank2011-09-121-0/+1
| | |
* | | Split all implementations into single filesFlorian Frank2011-09-129-241/+273
|/ / | | | | | | | | This way it's easier to create one's own serialisations by picking just the desired ones and mixing them with one's own implementations.
* | Test ruby 1.8.6Florian Frank2011-09-031-0/+1
|/
* 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
| |