scout_apm 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f5e033e72a264b660c2a76d6f188ddd641fa653
-  data.tar.gz: 359ed424119b0624dc0b87768c1e413924850dee
+  metadata.gz: ecdf92000eedbccd7433a68129281cd82847556c
+  data.tar.gz: e703b9dfa3aaf7f2a048ff31b9e6c66777dd3a35
 SHA512:
-  metadata.gz: 41ebbedfe2b1fad421c6db1e34f00710420fa774b152415a32941360011e458b8a07c3e0ad89f39257121960c21a49775a42fe2101f4af17b2fe27cb52e3092f
-  data.tar.gz: b155a159cf08da79680f228a53572bdc9b7359e460ceccb317cfb69b4635f715de6a540134b55f5529b0834749a71040cff3ebe999ca9b05421eec09c3bca3ba
+  metadata.gz: ceadce82ba6554b9217f5fc7d99b6f949db06d59c53f5728a48b23c6cba78a0ee068ad56cb04272879d35bd935fa1bf739fa93ed5618be96f57f3b3ebbf8aa3b
+  data.tar.gz: d75d311f1304aeecfa3b3be98ca3dc7874ba7d932c5a389f3b879f8d9dfca5b5ef782cc3bae5959d7d5ff0be7b461252046d19c33ce7943828d80e087f203ee1

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 1.4.1
+
+* Fix JSON encoding of special characters
+
 # 1.4.0
 
 * Release JSON reporting

data/lib/scout_apm/serializers/payload_serializer_to_json.rb

@@ -31,20 +31,18 @@ module ScoutApm
           "{#{str_parts.join(",")}}"
         end
 
+        ESCAPE_MAPPINGS = {
+          "\b" => '\\b',
+          "\t" => '\\t',
+          "\n" => '\\n',
+          "\f" => '\\f',
+          "\r" => '\\r',
+          '"'  => '\\"',
+          '\\' => '\\\\',
+        }
+
         def escape(string)
-          string = string.to_s
-          escapers = {
-            '\b' => '\\b',
-            '\t' => '\\t',
-            '\n' => '\\n',
-            '\f' => '\\f',
-            '\r' => '\\r',
-            '"'  => '\\"',
-            '\\' => '\\\\'
-          }
-          # TODO escape control chars
-          escapers.each {|bad, good| string = string.gsub(bad, good)}
-          string
+          ESCAPE_MAPPINGS.inject(string.to_s) {|s, (bad, good)| s.gsub(bad, good) }
         end
 
         def format_by_type(formatee)

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end
 

data/test/unit/serializers/payload_serializer_test.rb

@@ -116,7 +116,7 @@ class PayloadSerializerTest < Minitest::Test
   def test_serializes_slow_transactions_as_json
     slow_transaction_metrics = {
       ScoutApm::MetricMeta.new('ActiveRecord/all').tap { |meta|
-        meta.desc = "SELECT * from users where filter=?"
+        meta.desc = "SELECT *\nfrom users where filter=?"
         meta.extra = {:user => 'cooluser'}
         meta.metric_id = nil
         meta.scope = "Controller/apps/checkin"
@@ -163,7 +163,7 @@ class PayloadSerializerTest < Minitest::Test
             "key" => {
               "bucket" => "ActiveRecord",
               "name" => "all",
-              "desc" => "SELECT * from users where filter=?",
+              "desc" => "SELECT *\nfrom users where filter=?",
               "extra" => {
                 "user" => "cooluser",
               },
@@ -195,6 +195,7 @@ class PayloadSerializerTest < Minitest::Test
         ]
       }
     ]
+
     assert_equal formatted_slow_transactions, JSON.parse(payload)["slow_transactions"]
   end
 
@@ -212,4 +213,9 @@ class PayloadSerializerTest < Minitest::Test
     }
     assert_equal formatted_metadata, JSON.parse(payload)["metadata"]
   end
+
+  def test_escapes_newlines
+    json = { "foo" => "\bbar\nbaz\r" }
+    assert_equal json, JSON.parse(ScoutApm::Serializers::PayloadSerializerToJson.jsonify_hash(json))
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-16 00:00:00.000000000 Z
+date: 2016-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest