activejsonmodel 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6358d312dd78f6dec607bfcc0417e3bb716c8029d19502701d2c96704107d0f7
-  data.tar.gz: 0da1d126eead2748545c9455ac94a4b79c94e4278526ef9f78332104c63f121a
+  metadata.gz: dc97da5d920f8d4bd3086c08d7e785867d6aad6d76549ac5d4642d0dc7905269
+  data.tar.gz: be4f3c6d7b7eadee052cc42d7e7b7e3c4df3f7d86d9d673c6ae0c6dcd34f09f2
 SHA512:
-  metadata.gz: 3e9d4ec02edfcdfc3ac5eea8ed235094e37d18be43e4980d1fc789219856c73fe442116c53362f5e36e91ca1a79f3a5845f7da85e6a0822dc0271e7a2b6c7e45
-  data.tar.gz: 78b47a73bc4f50e8309655b01dbac8851377630941e1e85fba9c30e02e4f5a7c0c0a326c1bfd5e6fc3f0c0f04437a23e8b948a1295e235d609abfa91d0b2a40f
+  metadata.gz: 0ffe713e2616fff952482e90adab32f709634e6976040f7dd0c43fa34c5db81de5cf0f8f3829f83cfd9d54730618411d9b8003cfe1e415cf51111dc529a990cd
+  data.tar.gz: f28fee77d5d862f8615b146e7526d6593393518988f7ced44f1871914350e429dc0b1c44763674a1c1946f29699efa1bf3b1c114b87891a5133f1ac098a6352c

data/lib/active_json_model/active_record_encrypted_type.rb

@@ -48,14 +48,13 @@ if Gem.find_files("symmetric-encryption").any? &&
       end
 
       def serialize(value)
-        case value
-        when @clazz
+        if value.respond_to?(:dump_to_json)
           SymmetricEncryption.encrypt(
-            @clazz.dump(value),
+            value.dump_to_json,
             random_iv: true,
             type: :json
           )
-        when ::Hash, ::HashWithIndifferentAccess, ::Array
+        elsif ::Hash === value ||  ::HashWithIndifferentAccess === value || ::Array === value
           SymmetricEncryption.encrypt(
             value,
             random_iv: true,

data/lib/active_json_model/active_record_type.rb

@@ -63,10 +63,9 @@ if Gem.find_files("active_record").any?
       end
 
       def serialize(value)
-        case value
-        when @clazz
-          ::ActiveSupport::JSON.encode(@clazz.dump(value))
-        when ::Hash, ::HashWithIndifferentAccess, ::Array
+        if value.respond_to?(:dump_to_json)
+          ::ActiveSupport::JSON.encode(value.dump_to_json)
+        elsif ::Hash === value ||  ::HashWithIndifferentAccess === value || ::Array === value
           ::ActiveSupport::JSON.encode(value)
         else
           super

data/lib/active_json_model/model.rb

@@ -564,7 +564,10 @@ module ActiveJsonModel
       #
       # @param val either an instance of this model or a Hash like object
       def active_json_model_cast(val)
-        if val.is_a?(self)
+        # For polymorphic objects, it's possible that there won't be
+        # a base-class relationship, so just assume that if the
+        # object is an ActiveJsonModel object, it's good.
+        if val.respond_to?(:dump_to_json)
           val
         elsif val.is_a?(::Hash) || val.is_a?(::HashWithIndifferentAccess)
           self.load(val)

data/lib/active_json_model/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveJsonModel
-  VERSION = "0.1.5".freeze
+  VERSION = "0.1.6".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activejsonmodel
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Ryan Morlok