activejsonmodel 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7dc0c113f2d8bd650b237c5888d8cfdc8e0bb7747dc994eacc88bed98ed86fd
-  data.tar.gz: 88ef99a717976d7ba37de7523f101fbff1f49ec848bd6e216f33f7a33482d530
+  metadata.gz: 6358d312dd78f6dec607bfcc0417e3bb716c8029d19502701d2c96704107d0f7
+  data.tar.gz: 0da1d126eead2748545c9455ac94a4b79c94e4278526ef9f78332104c63f121a
 SHA512:
-  metadata.gz: '09bb083c925bed9b1efdf6fa7b343cb85e3b7ac5419d614218590980657bce605ff444a1012680c20e97639ae535ebc0a413f7b2eb51f90f8ad5518a11f7a0eb'
-  data.tar.gz: 74455ab06735cfb9b27d68cbe44d6457cb968b3eeaae2dc79e691f1bc5a36f161aa015403cf6effdd0f970b8d1d2f7dc25e46f7637a0ec5b74ad0746f12e3521
+  metadata.gz: 3e9d4ec02edfcdfc3ac5eea8ed235094e37d18be43e4980d1fc789219856c73fe442116c53362f5e36e91ca1a79f3a5845f7da85e6a0822dc0271e7a2b6c7e45
+  data.tar.gz: 78b47a73bc4f50e8309655b01dbac8851377630941e1e85fba9c30e02e4f5a7c0c0a326c1bfd5e6fc3f0c0f04437a23e8b948a1295e235d609abfa91d0b2a40f

data/lib/active_json_model/active_record_encrypted_type.rb

@@ -18,25 +18,29 @@ if Gem.find_files("symmetric-encryption").any? &&
     #      end
     #    end
     #
-    #    class Integration < ActiveRecord::Base
+    #    class User < ActiveRecord::Base
     #      attribute :credentials, Credentials.encrypted_attribute_type
     #    end
+    #
+    # Alternatively, the type can be registered ahead of time:
+    #
+    #    # config/initializers/types.rb
+    #    ActiveRecord::Type.register(:credentials_encrypted_type, Credentials.encrypted_attribute_type)
+    #
+    # Then the custom type can be used as:
+    #
+    #    class User < ActiveRecord::Base
+    #      attribute :credentials, :credentials_encrypted_type
+    #    end
+    #
     class ActiveRecordEncryptedType < ::ActiveJsonModel::ActiveRecordType
       def type
         :string
       end
 
-      def cast(value)
-        if value.is_a?(@clazz)
-          value
-        elsif value.is_a?(::Array)
-          @clazz.load(value)
-        end
-      end
-
       def deserialize(value)
         if String === value
-            decoded = SymmetricEncryption.decrypt(value, type: :json) rescue nil
+          decoded = SymmetricEncryption.decrypt(value, type: :json) rescue nil
           @clazz.load(decoded)
         else
           super
@@ -46,9 +50,17 @@ if Gem.find_files("symmetric-encryption").any? &&
       def serialize(value)
         case value
         when @clazz
-          ::ActiveSupport::JSON.encode(@clazz.dump(value))
-        when Array, Hash
-          ::ActiveSupport::JSON.encode(value)
+          SymmetricEncryption.encrypt(
+            @clazz.dump(value),
+            random_iv: true,
+            type: :json
+          )
+        when ::Hash, ::HashWithIndifferentAccess, ::Array
+          SymmetricEncryption.encrypt(
+            value,
+            random_iv: true,
+            type: :json
+          )
         else
           super
         end

data/lib/active_json_model/active_record_type.rb

@@ -15,10 +15,21 @@ if Gem.find_files("active_record").any?
     #      end
     #    end
     #
-    #    class Integration < ActiveRecord::Base
+    #    class User < ActiveRecord::Base
     #      attribute :credentials, Credentials.attribute_type
     #    end
     #
+    # Alternatively, the type can be registered ahead of time:
+    #
+    #    # config/initializers/types.rb
+    #    ActiveRecord::Type.register(:credentials_type, Credentials.attribute_type)
+    #
+    # Then the custom type can be used as:
+    #
+    #    class User < ActiveRecord::Base
+    #      attribute :credentials, :credentials_type
+    #    end
+    #
     # This is based on:
     # https://jetrockets.pro/blog/rails-5-attributes-api-value-objects-and-jsonb
     class ActiveRecordType < ::ActiveRecord::Type::Value
@@ -39,11 +50,7 @@ if Gem.find_files("active_record").any?
       end
 
       def cast(value)
-        if value.is_a?(@clazz)
-          value
-        elsif value.is_a?(::Array)
-          @clazz.load(value)
-        end
+        @clazz.active_json_model_cast(value)
       end
 
       def deserialize(value)
@@ -59,7 +66,7 @@ if Gem.find_files("active_record").any?
         case value
         when @clazz
           ::ActiveSupport::JSON.encode(@clazz.dump(value))
-        when Array, Hash
+        when ::Hash, ::HashWithIndifferentAccess, ::Array
           ::ActiveSupport::JSON.encode(value)
         else
           super

data/lib/active_json_model/array.rb

@@ -617,6 +617,26 @@ module ActiveJsonModel
         end
       end
 
+      # Convert a value that might already be an instance of this class from underlying data.
+      # Used to delegate potential loading from ActiveRecord attributes
+      #
+      # @param vals either an instance of this model or an array-like object
+      def active_json_model_cast(vals)
+        if vals.is_a?(self)
+          vals
+        elsif vals.is_a?(::Array)
+          if vals.length == 0
+            self.new(values: vals)
+          elsif vals[0].respond_to?(:dump_to_json)
+            self.new(values: vals)
+          else
+            self.load(vals)
+          end
+        elsif vals.nil?
+          self.new(values: [])
+        end
+      end
+
       # Define a polymorphic factory to choose the concrete class for the list model. Note that because the array_data passed
       # to the block is an array of models, you must account for what the behavior is if there are no elements.
       #

data/lib/active_json_model/model.rb

@@ -559,6 +559,18 @@ module ActiveJsonModel
         end
       end
 
+      # Convert a value that might already be an instance of this class from underlying data.
+      # Used to delegate potential loading from ActiveRecord attributes
+      #
+      # @param val either an instance of this model or a Hash like object
+      def active_json_model_cast(val)
+        if val.is_a?(self)
+          val
+        elsif val.is_a?(::Hash) || val.is_a?(::HashWithIndifferentAccess)
+          self.load(val)
+        end
+      end
+
       # Register a new after load callback which is invoked after the instance is loaded from JSON
       #
       # @param method_name [Symbol, String] the name of the method to be invoked

data/lib/active_json_model/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activejsonmodel
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Ryan Morlok
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-03 00:00:00.000000000 Z
+date: 2022-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel