activejsonmodel 0.1.3 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f12f2a8c7d4739513ed25aa68753babdcee91046a61bbb853be921f6886d34ea
-  data.tar.gz: 977442b81243736fb2fe2ecec108d1e2abfcc4d24c5a2e0a0df24cad388a731e
+  metadata.gz: dc97da5d920f8d4bd3086c08d7e785867d6aad6d76549ac5d4642d0dc7905269
+  data.tar.gz: be4f3c6d7b7eadee052cc42d7e7b7e3c4df3f7d86d9d673c6ae0c6dcd34f09f2
 SHA512:
-  metadata.gz: be403bfb95151340f132ed221037c95f814c0c8b7ad056ed3bac3425b31034d76cc20ac798a29eb512d6eed5bdf7c2b755dc8341c553ba383ab7c760b75ff8e7
-  data.tar.gz: a8c6ffe2e5e4f67c0835e068a0b45355f2f76681e94e068f7123c5b684a8f4f7f7cefb764fc4b1a8806c1544a5091444efe04afb55c8d04e0656a93eb03a1ee7
+  metadata.gz: 0ffe713e2616fff952482e90adab32f709634e6976040f7dd0c43fa34c5db81de5cf0f8f3829f83cfd9d54730618411d9b8003cfe1e415cf51111dc529a990cd
+  data.tar.gz: f28fee77d5d862f8615b146e7526d6593393518988f7ced44f1871914350e429dc0b1c44763674a1c1946f29699efa1bf3b1c114b87891a5133f1ac098a6352c

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
@@ -44,11 +48,18 @@ if Gem.find_files("symmetric-encryption").any? &&
       end
 
       def serialize(value)
-        case value
-        when @clazz
-          ::ActiveSupport::JSON.encode(@clazz.dump(value))
-        when Array, Hash
-          ::ActiveSupport::JSON.encode(value)
+        if value.respond_to?(:dump_to_json)
+          SymmetricEncryption.encrypt(
+            value.dump_to_json,
+            random_iv: true,
+            type: :json
+          )
+        elsif ::Hash === value ||  ::HashWithIndifferentAccess === value || ::Array === value
+          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)
@@ -56,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 Array, Hash
+        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/array.rb

@@ -6,7 +6,7 @@ require 'active_support'
 require_relative './json_attribute'
 require_relative './after_load_callback'
 
-if defined?(::ActiveRecord)
+if Gem.find_files("active_record").any?
   require_relative './active_record_type'
   require_relative './active_record_encrypted_type'
 end
@@ -238,7 +238,11 @@ module ActiveJsonModel
         #
         # Note that this array_data would be stored as jsonb in the database
         def attribute_type
-          @attribute_type ||= ActiveRecordType.new(self)
+          if Gem.find_files("active_record").any?
+            @attribute_type ||= ::ActiveJsonModel::ActiveRecordType.new(self)
+          else
+            raise RuntimeError.new('ActiveRecord must be installed to use attribute_type')
+          end
         end
 
         # Allow this model to be used as ActiveRecord attribute type in Rails 5+.
@@ -253,7 +257,15 @@ module ActiveJsonModel
         # Note that this array_data would be stored as a string in the database, encrypted using
         # a symmetric key at the application level.
         def encrypted_attribute_type
-          @encrypted_attribute_type ||= ActiveRecordEncryptedType.new(self)
+          if Gem.find_files("active_record").any?
+            if Gem.find_files("symmetric-encryption").any?
+              @encrypted_attribute_type ||= ::ActiveJsonModel::ActiveRecordEncryptedType.new(self)
+            else
+              raise RuntimeError.new('symmetric-encryption must be installed to use attribute_type')
+            end
+          else
+            raise RuntimeError.new('active_record must be installed to use attribute_type')
+          end
         end
       end
 
@@ -605,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

@@ -5,7 +5,7 @@ require 'json'
 require_relative './json_attribute'
 require_relative './after_load_callback'
 
-if defined?(::ActiveRecord)
+if Gem.find_files("active_record").any?
   require_relative './active_record_type'
   require_relative './active_record_encrypted_type'
 end
@@ -275,7 +275,11 @@ module ActiveJsonModel
         #
         # Note that this data would be stored as jsonb in the database
         def attribute_type
-          @attribute_type ||= ActiveRecordType.new(self)
+          if Gem.find_files("active_record").any?
+            @attribute_type ||= ::ActiveJsonModel::ActiveRecordType.new(self)
+          else
+            raise RuntimeError.new('ActiveRecord must be installed to use attribute_type')
+          end
         end
 
         # Allow this model to be used as ActiveRecord attribute type in Rails 5+.
@@ -290,7 +294,15 @@ module ActiveJsonModel
         # Note that this data would be stored as a string in the database, encrypted using
         # a symmetric key at the application level.
         def encrypted_attribute_type
-          @encrypted_attribute_type ||= ActiveRecordEncryptedType.new(self)
+          if Gem.find_files("active_record").any?
+            if Gem.find_files("symmetric-encryption").any?
+              @encrypted_attribute_type ||= ::ActiveJsonModel::ActiveRecordEncryptedType.new(self)
+            else
+              raise RuntimeError.new('symmetric-encryption must be installed to use attribute_type')
+            end
+          else
+            raise RuntimeError.new('active_record must be installed to use attribute_type')
+          end
         end
       end
 
@@ -547,6 +559,21 @@ 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)
+        # 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)
+        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.3".freeze
+  VERSION = "0.1.6".freeze
 end

data/lib/active_json_model.rb

@@ -4,8 +4,10 @@ require "active_support"
 module ActiveJsonModel
   extend ActiveSupport::Autoload
 
-  autoload :VERSION, "active_json_model/version"
-  autoload :Model, "active_json_model/model"
+  autoload :ActiveRecordEncryptedType, "active_json_model/active_record_encrypted_type" unless Gem.find_files("active_record").none? || Gem.find_files("symmetric-encryption").none?
+  autoload :ActiveRecordType, "active_json_model/active_record_type" unless Gem.find_files("active_record").none?
   autoload :Array, "active_json_model/array"
+  autoload :Model, "active_json_model/model"
   autoload :Utils, "active_json_model/utils"
+  autoload :VERSION, "active_json_model/version"
 end

metadata

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