multi_json 1.6.0 → 1.6.1

data/CHANGELOG.md

@@ -1,9 +1,14 @@
+1.6.1
+-----
+* [Revert "Use JSON.generate instead of #to_json"](https://github.com/intridea/multi_json/issues/86)
+
 1.6.0
 -----
 * [Add gson.rb support](https://github.com/intridea/multi_json/pull/71)
 * [Add MultiJson.default_options](https://github.com/intridea/multi_json/pull/70)
 * [Add MultiJson.with_adapter](https://github.com/intridea/multi_json/pull/67)
 * [Stringify all possible keys for ok_json](https://github.com/intridea/multi_json/pull/66)
+* [Use JSON.generate instead of #to_json](https://github.com/intridea/multi_json/issues/73)
 * [Alias `MultiJson::DecodeError` to `MultiJson::LoadError`](https://github.com/intridea/multi_json/pull/79)
 
 1.5.1

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'rake', '>= 0.9'
 gem 'yard', '>= 0.8'

data/README.md

@@ -48,6 +48,7 @@ MultiJSON falls back to [OkJson][], a simple, vendorable JSON parser.
 * [JSON](https://github.com/flori/json) The default JSON gem with C-extensions (ships with Ruby 1.9)
 * [JSON Pure](https://github.com/flori/json) A Ruby variant of the JSON gem
 * [NSJSONSerialization](https://developer.apple.com/library/ios/#documentation/Foundation/Reference/NSJSONSerialization_Class/Reference/Reference.html) Wrapper for Apple's NSJSONSerialization in the Cocoa Framework (MacRuby only)
+* [gson.rb](https://github.com/avsej/gson.rb) A Ruby wrapper for google-gson library (JRuby only)
 * [OkJson][okjson] A simple, vendorable JSON parser
 
 ## Supported Ruby Versions

data/lib/multi_json/adapters/json_common.rb

@@ -7,7 +7,7 @@ module MultiJson
       end
 
       def dump(object, options={})
-        ::JSON.generate([object], process_dump_options!(options)).strip[1..-2]
+        object.to_json(process_dump_options!(options))
       end
 
     protected

data/lib/multi_json/version.rb

@@ -1,3 +1,3 @@
 module MultiJson
-  VERSION = "1.6.0" unless defined?(MultiJson::VERSION)
+  VERSION = "1.6.1" unless defined?(MultiJson::VERSION)
 end

data/spec/helper.rb

@@ -42,4 +42,4 @@ module MockModuleDecoder
   def dump(string)
     '{"abc":"def"}'
   end
-end
+end

data/spec/json_common_shared_example.rb

@@ -10,15 +10,17 @@ shared_examples_for 'JSON-like adapter' do |adapter|
   describe '.dump' do
     describe 'with :pretty option set to true' do
       it 'passes default pretty options' do
-        ::JSON.should_receive(:generate).with(['foo'], JSON::PRETTY_STATE_PROTOTYPE.to_h).and_return('["foo"]')
-        MultiJson.dump('foo', :pretty => true)
+        object = 'foo'
+        object.should_receive(:to_json).with(JSON::PRETTY_STATE_PROTOTYPE.to_h).and_return('["foo"]')
+        MultiJson.dump(object, :pretty => true)
       end
     end
 
     describe 'with :indent option' do
       it 'passes it on dump' do
-        ::JSON.should_receive(:generate).with(['foo'], {:indent => "\t"}).and_return('["foo"]')
-        MultiJson.dump('foo', :indent => "\t")
+        object = 'foo'
+        object.should_receive(:to_json).with(:indent => "\t").and_return('["foo"]')
+        MultiJson.dump(object, :indent => "\t")
       end
     end
   end
@@ -31,4 +33,4 @@ shared_examples_for 'JSON-like adapter' do |adapter|
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi_json
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -39,7 +39,7 @@ cert_chain:
   U0xxV3ZRUnNCbHlwSGZoczZKSnVMbHlaUEdoVTNSL3YKU2YzbFZLcEJDV2dS
   cEdUdnk0NVhWcEIrNTl5MzNQSm1FdVExUFRFT1l2UXlhbzlVS01BQWFBTi83
   cVdRdGpsMApobHc9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
-date: 2013-02-12 00:00:00.000000000 Z
+date: 2013-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler