[DRE-commits] [ruby-multi-json] 02/05: Merge tag 'upstream/1.8.0'

[Jérémy Bobbio]

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

lunar pushed a commit to branch master
in repository ruby-multi-json.

commit 2498e609667b9a52388ac45b94c866ea0cbf930a
Merge: c08768b df5c8d9
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Wed Sep 25 17:22:52 2013 +0200

    Merge tag 'upstream/1.8.0'
    
    Upstream version 1.8.0

 CHANGELOG.md                                       |    5 +
 Gemfile                                            |    4 +-
 Rakefile                                           |   17 +-
 checksums.yaml.gz                                  |  Bin 270 -> 268 bytes
 checksums.yaml.gz.sig                              |  Bin 256 -> 256 bytes
 data.tar.gz.sig                                    |  Bin 256 -> 256 bytes
 lib/multi_json.rb                                  |   41 ++--
 lib/multi_json/adapter.rb                          |    7 +
 lib/multi_json/adapters/gson.rb                    |    2 +-
 lib/multi_json/adapters/json_gem.rb                |    2 +-
 lib/multi_json/adapters/json_pure.rb               |    2 +-
 lib/multi_json/adapters/oj.rb                      |    2 +-
 lib/multi_json/adapters/yajl.rb                    |    2 +-
 lib/multi_json/load_error.rb                       |   11 +
 lib/multi_json/vendor/okjson.rb                    |   18 +-
 lib/multi_json/version.rb                          |    4 +-
 metadata.gz.sig                                    |  Bin 256 -> 256 bytes
 metadata.yml                                       |   76 ++++---
 multi_json.gemspec                                 |    2 +-
 spec/gson_adapter_spec.rb                          |   10 +
 spec/has_options.rb                                |   74 -------
 spec/helper.rb                                     |   35 ---
 spec/jr_jackson_adapter_spec.rb                    |   10 +
 spec/json_gem_adapter_spec.rb                      |    9 +
 spec/json_pure_adapter_spec.rb                     |    9 +
 spec/multi_json_spec.rb                            |  230 +++++++++-----------
 spec/nsjsonserialization_adapter_spec.rb           |   10 +
 spec/oj_adapter_spec.rb                            |   10 +
 spec/ok_json_adapter_spec.rb                       |    7 +
 .../adapter.rb}                                    |   49 ++---
 .../json_common_adapter.rb}                        |    6 +-
 spec/shared/options.rb                             |  119 ++++++++++
 spec/spec_helper.rb                                |   73 +++++++
 spec/yajl_adapter_spec.rb                          |   10 +
 34 files changed, 525 insertions(+), 331 deletions(-)

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