[DRE-commits] [ruby-oj] 01/06: Merge tag 'upstream/2.12.5'

[Cédric Boutillier]

This is an automated email from the git hooks/post-receive script.

boutil pushed a commit to branch master
in repository ruby-oj.

commit 3ab804819a08301db8ca7fd92016e5fbbba44185
Merge: 6c14f5c 4499269
Author: Cédric Boutillier <boutil at debian.org>
Date:   Fri May 1 14:33:49 2015 +0200

    Merge tag 'upstream/2.12.5'
    
    Upstream version 2.12.5
    
    # gpg: Signature faite le ven. 01 mai 2015 14:33:44 CEST avec la clef RSA d'identifiant 39CD217A
    # gpg: Bonne signature de « Cédric Boutillier <boutil at debian.org> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at upmc.fr> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at polytechnique.org> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at gmail.com> »

 LICENSE                                  |  40 ++---
 README.md                                |  54 ++-----
 ext/oj/compat.c                          |  33 ++++
 ext/oj/dump.c                            | 264 +++++++++++++++++++++++++------
 ext/oj/extconf.rb                        |   1 +
 ext/oj/fast.c                            | 209 +++++++++++-------------
 ext/oj/object.c                          | 225 ++++++++++++++++++++++++--
 ext/oj/odd.c                             |  41 ++++-
 ext/oj/odd.h                             |   3 +
 ext/oj/oj.c                              | 135 +++++++++++++---
 ext/oj/oj.h                              |  22 ++-
 ext/oj/parse.c                           |   9 +-
 ext/oj/parse.h                           |   1 +
 ext/oj/reader.c                          |   2 +-
 ext/oj/saj.c                             |   4 +-
 ext/oj/sparse.c                          |   8 +-
 lib/oj/active_support_helper.rb          |  17 ++
 lib/oj/saj.rb                            |   8 +-
 lib/oj/version.rb                        |   2 +-
 metadata.yml                             |  16 +-
 test/_test_active.rb                     |  76 +++++++++
 test/_test_active_mimic.rb               |  96 +++++++++++
 test/_test_mimic_rails.rb                |  87 +++++++++-
 test/bug3.rb                             |  46 ++++++
 test/bug_fast.rb                         |  32 ++++
 test/bug_load.rb                         |  24 +++
 test/example.rb                          |  11 ++
 test/isolated/shared.rb                  |  36 ++++-
 test/isolated/test_mimic_rails_after.rb  |   5 +-
 test/isolated/test_mimic_rails_before.rb |   1 +
 test/test_compat.rb                      |  62 ++++++++
 test/test_fast.rb                        |  32 +++-
 test/test_file.rb                        |  17 +-
 test/test_object.rb                      | 244 ++++++++++++++++++++++++----
 test/test_scp.rb                         |  78 +++++++++
 test/test_serializer.rb                  |  59 +++++++
 test/test_various.rb                     | 166 ++++++++++++-------
 37 files changed, 1761 insertions(+), 405 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-oj.git