yagni_json_encoder 0.0.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3461fb18bd4f2d2a69eaaeb655af5ad290fe3e60
-  data.tar.gz: 7b79546f667857112a48fa2b88b41d985d2cc73b
+  metadata.gz: fe7c535d50a8b685f002034847b2f24b7a7d6546
+  data.tar.gz: 2b27b43016e451fee668cfcffaf0ffc0ee84916b
 SHA512:
-  metadata.gz: 713ac3358afa5e9bb1bf2b4bda4e4265efc0bda80a549459623d804076295493eed8cf424cd86fb6b0b3f2beb471914e7e56178692ac10c940db99ef067e57e1
-  data.tar.gz: 311736b35fdac8db60fab3db9dc3f22a425e8e395a3662dd8f1bf4716542a62d89f4c3da24c85d071f02e2a91bafec6a770956bab82ce3240fdc1894393d236b
+  metadata.gz: f069f0c535e3b667eda181c617a43440d086d5c7582bbe8e9f13bc9c5461d040fae71e43f85ed06cb90afc53ddc42afea596143dfe9f26ca4d8418008bb97115
+  data.tar.gz: 8f13b2b270bc2b28208bbbea427c43fa251d52b4008572ed972b84a249f607a5c5d86188dcb7cd735fc7e28b4098897871efe367a8041ecf2d39930c05f85347

data/README.md

@@ -27,7 +27,7 @@ the heavy JSON encoding work.
 
 In a real Rails app, I benchmarked `Tips.all.to_json` with the different
 encoders. On average, YagniJsonEncoder is ~2x as fast. However, you could
-see bigger gains if you models are text-heavy.
+see bigger gains if your models are text/string-heavy.
 
 ```
 Calculating -------------------------------------

data/lib/activesupport/json_encoder.rb

@@ -1,10 +1,19 @@
-require 'yagni_json_encoder'
-
 module ActiveSupport
   self.json_encoder = YagniJsonEncoder
 
   def self.escape_html_entities_in_json=(*_args)
-    fail StandardError,
-         'escape_html_entities_in_json is not supported in YagniJsonEncoder'
+    raise StandardError,
+          'escape_html_entities_in_json is not supported in YagniJsonEncoder'
+  end
+
+  def self.parse_json_times
+    raise StandardError,
+          'ActiveSupport.parse_json_times not supported in YagniJsonEncoder'
+  end
+
+  module JSON
+    def self.decode(json)
+      YagniJsonEncoder::JSON.parse(json, quirks_mode: true)
+    end
   end
 end

data/lib/yagni_json_encoder.rb

@@ -1,6 +1,16 @@
+begin
+  require 'json'
+rescue StandardError
+  nil # ignore
+end
+
+require "active_support/json"
 require 'oj'
 
 class YagniJsonEncoder
+  Oj.default_options = { mode: :compat, after_sep: 0 }
+  JSON = Oj.mimic_JSON
+
   attr_reader :options
 
   def initialize(options = nil)
@@ -8,9 +18,9 @@ class YagniJsonEncoder
   end
 
   def encode(value)
-    Oj.dump value.as_json(options.dup),
-            mode: :compat,
-            quirks_mode: true
+    JSON.generate value.as_json(options.dup),
+                  quirks_mode: true,
+                  max_nesting: false
   end
 end
 

data/test/decoding_test.rb

@@ -0,0 +1,117 @@
+require 'yagni_json_encoder'
+require "test_helper"
+require "active_support/time"
+require "time_zone_test_helpers"
+
+class TestJSONDecoding < ActiveSupport::TestCase
+  include TimeZoneTestHelpers
+
+  class Foo
+    def self.json_create(object)
+      "Foo"
+    end
+  end
+
+  TESTS = {
+    %q({"returnTo":{"\/categories":"\/"}})        => { "returnTo" => { "/categories" => "/" } },
+    %q({"return\\"To\\":":{"\/categories":"\/"}}) => { "return\"To\":" => { "/categories" => "/" } },
+    %q({"returnTo":{"\/categories":1}}) => { "returnTo" => { "/categories" => 1 } },
+    %({"returnTo":[1,"a"]})                    => { "returnTo" => [1, "a"] },
+    %({"returnTo":[1,"\\"a\\",", "b"]})        => { "returnTo" => [1, "\"a\",", "b"] },
+    %({"a": "'", "b": "5,000"})                  => { "a" => "'", "b" => "5,000" },
+    %({"a": "a's, b's and c's", "b": "5,000"})   => { "a" => "a's, b's and c's", "b" => "5,000" },
+    # multibyte
+    %({"matzue": "松江", "asakusa": "浅草"}) => { "matzue" => "松江", "asakusa" => "浅草" },
+    %({"a": "2007-01-01"})                       => { "a" => Date.new(2007, 1, 1) },
+    %({"a": "2007-01-01 01:12:34 Z"})            => { "a" => Time.utc(2007, 1, 1, 1, 12, 34) },
+    %(["2007-01-01 01:12:34 Z"])                 => [Time.utc(2007, 1, 1, 1, 12, 34)],
+    %(["2007-01-01 01:12:34 Z", "2007-01-01 01:12:35 Z"]) => [Time.utc(2007, 1, 1, 1, 12, 34), Time.utc(2007, 1, 1, 1, 12, 35)],
+    # no time zone
+    %({"a": "2007-01-01 01:12:34"})              => { "a" => Time.new(2007, 1, 1, 1, 12, 34, "-05:00") },
+    # invalid date
+    %({"a": "1089-10-40"})                       => { "a" => "1089-10-40" },
+    # xmlschema date notation
+    %({"a": "2009-08-10T19:01:02"})              => { "a" => Time.new(2009, 8, 10, 19, 1, 2, "-04:00") },
+    %({"a": "2009-08-10T19:01:02Z"})             => { "a" => Time.utc(2009, 8, 10, 19, 1, 2) },
+    %({"a": "2009-08-10T19:01:02+02:00"})        => { "a" => Time.utc(2009, 8, 10, 17, 1, 2) },
+    %({"a": "2009-08-10T19:01:02-05:00"})        => { "a" => Time.utc(2009, 8, 11, 00, 1, 2) },
+    # needs to be *exact*
+    %({"a": " 2007-01-01 01:12:34 Z "})          => { "a" => " 2007-01-01 01:12:34 Z " },
+    %({"a": "2007-01-01 : it's your birthday"})  => { "a" => "2007-01-01 : it's your birthday" },
+    %([])    => [],
+    %({})    => {},
+    %({"a":1}) => { "a" => 1 },
+    %({"a": ""}) => { "a" => "" },
+    %({"a":"\\""}) => { "a" => "\"" },
+    %({"a": null})  => { "a" => nil },
+    %({"a": true})  => { "a" => true },
+    %({"a": false}) => { "a" => false },
+    '{"bad":"\\\\","trailing":""}' => { "bad" => "\\", "trailing" => "" },
+    %q({"a": "http:\/\/test.host\/posts\/1"}) => { "a" => "http://test.host/posts/1" },
+    %q({"a": "\u003cunicode\u0020escape\u003e"}) => { "a" => "<unicode escape>" },
+    '{"a": "\\\\u0020skip double backslashes"}' => { "a" => "\\u0020skip double backslashes" },
+    %q({"a": "\u003cbr /\u003e"}) => { "a" => "<br />" },
+    %q({"b":["\u003ci\u003e","\u003cb\u003e","\u003cu\u003e"]}) => { "b" => ["<i>", "<b>", "<u>"] },
+    # test combination of dates and escaped or unicode encoded data in arrays
+    %q([{"d":"1970-01-01", "s":"\u0020escape"},{"d":"1970-01-01", "s":"\u0020escape"}]) =>
+      [{ "d" => Date.new(1970, 1, 1), "s" => " escape" }, { "d" => Date.new(1970, 1, 1), "s" => " escape" }],
+    %q([{"d":"1970-01-01","s":"http:\/\/example.com"},{"d":"1970-01-01","s":"http:\/\/example.com"}]) =>
+      [{ "d" => Date.new(1970, 1, 1), "s" => "http://example.com" },
+       { "d" => Date.new(1970, 1, 1), "s" => "http://example.com" }],
+    # tests escaping of "\n" char with Yaml backend
+    %q({"a":"\n"}) => { "a" => "\n" },
+    %q({"a":"\u000a"}) => { "a" => "\n" },
+    %q({"a":"Line1\u000aLine2"}) => { "a" => "Line1\nLine2" },
+    # prevent json unmarshalling
+    '{"json_class":"TestJSONDecoding::Foo"}' => { "json_class" => "TestJSONDecoding::Foo" },
+    # json "fragments" - these are invalid JSON, but ActionPack relies on this
+    '"a string"' => "a string",
+    "1.1" => 1.1,
+    "1" => 1,
+    "-1" => -1,
+    "true" => true,
+    "false" => false,
+    "null" => nil
+  }
+
+  TESTS.each_with_index do |(json, expected), index|
+    fail_message = "JSON decoding failed for #{json}"
+
+    test "json decodes #{index}" do
+      with_tz_default "Eastern Time (US & Canada)" do
+        with_parse_json_times(true) do
+          silence_warnings do
+            if expected.nil?
+              assert_nil ActiveSupport::JSON.decode(json), fail_message
+            else
+              assert_equal expected, ActiveSupport::JSON.decode(json), fail_message
+            end
+          end
+        end
+      end
+    end
+  end
+
+  test "json decodes time json with time parsing disabled" do
+    with_parse_json_times(false) do
+      expected = { "a" => "2007-01-01 01:12:34 Z" }
+      assert_equal expected, ActiveSupport::JSON.decode(%({"a": "2007-01-01 01:12:34 Z"}))
+    end
+  end
+
+  def test_failed_json_decoding
+    assert_raise(ActiveSupport::JSON.parse_error) { ActiveSupport::JSON.decode(%(undefined)) }
+    assert_raise(ActiveSupport::JSON.parse_error) { ActiveSupport::JSON.decode(%({a: 1})) }
+    assert_raise(ActiveSupport::JSON.parse_error) { ActiveSupport::JSON.decode(%({: 1})) }
+    # assert_raise(ActiveSupport::JSON.parse_error) { ActiveSupport::JSON.decode(%()) }
+  end
+
+  def test_cannot_pass_unsupported_options
+    assert_raise(ArgumentError) { ActiveSupport::JSON.decode("", create_additions: true) }
+  end
+
+  private
+
+    def with_parse_json_times(value)
+    end
+end

data/test/encoding_test.rb

@@ -1,12 +1,10 @@
-require 'active_support/json'
+require 'yagni_json_encoder'
 require 'active_support/time'
 require 'encoding_test_cases'
 require 'securerandom'
 require 'test_helper'
 require 'time_zone_test_helpers'
 
-require 'yagni_json_encoder'
-
 class TestJSONEncoding < ActiveSupport::TestCase
   include TimeZoneTestHelpers
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yagni_json_encoder
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Ian Ker-Seymer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-16 00:00:00.000000000 Z
+date: 2017-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: 2.18.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: 2.18.5
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -63,6 +63,7 @@ files:
 - README.md
 - lib/activesupport/json_encoder.rb
 - lib/yagni_json_encoder.rb
+- test/decoding_test.rb
 - test/encoding_test.rb
 - test/encoding_test_cases.rb
 - test/test_helper.rb
@@ -87,13 +88,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: "~2x faster JSON encoder for Rails"
 test_files:
-- test/time_zone_test_helpers.rb
 - test/encoding_test_cases.rb
 - test/test_helper.rb
+- test/time_zone_test_helpers.rb
+- test/decoding_test.rb
 - test/encoding_test.rb
-has_rdoc: