[DRE-commits] [ruby-multi-json] 01/07: Merge tag 'upstream/1.7.7'

[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-multi-json.

commit 8d445ee8eb7668ce3ea3d658dab1dd6a86e0e757
Merge: 6ef5f36 a9a2a7c
Author: Cédric Boutillier <boutil at debian.org>
Date:   Wed Jul 31 17:37:55 2013 +0200

    Merge tag 'upstream/1.7.7'
    
    Upstream version 1.7.7
    
    # gpg: Signature faite le mer. 31 juil. 2013 17:37:49 CEST avec la clef RSA d'identifiant 8F9F8F09
    # 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> »

 .rspec                                         |    1 +
 .travis.yml                                    |    3 +-
 .yardopts                                      |    6 +
 CHANGELOG.md                                   |  164 +++++++++++++++++
 CONTRIBUTING.md                                |   46 +++++
 Gemfile                                        |   28 ++-
 LICENSE.md                                     |    2 +-
 README.md                                      |  112 ++++++------
 Rakefile                                       |   12 +-
 checksums.yaml.gz                              |  Bin 0 -> 270 bytes
 checksums.yaml.gz.sig                          |    1 +
 data.tar.gz.sig                                |  Bin 0 -> 256 bytes
 lib/multi_json.rb                              |  226 ++++++++++++++----------
 lib/multi_json/adapter.rb                      |   48 +++++
 lib/multi_json/adapters/gson.rb                |   19 ++
 lib/multi_json/adapters/jr_jackson.rb          |   19 ++
 lib/multi_json/adapters/json_common.rb         |   26 +--
 lib/multi_json/adapters/json_gem.rb            |    3 +-
 lib/multi_json/adapters/json_pure.rb           |    3 +-
 lib/multi_json/adapters/nsjsonserialization.rb |    4 +-
 lib/multi_json/adapters/oj.rb                  |   16 +-
 lib/multi_json/adapters/ok_json.rb             |   40 +----
 lib/multi_json/adapters/yajl.rb                |    7 +-
 lib/multi_json/convertible_hash_keys.rb        |   43 +++++
 lib/multi_json/options.rb                      |   48 +++++
 lib/multi_json/vendor/okjson.rb                |  174 +++++++++---------
 lib/multi_json/version.rb                      |   19 +-
 metadata.gz.sig                                |    3 +
 metadata.yml                                   |  184 ++++++++-----------
 multi_json.gemspec                             |   40 ++---
 spec/adapter_shared_example.rb                 |  170 +++++++++++++++---
 spec/has_options.rb                            |   74 ++++++++
 spec/helper.rb                                 |   45 ++---
 spec/json_common_shared_example.rb             |   30 ++++
 spec/multi_json_spec.rb                        |  185 ++++++++++++++++---
 35 files changed, 1286 insertions(+), 515 deletions(-)

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