oj 2.14.1 → 2.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e5d3a7192d7fefd4923450eb9ca27fa3e480f53
-  data.tar.gz: 96278a7d936f76e660b8ae89ccfe25550cd75a77
+  metadata.gz: 5ba2532677f201c509765f805bcbcf1cbdddcac7
+  data.tar.gz: 56fc6f4ccc428ac6f07a3453fba0fbd9f0ee6509
 SHA512:
-  metadata.gz: b457b1f450686bc06d0e196bdf3e683fc16a835d8dd790b22592fce7cc1e911b42f61258c16aab45cb49a7c38496ffe3dc3b54a6dc320861032166e8690a98ec
-  data.tar.gz: 937af1a3a9270efe743e0a475510f4ca6f64d87ba04cdc1cd94ea5b0590b50e95f2eff8adf5e453cc04640ae99bfac5cbb7144546675623d0d727603f5e7653a
+  metadata.gz: 80690fabb4c159ef4bafebe48843da2f7e6de4e5236545163472575fe555458e2e57a78e4d823c64ae9a1f37d34f4b6af8bc33b106d73243600b2d8a92c143b4
+  data.tar.gz: c17262ab7020f38281534b821f7541d9a5b1cc3b193ac0ed404f0f241819907a9631dc96b248720ffb944b1c2b6ac6e38893801b4e176b8fa67e4ff4f82030ab

data/README.md

@@ -159,6 +159,10 @@ Oj.default_options = {:mode => :compat }
 
 ## Releases
 
+**Release 2.14.2**
+
+ - Non-UTF-8 string input is now converted to UTF-8.
+
 **Release 2.14.1**
 
  - Fixed bug that reverted to BigDecimal when a decimal had preceeding zeros

data/ext/oj/parse.c

@@ -771,8 +771,16 @@ protect_parse(VALUE pip) {
     return Qnil;
 }
 
+extern int oj_utf8_index;
 void
 oj_pi_set_input_str(ParseInfo pi, volatile VALUE input) {
+#if HAS_ENCODING_SUPPORT
+    rb_encoding	*enc = rb_to_encoding(rb_obj_encoding(input));
+
+    if (rb_utf8_encoding() != enc) {
+	input = rb_str_conv_enc(input, enc, rb_utf8_encoding());
+    }
+#endif
     pi->json = rb_string_value_ptr((VALUE*)&input);
     pi->end = pi->json + RSTRING_LEN(input);
 }

data/lib/oj/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.14.1
+  version: 2.14.2
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-15 00:00:00.000000000 Z
+date: 2015-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler