Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | If a custom :object_class is given, the C extension should not use ↵ | Jon Leighton | 2011-05-11 | 3 | -72/+90 | |
| | | | | | | | | | | | | rb_hash_aset - it should call the object's []= method instead. | |||||
* | | | Adds development dependencies | Florian Frank | 2011-05-11 | 3 | -20/+44 | |
| | | | ||||||
* | | | Create gemspecs | Florian Frank | 2011-05-11 | 6 | -39/+84 | |
|/ / | | | | | | | Get rid of rake-compiler dependencies | |||||
* | | Support building of fat binary gemv1.5.1 | Florian Frank | 2011-01-26 | 5 | -6/+26 | |
| | | | | | | | | This should fix issue #51 on Windows | |||||
* | | renamed :match argument to :match_stringv1.5.0 | Florian Frank | 2011-01-05 | 7 | -35/+37 | |
| | | ||||||
* | | avoid object creation | Florian Frank | 2011-01-03 | 2 | -42/+38 | |
| | | ||||||
* | | Merge branch 'master' of gate.dyna.ping.de:/git/json | Florian Frank | 2011-01-03 | 0 | -0/+0 | |
|\ \ | |/ | | | | | | | Conflicts: Rakefile | |||||
| * | Merge branch 'integrate-jruby' | Florian Frank | 2010-10-05 | 6 | -983/+8 | |
| |\ | | | | | | | | | | | | | Conflicts: Rakefile | |||||
| | * | started to build jruby extension with Rakefile | Florian Frank | 2010-09-27 | 29 | -1177/+272 | |
| | | | ||||||
* | | | Merge branch 'string-matching' | Florian Frank | 2011-01-02 | 18 | -321/+505 | |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore Rakefile tests/test_json_encoding.rb | |||||
| * | | | Rubinius' strscan already has a @match ivar | Florian Frank | 2011-01-02 | 4 | -5/+7 | |
| | | | | ||||||
| * | | | query if ruby/st.h exists | Florian Frank | 2011-01-02 | 2 | -0/+5 | |
| | | | | ||||||
| * | | | fixed test setup | Florian Frank | 2011-01-02 | 9 | -52/+33 | |
| | | | | ||||||
| * | | | implement string matching for java parser | Florian Frank | 2011-01-02 | 6 | -300/+348 | |
| | | | | ||||||
| * | | | Added matching in pure/ext parser | Florian Frank | 2011-01-02 | 6 | -54/+202 | |
| | | | | ||||||
| * | | | stop ignore java project configs | Florian Frank | 2011-01-02 | 1 | -7/+0 | |
| | | | | ||||||
| * | | | make sure bytes is a 8-bit string on all rubies | Florian Frank | 2011-01-02 | 1 | -2/+7 | |
| | | | | ||||||
| * | | | Fix for ruby 1.9 const_defined? method | Florian Frank | 2011-01-02 | 5 | -8/+19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | ruby 1.9 breaks backwards compatibility by usіng the wrong default value for its newly introduced second argument. This patch implements a work around, to make this gem work on both ruby 1.8 and 1.9. | |||||
| * | | | obsoleted json/add/rails definitions | Florian Frank | 2011-01-02 | 2 | -198/+4 | |
| | | | | ||||||
| * | | | use JSON.iconv abstraction | Florian Frank | 2011-01-02 | 6 | -75/+25 | |
| | | | | ||||||
| * | | | speed up | Shota Fukumori (sora_h) | 2011-01-02 | 1 | -4/+6 | |
| | | | | ||||||
| * | | | never use iconv | Shota Fukumori (sora_h) | 2011-01-02 | 2 | -9/+14 | |
| | | | | ||||||
| * | | | build jruby extension with Rakefile | Florian Frank | 2011-01-02 | 6 | -983/+8 | |
| |/ / | ||||||
* | | | stop ignore java project configs | Florian Frank | 2011-01-01 | 1 | -7/+0 | |
| | | | ||||||
* | | | make sure bytes is a 8-bit string on all rubies | Florian Frank | 2011-01-01 | 1 | -2/+7 | |
| | | | ||||||
* | | | Fix for ruby 1.9 const_defined? method | Florian Frank | 2011-01-01 | 5 | -8/+19 | |
| | | | | | | | | | | | | | | | | | | ruby 1.9 breaks backwards compatibility by usіng the wrong default value for its newly introduced second argument. This patch implements a work around, to make this gem work on both ruby 1.8 and 1.9. | |||||
* | | | obsoleted json/add/rails definitions | Florian Frank | 2011-01-01 | 2 | -198/+4 | |
| | | | ||||||
* | | | use JSON.iconv abstraction | Florian Frank | 2011-01-01 | 6 | -75/+25 | |
| | | | ||||||
* | | | speed up | Shota Fukumori (sora_h) | 2011-01-01 | 1 | -4/+6 | |
| | | | ||||||
* | | | never use iconv | Shota Fukumori (sora_h) | 2011-01-01 | 2 | -9/+14 | |
| | | | ||||||
* | | | started to build jruby extension with Rakefile | Florian Frank | 2011-01-01 | 6 | -983/+8 | |
|/ / | ||||||
* | | started to build jruby extension with Rakefile | Florian Frank | 2010-09-23 | 24 | -198/+268 | |
|/ | ||||||
* | silenced "already initialized constant" warnings | Florian Frank | 2010-09-17 | 3 | -2/+5 | |
| | ||||||
* | use long instead of int | Florian Frank | 2010-09-17 | 2 | -27/+27 | |
| | ||||||
* | better debugging message | Florian Frank | 2010-08-20 | 2 | -2/+3 | |
| | ||||||
* | Merge branch 'master' of gate.dyna.ping.de:/git/json | Florian Frank | 2010-08-18 | 0 | -0/+0 | |
|\ | | | | | | | | | | | | | Conflicts: CHANGES VERSION lib/json/version.rb | |||||
| * | prepare new versionv1.4.6 | Florian Frank | 2010-08-09 | 3 | -2/+6 | |
| | | ||||||
| * | keep track of depth correctly | Florian Frank | 2010-08-08 | 2 | -5/+2 | |
| | | ||||||
* | | prepare new version | Florian Frank | 2010-08-18 | 14 | -60/+210 | |
| | | | | | | | | | | fixed some warnings wrote some rake tasks to build jruby extension | |||||
* | | optimisation and deleted some redundant semicolons | Florian Frank | 2010-08-18 | 2 | -9/+8 | |
| | | ||||||
* | | prepare new version | Florian Frank | 2010-08-18 | 3 | -2/+6 | |
| | | ||||||
* | | Java: keep track of depth correctly | Daniel Luz | 2010-08-18 | 1 | -0/+1 | |
| | | ||||||
* | | keep track of depth correctly | Florian Frank | 2010-08-18 | 2 | -5/+2 | |
| | | ||||||
* | | Java: do not forget to dup the state | Daniel Luz | 2010-08-09 | 1 | -1/+1 | |
| | | ||||||
* | | Merge branch 'master' (early part) into unified | Daniel Luz | 2010-08-09 | 3 | -77/+77 | |
|\ \ | |/ | ||||||
| * | Merge branch 'master' of gate.dyna.ping.de:/git/json | Florian Frank | 2010-08-07 | 0 | -0/+0 | |
| |\ | | | | | | | | | | | | | Conflicts: tests/test_json_generate.rb | |||||
| | * | do not forget to dup the state | Florian Frank | 2010-08-07 | 2 | -2/+11 | |
| | | | ||||||
| * | | do not forget to dup the state | Florian Frank | 2010-08-07 | 3 | -77/+77 | |
| |/ | | | | | | | use state for depth checking in pure as well | |||||
* | | Merge remote branch 'mernen/master' | Charles Oliver Nutter | 2010-08-07 | 4 | -83/+110 | |
|\ \ | ||||||
| * | | Java: made the OptionsReader instantiation less silly | Daniel Luz | 2010-08-07 | 2 | -14/+9 | |
| | | |