oj 1.4.6 → 1.4.7

data/README.md

@@ -32,11 +32,9 @@ A fast JSON parser and Object marshaller as a Ruby gem.
 
 ## <a name="release">Release Notes</a>
 
-### Release 1.4.6
+### Release 1.4.7
 
- - Silently ignores BOM on files and Strings.
-
- - Now works with JRuby 1.7.0 to the extent possible with the unsupported C extension in JRuby.
+ - In compat mode non-String keys are converted to Strings instead of raising and error. (issue #52)
 
 ## <a name="description">Description</a>
 

data/ext/oj/dump.c

@@ -760,7 +760,8 @@ hash_cb_compat(VALUE key, VALUE value, Out out) {
 	dump_sym_comp(key, out);
 	break;
     default:
-	rb_raise(rb_eTypeError, "In :compat mode all Hash keys must be Strings or Symbols, not %s.\n", rb_class2name(rb_obj_class(key)));
+	/*rb_raise(rb_eTypeError, "In :compat mode all Hash keys must be Strings or Symbols, not %s.\n", rb_class2name(rb_obj_class(key)));*/
+	dump_str_comp(rb_funcall(key, oj_to_s_id, 0), out);
 	break;
     }
     if (0 == out->opts->dump_opts) {

data/lib/oj/version.rb

@@ -1,5 +1,5 @@
 
 module Oj
   # Current version of the module. 
-  VERSION = '1.4.6'
+  VERSION = '1.4.7'
 end

data/test/tests.rb

@@ -374,13 +374,9 @@ class Juice < ::Test::Unit::TestCase
     end
   end
   def test_non_str_hash_compat
-    begin
-      Oj.dump({ 1 => true, 0 => false }, :mode => :compat)
-      assert(false)
-    rescue Exception => e
-      assert(e.message.include?('Fixnum'))
-      assert(true)
-    end
+    json = Oj.dump({ 1 => true, 0 => false }, :mode => :compat)
+    h = Oj.load(json, :mode => :strict)
+    assert_equal({ "1" => true, "0" => false }, h)
   end
   def test_non_str_hash_object
     Oj.default_options = { :mode => :object }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.4.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-03 00:00:00.000000000 Z
+date: 2012-12-09 00:00:00.000000000 Z
 dependencies: []
 description: ! 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com