diff options
| author | Florian Frank <flori@ping.de> | 2012-05-09 23:57:51 +0200 |
|---|---|---|
| committer | Florian Frank <flori@ping.de> | 2012-05-09 23:57:51 +0200 |
| commit | 23ef680a3d43ed02d343611150d638d542c0190b (patch) | |
| tree | d06d5d402059bd05ec7e76cd479e9ba4856941e5 | |
| parent | 6d9a1d8caaf70b6a6c6878b66cff661f32c8355a (diff) | |
| download | json-23ef680a3d43ed02d343611150d638d542c0190b.tar.gz | |
force jruby encoding after generation
| -rw-r--r-- | java/src/json/ext/GeneratorState.java | 4 | ||||
| -rw-r--r-- | json.gemspec | 2 | ||||
| -rw-r--r-- | json_pure.gemspec | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/java/src/json/ext/GeneratorState.java b/java/src/json/ext/GeneratorState.java index 65ee984..0584959 100644 --- a/java/src/json/ext/GeneratorState.java +++ b/java/src/json/ext/GeneratorState.java @@ -212,6 +212,10 @@ public class GeneratorState extends RubyObject { throw Utils.newException(context, Utils.M_GENERATOR_ERROR, "only generation of JSON objects or arrays allowed"); } + RuntimeInfo info = RuntimeInfo.forRuntime(context.getRuntime()); + if (info.encodingsSupported()) { + result.force_encoding(context, info.utf8.get()); + } return result; } diff --git a/json.gemspec b/json.gemspec index 1987d46..d351e5c 100644 --- a/json.gemspec +++ b/json.gemspec @@ -6,7 +6,7 @@ Gem::Specification.new do |s| s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Florian Frank"] - s.date = "2012-05-07" + s.date = "2012-05-09" s.description = "This is a JSON implementation as a Ruby extension in C." s.email = "flori@ping.de" s.extensions = ["ext/json/ext/parser/extconf.rb", "ext/json/ext/generator/extconf.rb"] diff --git a/json_pure.gemspec b/json_pure.gemspec index 15ec7de..e0bc321 100644 --- a/json_pure.gemspec +++ b/json_pure.gemspec @@ -6,7 +6,7 @@ Gem::Specification.new do |s| s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Florian Frank"] - s.date = "2012-05-07" + s.date = "2012-05-09" s.description = "This is a JSON implementation in pure Ruby." s.email = "flori@ping.de" s.extra_rdoc_files = ["README.rdoc"] |