json_builder 3.1.2 → 3.1.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    json_builder (3.1.2)
+    json_builder (3.1.3)
       activesupport (>= 2.0.0)
 
 GEM
@@ -11,7 +11,7 @@ GEM
       i18n (~> 0.6)
       multi_json (~> 1.0)
     i18n (0.6.0)
-    multi_json (1.1.0)
+    multi_json (1.3.5)
     rake (0.9.2.2)
     tzinfo (0.3.31)
 

data/lib/json_builder/extensions.rb

@@ -13,6 +13,16 @@ class TrueClass
 end
 
 class String
+  JS_ESCAPE_MAP = {
+    '\\'    => '\\\\',
+    '</'    => '<\/',
+    "\r\n"  => '\n',
+    "\n"    => '\n',
+    "\r"    => '\n',
+    '"'     => '\\"',
+    "'"     => "\\'"
+  }
+
   def to_builder
     %("#{json_escape}")
   end
@@ -20,10 +30,9 @@ class String
   private
 
   def json_escape
-    self.gsub(/\n/, '\\n').
-         gsub(/\r/, '\\r').
-         gsub(/\t/, '\\t').
-         gsub(/\f/, '\\f')
+    gsub(/(\\|<\/|\r\n|\342\200\250|\342\200\251|[\n\r"'])/u) { |match|
+      JS_ESCAPE_MAP[match]
+    }
   end
 end
 

data/lib/json_builder/version.rb

@@ -1,3 +1,3 @@
 module JSONBuilder
-  VERSION = '3.1.2'
+  VERSION = '3.1.3'
 end

data/test/member_test.rb

@@ -39,6 +39,10 @@ class TestMember < Test::Unit::TestCase
     assert_equal '"hello": "olleh"', member('hello', Dozer.new('hello')).to_s
   end
 
+  def test_double_quoted_value
+    assert_equal '"hello": "\"Hello\" he said"', member('hello', '"Hello" he said').to_s
+  end
+
   def test_without_key
     assert_raises(JSONBuilder::MissingKeyError) { member(nil, true).to_s }
   end

data/test/value_test.rb

@@ -64,4 +64,8 @@ class TestValue < Test::Unit::TestCase
   def test_custom_class
     assert_equal '"olleh"', value(Dozer.new('hello'))
   end
+
+  def test_double_quoted_value
+    assert_equal '"\"hello\""', value('"hello"')
+  end
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: json_builder
 version: !ruby/object:Gem::Version 
-  hash: 7
   prerelease: 
-  segments: 
-  - 3
-  - 1
-  - 2
-  version: 3.1.2
+  version: 3.1.3
 platform: ruby
 authors: 
 - Garrett Bjerkhoel
@@ -15,38 +10,30 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-04 00:00:00 Z
+date: 2012-05-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  name: activesupport
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
         version: 2.0.0
-  version_requirements: *id001
-  name: activesupport
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: tzinfo
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  version_requirements: *id002
-  name: tzinfo
   type: :development
+  prerelease: false
+  version_requirements: *id002
 description: Rails provides an excellent XML Builder by default to build RSS and ATOM feeds, but nothing to help you build complex and custom JSON data structures. The standard to_json works well, but can get very verbose when you need full control of what is generated. JSON Builder hopes to solve that problem.
 email: 
 - me@garrettbjerkhoel.com
@@ -93,7 +80,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 4467735550645950409
       segments: 
       - 0
       version: "0"
@@ -102,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 4467735550645950409
       segments: 
       - 0
       version: "0"