Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Specify JSON module interfacerfc-7159-json | Florian Frank | 2015-06-15 | 1 | -2/+1 |
| | |||||
* | Disallow usage of symbolize_names and create_additions | Florian Frank | 2015-06-15 | 2 | -4/+5 |
| | |||||
* | Refactor tests and make pure parser green | Florian Frank | 2015-06-15 | 16 | -759/+779 |
| | |||||
* | Remove generate restriction for […]/{…} | Florian Frank | 2015-06-13 | 1 | -9/+3 |
| | |||||
* | Remove dependency on permutation | Florian Frank | 2015-06-13 | 1 | -14/+0 |
| | | | | Ruby can do this by now on her own. | ||||
* | Move common setup into test_helper.rb | Florian Frank | 2015-06-13 | 9 | -16/+18 |
| | |||||
* | Make generator format test backwards compatible | Michael Mac-Vicar | 2015-01-09 | 1 | -1/+1 |
| | |||||
* | Add test for format options used by the generator | Michael Mac-Vicar | 2015-01-09 | 1 | -0/+13 |
| | | | | | The space_before, space, indent, object_nl and array_nl options of the space were not covered. | ||||
* | Merge branch 'master' into zzak-ruby-2.2 | Florian Frank | 2015-01-02 | 1 | -0/+6 |
|\ | |||||
| * | Don't mutate JSON.dump_default_options from dump | Jason R. Clark | 2015-01-02 | 1 | -0/+6 |
| | | | | | | | | | | | | | | The use of Hash#update from the JSON.dump method was mutating the dump_default_options hash on any call to dump with a limit provided. An individual method call with an overriding value shouldn't update the defaults in this way. | ||||
* | | Only use gc stress assert if available | Zachary Scott | 2014-12-25 | 1 | -9/+11 |
| | | |||||
* | | Sync tests with trunk | Zachary Scott | 2014-12-25 | 2 | -15/+11 |
| | | |||||
* | | This value has changed somehow | Zachary Scott | 2014-12-25 | 1 | -1/+1 |
| | | |||||
* | | Don't mutate JSON.dump_default_options from dump | Jason R. Clark | 2014-09-19 | 1 | -0/+6 |
|/ | | | | | | | The use of Hash#update from the JSON.dump method was mutating the dump_default_options hash on any call to dump with a limit provided. An individual method call with an overriding value shouldn't update the defaults in this way. | ||||
* | forgot about 1.8 again | Florian Frank | 2013-05-13 | 1 | -1/+1 |
| | |||||
* | complete testing | Florian Frank | 2013-05-13 | 1 | -2/+7 |
| | |||||
* | resolved | Florian Frank | 2013-05-13 | 1 | -0/+10 |
| | |||||
* | Add test and implement pure versiong | Florian Frank | 2013-02-22 | 1 | -0/+6 |
| | |||||
* | Try to convert first with to_hash, then to_h | Florian Frank | 2013-02-21 | 1 | -0/+16 |
| | | | | | | | | rb_convert_type doesn't return if conversion fails, so use rb_check_convert_type and the raise vi rb_convert_type. Make sure, that this behaviour is consisten across all generator implementations. Fixes https://github.com/flori/json/issues/162 | ||||
* | Security fix create_additons/JSON::GenericObjectv1.7.7 | Florian Frank | 2013-02-11 | 4 | -38/+65 |
| | |||||
* | fix a bug in the JRuby implementation. getInstanceVariable() can return a ↵ | John Shahid | 2013-02-04 | 1 | -0/+1 |
| | | | | null which causes NPE. | ||||
* | Increase hash likeness of State objects | Florian Frank | 2012-12-31 | 7 | -24/+32 |
| | |||||
* | Use len for return values | Florian Frank | 2012-11-29 | 1 | -0/+16 |
|\ | |||||
| * | add tests to test the behavior of State::configure (and its alias State::merge). | John Shahid | 2012-11-23 | 1 | -0/+16 |
| | | |||||
* | | add merge alias for configure in jruby | Florian Frank | 2012-11-29 | 1 | -0/+24 |
|/ | |||||
* | Increase default max_nesting to 100 | Erik Michaels-Ober | 2012-10-05 | 3 | -15/+15 |
| | | | | See discussion at https://github.com/intridea/multi_json/pull/59. | ||||
* | Renamed method and handle arraysjson-generic-from_hashes | Florian Frank | 2012-10-02 | 1 | -2/+6 |
| | |||||
* | Add JSON::GenericObject.from_hashes | Florian Frank | 2012-10-02 | 1 | -0/+7 |
| | | | | This method transforms hashes of hashes into GenericObject structures. | ||||
* | Use correct end of string anchors | Florian Frank | 2012-07-25 | 2 | -4/+4 |
| | |||||
* | Add JSON::GenericObject | Florian Frank | 2012-04-28 | 2 | -4/+39 |
| | |||||
* | Throw exception unless source is a string | Florian Frank | 2012-04-27 | 1 | -0/+2 |
| | |||||
* | Rename test names according to file | Florian Frank | 2012-04-27 | 7 | -10/+10 |
| | |||||
* | Add implementation for a light object | Florian Frank | 2012-04-27 | 1 | -0/+10 |
| | |||||
* | Clean up code a bit | Florian Frank | 2012-02-11 | 2 | -19/+21 |
| | | | | This should fix #117 | ||||
* | Support duck typed ruby array in JRuby as well | Florian Frank | 2011-12-20 | 1 | -1/+29 |
| | |||||
* | Support object class with duck type hash | Florian Frank | 2011-12-20 | 1 | -1/+24 |
| | |||||
* | Small fix: JSON.load('') # => nil | Florian Frank | 2011-12-01 | 1 | -0/+1 |
| | |||||
* | Merge branch 'extract-fbuffer' | Florian Frank | 2011-11-23 | 1 | -30/+44 |
|\ | |||||
| * | Extract fbuffer and use it in parser and generator | Florian Frank | 2011-11-23 | 1 | -6/+6 |
| | | |||||
| * | start to make buffer_initial_length configurable | Florian Frank | 2011-11-09 | 1 | -0/+2 |
| | | |||||
| * | start to make buffer_initial_length configurable | Florian Frank | 2011-11-09 | 1 | -30/+42 |
| | | |||||
* | | Merge branch 'master' of https://github.com/jpartlow/json into jpartlow-master | Florian Frank | 2011-11-22 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fix for Time.json_create ensures == Time instances for roundtrip through ↵ | Josh Partlow | 2011-11-18 | 1 | -1/+1 |
| |/ | | | | | | | JSON serialization in Ruby 1.9.2. | ||||
* | | Make JSON.dump and JSON.load support Rails better | Florian Frank | 2011-11-22 | 2 | -1/+16 |
| | | |||||
* | | Add support for OpenStruct | Florian Frank | 2011-11-21 | 1 | -0/+8 |
|/ | |||||
* | Add testcase for a possible crash with bignum | Florian Frank | 2011-11-09 | 1 | -0/+20 |
| | |||||
* | always raise type error when parsing nil | Florian Frank | 2011-11-03 | 1 | -0/+2 |
| | |||||
* | Add support for BigDecimal numbers | Florian Frank | 2011-10-02 | 1 | -0/+6 |
| | |||||
* | Move rational and complex additions in own files | Florian Frank | 2011-08-30 | 1 | -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 Frank | 2011-08-29 | 1 | -0/+13 |
| | | | | See https://github.com/flori/json/issues/46 |