summaryrefslogtreecommitdiff
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Clean up code a bitFlorian Frank2012-02-112-19/+21
| | | | This should fix #117
* Support duck typed ruby array in JRuby as wellFlorian Frank2011-12-201-1/+29
|
* Support object class with duck type hashFlorian Frank2011-12-201-1/+24
|
* Small fix: JSON.load('') # => nilFlorian Frank2011-12-011-0/+1
|
* Merge branch 'extract-fbuffer'Florian Frank2011-11-231-30/+44
|\
| * Extract fbuffer and use it in parser and generatorFlorian Frank2011-11-231-6/+6
| |
| * start to make buffer_initial_length configurableFlorian Frank2011-11-091-0/+2
| |
| * start to make buffer_initial_length configurableFlorian Frank2011-11-091-30/+42
| |
* | Merge branch 'master' of https://github.com/jpartlow/json into jpartlow-masterFlorian Frank2011-11-221-1/+1
|\ \
| * | Fix for Time.json_create ensures == Time instances for roundtrip through ↵Josh Partlow2011-11-181-1/+1
| |/ | | | | | | JSON serialization in Ruby 1.9.2.
* | Make JSON.dump and JSON.load support Rails betterFlorian Frank2011-11-222-1/+16
| |
* | Add support for OpenStructFlorian Frank2011-11-211-0/+8
|/
* Add testcase for a possible crash with bignumFlorian Frank2011-11-091-0/+20
|
* always raise type error when parsing nilFlorian Frank2011-11-031-0/+2
|
* Add support for BigDecimal numbersFlorian Frank2011-10-021-0/+6
|
* Move rational and complex additions in own filesFlorian Frank2011-08-301-1/+3
| | | | | | | | | 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.
* Apply patch by Eric Wong <nocode@yhbt.net>Florian Frank2011-08-291-0/+13
| | | | See https://github.com/flori/json/issues/46
* Merge branch 'quirks-mode'Florian Frank2011-08-292-1/+57
|\
| * Merge branch 'quirks-mode-parser' into quirks-modeFlorian Frank2011-07-311-0/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 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-311-0/+36
| | | | | | | | | | | | This allows parsing of primitive values
| * | Merge branch 'quirks-mode-parser' into quirks-modeFlorian Frank2011-07-271-0/+30
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: json.gemspec json_pure.gemspec
| | * | Implement quirks_modeFlorian Frank2011-07-271-0/+30
| | |/ | | | | | | | | | This allows parsing of primitive values
| * | started quirks mode for generatorFlorian Frank2011-07-271-1/+21
| |/
* | Add (de-)serialisation methods f. Complex/RationalFlorian Frank2011-08-251-0/+5
|/
* remove trailing spaces.Nobuyoshi Nakada2011-07-082-2/+2
|
* should not modify argumentNobuyoshi Nakada2011-07-081-0/+6
| | | | | * ext/json/ext/parser/parser.h (FORCE_UTF8): should not modify encoding of the argument.
* re-initialize testNobuyoshi Nakada2011-07-081-2/+4
| | | | * tests/test_json.rb (test_allocate): add re-initialize test.
* * ext/json/ext/parser/parser.h (GET_PARSER): raise TypeError.nobu2011-07-071-0/+7
| | | | | | * 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
* Skip test which fails on some platformsFlorian Frank2011-05-121-1/+1
|
* Fix duplicate testFlorian Frank2011-05-121-39/+19
|
* Don't optimize calls for ducktypesFlorian Frank2011-05-121-0/+29
|
* Merge pull request #63 from vakuum/issue-60Florian Frank2011-05-111-0/+1
|\ | | | | flori/json#60: Incorrect pretty-print indentation
| * flori/json#60: Incorrect pretty-print indentationClemens Fuchslocher2011-02-261-0/+1
| |
* | If a custom :object_class is given, the C extension should not use ↵Jon Leighton2011-04-011-2/+12
|/ | | | rb_hash_aset - it should call the object's []= method instead.
* renamed :match argument to :match_stringv1.5.0Florian Frank2011-01-051-3/+3
|
* Rubinius' strscan already has a @match ivarFlorian Frank2011-01-021-1/+1
|
* fixed test setupFlorian Frank2011-01-028-35/+18
|
* Added matching in pure/ext parserFlorian Frank2011-01-022-0/+53
|
* obsoleted json/add/rails definitionsFlorian Frank2011-01-021-144/+0
|
* use JSON.iconv abstractionFlorian Frank2011-01-021-3/+8
|
* never use iconvShota Fukumori (sora_h)2011-01-021-7/+8
|
* started to build jruby extension with RakefileFlorian Frank2010-09-233-2/+4
|
* prepare new versionFlorian Frank2010-08-182-6/+6
| | | | | fixed some warnings wrote some rake tasks to build jruby extension
* keep track of depth correctlyFlorian Frank2010-08-181-3/+0
|
* do not forget to dup the stateFlorian Frank2010-08-071-0/+17
| | | | use state for depth checking in pure as well
* added missing methods to State + testsFlorian Frank2010-08-071-0/+45
|
* Revert "use method dispatch for generation again"Florian Frank2010-08-051-6/+39
| | | | | | | | This reverts commit 59eab2b7ad1b44dc424fb3fffa5520947f7360f3. Conflicts: ext/json/ext/generator/generator.c
* Revert "use method dispatch for generation again"Florian Frank2010-08-051-29/+7
| | | | This reverts commit f0a14faf1d59a5ea86a79d3a5780e8433bfc9e16.
* use method dispatch for generation againFlorian Frank2010-08-031-7/+29
|
* Merge branch 'master' of github.com:/flori/jsonFlorian Frank2010-05-051-6/+6
|\
View Lorry Controller Status