multi_json 1.9.2 → 1.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43f5709d1510f214433839f07ec267a8b90e1078
-  data.tar.gz: e26ae12730dcc51982e0d8afd3d8aa50c2c5550e
+  metadata.gz: 7c2a387cf1082722ed68ed290ba53909de8fa882
+  data.tar.gz: d06db47576a3cb2801b12af6d15fbd227facc800
 SHA512:
-  metadata.gz: 322d6e7444d708c5e18045383d8ab12cc7730a4aea6a352bdf0bc40f5d57c437d62119bc290b064b90af438fe1e7852d1e167307bd786b863da9877416a13d46
-  data.tar.gz: 357ba441d1ec3e0a4290f0a7b6e11209fda0f8705d3b7d06ec800187ae26988778f452367bb0f36320b7fa826b49bb8cc895156fb81651bd7fc2cd38eb377041
+  metadata.gz: dab04d4d5f9f3bcda964d379a9d9fee49cd09b2a72cf5ecf67d3f1be339f12e4a54c8fae1269b07437d4be0b87f93c8ef3719bd74b2096fb75a9db69d3ecd6a5
+  data.tar.gz: 723e745ecc160b1ae47ea0e35b79d0833b8c65549b787c8f3e2b2e9ae26055239a2d0cac18b1b3a637cdf5b7778d99ed0ee91f116e55156e1c304146b7558110

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+1.9.3
+-----
+* [Convert indent option to Fixnum before passing to Oj](https://github.com/intridea/multi_json/commit/826fc5535b863b74fc9f981dfdda3e26f1ee4e5b)
+
 1.9.2
 -----
 * [Enable use_to_json option for Oj adapter by default](https://github.com/intridea/multi_json/commit/76a4aaf697b10bbabd5d535d83cf1149efcfe5c7)

data/Gemfile

@@ -23,7 +23,7 @@ platforms :jruby do
 end
 
 platforms :mingw, :mswin, :ruby do
-  gem 'oj', '~> 2.0', :require => nil
+  gem 'oj', '~> 2.8', :require => nil
   gem 'yajl-ruby', '~> 1.0', :require => nil
 end
 

data/lib/multi_json/adapters/oj.rb

@@ -17,6 +17,7 @@ module MultiJson
 
       def dump(object, options={})
         options.merge!(:indent => 2) if options[:pretty]
+        options[:indent] = options[:indent].to_i if options[:indent]
         ::Oj.dump(object, options)
       end
     end

data/lib/multi_json/version.rb

@@ -2,7 +2,7 @@ module MultiJson
   class Version
     MAJOR = 1 unless defined? MultiJson::Version::MAJOR
     MINOR = 9 unless defined? MultiJson::Version::MINOR
-    PATCH = 2 unless defined? MultiJson::Version::PATCH
+    PATCH = 3 unless defined? MultiJson::Version::PATCH
     PRE = nil unless defined? MultiJson::Version::PRE
 
     class << self

data/spec/gson_adapter_spec.rb

@@ -7,4 +7,4 @@ require 'multi_json/adapters/gson'
 
 describe MultiJson::Adapters::Gson do
   it_behaves_like 'an adapter', described_class
-end
+end

data/spec/oj_adapter_spec.rb

@@ -7,4 +7,14 @@ require 'multi_json/adapters/oj'
 
 describe MultiJson::Adapters::Oj do
   it_behaves_like 'an adapter', described_class
-end
+
+  describe '.dump' do
+    describe '#dump_options' do
+      around{ |example| with_default_options(&example) }
+
+      it 'ensures indent is a Fixnum' do
+        expect{ MultiJson.dump(42, :indent => '')}.not_to raise_error
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -79,3 +79,11 @@ def get_exception(exception_class = StandardError)
     exception
   end
 end
+
+def with_default_options
+  adapter = MultiJson.adapter
+  adapter.load_options = adapter.dump_options = MultiJson.load_options = MultiJson.dump_options = nil
+  yield
+ensure
+  adapter.load_options = adapter.dump_options = MultiJson.load_options = MultiJson.dump_options = nil
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi_json
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.9.3
 platform: ruby
 authors:
 - Michael Bleigh
@@ -33,7 +33,7 @@ cert_chain:
   7BTxdlSpJZDcAK29Ni3NRCRu6Air4wfDln0Ilzeuut6cJ4/j2/RlvsccVSRaEfOa
   wM7GTK5SEdU3qelyBdc4+RRs6uU=
   -----END CERTIFICATE-----
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2014-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler