Merge pull request #81 from hashicorp/json-serializer-values

Preserve empty JSON types

lib/vault/rails.rb

@@ -6,7 +6,7 @@
 require_relative "encrypted_model"
 require_relative "rails/configurable"
 require_relative "rails/errors"
-require_relative "rails/serializer"
+require_relative "rails/json_serializer"
 require_relative "rails/version"
 
 module Vault

lib/vault/rails/serializer.rb → lib/vault/rails/json_serializer.rb

@@ -7,17 +7,16 @@ module JSONSerializer
       }.freeze
 
       def self.encode(raw)
-        self._init!
-
-        raw = {} if raw.nil?
+        _init!
 
         JSON.fast_generate(raw)
       end
 
       def self.decode(raw)
-        self._init!
+        _init!
+
+        return nil if raw == nil || raw == ""
 
-        return {} if raw.nil? || raw.empty?
         JSON.parse(raw, DECODE_OPTIONS)
       end
 

spec/integration/rails_spec.rb

@@ -299,16 +299,6 @@
       Vault::Rails.logical.write("transit/keys/dummy_people_details")
     end
 
-    it "has a default value for unpersisted records" do
-      person = Person.new
-      expect(person.details).to eq({})
-    end
-
-    it "has a default value for persisted records" do
-      person = Person.create!
-      expect(person.details).to eq({})
-    end
-
     it "tracks dirty attributes" do
       person = Person.create!(details: { "foo" => "bar" })
 

spec/lib/vault/rails/json_serializer_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+
+RSpec.describe Vault::Rails::JSONSerializer do
+  [
+    nil,
+    false,
+    true,
+    "",
+    "foo",
+    {},
+    { "foo" => "bar" },
+    [],
+    ["foo", "bar"],
+    0,
+    123,
+    0.0,
+    0.123,
+    0xff,
+    123e123
+  ].each do |object|
+    it "encodes and decodes #{object.inspect}" do
+      encoded = described_class.encode(object)
+      expect(encoded).to be_a(String)
+      decoded = described_class.decode(encoded)
+      expect(decoded).to eq(object)
+    end
+  end
+
+  describe ".decode" do
+    subject(:decoded) { described_class.decode(raw) }
+
+    context "with nil" do
+      let(:raw) { nil }
+      it { is_expected.to eq(nil) }
+    end
+
+    context "with an empty string (only possible if column has a default)" do
+      let(:raw) { "" }
+      it { is_expected.to eq(nil) }
+    end
+  end
+end