Merge pull request #145 from oriolgual/patch-1

[Fix] Oj expects indent as a Fixnum
intridea · Apr 14, 2014 · 676ae6c · 676ae6c
2 parents 3b62e64 + b3db833
commit 676ae6c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/lib/multi_json/adapters/oj.rb b/lib/multi_json/adapters/oj.rb
@@ -17,6 +17,7 @@ def load(string, options={})
 
       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

diff --git a/spec/oj_adapter_spec.rb b/spec/oj_adapter_spec.rb
@@ -7,4 +7,16 @@
 
 describe MultiJson::Adapters::Oj do
   it_behaves_like 'an adapter', described_class
+
+  describe '.dump' do
+    describe '#dump_options' do
+      before{ MultiJson.use :oj }
+      before{ MultiJson.dump_options = MultiJson.adapter.dump_options = {} }
+      after{ MultiJson.dump_options = MultiJson.adapter.dump_options = {} }
+
+      it 'ensures indent is a Fixnum' do
+        expect { MultiJson.dump(42, :indent => '')}.not_to raise_error
+      end
+    end
+  end
 end